naruse	2014-02-22 15:06:55 +0900 (Sat, 22 Feb 2014)

  New Revision: 45116

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=45116

  Log:
    merge revision(s) 44878,44879: [Backport #9483]
    
    * 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]
    
    * lib/open-uri.rb: [DOC] use lower case version of core classes, same
      as commit r44878, based on patch by Jonathan Jackson [Bug #9483]

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/ext/ripper/lib/ripper/lexer.rb
    branches/ruby_2_1/lib/open-uri.rb
    branches/ruby_2_1/version.h
Index: ruby_2_1/ChangeLog
===================================================================
--- ruby_2_1/ChangeLog	(revision 45115)
+++ ruby_2_1/ChangeLog	(revision 45116)
@@ -1,3 +1,14 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1
+Sat Feb 22 15:06:32 2014  Zachary Scott  <e@z...>
+
+	* 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@z...>
+
+	* 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@g...>
 
 	* variable.c: adding extra example in docs.
Index: ruby_2_1/lib/open-uri.rb
===================================================================
--- ruby_2_1/lib/open-uri.rb	(revision 45115)
+++ ruby_2_1/lib/open-uri.rb	(revision 45116)
@@ -534,8 +534,9 @@ module OpenURI https://github.com/ruby/ruby/blob/trunk/ruby_2_1/lib/open-uri.rb#L534
       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']
Index: ruby_2_1/ext/ripper/lib/ripper/lexer.rb
===================================================================
--- ruby_2_1/ext/ripper/lib/ripper/lexer.rb	(revision 45115)
+++ ruby_2_1/ext/ripper/lib/ripper/lexer.rb	(revision 45116)
@@ -12,7 +12,7 @@ require 'ripper/core' https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ext/ripper/lib/ripper/lexer.rb#L12
 
 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 @@ class Ripper https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ext/ripper/lib/ripper/lexer.rb#L21
     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'
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 45115)
+++ ruby_2_1/version.h	(revision 45116)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #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

Property changes on: ruby_2_1
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r44878-44879


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