diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-04-22 14:47:15 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-04-22 14:47:15 +0000 |
commit | cce82740b5b7f814196ddd2ad78242d02ce2e11c (patch) | |
tree | 11b8b3e3685b32eade0074a0013b649caca38067 | |
parent | f3b73a8ef666fe62a3bd9a614eece0256822d437 (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
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | doc/regexp.rdoc | 3 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 9 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Fri Apr 22 23:47:05 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * doc/regexp.rdoc (comments): [DOC] terminators cannot appear in + comments. [ruby-core:74838] [Bug #12256] + Fri Apr 22 23:44:07 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> * extension.rdoc, extension.ja.rdoc: [DOC] Fix some errors. 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 @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.3.0" #define RUBY_RELEASE_DATE "2016-04-22" -#define RUBY_PATCHLEVEL 98 +#define RUBY_PATCHLEVEL 99 #define RUBY_RELEASE_YEAR 2016 #define RUBY_RELEASE_MONTH 4 |