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

4 files changed, 22 insertions, 8 deletions

diff --git a/activerecord/README.rdoc b/activerecord/README.rdoc
index e04abe9b37..335f0e083f 100644
--- a/activerecord/README.rdoc
+++ b/activerecord/README.rdoc
@@ -19,9 +19,11 @@ A short rundown of some of the major features:
 
    class Product < ActiveRecord::Base
    end
-
-   The Product class is automatically mapped to the table named "products",
-   which might look like this:
+  
+  {Learn more}[link:classes/ActiveRecord/Base.html]
+  
+The Product class is automatically mapped to the table named "products",
+which might look like this:
 
    CREATE TABLE products (
      id int(11) NOT NULL auto_increment,
@@ -29,11 +31,9 @@ A short rundown of some of the major features:
      PRIMARY KEY  (id)
    );
 
-   This would also define the following accessors: `Product#name` and
-   `Product#name=(new_name)`
-
-  {Learn more}[link:classes/ActiveRecord/Base.html]
-
+This would also define the following accessors: `Product#name` and
+`Product#name=(new_name)`.
+  
 
 * Associations between objects defined by simple class methods.
 
diff --git a/activerecord/lib/active_record/attribute_assignment.rb b/activerecord/lib/active_record/attribute_assignment.rb
index 30fa2c8ba5..87ecbe54f1 100644
--- a/activerecord/lib/active_record/attribute_assignment.rb
+++ b/activerecord/lib/active_record/attribute_assignment.rb
@@ -11,6 +11,15 @@ module ActiveRecord
     # If the passed hash responds to <tt>permitted?</tt> method and the return value
     # of this method is +false+ an <tt>ActiveModel::ForbiddenAttributesError</tt>
     # exception is raised.
+    #
+    #   cat = Cat.new(name: "Gorby", status: "yawning")
+    #   cat.attributes # =>  { "name" => "Gorby", "status" => "yawning" }
+    #   cat.assign_attributes(status: "sleeping")
+    #   cat.attributes # =>  { "name" => "Gorby", "status" => "sleeping" }
+    #
+    # New attributes will be persisted in the database when the object is saved.
+    #
+    # Aliased to <tt>attributes=</tt>.
     def assign_attributes(new_attributes)
       if !new_attributes.respond_to?(:stringify_keys)
         raise ArgumentError, "When assigning attributes, you must pass a hash as an argument."
diff --git a/activerecord/lib/active_record/connection_adapters/column.rb b/activerecord/lib/active_record/connection_adapters/column.rb
index 187eefb9e4..38efebeaf3 100644
--- a/activerecord/lib/active_record/connection_adapters/column.rb
+++ b/activerecord/lib/active_record/connection_adapters/column.rb
@@ -72,6 +72,8 @@ module ActiveRecord
       end
 
       # Casts a Ruby value to something appropriate for writing to the database.
+      # Numeric columns will typecast boolean and string to appropriate numeric
+      # values.
       def type_cast_for_write(value)
         return value unless number?
 
diff --git a/activerecord/lib/active_record/connection_adapters/postgresql/column.rb b/activerecord/lib/active_record/connection_adapters/postgresql/column.rb
index 2cbcd5fd50..1d22b56964 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql/column.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql/column.rb
@@ -98,6 +98,9 @@ module ActiveRecord
         end
       end
 
+      # Casts a Ruby value to something appropriate for writing to PostgreSQL.
+      # see ActiveRecord::ConnectionAdapters::Class#type_cast_for_write
+      # see ActiveRecord::ConnectionAdapters::PostgreSQLAdapter::OID::Type
       def type_cast_for_write(value)
         if @oid_type.respond_to?(:type_cast_for_write)
           @oid_type.type_cast_for_write(value)