Skip to content

Commit

Permalink
Merge pull request #16615 from tgxworld/guide_fix
Browse files Browse the repository at this point in the history
[ci skip] Grammar fixes for upgrade guide from 4.0 to 4.1
  • Loading branch information
Zachary Scott committed Aug 21, 2014
2 parents af63e4a + ce392d9 commit ddb2d57
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions guides/source/upgrading_ruby_on_rails.md
Expand Up @@ -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"] %>'.
Expand Down Expand Up @@ -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.

Expand Down

0 comments on commit ddb2d57

Please sign in to comment.