summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorayumin <ayumin@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-02-07 11:13:40 +0000
committerayumin <ayumin@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-02-07 11:13:40 +0000
commit89a2a1050863dfa7b3adbf39db3a92b8320deaa6 (patch)
tree7e086e2a74652f91aad12c42151fc26a6c48a3ff
parent4a43f9203b5a9005108ecc59e01737597072433c (diff)
* error.c (exc_inspect): Fix typo. patch from Trent Ogren
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34462 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--error.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index d874f7b4cd..547d3a7c7a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Feb 7 20:08:12 2012 Ayumu AIZAWA <ayumu.aizawa@gmail.com>
+
+ * error.c (exc_inspect): Fix typo. patch from Trent Ogren
+ via https://github.com/ruby/ruby/pull/90
+
Tue Feb 7 19:37:35 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
* st.c: refactor packed entries using structs.
diff --git a/error.c b/error.c
index 03e22bfa3a..f83cf3d5cf 100644
--- a/error.c
+++ b/error.c
@@ -613,7 +613,7 @@ exc_message(VALUE exc)
* call-seq:
* exception.inspect -> string
*
- * Return this exception's class name an message
+ * Return this exception's class name and message
*/
static VALUE