nagachika	2016-04-22 23:47:15 +0900 (Fri, 22 Apr 2016)

  New Revision: 54709

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=54709

  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_3/
  Modified files:
    branches/ruby_2_3/ChangeLog
    branches/ruby_2_3/doc/regexp.rdoc
    branches/ruby_2_3/version.h
Index: ruby_2_3/version.h
===================================================================
--- ruby_2_3/version.h	(revision 54708)
+++ ruby_2_3/version.h	(revision 54709)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/version.h#L1
 #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
Index: ruby_2_3/doc/regexp.rdoc
===================================================================
--- ruby_2_3/doc/regexp.rdoc	(revision 54708)
+++ ruby_2_3/doc/regexp.rdoc	(revision 54709)
@@ -568,6 +568,9 @@ Comments can be included in a non-<tt>x< https://github.com/ruby/ruby/blob/trunk/ruby_2_3/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_3/ChangeLog
===================================================================
--- ruby_2_3/ChangeLog	(revision 54708)
+++ ruby_2_3/ChangeLog	(revision 54709)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/ChangeLog#L1
+Fri Apr 22 23:47:05 2016  Nobuyoshi Nakada  <nobu@r...>
+
+	* 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@r...>
 
 	* extension.rdoc, extension.ja.rdoc: [DOC] Fix some errors.

Property changes on: ruby_2_3
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r54510


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/