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

2 files changed, 2 insertions, 2 deletions

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 2c210e5ba2..8b9e830040 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
@@ -174,7 +174,7 @@ module ActiveRecord
       end
 
       # Creates a new join table with the name created using the lexical order of the first two
-      # arguments. These arguments can be be a String or a Symbol.
+      # arguments. These arguments can be a String or a Symbol.
       #
       #  # Creates a table called 'assemblies_parts' with no id.
       #  create_join_table(:assemblies, :parts)
diff --git a/activerecord/lib/active_record/relation/calculations.rb b/activerecord/lib/active_record/relation/calculations.rb
index c770d36a1c..f613014f23 100644
--- a/activerecord/lib/active_record/relation/calculations.rb
+++ b/activerecord/lib/active_record/relation/calculations.rb
@@ -174,7 +174,7 @@ module ActiveRecord
     #
     #   Person.pluck(:id) # SELECT people.id FROM people
     #   Person.uniq.pluck(:role) # SELECT DISTINCT role FROM people
-    #   Person.where(:confirmed => true).limit(5).pluck(:id)
+    #   Person.where(:age => 21).limit(5).pluck(:id) # SELECT people.id FROM people WHERE people.age = 21 LIMIT 5
     #
     def pluck(column_name)
       key = column_name.to_s.split('.', 2).last