ruby-changes:42623
From: usa <ko1@a...>
Date: Fri, 22 Apr 2016 17:38:10 +0900 (JST)
Subject: [ruby-changes:42623] usa:r54697 (ruby_2_2): merge revision(s) 54510: [Backport #12256]
usa 2016-04-22 18:34:47 +0900 (Fri, 22 Apr 2016) New Revision: 54697 https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=54697 Log: merge revision(s) 54510: [Backport #12256] * doc/regexp.rdoc (comments): [DOC] terminators cannot appear in comments. [ruby-core:74838] [Bug #12256] Modified directories: branches/ruby_2_2/ Modified files: branches/ruby_2_2/ChangeLog branches/ruby_2_2/doc/regexp.rdoc branches/ruby_2_2/version.h Index: ruby_2_2/doc/regexp.rdoc =================================================================== --- ruby_2_2/doc/regexp.rdoc (revision 54696) +++ ruby_2_2/doc/regexp.rdoc (revision 54697) @@ -568,6 +568,9 @@ Comments can be included in a non-<tt>x< https://github.com/ruby/ruby/blob/trunk/ruby_2_2/doc/regexp.rdoc#L568 <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 Index: ruby_2_2/version.h =================================================================== --- ruby_2_2/version.h (revision 54696) +++ ruby_2_2/version.h (revision 54697) @@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1 #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 Index: ruby_2_2/ChangeLog =================================================================== --- ruby_2_2/ChangeLog (revision 54696) +++ ruby_2_2/ChangeLog (revision 54697) @@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L1 +Fri Apr 22 18:34:31 2016 Nobuyoshi Nakada <nobu@r...> + + * doc/regexp.rdoc (comments): [DOC] terminators cannot appear in + comments. [ruby-core:74838] [Bug #12256] + Fri Apr 22 18:30:50 2016 NAKAMURA Usaku <usa@r...> * extension.rdoc, extension.ja.rdoc: [DOC] Fix some errors. Property changes on: ruby_2_2 ___________________________________________________________________ Modified: svn:mergeinfo Merged /trunk:r54510 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/