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

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

2 files changed, 2 insertions, 2 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 7a3d9bfd3e..bf08459b3b 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
@@ -494,7 +494,7 @@ module ActiveRecord
     #
     # Normally there is only a single ConnectionHandler instance, accessible via
     # ActiveRecord::Base.connection_handler. Active Record models use this to
-    # determine that connection pool that they should use.
+    # determine the connection pool that they should use.
     class ConnectionHandler
       def initialize
         @owner_to_pool = Hash.new { |h,k| h[k] = {} }
diff --git a/activerecord/lib/active_record/store.rb b/activerecord/lib/active_record/store.rb
index 25f528498e..8ea0ea239f 100644
--- a/activerecord/lib/active_record/store.rb
+++ b/activerecord/lib/active_record/store.rb
@@ -82,7 +82,7 @@ module ActiveRecord
         attribute
       end
 
-    class IndifferentCoder
+    class IndifferentCoder # :nodoc:
       def initialize(coder_or_class_name)
         @coder =
           if coder_or_class_name.respond_to?(:load) && coder_or_class_name.respond_to?(:dump)