nagachika	2013-04-15 23:04:09 +0900 (Mon, 15 Apr 2013)

  New Revision: 40309

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

  Log:
    merge revision(s) 40299:
    
    * string.c (String#gsub): fix typo in documentation

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

Index: ruby_2_0_0/string.c
===================================================================
--- ruby_2_0_0/string.c	(revision 40308)
+++ ruby_2_0_0/string.c	(revision 40309)
@@ -3977,7 +3977,7 @@ rb_str_gsub_bang(int argc, VALUE *argv, https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/string.c#L3977
  *  <code>\\\k<n></code>, where <i>n</i> is a group name. If it is a
  *  double-quoted string, both back-references must be preceded by an
  *  additional backslash. However, within <i>replacement</i> the special match
- *  variables, such as <code>&$</code>, will not refer to the current match.
+ *  variables, such as <code>$&</code>, will not refer to the current match.
  *
  *  If the second argument is a <code>Hash</code>, and the matched text is one
  *  of its keys, the corresponding value is the replacement string.
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 40308)
+++ ruby_2_0_0/version.h	(revision 40309)
@@ -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-15"
-#define RUBY_PATCHLEVEL 134
+#define RUBY_PATCHLEVEL 135
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 4

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


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