diff options
| author | Zachary Scott <e@zzak.io> | 2014-08-21 09:52:33 -0700 |
|---|---|---|
| committer | Zachary Scott <e@zzak.io> | 2014-08-21 09:52:33 -0700 |
| commit | ddb2d57223e20eae61276592e4270405fa8d87aa (patch) | |
| tree | db8cdca93f7d4ac9746ffd8e27be1f80ccd7be46 /guides | |
| parent | af63e4a2546629c3fb2d53cffb7d4ea0e8663f68 (diff) | |
| parent | ce392d948403a4b5cb7348669cb597a3c93b8d3c (diff) | |
| download | rails-ddb2d57223e20eae61276592e4270405fa8d87aa.tar.gz rails-ddb2d57223e20eae61276592e4270405fa8d87aa.tar.bz2 rails-ddb2d57223e20eae61276592e4270405fa8d87aa.zip | |
Merge pull request #16615 from tgxworld/guide_fix
[ci skip] Grammar fixes for upgrade guide from 4.0 to 4.1
Diffstat (limited to 'guides')
| -rw-r--r-- | guides/source/upgrading_ruby_on_rails.md | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/guides/source/upgrading_ruby_on_rails.md b/guides/source/upgrading_ruby_on_rails.md index 3f09aea814..407445f449 100644 --- a/guides/source/upgrading_ruby_on_rails.md +++ b/guides/source/upgrading_ruby_on_rails.md @@ -199,7 +199,7 @@ secrets, you need to: ``` 2. Use your existing `secret_key_base` from the `secret_token.rb` initializer to - set the SECRET_KEY_BASE environment variable for whichever users that are running the + set the SECRET_KEY_BASE environment variable for whichever users running the Rails application in production mode. Alternatively, you can simply copy the existing `secret_key_base` from the `secret_token.rb` initializer to `secrets.yml` under the `production` section, replacing '<%= ENV["SECRET_KEY_BASE"] %>'. @@ -414,8 +414,8 @@ configuration to your application: config.i18n.enforce_available_locales = false ``` -Note that this option was added as a security measure, to ensure user input can -not be used as locale information unless it is previously known. Therefore, +Note that this option was added as a security measure, to ensure user input +cannot be used as locale information unless it is previously known. Therefore, it's recommended not to disable this option unless you have a strong reason for doing so. |