summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--ext/bigdecimal/lib/bigdecimal/math.rb1
-rw-r--r--string.c2
3 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 05bb688..d3b2062 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Mon Mar 5 11:51:48 2012 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * ext/bigdecimal/lib/bigdecimal/math.rb: remove description about
+ BigMath#log. patched by Sho Hashimoto [ruby-dev:45307] [Bug #6112]
+
+ * string.c (str_byteslice): fix typo.
+
Sun Mar 4 23:21:10 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
* parse.y (parser_tokadd_string): regexp engine doesn't need
diff --git a/ext/bigdecimal/lib/bigdecimal/math.rb b/ext/bigdecimal/lib/bigdecimal/math.rb
index 03c59bf..16cf9c8 100644
--- a/ext/bigdecimal/lib/bigdecimal/math.rb
+++ b/ext/bigdecimal/lib/bigdecimal/math.rb
@@ -7,7 +7,6 @@ require 'bigdecimal'
# sin (x, prec)
# cos (x, prec)
# atan(x, prec) Note: |x|<1, x=0.9999 may not converge.
-# log (x, prec)
# PI (prec)
# E (prec) == exp(1.0,prec)
#
diff --git a/string.c b/string.c
index d53c3b4..dd4e367 100644
--- a/string.c
+++ b/string.c
@@ -4111,7 +4111,7 @@ str_byte_aref(VALUE str, VALUE indx)
* "hello".byteslice(-1) #=> "o"
* "hello".byteslice(1, 2) #=> "el"
* "\x80\u3042".byteslice(1, 3) #=> "\u3042"
- * "\x03\u3042\xff".byteslice(1..3) #=> "\u3942"
+ * "\x03\u3042\xff".byteslice(1..3) #=> "\u3042"
*/
static VALUE