nagachika	2013-06-02 22:39:50 +0900 (Sun, 02 Jun 2013)

  New Revision: 41033

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=41033

  Log:
    merge revision(s) 41026: [Backport #8242]
    
    * range.c: Fix rdoc on Range#bsearch [Bug #8242] [ruby-core:54143]

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/range.c
    branches/ruby_2_0_0/version.h

Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 41032)
+++ ruby_2_0_0/ChangeLog	(revision 41033)
@@ -1,3 +1,7 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Sun Jun  2 22:39:24 2013  Zachary Scott  <zachary@z...>
+
+	* range.c: Fix rdoc on Range#bsearch [Bug #8242] [ruby-core:54143]
+
 Mon May 20 04:00:48 2013  Zachary Scott  <zachary@z...>
 
 	* lib/yaml.rb: YAML documentation from #8344 [Bug #8355]
Index: ruby_2_0_0/range.c
===================================================================
--- ruby_2_0_0/range.c	(revision 41032)
+++ ruby_2_0_0/range.c	(revision 41033)
@@ -512,10 +512,10 @@ is_integer_p(VALUE v) https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/range.c#L512
  *     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),
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 41032)
+++ ruby_2_0_0/version.h	(revision 41033)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #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"
 

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r41026


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/