diff --git a/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml b/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml
index adb4df0e33..b11369b2fb 100644
--- a/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml
@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml,v 1.60 2001/07/17 23:33:25 chern Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml,v 1.61 2001/07/19 18:38:43 chern Exp $
 -->
 
 <chapter id="advanced-networking">
@@ -1451,7 +1451,7 @@ ISDN BRI line</literallayout>
         industry standard; all major Unix systems (Solaris, HP-UX, AIX, Linux,
         NetBSD, OpenBSD, FreeBSD, etc) support NIS.</para>
 
-      <indexterm><primary>yellow pages (see NIS)</primary></indexterm>
+      <indexterm><primary>yellow pages</primary><see>NIS</see></indexterm>
       <para>NIS was formerly known as Yellow Pages (or yp), but due to
         copyright violations, Sun was forced to change the name.</para>
 
@@ -3113,7 +3113,7 @@ dhcp_flags=""</programlisting>
       <sect3>
         <title><filename>/etc/namedb/named.conf</filename></title>
 
-        <programlisting>// $FreeBSD: doc/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml,v 1.60 2001/07/17 23:33:25 chern Exp $
+        <programlisting>// $FreeBSD: doc/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml,v 1.61 2001/07/19 18:38:43 chern Exp $
 //
 // Refer to the named(8) man page for details.  If you are ever going
 // to setup a primary server, make sure you've understood the hairy
diff --git a/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml b/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml
index 97212a3f5e..153dcb6aa6 100644
--- a/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml
@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml,v 1.40 2001/07/19 23:18:08 chern Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml,v 1.41 2001/07/20 23:25:00 chern Exp $
 -->
 
 <chapter id="ppp-and-slip">
@@ -12,16 +12,29 @@
 
   <sect1>
     <title>Synopsis</title>
-    <indexterm><primary>PPP</primary></indexterm>
-    <indexterm><primary>SLIP</primary></indexterm>
+    <indexterm id="ppp-ppp">
+      <primary>PPP</primary>
+    </indexterm>
+    <indexterm id="ppp-slip">
+      <primary>SLIP</primary>
+    </indexterm>
 
     <para>If you are connecting to the Internet via modem, or wish to
       provide dial-up connections to the Internet for others using FreeBSD,
       you have the option of using PPP or SLIP.</para>
 
-    <indexterm><primary>PPP</primary><secondary>user PPP</secondary></indexterm>      
-    <indexterm><primary>PPP</primary><secondary>kernel PPP</secondary></indexterm>      
-    <indexterm><primary>PPP</primary><secondary>over Ethernet</secondary></indexterm>
+    <indexterm id="ppp-ppp-user">
+      <primary>PPP</primary>
+      <secondary>user PPP</secondary>
+    </indexterm>      
+    <indexterm id="ppp-ppp-kernel">
+      <primary>PPP</primary>
+      <secondary>kernel PPP</secondary>
+    </indexterm>      
+    <indexterm id="ppp-ppp-ethernet">
+      <primary>PPP</primary>
+      <secondary>over Ethernet</secondary>
+    </indexterm>
     <para>This chapter covers three varieties of PPP;
       <emphasis>user</emphasis>, <emphasis>kernel</emphasis>, and
       <emphasis>PPPoE</emphasis> (PPP over Ethernet).  It also covers
@@ -60,8 +73,12 @@
 	<para>This document assumes you have the following:</para>
 
 	<itemizedlist>
-	  <indexterm><primary>ISP</primary></indexterm>
-	  <indexterm><primary>PPP</primary></indexterm>
+	  <indexterm id="ppp-isp">
+	    <primary>ISP</primary>
+	  </indexterm>
+	  <indexterm id="ppp-ppp2">
+	    <primary>PPP</primary>
+	  </indexterm>
 	  <listitem>
 	    <para>An account with an Internet Service Provider (ISP) which
 	      you connect to using PPP.  Further, you have a modem or
@@ -73,18 +90,30 @@
 	    <para>The dial-up number(s) of your ISP.</para>
 	  </listitem>
 
-	  <indexterm><primary>PAP</primary></indexterm>
-	  <indexterm><primary>CHAP</primary></indexterm>
-	  <indexterm><primary>Unix</primary></indexterm>
-	  <indexterm><primary>login name</primary></indexterm>
-	  <indexterm><primary>password</primary></indexterm>
+	  <indexterm id="ppp-pap">
+	    <primary>PAP</primary>
+	  </indexterm>
+	  <indexterm id="ppp-chap">
+	    <primary>CHAP</primary>
+	  </indexterm>
+	  <indexterm id="ppp-unix">
+	    <primary>Unix</primary>
+	  </indexterm>
+	  <indexterm id="ppp-login">
+	    <primary>login name</primary>
+	  </indexterm>
+	  <indexterm id="ppp-password">
+	    <primary>password</primary>
+	  </indexterm>
 	  <listitem>
 	    <para>Your login name and password.  This can be either a
 	      regular Unix-style login and password pair, or a PAP or CHAP
 	      login and password pair.</para>
 	  </listitem>
 
