usa	2017-04-30 22:53:30 +0900 (Sun, 30 Apr 2017)

  New Revision: 58517

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

  Log:
    merge revision(s) 58062: [Backport #13306]
    
    io.c: [DOC] expand docs for IO#puts
    
    [ruby-core:80081] [Bug #13306]

  Modified directories:
    branches/ruby_2_3/
  Modified files:
    branches/ruby_2_3/ChangeLog
    branches/ruby_2_3/io.c
    branches/ruby_2_3/version.h
Index: ruby_2_3/ChangeLog
===================================================================
--- ruby_2_3/ChangeLog	(revision 58516)
+++ ruby_2_3/ChangeLog	(revision 58517)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/ChangeLog#L1
+Sun Apr 30 22:52:38 2017  Marcus Stollsteimer  <sto.mar@w...>
+
+	* io.c: [DOC] expand docs for IO#puts
+	  [Bug #13306]
+
 Sun Apr 30 22:38:44 2017  Nobuyoshi Nakada  <nobu@r...>
 
 	sample/pty/shl.rb: update [ci skip]
Index: ruby_2_3/io.c
===================================================================
--- ruby_2_3/io.c	(revision 58516)
+++ ruby_2_3/io.c	(revision 58517)
@@ -7099,15 +7099,17 @@ io_puts_ary(VALUE ary, VALUE out, int re https://github.com/ruby/ruby/blob/trunk/ruby_2_3/io.c#L7099
  *  call-seq:
  *     ios.puts(obj, ...)    -> nil
  *
- *  Writes the given object(s) to <em>ios</em> as with <code>IO#write</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.
- *  This doesn't affect $/. ($RS or INPUT_RECORD_SEPARATOR in English.rb)
  *
- *     $stdout.puts("this", "is", "a", "test")
+ *     $stdout.puts("this", "is", ["a", "test"])
  *
  *  <em>produces:</em>
  *
@@ -7115,6 +7117,9 @@ io_puts_ary(VALUE ary, VALUE out, int re https://github.com/ruby/ruby/blob/trunk/ruby_2_3/io.c#L7117
  *     is
  *     a
  *     test
+ *
+ *  Note that +puts+ always uses newlines and is not affected
+ *  by the output record separator (<code>$\\</code>).
  */
 
 VALUE
Index: ruby_2_3/version.h
===================================================================
--- ruby_2_3/version.h	(revision 58516)
+++ ruby_2_3/version.h	(revision 58517)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/version.h#L1
 #define RUBY_VERSION "2.3.5"
 #define RUBY_RELEASE_DATE "2017-04-30"
-#define RUBY_PATCHLEVEL 306
+#define RUBY_PATCHLEVEL 307
 
 #define RUBY_RELEASE_YEAR 2017
 #define RUBY_RELEASE_MONTH 4
Index: ruby_2_3
===================================================================
--- ruby_2_3	(revision 58516)
+++ ruby_2_3	(revision 58517)

Property changes on: ruby_2_3
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /trunk:r58062

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