b37900
diff -urNp old/userguide/cameratopam.html new/userguide/cameratopam.html
b37900
--- old/userguide/cameratopam.html	2017-09-05 09:05:16.000000000 +0200
b37900
+++ new/userguide/cameratopam.html	2017-09-05 13:16:33.622352535 +0200
b37900
@@ -25,10 +25,10 @@ cameratopam - convert raw camera image t
b37900
 [-balance_camera]
b37900
 [-red_scale=float]
b37900
 [-blue_scale=float]
b37900
-[-brightness=fraction]
b37900
+[-bright=fraction]
b37900
 [-no_clip_color]
b37900
 [-rgb]
b37900
-[-secondary]
b37900
+[-use_secondary]
b37900
 [-linear]
b37900
 [-verbose]
b37900
 
b37900
@@ -106,7 +106,7 @@ the default.
b37900
 
Further adjust the color balance by multiplying the red and blue
b37900
 channels by these values.  Both default to 1.0.
b37900
 
b37900
-
-brightness=float
b37900
+
-bright=float
b37900
 
b37900
 
Change the output brightness. Default is 1.0.
b37900
 
b37900
@@ -114,14 +114,14 @@ channels by these values.  Both default
b37900
 
b37900
 
By default, cameratoapm clips all colors to prevent pink
b37900
 hues in the highlights.  Combine this option with
b37900
--brightness=0.25 to leave the image data completely unclipped.
b37900
+-bright=0.25 to leave the image data completely unclipped.
b37900
 
b37900
 
-rgb
b37900
 
b37900
 
Write raw camera colors to the output file. By default,
b37900
 cameratoapm converts to sRGB colorspace.
b37900
 
b37900
-
-secondary
b37900
+
-use_secondary
b37900
 
b37900
 
For cameras based on the Fuji Super CCD SR, this option causes
b37900
 cameratopam to use the secondary sensors, in effect
b37900
diff -urNp old/userguide/fiascotopnm.html new/userguide/fiascotopnm.html
b37900
--- old/userguide/fiascotopnm.html	2017-09-05 09:05:16.000000000 +0200
b37900
+++ new/userguide/fiascotopnm.html	2017-09-05 13:32:51.810458154 +0200
b37900
@@ -51,7 +51,7 @@ the output file(s) are written to the fi
b37900
 this list. Otherwise, the current directory is used to store the
b37900
 output file(s).
b37900
 
b37900
-
-z, --fast
b37900
+
-r, --fast
b37900
 
b37900
 Decompress images in the 4:2:0 format; i.e., each chroma channel is
b37900
 decompressed to an image of halved width and height. Use this option
b37900
@@ -83,7 +83,7 @@ given amount N. N is 1 (mi
b37900
 is 70. When N=0, then the smoothing amount specified in the
b37900
 FIASCO file is used (defined by the FIASCO coder).
b37900
 
b37900
-
-F N, --fps=N
b37900
+
-F N, --framerate=N
b37900
 
b37900
 Set number of frames per second to N. When using this option,
b37900
 the frame rate specified in the FIASCO file is overridden.
b37900
@@ -113,13 +113,8 @@ following methods (in the specified orde
b37900
 
  • --config=name
  • b37900
     
    b37900
     
    b37900
    -
    -h, --info
    b37900
    -
    b37900
    -Print brief help, then exit.
    b37900
    -
    b37900
    -
    -H, --help
    b37900
    -
    b37900
    -Print detailed help, then exit.
    b37900
    +
    -h, --help
    b37900
    +Print help, then exit.
    b37900
     
    b37900
     
    b37900
     
    b37900
    diff -urNp old/userguide/pamperspective.html new/userguide/pamperspective.html
    b37900
    --- old/userguide/pamperspective.html	2017-09-05 09:05:16.000000000 +0200
    b37900
    +++ new/userguide/pamperspective.html	2017-09-05 13:23:15.869997105 +0200
    b37900
    @@ -220,7 +220,7 @@ default rectangle as the "frame." The vi
    b37900
     a rectangle the axes of which are parallel to those of the frame.
    b37900
     
    b37900
     

    The frame options are additive. All the parts of the image

    b37900
    -specified by either margin options, --include_frame, or
    b37900
    +specified by either margin options, --frame_include, or
    b37900
     --include (or their defaults) are in the visible part.  The
    b37900
     visible part is the smallest possible rectangle that contains the
    b37900
     parts specified those three ways.
    b37900
    diff -urNp old/converter/pbm/pbmtoepson.c new/converter/pbm/pbmtoepson.c
    b37900
    --- old/converter/pbm/pbmtoepson.c	2018-01-04 14:26:14.740024843 +0100
    b37900
    +++ new/converter/pbm/pbmtoepson.c	2018-01-04 14:28:47.970518766 +0100
    b37900
    @@ -75,7 +75,7 @@ parseCommandLine(int                  ar
    b37900
                 &dpiSpec,                         0);
    b37900
         OPTENT3(0, "adjacent",     OPT_FLAG,     NULL,
    b37900
                 &adjacentSpec,                    0);
    b37900
    -    OPTENT3(0, "nonadjacent",  OPT_FLAG,     NULL,
    b37900
    +    OPTENT3(0, "noadjacent",  OPT_FLAG,     NULL,
    b37900
                 &nonadjacentSpec,                 0);
    b37900
     
    b37900
         opt.opt_table = option_def;
    b37900
    diff -urNp old/userguide/pbmtoepson.html new/userguide/pbmtoepson.html
    b37900
    --- old/userguide/pbmtoepson.html	2018-01-04 14:26:14.586024719 +0100
    b37900
    +++ new/userguide/pbmtoepson.html	2018-01-04 14:27:56.466847698 +0100
    b37900
    @@ -18,7 +18,7 @@ pbmtoepson - convert a PBM image into Ep
    b37900
     [-dpi=n]
    b37900
     [-protocol={escp9|escp}]
    b37900
     [-adjacent]
    b37900
    -[-nonadjacent]
    b37900
    +[-noadjacent]
    b37900
     
    b37900
     [pbmfile]
    b37900
     
    b37900
    @@ -74,7 +74,7 @@ print density for you consistent with yo
    b37900
     

    This option was new in Netpbm 10.23 (July 2004).

    b37900
     
    b37900
     
    -adjacent
    b37900
    -
    -nonadjacent
    b37900
    +
    -noadjacent
    b37900
     
    b37900
     
    These options determine whether the output uses "adjacent dot
    b37900
     printing" or not, whatever that is.