miscellaneous update

git-svn-id: http://svn.code.sf.net/p/netpbm/code/userguide@2313 9d0c8265-081b-0410-96cb-a4ca84ce46f8

1 files changed, 12 insertions, 13 deletions

diff --git a/ppmtoxpm.html b/ppmtoxpm.html
index 1530682b..80adbc64 100644
--- a/ppmtoxpm.html
+++ b/ppmtoxpm.html
@@ -62,17 +62,16 @@ of the color code affects the size of the image stream.
 <p>All color codes in an image are the same length, and
 <b>ppmtoxpm</b> tries to make it as short as possible.  That length
 is, of course, determined by the number of colors in the image.
-<b>ppmtoxpm</b> counts the colors in the image, excluding those that
-will be transparent in the output because of your alpha mask, and chooses
-a color code length accordingly.  There are 92 printable characters
-that can be used in a color code.  Therefore, if you have 92 or fewer
-colors, your color codes will be one character.  If you have more than
-92 but not more than 92 * 92, your color codes will be two characters.
-And so on.
-
-<p>There's one exception to the above: If you specify an alpha mask
+<b>ppmtoxpm</b> counts the colors in the image, excluding those that will be
+transparent in the output because of your transparency mask, and chooses a
+color code length accordingly.  There are 92 printable characters that can be
+used in a color code.  Therefore, if you have 92 or fewer colors, your color
+codes will be one character.  If you have more than 92 but not more than 92 *
+92, your color codes will be two characters.  And so on.
+
+<p>There's one exception to the above: If you specify a transparency mask
 (the <b>-alpha</b> option, one unique color code represents
-&quot;transparent.&quot;  This is true even if the alpha mask doesn't 
+&quot;transparent.&quot;  This is true even if the transparency mask doesn't 
 actually produce any transparent pixels.  So subtract one from the number
 of possible colors if you use <b>-alpha</b>.
 
@@ -114,15 +113,15 @@ to the system color dictionary.  If you didn't specify <b>-rgb</b>,
 
 <DT><B>-alphamask=</B><I>pgmfile</I>
 
-<DD> This option names a PGM file to use as an alpha (transparency)
+<DD> This option names a PGM file to use as a transparency (alpha)
 mask.  The file must contain an image the same dimensions as the input
 image.  <B>ppmtoxpm</B> marks as transparent any pixel whose position
-in the alpha mask image is at most half white.  
+in the transparency mask image is at most half white.  
 
 <P>If you don't specify <B>-alphamask</B>, <B>ppmtoxpm</B> makes all
 pixels in the output opaque.  
 
-<P><B>ppmcolormask</B> is one way to generate an alpha mask file.  You
+<P><B>ppmcolormask</B> is one way to generate a transparency mask file.  You
 might also generate it by extracting transparency information from an
 XPM file with the <B>-alphaout</B> option to <B>xpmtoppm</B>.