naruse	2017-03-12 02:28:49 +0900 (Sun, 12 Mar 2017)

  New Revision: 57863

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

  Log:
    merge revision(s) 57372:
    
    Fix documentation of options for all of methods in FileUtils.
    
    Patch by galia traub( @galiat ). [Fix GH-1510][ci skip]

  Modified directories:
    branches/ruby_2_4/
  Modified files:
    branches/ruby_2_4/lib/fileutils.rb
    branches/ruby_2_4/version.h
Index: ruby_2_4/lib/fileutils.rb
===================================================================
--- ruby_2_4/lib/fileutils.rb	(revision 57862)
+++ ruby_2_4/lib/fileutils.rb	(revision 57863)
@@ -47,7 +47,7 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_4/lib/fileutils.rb#L47
 #
 # The <tt>options</tt> parameter is a hash of options, taken from the list
 # <tt>:force</tt>, <tt>:noop</tt>, <tt>:preserve</tt>, and <tt>:verbose</tt>.
-# <tt>:noop</tt> means that no changes are made.  The other two are obvious.
+# <tt>:noop</tt> means that no changes are made.  The other three are obvious.
 # Each method documents the options that it honours.
 #
 # All methods that have the concept of a "source" file or directory can take
Index: ruby_2_4/version.h
===================================================================
--- ruby_2_4/version.h	(revision 57862)
+++ ruby_2_4/version.h	(revision 57863)
@@ -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-12"
-#define RUBY_PATCHLEVEL 28
+#define RUBY_PATCHLEVEL 29
 
 #define RUBY_RELEASE_YEAR 2017
 #define RUBY_RELEASE_MONTH 3

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


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