summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--string.c2
-rw-r--r--version.h6
3 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 8c182699be..b39f736bf7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Oct 6 23:14:54 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * string.c (rb_str_to_i): update RDoc since base can be any value
+ between 2 and 36. [ruby-talk:272879]
+
Fri Oct 5 15:44:50 2007 Akinori MUSHA <knu@iDaemons.org>
* lib/shellwords.rb: Add shellescape() and shelljoin().
diff --git a/string.c b/string.c
index cc27550ebe..55a888b2d1 100644
--- a/string.c
+++ b/string.c
@@ -2475,7 +2475,7 @@ rb_str_include(str, arg)
* str.to_i(base=10) => integer
*
* Returns the result of interpreting leading characters in <i>str</i> as an
- * integer base <i>base</i> (2, 8, 10, or 16). Extraneous characters past the
+ * integer base <i>base</i> (between 2 and 36). Extraneous characters past the
* end of a valid number are ignored. If there is not a valid number at the
* start of <i>str</i>, <code>0</code> is returned. This method never raises an
* exception.
diff --git a/version.h b/version.h
index a8bb936976..23d6f95ae8 100644
--- a/version.h
+++ b/version.h
@@ -1,7 +1,7 @@
#define RUBY_VERSION "1.8.6"
-#define RUBY_RELEASE_DATE "2007-10-05"
+#define RUBY_RELEASE_DATE "2007-10-06"
#define RUBY_VERSION_CODE 186
-#define RUBY_RELEASE_CODE 20071005
+#define RUBY_RELEASE_CODE 20071006
#define RUBY_PATCHLEVEL 5000
#define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
#define RUBY_VERSION_TEENY 6
#define RUBY_RELEASE_YEAR 2007
#define RUBY_RELEASE_MONTH 10
-#define RUBY_RELEASE_DAY 5
+#define RUBY_RELEASE_DAY 6
#ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[];