drbrain	2011-08-13 03:43:49 +0900 (Sat, 13 Aug 2011)

  New Revision: 32954

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

  Log:
    * backport r32953 from trunk.
    
    * lib/uri/common.rb:  Fix documentation of URI::Parser.new.  Patch by
      Steve Klabnik.  [Ruby 1.9 - Bug #5177]

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/lib/uri/common.rb

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 32953)
+++ ruby_1_9_3/ChangeLog	(revision 32954)
@@ -1,3 +1,10 @@
+Sat Aug 13 03:41:37 2011  Eric Hodel  <drbrain@s...>
+
+	* backport r32953 from trunk.
+
+	* lib/uri/common.rb:  Fix documentation of URI::Parser.new.  Patch by
+	  Steve Klabnik.  [Ruby 1.9 - Bug #5177]
+
 Sat Aug 13 02:19:57 2011  Eric Hodel  <drbrain@s...>
 
 	* backport r32950 from trunk.
Index: ruby_1_9_3/lib/uri/common.rb
===================================================================
--- ruby_1_9_3/lib/uri/common.rb	(revision 32953)
+++ ruby_1_9_3/lib/uri/common.rb	(revision 32954)
@@ -78,15 +78,15 @@
     #
     # You can use the following keys:
     #
-    #   * <tt>:ESCAPED</tt> (URI::PATTERN::ESCAPED in default)
-    #   * <tt>:UNRESERVED</tt> (URI::PATTERN::UNRESERVED in default)
-    #   * <tt>:DOMLABEL</tt> (URI::PATTERN::DOMLABEL in default)
-    #   * <tt>:TOPLABEL</tt> (URI::PATTERN::TOPLABEL in default)
-    #   * <tt>:HOSTNAME</tt> (URI::PATTERN::HOSTNAME in default)
+    #   * :ESCAPED (URI::PATTERN::ESCAPED in default)
+    #   * :UNRESERVED (URI::PATTERN::UNRESERVED in default)
+    #   * :DOMLABEL (URI::PATTERN::DOMLABEL in default)
+    #   * :TOPLABEL (URI::PATTERN::TOPLABEL in default)
+    #   * :HOSTNAME (URI::PATTERN::HOSTNAME in default)
     #
     # == Examples
     #
-    #   p = URI::Parser.new(:ESCPAED => "(?:%[a-fA-F0-9]{2}|%u[a-fA-F0-9]{4})"
+    #   p = URI::Parser.new(:ESCAPED => "(?:%[a-fA-F0-9]{2}|%u[a-fA-F0-9]{4})"
     #   u = p.parse("http://example.jp/%uABCD") #=> #<URI::HTTP:0xb78cf4f8 URL:http://example.jp/%uABCD>
     #   URI.parse(u.to_s) #=> raises URI::InvalidURIError
     #

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