naruse	2017-03-13 02:10:14 +0900 (Mon, 13 Mar 2017)

  New Revision: 57933

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

  Log:
    merge revision(s) 57802:
    
    string.c: [DOC] Fix a typo in String#dump
    
    [Fix GH-1531][ci skip]
    Author:    Alex Semyonov <alex@s...>

  Modified directories:
    branches/ruby_2_4/
  Modified files:
    branches/ruby_2_4/string.c
    branches/ruby_2_4/version.h
Index: ruby_2_4/string.c
===================================================================
--- ruby_2_4/string.c	(revision 57932)
+++ ruby_2_4/string.c	(revision 57933)
@@ -5717,7 +5717,7 @@ rb_str_inspect(VALUE str) https://github.com/ruby/ruby/blob/trunk/ruby_2_4/string.c#L5717
  *  Produces a version of +str+ with all non-printing characters replaced by
  *  <code>\nnn</code> notation and all special characters escaped.
  *
- *    "hello \n ''".dump  #=> "\"hello \\n ''\"
+ *    "hello \n ''".dump  #=> "\"hello \\n ''\""
  */
 
 VALUE
Index: ruby_2_4/version.h
===================================================================
--- ruby_2_4/version.h	(revision 57932)
+++ ruby_2_4/version.h	(revision 57933)
@@ -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 87
+#define RUBY_PATCHLEVEL 88
 
 #define RUBY_RELEASE_YEAR 2017
 #define RUBY_RELEASE_MONTH 3

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


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