From 3a2effbd6bebfa01abbbf8544543a643d142801c Mon Sep 17 00:00:00 2001 From: usa Date: Fri, 22 Apr 2016 09:34:47 +0000 Subject: [PATCH] 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 --- ChangeLog | 5 +++++ doc/regexp.rdoc | 3 +++ version.h | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 2f31ac0264..a3dcce8a84 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Apr 22 18:34:31 2016 Nobuyoshi Nakada + + * doc/regexp.rdoc (comments): [DOC] terminators cannot appear in + comments. [ruby-core:74838] [Bug #12256] + Fri Apr 22 18:30:50 2016 NAKAMURA Usaku * extension.rdoc, extension.ja.rdoc: [DOC] Fix some errors. 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-x pattern with the (?#comment) construct, where comment 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 diff --git a/version.h b/version.h index e9e941843e..8f73dd0d82 100644 --- a/version.h +++ b/version.h @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.2.5" #define RUBY_RELEASE_DATE "2016-04-22" -#define RUBY_PATCHLEVEL 311 +#define RUBY_PATCHLEVEL 312 #define RUBY_RELEASE_YEAR 2016 #define RUBY_RELEASE_MONTH 4