diff --git a/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml b/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml
index c25b044ae3..1865ae3767 100644
--- a/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml
@@ -486,7 +486,11 @@
         to kernel panics or data corruption.</para>
     </warning>
 
-    <indexterm><primary>anonymous CVS</primary></indexterm>
+    <indexterm>
+      <primary>CVS</primary>
+      <secondary>anonymous</secondary>
+    </indexterm>
+
     <para><application>Anonymous CVS</application> and
       <application>CVSup</application> use the <emphasis>pull</emphasis>
       model of updating sources.  In the case of
diff --git a/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml b/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml
index b762cb7a18..b4514cac30 100644
--- a/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml
@@ -101,6 +101,11 @@
   <sect1 id="desktop-browsers">
     <title>Browsers</title>
 
+    <indexterm>
+      <primary>browsers</primary>
+      <secondary>web</secondary>
+    </indexterm>
+
     <para>FreeBSD does not come with a particular browser
       pre-installed.  Instead, the
       <ulink url="http://www.FreeBSD.org/ports/www.html">www</ulink>
diff --git a/en_US.ISO8859-1/books/handbook/install/chapter.sgml b/en_US.ISO8859-1/books/handbook/install/chapter.sgml
index 7d8855d9d1..d93cfd7b69 100644
--- a/en_US.ISO8859-1/books/handbook/install/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/install/chapter.sgml
@@ -2763,6 +2763,11 @@ use the current settings.
     <sect2 id="ftpanon">
       <title>Anonymous FTP</title>
 
+      <indexterm>
+	<primary>FTP</primary>
+	<secondary>anonymous</secondary>
+      </indexterm>
+
       <screen>                      User Confirmation Requested
  Do you want to have anonymous FTP access to this machine? 
 
@@ -3464,6 +3469,11 @@ To change any of these settings later, edit /etc/rc.conf
 	<filename>/etc/amd.map</filename> file defines the default
 	options for <acronym>AMD</acronym> exports.</para>
 
+      <indexterm>
+	<primary>FTP</primary>
+	<secondary>anonymous</secondary>
+      </indexterm>
+
       <para>The <guimenuitem>Anon FTP</guimenuitem> option permits anonymous
 	<acronym>FTP</acronym> connections.  Select this option to
 	make this machine an anonymous <acronym>FTP</acronym> server.
diff --git a/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml b/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml
index 878ad54569..74522b6123 100644
--- a/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml
@@ -295,7 +295,6 @@
     <indexterm>
       <primary><command>cvsup</command></primary>
     </indexterm>
-    <indexterm><primary>anonymous CVS</primary></indexterm>
     <indexterm><primary>CTM</primary></indexterm>
     <indexterm>
       <primary>CVS</primary>
@@ -1422,12 +1421,9 @@ device          fwe           # Ethernet over FireWire (non-standard!)</programl
       <sect2>
         <title>Large Memory Configurations (<acronym>PAE</acronym>)</title>
 	<indexterm>
-	  <primary>
-	    Physical Address Extensions (<acronym>PAE</acronym>)
-	  </primary>
-	  <secondary>
-	    Large Memory Configurations
-	  </secondary>
+	  <primary>Physical Address Extensions
+	    (<acronym>PAE</acronym>)</primary>
+	  <secondary>large memory</secondary>
 	</indexterm>
 
 	<para>Large memory configuration machines require access to
diff --git a/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml b/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml
index 5909bf1bf6..1e83eeb79f 100644
--- a/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml
@@ -302,6 +302,11 @@
       <sect2>
 	<title><anchor id="anoncvs-intro">Introduction</title>
 
+	<indexterm>
+	  <primary>CVS</primary>
+	  <secondary>anonymous</secondary>
+	</indexterm>
+
 	<para>Anonymous CVS (or, as it is otherwise known,
 	  <emphasis>anoncvs</emphasis>) is a feature provided by the CVS
 	  utilities bundled with FreeBSD for synchronizing with a remote
@@ -535,6 +540,10 @@ Warning: Permanently added 'anoncvs.freebsd.org' (DSA) to the list of known host
   <sect1 id="ctm">
     <title>Using CTM</title>
 
+      <indexterm>
+	<primary>CTM</primary>
+      </indexterm>
+
       <para><application>CTM</application> is a method for keeping a
 	remote directory tree in sync with a central one.  It has been
 	developed for usage with FreeBSD's source trees, though other
diff --git a/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml b/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml
index 452fcffd92..dd7e4d8598 100644
--- a/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml
@@ -1858,9 +1858,9 @@ nis_client_enable="YES"</programlisting>
 	host.</para>
 
       <para>The <command>ypserv</command> program also has support for
