nagachika	2013-04-16 23:09:00 +0900 (Tue, 16 Apr 2013)

  New Revision: 40325

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=40325

  Log:
    merge revision(s) 40322:
    
    fix ENV.to_a rdoc example by @benolee [fix GH-288]

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/hash.c
    branches/ruby_2_0_0/version.h

Index: ruby_2_0_0/hash.c
===================================================================
--- ruby_2_0_0/hash.c	(revision 40324)
+++ ruby_2_0_0/hash.c	(revision 40325)
@@ -2926,7 +2926,7 @@ env_inspect(void) https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/hash.c#L2926
  *
  * 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
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 40324)
+++ ruby_2_0_0/version.h	(revision 40325)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #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

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r40322


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/