Index: trunk/doc/book/book/ch05.xml
===================================================================
--- trunk/doc/book/book/ch05.xml
+++ trunk/doc/book/book/ch05.xml	2002-10-29 11:06:33.000000000 -0800
@@ -412,7 +412,7 @@
           </itemizedlist>
 
           <para>You can accomplish the first two items by either
-            building httpd and Subversion from source code, or by
+            building the Apache HTTP Server and Subversion from source code, or by
             installing a binary packages on your system.  The second
             appendix of this document contains more detailed
             instructions on doing this. (<xref
@@ -458,7 +458,7 @@
               class="url">http://hostname/repos/foorepo</systemitem>
             would automatically be accessible without having to
             change <filename>httpd.conf</filename> or restart
-            httpd.</para>
+            the Apache HTTP Server.</para>
           
           <para>Note that this simple <literal>&lt;Location&gt;</literal>
             setup starts life with no access restrictions at
@@ -488,8 +488,8 @@
             a repository as a whole, you can use Apache's built-in
             access control features.</para>
             
-          <para>First, create an empty file that will hold httpd
-            usernames and passwords.  Place names and crypted
+          <para>First, create an empty file that will hold Apache HTTP
+            Server usernames and passwords. Place names and crypted
             passwords into this file like so:</para>
             
           <screen>
@@ -590,7 +590,7 @@
             class="url">http://httpd.apache.org/docs-2.0/mod/directives.html</systemitem>.)</para>
             
           <para>You can test your exported repository by firing up
-            httpd:</para>
+            the Apache HTTP Server:</para>
             
           <screen>
             $ /usr/local/apache2/bin/apachectl stop
@@ -609,7 +609,7 @@
           <para>The most common reason this might fail is permission
             problems reading the repository db files.  Make sure that
             the user <literal>nobody</literal> (or whatever
-            <literal>UID</literal> the httpd process runs as) has
+            <literal>UID</literal> the Apache HTTP Server process runs as) has
             permission to read and write the Berkeley DB files!  This
             is a very common problem.</para>
             
@@ -971,9 +971,9 @@
 
           </variablelist>
             
-          <para>Note that the hooks must be executable by the user who
-            will invoke them (commonly the user httpd runs as), and
-            that same user needs to be able to access the
+          <para>Note that the hooks must be executable by the user who will
+            invoke them (commonly the user the Apache HTTP Server runs as),
+            and that same user needs to be able to access the
             repository.</para>
           
           <para>The <command>pre-commit</command> and