summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Jacobson <jidanni@jidanni.org>2008-02-12 09:18:11 +0100
committerJim Meyering <meyering@redhat.com>2008-02-17 08:53:28 +0100
commit7dc26da47c9e01dc89fef9837219cdca1e9bbce6 (patch)
tree8bcdecc67e9b878f8a937454f640aec8d9461805
parent526e43a1c29c2ed9b12b2f8c0173fc09bbe4061e (diff)
downloadcoreutils-7dc26da47c9e01dc89fef9837219cdca1e9bbce6.tar.xz
ls: Improve description of --group-directories-first.
* src/ls.c (usage) [--group-directories-first]: Improve description. * doc/coreutils.texi (Which files are listed): Likewise.
-rw-r--r--doc/coreutils.texi2
-rw-r--r--src/ls.c4
2 files changed, 5 insertions, 1 deletions
diff --git a/doc/coreutils.texi b/doc/coreutils.texi
index 23d0ab45b..016673a3b 100644
--- a/doc/coreutils.texi
+++ b/doc/coreutils.texi
@@ -5894,6 +5894,8 @@ directories and the files separately using the selected sort key
(see --sort option).
That is, this option specifies a primary sort key,
and the --sort option specifies a secondary key.
+However, any use of @option{--sort=none}
+(@option{-U}) disables this option altogether.
@item --hide=PATTERN
@opindex --hide=@var{pattern}
diff --git a/src/ls.c b/src/ls.c
index b6dcaacaa..ff49278c7 100644
--- a/src/ls.c
+++ b/src/ls.c
@@ -4350,7 +4350,9 @@ Mandatory arguments to long options are mandatory for short options too.\n\
"), stdout);
fputs (_("\
--group-directories-first\n\
- group directories before files\n\
+ group directories before files.\n\
+ augment with a --sort option, but any\n\
+ use of --sort=none (-U) disables grouping\n\
"), stdout);
fputs (_("\
-G, --no-group in a long listing, don't print group names\n\