summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordrbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-05-29 21:20:45 +0000
committerdrbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-05-29 21:20:45 +0000
commit9e84f837365c65afc21071fb431dc4d17154499b (patch)
treec0c2e9a4e58958603bbedf329a7b1b6089be9d8e
parent39a3d1793b67df8ef1aa48e2f813dcac13814544 (diff)
* error.c (exc_set_backtrace): Updated documentation to indicate
set_backtrace allows a string as well as an array of strings. [ruby-trunk - Bug #6501] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35837 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--error.c8
2 files changed, 10 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 1b12c24f0ac..8c0bf9695f6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed May 30 06:20:29 2012 Eric Hodel <drbrain@segment7.net>
+
+ * error.c (exc_set_backtrace): Updated documentation to indicate
+ set_backtrace allows a string as well as an array of strings.
+ [ruby-trunk - Bug #6501]
+
Tue May 29 17:28:20 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
* strftime.c (rb_strftime_with_timespec): support GNU extension triple
diff --git a/error.c b/error.c
index 1dce70c01b4..eabc3c9eb36 100644
--- a/error.c
+++ b/error.c
@@ -709,11 +709,11 @@ rb_check_backtrace(VALUE bt)
/*
* call-seq:
- * exc.set_backtrace(array) -> array
+ * exc.set_backtrace(backtrace) -> array
*
- * Sets the backtrace information associated with <i>exc</i>. The
- * argument must be an array of <code>String</code> objects in the
- * format described in <code>Exception#backtrace</code>.
+ * Sets the backtrace information associated with +exc+. The +backtrace+ must
+ * be an array of String objects or a single String in the format described
+ * in Exception#backtrace.
*
*/