diff --git a/actionpack/lib/action_dispatch/middleware/assume_ssl.rb b/actionpack/lib/action_dispatch/middleware/assume_ssl.rb index 9970c51300fef..0c7cc0f63092a 100644 --- a/actionpack/lib/action_dispatch/middleware/assume_ssl.rb +++ b/actionpack/lib/action_dispatch/middleware/assume_ssl.rb @@ -4,7 +4,7 @@ module ActionDispatch # = Action Dispatch \AssumeSSL # # When proxying through a load balancer that terminates SSL, the forwarded request will appear - # as though its HTTP instead of HTTPS to the application. This makes redirects and cookie + # as though it's HTTP instead of HTTPS to the application. This makes redirects and cookie # security target HTTP instead of HTTPS. This middleware makes the server assume that the # proxy already terminated SSL, and that the request really is HTTPS. class AssumeSSL diff --git a/guides/source/configuring.md b/guides/source/configuring.md index fbe877d4a10cb..a4e58c5c54e86 100644 --- a/guides/source/configuring.md +++ b/guides/source/configuring.md @@ -202,7 +202,7 @@ Sets the host for the assets. Useful when CDNs are used for hosting assets, or w #### `config.assume_ssl` -Makes application believe that all requests are arriving over SSL. This is useful when proxying through a load balancer that terminates SSL, the forwarded request will appear as though its HTTP instead of HTTPS to the application. This makes redirects and cookie security target HTTP instead of HTTPS. This middleware makes the server assume that the proxy already terminated SSL, and that the request really is HTTPS. +Makes application believe that all requests are arriving over SSL. This is useful when proxying through a load balancer that terminates SSL, the forwarded request will appear as though it's HTTP instead of HTTPS to the application. This makes redirects and cookie security target HTTP instead of HTTPS. This middleware makes the server assume that the proxy already terminated SSL, and that the request really is HTTPS. #### `config.autoflush_log`