diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-05-29 05:36:25 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-05-29 05:36:25 +0000 |
commit | bbf36fbb2f907b71c9ba9766e519b7b19801efd9 (patch) | |
tree | 0d9af4b636b8888a746f99b178483a978c7fecb3 | |
parent | 80cb3c3ebd8a074f45a49ad7268a1f841417ce96 (diff) |
merges r27994 from trunk into ruby_1_9_2.
--
* error.c: fix wrong exception class name in rdoc.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28066 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | error.c | 4 |
2 files changed, 7 insertions, 3 deletions
@@ -1,3 +1,7 @@ +Mon May 24 23:04:41 2010 Tanaka Akira <akr@fsij.org> + + * error.c: fix wrong exception class name in rdoc. + Sat May 29 13:55:22 2010 NARUSE, Yui <naruse@ruby-lang.org> * encoding.c (rb_filesystem_encindex): avoid infinite require @@ -915,7 +919,7 @@ Sat May 1 00:14:47 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> Fri Apr 30 22:46:27 2010 Marc-Andre Lafortune <ruby-core@marc-andre.ca> - * math.c: Math::DomainError < StandardException [ruby-core:29855] + * math.c: Math::DomainError < StandardError [ruby-core:29855] Fri Apr 30 21:40:36 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> @@ -1235,7 +1235,7 @@ syserr_eqq(VALUE self, VALUE exc) * ScriptError is the superclass for errors raised when a script * can not be executed because of a +LoadError+, * +NotImplementedError+ or a +SyntaxError+. Note these type of - * +ScriptErrors+ are not +StandardExceptions+ and will not be + * +ScriptErrors+ are not +StandardError+ and will not be * rescued unless it is specified explicitly (or its ancestor * +Exception+). */ @@ -1385,7 +1385,7 @@ syserr_eqq(VALUE self, VALUE exc) * objects carry information about the exception---its type (the * exception's class name), an optional descriptive string, and * optional traceback information. Programs may subclass - * <code>Exception</code>, or more typically <code>StandardException</code> + * <code>Exception</code>, or more typically <code>StandardError</code> * to provide custom classes and add additional information. */ |