summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-04-22 09:34:47 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-04-22 09:34:47 +0000
commit3a2effbd6bebfa01abbbf8544543a643d142801c (patch)
tree35586f83167cc3b2f2f2dce674019b9cb8d87c69 /doc
parent77e74bef16ef1d600b8e907603d5d89379b479ee (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_2@54697 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 810f15ce1a..8564258115 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