naruse	2017-03-13 03:41:38 +0900 (Mon, 13 Mar 2017)

  New Revision: 57945

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

  Log:
    merge revision(s) 57767,57943: [Backport #10403]
    
    io.c: documentation for puts
    
    * io.c: [DOC] clarify that the 'record separator' between
      arguments passed to 'puts' is always a newline.
      Based on a patch by Mark Amery. [ruby-core:65801] [Misc #10403]
    * 2017-03-13

  Modified directories:
    branches/ruby_2_4/
  Modified files:
    branches/ruby_2_4/io.c
    branches/ruby_2_4/version.h
Index: ruby_2_4/version.h
===================================================================
--- ruby_2_4/version.h	(revision 57944)
+++ ruby_2_4/version.h	(revision 57945)
@@ -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 96
+#define RUBY_PATCHLEVEL 97
 
 #define RUBY_RELEASE_YEAR 2017
 #define RUBY_RELEASE_MONTH 3
Index: ruby_2_4/io.c
===================================================================
--- ruby_2_4/io.c	(revision 57944)
+++ ruby_2_4/io.c	(revision 57945)
@@ -7181,11 +7181,12 @@ io_puts_ary(VALUE ary, VALUE out, int re https://github.com/ruby/ruby/blob/trunk/ruby_2_4/io.c#L7181
  *  call-seq:
  *     ios.puts(obj, ...)    -> nil
  *
- *  Writes the given objects to <em>ios</em> as with
- *  <code>IO#print</code>. Writes a record separator (typically a
- *  newline) after any that do not already end with a newline sequence.
+ *  Writes the given object(s) to <em>ios</em> as with <code>IO#print</code>.
+ *  Writes a newline after any that do not already end
+ *  with a newline sequence.
+ *
  *  If called with an array argument, writes each element on a new line.
- *  If called without arguments, outputs a single record separator.
+ *  If called without arguments, outputs a single newline.
  *
  *     $stdout.puts("this", "is", "a", "test")
  *

Property changes on: ruby_2_4
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r57767,57943


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