merge revision(s) 53947,53948: [Backport #12111]

	* doc/extension.ja.rdoc: removed rendering error caused by editor specific
	  configuration on http://docs.ruby-lang.org/en/trunk/extension_rdoc.html .
	  [Bug #12111][ruby-core:73990]

	* doc/extension.rdoc, doc/extension.ja.rdoc: add editor local
	  variables, with commenting out by :enddoc: directives which are
	  just ignored unless code object mode.  [Bug #12111]


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

4 files changed, 21 insertions, 13 deletions

diff --git a/ChangeLog b/ChangeLog
index aadfa9f5d1..93c2536e92 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+Wed Mar 30 00:00:47 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* doc/extension.rdoc, doc/extension.ja.rdoc: add editor local
+	  variables, with commenting out by :enddoc: directives which are
+	  just ignored unless code object mode.  [Bug #12111]
+
+Wed Mar 30 00:00:47 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
+
+	* doc/extension.ja.rdoc: removed rendering error caused by editor specific
+	  configuration on http://docs.ruby-lang.org/en/trunk/extension_rdoc.html .
+	  [Bug #12111][ruby-core:73990]
+
 Tue Mar 29 23:54:31 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* object.c (rb_mod_const_get): make error message at uninterned
diff --git a/doc/extension.ja.rdoc b/doc/extension.ja.rdoc
index 7cec8c77a7..bdf80c7a90 100644
--- a/doc/extension.ja.rdoc
+++ b/doc/extension.ja.rdoc
@@ -1789,8 +1789,6 @@ rb_ary_store() などの，適切な API 関数を利用するようにして下
 そのほか，対応についての詳細は README.EXT の「Appendix D. Generational
 GC」を参照して下さい．
 
-/*
- * Local variables:
- * fill-column: 60
- * end:
- */
+:enddoc: Local variables:
+:enddoc: fill-column: 60
+:enddoc: end:
diff --git a/doc/extension.rdoc b/doc/extension.rdoc
index f60e97f779..73197a990b 100644
--- a/doc/extension.rdoc
+++ b/doc/extension.rdoc
@@ -1822,8 +1822,6 @@ keyword in C.  RB_GC_GUARD has the following advantages:
    systems/compilers without those without negatively affecting other
    systems.
 
-/*
- * Local variables:
- * fill-column: 70
- * end:
- */
+:enddoc: Local variables:
+:enddoc: fill-column: 70
+:enddoc: end:
diff --git a/version.h b/version.h
index d6088e06cc..5a2767b49a 100644
--- a/version.h
+++ b/version.h
@@ -1,10 +1,10 @@
 #define RUBY_VERSION "2.3.0"
-#define RUBY_RELEASE_DATE "2016-03-29"
-#define RUBY_PATCHLEVEL 57
+#define RUBY_RELEASE_DATE "2016-03-30"
+#define RUBY_PATCHLEVEL 58
 
 #define RUBY_RELEASE_YEAR 2016
 #define RUBY_RELEASE_MONTH 3
-#define RUBY_RELEASE_DAY 29
+#define RUBY_RELEASE_DAY 30
 
 #include "ruby/version.h"