aboutsummaryrefslogtreecommitdiffstats
path: root/guides
diff options
context:
space:
mode:
authorEileen M. Uchitelle <eileencodes@users.noreply.github.com>2019-01-22 11:13:37 -0500
committerGitHub <noreply@github.com>2019-01-22 11:13:37 -0500
commite26f0658da7ff7e9382d6040fe76c087ff1791e4 (patch)
tree1d5611d2de59b53659afcf649d546ee86ec84459 /guides
parent3f0c7c5580e67120b2a42552c3624b4e552aa721 (diff)
parent97909ddcf22671aee0f1ba26c471cc069e737e29 (diff)
downloadrails-e26f0658da7ff7e9382d6040fe76c087ff1791e4.tar.gz
rails-e26f0658da7ff7e9382d6040fe76c087ff1791e4.tar.bz2
rails-e26f0658da7ff7e9382d6040fe76c087ff1791e4.zip
Merge pull request #34997 from alkesh26/typo-fix-webserver
Replaced webserver with web server
Diffstat (limited to 'guides')
-rw-r--r--guides/source/caching_with_rails.md4
-rw-r--r--guides/source/rails_on_rack.md2
2 files changed, 3 insertions, 3 deletions
diff --git a/guides/source/caching_with_rails.md b/guides/source/caching_with_rails.md
index 3ac3f8fa8b..56c0ca78a0 100644
--- a/guides/source/caching_with_rails.md
+++ b/guides/source/caching_with_rails.md
@@ -51,10 +51,10 @@ For instance, it will not impact low-level caching, that we address
### Page Caching
Page caching is a Rails mechanism which allows the request for a generated page
-to be fulfilled by the webserver (i.e. Apache or NGINX) without having to go
+to be fulfilled by the web server (i.e. Apache or NGINX) without having to go
through the entire Rails stack. While this is super fast it can't be applied to
every situation (such as pages that need authentication). Also, because the
-webserver is serving a file directly from the filesystem you will need to
+web server is serving a file directly from the filesystem you will need to
implement cache expiration.
INFO: Page Caching has been removed from Rails 4. See the [actionpack-page_caching gem](https://github.com/rails/actionpack-page_caching).
diff --git a/guides/source/rails_on_rack.md b/guides/source/rails_on_rack.md
index c33851a0f9..69b5f254bf 100644
--- a/guides/source/rails_on_rack.md
+++ b/guides/source/rails_on_rack.md
@@ -35,7 +35,7 @@ application. Any Rack compliant web server should be using
### `rails server`
-`rails server` does the basic job of creating a `Rack::Server` object and starting the webserver.
+`rails server` does the basic job of creating a `Rack::Server` object and starting the web server.
Here's how `rails server` creates an instance of `Rack::Server`