aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--doc/regexp.rdoc3
2 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 81b1421458..3e908c0be4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Apr 7 19:04:03 2016 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * doc/regexp.rdoc (comments): [DOC] terminators cannot appear in
+ comments. [ruby-core:74838] [Bug #12256]
+
Thu Apr 7 11:24:14 2016 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/tk/tkutil/tkutil.c (cbsubst_initialize): fix out-of-bound
diff --git a/doc/regexp.rdoc b/doc/regexp.rdoc
index 4722f2e7f5..49fce51a8d 100644
--- a/doc/regexp.rdoc
+++ b/doc/regexp.rdoc
@@ -580,6 +580,9 @@ Comments can be included in a non-<tt>x</tt> pattern with the
<tt>(?#</tt><i>comment</i><tt>)</tt> construct, where <i>comment</i> is
arbitrary text ignored by the regexp engine.
+Comments in regexp literals cannot include unescaped terminator
+characters.
+
== Encoding
Regular expressions are assumed to use the source encoding. This can be