aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-02-01 00:50:17 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-02-01 00:50:17 +0000
commit01d54bc2c7f9baaa86b5444e799f9c00cd9cabe7 (patch)
treee3b7cea7b3aef6e0cdebc326ecfbe1044dbc8fbd
parent25cd6d14e43ad1835adb73f83c8bc71f35223b80 (diff)
downloadruby-01d54bc2c7f9baaa86b5444e799f9c00cd9cabe7.tar.gz
* doc/re.rdoc (Repetition): fix typo. reported by Ori Avtalion
and patched by Zachary Scott. [Bug #5947] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34411 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--doc/re.rdoc2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 2a74b42a33..5a7155f028 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Feb 1 09:50:10 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * doc/re.rdoc (Repetition): fix typo. reported by Ori Avtalion
+ and patched by Zachary Scott. [Bug #5947]
+
Wed Feb 1 06:38:54 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
* io.c (argf_close): skip stdin, which should be readable again.
diff --git a/doc/re.rdoc b/doc/re.rdoc
index 602775d95d..4e943571a8 100644
--- a/doc/re.rdoc
+++ b/doc/re.rdoc
@@ -179,7 +179,7 @@ contrast, <i>lazy</i> matching makes the minimal amount of matches
necessary for overall success. A greedy metacharacter can be made lazy by
following it with <tt>?</tt>.
- # Both patterns below match the string. The fist uses a greedy
+ # Both patterns below match the string. The first uses a greedy
# quantifier so '.+' matches '<a><b>'; the second uses a lazy
# quantifier so '.+?' matches '<a>'.
/<.+>/.match("<a><b>") #=> #<MatchData "<a><b>">