Copy-edit at the CHANGELOGS [ci skip]

rails · May 20, 2014 · c9d544d · c9d544d
1 parent e12adfe
commit c9d544d
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 18 deletions.
diff --git a/actionmailer/CHANGELOG.md b/actionmailer/CHANGELOG.md
@@ -1,3 +1,8 @@
+## Rails 4.0.6 (unreleased) ##
+
+*No changes*
+
+
 ## Rails 4.0.5 (May 6, 2014) ##
 
 *No changes*

diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
@@ -1,4 +1,6 @@
-*   Fix 'Stack level too deep' when rendering `head :ok` in an action method
+## Rails 4.0.6 (unreleased) ##
+
+*   Fix `'Stack level too deep'` when rendering `head :ok` in an action method
     called 'status' in a controller.
 
     Fixes #13905.
@@ -11,7 +13,7 @@
 
     *Guilherme Cavalcanti*, *Andrew White*
 
-*   Change `asset_path` to use File.join to create proper paths (#14932):
+*   Change `asset_path` to use File.join to create proper paths.
 
         https://some.host.com//assets/some.js
 
@@ -44,16 +46,16 @@
 
     *Izumi Wong-Horiuchi*
 
-*   Swapped the parameters of assert_equal in `assert_select` so that the
-    proper values were printed correctly
+*   Swapped the parameters of `assert_equal` in `assert_select` so that the
+    proper values were printed correctly.
 
     Fixes #14422.
 
     *Vishal Lal*
 
 *   The method `shallow?` returns false if the parent resource is a singleton so
-    we need to check if we're not inside a nested scope before copying the :path
-    and :as options to their shallow equivalents.
+    we need to check if we're not inside a nested scope before copying the `:path`
+    and `:as` options to their shallow equivalents.
 
     Fixes #14388.
 

diff --git a/activemodel/CHANGELOG.md b/activemodel/CHANGELOG.md
@@ -1,3 +1,8 @@
+## Rails 4.0.6 (unreleased) ##
+
+*No changes*
+
+
 ## Rails 4.0.5 (May 6, 2014) ##
 
 *No changes*

diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
@@ -1,4 +1,7 @@
-*   Fixed the inferred table name of a HABTM auxiliar table inside a schema.
+## Rails 4.0.6 (unreleased) ##
+
+*   Fixed the inferred table name of a has_and_belongs_to_many auxiliar
+    table inside a schema.
 
     Fixes #14824
 
@@ -51,32 +54,32 @@
 
     *Yves Senn*
 
-*   Fixed HABTM's CollectionAssociation size calculation.
+*   Fixed has_and_belongs_to_many's CollectionAssociation size calculation.
 
-    HABTM should not include new records as part of #count_records as new
-    records are already counted.
+    has_and_belongs_to_many should not include new records as part of
+    `#count_records` as new records are already counted.
 
     Fixes #14914.
 
     *Fred Wu*
 
-*   Stringify all variables keys of mysql connection configuration.
+*   Stringify all variables keys of MySQL connection configuration.
 
-    When `sql_mode` variable for mysql adapters set in configuration as `String`
+    When `sql_mode` variable for MySQL adapters set in configuration as `String`
     was ignored and overwritten by strict mode option.
 
-    Fixes #14895
+    Fixes #14895.
 
     *Paul Nikitochkin*
 
 *   Ensure SQLite3 statements are closed on errors.
 
-    Fixes: #13631
+    Fixes: #13631.
 
     *Timur Alperovich*
 
 *   When joining tables with a default scope, ensure the generated table name
-    in the ON conditions from the default scope is correctly aliased .
+    in the `ON` conditions from the default scope is correctly aliased.
 
     Backports #14154.
 
@@ -143,7 +146,7 @@
 
 *   `to_sql` on an association now matches the query that is actually executed, where it
     could previously have incorrectly accrued additional conditions (e.g. as a result of
-    a previous query). CollectionProxy now always defers to the association scope's
+    a previous query). `CollectionProxy` now always defers to the association scope's
     `arel` method so the (incorrect) inherited one should be entirely concealed.
 
     Fixes #14003.
@@ -166,7 +169,7 @@
 
     *Tieg Zaharia*
 
-*   Fixed error where .persisted? throws SystemStackError for an unsaved model with a
+*   Fixed error where `#persisted?` throws `SystemStackError` for an unsaved model with a
     custom primary key that didn't save due to validation error.
 
     Fixes #14393.
@@ -180,7 +183,7 @@
 
     *Yves Senn*
 
-*   Fix counter cache when association uses a class_name.
+*   Fix counter cache when association uses a `class_name`.
 
     Fixes #14369.
 

diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md
@@ -1,3 +1,5 @@
+## Rails 4.0.6 (unreleased) ##
+
 *   `HashWithIndifferentAccess` better respects `#to_hash` on objects it's
     given. In particular `#update`, `#merge`, `#replace` all accept objects
     which respond to `#to_hash`, even if those objects are not Hashes directly.

diff --git a/guides/CHANGELOG.md b/guides/CHANGELOG.md
@@ -1,3 +1,8 @@
+## Rails 4.0.6 (unreleased) ##
+
+*No changes*
+
+
 ## Rails 4.0.5 (May 6, 2014) ##
 
 *No changes*

diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
@@ -1,3 +1,5 @@
+## Rails 4.0.6 (unreleased) ##
+
 *   Do not set the Rails environment to test by default when using test_unit Railtie.
 
     *Konstantin Shabanov*