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

Conflicts:
	activerecord/lib/active_record/core.rb

2 files changed, 12 insertions, 9 deletions

diff --git a/activesupport/lib/active_support/core_ext/object/instance_variables.rb b/activesupport/lib/active_support/core_ext/object/instance_variables.rb
index 91fdf93eb2..40821fd619 100644
--- a/activesupport/lib/active_support/core_ext/object/instance_variables.rb
+++ b/activesupport/lib/active_support/core_ext/object/instance_variables.rb
@@ -1,6 +1,6 @@
 class Object
-  # Returns a hash that maps instance variable names without "@" to their
-  # corresponding values. Keys are strings both in Ruby 1.8 and 1.9.
+  # Returns a hash with string keys that maps instance variable names without "@" to their
+  # corresponding values.
   #
   #   class C
   #     def initialize(x, y)
@@ -9,12 +9,11 @@ class Object
   #   end
   #
   #   C.new(0, 1).instance_values # => {"x" => 0, "y" => 1}
-  def instance_values #:nodoc:
+  def instance_values
     Hash[instance_variables.map { |name| [name[1..-1], instance_variable_get(name)] }]
   end
 
-  # Returns an array of instance variable names including "@". They are strings
-  # both in Ruby 1.8 and 1.9.
+  # Returns an array of instance variable names including "@".
   #
   #   class C
   #     def initialize(x, y)
diff --git a/activesupport/lib/active_support/ordered_hash.rb b/activesupport/lib/active_support/ordered_hash.rb
index 8edd3960c7..1a3693f766 100644
--- a/activesupport/lib/active_support/ordered_hash.rb
+++ b/activesupport/lib/active_support/ordered_hash.rb
@@ -5,16 +5,20 @@ YAML.add_builtin_type("omap") do |type, val|
 end
 
 module ActiveSupport
-  # The order of iteration over hashes in Ruby 1.8 is undefined. For example, you do not know the
-  # order in which +keys+ will return keys, or +each+ yield pairs. <tt>ActiveSupport::OrderedHash</tt>
-  # implements a hash that preserves insertion order, as in Ruby 1.9:
+  # <tt>ActiveSupport::OrderedHash</tt> implements a hash that preserves
+  # insertion order.
   #
   #   oh = ActiveSupport::OrderedHash.new
   #   oh[:a] = 1
   #   oh[:b] = 2
   #   oh.keys # => [:a, :b], this order is guaranteed
   #
-  # <tt>ActiveSupport::OrderedHash</tt> is namespaced to prevent conflicts with other implementations.
+  # Also, maps the +omap+ feature for YAML files
+  # (See http://yaml.org/type/omap.html) to support ordered items
+  # when loading from yaml.
+  #
+  # <tt>ActiveSupport::OrderedHash</tt> is namespaced to prevent conflicts
+  # with other implementations.
   class OrderedHash < ::Hash
     def to_yaml_type
       "!tag:yaml.org,2002:omap"