summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-05-03 03:08:33 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-05-03 03:08:33 +0000
commitb67fbc0789c5f9f3c84406a95ca8a0ccc2d77cdc (patch)
tree9c185a1189f09988dbddc99c7e2d44f921595cfc
parent8fd9bb4dc667e72ce716811c8da2062003790509 (diff)
merges r25081 from trunk into ruby_1_9_1.
fixes [ruby-core:27694], reported by Denis Defreyne. -- * hash.c (Hash#each): Fix documentation to reflect insertion order. A patch by Run Paint Run Run [ruby-core:23644] and [ruby-core:21231] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@27595 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--hash.c5
-rw-r--r--version.h2
2 files changed, 3 insertions, 4 deletions
diff --git a/hash.c b/hash.c
index fa08b535d6..3746099630 100644
--- a/hash.c
+++ b/hash.c
@@ -2573,9 +2573,8 @@ env_update(VALUE env, VALUE hash)
/*
* A <code>Hash</code> is a collection of key-value pairs. It is
* similar to an <code>Array</code>, except that indexing is done via
- * arbitrary keys of any object type, not an integer index. The order
- * in which you traverse a hash by either key or value may seem
- * arbitrary, and will generally not be in the insertion order.
+ * arbitrary keys of any object type, not an integer index. Hashes enumerate
+ * their values in the order that the corresponding keys were inserted.
*
* Hashes have a <em>default value</em> that is returned when accessing
* keys that do not exist in the hash. By default, that value is
diff --git a/version.h b/version.h
index 85113c1a97..74df289306 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.1"
-#define RUBY_PATCHLEVEL 421
+#define RUBY_PATCHLEVEL 422
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 9
#define RUBY_VERSION_TEENY 1