merge revision(s) 47820: [Backport #10330]

	* error.c: update exception tree. [DOC]
	  reported by @hemge via twitter.


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

3 files changed, 13 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 5008c79dc4..38579c54c9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Oct 15 16:05:47 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* error.c: update exception tree. [DOC]
+	  reported by @hemge via twitter.
+
 Wed Oct 15 15:57:48 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* win32/Makefile.sub (VCSUP): nothing to do if this worktree is not
diff --git a/error.c b/error.c
index d05b2eb1cf..3988e5645e 100644
--- a/error.c
+++ b/error.c
@@ -1673,14 +1673,18 @@ syserr_eqq(VALUE self, VALUE exc)
  *    * LoadError
  *    * NotImplementedError
  *    * SyntaxError
+ *  * SecurityError
  *  * SignalException
  *    * Interrupt
  *  * StandardError -- default for +rescue+
  *    * ArgumentError
- *    * IndexError
- *      * StopIteration
+ *    * EncodingError
+ *    * FiberError
  *    * IOError
  *      * EOFError
+ *    * IndexError
+ *      * KeyError
+ *      * StopIteration
  *    * LocalJumpError
  *    * NameError
  *      * NoMethodError
@@ -1688,14 +1692,13 @@ syserr_eqq(VALUE self, VALUE exc)
  *      * FloatDomainError
  *    * RegexpError
  *    * RuntimeError -- default for +raise+
- *    * SecurityError
  *    * SystemCallError
  *      * Errno::*
- *    * SystemStackError
  *    * ThreadError
  *    * TypeError
  *    * ZeroDivisionError
  *  * SystemExit
+ *  * SystemStackError
  *  * fatal -- impossible to rescue
  */
 
diff --git a/version.h b/version.h
index bb1418ae03..08d77b7771 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "2.0.0"
 #define RUBY_RELEASE_DATE "2014-10-15"
-#define RUBY_PATCHLEVEL 579
+#define RUBY_PATCHLEVEL 580
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 10