1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

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
This commit is contained in:
usa 2016-04-22 09:34:47 +00:00
parent 77e74bef16
commit 3a2effbd6b
3 changed files with 9 additions and 1 deletions

View file

@ -1,3 +1,8 @@
Fri Apr 22 18:34:31 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 18:30:50 2016 NAKAMURA Usaku <usa@ruby-lang.org>
* extension.rdoc, extension.ja.rdoc: [DOC] Fix some errors.

View file

@ -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

View file

@ -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