summaryrefslogtreecommitdiff
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
commitaea7069f79236a78c9dc614a8300502d3e855fa4 (patch)
tree52adde5f9d827715f7d05eaea6667cd67c1873bb
parentea6101f8ddb063d9c0f16f1e7a4b7a459e4fb77c (diff)
* 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/branches/ruby_1_9_3@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 8c47ba9334..352ce0a9be 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]
+
Tue Jan 24 11:38:05 2012 NARUSE, Yui <naruse@ruby-lang.org>
* lib/uri/common.rb (URI.encode_www_form_component): initialize on
diff --git a/doc/re.rdoc b/doc/re.rdoc
index a52d1a6956..d629a4a79e 100644
--- a/doc/re.rdoc
+++ b/doc/re.rdoc
@@ -153,7 +153,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>">