summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzzak <zzak@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-07-27 20:34:18 +0000
committerzzak <zzak@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-07-27 20:34:18 +0000
commit37fd832f3c684951805d345ded4b362307246523 (patch)
tree7e65a497ed1eaf14ac89e617f1a01dd0ce68ca41
parent1fd840a063c554977eb948f9c13f928524e7c425 (diff)
* lib/uri/common.rb: [DOC] [Bug #10075] Clarify how URI.join arguments
are handled by RFC3986, originall reported by John Feminella. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46979 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--lib/uri/common.rb2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 0334fe5fcd4..22dbc2087bf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jul 28 05:32:06 2014 Zachary Scott <e@zzak.io>
+
+ * lib/uri/common.rb: [DOC] [Bug #10075] Clarify how URI.join arguments
+ are handled by RFC3986, originall reported by John Feminella.
+
Mon Jul 28 05:21:41 2014 Zachary Scott <e@zzak.io>
* file.c: [DOC] Clarify how File.file? handles symbolic links. Also
diff --git a/lib/uri/common.rb b/lib/uri/common.rb
index b310c4dc6c1..006b2714773 100644
--- a/lib/uri/common.rb
+++ b/lib/uri/common.rb
@@ -231,7 +231,7 @@ module URI
# == Args
#
# +str+::
- # String(s) to work with
+ # String(s) to work with, will be converted to RFC3986 URIs before merging.
#
# == Description
#