ls: Improve description of --group-directories-first.

* src/ls.c (usage) [--group-directories-first]: Improve description.
* doc/coreutils.texi (Which files are listed): Likewise.

diff --git a/doc/coreutils.texi b/doc/coreutils.texi
index 23d0ab45b0cb240e077d54ff646ee1182945fcd4..016673a3b58806df08c789094fb08b182ecc8ff0 100644 (file)
--- 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 b6dcaacaac5e6ad2ad36d1f3c8b8f83ad656cf14..ff49278c778ddee1884f715c56f2b6c0b0955fd8 100644 (file)
--- 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\