miscellaneous update

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

6 files changed, 12 insertions, 11 deletions

diff --git a/pamcat.html b/pamcat.html
index e0b2f845..6522396b 100644
--- a/pamcat.html
+++ b/pamcat.html
@@ -225,7 +225,7 @@ different for each image.
 
 <p>At that time, Netpbm continued to include <b>pnmcat</b>, but now it did
   nothing but invoke <b>pamcat</b> with an <b>-extendplane</b> option and pipe
-  the output through <b>pnmtopnm</b>.  It was intended for backward
+  the output through <b>pamtopnm</b>.  It was intended for backward
   compatibility only.
 
 <hr>
diff --git a/pamslice.html b/pamslice.html
index 2481c962..1100e04f 100644
--- a/pamslice.html
+++ b/pamslice.html
@@ -92,7 +92,7 @@ command line options:
 
 <a href="pamtable.html">pamtable</a>
 <a href="pamcut.html">pamcut</a>
-<a href="pnmtopnm.html">pnmtopnm</a>
+<a href="pamtopnm.html">pamtopnm</a>
 <a href="pamchannel.html">pamchannel</a>
 <a href="pnm.html">pnm</a>
 
diff --git a/pnmcat.html b/pnmcat.html
index a2affa65..15aa8d83 100644
--- a/pnmcat.html
+++ b/pnmcat.html
@@ -23,7 +23,7 @@ including the ability to process PAM images.
   <ul>
     <li><b>pamcat</b> produces PAM output, whereas <b>pnmcat</b> produces PNM.
       With <b>pamcat</b>, If your inputs are PNM and you want PNM output, you
-      can run the output through <b>pnmtopnm</b>.  But most Netpbm programs
+      can run the output through <b>pamtopnm</b>.  But most Netpbm programs
       that take PNM input can just as well take the PAM input, so this may not
       be necessary.
 
diff --git a/pnmnoraw.html b/pnmnoraw.html
index b38f343d..13abe3ae 100644
--- a/pnmnoraw.html
+++ b/pnmnoraw.html
@@ -6,7 +6,7 @@ Updated: March 2000
 
 <h2>NAME</h2>
 
-pnmnoraw - replaced by pnmtoplainpnm and pnmtopnm
+pnmnoraw - replaced by pnmtoplainpnm and pamtopnm
 
 <h2>DESCRIPTION</h2>
 
@@ -14,13 +14,14 @@ pnmnoraw - replaced by pnmtoplainpnm and pnmtopnm
 
 <p><b>pnmnoraw</b> was replaced in Netpbm 8.2 (March 2000) by <b><a
 href="pnmtoplainpnm.html">pnmtoplainpnm</a></b>, which was obsoleted by
-<b>pnmtopnm</b> in Netpbm 10.23 (July 2004).
+<b>pnmtopnm</b> in Netpbm 10.23 (July 2004), which in turn was
+obsoleted by <b>pamtopnm</b>.
 
 <p><b>pnmtoplainpnm</b> was actually the same program; it was just renamed
 to make it clear that is just a format converter.
 
-<p><b>pnmtopnm</b> is more general, in that it can go both directions.
-<b>pnmtopnm -plain</b> is the same as <b>pnmnoraw</b>.
+<p><b>pamtopnm</b> is more general, in that it can go both directions.
+<b>pamtopnm -plain</b> is the same as <b>pnmnoraw</b>.
 
 </body>
 </html>
diff --git a/pnmquant.html b/pnmquant.html
index 3c864da0..516875c1 100644
--- a/pnmquant.html
+++ b/pnmquant.html
@@ -134,7 +134,7 @@ images.  <b>ppmquant</b> continues to exist, but is only a front end
 
 <b><a href="pnmcolormap.html">pnmcolormap</a></b>,
 <b><a href="pnmremap.html">pnmremap</a></b>,
-<b><a href="ppmquantall.html">ppmquantall</a></b>,
+<b><a href="pnmquantall.html">pnmquantall</a></b>,
 <b><a href="pamdepth.html">pamdepth</a></b>,
 <b><a href="ppmdither.html">ppmdither</a></b>,
 <b><a href="ppmquant.html">ppmquant</a></b>,
diff --git a/pnmtoplainpnm.html b/pnmtoplainpnm.html
index 16fe9c9a..62e9966e 100644
--- a/pnmtoplainpnm.html
+++ b/pnmtoplainpnm.html
@@ -6,18 +6,18 @@ Updated: July 2004
 
 <h2>NAME</h2>
 
-pnmtoplainpnm - replaced by pnmtopnm
+pnmtoplainpnm - replaced by pamtopnm
 
 <h2>DESCRIPTION</h2>
 
 <p>This program is part of <a href="index.html">Netpbm</a>.
 
 <p><b>pnmtoplainpnm</b> was obsoleted in Netpbm 10.23 (July 2004) by <b><a
-href="pnmtopnm.html">pnmtopnm</a></b>.  Just use the Netpbm common option
+href="pamtopnm.html">pamtopnm</a></b>.  Just use the Netpbm common option
 <b>-plain</b>.
 
 <p><b>pnmtoplainpnm</b> exists today for backward compatibility; all it
-does is call <b>pnmtopnm -plain</b>.
+does is call <b>pamtopnm -plain</b>.
 
 <p><b>pnmtoplainpnm</b> was new in Netpbm 8.2 (March 2000) as a renaming
 of <b>pnmnoraw</b>, which was new in Pbmplus in November 1989.