aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/CHANGELOG.md
diff options
context:
space:
mode:
authorEileen M. Uchitelle <eileencodes@users.noreply.github.com>2019-02-14 14:23:25 -0500
committerGitHub <noreply@github.com>2019-02-14 14:23:25 -0500
commit6183483fa13bb1cac7e32f64df568fc2f9fb9a6b (patch)
tree198317bf2246aaae549023e92c86518a9a746997 /activerecord/CHANGELOG.md
parenteaf6d188e4b8c72cce6d08170678557e8c3d1713 (diff)
parent85efb7cfe6dba1430e63f244a801c3a4c6b87f41 (diff)
downloadrails-6183483fa13bb1cac7e32f64df568fc2f9fb9a6b.tar.gz
rails-6183483fa13bb1cac7e32f64df568fc2f9fb9a6b.tar.bz2
rails-6183483fa13bb1cac7e32f64df568fc2f9fb9a6b.zip
Merge pull request #35277 from abhaynikam/minor-doc-update-after-35242
Minor changes to deprecation warning message after #35242
Diffstat (limited to 'activerecord/CHANGELOG.md')
-rw-r--r--activerecord/CHANGELOG.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index 7b4f3c617c..47ae71f2a0 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -502,8 +502,8 @@
Iterating over the database configurations has also changed. Instead of
calling hash methods on the `configurations` hash directly, a new method `configs_for` has
- been provided that allows you to select the correct configuration. `env_name`, and
- `spec_name` arguments are optional. For example these return an array of
+ been provided that allows you to select the correct configuration. `env_name` and
+ `spec_name` arguments are optional. For example, these return an array of
database config objects for the requested environment and a single database config object
will be returned for the requested environment and specification name respectively.