merge revision(s) 44878,44879: [Backport ruby#9483]

nurse · nurse · commit 8f7b41024e70 · 2014-02-22T06:06:55.000Z
* ext/ripper/lib/ripper/lexer.rb: [DOC] use lower case version of core classes when referring to return value, since we aren't directly talking about the class. Patch by Jonathan Jackson [Bug ruby#9483] * lib/open-uri.rb: [DOC] use lower case version of core classes, same as commit r44878, based on patch by Jonathan Jackson [Bug ruby#9483] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@45116 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,14 @@
+Sat Feb 22 15:06:32 2014  Zachary Scott  <e@zzak.io>
+
+	* lib/open-uri.rb: [DOC] use lower case version of core classes, same
+	  as commit r44878, based on patch by Jonathan Jackson [Bug #9483]
+
+Sat Feb 22 15:06:32 2014  Zachary Scott  <e@zzak.io>
+
+	* ext/ripper/lib/ripper/lexer.rb: [DOC] use lower case version of core
+	  classes when referring to return value, since we aren't directly
+	  talking about the class. Patch by Jonathan Jackson [Bug #9483]
+
 Sat Feb 22 15:03:05 2014  Ayumu AIZAWA  <ayumu.aizawa@gmail.com>
 
 	* variable.c: adding extra example in docs.
diff --git a/ext/ripper/lib/ripper/lexer.rb b/ext/ripper/lib/ripper/lexer.rb
@@ -12,7 +12,7 @@
 
 class Ripper
 
-  # Tokenizes the Ruby program and returns an Array of String.
+  # Tokenizes the Ruby program and returns an array of strings.
   #
   #   p Ripper.tokenize("def m(a) nil end")
   #      # => ["def", " ", "m", "(", "a", ")", " ", "nil", " ", "end"]
@@ -21,7 +21,7 @@ def Ripper.tokenize(src, filename = '-', lineno = 1)
     Lexer.new(src, filename, lineno).tokenize
   end
 
-  # Tokenizes the Ruby program and returns an Array of an Array,
+  # Tokenizes the Ruby program and returns an array of an array,
   # which is formatted like <code>[[lineno, column], type, token]</code>.
   #
   #   require 'ripper'
diff --git a/lib/open-uri.rb b/lib/open-uri.rb
@@ -534,8 +534,9 @@ def charset
       end
     end
 
-    # returns a list of encodings in Content-Encoding field
-    # as an Array of String.
+    # Returns a list of encodings in Content-Encoding field as an array of
+    # strings.
+    #
     # The encodings are downcased for canonicalization.
     def content_encoding
       vs = @metas['content-encoding']
diff --git a/version.h b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "2.1.1"
 #define RUBY_RELEASE_DATE "2014-02-22"
-#define RUBY_PATCHLEVEL 60
+#define RUBY_PATCHLEVEL 61
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 2

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`
`13`	`13`	`class Ripper`
`14`	`14`
`15`		`- # Tokenizes the Ruby program and returns an Array of String.`
	`15`	`+ # Tokenizes the Ruby program and returns an array of strings.`
`16`	`16`	`#`
`17`	`17`	`# p Ripper.tokenize("def m(a) nil end")`
`18`	`18`	`# # => ["def", " ", "m", "(", "a", ")", " ", "nil", " ", "end"]`
`@@ -21,7 +21,7 @@ def Ripper.tokenize(src, filename = '-', lineno = 1)`
`21`	`21`	`Lexer.new(src, filename, lineno).tokenize`
`22`	`22`	`end`
`23`	`23`
`24`		`- # Tokenizes the Ruby program and returns an Array of an Array,`
	`24`	`+ # Tokenizes the Ruby program and returns an array of an array,`
`25`	`25`	`# which is formatted like <code>[[lineno, column], type, token]</code>.`
`26`	`26`	`#`
`27`	`27`	`# require 'ripper'`