From 6d988bb20d6382fc62d9ba71317057d9605e505b Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Tue, 16 Nov 2004 20:47:28 +0000 Subject: (usage): Improve documentation along the lines suggested by Debian 5.2.1-2. --- src/cut.c | 4 +++- src/echo.c | 13 +++++++++---- src/expr.c | 5 +++++ 3 files changed, 17 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/cut.c b/src/cut.c index d3fa9606b..cf6885e33 100644 --- a/src/cut.c +++ b/src/cut.c @@ -211,7 +211,9 @@ Mandatory arguments to long options are mandatory for short options too.\n\ fputs (_("\ \n\ Use one, and only one of -b, -c or -f. Each LIST is made up of one\n\ -range, or many ranges separated by commas. Each range is one of:\n\ +range, or many ranges separated by commas. Selected input is written\n\ +in the same order that it is read, and is written exactly once.\n\ +Each range is one of:\n\ \n\ N N'th byte, character or field, counted from 1\n\ N- from N'th byte, character or field, to end of line\n\ diff --git a/src/echo.c b/src/echo.c index 1447fcaf8..bf82de993 100644 --- a/src/echo.c +++ b/src/echo.c @@ -65,11 +65,16 @@ usage (int status) fputs (_("\ Echo the STRING(s) to standard output.\n\ \n\ - -n do not output the trailing newline\n\ - -e enable interpretation of the backslash-escaped characters\n\ - listed below\n\ - -E disable interpretation of those sequences in STRINGs\n\ + -n do not output the trailing newline\n\ "), stdout); + fputs (_(DEFAULT_ECHO_TO_XPG + ? "\ + -e enable interpretation of backslash escapes (default)\n\ + -E disable interpretation of backslash escapes\n" + : "\ + -e enable interpretation of backslash escapes\n\ + -E disable interpretation of backslash escapes (default)\n"), + stdout); fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); fputs (_("\ diff --git a/src/expr.c b/src/expr.c index eac5cf17f..2ba533bc8 100644 --- a/src/expr.c +++ b/src/expr.c @@ -153,6 +153,11 @@ Beware that many operators need to be escaped or quoted for shells.\n\ Comparisons are arithmetic if both ARGs are numbers, else lexicographical.\n\ Pattern matches return the string matched between \\( and \\) or null; if\n\ \\( and \\) are not used, they return the number of characters matched or 0.\n\ +"), stdout); + fputs (_("\ +\n\ +Exit status is 0 if EXPRESSION is neither null nor 0, 1 if EXPRESSION is null\n\ +or 0, 2 if EXPRESSION is syntactically invalid, and 3 if an error occurred.\n\ "), stdout); printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT); } -- cgit v1.2.3-70-g09d2