--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-11-13  Bruno Haible  <bruno@clisp.org>
+
+	rename, renameat: Document Linux bug with NFS
+	<http://lists.gnu.org/archive/html/bug-gnulib/2010-11/msg00154.html>.
+	* doc/posix-functions/rename.texi: Mention the NFS bug on Linux.
+	* doc/posix-functions/renameat.texi: Likewise.
+	Suggested by Eric Blake.
+
 2010-11-13  Bruno Haible  <bruno@clisp.org>
 
 	rename test: Add comments.

--- a/doc/posix-functions/rename.texi
+++ b/doc/posix-functions/rename.texi
@@ -60,6 +60,11 @@
 @code{ENOTDIR} if either argument is a symlink with a trailing slash:
 glibc, OpenBSD, Cygwin 1.7.
 @item
+After renaming a non-empty directory over an existing empty directory,
+the old directory name is still visible through the @code{stat} function
+for 30 seconds after the rename, on NFS file systems, on some platforms:
+Linux 2.6.18.
+@item
 This function will not rename a source that is currently opened
 by any process:
 mingw.

--- a/doc/posix-functions/renameat.texi
+++ b/doc/posix-functions/renameat.texi
@@ -39,6 +39,11 @@
 @code{ENOTDIR} if either argument is a symlink with a trailing slash:
 glibc, OpenBSD, Cygwin 1.7.
 @item
+After renaming a non-empty directory over an existing empty directory,
+the old directory name is still visible through the @code{stat} function
+for 30 seconds after the rename, on NFS file systems, on some platforms:
+Linux 2.6.18.
+@item
 This function will not rename a source that is currently opened
 by any process:
 mingw.