-	Wietse Venema's <application>tcpwrapper</application> package.
+	Wietse Venema's <application>TCP Wrapper</application> package.
 	This allows the administrator to use the
-	<application>tcpwrapper</application> configuration files for
+	<application>TCP Wrapper</application> configuration files for
 	access control instead of
 	<filename>/var/yp/securenets</filename>.</para>
 
@@ -1885,8 +1885,8 @@ nis_client_enable="YES"</programlisting>
           really bad idea and will lead to loss of NIS functionality
           for large parts of your network.</para>
 
-	<indexterm><primary>tcpwrapper</primary></indexterm>
-        <para>The use of the <application>tcpwrapper</application>
+	<indexterm><primary>TCP Wrappers</primary></indexterm>
+        <para>The use of the <application>TCP Wrapper</application>
           package increases the latency of your NIS server.  The
           additional delay may be long enough to cause timeouts in
           client programs, especially in busy networks or with slow
@@ -4211,7 +4211,7 @@ zone "0.168.192.in-addr.arpa" {
     </sect1info>
     <title>Apache HTTP Server</title>
 
-    <indexterm><primary>web server</primary>
+    <indexterm><primary>web servers</primary>
       <secondary>setting up</secondary></indexterm>
     <indexterm><primary>Apache</primary></indexterm>
 
@@ -4431,7 +4431,7 @@ DocumentRoot /www/someotherdomain.tld
       <sect3>
         <title>mod_ssl</title>
 
-	<indexterm><primary>web server</primary>
+	<indexterm><primary>web servers</primary>
           <secondary>secure</secondary></indexterm>
 	<indexterm><primary>SSL</primary></indexterm>
 	<indexterm><primary>cryptography</primary></indexterm>
@@ -4543,6 +4543,11 @@ DocumentRoot /www/someotherdomain.tld
 	restrictions.  The &man.ftpchroot.5; manual page has all of
 	the details so it will not be described in detail here.</para>
 
+      <indexterm>
+	<primary>FTP</primary>
+	<secondary>anonymous</secondary>
+      </indexterm>
+
       <para>If you would like to enable anonymous FTP access to your
 	server, then you must create a user named
 	<username>ftp</username> on your &os; system.  Users will then
@@ -4598,6 +4603,11 @@ DocumentRoot /www/someotherdomain.tld
 
       <programlisting>ftp.info      /var/log/xferlog</programlisting>
 
+      <indexterm>
+	<primary>FTP</primary>
+	<secondary>anonymous</secondary>
+      </indexterm>
+
       <para>Be aware of the potential problems involved with running
         an anonymous FTP server.  In particular, you should think
         twice about allowing anonymous users to upload files.  You may
diff --git a/en_US.ISO8859-1/books/handbook/security/chapter.sgml b/en_US.ISO8859-1/books/handbook/security/chapter.sgml
index bd343f551f..a3bd259165 100644
--- a/en_US.ISO8859-1/books/handbook/security/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/security/chapter.sgml
@@ -819,10 +819,10 @@
 	otherwise.</para>
 
       <para>You should also be fairly careful with connect-back services
-	such as <application>tcpwrapper</application>'s reverse-identd,
+	such as <application>TCP Wrapper</application>'s reverse-identd,
 	which can be attacked directly.  You generally do not want to use
 	the reverse-ident feature of
-	<application>tcpwrappers</application> for this reason.</para>
+	<application>TCP Wrapper</application> for this reason.</para>
 
       <para>It is a very good idea to protect internal services from
 	external access by firewalling them off at your border routers.
diff --git a/en_US.ISO8859-1/books/handbook/x11/chapter.sgml b/en_US.ISO8859-1/books/handbook/x11/chapter.sgml
index 250b661e7e..ba4908807e 100644
--- a/en_US.ISO8859-1/books/handbook/x11/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/x11/chapter.sgml
@@ -1041,10 +1041,10 @@ EndSection</programlisting>
 	 <literal>vrgb</literal> or <literal>vbgr</literal>: experiment and
 	 see which works best.</para></note>
 
-       <indexterm><primary>Mozilla</primary></indexterm>
-       <indexterm><primary>web browsers</primary>
-         <secondary>Mozilla</secondary>
-         <see>Mozilla</see></indexterm>
+       <indexterm>
+	 <primary>Mozilla</primary>
+         <secondary>disabling anti-aliased fonts</secondary>
+       </indexterm>
 
        <para>Anti-aliasing should be enabled the next time the X
          server is started.  However, programs must know how to take