more: improve formatting and wording of man page and help text

Also, slice up the usage text for ease of translation.

Reported-by: Phillip Susi <psusi@ubuntu.com>
Signed-off-by: Benno Schulenberg <bensberg@justemail.net>

diff --git a/text-utils/more.1 b/text-utils/more.1
index 479f037f03a53dc8f1b8fd6c4254272997327b5c..0cf3892a2d198da549371c41551000923b0437b2 100644 (file)
--- a/text-utils/more.1
+++ b/text-utils/more.1
@@ -37,12 +37,13 @@
 .\" conform with the more 5.19 currently in use by the Linux community.
 .\"
 .\" .Dd July 29, 1991 (Modified December 25, 1992)
-.TH MORE "1" "September 2011" "util-linux" "User Commands"
+.TH MORE "1" "February 2014" "util-linux" "User Commands"
 .SH NAME
 more \- file perusal filter for crt viewing
 .SH SYNOPSIS
 .B more
-[options] file [...]
+[options]
+.IR file ...
 .SH DESCRIPTION
 .B more
 is a filter for paging through text one screenful at a time.  This version is
@@ -59,11 +60,6 @@ environment variable
 override them.
 .It Fl num
 .TP
-.B \-number
-This option specifies an integer
-.I number
-which is the screen size (in lines).
-.TP
 .B \-d
 .B more
 will prompt the user with the message "[Press space to continue, 'q' to
@@ -100,15 +96,19 @@ Squeeze multiple blank lines into one.
 .B \-u
 Suppress underlining.
 .TP
-.B +/
-The
-.B +/
-option specifies a string that will be searched for before each file is
-displayed.
+.BI \- number
+The screen size to use, in
+.I number
+of lines.
 .TP
-.B +number
-Start at line
+.BI + number
+Start displaying each file at line
 .IR number .
+.TP
+.BI +/ string
+The
+.I string
+to be searched in each file before starting to display it.
 .SH COMMANDS
 Interactive commands for
 .B more
@@ -203,7 +203,9 @@ Display current file name and line number.
 .B \&.
 Repeat previous command.
 .SH ENVIRONMENT
-More utilizes the following environment variables, if they exist:
+The
+.B more
+command respects the following environment variables, if they exist:
 .TP
 .B MORE
 This variable may be set with favored options to
@@ -213,16 +215,16 @@ This variable may be set with favored options to
 Current shell in use (normally set by the shell at login time).
 .TP
 .B TERM
-Specifies terminal type, used by more to get the terminal
+The terminal type used by \fBmore\fR to get the terminal
 characteristics necessary to manipulate the screen.
 .TP
 .B VISUAL
-Editor the user is preferring.  Used when key command
+The editor the user prefers.  Invoked when command key
 .I v
 is pressed.
 .TP
 .B EDITOR
-Editor of choise when
+The editor of choice when
 .B VISUAL
 is not specified.
 .SH SEE ALSO

diff --git a/text-utils/more.c b/text-utils/more.c
index 4c39887e9ea8fc4c7445f069a1e7b9289d2ac3e0..b06abbb63f77a3aab36d543ac88b1757c7e6147b 100644 (file)
--- a/text-utils/more.c
+++ b/text-utils/more.c
@@ -315,22 +315,21 @@ static char *my_tgoto(char *cap, int col, int row)
 
 static void __attribute__((__noreturn__)) usage(FILE *out)
 {
-       fprintf(out,
-               _("Usage: %s [options] file...\n\n"),
-               program_invocation_short_name);
-       fprintf(out,
-               _("Options:\n"
-                 "  -d        display help instead of ring bell\n"
-                 "  -f        count logical, rather than screen lines\n"
-                 "  -l        suppress pause after form feed\n"
-                 "  -p        do not scroll, clean screen and display text\n"
-                 "  -c        do not scroll, display text and clean line ends\n"
-                 "  -u        suppress underlining\n"
-                 "  -s        squeeze multiple blank lines into one\n"
-                 "  -NUM      specify the number of lines per screenful\n"
-                 "  +NUM      display file beginning from line number NUM\n"
-                 "  +/STRING  display file beginning from search string match\n"
-                 "  -V        output version information and exit\n"));
+       fputs(USAGE_HEADER, out);
+       fprintf(out, _(" %s [options] <file>...\n"), program_invocation_short_name);
+       fputs(USAGE_OPTIONS, out);
+       fputs(_(" -d          display help instead of ringing bell\n"), out);
+       fputs(_(" -f          count logical rather than screen lines\n"), out);
+       fputs(_(" -l          suppress pause after form feed\n"), out);
+       fputs(_(" -c          do not scroll, display text and clean line ends\n"), out);
+       fputs(_(" -p          do not scroll, clean screen and display text\n"), out);
+       fputs(_(" -s          squeeze multiple blank lines into one\n"), out);
+       fputs(_(" -u          suppress underlining\n"), out);
+       fputs(_(" -<number>   the number of lines per screenful\n"), out);
+       fputs(_(" +<number>   display file beginning from line number\n"), out);
+       fputs(_(" +/<string>  display file beginning from search string match\n"), out);
+       fputs(_(" -V          display version information and exit\n"), out);
+       fprintf(out, USAGE_MAN_TAIL("more(1)"));
        exit(out == stderr ? EXIT_FAILURE : EXIT_SUCCESS);
 }