netpbm/netpbm-docfix.patch

diff --git a/converter/pbm/pbmtoepson.c b/converter/pbm/pbmtoepson.c
index bb36791..79d9ece 100644
--- a/converter/pbm/pbmtoepson.c
+++ b/converter/pbm/pbmtoepson.c
@@ -74,7 +74,7 @@ parseCommandLine(int                  argc,
             &dpiSpec,                         0);
     OPTENT3(0, "adjacent",     OPT_FLAG,     NULL,
             &adjacentSpec,                    0);
-    OPTENT3(0, "nonadjacent",  OPT_FLAG,     NULL,
+    OPTENT3(0, "noadjacent",  OPT_FLAG,     NULL,
             &nonadjacentSpec,                 0);
 
     opt.opt_table = option_def;
diff --git a/userguide/cameratopam.html b/userguide/cameratopam.html
index 4a34817..f26338f 100644
--- a/userguide/cameratopam.html
+++ b/userguide/cameratopam.html
@@ -25,10 +25,10 @@ cameratopam - convert raw camera image to PAM
 [<b>-balance_camera</b>]
 [<b>-red_scale=</b><i>float</i>]
 [<b>-blue_scale=</b><i>float</i>]
-[<b>-brightness=</b><i>fraction</i>]
+[<b>-bright=</b><i>fraction</i>]
 [<b>-no_clip_color</b>]
 [<b>-rgb</b>]
-[<b>-secondary</b>]
+[<b>-use_secondary</b>]
 [<b>-linear</b>]
 [<b>-verbose</b>]
 
@@ -106,7 +106,7 @@ the default.
 <dd>Further adjust the color balance by multiplying the red and blue
 channels by these values.  Both default to 1.0.
 
-<dt><b>-brightness=</b><i>float</i>
+<dt><b>-bright=</b><i>float</i>
 
 <dd>Change the output brightness.  Default is 1.0.
 
@@ -114,14 +114,14 @@ channels by these values.  Both default to 1.0.
 
 <dd>By default, <b>cameratoapm</b> clips all colors to prevent pink
 hues in the highlights.  Combine this option with
-<b>-brightness=0.25</b> to leave the image data completely unclipped.
+<b>-bright=0.25</b> to leave the image data completely unclipped.
 
 <dt><b>-rgb</b>
 
 <dd>Write raw camera colors to the output file.  By default,
 <b>cameratoapm</b> converts to sRGB colorspace.
 
-<dt><b>-secondary</b>
+<dt><b>-use_secondary</b>
 
 <dd>For cameras based on the Fuji Super CCD SR, this option causes
 <b>cameratopam</b> to use the secondary sensors, in effect
diff --git a/userguide/fiascotopnm.html b/userguide/fiascotopnm.html
index d8e2551..1747ad3 100644
--- a/userguide/fiascotopnm.html
+++ b/userguide/fiascotopnm.html
@@ -51,7 +51,7 @@ the output file(s) are written to the first (writable) directory of
 this list. Otherwise, the current directory is used to store the
 output file(s).
 
-<DT><B>-z</B>, <B>--fast</B>
+<DT><B>-r</B>, <B>--fast</B>
 <DD>
 Decompress images in the 4:2:0 format; i.e., each chroma channel is
 decompressed to an image of halved width and height. Use this option
@@ -83,7 +83,7 @@ given amount <I>N</I>. <I>N</I> is 1 (minimum) to 100 (maximum); default
 is 70. When <I>N</I>=0, then the smoothing amount specified in the
 FIASCO file is used (defined by the FIASCO coder).
 
-<DT><B>-F</B> <I>N</I>, <B>--fps=</B><I>N</I>
+<DT><B>-F</B> <I>N</I>, <B>--framerate=</B><I>N</I>
 <DD>
 Set number of frames per second to <I>N</I>. When using this option,
 the frame rate specified in the FIASCO file is overridden.
@@ -113,13 +113,9 @@ following methods (in the specified order):
 <LI>--config=<I>name</I>
 </OL>
 
-<DT><B>-h</B>, <B>--info</B>
+<DT><B>-h</B>, <B>--help</B>
 <DD>
-Print brief help, then exit.
-
-<DT><B>-H</B>, <B>--help</B>
-<DD>
-Print detailed help, then exit.
+Print help, then exit.
 
 </DL>
 
diff --git a/userguide/pamperspective.html b/userguide/pamperspective.html
index 9f5e9f0..bb6cb58 100644
--- a/userguide/pamperspective.html
+++ b/userguide/pamperspective.html
@@ -220,7 +220,7 @@ default rectangle as the "frame." The visible part is always
 a rectangle the axes of which are parallel to those of the frame.
 
 <p>The frame options are additive.  All the parts of the image
-specified by either margin options, <b>--include_frame</b>, or
+specified by either margin options, <b>--frame_include</b>, or
 <b>--include</b> (or their defaults) are in the visible part.  The
 visible part is the smallest possible rectangle that contains the
 parts specified those three ways.
diff --git a/userguide/pbmtoepson.html b/userguide/pbmtoepson.html
index 6895d33..c0df7c4 100644
--- a/userguide/pbmtoepson.html
+++ b/userguide/pbmtoepson.html
@@ -18,7 +18,7 @@ pbmtoepson - convert a PBM image into Epson printer graphics
 [<b>-dpi=</b><i>n</i>]
 [<b>-protocol=</b>{<b>escp9</b>|<B>escp</B>}]
 [<b>-adjacent</b>]
-[<b>-nonadjacent</b>]
+[<b>-noadjacent</b>]
 
 [<I>pbmfile</I>]
 
@@ -74,7 +74,7 @@ print density for you consistent with your other options.
 <p>This option was new in Netpbm 10.23 (July 2004).     
 
 <dt><b>-adjacent</b>
-<dt><b>-nonadjacent</b>
+<dt><b>-noadjacent</b>
 
 <dd>These options determine whether the output uses "adjacent dot
 printing" or not, whatever that is.