File _service:tar_scm:netpbm-docfix.patch of Package netpbm

diff --git a/converter/pbm/pbmtoepson.c b/converter/pbm/pbmtoepson.c
index 122a438..5d67746 100644
--- a/converter/pbm/pbmtoepson.c
+++ b/converter/pbm/pbmtoepson.c
@@ -75,7 +75,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 b50bfeb..3af9008 100644
--- a/userguide/cameratopam.html
+++ b/userguide/cameratopam.html
@@ -24,10 +24,10 @@ cameratopam - convert raw camera image to PAM
 [-balance_camera]
 [-red_scale=float]
 [-blue_scale=float]
-[-brightness=fraction]
+[-bright=fraction]
 [-no_clip_color]
 [-rgb]
-[-secondary]
+[-use_secondary]
 [-linear]
 [-verbose]
 
@@ -110,7 +110,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>-brightness=float
+<dt>-bright=float
 
 <dd>Change the output brightness. Default is 1.0.
 
@@ -118,14 +118,14 @@ channels by these values. Both default to 1.0.
 
 <dd>By default, cameratoapm clips all colors to prevent pink
 hues in the highlights. Combine this option with
--brightness=0.25 to leave the image data completely unclipped.
+-bright=0.25 to leave the image data completely unclipped.
 
 <dt>-rgb
 
 <dd>Write raw camera colors to the output file. By default,
 cameratoapm converts to sRGB colorspace.
 
-<dt>-secondary
+<dt>-use_secondary
 
 <dd>For cameras based on the Fuji Super CCD SR, this option causes
 cameratopam to use the secondary sensors, in effect
diff --git a/userguide/fiascotopnm.html b/userguide/fiascotopnm.html
index c33f701..fa84441 100644
--- a/userguide/fiascotopnm.html
+++ b/userguide/fiascotopnm.html
@@ -56,7 +56,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>-z, --fast
+<dt>-r, --fast
 <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
@@ -88,7 +88,7 @@ given amount N. N is 1 (minimum) to 100 (maximum); default
 is 70. When N=0, then the smoothing amount specified in the
 FIASCO file is used (defined by the FIASCO coder).
 
-<dt>-F N, --fps=N
+<dt>-F N, --framerate=N
 <dd>
 Set number of frames per second to N. When using this option,
 the frame rate specified in the FIASCO file is overridden.
@@ -118,13 +118,8 @@ following methods (in the specified order):
 <li>--config=name
 </ol>
 
-<dt>-h, --info
-<dd>
-Print brief help, then exit.
-
-<dt>-H, --help
-<dd>
-Print detailed help, then exit.
+<dt>-h, --help
+Print help, then exit.
 
 </dl>
 
diff --git a/userguide/pamperspective.html b/userguide/pamperspective.html
index 018f18a..13073d2 100644
--- a/userguide/pamperspective.html
+++ b/userguide/pamperspective.html
@@ -223,7 +223,7 @@ default rectangle as the "frame." The visible part is always
 a rectangle the axes of which are parallel to those of the frame.
 
 The frame options are additive. All the parts of the image
-specified by either margin options, --include_frame, or
+specified by either margin options, --frame_include, or
 --include (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 baacf7b..e74a7fe 100644
--- a/userguide/pbmtoepson.html
+++ b/userguide/pbmtoepson.html
@@ -16,7 +16,7 @@ pbmtoepson - convert a PBM image into Epson printer graphics
 [-dpi=n]
 [-protocol={escp9|escp}]
 [-adjacent]
-[-nonadjacent]
+[-noadjacent]
 
 [pbmfile]
 
@@ -75,7 +75,7 @@ print density for you consistent with your other options.
 This option was new in Netpbm 10.23 (July 2004). 
 
 <dt>-adjacent
-<dt>-nonadjacent
+<dt>-noadjacent
 
 <dd>These options determine whether the output uses "adjacent dot
 printing" or not, whatever that is.