setterm: put an option and its description in a single message

And improve a bit of markup and a wording in the man page.

Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>

diff --git a/term-utils/setterm.1.adoc b/term-utils/setterm.1.adoc
index 38dc81ab5e82415255c43b1a9677332474619b15..3fdee3283857c2143fbaeacbf48461021f86e52f 100644 (file)
--- a/term-utils/setterm.1.adoc
+++ b/term-utils/setterm.1.adoc
@@ -115,14 +115,14 @@ Sets the VESA powerdown interval in minutes. Without an argument, it defaults to
 *--powersave* _mode_::
 Valid values for _mode_ are:
 
-*vsync|on*;;
+*vsync*|*on*;;
 Puts the monitor into VESA vsync suspend mode.
 *hsync*;;
 Puts the monitor into VESA hsync suspend mode.
 *powerdown*;;
 Puts the monitor into VESA powerdown mode.
 *off*;;
-Turns monitor VESA powersaving features.
+Turns the monitor's powersaving features off.
 
 *--regtabs*[**=**1-160]::
 Clears all tab stops, then sets a regular tab stop pattern, with one tab every specified number of positions. Without an argument, it defaults to *8*. Virtual consoles only.

diff --git a/term-utils/setterm.c b/term-utils/setterm.c
index 53bc6785d80ddc75e8a48b5acc3fca92787e878d..801095c8751607d042c8be178a2ceb58905cc5f5 100644 (file)
--- a/term-utils/setterm.c
+++ b/term-utils/setterm.c
@@ -430,8 +430,8 @@ static void __attribute__((__noreturn__)) usage(void)
        fputs(_(" --file <filename>             name of the dump file\n"), out);
        fputs(USAGE_SEPARATOR, out);
 
-       fputs(_(" --powersave on|vsync|hsync|powerdown|off\n"), out);
-       fputs(_("                               set vesa powersaving features\n"), out);
+       fputs(_(" --powersave on|vsync|hsync|powerdown|off\n"
+               "                               set vesa powersaving features\n"), out);
        fputs(_(" --powerdown[=<0-60>]          set vesa powerdown interval in minutes\n"), out);
        fputs(USAGE_SEPARATOR, out);