[PATCH setxkbmap] Minor style changes in help message.

Van de Bugger van.de.bugger at gmail.com
Fri Feb 25 12:55:57 PST 2011


1.  `args' renamed to `options'. (xkbcomp and gcc name these entities
    `options').
2.  `Where legal args are:' replaced with `Options:'. (Short and
    correct. As I remember, GNU does not recommend to use word
    `legal' unless it related to law and lawyers).
3.  Option descriptions shifted right by 2 space. (Like gcc.)

Signed-off-by: Van de Bugger <van.de.bugger at gmail.com>
---
 setxkbmap.c |   46 +++++++++++++++++++++++-----------------------
 1 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/setxkbmap.c b/setxkbmap.c
index fc0362e..5d97ad8 100644
--- a/setxkbmap.c
+++ b/setxkbmap.c
@@ -238,29 +238,29 @@ void
 usage(int argc, char **argv)
 {
     MSG1(
-        "Usage: %s [args] [<layout> [<variant> [<option> ... ]]]\n"
-        "Where legal args are:\n"
-        "-?, -help           Print this message\n"
-        "-compat <name>      Specifies compatibility map component name\n"
-        "-config <file>      Specifies configuration file to use\n"
-        "-device <deviceid>  Specifies the device ID to use\n"
-        "-display <dpy>      Specifies display to use\n"
-        "-geometry <name>    Specifies geometry component name\n"
-        "-I<dir>             Add <dir> to list of directories to be used\n"
-        "-keycodes <name>    Specifies keycodes component name\n"
-        "-keymap <name>      Specifies name of keymap to load\n"
-        "-layout <name>      Specifies layout used to choose component names\n"
-        "-model <name>       Specifies model used to choose component names\n"
-        "-option <name>      Adds an option used to choose component names\n"
-        "-print              Print a complete xkb_keymap description and exit\n"
-        "-query              Print the current layout settings and exit\n"
-        "-rules <name>       Name of rules file to use\n"
-        "-symbols <name>     Specifies symbols component name\n"
-        "-synch              Synchronize request w/X server\n"
-        "-types <name>       Specifies types component name\n"
-        "-v[erbose] [<lvl>]  Sets verbosity (1..10).  Higher values yield\n"
-        "                    more messages\n"
-        "-variant <name>     Specifies layout variant used to choose component names\n",
+        "Usage: %s [options] [<layout> [<variant> [<option> ... ]]]\n"
+        "Options:\n"
+        "  -?, -help           Print this message\n"
+        "  -compat <name>      Specifies compatibility map component name\n"
+        "  -config <file>      Specifies configuration file to use\n"
+        "  -device <deviceid>  Specifies the device ID to use\n"
+        "  -display <dpy>      Specifies display to use\n"
+        "  -geometry <name>    Specifies geometry component name\n"
+        "  -I<dir>             Add <dir> to list of directories to be used\n"
+        "  -keycodes <name>    Specifies keycodes component name\n"
+        "  -keymap <name>      Specifies name of keymap to load\n"
+        "  -layout <name>      Specifies layout used to choose component names\n"
+        "  -model <name>       Specifies model used to choose component names\n"
+        "  -option <name>      Adds an option used to choose component names\n"
+        "  -print              Print a complete xkb_keymap description and exit\n"
+        "  -query              Print the current layout settings and exit\n"
+        "  -rules <name>       Name of rules file to use\n"
+        "  -symbols <name>     Specifies symbols component name\n"
+        "  -synch              Synchronize request with X server\n"
+        "  -types <name>       Specifies types component name\n"
+        "  -v[erbose] [<lvl>]  Sets verbosity (1..10).  Higher values yield\n"
+        "                      more messages\n"
+        "  -variant <name>     Specifies layout variant used to choose component names\n",
         argv[0]
     );
 }
-- 
1.7.4




More information about the xorg-devel mailing list