naruse	2017-03-12 17:01:46 +0900 (Sun, 12 Mar 2017)

  New Revision: 57902

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=57902

  Log:
    merge revision(s) 57539: [Backport #11752]
    
    rational.c: fix rdoc [ci skip]
    
    * rational.c (rb_rational_plus): [DOC] fix an example.
      A patch by Trygve Flathen <at.ruby-lang AT flathen.net> in
      [ruby-core:71755].  [Bug #11752]

  Modified directories:
    branches/ruby_2_4/
  Modified files:
    branches/ruby_2_4/rational.c
    branches/ruby_2_4/version.h
Index: ruby_2_4/rational.c
===================================================================
--- ruby_2_4/rational.c	(revision 57901)
+++ ruby_2_4/rational.c	(revision 57902)
@@ -726,7 +726,7 @@ static double nurat_to_double(VALUE self https://github.com/ruby/ruby/blob/trunk/ruby_2_4/rational.c#L726
  * Performs addition.
  *
  *    Rational(2, 3)  + Rational(2, 3)   #=> (4/3)
- *    Rational(900)   + Rational(1)      #=> (900/1)
+ *    Rational(900)   + Rational(1)      #=> (901/1)
  *    Rational(-2, 9) + Rational(-9, 2)  #=> (-85/18)
  *    Rational(9, 8)  + 4                #=> (41/8)
  *    Rational(20, 9) + 9.8              #=> 12.022222222222222
Index: ruby_2_4/version.h
===================================================================
--- ruby_2_4/version.h	(revision 57901)
+++ ruby_2_4/version.h	(revision 57902)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_4/version.h#L1
 #define RUBY_VERSION "2.4.0"
 #define RUBY_RELEASE_DATE "2017-03-12"
-#define RUBY_PATCHLEVEL 59
+#define RUBY_PATCHLEVEL 60
 
 #define RUBY_RELEASE_YEAR 2017
 #define RUBY_RELEASE_MONTH 3

Property changes on: ruby_2_4
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r57539


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