usa	2015-05-21 14:02:07 +0900 (Thu, 21 May 2015)

  New Revision: 50579

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

  Log:
    merge revision(s) 50406,50407: [Backport #11075]
    
    * rational.c: Added documentation for rational literal.
      [Bug #11075][fix GH-885][ci skip] Patch by @shishir127

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/rational.c
    branches/ruby_2_1/version.h
Index: ruby_2_1/ChangeLog
===================================================================
--- ruby_2_1/ChangeLog	(revision 50578)
+++ ruby_2_1/ChangeLog	(revision 50579)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1
+Thu May 21 14:01:40 2015  SHIBATA Hiroshi  <hsbt@r...>
+
+	* rational.c: Added documentation for rational literal.
+	  [Bug #11075][fix GH-885][ci skip] Patch by @shishir127
+
 Thu May 21 13:57:47 2015  Nobuyoshi Nakada  <nobu@r...>
 
 	* ext/socket/ipsocket.c (init_inetsock_internal): preserve errno
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 50578)
+++ ruby_2_1/version.h	(revision 50579)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #define RUBY_VERSION "2.1.7"
 #define RUBY_RELEASE_DATE "2015-05-21"
-#define RUBY_PATCHLEVEL 352
+#define RUBY_PATCHLEVEL 353
 
 #define RUBY_RELEASE_YEAR 2015
 #define RUBY_RELEASE_MONTH 5
Index: ruby_2_1/rational.c
===================================================================
--- ruby_2_1/rational.c	(revision 50578)
+++ ruby_2_1/rational.c	(revision 50579)
@@ -2451,13 +2451,14 @@ nurat_s_convert(int argc, VALUE *argv, V https://github.com/ruby/ruby/blob/trunk/ruby_2_1/rational.c#L2451
  * a/b (b>0).  Where a is numerator and b is denominator.  Integer a
  * equals rational a/1 mathematically.
  *
- * In ruby, you can create rational object with Rational, to_r or
- * rationalize method.  The return values will be irreducible.
+ * In ruby, you can create rational object with Rational, to_r,
+ * rationalize method or suffixing r to a literal.  The return values will be irreducible.
  *
  *    Rational(1)      #=> (1/1)
  *    Rational(2, 3)   #=> (2/3)
  *    Rational(4, -6)  #=> (-2/3)
  *    3.to_r           #=> (3/1)
+ *    2/3r             #=> (2/3)
  *
  * You can also create rational object from floating-point numbers or
  * strings.

Property changes on: ruby_2_1
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r50406-50407


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