Merge commit 'rails/master'

Conflicts:
	activerecord/lib/active_record/associations.rb

2 files changed, 9 insertions, 1 deletions

diff --git a/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb b/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
index 500dafdc2e..12253eac3f 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
@@ -362,7 +362,7 @@ module ActiveRecord
       def call(env)
         @app.call(env)
       ensure
-        # Don't return connection (and peform implicit rollback) if
+        # Don't return connection (and perform implicit rollback) if
         # this request is a part of integration test
         unless env.key?("rack.test")
           ActiveRecord::Base.clear_active_connections!
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb b/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
index 8e33681772..b2c5c78bf7 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
@@ -41,11 +41,19 @@ module ActiveRecord
       #  # create_table() passes a TableDefinition object to the block.
       #  # This form will not only create the table, but also columns for the
       #  # table.
+      #
       #  create_table(:suppliers) do |t|
       #    t.column :name, :string, :limit => 60
       #    # Other fields here
       #  end
       #
+      # === Block form, with shorthand
+      #  # You can also use the column types as method calls, rather than calling the column method.
+      #  create_table(:suppliers) do |t|
+      #    t.string :name, :limit => 60
+      #    # Other fields here
+      #  end
+      #
       # === Regular form
       #  # Creates a table called 'suppliers' with no columns.
       #  create_table(:suppliers)