Jim Meyering wrote: > Hi Pádraig, > > Is this ok with you? In the same vein, how about this cleanup?
>From 23f8cfda81a7261edeebe406582bb68d643f10ca Mon Sep 17 00:00:00 2001 From: =?utf-8?q?P=C3=A1draig=20Brady?= <p...@draigbrady.com> Date: Thu, 10 Sep 2009 08:00:31 +0100 Subject: [PATCH] doc: ls: make help for --color more concise and accurate * src/ls.c (usage): Shorten the --color ancillary info by two lines, while replacing --color=none with --color=never. Mention "always" is the default parameter of the --color option, along with the primary help for that option. Mention the ancillary --color info in the --color primary help. --- src/ls.c | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/ls.c b/src/ls.c index b62ea12..220ab65 100644 --- a/src/ls.c +++ b/src/ls.c @@ -4552,8 +4552,8 @@ Mandatory arguments to long options are mandatory for short options too.\n\ "), stdout); fputs (_("\ -C list entries by columns\n\ - --color[=WHEN] control whether color is used to distinguish file\n\ - types. WHEN may be `never', `always', or `auto'\n\ + --color[=WHEN] colorize the output. WHEN defaults to `always'\n\ + or can be `never' or `auto'. More info below\n\ -d, --directory list directory entries instead of contents,\n\ and do not dereference symbolic links\n\ -D, --dired generate output designed for Emacs' dired mode\n\ @@ -4667,12 +4667,10 @@ Mandatory arguments to long options are mandatory for short options too.\n\ emit_size_note (); fputs (_("\ \n\ -By default, color is not used to distinguish types of files. That is\n\ -equivalent to using --color=none. Using the --color option without the\n\ -optional WHEN argument is equivalent to using --color=always. With\n\ ---color=auto, color codes are output only if standard output is connected\n\ -to a terminal (tty). The environment variable LS_COLORS can influence the\n\ -colors, and can be set easily by the dircolors command.\n\ +Using color to distinguish types of files is not enabled by default, or when\n\ +--color=never is specified. With --color=auto, color codes are output only\n\ +when standard output is connected to a terminal. The LS_COLORS environment\n\ +variable can change the default codes and can be set using dircolors command\n\ "), stdout); fputs (_("\ \n\ -- 1.6.2.5