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

Conflicts:
	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb

2 files changed, 3 insertions, 3 deletions

diff --git a/activesupport/lib/active_support/core_ext/object/inclusion.rb b/activesupport/lib/active_support/core_ext/object/inclusion.rb
index 51cfc62f2b..b5671f66d0 100644
--- a/activesupport/lib/active_support/core_ext/object/inclusion.rb
+++ b/activesupport/lib/active_support/core_ext/object/inclusion.rb
@@ -1,11 +1,11 @@
 class Object
   # Returns true if this object is included in the argument. Argument must be
-  # any object which respond to +#include?+. Usage:
+  # any object which responds to +#include?+. Usage:
   #
   #   characters = ["Konata", "Kagami", "Tsukasa"]
   #   "Konata".in?(characters) # => true
   #
-  # This will throw an ArgumentError if the supplied argument doesnt not respond
+  # This will throw an ArgumentError if the argument doesn't respond
   # to +#include?+.
   def in?(another_object)
     another_object.include?(self)
diff --git a/activesupport/lib/active_support/core_ext/object/try.rb b/activesupport/lib/active_support/core_ext/object/try.rb
index aedf5c8c82..e77a9da0ec 100644
--- a/activesupport/lib/active_support/core_ext/object/try.rb
+++ b/activesupport/lib/active_support/core_ext/object/try.rb
@@ -35,7 +35,7 @@ class Object
 end
 
 class NilClass
-  # Instances of +NilClass+ return always +nil+.
+  # Calling +try+ on +nil+ always returns +nil+.
   # It becomes specially helpful when navigating through associations that may return +nil+.
   #
   # === Examples