-	  <indexterm><primary>name server</primary></indexterm>
+	  <indexterm id="ppp-nameserver">
+	    <primary>name server</primary>
+	  </indexterm>
 	  <listitem>
 	    <para>The IP address(es) of one or more name servers.
 	      Normally, you will be given two IP addresses by your ISP to
@@ -118,7 +147,9 @@
 	      role="netmask">255.255.255.0</hostid>.</para>
 	  </listitem>
 
-	  <indexterm><primary>static IP address</primary></indexterm>
+	  <indexterm id="ppp-statis-ip">
+	    <primary>static IP address</primary>
+	  </indexterm>
 	  <listitem>
 	    <para>If your ISP provides you with a static IP address and
 	      hostname, you can enter it.  Otherwise, we simply let the
@@ -141,7 +172,10 @@
           with FreeBSD.  However, if you have installed a custom kernel,
           you must make sure your kernel is configured for ppp.</para>
 
-	<indexterm><primary>kernel</primary><secondary>compilation</secondary></indexterm>
+	<indexterm id="ppp-kernel-compilation">
+	  <primary>kernel</primary>
+	  <secondary>compilation</secondary>
+	</indexterm>
 	<para>To check, go to your kernel compile directory
 	  (<filename>/sys/i386/conf</filename> or
 	  <filename>/sys/pc98/conf</filename>) and examine your
@@ -241,13 +275,15 @@ tun0: flags=8010&lt;POINTOPOINT,MULTICAST&gt; mtu 1500</screen>
       <sect3>
 	<title>Name Resolution Configuration</title>
 
-	<indexterm><primary>resolver</primary></indexterm>
-	<indexterm>
-    <primary><command>hostname</command></primary>
-  </indexterm>
-	<indexterm>
-    <primary><filename>hosts</filename></primary>
-  </indexterm>
+	<indexterm id="ppp-resolver">
+	  <primary>resolver</primary>
+	</indexterm>
+	<indexterm id="ppp-hostname">
+	  <primary><command>hostname</command></primary>
+	</indexterm>
+	<indexterm id="ppp-hosts">
+	  <primary><filename>hosts</filename></primary>
+	</indexterm>
 	<para>The resolver is the part of the system that turns IP
 	  addresses into hostnames and vice versa.  It can be configured
 	  to look for maps that describe IP to hostname mappings in one of
@@ -1710,7 +1746,10 @@ exit 1
   <sect1 id="pppoe">
     <title>Using <application>PPP</application> over Ethernet (PPPoE)</title>
     <indexterm><primary>PPP</primary><secondary>over Ethernet</secondary></indexterm>
-    <indexterm><primary>PPPoE (see PPP, over Ethernet)</primary></indexterm>
+    <indexterm>
+      <primary>PPPoE</primary>
+      <see>PPP, over Ethernet</see>
+    </indexterm>
 
     <para><emphasis>Contributed by &a.jim;  (from <ulink
       url="http://node.to/freebsd/how-tos/how-to-freebsd-pppoe.html">node.to</ulink>) 10 Jan 2000.</emphasis></para>
diff --git a/en_US.ISO8859-1/books/handbook/printing/chapter.sgml b/en_US.ISO8859-1/books/handbook/printing/chapter.sgml
index 84cb0f31e6..1c5828206a 100644
--- a/en_US.ISO8859-1/books/handbook/printing/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/printing/chapter.sgml
@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/printing/chapter.sgml,v 1.39 2001/07/17 23:33:26 chern Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/printing/chapter.sgml,v 1.40 2001/07/20 23:25:02 chern Exp $
 -->
 
 <chapter id="printing">
@@ -221,7 +221,10 @@
 		options with parallel interfaces, making their
 		configuration exceedingly simple.</para>
 
-	      <indexterm><primary>centronics (see parallel printers)</primary></indexterm>
+	      <indexterm>
+	        <primary>centronics</primary>
+		<see>parallel printers</see>
+	      </indexterm>
 	      <para>Parallel interfaces are sometimes known as
 		<quote>Centronics</quote> interfaces, named after the
 		connector type on the printer.</para>
@@ -2369,7 +2372,10 @@ exit 0</programlisting>
         various printers, then you probably want to consider <emphasis>header
           pages</emphasis> as a necessary evil.</para>
           
-      <indexterm><primary>banner pages (see header pages)</primary></indexterm>
+      <indexterm>
+        <primary>banner pages</primary>
+	<see>header pages</see>
+      </indexterm>
       <indexterm><primary>header pages</primary></indexterm>
       <para>Header pages, also known as <emphasis>banner</emphasis> or
         <emphasis>burst pages</emphasis> identify to whom jobs belong after