naruse	2017-03-13 01:20:09 +0900 (Mon, 13 Mar 2017)

  New Revision: 57919

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

  Log:
    merge revision(s) 57758: [Backport #13268]
    
    string.c: restore documentation for String#<<
    
    * string.c: [DOC] restore documentation for String#<<
      which became undocumented with r56021; fix a typo.
      [ruby-core:79865] [Bug #13268]

  Modified directories:
    branches/ruby_2_4/
  Modified files:
    branches/ruby_2_4/string.c
    branches/ruby_2_4/version.h
Index: ruby_2_4/version.h
===================================================================
--- ruby_2_4/version.h	(revision 57918)
+++ ruby_2_4/version.h	(revision 57919)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_4/version.h#L1
 #define RUBY_VERSION "2.4.0"
 #define RUBY_RELEASE_DATE "2017-03-13"
-#define RUBY_PATCHLEVEL 74
+#define RUBY_PATCHLEVEL 75
 
 #define RUBY_RELEASE_YEAR 2017
 #define RUBY_RELEASE_MONTH 3
Index: ruby_2_4/string.c
===================================================================
--- ruby_2_4/string.c	(revision 57918)
+++ ruby_2_4/string.c	(revision 57919)
@@ -2798,6 +2798,9 @@ rb_str_concat_literals(size_t num, const https://github.com/ruby/ruby/blob/trunk/ruby_2_4/string.c#L2798
 }
 
 /*
+ *  Document-method: String#<<
+ *  Document-method: String#concat
+ *
  *  call-seq:
  *     str << integer                      -> str
  *     str.concat(integer1, integer2,...)  -> str
@@ -2812,7 +2815,7 @@ rb_str_concat_literals(size_t num, const https://github.com/ruby/ruby/blob/trunk/ruby_2_4/string.c#L2815
  *     a = "hello "
  *     a << "world"   #=> "hello world"
  *     a.concat(33)   #=> "hello world!"
- *     a              #=> "hollo world!"
+ *     a              #=> "hello world!"
  *
  *     b = "sn"
  *     b.concat(b, b)    #=> "snsnsn"

Property changes on: ruby_2_4
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r57758


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