aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVipul A M <vipulnsward@gmail.com>2019-03-12 04:12:22 +0530
committerGitHub <noreply@github.com>2019-03-12 04:12:22 +0530
commit9f0e83b7c5d9d24f6da7a04ea1d1546f29920f32 (patch)
tree4856f57c49f541c404646aeaf32486e0ca896166
parentcfa22f1a4b5e8b95ee01a432168de2f831b3f788 (diff)
parentad5ca97acc0ef744d8c9438ce547c48fddeae4b6 (diff)
downloadrails-9f0e83b7c5d9d24f6da7a04ea1d1546f29920f32.tar.gz
rails-9f0e83b7c5d9d24f6da7a04ea1d1546f29920f32.tar.bz2
rails-9f0e83b7c5d9d24f6da7a04ea1d1546f29920f32.zip
Merge pull request #35576 from sharang-d/fix-typo-overriden
overriden -> overridden [ci skip]
-rw-r--r--railties/lib/rails/commands/encrypted/USAGE2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/commands/encrypted/USAGE b/railties/lib/rails/commands/encrypted/USAGE
index 7ec3ebb5d7..253eec2378 100644
--- a/railties/lib/rails/commands/encrypted/USAGE
+++ b/railties/lib/rails/commands/encrypted/USAGE
@@ -6,7 +6,7 @@ See the `Rails.application.encrypted` documentation for using them in your app.
=== Encryption Keys
By default, Rails looks for the encryption key in `config/master.key` or
-`ENV["RAILS_MASTER_KEY"]`, but that lookup can be overriden with `--key`:
+`ENV["RAILS_MASTER_KEY"]`, but that lookup can be overridden with `--key`:
rails encrypted:edit config/encrypted_file.yml.enc --key config/encrypted_file.key