summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-02-24 03:43:27 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-02-24 03:43:27 +0000
commitea39ef731298fafbcedb2d0b9d56a815312207af (patch)
tree9acdb897667613ac6100067ff8a41e9d7963f0b2 /lib
parent2da14728063aa8adfb03fbfc0dfd2e7aef8f8bcb (diff)
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] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@45158 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 3241c3b27a..f0cfec94e4 100644
--- a/lib/open-uri.rb
+++ b/lib/open-uri.rb
@@ -508,8 +508,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']