summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-04-16 14:09:00 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-04-16 14:09:00 +0000
commitb4909876ef9a17c3cd18d226c46fc86899195b3d (patch)
tree735ac9fd0a847760be6500fe7b1d7083212bd8fe
parentb3f5b73ac2561c3683a4612d94dda979d1af75be (diff)
merge revision(s) 40322:
fix ENV.to_a rdoc example by @benolee [fix GH-288] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40325 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--hash.c2
-rw-r--r--version.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/hash.c b/hash.c
index 9a0f71db9a..a06e7a352b 100644
--- a/hash.c
+++ b/hash.c
@@ -2926,7 +2926,7 @@ env_inspect(void)
*
* Converts the environment variables into an array of names and value arrays.
*
- * ENV.to_a # => [["TERM" => "xterm-color"], ["SHELL" => "/bin/bash"], ...]
+ * ENV.to_a # => [["TERM", "xterm-color"], ["SHELL", "/bin/bash"], ...]
*
*/
static VALUE
diff --git a/version.h b/version.h
index 5082120972..2b024c45c4 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
#define RUBY_VERSION "2.0.0"
#define RUBY_RELEASE_DATE "2013-04-16"
-#define RUBY_PATCHLEVEL 142
+#define RUBY_PATCHLEVEL 143
#define RUBY_RELEASE_YEAR 2013
#define RUBY_RELEASE_MONTH 4