nagachika	2014-09-04 00:29:56 +0900 (Thu, 04 Sep 2014)

  New Revision: 47377

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

  Log:
    merge revision(s) r46876: [Backport #10039]
    
    * io.c (rb_io_initialize): [DOC] fix rdoc of append mode.  it does
      not move the pointer at open.  [ruby-core:63747] [Bug #10039]

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/io.c
    branches/ruby_2_1/version.h
Index: ruby_2_1/ChangeLog
===================================================================
--- ruby_2_1/ChangeLog	(revision 47376)
+++ ruby_2_1/ChangeLog	(revision 47377)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1
+Thu Sep  4 00:29:10 2014  Nobuyoshi Nakada  <nobu@r...>
+
+	* io.c (rb_io_initialize): [DOC] fix rdoc of append mode.  it does
+	  not move the pointer at open.  [ruby-core:63747] [Bug #10039]
+
 Thu Sep  4 00:23:15 2014  Nobuyoshi Nakada  <nobu@r...>
 
 	* sprintf.c (GETASTER): should not use the numbered argument to be
Index: ruby_2_1/io.c
===================================================================
--- ruby_2_1/io.c	(revision 47376)
+++ ruby_2_1/io.c	(revision 47377)
@@ -7274,12 +7274,12 @@ rb_io_stdio_file(rb_io_t *fptr) https://github.com/ruby/ruby/blob/trunk/ruby_2_1/io.c#L7274
  *  	"w+" Read-write, truncates existing file to zero length
  *  	     or creates a new file for reading and writing.
  *
- *  	"a"  Write-only, starts at end of file if file exists,
- *  	     otherwise creates a new file for writing.
+ *  	"a"  Write-only, each write call appends data at end of file.
+ *  	     Creates a new file for writing if file does not exist.
  *
- *  	"a+" Read-write, starts at end of file if file exists,
- *	     otherwise creates a new file for reading and
- *  	     writing.
+ *  	"a+" Read-write, each write call appends data at end of file.
+ *	     Creates a new file for reading and writing if file does
+ *	     not exist.
  *
  *  The following modes must be used separately, and along with one or more of
  *  the modes seen above.
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 47376)
+++ ruby_2_1/version.h	(revision 47377)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #define RUBY_VERSION "2.1.2"
 #define RUBY_RELEASE_DATE "2014-09-04"
-#define RUBY_PATCHLEVEL 220
+#define RUBY_PATCHLEVEL 221
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 9

Property changes on: ruby_2_1
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r46876


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