aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--doc/regexp.rdoc2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 478658a1c6..0330d09acd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Jul 20 22:33:13 2013 Zachary Scott <e@zzak.io>
+
+ * doc/regexp.rdoc: [DOC] Fix typo in example [Fixes GH-365]
+ Patch by Juanito Fatas https://github.com/ruby/ruby/pull/365
+
Sat Jul 20 17:46:03 2013 NARUSE, Yui <naruse@ruby-lang.org>
* string.c (rb_str_succ): add missing case NEIGHBOR_WRAPPED.
diff --git a/doc/regexp.rdoc b/doc/regexp.rdoc
index 1c68533a8d..9263e229d8 100644
--- a/doc/regexp.rdoc
+++ b/doc/regexp.rdoc
@@ -611,7 +611,7 @@ The following patterns match instantly as you would expect:
/(b|a)/ =~ s #=> 0
/(b|a+)/ =~ s #=> 0
- /(b|a+)*\/ =~ s #=> 0
+ /(b|a+)*/ =~ s #=> 0
However, the following pattern takes appreciably longer: