From 6f617028a45a00d89f9efa85fe8705eccc297355 Mon Sep 17 00:00:00 2001 From: nagachika Date: Sun, 2 Jun 2013 13:39:50 +0000 Subject: [PATCH] merge revision(s) 41026: [Backport #8242] * range.c: Fix rdoc on Range#bsearch [Bug #8242] [ruby-core:54143] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41033 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ range.c | 4 ++-- version.h | 8 ++++---- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index f1f31aca9a..c6c4605417 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Sun Jun 2 22:39:24 2013 Zachary Scott + + * range.c: Fix rdoc on Range#bsearch [Bug #8242] [ruby-core:54143] + Mon May 20 04:00:48 2013 Zachary Scott * lib/yaml.rb: YAML documentation from #8344 [Bug #8355] diff --git a/range.c b/range.c index dd94e8d747..e2e8388c43 100644 --- a/range.c +++ b/range.c @@ -512,10 +512,10 @@ is_integer_p(VALUE v) * rng.bsearch {|obj| block } -> value * * By using binary search, finds a value in range which meets the given - * condition in O(log n) where n is the size of the array. + * condition in O(log n) where n is the size of the range. * * You can use this method in two use cases: a find-minimum mode and - * a find-any mode. In either case, the elements of the array must be + * a find-any mode. In either case, the elements of the range must be * monotone (or sorted) with respect to the block. * * In find-minimum mode (this is a good choice for typical use case), diff --git a/version.h b/version.h index 50918175f0..09af43864e 100644 --- a/version.h +++ b/version.h @@ -1,10 +1,10 @@ #define RUBY_VERSION "2.0.0" -#define RUBY_RELEASE_DATE "2013-05-20" -#define RUBY_PATCHLEVEL 197 +#define RUBY_RELEASE_DATE "2013-06-02" +#define RUBY_PATCHLEVEL 198 #define RUBY_RELEASE_YEAR 2013 -#define RUBY_RELEASE_MONTH 5 -#define RUBY_RELEASE_DAY 20 +#define RUBY_RELEASE_MONTH 6 +#define RUBY_RELEASE_DAY 2 #include "ruby/version.h"