Merge branch 'master' of github.com:rails/docrails

activerecord/lib/active_record/reflection.rb

@@ -124,8 +124,19 @@ def clear_reflections_cache # :nodoc:
       end
     end
 
-    # Holds all the methods that are shared between MacroReflection, AssociationReflection
-    # and ThroughReflection
+    # Holds all the methods that are shared between MacroReflection and ThroughReflection.
+    #
+    #   AbstractReflection
+    #     MacroReflection
+    #       AggregateReflection
+    #       AssociationReflection
+    #         HasManyReflection
+    #         HasOneReflection
+    #         BelongsToReflection
+    #         HasAndBelongsToManyReflection
+    #     ThroughReflection
+    #       PolymorphicReflection
+    #         RuntimeReflection
     class AbstractReflection # :nodoc:
       def table_name
         klass.table_name
@@ -232,14 +243,6 @@ def alias_candidate(name)
 
     # Base class for AggregateReflection and AssociationReflection. Objects of
     # AggregateReflection and AssociationReflection are returned by the Reflection::ClassMethods.
-    #
-    #   MacroReflection
-    #     AggregateReflection
-    #     AssociationReflection
-    #       HasManyReflection
-    #       HasOneReflection
-    #       BelongsToReflection
-    #         ThroughReflection
     class MacroReflection < AbstractReflection
       # Returns the name of the macro.
       #

activerecord/test/cases/migration_test.rb

@@ -192,8 +192,6 @@ def test_add_table_with_decimals
       # of 0, they take on the compile-time limit for precision and scale,
       # so the following should succeed unless you have used really wacky
       # compilation options
-      # - SQLite2 has the default behavior of preserving all data sent in,
-      # so this happens there too
       assert_kind_of BigDecimal, b.value_of_e
       assert_equal BigDecimal("2.7182818284590452353602875"), b.value_of_e
     elsif current_adapter?(:SQLite3Adapter)

activesupport/lib/active_support/deprecation/proxy_wrappers.rb

@@ -80,7 +80,7 @@ def warn(callstack, called, args)
     #   example.old_request.to_s
     #   # => DEPRECATION WARNING: @request is deprecated! Call request.to_s instead of
     #      @request.to_s
-    #      (Bactrace information…)
+    #      (Backtrace information…)
     #      "special_request"
     #
     #   example.request.to_s
@@ -118,7 +118,7 @@ def warn(callstack, called, args)
     #
     #   PLANETS.map { |planet| planet.capitalize }
     #   # => DEPRECATION WARNING: PLANETS is deprecated! Use PLANETS_POST_2006 instead.
-    #        (Bactrace information…)
+    #        (Backtrace information…)
     #        ["Mercury", "Venus", "Earth", "Mars", "Jupiter", "Saturn", "Uranus", "Neptune"]
     class DeprecatedConstantProxy < DeprecationProxy
       def initialize(old_const, new_const, deprecator = ActiveSupport::Deprecation.instance)

guides/source/association_basics.md

@@ -726,7 +726,7 @@ class Author < ApplicationRecord
   has_many :books, inverse_of: :author
 end
 
-class book < ApplicationRecord
+class Book < ApplicationRecord
   belongs_to :author, inverse_of: :books
 end
 ```