From 59c74fab7967bcbad628a7b161577024939251ca Mon Sep 17 00:00:00 2001
From: mame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 30 May 2010 08:10:04 +0000
Subject: [PATCH] * file.c (rb_file_directory_p): update rdoc.  a patch from
 Ilkka   Laukkanen.  [ruby-core:30016]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28088 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog |  5 +++++
 file.c    | 13 ++-----------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 73c409d7c7..cc31b4ab65 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun May 30 16:54:34 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* file.c (rb_file_directory_p): update rdoc.  a patch from Ilkka
+	  Laukkanen.  [ruby-core:30016]
+
 Sun May 30 14:59:13 2010  Narihiro Nakamura  <authorNari@gmail.com>
 
 	* gc.c (gc_mark_all_clear): don't call obj_free() in
diff --git a/file.c b/file.c
index 56b467fa99..86ea3d67fa 100644
--- a/file.c
+++ b/file.c
@@ -1052,16 +1052,6 @@ access_internal(const char *path, int mode)
  *
  */
 
-/*
- *   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?
  *
@@ -1081,7 +1071,8 @@ access_internal(const char *path, int mode)
  *   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?(".")
  */