aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/CHANGELOG.md
diff options
context:
space:
mode:
authorAbhay Nikam <nikam.abhay1@gmail.com>2019-02-15 00:33:36 +0530
committerAbhay Nikam <nikam.abhay1@gmail.com>2019-02-15 00:33:36 +0530
commit85efb7cfe6dba1430e63f244a801c3a4c6b87f41 (patch)
tree630b1e53cb1337429802cbacc9363242990009be /activerecord/CHANGELOG.md
parent5f7180676bd60b44566a24b293376d54ff5d0d94 (diff)
downloadrails-85efb7cfe6dba1430e63f244a801c3a4c6b87f41.tar.gz
rails-85efb7cfe6dba1430e63f244a801c3a4c6b87f41.tar.bz2
rails-85efb7cfe6dba1430e63f244a801c3a4c6b87f41.zip
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.