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]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28265 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 7 insertions, 11 deletions

diff --git a/ChangeLog b/ChangeLog
index 681261e07f..5d353b4b5e 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]
+
 Sat Jun  5 16:39:13 2010  Tanaka Akira  <akr@fsij.org>
 
 	* .gdbinit (rp): show type name for RTypedData.
diff --git a/file.c b/file.c
index 0ce6e3a19b..1d9ad50840 100644
--- a/file.c
+++ b/file.c
@@ -1053,16 +1053,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?
  *
  * call-seq:
@@ -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?(".")
  */