naruse	2017-03-13 01:30:08 +0900 (Mon, 13 Mar 2017)

  New Revision: 57929

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

  Log:
    merge revision(s) 57780: [Backport #12975]
    
    docs for IO#print
    
    * io.c: [DOC] split documentation for IO#print into smaller paragraphs,
      delete duplicate sentence, fix call-seq.
      Based on a patch by Dario Daic. [ruby-core:78291] [Bug #12975]

  Modified directories:
    branches/ruby_2_4/
  Modified files:
    branches/ruby_2_4/io.c
    branches/ruby_2_4/version.h
Index: ruby_2_4/io.c
===================================================================
--- ruby_2_4/io.c	(revision 57928)
+++ ruby_2_4/io.c	(revision 57929)
@@ -7006,18 +7006,20 @@ rb_f_printf(int argc, VALUE *argv) https://github.com/ruby/ruby/blob/trunk/ruby_2_4/io.c#L7006
 
 /*
  *  call-seq:
- *     ios.print()             -> nil
+ *     ios.print               -> nil
  *     ios.print(obj, ...)     -> nil
  *
- *  Writes the given object(s) to <em>ios</em>. The stream must be
- *  opened for writing. If the output field separator (<code>$,</code>)
- *  is not <code>nil</code>, it will be inserted between each object.
- *  If the output record separator (<code>$\\</code>)
- *  is not <code>nil</code>, it will be appended to the output. If no
- *  arguments are given, prints <code>$_</code>. Objects that aren't
- *  strings will be converted by calling their <code>to_s</code> method.
- *  With no argument, prints the contents of the variable <code>$_</code>.
- *  Returns <code>nil</code>.
+ *  Writes the given object(s) to <em>ios</em>. Returns <code>nil</code>.
+ *
+ *  The stream must be opened for writing.
+ *  Each given object that isn't a string will be converted by calling
+ *  its <code>to_s</code> method.
+ *  When called without arguments, prints the contents of <code>$_</code>.
+ *
+ *  If the output field separator (<code>$,</code>) is not <code>nil</code>,
+ *  it is inserted between objects.
+ *  If the output record separator (<code>$\\</code>) is not <code>nil</code>,
+ *  it is appended to the output.
  *
  *     $stdout.print("This is ", 100, " percent.\n")
  *
Index: ruby_2_4/version.h
===================================================================
--- ruby_2_4/version.h	(revision 57928)
+++ ruby_2_4/version.h	(revision 57929)
@@ -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-13"
-#define RUBY_PATCHLEVEL 84
+#define RUBY_PATCHLEVEL 85
 
 #define RUBY_RELEASE_YEAR 2017
 #define RUBY_RELEASE_MONTH 3

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


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