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


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@54393 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 7 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 434ced135e..807d74222c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Mar 29 21:01:07 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
+
+	* 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@ruby-lang.org>
 
 	* lib/ostruct.rb (freeze): define deferred accessors before
diff --git a/doc/syntax/calling_methods.rdoc b/doc/syntax/calling_methods.rdoc
index f1ebf186f7..ec86ef05ee 100644
--- a/doc/syntax/calling_methods.rdoc
+++ b/doc/syntax/calling_methods.rdoc
@@ -27,7 +27,7 @@ This sends the +my_method+ message to +my_object+.  Any object can be a
 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.
 
diff --git a/version.h b/version.h
index 4254034408..0a23c60cd8 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #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