knu	2009-02-09 12:20:56 +0900 (Mon, 09 Feb 2009)

  New Revision: 22159

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

  Log:
     r22168@crimson:  knu | 2009-02-09 12:05:32 +0900
     Fix a typo and remove trailing spaces. (r16810, r19345)

  Modified directories:
    branches/ruby_1_8/
  Modified files:
    branches/ruby_1_8/ChangeLog
    branches/ruby_1_8/lib/open-uri.rb

Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 22158)
+++ ruby_1_8/ChangeLog	(revision 22159)
@@ -1,4 +1,4 @@
-Mon Feb  9 11:50:02 2009  Akinori MUSHA  <knu@i...>
+Mon Feb  9 12:02:29 2009  Akinori MUSHA  <knu@i...>
 
 	* lib/open-uri.rb: add :read_timeout option.
 	  [ruby-core:4848] (r9166)
@@ -19,6 +19,7 @@
 	  tests. [ruby-dev:33336] (r15200)
 	  (OpenURI.open_http): rescue URI::InvalidURIError by URI.parse
 	  for location URI. (r15406)
+	  Fix a typo and remove trailing spaces. (r16810, r19345)
 
 Mon Feb  9 01:21:16 2009  Tanaka Akira  <akr@f...>
 
Index: ruby_1_8/lib/open-uri.rb
===================================================================
--- ruby_1_8/lib/open-uri.rb	(revision 22158)
+++ ruby_1_8/lib/open-uri.rb	(revision 22159)
@@ -518,7 +518,7 @@
     #    :proxy => true
     #    :proxy => false
     #    :proxy => nil
-    #   
+    #
     #  If :proxy option is specified, the value should be String, URI,
     #  boolean or nil.
     #  When String or URI is given, it is treated as proxy URI.
@@ -532,7 +532,7 @@
     #  Synopsis:
     #    :proxy_http_basic_authentication => ["http://proxy.foo.com:8000/", "proxy-user", "proxy-password"]
     #    :proxy_http_basic_authentication => [URI.parse("http://proxy.foo.com:8000/"), "proxy-user", "proxy-password"]
-    #   
+    #
     #  If :proxy option is specified, the value should be an Array with 3 elements.
     #  It should contain a proxy URI, a proxy user name and a proxy password.
     #  The proxy URI should be a String, an URI or nil.
@@ -540,7 +540,7 @@
     #
     #  If nil is given for the proxy URI, this option is just ignored.
     #
-    #  If :proxy and :proxy_http_basic_authentication is specified, 
+    #  If :proxy and :proxy_http_basic_authentication is specified,
     #  ArgumentError is raised.
     #
     # [:http_basic_authentication]
@@ -555,14 +555,14 @@
     # [:content_length_proc]
     #  Synopsis:
     #    :content_length_proc => lambda {|content_length| ... }
-    # 
+    #
     #  If :content_length_proc option is specified, the option value procedure
     #  is called before actual transfer is started.
     #  It takes one argument which is expected content length in bytes.
-    # 
+    #
     #  If two or more transfer is done by HTTP redirection, the procedure
     #  is called only one for a last transfer.
-    # 
+    #
     #  When expected content length is unknown, the procedure is called with
     #  nil.
     #  It is happen when HTTP response has no Content-Length header.
@@ -633,7 +633,7 @@
     # :redirect=>false is used to disable HTTP redirects at all.
     # OpenURI::HTTPRedirect exception raised on redirection.
     # It is true by default.
-    # The true means redirectoins between http and ftp is permitted.
+    # The true means redirections between http and ftp is permitted.
     #
     def open(*rest, &block)
       OpenURI.open_uri(self, *rest, &block)

Property changes on: ruby_1_8
___________________________________________________________________
Name: svk:merge
   - 050cfa88-b445-4b2e-b226-957b86f2c464:/local/ruby/1.8:22165
b2dd03c8-39d4-4d8f-98ff-823fe69b080e:/trunk:5286
   + 050cfa88-b445-4b2e-b226-957b86f2c464:/local/ruby/1.8:22168
b2dd03c8-39d4-4d8f-98ff-823fe69b080e:/trunk:5286


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