diff --git a/docs/manual/dso.html b/docs/manual/dso.html
index ad324c8d82..bff578e444 100644
--- a/docs/manual/dso.html
+++ b/docs/manual/dso.html
@@ -132,17 +132,18 @@ HREF="mod/mod_so.html"><CODE>mod_so</CODE></A>'s <A
 HREF="mod/mod_so.html#loadmodule"><CODE>LoadModule</CODE></A> command in your
 <CODE>httpd.conf</CODE> file to load this module at server startup or restart.
 
-<P>To simplify this creation of DSO files for Apache modules (especially for
-third-party modules) a new support program named <CODE>apxs</CODE> (<EM>APache
-eXtenSion</EM>) is available. It can be used to build DSO based modules
-<EM>outside of</EM> the Apache source tree. The idea is simple: When
-installing Apache the <CODE>configure</CODE>'s <CODE>make install</CODE>
-procedure installs the Apache C header files and puts the platform-dependent
-compiler and linker flags for building DSO files into the <CODE>apxs</CODE>
-program.  This way the user can use <CODE>apxs</CODE> to compile his Apache
-module sources without the Apache distribution source tree and without having
-to fiddle with the platform-dependent compiler and linker flags for DSO
-support.
+<P>To simplify this creation of DSO files for Apache modules
+(especially for third-party modules) a new support program named <a
+href="programs/apxs.html">apxs</a> (<EM>APache eXtenSion</EM>) is
+available. It can be used to build DSO based modules <EM>outside
+of</EM> the Apache source tree. The idea is simple: When installing
+Apache the <CODE>configure</CODE>'s <CODE>make install</CODE>
+procedure installs the Apache C header files and puts the
+platform-dependent compiler and linker flags for building DSO files
+into the <CODE>apxs</CODE> program.  This way the user can use
+<CODE>apxs</CODE> to compile his Apache module sources without the
+Apache distribution source tree and without having to fiddle with the
+platform-dependent compiler and linker flags for DSO support.
 
 <P>To place the complete Apache core program into a DSO library (only required
 on some of the supported platforms to force the linker to export the apache
@@ -309,7 +310,7 @@ of</EM> the Apache source tree:
 
 <P>
 <UL>
-<LI>Build and install via <CODE>apxs</CODE>: 
+<LI>Build and install via <a href="programs/apxs.html">apxs</a>: 
 <TABLE BGCOLOR="#f0f0f0" CELLPADDING=10><TR><TD>
 <PRE>
 $ cd /path/to/3rdparty
diff --git a/docs/manual/dso.html.en b/docs/manual/dso.html.en
index ad324c8d82..bff578e444 100644
--- a/docs/manual/dso.html.en
+++ b/docs/manual/dso.html.en
@@ -132,17 +132,18 @@ HREF="mod/mod_so.html"><CODE>mod_so</CODE></A>'s <A
 HREF="mod/mod_so.html#loadmodule"><CODE>LoadModule</CODE></A> command in your
 <CODE>httpd.conf</CODE> file to load this module at server startup or restart.
 
-<P>To simplify this creation of DSO files for Apache modules (especially for
-third-party modules) a new support program named <CODE>apxs</CODE> (<EM>APache
-eXtenSion</EM>) is available. It can be used to build DSO based modules
-<EM>outside of</EM> the Apache source tree. The idea is simple: When
-installing Apache the <CODE>configure</CODE>'s <CODE>make install</CODE>
-procedure installs the Apache C header files and puts the platform-dependent
-compiler and linker flags for building DSO files into the <CODE>apxs</CODE>
-program.  This way the user can use <CODE>apxs</CODE> to compile his Apache
-module sources without the Apache distribution source tree and without having
-to fiddle with the platform-dependent compiler and linker flags for DSO
-support.
+<P>To simplify this creation of DSO files for Apache modules
+(especially for third-party modules) a new support program named <a
+href="programs/apxs.html">apxs</a> (<EM>APache eXtenSion</EM>) is
+available. It can be used to build DSO based modules <EM>outside
+of</EM> the Apache source tree. The idea is simple: When installing
+Apache the <CODE>configure</CODE>'s <CODE>make install</CODE>
+procedure installs the Apache C header files and puts the
+platform-dependent compiler and linker flags for building DSO files
+into the <CODE>apxs</CODE> program.  This way the user can use
+<CODE>apxs</CODE> to compile his Apache module sources without the
+Apache distribution source tree and without having to fiddle with the
+platform-dependent compiler and linker flags for DSO support.
 
 <P>To place the complete Apache core program into a DSO library (only required
 on some of the supported platforms to force the linker to export the apache
@@ -309,7 +310,7 @@ of</EM> the Apache source tree:
 
 <P>
 <UL>
-<LI>Build and install via <CODE>apxs</CODE>: 
+<LI>Build and install via <a href="programs/apxs.html">apxs</a>: 
 <TABLE BGCOLOR="#f0f0f0" CELLPADDING=10><TR><TD>
 <PRE>
 $ cd /path/to/3rdparty
diff --git a/docs/manual/misc/FAQ-I.html b/docs/manual/misc/FAQ-I.html
index 751800846e..c56b46d96e 100644
--- a/docs/manual/misc/FAQ-I.html
+++ b/docs/manual/misc/FAQ-I.html
@@ -31,7 +31,7 @@
   <!--#include virtual="header.html" -->
   <H1 ALIGN="CENTER">Apache Server Frequently Asked Questions</H1>
   <P>
-  $Revision: 1.7 $ ($Date: 2000/04/18 20:54:03 $)
+  $Revision: 1.8 $ ($Date: 2001/01/28 00:19:28 $)
   </P>
   <P>
   The latest version of this FAQ is always available from the main
@@ -213,21 +213,23 @@
       <STRONG>How can I rotate my log files?</STRONG>
      </A>
   <P>The simple answer: by piping the transfer log into an appropriate
-  log file rotation utility.</P>
-  <P>The longer answer: In the src/support/ directory, you will find a
-  utility called <CODE>rotatelogs</CODE> which can be used like this:<PRE>
-   TransferLog "|/path/to/rotatelogs /path/to/logs/access_log 86400"
-  </PRE> to enable daily rotation of the log files.<BR>
-  A more sophisticated solution of a logfile rotation utility is
-  available under the name <CODE>cronolog</CODE> from Andrew Ford's site at
-  <A HREF="http://www.ford-mason.co.uk/resources/cronolog/"
-  >http://www.ford-mason.co.uk/resources/cronolog/</A>. It can automatically
-  create logfile subdirectories based on time and date, and can have a
-  constant symlink point to the rotating logfiles. (As of version 1.6.1,
-  cronolog is available under the <A HREF="../LICENSE">Apache License</A>).
-  Use it like this:<PRE>
-   CustomLog "|/path/to/cronolog --symlink=/usr/local/apache/logs/access_log /usr/local/apache/logs/%Y/%m/access_log" combined
-  </PRE></P>
+  log file rotation utility.</P> <P>The longer answer: In the
+  src/support/ directory, you will find a utility called <a
+  href="../programs/rotatelogs.html">rotatelogs</a> which can be used
+  like this:<PRE> TransferLog "|/path/to/rotatelogs
+  /path/to/logs/access_log 86400" </PRE> to enable daily rotation of
+  the log files.<BR> A more sophisticated solution of a logfile
+  rotation utility is available under the name <CODE>cronolog</CODE>
+  from Andrew Ford's site at <A
+  HREF="http://www.ford-mason.co.uk/resources/cronolog/"
+  >http://www.ford-mason.co.uk/resources/cronolog/</A>. It can
+  automatically create logfile subdirectories based on time and date,
+  and can have a constant symlink point to the rotating logfiles. (As
+  of version 1.6.1, cronolog is available under the <A
+  HREF="../LICENSE">Apache License</A>).  Use it like this:<PRE>
+  CustomLog "|/path/to/cronolog
+  --symlink=/usr/local/apache/logs/access_log
+  /usr/local/apache/logs/%Y/%m/access_log" combined </PRE></P>
   <HR>
  </LI>
  <LI><A NAME="conditional-logging">
diff --git a/docs/manual/mod/core.html b/docs/manual/mod/core.html
index 6b115381bb..e0fe26a51a 100644
--- a/docs/manual/mod/core.html
+++ b/docs/manual/mod/core.html
@@ -894,11 +894,12 @@ versions of Apache prior to 1.3.  It was changed to <CODE>off</CODE>
 in order to save the network traffic for those sites that don't truly
 need the reverse lookups done.  It is also better for the end users
 because they don't have to suffer the extra latency that a lookup
-entails.
-Heavily loaded sites should leave this directive <CODE>off</CODE>, since DNS
-lookups can take considerable amounts of time. The utility <EM>logresolve</EM>,
-provided in the <EM>/support</EM> directory, can be used to look up host names
-from logged IP addresses offline.<P><HR>
+entails.  Heavily loaded sites should leave this directive
+<CODE>off</CODE>, since DNS lookups can take considerable amounts of
+time. The utility <a
+href="../programs/logresolve.html">logresolve</a>, provided in the
+<EM>/support</EM> directory, can be used to look up host names from
+logged IP addresses offline.<P><HR>
 
 <H2><A NAME="identitycheck">IdentityCheck directive</A></H2>
 <!--%plaintext &lt;?INDEX {\tt IdentityCheck} directive&gt; -->
diff --git a/docs/manual/mod/mod_auth.html b/docs/manual/mod/mod_auth.html
index a2e97f1ee6..04508d4468 100644
--- a/docs/manual/mod/mod_auth.html
+++ b/docs/manual/mod/mod_auth.html
@@ -133,10 +133,10 @@ slash), it is treated as relative to the ServerRoot.
 by a colon, followed by the crypt() encrypted password. The behavior
 of multiple occurrences of the same user is undefined.
 <P>
-The utility <code>htpasswd</code> which is installed as part of the
-binary distribution, or which can be found in <code>src/support</code>,
-is used to maintain this password file. See the <code>man</code>
-page for more details. In short
+The utility <a href="../programs/htpasswd.html">htpasswd</a> which is
+installed as part of the binary distribution, or which can be found in
+<code>src/support</code>, is used to maintain this password file. See
+the <code>man</code> page for more details. In short
 <p>
 <blockquote>
 	<code>htpasswd -c Filename username</code><br>
diff --git a/docs/manual/mod/mod_auth_db.html b/docs/manual/mod/mod_auth_db.html
index dc57f4b451..4d57738dcd 100644
--- a/docs/manual/mod/mod_auth_db.html
+++ b/docs/manual/mod/mod_auth_db.html
@@ -173,6 +173,11 @@ rely upon the string being NULL-appended, so if you are having trouble
 using DB files interchangeably between applications this may be a
 part of the problem. <P>
 
+<p>A perl script called
+href="../programs/dbmmanage.html">dbmmanage</a> is included with
+Apache.  This program can be used to create and update DB format
+password files for use with this module.</p>
+
 See also <A HREF="core.html#authname">AuthName</A>,
 <A HREF="core.html#authtype">AuthType</A> and
 <A HREF="#authdbgroupfile">AuthDBGroupFile</A>.<P>
diff --git a/docs/manual/mod/mod_auth_dbm.html b/docs/manual/mod/mod_auth_dbm.html
index 25ee0ddece..43cd444aa6 100644
--- a/docs/manual/mod/mod_auth_dbm.html
+++ b/docs/manual/mod/mod_auth_dbm.html
@@ -164,6 +164,11 @@ rely upon the string being NULL-appended, so if you are having trouble
 using DBM files interchangeably between applications this may be a
 part of the problem. <P>
 
+<p>A perl script called
+href="../programs/dbmmanage.html">dbmmanage</a> is included with
+Apache.  This program can be used to create and update DBM format
+password files for use with this module.</p>
+
 See also <A HREF="core.html#authname">AuthName</A>,
 <A HREF="core.html#authtype">AuthType</A> and
 <A HREF="#authdbmgroupfile">AuthDBMGroupFile</A>.<P>
diff --git a/docs/manual/mod/mod_auth_digest.html b/docs/manual/mod/mod_auth_digest.html
index 996a8086f1..5cda2a778b 100644
--- a/docs/manual/mod/mod_auth_digest.html
+++ b/docs/manual/mod/mod_auth_digest.html
@@ -120,8 +120,8 @@ the list of users and encoded passwords for digest authentication.
 <EM>Filename</EM> is the absolute path to the user file.
 
 <P>The digest file uses a special format. Files in this format can be
-created using the "htdigest" utility found in the support/ subdirectory of
-the Apache distribution.
+created using the <a href="../programs/htdigest.html">htdigest</a>
+utility found in the support/ subdirectory of the Apache distribution.
 
 <HR>
 
diff --git a/docs/manual/mod/mod_log_config.html b/docs/manual/mod/mod_log_config.html
index 4a980e3e40..4350b1af7d 100644
--- a/docs/manual/mod/mod_log_config.html
+++ b/docs/manual/mod/mod_log_config.html
@@ -255,7 +255,8 @@ deleted so that it will open a new log.</p>
 
 <p>Alternatively, log files can be <a
 href="../misc/FAQ.html#rotate">rotated automatically</a> be writing
-them through a pipe to a program designed for that purpose.</p>
+them through a pipe to a program designed for that purpose such
+as <a href="../programs/rotatelogs.html">rotatelogs</a>.</p>
 
 <HR>
 
diff --git a/docs/manual/stopping.html b/docs/manual/stopping.html
index ed75c8a092..b2e50b5562 100644
--- a/docs/manual/stopping.html
+++ b/docs/manual/stopping.html
@@ -43,10 +43,11 @@ Modify those examples to match your
 <A HREF="mod/core.html#serverroot">ServerRoot</A> and
 <A HREF="mod/core.html#pidfile">PidFile</A> settings.
 
-<p>A shell script called <code>apachectl</code> is provided
-which automates the processing of signalling Apache.
-For details about this script, see the documentation
-on <a href="invoking.html">starting Apache</a>.</p>
+<p>A shell script called <a
+href="programs/apachectl.html">apachectl</a> is provided which
+automates the processing of signalling Apache.  For details about this
+script, see the documentation on <a href="invoking.html">starting
+Apache</a>.</p>
 
 <H3>Stop Now</h3>
 
diff --git a/docs/manual/stopping.html.en b/docs/manual/stopping.html.en
index ed75c8a092..b2e50b5562 100644
--- a/docs/manual/stopping.html.en
+++ b/docs/manual/stopping.html.en
@@ -43,10 +43,11 @@ Modify those examples to match your
 <A HREF="mod/core.html#serverroot">ServerRoot</A> and
 <A HREF="mod/core.html#pidfile">PidFile</A> settings.
 
-<p>A shell script called <code>apachectl</code> is provided
-which automates the processing of signalling Apache.
-For details about this script, see the documentation
-on <a href="invoking.html">starting Apache</a>.</p>
+<p>A shell script called <a
+href="programs/apachectl.html">apachectl</a> is provided which
+automates the processing of signalling Apache.  For details about this
+script, see the documentation on <a href="invoking.html">starting
+Apache</a>.</p>
 
 <H3>Stop Now</h3>