nagachika	2013-03-09 21:53:29 +0900 (Sat, 09 Mar 2013)

  New Revision: 39658

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

  Log:
    merge revision(s) 39369:
    
    * numeric.c: Examples and formatting for Numeric and Float
      Based on a patch by Zach Morek and Oren K of newhaven.rb
      [Github documenting-ruby/ruby#5]

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

Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 39657)
+++ ruby_2_0_0/ChangeLog	(revision 39658)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Sat Mar  9 21:52:19 2013  Zachary Scott  <zachary@z...>
+
+	* numeric.c: Examples and formatting for Numeric and Float
+	  Based on a patch by Zach Morek and Oren K of newhaven.rb
+	  [Github documenting-ruby/ruby#5]
+
 Sat Mar  9 21:46:41 2013  Eric Hodel  <drbrain@s...>
 
 	* doc/globals.rdoc:  Document what setting $DEBUG does.
Index: ruby_2_0_0/numeric.c
===================================================================
--- ruby_2_0_0/numeric.c	(revision 39657)
+++ ruby_2_0_0/numeric.c	(revision 39658)
@@ -522,8 +522,10 @@ num_real_p(VALUE num) https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/numeric.c#L522
  *  call-seq:
  *     num.integer?  ->  true or false
  *
- *  Returns <code>true</code> if <i>num</i> is an <code>Integer</code>
- *  (including <code>Fixnum</code> and <code>Bignum</code>).
+ *  Returns +true+ if +num+ is an Integer (including Fixnum and Bignum).
+ *
+ *      (1.0).integer? #=> false
+ *      (1).integer?   #=> true
  */
 
 static VALUE
@@ -596,8 +598,11 @@ num_nonzero_p(VALUE num) https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/numeric.c#L598
  *  call-seq:
  *     num.to_int  ->  integer
  *
- *  Invokes the child class's <code>to_i</code> method to convert
- *  <i>num</i> to an integer.
+ *  Invokes the child class's +to_i+ method to convert +num+ to an integer.
+ *
+ *      1.0.class => Float
+ *      1.0.to_int.class => Fixnum
+ *      1.0.to_i.class => Fixnum
  */
 
 static VALUE
@@ -899,10 +904,10 @@ ruby_float_mod(double x, double y) https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/numeric.c#L904
 
 /*
  *  call-seq:
- *     flt % other        ->  float
- *     flt.modulo(other)  ->  float
+ *     float % other        ->  float
+ *     float.modulo(other)  ->  float
  *
- *  Return the modulo after division of <code>flt</code> by <code>other</code>.
+ *  Return the modulo after division of +float+ by +other+.
  *
  *     6543.21.modulo(137)      #=> 104.21
  *     6543.21.modulo(137.24)   #=> 92.9299999999996
@@ -941,9 +946,12 @@ dbl2ival(double d) https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/numeric.c#L946
 
 /*
  *  call-seq:
- *     flt.divmod(numeric)  ->  array
+ *     float.divmod(numeric)  ->  array
+ *
+ *  See Numeric#divmod.
  *
- *  See <code>Numeric#divmod</code>.
+ *      42.0.divmod 6 #=> [7, 0.0]
+ *      42.0.divmod 5 #=> [8, 2.0]
  */
 
 static VALUE
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 39657)
+++ ruby_2_0_0/version.h	(revision 39658)
@@ -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-03-09"
-#define RUBY_PATCHLEVEL 27
+#define RUBY_PATCHLEVEL 28
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 3

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


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