ul: cleanup usage() and man page

Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/text-utils/ul.1 b/text-utils/ul.1
index d6089d028faa102bea6ce3ff51f70aa66a0879cf..9ed93790a9babfbe731b544cb5e2573e35ed0eb0 100644 (file)
--- a/text-utils/ul.1
+++ b/text-utils/ul.1
@@ -62,7 +62,7 @@ present in an
 .B nroff
 output stream on a crt-terminal.
 .TP
-\fB\-t\fR, \fB\-\-terminal\fR \fIterminal\fR
+\fB\-t\fR, \fB\-T\fR, \fB\-\-terminal\fR \fIterminal\fR
 .It Fl t Ar terminal
 Overrides the
 .I terminal

diff --git a/text-utils/ul.c b/text-utils/ul.c
index f48550c8dca755d5fc682bbcb84af09a1629528d..5710a5547e98870448b4ddfd80e686dada0ac38a 100644 (file)
--- a/text-utils/ul.c
+++ b/text-utils/ul.c
@@ -132,16 +132,17 @@ int       iflag;
 static void __attribute__((__noreturn__))
 usage(FILE *out)
 {
-       fprintf(out, _(
-               "\nUsage:\n"
-               " %s [options] [file...]\n"), program_invocation_short_name);
-
-       fprintf(out, _(
-               "\nOptions:\n"
-               " -t, --terminal TERMINAL    override the TERM environment variable\n"
-               " -i, --indicated            underlining is indicated via a separate line\n"
-               " -V, --version              output version information and exit\n"
-               " -h, --help                 display this help and exit\n\n"));
+       fputs(USAGE_HEADER, out);
+       fprintf(out, _(" %s [options] [<file> ...]\n"), program_invocation_short_name);
+       fputs(USAGE_OPTIONS, out);
+
+       fputs(_(" -t, -T, --terminal TERMINAL  override the TERM environment variable\n"), out);
+       fputs(_(" -i, --indicated              underlining is indicated via a separate line\n"), out);
+       fputs(USAGE_SEPARATOR, out);
+       fputs(USAGE_HELP, out);
+       fputs(USAGE_VERSION, out);
+
+       fprintf(out, USAGE_MAN_TAIL("ul(1)"));
 
        exit(out == stderr ? EXIT_FAILURE : EXIT_SUCCESS);
 }