Ensure consistency between the manpage and the output of the -help option

Signed-off-by: Stéphane Aulery <lkppo@free.fr>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>

2 files changed, 28 insertions, 10 deletions

diff --git a/man/xwd.man b/man/xwd.man
index da06d74..be4cc58 100644
--- a/man/xwd.man
+++ b/man/xwd.man
@@ -28,8 +28,8 @@ xwd - dump an image of an X window
 .SH SYNOPSIS
 .B "xwd"
 [-debug] [-help] [-nobdrs] [-out \fIfile\fP] [-xy] [-frame] [-add \fIvalue\fP]
-[-root | -id \fIid\fP | -name \fIname\fP ] [-icmap] [-screen] [-silent]
-[-display \fIdisplay\fP] [-version]
+[-root | -id \fIwdid\fP | -name \fIwdname\fP ] [-icmap] [-screen] [-silent]
+[-display \fIhost:dpy\fP] [-version]
 .SH DESCRIPTION
 .PP
 .I Xwd
@@ -44,7 +44,11 @@ the dump is completed.
 .SH OPTIONS
 .PP
 .TP 8
-.B "-display \fIdisplay\fP"
+.B "-debug"
+Enable debug mode.
+.PP
+.TP 8
+.B "-d, -display \fIhost:dpy\fP"
 This argument allows you to specify the server to connect to; see \fIX(__miscmansuffix__)\fP.
 .PP
 .TP 8
@@ -83,13 +87,13 @@ This option indicates that the root window should be selected for the
 window dump, without requiring the user to select a window with the pointer.
 .PP
 .TP 8
-.B "-id \fIid\fP"
+.B "-id \fIwdid\fP"
 This option indicates that the window with the specified resource id
 should be selected for the window dump, without requiring the user to
 select a window with the pointer.
 .PP
 .TP 8
-.B "-name \fIname\fP"
+.B "-name \fIwdname\fP"
 This option indicates that the window with the specified WM_NAME property
 should be selected for the window dump, without requiring the user to
 select a window with the pointer.
diff --git a/xwd.c b/xwd.c
index c3a053b..c605e50 100644
--- a/xwd.c
+++ b/xwd.c
@@ -248,7 +248,7 @@ Get24bitDirectColors(XColor **colors)
 
 /*
  * Window_Dump: dump a window to a file which must already be open for
- *              writting.
+ *              writing.
  */
 
 void
@@ -529,10 +529,24 @@ usage(const char *errmsg)
     if (errmsg != NULL)
         fprintf (stderr, "%s: %s\n", program_name, errmsg);
 
-    fprintf (stderr,
-"usage: %s [-display host:dpy] [-debug] [-help] %s [-nobdrs] [-out <file>]",
-	   program_name, "[{-root|-id <id>|-name <name>}]");
-    fprintf (stderr, " [-xy] [-add value] [-frame] [-version]\n");
+    fprintf(stderr, "Usage: %s [options] [-root| -id <wdid>| -name <wdname>] > mywddump\n", program_name);
+    fprintf(stderr, "       %s [options] [-root| -id <wdid>| -name <wdname>] -out mywddump\n", program_name);
+    fprintf(stderr, "Options:\n");
+    fprintf(stderr, "  -help                    Print this message\n");
+    fprintf(stderr, "  -version                 Print the program version and exit\n");
+    fprintf(stderr, "  -debug                   Enable debug mode\n");
+    fprintf(stderr, "  -d, -display <host:dpy>  Specify server to connect\n");
+    fprintf(stderr, "  -nobdrs                  Exclude window borders\n");
+    fprintf(stderr, "  -out <file>              Specify an output file\n");
+    fprintf(stderr, "  -xy                      Select XY dumping format for color displays\n");
+    fprintf(stderr, "  -add <value>             Add a signed value to every pixel\n");
+    fprintf(stderr, "  -frame                   Include window manager frame\n");
+    fprintf(stderr, "  -root                    Select the root window\n");
+    fprintf(stderr, "  -id <wdid>               Select a window by its resource id\n");
+    fprintf(stderr, "  -name <wdname>           Select a window by its WM_NAME property\n");
+    fprintf(stderr, "  -icmap                   Use the first colormap of the screen\n");
+    fprintf(stderr, "  -screen                  Send the request against the root window\n");
+    fprintf(stderr, "  -silent                  Don't ring any bells\n");
     exit(1);
 }