yugui	2010-06-11 00:58:53 +0900 (Fri, 11 Jun 2010)

  New Revision: 28265

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

  Log:
    merges r28088 from trunk into ruby_1_9_2.
    --
    * file.c (rb_file_directory_p): update rdoc.  a patch from Ilkka
      Laukkanen.  [ruby-core:30016]

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/file.c

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 28264)
+++ ruby_1_9_2/ChangeLog	(revision 28265)
@@ -1,3 +1,8 @@
+Sun May 30 16:54:34 2010  Yusuke Endoh  <mame@t...>
+
+	* file.c (rb_file_directory_p): update rdoc.  a patch from Ilkka
+	  Laukkanen.  [ruby-core:30016]
+
 Sat Jun  5 16:39:13 2010  Tanaka Akira  <akr@f...>
 
 	* .gdbinit (rp): show type name for RTypedData.
Index: ruby_1_9_2/file.c
===================================================================
--- ruby_1_9_2/file.c	(revision 28264)
+++ ruby_1_9_2/file.c	(revision 28265)
@@ -1053,16 +1053,6 @@
  */
 
 /*
- *   File.directory?(file_name)   ->  true or false
- *   File.directory?(file_name)   ->  true or false
- *
- * Returns <code>true</code> if the named file is a directory,
- * <code>false</code> otherwise.
- *
- *    File.directory?(".")
- */
-
-/*
  * Document-method: exist?
  *
  * call-seq:
@@ -1081,7 +1071,8 @@
  *   File.directory?(file_name)   ->  true or false
  *
  * Returns <code>true</code> if the named file is a directory,
- * <code>false</code> otherwise.
+ * or a symlink that points at a directory, and <code>false</code>
+ * otherwise.
  *
  *    File.directory?(".")
  */

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