nagachika	2013-07-13 23:35:04 +0900 (Sat, 13 Jul 2013)

  New Revision: 41947

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

  Log:
    merge revision(s) 41854,41867:
    
    * object.c: Fix rdoc for Kernel#<=>. [Fix GH-352]

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

Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 41946)
+++ ruby_2_0_0/ChangeLog	(revision 41947)
@@ -1,3 +1,7 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Sat Jul 13 23:34:13 2013  Akinori MUSHA  <knu@i...>
+
+	* object.c: Fix rdoc for Kernel#<=>. [Fix GH-352]
+
 Sat Jul 13 23:29:51 2013  Akinori MUSHA  <knu@i...>
 
 	* lib/fileutils.rb (FileUtils#mode_to_s): Define mode_to_s() also
Index: ruby_2_0_0/object.c
===================================================================
--- ruby_2_0_0/object.c	(revision 41946)
+++ ruby_2_0_0/object.c	(revision 41947)
@@ -1320,7 +1320,8 @@ rb_obj_not_match(VALUE obj1, VALUE obj2) https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/object.c#L1320
  *  call-seq:
  *     obj <=> other -> 0 or nil
  *
- *  Returns 0 if obj === other, otherwise nil.
+ *  Returns 0 if +obj+ and +other+ are the same object
+ *  or <code>obj == other</code>, otherwise nil.
  *
  *  The <=> is used by various methods to compare objects, for example
  *  Enumerable#sort, Enumerable#max etc.
@@ -1330,7 +1331,7 @@ rb_obj_not_match(VALUE obj1, VALUE obj2) https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/object.c#L1331
  *  1 means self is bigger than other. Nil means the two values could not be
  *  compared.
  *
- *  When you defined <=>, you can include Comparable to gain the methods <=, <,
+ *  When you define <=>, you can include Comparable to gain the methods <=, <,
  *  ==, >=, > and between?.
  */
 static VALUE
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 41946)
+++ ruby_2_0_0/version.h	(revision 41947)
@@ -1,6 +1,6 @@ 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-07-13"
-#define RUBY_PATCHLEVEL 260
+#define RUBY_PATCHLEVEL 261
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 7

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r41854,41867


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