nagachika	2017-09-10 11:46:34 +0900 (Sun, 10 Sep 2017)

  New Revision: 59808

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

  Log:
    merge revision(s) 57944,57977,58062: [Backport #13306]
    
    io.c: [DOC] IO#puts uses IO#write
    io.c: [DOC] add missing `$`
    io.c: [DOC] expand docs for IO#puts
    
    [ruby-core:80081] [Bug #13306]

  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 59807)
+++ ruby_2_4/io.c	(revision 59808)
@@ -7185,14 +7185,17 @@ io_puts_ary(VALUE ary, VALUE out, int re https://github.com/ruby/ruby/blob/trunk/ruby_2_4/io.c#L7185
  *  call-seq:
  *     ios.puts(obj, ...)    -> nil
  *
- *  Writes the given object(s) to <em>ios</em> as with <code>IO#print</code>.
+ *  Writes the given object(s) to <em>ios</em>.
  *  Writes a newline after any that do not already end
- *  with a newline sequence.
+ *  with a newline sequence. Returns +nil+.
  *
+ *  The stream must be opened for writing.
  *  If called with an array argument, writes each element on a new line.
+ *  Each given object that isn't a string or array will be converted
+ *  by calling its +to_s+ method.
  *  If called without arguments, outputs a single newline.
  *
- *     $stdout.puts("this", "is", "a", "test")
+ *     $stdout.puts("this", "is", ["a", "test"])
  *
  *  <em>produces:</em>
  *
@@ -7200,6 +7203,9 @@ io_puts_ary(VALUE ary, VALUE out, int re https://github.com/ruby/ruby/blob/trunk/ruby_2_4/io.c#L7203
  *     is
  *     a
  *     test
+ *
+ *  Note that +puts+ always uses newlines and is not affected
+ *  by the output record separator (<code>$\\</code>).
  */
 
 VALUE
Index: ruby_2_4/version.h
===================================================================
--- ruby_2_4/version.h	(revision 59807)
+++ ruby_2_4/version.h	(revision 59808)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_4/version.h#L1
 #define RUBY_VERSION "2.4.2"
 #define RUBY_RELEASE_DATE "2017-09-10"
-#define RUBY_PATCHLEVEL 185
+#define RUBY_PATCHLEVEL 186
 
 #define RUBY_RELEASE_YEAR 2017
 #define RUBY_RELEASE_MONTH 9
Index: ruby_2_4
===================================================================
--- ruby_2_4	(revision 59807)
+++ ruby_2_4	(revision 59808)

Property changes on: ruby_2_4
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /trunk:r57944,57977,58062

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