nagachika	2016-03-30 05:13:52 +0900 (Wed, 30 Mar 2016)

  New Revision: 54427

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

  Log:
    merge revision(s) 54257: [Backport #12215]
    
    * lib/uri/http.rb (URI::HTTP#initialize): [DOC] fix example,
      missing mandatory arguments.  [ruby-core:74540] [Bug #12215]

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/lib/uri/http.rb
    branches/ruby_2_2/version.h
Index: ruby_2_2/lib/uri/http.rb
===================================================================
--- ruby_2_2/lib/uri/http.rb	(revision 54426)
+++ ruby_2_2/lib/uri/http.rb	(revision 54427)
@@ -62,6 +62,7 @@ module URI https://github.com/ruby/ruby/blob/trunk/ruby_2_2/lib/uri/http.rb#L62
       return super(tmp)
     end
 
+=begin
     #
     # == Description
     #
@@ -74,8 +75,8 @@ module URI https://github.com/ruby/ruby/blob/trunk/ruby_2_2/lib/uri/http.rb#L75
     #
     # Example:
     #
-    #     uri = URI::HTTP.new('http', nil, "www.example.com", nil, "/path",
-    #       "query", 'fragment')
+    #     uri = URI::HTTP.new("http", nil, "www.example.com", nil, nil,
+    #                         "/path", nil, "query", "fragment")
     #
     #
     # See also URI::Generic.new
@@ -83,6 +84,7 @@ module URI https://github.com/ruby/ruby/blob/trunk/ruby_2_2/lib/uri/http.rb#L84
     def initialize(*arg)
       super(*arg)
     end
+=end
 
     #
     # == Description
Index: ruby_2_2/ChangeLog
===================================================================
--- ruby_2_2/ChangeLog	(revision 54426)
+++ ruby_2_2/ChangeLog	(revision 54427)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L1
+Wed Mar 30 05:13:25 2016  Nobuyoshi Nakada  <nobu@r...>
+
+	* lib/uri/http.rb (URI::HTTP#initialize): [DOC] fix example,
+	  missing mandatory arguments.  [ruby-core:74540] [Bug #12215]
+
 Tue Mar 29 02:22:35 2016  Martin Duerst  <duerst@i...>
 
 	* lib/uri/mailto.rb: raising URI::InvalidComponentError instead
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 54426)
+++ ruby_2_2/version.h	(revision 54427)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #define RUBY_VERSION "2.2.5"
-#define RUBY_RELEASE_DATE "2016-03-29"
-#define RUBY_PATCHLEVEL 285
+#define RUBY_RELEASE_DATE "2016-03-30"
+#define RUBY_PATCHLEVEL 286
 
 #define RUBY_RELEASE_YEAR 2016
 #define RUBY_RELEASE_MONTH 3
-#define RUBY_RELEASE_DAY 29
+#define RUBY_RELEASE_DAY 30
 
 #include "ruby/version.h"
 

Property changes on: ruby_2_2
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r54257


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