naruse	2016-03-29 21:01:17 +0900 (Tue, 29 Mar 2016)

  New Revision: 54393

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

  Log:
    merge revision(s) 53385: [Backport #11926]
    
    * doc/syntax/calling_methods.rdoc: fix old operator for safe navigation
      operator. [ci skip][fix GH-1182] Patch by @dougo

  Modified directories:
    branches/ruby_2_3/
  Modified files:
    branches/ruby_2_3/ChangeLog
    branches/ruby_2_3/doc/syntax/calling_methods.rdoc
    branches/ruby_2_3/version.h
Index: ruby_2_3/doc/syntax/calling_methods.rdoc
===================================================================
--- ruby_2_3/doc/syntax/calling_methods.rdoc	(revision 54392)
+++ ruby_2_3/doc/syntax/calling_methods.rdoc	(revision 54393)
@@ -27,7 +27,7 @@ This sends the +my_method+ message to +m https://github.com/ruby/ruby/blob/trunk/ruby_2_3/doc/syntax/calling_methods.rdoc#L27
 receiver but depending on the method's visibility sending a message may raise a
 NoMethodError.
 
-You may use <code>.?</code> to designate a receiver, then +my_method+ is not
+You may use <code>&.</code> to designate a receiver, then +my_method+ is not
 invoked and the result is +nil+ when the receiver is +nil+.  In that case, the
 arguments of +my_method+ are not evaluated.
 
Index: ruby_2_3/ChangeLog
===================================================================
--- ruby_2_3/ChangeLog	(revision 54392)
+++ ruby_2_3/ChangeLog	(revision 54393)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/ChangeLog#L1
+Tue Mar 29 21:01:07 2016  SHIBATA Hiroshi  <hsbt@r...>
+
+	* doc/syntax/calling_methods.rdoc: fix old operator for safe navigation
+	  operator. [ci skip][fix GH-1182] Patch by @dougo
+
 Tue Mar 29 18:49:54 2016  Nobuyoshi Nakada  <nobu@r...>
 
 	* lib/ostruct.rb (freeze): define deferred accessors before
Index: ruby_2_3/version.h
===================================================================
--- ruby_2_3/version.h	(revision 54392)
+++ ruby_2_3/version.h	(revision 54393)
@@ -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-03-29"
-#define RUBY_PATCHLEVEL 45
+#define RUBY_PATCHLEVEL 46
 
 #define RUBY_RELEASE_YEAR 2016
 #define RUBY_RELEASE_MONTH 3

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


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