summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-02-15 16:01:02 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-02-15 16:01:02 +0000
commit099f6676a1f896b1ab0eda1ba9cf3534952fe7d0 (patch)
treea99fda1af5dac0382ba429a4418b6a8f27121c5e /lib
parentc386c3a2a9eff65a282ccde2e7ecd2c8c3c67c14 (diff)
merge revision(s) r44878,r44879: [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] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@44985 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r--lib/open-uri.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/open-uri.rb b/lib/open-uri.rb
index 760c886b07..62e2669d66 100644
--- a/lib/open-uri.rb
+++ b/lib/open-uri.rb
@@ -519,8 +519,9 @@ module OpenURI
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']