diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index fe488a45f902edd989a80556b27cc09cd7e8a0db..272f05eb7912b20a3002adbc2fada027c8bbdf18 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -5,13 +5,13 @@
 
     *Yves Senn*
 
-*   PostgreSQL implementation of SchemaStatements#index_name_exists?
+*   PostgreSQL implementation of `SchemaStatements#index_name_exists?`.
 
     The database agnostic implementation does not detect with indexes that are
     not supported by the ActiveRecord schema dumper. For example, expressions
     indexes would not be detected.
 
-    This fixes #11018.
+    Fixes #11018.
 
     *Jonathan Baudanza*
 
@@ -884,7 +884,7 @@
 
     *Severin Schoepke*
 
-*   `ActiveRecord::Store` works together with PG `hstore` columns.
+*   `ActiveRecord::Store` works together with PostgreSQL `hstore` columns.
 
     Fixes #12452.
 
@@ -1170,7 +1170,7 @@
 
     *Yves Senn* , *Severin Schoepke*
 
-*   Fix multidimensional PG arrays containing non-string items.
+*   Fix multidimensional PostgreSQL arrays containing non-string items.
 
     *Yves Senn*
 
@@ -1188,7 +1188,7 @@
 
     *Richard Schneeman*
 
-*   Removed redundant override of `xml` column definition for PG,
+*   Removed redundant override of `xml` column definition for PostgreSQL,
     in order to use `xml` column type instead of `text`.
 
     *Paul Nikitochkin*, *Michael Nikitochkin*
diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb
index 86f5e6647bcf3bedff91723e516302a471c419cb..b5e21cbede601cb2e3134f01f37a9bcdfbdeacfb 100644
--- a/activerecord/lib/active_record/associations.rb
+++ b/activerecord/lib/active_record/associations.rb
@@ -670,7 +670,7 @@ def association_instance_set(name, association)
     # column in the posts table.
     #
     # Note: The <tt>attachable_type=</tt> method is being called when assigning an +attachable+.
-    # The +class_name+ of the +attachable+ is being passed as a String.
+    # The +class_name+ of the +attachable+ is passed as a String.
     #
     #   class Asset < ActiveRecord::Base
     #     belongs_to :attachable, polymorphic: true