"miscellaneous update"

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

7 files changed, 27 insertions, 28 deletions

diff --git a/error.html b/liberror.html
index 2bd8ad9b..2bd8ad9b 100644
--- a/error.html
+++ b/liberror.html
diff --git a/libnetpbm_dir.html b/libnetpbm_dir.html
index 0221df94..282040fa 100644
--- a/libnetpbm_dir.html
+++ b/libnetpbm_dir.html
@@ -53,10 +53,10 @@ services.
   <li><a href="libpm.html#gamma">pm_ungamma709()</a>
   <li><a href="libpm.html#message">pm_message()</a>
   <li><a href="libpm.html#message">pm_setusermessagefn()</a>
-  <li><a href="error.html#pm_error">pm_error()</a>
-  <li><a href="error.html#pm_errormsg">pm_errormsg()</a>
-  <li><a href="error.html#pm_setusererrormsgfn">pm_setusererrormsgfn()</a>
-  <li><a href="error.html#pm_setjmpbuf">pm_setjmpbuf()</a>
+  <li><a href="liberror.html#pm_error">pm_error()</a>
+  <li><a href="liberror.html#pm_errormsg">pm_errormsg()</a>
+  <li><a href="liberror.html#pm_setusererrormsgfn">pm_setusererrormsgfn()</a>
+  <li><a href="liberror.html#pm_setjmpbuf">pm_setjmpbuf()</a>
   <li><a href="libpm.html#keyword">pm_keymatch()</a>
   </ul>
 
diff --git a/libnetpbm_draw.html b/libnetpbm_draw.html
index 168ed0e0..39543dfc 100644
--- a/libnetpbm_draw.html
+++ b/libnetpbm_draw.html
@@ -42,8 +42,6 @@ in this facility.
 
 <h3><b>ppmd_filledrectangle</b></h3>
 
-<h3><b>ppmd_fill_init</b></h3>
-
 <h3><b>ppmd_fill_drawproc</b></h3>
 
 <h3><b>ppmd_fill</b></h3>
@@ -65,7 +63,7 @@ can create additional fonts and use them instead.
 <p>In a program that uses Netpbm drawing facilities, there is a
 &quot;current font.&quot; all drawing of text uses the current font.
 When the program starts, the current font is &quot;standard&quot;; you
-can change it after that by calling the <b>ppmd_setfont</b> function.
+can change it after that by calling the <b>ppmd_set_font</b> function.
 
 <p>Other than a built-in font, a font lives in file in a format
 special to Netpbm called Ppmdfont.  The file typically has a name that
@@ -86,7 +84,7 @@ example.  In Netpbm source code, you will find the C source file
 <b>standardppmdfont.c</b>, which was generated from the file
 <b>standard.ppmdfont</b> by <b>ppmdcfont</b>.  You simply use a
 pointer to the structure that the C file defines as a font handle,
-just like one you would get from <b>ppmd_readfont</b>.
+just like one you would get from <b>ppmd_read_font</b>.
 
 
 <h2>Font File Format</h2>
@@ -104,28 +102,28 @@ vector, not raster, font.
 
 <p>These functions are declared in the header file <b>ppmdfont.h</b>.
 
-<h3><b>ppmd_readfont</b></h3>
+<h3><b>ppmd_read_font</b></h3>
 
 <p>This function associates a Ppmdfont file, which you identify by
 naming the Ppmdfont file, with a handle that you can use to identify
 the font to other functions.  Technically, this function reads the
 font into memory.
 
-<h3><b>ppmd_freefont</b></h3>
+<h3><b>ppmd_free_font</b></h3>
 
 <p>This function releases the handle that you get from
-<b>ppmd_readfont</b>.  It frees resources associated with it; you
+<b>ppmd_read_font</b>.  It frees resources associated with it; you
 can't use the handle after this.
 
-<h3><b>ppmd_getfont</b></h3>
+<h3><b>ppmd_get_font</b></h3>
 
 <p>This function returns the handle of the currently selected font.
 
-<h3><b>ppmd_setfont</b></h3>
+<h3><b>ppmd_set_font</b></h3>
 
 <p>This function sets the currently selected font.  You identify the
 font to which to set it with a handle such as you get from
-<b>ppmd_readfont</b> or <b>ppmd_getfont</b>.
+<b>ppmd_read_font</b> or <b>ppmd_get_font</b>.
 
 <HR>
 <A NAME="toc">&nbsp;</A>
diff --git a/libpbm.html b/libpbm.html
index 22cca2af..2243c9cf 100644
--- a/libpbm.html
+++ b/libpbm.html
@@ -226,7 +226,7 @@ there may be white space between images.
 image, it returns <B>*</B><I>eofP</I> false (0).  If there is no next
 image in the file, it returns <B>*</B><I>eofP</I> true .  If it can't
 position or determine the file status due to a file error, it
-<a href="error.html#error">throws an error</a>.
+<a href="liberror.html#error">throws an error</a>.
 
 <P><B>pbm_check()</B> checks for the common file integrity error where
 the file is the wrong size to contain all the image data.
