usa	2014-02-24 12:43:27 +0900 (Mon, 24 Feb 2014)

  New Revision: 45158

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

  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_1_9_3/
  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/ext/ripper/lib/ripper/lexer.rb
    branches/ruby_1_9_3/lib/open-uri.rb
    branches/ruby_1_9_3/version.h
Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 45157)
+++ ruby_1_9_3/ChangeLog	(revision 45158)
@@ -1,3 +1,14 @@ https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/ChangeLog#L1
+Mon Feb 24 12:42:01 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]
+
+Mon Feb 24 12:42:01 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]
+
 Mon Feb 24 12:39:11 2014  Zachary Scott  <e@z...>
 
 	* ext/openssl/ossl_pkey_dh.c: Fixed typo by Sandor Szuecs [Bug #9243]
Index: ruby_1_9_3/lib/open-uri.rb
===================================================================
--- ruby_1_9_3/lib/open-uri.rb	(revision 45157)
+++ ruby_1_9_3/lib/open-uri.rb	(revision 45158)
@@ -508,8 +508,9 @@ module OpenURI https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/lib/open-uri.rb#L508
       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
       v = @meta['content-encoding']
Index: ruby_1_9_3/ext/ripper/lib/ripper/lexer.rb
===================================================================
--- ruby_1_9_3/ext/ripper/lib/ripper/lexer.rb	(revision 45157)
+++ ruby_1_9_3/ext/ripper/lib/ripper/lexer.rb	(revision 45158)
@@ -12,13 +12,17 @@ require 'ripper/core' https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/ext/ripper/lib/ripper/lexer.rb#L12
 
 class Ripper
 
-  # Tokenizes 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"]
+  #
   def Ripper.tokenize(src, filename = '-', lineno = 1)
     Lexer.new(src, filename, lineno).tokenize
   end
 
-  # Tokenizes Ruby program and returns an Array of Array,
-  # which is formatted like [[lineno, column], type, token].
+  # Tokenizes the Ruby program and returns an array of an array,
+  # which is formatted like <code>[[lineno, column], type, token]</code>.
   #
   #   require 'ripper'
   #   require 'pp'
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 45157)
+++ ruby_1_9_3/version.h	(revision 45158)
@@ -1,5 +1,5 @@ https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/version.h#L1
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 544
+#define RUBY_PATCHLEVEL 545
 
 #define RUBY_RELEASE_DATE "2014-02-24"
 #define RUBY_RELEASE_YEAR 2014

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


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