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

unak · unak · commit 1a5d5856f5bf · 2016-03-29T12:09:08.000Z
* lib/uri/http.rb (URI::HTTP#initialize): [DOC] fix example, missing mandatory arguments. [ruby-core:74540] [Bug ruby#12215] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@54395 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Mar 29 21:09:02 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 21:07:30 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* thread_pthread.c (reserve_stack): fix reserving position where
diff --git a/lib/uri/http.rb b/lib/uri/http.rb
@@ -62,6 +62,7 @@ def self.build(args)
       return super(tmp)
     end
 
+=begin
     #
     # == Description
     #
@@ -74,15 +75,16 @@ def self.build(args)
     #
     # 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
     #
     def initialize(*arg)
       super(*arg)
     end
+=end
 
     #
     # == Description
diff --git a/version.h b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "2.1.9"
 #define RUBY_RELEASE_DATE "2016-03-29"
-#define RUBY_PATCHLEVEL 487
+#define RUBY_PATCHLEVEL 488
 
 #define RUBY_RELEASE_YEAR 2016
 #define RUBY_RELEASE_MONTH 3

Original file line number	Diff line number	Diff line change
`@@ -62,6 +62,7 @@ def self.build(args)`
`62`	`62`	`return super(tmp)`
`63`	`63`	`end`
`64`	`64`
	`65`	`+=begin`
`65`	`66`	`#`
`66`	`67`	`# == Description`
`67`	`68`	`#`
`@@ -74,15 +75,16 @@ def self.build(args)`
`74`	`75`	`#`
`75`	`76`	`# Example:`
`76`	`77`	`#`
`77`		`- # uri = URI::HTTP.new('http', nil, "www.example.com", nil, "/path",`
`78`		`- # "query", 'fragment')`
	`78`	`+ # uri = URI::HTTP.new("http", nil, "www.example.com", nil, nil,`
	`79`	`+ # "/path", nil, "query", "fragment")`
`79`	`80`	`#`
`80`	`81`	`#`
`81`	`82`	`# See also URI::Generic.new`
`82`	`83`	`#`
`83`	`84`	`def initialize(*arg)`
`84`	`85`	`super(*arg)`
`85`	`86`	`end`
	`87`	`+=end`
`86`	`88`
`87`	`89`	`#`
`88`	`90`	`# == Description`