From: Eric Blake <ebb9@byu.net>
Date: Mon, 15 Feb 2010 13:45:31 +0000 (-0700)
Subject: dirname: improve man page description
X-Git-Tag: v8.5~75
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d4de2dc83ad76f0dbce67aa15b37dbedbfd0e6de;p=platform%2Fupstream%2Fcoreutils.git

dirname: improve man page description

* doc/coreutils.texi (dirname invocation): Properly cover behavior
on directory.
* man/dirname.x: Likewise.
* THANKS: Update.
Reported by Emmanuel Lacour.
---

diff --git a/THANKS b/THANKS
index d8cdf82..a538644 100644
--- a/THANKS
+++ b/THANKS
@@ -178,6 +178,7 @@ Elbert Pol                          elbert.pol@gmail.com
 Eli Zaretskii                       eliz@is.elta.co.il
 Elias Pipping                       pipping@gentoo.org
 Emile LeBlanc                       leblanc@math.toronto.edu
+Emmanuel Lacour                     elacour@home-dn.net
 Erik Auerswald                      auerswal@unix-ag.uni-kl.de
 Eric Backus                         ericb@lsid.hp.com
 Eric Blake                          ebb9@byu.net
diff --git a/doc/coreutils.texi b/doc/coreutils.texi
index e3e95f5..fcee336 100644
--- a/doc/coreutils.texi
+++ b/doc/coreutils.texi
@@ -53,7 +53,7 @@
 * df: (coreutils)df invocation.                 Report file system disk usage.
 * dir: (coreutils)dir invocation.               List directories briefly.
 * dircolors: (coreutils)dircolors invocation.   Color setup for ls.
-* dirname: (coreutils)dirname invocation.       Strip non-directory suffix.
+* dirname: (coreutils)dirname invocation.       Strip last file name component.
 * du: (coreutils)du invocation.                 Report on disk usage.
 * echo: (coreutils)echo invocation.             Print a line of text.
 * env: (coreutils)env invocation.               Modify the environment.
@@ -377,7 +377,7 @@ Redirection
 File name manipulation
 
 * basename invocation::          Strip directory and suffix from a file name
-* dirname invocation::           Strip non-directory suffix from a file name
+* dirname invocation::           Strip last file name component
 * pathchk invocation::           Check file name validity and portability
 * mktemp invocation::            Create temporary file or directory
 
@@ -11902,7 +11902,7 @@ This section describes commands that manipulate file names.
 
 @menu
 * basename invocation::         Strip directory and suffix from a file name.
-* dirname invocation::          Strip non-directory suffix from a file name.
+* dirname invocation::          Strip last file name component.
 * pathchk invocation::          Check file name validity and portability.
 * mktemp invocation::           Create temporary file or directory.
 @end menu
@@ -11963,7 +11963,7 @@ basename include/stdio.h .h
 
 
 @node dirname invocation
-@section @command{dirname}: Strip non-directory suffix from a file name
+@section @command{dirname}: Strip last file name component
 
 @pindex dirname
 @cindex directory components, printing
@@ -11971,7 +11971,7 @@ basename include/stdio.h .h
 @cindex non-directory suffix, stripping
 
 @command{dirname} prints all but the final slash-delimited component of
-a string (presumably a file name).  Synopsis:
+a string (presumably a file name, but also works on directories).  Synopsis:
 
 @example
 dirname @var{name}
diff --git a/man/dirname.x b/man/dirname.x
index 2cfa08a..09c46e4 100644
--- a/man/dirname.x
+++ b/man/dirname.x
@@ -1,5 +1,5 @@
 [NAME]
-dirname \- strip non-directory suffix from file name
+dirname \- strip last component from file name
 [DESCRIPTION]
 .\" Add any additional description here
 [SEE ALSO]