@@ -235,7 +235,7 @@ header (as if <B>pbm_readpbminit() </B> was the last operation on the
 file).  It checks the file size to see if the number of bytes left in
 the file are the number required to contain the image raster.  If the
 file is too short, <B>pbm_check()</B> causes the program t <a
-href="error.html#error">throws an error</a>.  Otherwise, it returns
+href="liberror.html#error">throws an error</a>.  Otherwise, it returns
 one of the following values (enumerations of the <B>enum
 pm_check_code</B> type) as <B>*</B><I>retval</I>:
 
diff --git a/libpm.html b/libpm.html
index 1cd3ae88..a4a4f987 100644
--- a/libpm.html
+++ b/libpm.html
@@ -474,7 +474,7 @@ specifying the <B>-quiet</B> option.
 <p>Netpbm distinguishes between error messages and information
 messages; <b>pm_message()</b> is just for informational messages.  To
 issue an error message, see
-<a href="error.html#pm_errormsg"><b>pm_errormsg()</b></a>.
+<a href="liberror.html#pm_errormsg"><b>pm_errormsg()</b></a>.
 
 <p><b>pm_setusermessagefn</b> registers a handler for informational
 messages, called a user message routine.  Any library function
@@ -489,7 +489,7 @@ characters).
 
 <p>To capture error messages in addition to informational messages,
 see
-<a href="error.html#pm_setusererrormsgfn"><b>pm_setusererrormsgfn()</b></a>.
+<a href="liberror.html#pm_setusererrormsgfn"><b>pm_setusererrormsgfn()</b></a>.
 
 <p>You can remove the user message routine, so that the library issues
 future informational messages in its default way (write to Standard
diff --git a/libppm.html b/libppm.html
index 44883834..015d76fc 100644
--- a/libppm.html
+++ b/libppm.html
@@ -520,7 +520,7 @@ it was in use before MIT came up with the similar and preferred rgbi style).
 <P>If the color specification does not conform to any of these
 formats, including the case that it is a name, but is not in the
 system color dictionary, <B>ppm_parsecolor()</B> <a
-href="error.html">throws an error</a>.
+href="liberror.html">throws an error</a>.
 
 <h4 id="ppm_colorname">ppm_colorname</h4>
 
@@ -535,7 +535,7 @@ color does not appear in it and <I>hexok</I> is false,
 <B>ppm_colorname()</B> returns the name of the closest matching color
 in the color file.  Finally, if there is no system color dictionary
 available and <I>hexok</I> is false, <B>ppm_colorname()</B> fails and
-<a href="error.html#error">throws an error</a>.
+<a href="liberror.html#error">throws an error</a>.
 
 <P>The string returned is in static libppm library storage which is
 overwritten by every call to <B>ppm_colorname()</B>.
@@ -614,7 +614,7 @@ one of many things that could be represented by it).
 
 <P>This creates a <B>colorhash_table</B> using dynamically allocated
 storage.  There are no colors in it.  If there is not enough storage,
-<a href="error.html#error">throws an error</a>.
+<a href="liberror.html#error">throws an error</a>.
 
 <P><B>void ppm_freecolorhash()</B>
 
@@ -677,7 +677,7 @@ the index in the input <B>colorhist_vector</B> for that color.
 the input.
 
 <P>If the same color appears twice in the input,
-<B>ppm_colorhisttocolorhash()</B> <a href="error.html#error">throws an
+<B>ppm_colorhisttocolorhash()</B> <a href="liberror.html#error">throws an
 error</a>.
 
 <P><B>ncolors</B> is the number of colors in <B>chv</B>.
diff --git a/pamscale.html b/pamscale.html
index 7a23842d..855649ec 100644
--- a/pamscale.html
+++ b/pamscale.html
@@ -383,7 +383,7 @@ function.  <b>pamscale</b> offers many other filter functions, though.
 Some of these approximate sinc and are faster to compute.  For most of
 them, I have no idea of the mathematical explanation for them, but
 people do find they give pleasing results.  They may not be based on
-resampling at all, but just exploit the fact the convolution that is
+resampling at all, but just exploit the convolution that is
 coincidentally part of a resampling calculation.
 
 <p>For some filter functions, you can tell just by looking at the
@@ -395,11 +395,12 @@ fact a step function -- the very one we computed as the first step in
 the resampling.  This is mathematically equivalent to the discrete
 sampling method.
 
-<p>The box (rectangle) filter assumes the original image is a piecewise
-linear function.  Its graph just looks like straight lines connecting
-the pixel values.  This is mathematically equivalent to the pixel mixing
-method when scaling down, and interpolation (ala <b>pamstretch</b>)
-when scaling up.
+<p>The box (rectangle) filter assumes the original image is a
+piecewise linear function.  Its graph just looks like straight lines
+connecting the pixel values.  This is mathematically equivalent to the
+pixel mixing method (but mixing brightness, not light intensity, so
+like <b>pamscale -linear</b>) when scaling down, and interpolation
+(ala <b>pamstretch</b>) when scaling up.
 
 <h4>Gamma</h4>