From 1d7b3fa84caec0e935df3b61573a5ef23ea69f34 Mon Sep 17 00:00:00 2001
From: Zachary Scott <e@zzak.io>
Date: Fri, 23 May 2014 14:45:21 -0700
Subject: [PATCH] Future port c8ddb61

---
 actionpack/CHANGELOG.md   |  6 +++---
 activerecord/CHANGELOG.md | 19 ++++++++++---------
 railties/CHANGELOG.md     |  3 +--
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index 2b4ff7f03d..92e94ee463 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -3,7 +3,7 @@
 
     *Guo Xiang Tan*
 
-*   Fix 'Stack level too deep' when rendering `head :ok` in an action method
+*   Fix `'Stack level too deep'` when rendering `head :ok` in an action method
     called 'status' in a controller.
 
     Fixes #13905.
@@ -71,7 +71,7 @@
     4. Use `escape_segment` rather than `escape_path` in URL generation
 
     For point 4 there are two exceptions. Firstly, when a route uses wildcard segments
-    (e.g. *foo) then we use `escape_path` as the value may contain '/' characters. This
+    (e.g. `*foo`) then we use `escape_path` as the value may contain '/' characters. This
     means that wildcard routes can't be optimized. Secondly, if a `:controller` segment
     is used in the path then this uses `escape_path` as the controller may be namespaced.
 
@@ -101,7 +101,7 @@
 
     *Andrew White*, *James Coglan*
 
-*   Append link to bad code to backtrace when exception is SyntaxError.
+*   Append link to bad code to backtrace when exception is `SyntaxError`.
 
     *Boris Kuznetsov*
 
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index 260bd063aa..041872034f 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -28,7 +28,8 @@
 
     *Brock Trappitt*
 
-*   Fixed the inferred table name of a HABTM auxiliar table inside a schema.
+*   Fixed the inferred table name of a has_and_belongs_to_many auxiliar
+    table inside a schema.
 
     Fixes #14824
 
@@ -71,7 +72,7 @@
 
     *Aaron Nelson*
 
-*   Fix how to calculate associated class name when using namespaced `has_and_belongs_to_many`
+*   Fix how to calculate associated class name when using namespaced has_and_belongs_to_many
     association.
 
     Fixes #14709.
@@ -124,7 +125,7 @@
 
     *Innokenty Mikhailov*
 
-*   Allow the PostgreSQL adapter to handle bigserial pk types again.
+*   Allow the PostgreSQL adapter to handle bigserial primary key types again.
 
     Fixes #10410.
 
@@ -139,10 +140,10 @@
 
     *Yves Senn*
 
-*   Fixed HABTM's CollectionAssociation size calculation.
+*   Fixed has_and_belongs_to_many's CollectionAssociation size calculation.
 
-    HABTM should fall back to using the normal CollectionAssociation's size
-    calculation if the collection is not cached or loaded.
+    has_and_belongs_to_many should fall back to using the normal CollectionAssociation's
+    size calculation if the collection is not cached or loaded.
 
     Fixes #14913, #14914.
 
@@ -186,10 +187,10 @@
 
     *Eric Chahin*, *Aaron Nelson*, *Kevin Casey*
 
-*   Stringify all variable keys of mysql connection configuration.
+*   Stringify all variables keys of MySQL connection configuration.
 
-    When the `sql_mode` variable for mysql adapters is set in the configuration
-    as a `String`, it was ignored and overwritten by the strict mode option.
+    When `sql_mode` variable for MySQL adapters set in configuration as `String`
+    was ignored and overwritten by strict mode option.
 
     Fixes #14895.
 
diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index ba6a0feeef..9e7569465f 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -2,8 +2,7 @@
 
     *Dan Kang*
 
-*   Load database configuration from the first
-    database.yml available in paths.
+*   Load database configuration from the first `database.yml` available in paths.
 
     *Pier-Olivier Thibault*