aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--lib/uri/common.rb2
-rw-r--r--lib/uri/generic.rb4
3 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 7b8819759c..0b1b5976d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Nov 25 19:48:10 2013 Zachary Scott <e@zzak.io>
+
+ * lib/uri/common.rb: [DOC] typo fixes by @vipulnsward [Fixes GH-456]
+ https://github.com/ruby/ruby/pull/456
+ * lib/uri/generic.rb: [DOC] ditto.
+
Mon Nov 25 14:34:42 2013 Zachary Scott <e@zzak.io>
* ext/bigdecimal/bigdecimal.gemspec: bump BigDecimal to 1.2.3 for
diff --git a/lib/uri/common.rb b/lib/uri/common.rb
index 771be971a5..28c7933be6 100644
--- a/lib/uri/common.rb
+++ b/lib/uri/common.rb
@@ -74,7 +74,7 @@ module URI
# The constructor accepts a hash as options for parser.
# Keys of options are pattern names of URI components
# and values of options are pattern strings.
- # The constructor generetes set of regexps for parsing URIs.
+ # The constructor generates set of regexps for parsing URIs.
#
# You can use the following keys:
#
diff --git a/lib/uri/generic.rb b/lib/uri/generic.rb
index b1195fdf0b..48c9d7b9a2 100644
--- a/lib/uri/generic.rb
+++ b/lib/uri/generic.rb
@@ -552,7 +552,7 @@ module URI
protected :set_password
# returns the userinfo +ui+ as user, password
- # if properly formated as 'user:password'
+ # if properly formatted as 'user:password'
def split_userinfo(ui)
return nil, nil unless ui
user, password = ui.split(/:/, 2)
@@ -672,7 +672,7 @@ module URI
# u.hostname = "::1"
# p u.to_s #=> "http://[::1]/bar"
#
- # If the arugument seems IPv6 address,
+ # If the arguement seems IPv6 address,
# it is wrapped by brackets.
#
def hostname=(v)