naruse	2017-03-12 02:55:02 +0900 (Sun, 12 Mar 2017)

  New Revision: 57870

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

  Log:
    merge revision(s) 57411: [Backport #13147]
    
    Fix typo of URI#escape [Bug #13147]
    
    patched by Steve Hill <sghill.dev@g...>

  Modified directories:
    branches/ruby_2_4/
  Modified files:
    branches/ruby_2_4/lib/uri/common.rb
    branches/ruby_2_4/version.h
Index: ruby_2_4/lib/uri/common.rb
===================================================================
--- ruby_2_4/lib/uri/common.rb	(revision 57869)
+++ ruby_2_4/lib/uri/common.rb	(revision 57870)
@@ -82,7 +82,7 @@ module URI https://github.com/ruby/ruby/blob/trunk/ruby_2_4/lib/uri/common.rb#L82
     # Escapes the string, replacing all unsafe characters with codes.
     #
     # This method is obsolete and should not be used. Instead, use
-    # CGI.escape, URI.www_form_encode or URI.www_form_encode_component
+    # CGI.escape, URI.encode_www_form or URI.encode_www_form_component
     # depending on your specific use case.
     #
     # == Usage
Index: ruby_2_4/version.h
===================================================================
--- ruby_2_4/version.h	(revision 57869)
+++ ruby_2_4/version.h	(revision 57870)
@@ -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-12"
-#define RUBY_PATCHLEVEL 35
+#define RUBY_PATCHLEVEL 36
 
 #define RUBY_RELEASE_YEAR 2017
 #define RUBY_RELEASE_MONTH 3

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


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