Merge changes between r2007 and 2107 from /fsf/trunk.

git-svn-id: svn://svn.eglibc.org/trunk@2108 7b3dc134-2b1b-0410-93df-9e9f96275f8d

1 files changed, 5 insertions, 6 deletions

diff --git a/libc/stdlib/stdlib.h b/libc/stdlib/stdlib.h
index af27d09e3..aa5f514ca 100644
--- a/libc/stdlib/stdlib.h
+++ b/libc/stdlib/stdlib.h
@@ -747,12 +747,11 @@ extern char *canonicalize_file_name (__const char *__name)
 #endif
 
 #if defined __USE_BSD || defined __USE_XOPEN_EXTENDED
-/* Return the canonical absolute name of file NAME.  The last file name
-   component need not exist, and may be a symlink to a nonexistent file.
-   If RESOLVED is null, the result is malloc'd; otherwise, if the canonical
-   name is PATH_MAX chars or more, returns null with `errno' set to
-   ENAMETOOLONG; if the name fits in fewer than PATH_MAX chars, returns the
-   name in RESOLVED.  */
+/* Return the canonical absolute name of file NAME.  If RESOLVED is
+   null, the result is malloc'd; otherwise, if the canonical name is
+   PATH_MAX chars or more, returns null with `errno' set to
+   ENAMETOOLONG; if the name fits in fewer than PATH_MAX chars,
+   returns the name in RESOLVED.  */
 extern char *realpath (__const char *__restrict __name,
 		       char *__restrict __resolved) __THROW __wur;
 #endif