aboutsummaryrefslogtreecommitdiffstats
path: root/guides/source/upgrading_ruby_on_rails.md
diff options
context:
space:
mode:
authorGuo Xiang Tan <tgx_world@hotmail.com>2014-08-22 00:27:29 +0800
committerGuo Xiang Tan <tgx_world@hotmail.com>2014-08-22 00:27:57 +0800
commitce392d948403a4b5cb7348669cb597a3c93b8d3c (patch)
tree95713afa6dc2cb996db67d69cb723c63c92f0c7b /guides/source/upgrading_ruby_on_rails.md
parent54cf7c54221b97be62fe388560db4b28d3c8d62d (diff)
downloadrails-ce392d948403a4b5cb7348669cb597a3c93b8d3c.tar.gz
rails-ce392d948403a4b5cb7348669cb597a3c93b8d3c.tar.bz2
rails-ce392d948403a4b5cb7348669cb597a3c93b8d3c.zip
Guide fix. [CI SKIP]
Related: https://github.com/rails/rails/pull/16607
Diffstat (limited to 'guides/source/upgrading_ruby_on_rails.md')
-rw-r--r--guides/source/upgrading_ruby_on_rails.md6
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.