(Ffile_name_directory, Fexpand_file_name): Doc fixes.

diff --git a/src/ChangeLog b/src/ChangeLog
index c0b86a16593bc419ce56f1222b5a5f5b8c35c005..de8dd197733c2e1894b6f2929e0b770e99bd84b8 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2008-01-04  Richard Stallman  <rms@gnu.org>
+
+       * fileio.c (Ffile_name_directory, Fexpand_file_name): Doc fixes.
+
 2007-12-24  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
        * process.c (make_process): Initialize pty_flag to Qnil instead of 0

diff --git a/src/fileio.c b/src/fileio.c
index 0f13c6535a08cfccf9a0f20f0a8c30d313f0bb69..b487c64767b9493a49e9dc6bbcc88d608f753b75 100644 (file)
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -410,7 +410,7 @@ DEFUN ("file-name-directory", Ffile_name_directory, Sfile_name_directory,
        1, 1, 0,
        doc: /* Return the directory component in file name FILENAME.
 Return nil if FILENAME does not include a directory.
-Otherwise return a directory spec.
+Otherwise return a directory name.
 Given a Unix syntax file name, returns a string ending in slash;
 on VMS, perhaps instead a string ending in `:', `]' or `>'.  */)
      (filename)
@@ -1029,7 +1029,7 @@ probably use `make-temp-file' instead, except in three circumstances:
 DEFUN ("expand-file-name", Fexpand_file_name, Sexpand_file_name, 1, 2, 0,
        doc: /* Convert filename NAME to absolute, and canonicalize it.
 Second arg DEFAULT-DIRECTORY is directory to start with if NAME is relative
-\(does not start with slash); if DEFAULT-DIRECTORY is nil or missing,
+\(does not start with slash or tilde); if DEFAULT-DIRECTORY is nil or missing,
 the current buffer's value of `default-directory' is used.
 File name components that are `.' are removed, and
 so are file name components followed by `..', along with the `..' itself;