merge revision(s) 54257: [Backport #12215]

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


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@54427 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 12 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 8f43f3b261..add3f1914d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Mar 30 05:13:25 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* 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@it.aoyama.ac.jp>
 
 	* lib/uri/mailto.rb: raising URI::InvalidComponentError instead
diff --git a/lib/uri/http.rb b/lib/uri/http.rb
index dc47613cdf..56d29f3432 100644
--- a/lib/uri/http.rb
+++ b/lib/uri/http.rb
@@ -62,6 +62,7 @@ module URI
       return super(tmp)
     end
 
+=begin
     #
     # == Description
     #
@@ -74,8 +75,8 @@ module URI
     #
     # 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
     def initialize(*arg)
       super(*arg)
     end
+=end
 
     #
     # == Description
diff --git a/version.h b/version.h
index a74641e3c7..b8fd0bf16b 100644
--- a/version.h
+++ b/version.h
@@ -1,10 +1,10 @@
 #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"