usa	2015-05-21 14:08:28 +0900 (Thu, 21 May 2015)

  New Revision: 50582

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

  Log:
    merge revision(s) 50509: [Backport #11132]
    
    * string.c: added documentation for character sequence \' with String#sub
      [Bug #11132][ruby-core:69121][fix GH-900][ci skip] Patch by @shishir127

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/string.c
    branches/ruby_2_1/version.h
Index: ruby_2_1/ChangeLog
===================================================================
--- ruby_2_1/ChangeLog	(revision 50581)
+++ ruby_2_1/ChangeLog	(revision 50582)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1
+Thu May 21 14:08:15 2015  SHIBATA Hiroshi  <hsbt@r...>
+
+	* string.c: added documentation for character sequence \' with String#sub
+	  [Bug #11132][ruby-core:69121][fix GH-900][ci skip] Patch by @shishir127
+
 Thu May 21 14:04:06 2015  Nobuyoshi Nakada  <nobu@r...>
 
 	* range.c (linear_object_p, range_include): test if covered for
Index: ruby_2_1/string.c
===================================================================
--- ruby_2_1/string.c	(revision 50581)
+++ ruby_2_1/string.c	(revision 50582)
@@ -4088,6 +4088,9 @@ rb_str_sub_bang(int argc, VALUE *argv, V https://github.com/ruby/ruby/blob/trunk/ruby_2_1/string.c#L4088
  *  double-quoted string, both back-references must be preceded by an
  *  additional backslash. However, within +replacement+ the special match
  *  variables, such as <code>&$</code>, will not refer to the current match.
+ *  If +replacement+ is a String that looks like a pattern's capture group but
+ *  is actaully not a pattern capture group e.g. <code>"\\'"</code>, then it
+ *  will have to be preceded by two backslashes like so <code>"\\\\'"</code>.
  *
  *  If the second argument is a Hash, and the matched text is one of its keys,
  *  the corresponding value is the replacement string.
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 50581)
+++ ruby_2_1/version.h	(revision 50582)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #define RUBY_VERSION "2.1.7"
 #define RUBY_RELEASE_DATE "2015-05-21"
-#define RUBY_PATCHLEVEL 354
+#define RUBY_PATCHLEVEL 355
 
 #define RUBY_RELEASE_YEAR 2015
 #define RUBY_RELEASE_MONTH 5

Property changes on: ruby_2_1
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r50509


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