summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-04-22 14:47:15 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-04-22 14:47:15 +0000
commitcce82740b5b7f814196ddd2ad78242d02ce2e11c (patch)
tree11b8b3e3685b32eade0074a0013b649caca38067 /doc
parentf3b73a8ef666fe62a3bd9a614eece0256822d437 (diff)
merge revision(s) 54510: [Backport #12256]
* doc/regexp.rdoc (comments): [DOC] terminators cannot appear in comments. [ruby-core:74838] [Bug #12256] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@54709 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'doc')
-rw-r--r--doc/regexp.rdoc3
1 files changed, 3 insertions, 0 deletions
diff --git a/doc/regexp.rdoc b/doc/regexp.rdoc
index 02a5f300ee..7384670557 100644
--- a/doc/regexp.rdoc
+++ b/doc/regexp.rdoc
@@ -568,6 +568,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