summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorknu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-02-09 03:20:56 +0000
committerknu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-02-09 03:20:56 +0000
commit7af830bd1d8406c9da08f9c5f89ca08349eda48f (patch)
treeb21e35323afdea3452884c0ec85855c7eca273bd
parent89f7a63db46f5821c629fa55dc45ade148b0e366 (diff)
r22168@crimson: knu | 2009-02-09 12:05:32 +0900
Fix a typo and remove trailing spaces. (r16810, r19345) git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@22159 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog3
-rw-r--r--lib/open-uri.rb14
2 files changed, 9 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 7ab59950fa..b96376e6af 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-Mon Feb 9 11:50:02 2009 Akinori MUSHA <knu@iDaemons.org>
+Mon Feb 9 12:02:29 2009 Akinori MUSHA <knu@iDaemons.org>
* lib/open-uri.rb: add :read_timeout option.
[ruby-core:4848] (r9166)
@@ -19,6 +19,7 @@ Mon Feb 9 11:50:02 2009 Akinori MUSHA <knu@iDaemons.org>
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@fsij.org>
diff --git a/lib/open-uri.rb b/lib/open-uri.rb
index 3132cd5593..2f2cf5f957 100644
--- a/lib/open-uri.rb
+++ b/lib/open-uri.rb
@@ -518,7 +518,7 @@ module OpenURI
# :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 @@ module OpenURI
# 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 @@ module OpenURI
#
# 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 @@ module OpenURI
# [: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 @@ module OpenURI
# :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)