19 files changed, 450 insertions, 519 deletions

diff --git a/en_US.ISO_8859-1/books/handbook/advanced-networking/chapter.sgml b/en_US.ISO_8859-1/books/handbook/advanced-networking/chapter.sgml
index fe125009d2..9de3cdaeb5 100644
--- a/en_US.ISO_8859-1/books/handbook/advanced-networking/chapter.sgml
+++ b/en_US.ISO_8859-1/books/handbook/advanced-networking/chapter.sgml
@@ -831,8 +831,8 @@ subscribe freebsd-isdn</programlisting>
 	  
 	  <para>A TA will operate basically the same as a modem except
 	    connection and throughput speeds will be much faster than your old
-	    modem. You will need to configure <xref linkend="ppp"
-	      remap="PPP"> exactly the
+	    modem. You will need to configure <link linkend="ppp">PPP</link>
+	    exactly the
 	    same as for a modem setup. Make sure you set your serial speed as
 	    high as possible.</para>
 	  
@@ -849,9 +849,9 @@ subscribe freebsd-isdn</programlisting>
 	    problems you experienced with the PPP program and are going to
 	    persist.</para>
 	  
-	  <para>If you want maximum stability, use the kernel  <xref
-	      linkend="ppp" remap="PPP"> option, not the user-land <xref
-	      linkend="userppp" remap="iijPPP">.</para>
+	  <para>If you want maximum stability, use the kernel <link
+	      linkend="ppp">PPP</link> option, not the user-land <link
+	      linkend="userppp">iijPPP</link>.</para>
 	  
 	  <para>The following TA's are know to work with FreeBSD.</para>
 	  
@@ -876,7 +876,7 @@ subscribe freebsd-isdn</programlisting>
 	  <para>The real problem with external TA's is like modems you need a
 	    good serial card in your computer.</para>
 	  
-	  <para>You should read the <xref linkend="uart" remap="serial ports">
+	  <para>You should read the <link linkend="uart">serial ports</link>
 	    section in the handbook for a detailed understanding of serial
 	    devices, and the differences between asynchronous and synchronous
 	    serial ports.</para>
diff --git a/en_US.ISO_8859-1/books/handbook/contrib/chapter.sgml b/en_US.ISO_8859-1/books/handbook/contrib/chapter.sgml
index 9ddcdbe723..98f4ac936f 100644
--- a/en_US.ISO_8859-1/books/handbook/contrib/chapter.sgml
+++ b/en_US.ISO_8859-1/books/handbook/contrib/chapter.sgml
@@ -576,7 +576,7 @@
 	    people with an interest in such things (and a tolerance for a
 	    <emphasis>high</emphasis> volume of mail!) may subscribe to the
 	    hackers mailing list by sending mail to &a.majordomo;. See
-	    <xref linkend="eresources-mail" remap="mailing lists"> for more
+	    <link linkend="eresources-mail">mailing lists</link> for more
 	    information about this and other mailing lists.</para>
 	  
 	  <para>If you find a bug or are submitting a specific change, please
@@ -605,8 +605,8 @@
 	  <para>Changes to the documentation are overseen by the &a.doc;. Send
 	    submissions and changes (even small ones are welcome!) using
 	    <command>send-pr</command> as described in
-	    <xref linkend="contrib-general" remap="Bug Reports and General
-	      Commentary">.</para>
+	    <link linkend="contrib-general">Bug Reports and General
+	      Commentary</link>.</para>
 	  
 	</sect2>
 	
@@ -619,8 +619,8 @@
 	    There is a special on-going release of FreeBSD known as
 	    &ldquo;FreeBSD-current&rdquo; which is made available in a variety of ways
 	    for the convenience of developers working actively on the system.
-	    See <xref linkend="current"
-	      remap="Staying    current with FreeBSD"> for more information
+	    See <link linkend="current">Staying current with FreeBSD</link>
+	    for more information
 	    about getting and using FreeBSD-current.</para>
 	  
 	  <para>Working from older sources unfortunately means that your
@@ -654,8 +654,8 @@
 	    <citerefentry><refentrytitle>patch</refentrytitle><manvolnum>1</manvolnum></citerefentry> command), you should submit them for
 	    inclusion with FreeBSD. Use the <citerefentry><refentrytitle>send-pr</refentrytitle><manvolnum>1</manvolnum></citerefentry>
 	    program as described in
-	    <xref linkend="contrib-general" remap="Bug Reports and General
-	      Commentary">. <emphasis>Do not</emphasis> just send the diffs to
+	    <link linkend="contrib-general">Bug Reports and General
+	      Commentary</link>. <emphasis>Do not</emphasis> just send the diffs to
 	    the &a.hackers; or they will get lost! We greatly appreciate your
 	    submission (this is a volunteer project!); because we are busy, we
 	    may not be able to address it immediately, but it will remain in
@@ -1126,8 +1126,8 @@ USE_IMAKE=     yes
 		contents of the <literal>&#36;Id&#36;</literal>
 		line, it will be filled in automatically by CVS when the port
 		is imported to our main ports tree. You can find a more
-		detailed example in the <xref
-		  linkend="porting-samplem" remap="sample Makefile">
+		detailed example in the <link
+		  linkend="porting-samplem">sample Makefile</link>
 		section.</para>
 	      
 	    </sect4>
@@ -1415,8 +1415,8 @@ lib/X11/oneko/mouse.xpm</programlisting>
 		<makevar>DISTDIR</makevar>. Do not worry if
 		they come from site other than where you got the main source
 		tarball, we have a way to handle these situations (see the
-		description of <xref linkend="porting-patchfiles"
-		  remap="PATCHFILES"> below).</para>
+		description of <link
+		  linkend="porting-patchfiles">PATCHFILES</link> below).</para>
 	      
 	    </sect4>
 	    
@@ -1502,8 +1502,8 @@ lib/X11/oneko/mouse.xpm</programlisting>
 	    
 	    <para>Configuring the Makefile is pretty simple, and again we
 	      suggest that you look at existing examples before starting.
-	      Also, there is a <xref linkend="porting-samplem" remap="sample
-		Makefile"> in this handbook, so take a look and please follow
+	      Also, there is a <link linkend="porting-samplem">sample
+		Makefile</link> in this handbook, so take a look and please follow
 	      the ordering of variables and sections in that template to make
 	      your port easier for others to read.</para>
 	    
@@ -1663,9 +1663,9 @@ MASTER_SITE_SUBDIR=   applications</programlisting>
 	      <para>Set your mail-address here. Please. <!-- smiley --><emphasis>:)</emphasis></para>
 	      
 	      <para>For detailed description of the responsibility of
-		maintainers, refer to <xref linkend="policies-maintainer"
-		  remap="MAINTAINER
-		  on Makefiles"> section.</para>
+		maintainers, refer to <link
+		  linkend="policies-maintainer">MAINTAINER
+		  on Makefiles</link> section.</para>
 	      
 	    </sect4>
 	    
@@ -3057,8 +3057,8 @@ pre-install:
 	      either via email or to the FreeBSD, Inc. postal address given
 	      above.</para>
 	    
-	    <para>If you do not wish to be listed in our <xref
-		linkend="donors" remap="donors"> section, please specify this
+	    <para>If you do not wish to be listed in our <link
+		linkend="donors">donors</link> section, please specify this
 	      when making your donation. Thanks!</para>
 	    
 	  </sect3>
@@ -3351,7 +3351,7 @@ pre-install:
 		    <para><ulink URL="http://www.cdrom.com">Walnut Creek
 			CDROM</ulink> has donated almost more than we can say
 		      (see the
-		      <xref linkend="history" remap="history"> document for
+		      <link linkend="history">history</link> document for
 		      more details). In particular, we would like to thank
 		      them for the original hardware used for
 		      <hostid role="fqdn">freefall.FreeBSD.ORG</hostid>, our primary
diff --git a/en_US.ISO_8859-1/books/handbook/cutting-edge/chapter.sgml b/en_US.ISO_8859-1/books/handbook/cutting-edge/chapter.sgml
index 7b9ff14b51..d71df2e940 100644
--- a/en_US.ISO_8859-1/books/handbook/cutting-edge/chapter.sgml
+++ b/en_US.ISO_8859-1/books/handbook/cutting-edge/chapter.sgml
@@ -143,13 +143,13 @@ subscribe cvs-all</programlisting>
 		  <orderedlist>
 		    
 		    <listitem>
-		  <para>Use the <application><xref linkend="ctm" remap="CTM"></application>
+		  <para>Use the <application><link linkend="ctm">CTM</link></application>
 			facility. Unless you  have a good TCP/IP connection
 			at a flat rate, this is  the way to do it.</para>
 		    </listitem>
 		    
 		    <listitem>
-		      <para>Use the <xref linkend="cvsup" remap="cvsup">
+		      <para>Use the <link linkend="cvsup">cvsup</link>
 			program with <ulink
 			  URL="ftp://ftp.freebsd.org/pub/FreeBSD/FreeBSD-current/src/share/examples/cvsup/standard-supfile">this supfile</ulink>. This is the second most recommended method, since it allows  you to grab the entire collection once and then only what has changed from then on. Many people run cvsup from cron and keep their sources up-to-date automatically.</para>
 		    </listitem>
@@ -196,8 +196,8 @@ subscribe cvs-all</programlisting>
 	      <listitem>
 		<para>Before compiling current, read the Makefile in
 		  <filename>/usr/src</filename> carefully. You should at
-		  least run a <xref
-		    linkend="makeworld" remap="make world"> the first time
+		  least run a <link
+		    linkend="makeworld">make world</link> the first time
 		  through as part of the upgrading process. Reading the
 		  &a.current; will keep you up-to-date on other bootstrapping
 		  procedures that sometimes become necessary as we move
@@ -229,8 +229,7 @@ subscribe cvs-all</programlisting>
 	  <para>FreeBSD-stable is our development branch for a more low-key
 	    and conservative set of changes intended for our next mainstream
 	    release. Changes of an experimental or untested nature do not go
-	    into this branch (see <xref linkend="current"
-	      remap="FreeBSD-current">).</para>
+	    into this branch (see <link linkend="current">FreeBSD-current</link>).</para>
 	  
 	</sect2>
 	
@@ -288,13 +287,13 @@ subscribe freebsd-stable</programlisting> In the body of your
 		  <orderedlist>
 		    
 		    <listitem>
-		      <para>Use the <application><xref linkend="ctm" remap="CTM"></application>
+		      <para>Use the <application><link linkend="ctm">CTM</link></application>
 			facility. Unless you  have a good TCP/IP connection
 			at a flat rate, this is  the way to do it.</para>
 		    </listitem>
 		    
 		    <listitem>
-		      <para>Use the <xref linkend="cvsup" remap="cvsup">
+		      <para>Use the <link linkend="cvsup">cvsup</link>
 			program with <ulink
 			  URL="ftp://ftp.freebsd.org/pub/FreeBSD/FreeBSD-current/src/share/examples/cvsup/stable-supfile">this supfile</ulink>. This is the second most recommended method, since it allows  you to grab the entire collection once and then only what has changed from then on. Many people run cvsup from cron to keep their sources up-to-date automatically.</para>
 		    </listitem>
@@ -337,8 +336,8 @@ subscribe freebsd-stable</programlisting> In the body of your
 	      <listitem>
 		<para>Before compiling stable, read the Makefile in
 		  <filename>/usr/src</filename> carefully. You should at
-		  least run a <xref
-		    linkend="makeworld" remap="make world"> the first time
+		  least run a <link
+		    linkend="makeworld">make world</link> the first time
 		  through as part of the upgrading process. Reading the
 		  &a.stable; will keep you up-to-date on other bootstrapping
 		  procedures that sometimes become necessary as we move
@@ -434,9 +433,9 @@ subscribe freebsd-stable</programlisting> In the body of your
 	      caveats  related to working directly from the development
 	      sources rather than a pre-packaged release. This is particularly
 	      true if you choose the &ldquo;current&rdquo; sources. It is recommended
-	      that you read <xref linkend="current" remap="Staying current
+	      that you read <link linkend="current">Staying current
 		with
-		FreeBSD">.</para>
+		FreeBSD</link>.</para>
 	    
 	  </sect3>
 	  
@@ -467,8 +466,7 @@ subscribe freebsd-stable</programlisting> In the body of your
 	    <para><ulink
 		URL="ftp://ftp.FreeBSD.ORG/pub/FreeBSD/CTM">ftp://ftp.FreeBSD.ORG/pub/FreeBSD/CTM</ulink></para>
 	    
-	    <para>or see section <xref linkend="mirrors-ctm"
-		remap="mirrors">.</para>
+	    <para>or see section <link linkend="mirrors-ctm">mirrors</link>.</para>
 	    
 	    <para>FTP the relevant directory and fetch the
 	      <filename>README</filename> file, starting from there.</para>
@@ -793,7 +791,7 @@ subscribe freebsd-stable</programlisting> In the body of your
 	    
 	    <para>The easiest way to install <application>CVSup</application> if you are running FreeBSD
 	      2.2 or later is to use either <ulink
-		URL="ftp://ftp.freebsd.org/pub/FreeBSD/ports-current/net/cvsup.tar">the port</ulink> from the FreeBSD <xref linkend="ports" remap="ports collection"> or the corresponding <ulink URL="ftp://ftp.freebsd.org/pub/FreeBSD/packages-current/net/cvsup-15.3.tgz">binary package</ulink>, depending on whether you prefer to roll your own or not.</para>
+		URL="ftp://ftp.freebsd.org/pub/FreeBSD/ports-current/net/cvsup.tar">the port</ulink> from the FreeBSD <link linkend="ports">ports collection</link> or the corresponding <ulink URL="ftp://ftp.freebsd.org/pub/FreeBSD/packages-current/net/cvsup-15.3.tgz">binary package</ulink>, depending on whether you prefer to roll your own or not.</para>
 	    
 	    <para>If you are running FreeBSD-2.1.6 or 2.1.7, you unfortunately
 	      cannot use the binary package versions due to the fact that it
@@ -898,28 +896,28 @@ subscribe freebsd-stable</programlisting> In the body of your
 	      <itemizedlist>
 		
 		<listitem>
-		  <para><xref linkend="cvsup-config-files" remap="Which files
-		      do you want to receive?"></para>
+		  <para><link linkend="cvsup-config-files">Which files
+		      do you want to receive?</link></para>
 		</listitem>
 		
 		<listitem>
-		  <para><xref linkend="cvsup-config-vers" remap="Which
-		      versions of them do you want?"></para>
+		  <para><link linkend="cvsup-config-vers">Which
+		      versions of them do you want?</link></para>
 		</listitem>
 		
 		<listitem>
-		  <para><xref linkend="cvsup-config-where" remap="Where do you
-		      want to get them from?"></para>
+		  <para><link linkend="cvsup-config-where">Where do you
+		      want to get them from?</link></para>
 		</listitem>
 		
 		<listitem>
-		  <para><xref linkend="cvsup-config-dest" remap="Where do you
-		      want to put them on your own machine?"></para>
+		  <para><link linkend="cvsup-config-dest">Where do you
+		      want to put them on your own machine?</link></para>
 		</listitem>
 		
 		<listitem>
-		  <para><xref linkend="cvsup-config-status" remap="Where do
-		      you want to put your status files?"></para>
+		  <para><link linkend="cvsup-config-status">Where do
+		      you want to put your status files?</link></para>
 		</listitem>
 		
 	      </itemizedlist>
@@ -966,8 +964,8 @@ subscribe freebsd-stable</programlisting> In the body of your
 	    
 	    <para>With this background, we will now proceed to construct a
 	      <filename>supfile</filename> for receiving and updating the main
-	      source tree of <xref
-		linkend="current" remap="FreeBSD-current">.</para>
+	      source tree of <link
+		linkend="current">FreeBSD-current</link>.</para>
 	    
 	    
 	      <itemizedlist>
@@ -977,8 +975,8 @@ subscribe freebsd-stable</programlisting> In the body of your
 		  
 		<para>The files available via <application>CVSup</application> are organized into named
 		  groups called &ldquo;collections&rdquo;. The collections that are
-		    available are described <xref linkend="cvsup-collec"
-		      remap="here">. In this example, we wish to receive the
+		    available are described <link
+		  linkend="cvsup-collec">here</link>. In this example, we wish to receive the
 		    entire main source tree for the FreeBSD system. There is
 		    a single large collection <literal>src-all</literal> which will give us all
 		    of that, except the export-controlled cryptography
@@ -1200,9 +1198,9 @@ cvs-crypto</programlisting>
 		  <para>Where do you want to get them from?<anchor id="cvsup-config-where"></para>
 		  
 		<para>We use the <literal>host=</literal> field to tell <command>cvsup</command> where to obtain
-		    its updates. Any of the <xref linkend="mirrors-cvsup"
-		      remap="CVSup
-		      mirror sites"> will do, though you should try to select
+		    its updates. Any of the <link
+		  linkend="mirrors-cvsup">CVSup
+		      mirror sites</link> will do, though you should try to select
 		    one that's near to you. In this example, we'll use the
 		    primary FreeBSD distribution site,
 		  <hostid role="fqdn">cvsup.FreeBSD.org</hostid>:</para>
diff --git a/en_US.ISO_8859-1/books/handbook/hw/chapter.sgml b/en_US.ISO_8859-1/books/handbook/hw/chapter.sgml
index 9b9b9db7f5..9a915a7c17 100644
--- a/en_US.ISO_8859-1/books/handbook/hw/chapter.sgml
+++ b/en_US.ISO_8859-1/books/handbook/hw/chapter.sgml
@@ -10,9 +10,9 @@
 	that FreeBSD supports, this section serves as a catalog of the device
 	drivers included with FreeBSD and the hardware each drivers supports.
 	Where possible and appropriate, notes about specific products are
-	included. You may also want to refer to <xref
-	  linkend="kernelconfig-config"
-	  remap="the kernel configuration file"> section in this handbook for
+	included. You may also want to refer to <link
+	  linkend="kernelconfig-config">the kernel configuration
+	file</link> section in this handbook for
 	a list of supported devices.</para>
       
       <para>As FreeBSD is a volunteer project without a funded testing
@@ -21,7 +21,7 @@
 	that does or does not work with FreeBSD, please let us know by sending
 	e-mail to the &a.doc;. Questions about supported hardware should be
 	directed to the &a.questions; (see
-	<xref linkend="eresources-mail" remap="Mailing Lists"> for more
+	<link linkend="eresources-mail">Mailing Lists</link> for more
 	information). When submitting information or asking a question,
 	please remember to specify exactly what version of FreeBSD you are
 	using and include as many details of your hardware as possible.</para>
@@ -297,7 +297,7 @@
 	      Note that the Meteor frame grabber card <emphasis>will not
 		work</emphasis> with motherboards based on the 440FX chipset!
 	      See the
-	      <xref linkend="hw-mb" remap="motherboard reference"> section for
+	      <link linkend="hw-mb">motherboard reference</link> section for
 	      details. In such cases, it's better to go with a BT848 based
 	      board.</para>
 	    
@@ -655,8 +655,8 @@
 	  <title>* Memory</title>
 	  
 	  <para>The minimum amount of memory you must have to install FreeBSD
-	    is 5 MB. Once your system is up and running you can <xref
-	      linkend="kernelconfig-building" remap="build a custom kernel">
+	    is 5 MB. Once your system is up and running you can <link
+	      linkend="kernelconfig-building">build a custom kernel</link>
 	    that will use less memory. If you use the <filename>boot4.flp</filename> you can get
 	    away with having only 4 MB.</para>
 	  
@@ -2695,8 +2695,8 @@ device          sio11   at isa? port 0x138 tty flags 0xb05 irq 9 vector siointr<
 		it back in, and I suggest you do not either.</para>
 	      
 	      <para>If you do not already have a custom kernel configuration
-		file set up, refer to <xref
-		  linkend="kernelconfig" remap="Kernel Configuration"> for
+		file set up, refer to <link
+		  linkend="kernelconfig">Kernel Configuration</link> for
 		general procedures. The following are the specifics for the
 		Boca 16 board and assume you are using the kernel name
 		MYKERNEL and editing with vi.</para>
@@ -2854,8 +2854,8 @@ sio16: type 16550A (multiport master)</screen>
 	    <procedure>
 	      <step>
 		<para>Add the <devicename>cy</devicename> device to
-		  your <xref linkend="kernelconfig-config"
-		    remap="kernel configuration"> (note that your irq and
+		  your <link linkend="kernelconfig-config">kernel
+		    configuration</link> (note that your irq and
 		  iomem settings may differ).</para>
 		    
 		    <programlisting>
@@ -2863,13 +2863,13 @@ device cy0 at isa? tty irq 10 iomem 0xd4000 iosiz 0x2000 vector cyintr</programl
 		</step>
 		
 	      <step>
-		<para><xref linkend="kernelconfig-building" remap="Rebuild
-		    and install">  the new kernel.</para>
+		<para><link linkend="kernelconfig-building">Rebuild
+		    and install</link>  the new kernel.</para>
 	      </step>
 	      
 	      <step>
-		<para>Make the <xref linkend="kernelconfig-nodes"
-		    remap="device nodes"> by typing (the following example
+		<para>Make the <link linkend="kernelconfig-nodes">device
+		    nodes</link> by typing (the following example
 		  assumes an 8-port board):</para>
 		  
 		  <informalexample>
@@ -2879,9 +2879,8 @@ device cy0 at isa? tty irq 10 iomem 0xd4000 iosiz 0x2000 vector cyintr</programl
 	      </step>
 	      
 	      <step>
-		<para>If appropriate, add <xref linkend="dialup"
-		    remap="dialup"> entries to <xref linkend="dialup-ttys"
-		    remap="/etc/ttys">
+		<para>If appropriate, add <link linkend="dialup">dialup</link>
+		    entries to <link linkend="dialup-ttys">/etc/ttys</link>
 		  by  duplicating serial device (<literal>ttyd</literal>) entries and  using <literal>ttyc</literal> in place of <literal>ttyd</literal>. For example:</para>
 		    
 		    <programlisting>
@@ -3414,9 +3413,8 @@ disk            wd3     at wdc1 drive 1</programlisting>
 	    more strict standard allowing devices from different vendors to
 	    work together. This effort was recognized in the ANSI SCSI-1
 	    standard. The SCSI-1 standard (approx 1985) is rapidly becoming
-	    obsolete. The current standard is SCSI-2 (see <xref
-	      linkend="scsi-further-reading"
-	      remap="Further         reading">), with SCSI-3 on the drawing
+	    obsolete. The current standard is SCSI-2 (see <link
+	      linkend="scsi-further-reading">Further reading</link>), with SCSI-3 on the drawing
 	    boards.</para>
 	  
 	  <para>In addition to a physical interconnection standard, SCSI
@@ -3619,8 +3617,8 @@ disk            wd3     at wdc1 drive 1</programlisting>
 		standard.</para>
 	      
 	      <para>For connector pinning and connector types please refer to
-		the SCSI-2 standard (see <xref linkend="scsi-further-reading"
-		  remap="Further             reading">) itself, connectors etc
+		the SCSI-2 standard (see <link
+		linkend="scsi-further-reading">Further reading</link>) itself, connectors etc
 		are listed there in painstaking detail.</para>
 	      
 	      <para>Beware of devices using non-standard cabling. For instance
@@ -4559,13 +4557,13 @@ options        "TUNE_1542"             #dynamic tune of bus DMA speed</programli
 	    <para><emphasis>Contributed by &a.asami;.<!-- <br> -->17 February
 		1998.</emphasis></para>
 	    
-	    <para>As mentioned in the <xref linkend="scsi" remap="SCSI">
+	    <para>As mentioned in the <link linkend="scsi">SCSI</link>
 	      section, virtually all SCSI hard drives sold today are SCSI-2
 	      compliant and thus will work fine as long as you connect them to
 	      a supported SCSI host adapter. Most problems people encounter
 	      are either due to badly designed cabling (cable too long, star
 	      topology, etc.), insufficient termination, or defective parts.
-	      Please refer to the <xref linkend="scsi" remap="SCSI">
+	      Please refer to the <link linkend="scsi">SCSI</link>
 	      section first if your SCSI hard drive is not working. However,
 	      there are a couple of things you may want to take into account
 	      before you purchase SCSI hard drives for your system.</para>
@@ -4719,8 +4717,8 @@ options        "TUNE_1542"             #dynamic tune of bus DMA speed</programli
 	      drives. The interfaces are SCSI, IDE, Floppy and Parallel Port.
 	      A wide variety of tape drives are available for these
 	      interfaces. Controllers are discussed in
-	      <xref linkend="hw-storage-controllers" remap="Disk/tape
-		controllers"></para>
+	      <link linkend="hw-storage-controllers">Disk/tape
+		controllers</link>.</para>
 	    
 	  </sect3>
 	  
@@ -4744,99 +4742,95 @@ options        "TUNE_1542"             #dynamic tune of bus DMA speed</programli
 	    <sect4>
 	      <title>4mm (DAT: Digital Audio Tape)</title>
 	      
-	      <para><xref linkend="hw-storage-python" remap="Archive
-		  Python"></para>
+	      <para><link linkend="hw-storage-python">Archive
+		  Python</link></para>
 	      
-	      <para><xref linkend="hw-storage-hp1533a" remap="HP
-		  C1533A"></para>
+	      <para><link linkend="hw-storage-hp1533a">HP
+		  C1533A</link></para>
 	      
-	      <para><xref linkend="hw-storage-hp1534a" remap="HP
-		  C1534A"></para>
+	      <para><link linkend="hw-storage-hp1534a">HP
+		  C1534A</link></para>
 	      
-	      <para><xref linkend="hw-storage-hp35450a" remap="HP
-		  35450A"></para>
+	      <para><link linkend="hw-storage-hp35450a">HP
+		  35450A</link></para>
 	      
-	      <para><xref linkend="hw-storage-hp35470a" remap="HP
-		  35470A"></para>
+	      <para><link linkend="hw-storage-hp35470a">HP
+		  35470A</link></para>
 	      
-	      <para><xref linkend="hw-storage-hp35480a" remap="HP
-		  35480A"></para>
+	      <para><link linkend="hw-storage-hp35480a">HP
+		  35480A</link></para>
 	      
-	      <para><xref linkend="hw-storage-sdt5000"
-		  remap="SDT-5000"></para>
+	      <para><link linkend="hw-storage-sdt5000">SDT-5000</link></para>
 	      
-	      <para><xref linkend="hw-storage-wangtek6200" remap="Wangtek
-		  6200"></para>
+	      <para><link linkend="hw-storage-wangtek6200">Wangtek
+		  6200</link></para>
 	      
 	    </sect4>
 	    
 	    <sect4>
 	      <title>8mm (Exabyte)</title>
 	      
-	      <para><xref linkend="hw-storage-exb8200"
-		  remap="EXB-8200"></para>
+	      <para><link linkend="hw-storage-exb8200">EXB-8200</link></para>
 	      
-	      <para><xref linkend="hw-storage-exb8500"
-		  remap="EXB-8500"></para>
+	      <para><link linkend="hw-storage-exb8500">EXB-8500</link></para>
 	      
-	      <para><xref linkend="hw-storage-exb8505"
-		  remap="EXB-8505"></para>
+	      <para><link linkend="hw-storage-exb8505">EXB-8505</link></para>
 	      
 	    </sect4>
 	    
 	    <sect4>
 	      <title>QIC (Quarter-Inch Cartridge)</title>
 	      
-	      <para><xref linkend="hw-storage-anaconda" remap="Archive
-		  Ananconda 2750"></para>
+	      <para><link linkend="hw-storage-anaconda">Archive
+		  Ananconda 2750</link></para>
 	      
-	      <para><xref linkend="hw-storage-viper60" remap="Archive Viper
-		  60"></para>
+	      <para><link linkend="hw-storage-viper60">Archive Viper
+		  60</link></para>
 	      
-	      <para><xref linkend="hw-storage-viper150" remap="Archive Viper
-		  150"></para>
+	      <para><link linkend="hw-storage-viper150">Archive Viper
+		  150</link></para>
 	      
-	      <para><xref linkend="hw-storage-viper2525" remap="Archive Viper
-		  2525"></para>
+	      <para><link linkend="hw-storage-viper2525">Archive Viper
+		  2525</link></para>
 	      
-	      <para><xref linkend="hw-storage-tandberg3600" remap="Tandberg
-		  TDC 3600"></para>
+	      <para><link linkend="hw-storage-tandberg3600">Tandberg
+		  TDC 3600</link></para>
 	      
-	      <para><xref linkend="hw-storage-tandberg3620" remap="Tandberg
-		  TDC 3620"></para>
+	      <para><link linkend="hw-storage-tandberg3620">Tandberg
+		  TDC 3620</link></para>
 	      
-	      <para><xref linkend="hw-storage-tandberg4222" remap="Tandberg
-		  TDC 4222"></para>
+	      <para><link linkend="hw-storage-tandberg4222">Tandberg
+		  TDC 4222</link></para>
 	      
-	      <para><xref linkend="hw-storage-wangtek5525es" remap="Wangtek
-		  5525ES"></para>
+	      <para><link linkend="hw-storage-wangtek5525es">Wangtek
+		  5525ES</link></para>
 	      
 	    </sect4>
 	    
 	    <sect4>
 	      <title>DLT (Digital Linear Tape)</title>
 	      
-	      <para><xref linkend="hw-storage-dectz87" remap="Digital
-		  TZ87"></para>
+	      <para><link linkend="hw-storage-dectz87">Digital
+		  TZ87</link></para>
 	      
 	    </sect4>
 	    
 	    <sect4>
 	      <title>Mini-Cartridge</title>
 	      
-	      <para><xref linkend="hw-storage-ctms3200" remap="Conner CTMS
-		  3200"></para>
+	      <para><link linkend="hw-storage-ctms3200">Conner CTMS
+		  3200</link></para>
 	      
-	      <para><xref linkend="hw-storage-exb2501" remap="Exabyte
-		  2501"></para>
+	      <para><link linkend="hw-storage-exb2501">Exabyte
+		  2501</link></para>
 	      
 	    </sect4>
 	    
 	    <sect4>
 	      <title>Autoloaders/Changers</title>
 	      
-	      <para><xref linkend="hw-storage-hp1553a" remap="Hewlett-Packard
-		  HP C1553A Autoloading DDS2"></para>
+	      <para><link linkend="hw-storage-hp1553a">Hewlett-Packard
+		  HP C1553A Autoloading DDS2</link></para>
 	      
 	    </sect4>
 	  </sect3>
@@ -4850,8 +4844,8 @@ options        "TUNE_1542"             #dynamic tune of bus DMA speed</programli
 	  <sect3>
 	    <title>Floppy drives</title>
 	    
-	    <para><xref linkend="hw-storage-conner420r" remap="Conner
-		420R"></para>
+	    <para><link linkend="hw-storage-conner420r">Conner
+		420R</link></para>
 	    
 	  </sect3>
 	  
@@ -4880,8 +4874,8 @@ options        "TUNE_1542"             #dynamic tune of bus DMA speed</programli
 	      
 	      <para>Data transfer rate is 350kB/s using
 		<citerefentry><refentrytitle>dump</refentrytitle><manvolnum>8</manvolnum></citerefentry>. Rates of 530kB/s have been
-		reported when using <xref
-		  linkend="hw-storage-amanda" remap="Amanda"></para>
+		reported when using <link
+		  linkend="hw-storage-amanda">Amanda</link></para>
 	      
 	      <para>Production of this drive has been discontinued.</para>
 	      
@@ -5446,9 +5440,9 @@ scsi -f $2 -s 100 -c "1b 0 0 $cdb3 $cdb4 $cdb5"</programlisting>
 	      
 	      <para>Native capacity is 2GB when using 90m tapes. It cannot
 		handle 120m tapes. This drive supports hardware data
-		compression. Please refer to the section on <xref
-		  linkend="hw-storage-hp1533a" remap="HP
-		  C1533A"> for the proper switch settings.</para>
+		compression. Please refer to the section on <link
+		  linkend="hw-storage-hp1533a">HP
+		  C1533A</link> for the proper switch settings.</para>
 	      
 	      <para>Data transfer rate is 183kB/s.</para>
 	      
@@ -5533,8 +5527,8 @@ scsi -f $2 -s 100 -c "1b 0 0 $cdb3 $cdb4 $cdb5"</programlisting>
 	    <sect4 id="hw-storage-tandberg3620">
 	      <title>Tandberg TDC 3620</title>
 	      
-	      <para>This is very similar to the <xref
-		  linkend="hw-storage-tandberg3600" remap="Tandberg TDC 3600">
+	      <para>This is very similar to the <link
+		  linkend="hw-storage-tandberg3600">Tandberg TDC 3600</link>
 		drive.</para>
 	      
 	      <para>Reported by: &a.joerg;</para>
@@ -5635,7 +5629,7 @@ scsi -f $2 -s 100 -c "1b 0 0 $cdb3 $cdb4 $cdb5"</programlisting>
 	      1997.</emphasis></para>
 	  
 	  <para>As mentioned in
-	    <xref linkend="hw-jordans-picks-cdrom" remap="Jordan's Picks">
+	    <link linkend="hw-jordans-picks-cdrom">Jordan's Picks</link>
 	    Generally speaking those in <emphasis>The FreeBSD
 	      Project</emphasis> prefer SCSI CDROM drives over IDE CDROM
 	    drives. However not all SCSI CDROM drives are equal. Some feel
@@ -5648,9 +5642,9 @@ scsi -f $2 -s 100 -c "1b 0 0 $cdb3 $cdb4 $cdb5"</programlisting>
 	  
 	  <para>Another area where SCSI CDROM manufacturers are cutting
 	    corners is adhearance to the 
-	    <xref linkend="scsi-further-reading" remap="SCSI specification">.
+	    <link linkend="scsi-further-reading">SCSI specification</link>.
 	    Many SCSI CDROMs will respond to
-	    <xref linkend="scsi-rogue-devices" remap="multiple LUNs"> for its
+	    <link linkend="scsi-rogue-devices">multiple LUNs</link> for its
 	    target address. Known violators include the 6x Teac CD-56S
 	    1.0D.</para>
 	  
@@ -5757,9 +5751,9 @@ scsi -f $2 -s 100 -c "1b 0 0 $cdb3 $cdb4 $cdb5"</programlisting>
 		QIC drives are not quiet. These drives audibly seek before
 		they begin to record data and are clearly audible whenever
 		reading, writing or seeking. QIC tapes measure (6 x 4 x 0.7
-		inches; 15.2 x 10.2 x 1.7 mm). <xref
-		  linkend="hw-storage-tapebackups-mini"
-		  remap="Mini-cartridges">, which also use 1/4" wide tape are
+		inches; 15.2 x 10.2 x 1.7 mm). <link
+		  linkend="hw-storage-tapebackups-mini">Mini-cartridges</link>,
+		which also use 1/4" wide tape are
 		discussed separately. Tape libraries and changers are not
 		available.</para>
 	      
diff --git a/en_US.ISO_8859-1/books/handbook/install/chapter.sgml b/en_US.ISO_8859-1/books/handbook/install/chapter.sgml
index deba3e99bc..9f6aff2b43 100644
--- a/en_US.ISO_8859-1/books/handbook/install/chapter.sgml
+++ b/en_US.ISO_8859-1/books/handbook/install/chapter.sgml
@@ -21,8 +21,8 @@
 	itself).</para>
       
       <para>For more information on obtaining the latest FreeBSD
-	distributions, please see <xref linkend="mirrors" remap="Obtaining
-	  FreeBSD"> in the
+	distributions, please see <link linkend="mirrors">Obtaining
+	  FreeBSD</link> in the
 	Appendix.</para>
       
       <para>So, to get the show on the road, follow these steps:</para>
@@ -30,8 +30,8 @@
 	<procedure>
 	  
 	  <step>
-	    <para>Review the <xref linkend="install-hw" remap="supported
-		configurations"> section of this installation guide to be sure
+	    <para>Review the <link linkend="install-hw">supported
+		configurations</link> section of this installation guide to be sure
 	      that your hardware is supported by FreeBSD. It may be helpful
 	      to make a list of any special cards you have installed, such as
 	      SCSI controllers, Ethernet adapters or sound cards. This list
@@ -162,7 +162,7 @@ Boot:
 	probing to be 100 percent reliable. In the event that your hardware
 	is incorrectly identified, or that the probing causes your computer to
 	lock up, first check the
-	<xref linkend="install-hw" remap="supported       configurations">
+	<link linkend="install-hw">supported       configurations</link>
 	section of this installation guide to be sure that your hardware is
 	indeed supported by FreeBSD.</para>
       
@@ -214,8 +214,8 @@ Boot:
 	configuration mode will be permanent so you do not have to reconfigure
 	every time you boot. Even so, it is likely that you will want to
 	build a custom kernel to optimize the performance of your system. See
-	<xref linkend="kernelconfig"
-	  remap="Kernel configuration"> for more information on creating
+	<link linkend="kernelconfig"
+	 >Kernel configuration</link> for more information on creating
 	custom kernels.</para>
       
       
@@ -686,8 +686,8 @@ Boot:
 	  <title>Before installing from CDROM</title>
 	  
 	  <para>If your CDROM is of an unsupported type, then please skip to
-	    <xref linkend="install-msdos" remap="MS-DOS
-	      Preparation">.</para>
+	    <link linkend="install-msdos">MS-DOS
+	      Preparation</link>.</para>
 	  
 	  <para>There is not a lot of preparatory work that needs to be done
 	    to successfully install from one of Walnut Creek's FreeBSD CDROMs
@@ -708,8 +708,8 @@ Boot:
 	    the available options.</para>
 	  
 	  <para>If you are creating the boot floppy from a UNIX machine, see
-	    <xref linkend="install" remap="the beginning of this
-	      guide"> for examples. of how to create the boot floppy.</para>
+	    <link linkend="install">the beginning of this
+	      guide</link> for examples. of how to create the boot floppy.</para>
 	  
 	  <para>Once you have booted from DOS or floppy, you should then be
 	    able to select CDROM as the media type in the Media menu and load
@@ -914,7 +914,7 @@ ftp:*:99:99::0:0:FTP:/cdrom:/nonexistent</programlisting>
 	    dialer provides only a very simple terminal emulator. If you're
 	    using PAP or CHAP, you'll need to type the necessary <command>set
 	    authname</command> and <command>set authkey</command> commands before typing <command>term</command>.
-	    Refer to the user-ppp <xref linkend="userppp" remap="handbook">
+	    Refer to the user-ppp <link linkend="userppp">handbook</link>
 	    and <ulink URL="../FAQ/userppp.html">FAQ</ulink> entries for
 	    further information. If you have problems, logging can be
 	    directed to the screen using the command <command>set
@@ -930,9 +930,9 @@ ftp:*:99:99::0:0:FTP:/cdrom:/nonexistent</programlisting>
 	  <para>Finally, for the fastest possible network installation, an
 	    ethernet adaptor is always a good choice! FreeBSD supports most
 	    common PC ethernet cards, a table of supported cards (and their
-	    required settings) is provided in <xref linkend="install-hw"
-	      remap="Supported
-	      Hardware">. If you are using one of the supported PCMCIA
+	    required settings) is provided in <link linkend="install-hw"
+	     >Supported
+	      Hardware</link>. If you are using one of the supported PCMCIA
 	    ethernet cards, also be sure that it is plugged in
 	    <emphasis>before</emphasis> the laptop is powered on! FreeBSD
 	    does not, unfortunately, currently support hot insertion of PCMCIA
@@ -1203,7 +1203,7 @@ ftp:*:99:99::0:0:FTP:/cdrom:/nonexistent</programlisting>
 	  has been ported to FreeBSD.</para>
 	
 	<para>There is also a (technically) nice application available in the
-	  <xref linkend="ports" remap="The Ports Collection"> called pcemu
+	  <link linkend="ports">The Ports Collection</link> called pcemu
 	  which allows you to run many basic MS-DOS text-mode binaries by
 	  entirely emulating an 8088 CPU.</para>
 	
diff --git a/en_US.ISO_8859-1/books/handbook/introduction/chapter.sgml b/en_US.ISO_8859-1/books/handbook/introduction/chapter.sgml
index 9102cbd9b6..6970021feb 100644
--- a/en_US.ISO_8859-1/books/handbook/introduction/chapter.sgml
+++ b/en_US.ISO_8859-1/books/handbook/introduction/chapter.sgml
@@ -3,14 +3,13 @@
       
       <para>FreeBSD is a 4.4BSD-Lite based operating system for Intel
 	architecture (x86) based PCs. For an overview of FreeBSD, see
-	<xref linkend="nutshell" remap="FreeBSD in a nutshell">. For a
-	history of the project, read <xref linkend="history" remap="a brief
-	  history of FreeBSD">. To see a description of the latest release,
-	read <xref linkend="relnotes" remap="about the current
-	  release">. If you're interested in contributing something to the
+	<link linkend="nutshell">FreeBSD in a nutshell</link>. For a
+	history of the project, read <link linkend="history">a brief
+	  history of FreeBSD</link>. To see a description of the latest release,
+	read <link linkend="relnotes">about the current
+	  release</link>. If you're interested in contributing something to the
 	FreeBSD project (code, equipment, sacks of unmarked bills), please see
-	about <xref linkend="contrib"
-	  remap="contributing to FreeBSD">.</para>
+	about <link linkend="contrib">contributing to FreeBSD</link>.</para>
       
       
       <sect1 id="nutshell">
@@ -255,8 +254,8 @@
 	
 	
 	<para>FreeBSD is available in both source and binary form on CDROM and
-	  via anonymous ftp. See <xref linkend="mirrors" remap="Obtaining
-	    FreeBSD">  for more details.</para>
+	  via anonymous ftp. See <link linkend="mirrors">Obtaining
+	    FreeBSD</link>  for more details.</para>
 	
       </sect1>
       
@@ -391,8 +390,8 @@
 	
 	<para>The development of FreeBSD is a very open and flexible process,
 	  FreeBSD being literally built from the contributions of hundreds of
-	  people around the world, as can be seen from our <xref
-	    linkend="staff" remap="list of contributors">. We are constantly
+	  people around the world, as can be seen from our <link
+	    linkend="staff">list of contributors</link>. We are constantly
 	  on the lookout for new developers and ideas, and those interested in
 	  becoming more closely involved with the project need simply contact
 	  us at the &a.hackers;. Those who prefer to work more independently
@@ -411,12 +410,12 @@
 	      <listitem>
 		<para>The central source tree for FreeBSD is maintained by
 		  <ulink
-		    URL="http://www.cyclic.com/cyclic-pages/CVS-sheet.html">CVS</ulink> (Concurrent Version System), a freely available source code control tool which comes bundled with FreeBSD. The primary <ulink URL="http://www.freebsd.org/cgi/cvsweb.cgi">CVS repository</ulink> resides on a machine in Concord CA, USA from where it is replicated to numerous mirror machines throughout the world. The CVS tree, as well as the <xref linkend="current" remap="-current"> and <xref
-		    linkend="stable" remap="-stable"> trees which are checked
+		    URL="http://www.cyclic.com/cyclic-pages/CVS-sheet.html">CVS</ulink> (Concurrent Version System), a freely available source code control tool which comes bundled with FreeBSD. The primary <ulink URL="http://www.freebsd.org/cgi/cvsweb.cgi">CVS repository</ulink> resides on a machine in Concord CA, USA from where it is replicated to numerous mirror machines throughout the world. The CVS tree, as well as the <link linkend="current">-current</link> and <link
+		    linkend="stable">-stable</link> trees which are checked
 		  out of it, can be easily replicated to your own machine as
 		  well. Please refer to the
-		  <xref linkend="synching" remap="Synchronizing your source
-		    tree"> section for more information on doing this.</para>
+		  <link linkend="synching">Synchronizing your source
+		    tree</link> section for more information on doing this.</para>
 	      </listitem>
 	    </varlistentry>
 	    
@@ -424,7 +423,7 @@
 		  list<anchor id="development-committers"></term>
 	      
 	      <listitem>
-		<para>The <xref linkend="staff-committers" remap="committers">
+		<para>The <link linkend="staff-committers">committers</link>
 		  are the people who have <emphasis>write</emphasis> access to
 		  the CVS tree, and are thus authorized to make modifications
 		  to the FreeBSD source (the term &ldquo;committer&rdquo; comes from the
@@ -439,8 +438,8 @@
 		  team<anchor id="development-core"></term>
 	      
 	      <listitem>
-		<para>The <xref linkend="staff-core" remap="FreeBSD core
-		    team"> would be equivalent to the board of directors if
+		<para>The <link linkend="staff-core">FreeBSD core
+		    team</link> would be equivalent to the board of directors if
 		  the FreeBSD Project were a company. The primary task of the
 		  core team is to make sure the project, as a whole, is in
 		  good shape and is heading in the right directions. Inviting
@@ -451,8 +450,8 @@
 		  who's addiction to the project got the better of
 		  them.</para>
 
-		<para>Some core team members also have specific <xref
-		    linkend="staff-who" remap="areas of responsibility">,
+		<para>Some core team members also have specific <link
+		    linkend="staff-who">areas of responsibility</link>,
 		  meaning that they are committed to ensuring that some large
 		  portion of the system works as advertised.</para>
 
@@ -477,11 +476,11 @@
 		  developers are the users themselves who provide feedback and
 		  bug-fixes to us on an almost constant basis. The primary
 		  way of keeping in touch with FreeBSD's more non-centralized
-		  development is to subscribe to the &a.hackers; (see <xref
-		    linkend="eresources-mail" remap="mailing list
-		    info">) where such things are discussed.</para>
+		  development is to subscribe to the &a.hackers; (see <link
+		    linkend="eresources-mail">mailing list
+		    info</link>) where such things are discussed.</para>
 
-		<para><xref linkend="contrib-additional" remap="The list"> of
+		<para><link linkend="contrib-additional">The list</link> of
 		  those who have contributed something which made its way into
 		  our source tree is a long and growing one, so why not join
 		  it by contributing something back to FreeBSD today?
@@ -489,9 +488,8 @@
 
 		<para>Providing code is not the only way of contributing to
 		  the project; for a more complete list of things that need
-		  doing, please refer to the <xref linkend="contrib"
-		    remap="how to
-		    contribute"> section in this handbook.</para>
+		  doing, please refer to the <link linkend="contrib">how to
+		    contribute</link> section in this handbook.</para>
 	      </listitem>
 	    </varlistentry>
 	  </variablelist>
@@ -502,9 +500,8 @@
 	  convenience of the <emphasis>users</emphasis> of FreeBSD, who are
 	  thereby provided with an easy way of tracking one central code base,
 	  not to keep potential contributors out! Our desire is to present a
-	  stable operating system with a large set of coherent <xref
-	    linkend="ports"
-	    remap="application programs"> that the users can easily install
+	  stable operating system with a large set of coherent <link
+	    linkend="ports">application programs</link> that the users can easily install
 	  and use, and this model works very well in accomplishing
 	  that.</para>
 	
diff --git a/en_US.ISO_8859-1/books/handbook/kernelconfig/chapter.sgml b/en_US.ISO_8859-1/books/handbook/kernelconfig/chapter.sgml
index 7399246cbd..34b0961405 100644
--- a/en_US.ISO_8859-1/books/handbook/kernelconfig/chapter.sgml
+++ b/en_US.ISO_8859-1/books/handbook/kernelconfig/chapter.sgml
@@ -103,8 +103,8 @@
 	  editor. If you are just starting out, the only editor available
 	  will probably be <command>vi</command>, which is too
 	  complex to explain here, but is covered well in many books in the
-	  <xref
-	    linkend="bibliography" remap="bibliography">. Feel free to change
+	  <link
+	    linkend="bibliography">bibliography</link>. Feel free to change
 	  the comment	lines at the top to reflect your configuration or the
 	  changes you have made to differentiate it from
 	  <filename>GENERIC</filename>.</para>
@@ -114,9 +114,8 @@
 	  you are coming from some other operating system such as DOS, on the
 	  other hand, the <filename>GENERIC</filename> configuration file
 	  might seem overwhelming to you, so follow the descriptions in the
-	  <xref
-	    linkend="kernelconfig-config"
-	    remap="Configuration File"> section slowly and carefully.</para>
+	  <link
+	    linkend="kernelconfig-config">Configuration File</link> section slowly and carefully.</para>
 	
 	<note>
 	  <para>If you are trying to upgrade your kernel from an older version
@@ -143,16 +142,15 @@
 	  directory as <filename>/kernel</filename> and the old kernel will be
 	  moved to <filename>/kernel.old</filename>. Now, shutdown the system
 	  and reboot to use your kernel. In case something goes wrong, there
-	  are some <xref linkend="kernelconfig-trouble"
-	    remap="troubleshooting"> instructions at the end of this document.
+	  are some <link linkend="kernelconfig-trouble">troubleshooting</link> instructions at the end of this document.
 	  Be sure to read the section which explains how to recover in case
-	  your new kernel <xref
-	    linkend="kernelconfig-noboot" remap="does not boot">.</para>
+	  your new kernel <link
+	    linkend="kernelconfig-noboot">does not boot</link>.</para>
 	
 	<note>
 	  <para>If you have added any new devices (such as sound cards) you
-	    may have to add some <xref
-	      linkend="kernelconfig-nodes" remap="device nodes"> to your
+	    may have to add some <link
+	      linkend="kernelconfig-nodes">device nodes</link> to your
 	    <filename>/dev</filename> directory before you can use
 	    them.</para>
 	</note>
@@ -313,9 +311,9 @@
 		      how many processes each of them will be running. One
 		      keyword which <emphasis>does</emphasis> limit the number
 		      of simultaneous <emphasis>remote logins</emphasis> is
-			<xref
-			  linkend="kernelconfig-ptys" remap="pseudo-device pty
-			  16">.</para>
+			<link
+			  linkend="kernelconfig-ptys">pseudo-device pty
+			  16</link>.</para>
 		  </note>
 		</listitem>
 	      </varlistentry>
@@ -561,7 +559,7 @@
 		    system, and do not want users to be able to overflow the
 		    <filename>/home</filename> partition, you can establish
 		    disk quotas for each user. Refer to the
-		    <xref linkend="quotas" remap="Disk Quotas"> section for
+		    <link linkend="quotas">Disk Quotas</link> section for
 		    more information.</para>
 		</listitem>
 	      </varlistentry>
@@ -575,9 +573,8 @@
 	  
 	  <para>These sections describe the basic disk, tape, and CD-ROM
 	    controllers supported by FreeBSD. There are separate sections for
-	    <xref linkend="kernelconfig-scsi"
-	      remap="SCSI"> controllers and <xref
-	      linkend="kernelconfig-network" remap="network"> cards.</para>
+	    <link linkend="kernelconfig-scsi">SCSI</link> controllers and <link
+	      linkend="kernelconfig-network">network</link> cards.</para>
 	  
 	  
 	    <variablelist>
@@ -670,9 +667,9 @@
 		    sound card such as the SoundBlaster 16. They are
 		    <emphasis>not</emphasis> IDE or SCSI. Most older
 		    single-speed and double-speed CD-ROMs use these
-		    interfaces, while newer quad-speeds are likely to be <xref
-		      linkend="kernelconfig-atapi" remap="IDE"> or <xref
-		      linkend="kernelconfig-scsi" remap="SCSI">.</para>
+		    interfaces, while newer quad-speeds are likely to be <link
+		      linkend="kernelconfig-atapi">IDE</link> or <link
+		      linkend="kernelconfig-scsi">SCSI</link>.</para>
 		  
 		  
 		    <variablelist>
@@ -936,9 +933,8 @@
 		  
 		  <note>
 		    <para>If you have a serial mouse, ignore these two lines,
-		      and instead, make sure the appropriate <xref
-			linkend="kernelconfig-serial"
-			  remap="serial"> port is enabled (probably
+		      and instead, make sure the appropriate <link
+			linkend="kernelconfig-serial">serial</link> port is enabled (probably
 		      COM1).</para>
 		  </note>
 		</listitem>
@@ -961,10 +957,8 @@
 	  <title>Serial and Parallel Ports</title>
 	  
 	  <para>Nearly all systems have these. If you are attaching a printer
-	    to one of these ports, the <xref linkend="printing"
-	      remap="Printing"> section of the handbook is very useful. If
-	    you are using modem, <xref linkend="dialup"
-	      remap="Dialup access"> provides extensive detail on serial port
+	    to one of these ports, the <link linkend="printing">Printing</link> section of the handbook is very useful. If
+	    you are using modem, <link linkend="dialup">Dialup access</link> provides extensive detail on serial port
 	    configuration for use with such devices.</para>
 	  
 	  
@@ -1213,10 +1207,8 @@
 		    more powerful. The <replaceable>number</replaceable> after
 		    <literal>sl</literal> specifies how many
 		    simultaneous SLIP sessions to support. This handbook has
-		    more information on setting up a SLIP <xref
-		      linkend="slipc"
-		      remap="client"> or <xref linkend="slips"
-		      remap="server">.</para>
+		    more information on setting up a SLIP <link
+		      linkend="slipc">client</link> or <link linkend="slips">server</link>.</para>
 		</listitem>
 	      </varlistentry>
 	      
@@ -1229,8 +1221,7 @@
 		    connections. There is also version of PPP implemented as a
 		    user application that uses the <devicename>tun</devicename> and offers more flexibility and
 		    features such as demand dialing. If you still want to use
-		    this PPP driver, read the <xref linkend="ppp"
-		      remap="kernel-mode PPP">
+		    this PPP driver, read the <link linkend="ppp">kernel-mode PPP</link>
 		    section of the handbook. As with the <literal>sl</literal> device,
 		    <replaceable>number</replaceable> specifies how many
 		    simultaneous PPP connections to support.</para>
@@ -1245,9 +1236,8 @@
 		    user-mode PPP software. This program is easy to set up and
 		    very fast. It also has special features such as automatic
 		    dial-on-demand. The number after <literal>tun</literal> specifies the number of
-		    simultaneous PPP sessions to support. See the <xref
-		      linkend="userppp"
-		      remap="user-mode PPP"> section of the handbook for more
+		    simultaneous PPP sessions to support. See the <link
+		      linkend="userppp">user-mode PPP</link> section of the handbook for more
 		    information.</para>
 		</listitem>
 	      </varlistentry>
@@ -1400,8 +1390,7 @@
 	    <para>There is some additional documentation in
 	      <filename>/usr/src/sys/i386/isa/sound/sound.doc</filename>.
 	      Also, if you add any of these devices, be sure to create the
-	      sound <xref linkend="kernelconfig-nodes"
-		remap="device nodes">.</para>
+	      sound <link linkend="kernelconfig-nodes">device nodes</link>.</para>
 	  </note>
 	  
 	</sect2>
@@ -1411,8 +1400,7 @@
 	  
 	  <para>Pseudo-device drivers are parts of the kernel that act like
 	    device drivers but do not correspond to any actual hardware in the
-	    machine. The <xref linkend="kernelconfig-network"
-	      remap="network-related"> pseudo-devices are in that section,
+	    machine. The <link linkend="kernelconfig-network">network-related</link> pseudo-devices are in that section,
 	    while the remainder are here.</para>
 	  
 	  
@@ -1527,8 +1515,7 @@
 		    can be configured to use this device to play songs when
 		    you play musical instruments in the game.</para>
 
-		  <para>See also the <xref linkend="kernelconfig-pcaudio"
-		      remap="pca0"> device.</para>
+		  <para>See also the <link linkend="kernelconfig-pcaudio">pca0</link> device.</para>
 		</listitem>
 	      </varlistentry>
 	    </variablelist>
diff --git a/en_US.ISO_8859-1/books/handbook/kerneldebug/chapter.sgml b/en_US.ISO_8859-1/books/handbook/kerneldebug/chapter.sgml
index d4a6de98ae..5f6af0f864 100644
--- a/en_US.ISO_8859-1/books/handbook/kerneldebug/chapter.sgml
+++ b/en_US.ISO_8859-1/books/handbook/kerneldebug/chapter.sgml
@@ -15,8 +15,8 @@
 	    kernel</literal> line), or you can specify an alternate using the
 	  <citerefentry><refentrytitle>dumpon</refentrytitle><manvolnum>8</manvolnum></citerefentry> command. Dumps to non-swap devices, tapes for example,
 	  are currently not supported. Config your kernel using
-	  <command>config -g</command>. See <xref linkend="kernelconfig"
-	    remap="Kernel Configuration"> for
+	  <command>config -g</command>. See <link linkend="kernelconfig">Kernel
+	  Configuration</link> for
 	  details on configuring the FreeBSD kernel.</para>
 	
 	<para>Use the <citerefentry><refentrytitle>dumpon</refentrytitle><manvolnum>8</manvolnum></citerefentry> command to tell the kernel
@@ -291,9 +291,8 @@
 	<para>To configure your kernel to include DDB, add the option line
 
 	  <programlisting>
-options DDB</programlisting> to your config file, and rebuild. (See <xref
-	    linkend="kernelconfig"
-	    remap="Kernel Configuration"> for details on configuring the
+options DDB</programlisting> to your config file, and rebuild. (See <link
+	    linkend="kernelconfig">Kernel Configuration</link> for details on configuring the
 	  FreeBSD kernel.</para>
 
 	<note>
diff --git a/en_US.ISO_8859-1/books/handbook/kernelopts/chapter.sgml b/en_US.ISO_8859-1/books/handbook/kernelopts/chapter.sgml
index b42c1b47cc..30f5e9f461 100644
--- a/en_US.ISO_8859-1/books/handbook/kernelopts/chapter.sgml
+++ b/en_US.ISO_8859-1/books/handbook/kernelopts/chapter.sgml
@@ -4,16 +4,16 @@
       <para><emphasis>Contributed by &a.joerg;</emphasis></para>
 
       <note>
-	<para>You should be familiar with the section about <xref
-	    linkend="kernelconfig" remap="kernel configuration">
+	<para>You should be familiar with the section about <link
+	    linkend="kernelconfig">kernel configuration</link>
 	  before reading here.</para>
       </note>
       
       <sect1>
 	<title>What's a <emphasis>Kernel Option</emphasis>, Anyway?</title>
 	
-	<para>The use of kernel options is basically described in the <xref
-	    linkend="kernelconfig-options" remap="kernel configuration">
+	<para>The use of kernel options is basically described in the <link
+	    linkend="kernelconfig-options">kernel configuration</link>
 	  section. There's also an explanation of &ldquo;historic&rdquo; and
 	  &ldquo;new-style&rdquo; options. The ultimate goal is to eventually turn all
 	  the supported options in the kernel into new-style ones, so for
diff --git a/en_US.ISO_8859-1/books/handbook/l10n/chapter.sgml b/en_US.ISO_8859-1/books/handbook/l10n/chapter.sgml
index ca7fe03ca8..4fda3de2f8 100644
--- a/en_US.ISO_8859-1/books/handbook/l10n/chapter.sgml
+++ b/en_US.ISO_8859-1/books/handbook/l10n/chapter.sgml
@@ -182,9 +182,9 @@ defaultclass = russian</programlisting> in
 	    <title>Shell Startup Files Method</title>
 	    
 	    <para>If you don't want to use
-	      <xref linkend="russian-class" remap="login class method"> for
+	      <link linkend="russian-class">login class method</link> for
 	      some reasons, just set this
-	      <xref linkend="russian-env" remap="two environment variables">
+	      <link linkend="russian-env">two environment variables</link>
 	      in the following shell startup files:</para>
 	    
 	      <itemizedlist>
@@ -273,7 +273,7 @@ lp|Russian local line printer:\
 	      
 	      <step>
 		<para>Do
-		  <xref linkend="russian-locale" remap="non-X locale setup">
+		  <link linkend="russian-locale">non-X locale setup</link>
 		  first as described.</para>
 
 		<note>
@@ -329,8 +329,8 @@ XkbKeymap   "xfree86(ru)"</programlisting> line into
 
 		<note>
 		  <para>Russian XKB keyboard may not work with old XFree86
-		    versions, see <xref
-		    linkend="russian-note" remap="locale note"> for more info.
+		    versions, see <link
+		    linkend="russian-note">locale note</link> for more info.
 		    Russian XKB keyboard may not work with non-localized
 		    applications too, minimally localized application should
 		    call <literal>XtSetLanguageProc
diff --git a/en_US.ISO_8859-1/books/handbook/linuxemu/chapter.sgml b/en_US.ISO_8859-1/books/handbook/linuxemu/chapter.sgml
index 04055351b3..426491a079 100644
--- a/en_US.ISO_8859-1/books/handbook/linuxemu/chapter.sgml
+++ b/en_US.ISO_8859-1/books/handbook/linuxemu/chapter.sgml
@@ -68,7 +68,7 @@ options  LINUX</programlisting>
 
 	  <para>Then run config and install the new kernel as
 	    described in the
-	    <xref linkend="kernelconfig" remap="kernel configuration">
+	    <link linkend="kernelconfig">kernel configuration</link>
 	    section.</para>
 	  
 	  <para>If you decide to use the LKM you must also install the
@@ -162,9 +162,8 @@ EXEC      0   4 f09e6000 001c f09ec010   1 linux_mod</screen>
 options  LINUX</programlisting>
 
 	    to your kernel config file. Then run config
-	    and install the new kernel as described in the <xref
-	      linkend="kernelconfig"
-	      remap="kernel configuration"> section.</para>
+	    and install the new kernel as described in the <link
+	      linkend="kernelconfig">kernel configuration</link> section.</para>
 	  
 	</sect2>
 	
diff --git a/en_US.ISO_8859-1/books/handbook/mail/chapter.sgml b/en_US.ISO_8859-1/books/handbook/mail/chapter.sgml
index 6b7c08a15a..e4c2d14f9e 100644
--- a/en_US.ISO_8859-1/books/handbook/mail/chapter.sgml
+++ b/en_US.ISO_8859-1/books/handbook/mail/chapter.sgml
@@ -3,8 +3,8 @@
       
       <para><emphasis>Contributed by &a.wlloyd;.</emphasis></para>
       
-      <para>Electronic Mail configuration is the subject of many <xref
-	  linkend="bibliography" remap="System Administration"> books. If you
+      <para>Electronic Mail configuration is the subject of many <link
+	  linkend="bibliography">System Administration</link> books. If you
 	plan on doing anything beyond setting up one mailhost for your
 	network, you need industrial strength help.</para>
       
@@ -43,8 +43,8 @@
 	    <filename>/etc/rc.conf</filename> (or, prior to FreeBSD 2.2.2,
 	    <filename>/etc/sysconfig</filename>). It is best to leave it on,
 	    unless you have a specific reason to want it off. Example: You
-	    are building a <xref
-	      linkend="firewalls" remap="Firewall">.</para>
+	    are building a <link
+	      linkend="firewalls">Firewall</link>.</para>
 	  
 	  <para>You should be aware that <command>sendmail</command> is a potential weak link in a
 	    secure site. Some versions of <command>sendmail</command> have known security
@@ -94,8 +94,7 @@
 		    URL="../ports/mail.html">Ports collection</ulink>  that
 		  can be found in <filename>/usr/ports</filename> or packages
 		  collection. This handbook section has a complete reference
-		  on the <xref linkend="ports"
-		    remap="Ports"> system.</para>
+		  on the <link linkend="ports">Ports</link> system.</para>
 	      </step>
 	      
 	      <step>
@@ -270,8 +269,8 @@ foo.bar                  MX  10	smtp.smalliap.com	; your mailhost</programlistin
 	  <para>If you plan on doing anything serious with <command>sendmail</command> you should install the <command>sendmail</command>
 	    source. The source has plenty of documentation with it. You will
 	    find information on getting <command>sendmail</command>
-	    source from <xref linkend="sendmailuucp" remap="the UUCP
-	      information">.</para>
+	    source from <link linkend="sendmailuucp">the UUCP
+	      information</link>.</para>
 	  
 	</sect2>
 	
diff --git a/en_US.ISO_8859-1/books/handbook/mirrors/chapter.sgml b/en_US.ISO_8859-1/books/handbook/mirrors/chapter.sgml
index c9e274206a..225ecb72e6 100644
--- a/en_US.ISO_8859-1/books/handbook/mirrors/chapter.sgml
+++ b/en_US.ISO_8859-1/books/handbook/mirrors/chapter.sgml
@@ -34,33 +34,33 @@
 	  following mirror sites. If you choose to obtain FreeBSD via
 	  anonymous FTP, please try to use a site near you.</para>
 	
-	<para><xref linkend="mirrors-ar" remap="Argentina">, 
-	  <xref linkend="mirrors-au" remap="Australia">, 
-	  <xref linkend="mirrors-br" remap="Brazil">, 
-	  <xref linkend="mirrors-ca" remap="Canada">,
-	  <xref linkend="mirrors-cz" remap="Czech Republic">,
-	  <xref linkend="mirrors-dk" remap="Denmark">,
-	  <xref linkend="mirrors-ee" remap="Estonia">,
-	  <xref linkend="mirrors-fi" remap="Finland">,
-	  <xref linkend="mirrors-fr" remap="France">,
-	  <xref linkend="mirrors-de" remap="Germany">,
-	  <xref linkend="mirrors-hk" remap="Hong Kong">,
-	  <xref linkend="mirrors-ie" remap="Ireland">,
-	  <xref linkend="mirrors-il" remap="Israel">,
-	  <xref linkend="mirrors-jp" remap="Japan">,
-	  <xref linkend="mirrors-kr" remap="Korea">,
-	  <xref linkend="mirrors-nl" remap="Netherlands">,
-	  <xref linkend="mirrors-pl" remap="Poland">,
-	  <xref linkend="mirrors-pt" remap="Portugal">,
-	  <xref linkend="mirrors-ru" remap="Russia">,
-	  <xref linkend="mirrors-za" remap="South Africa">,
-	  <xref linkend="mirrors-si" remap="Slovenia">,
-	  <xref linkend="mirrors-se" remap="Sweden">,
-	  <xref linkend="mirrors-tw" remap="Taiwan">,
-	  <xref linkend="mirrors-th" remap="Thailand">,
-	  <xref linkend="mirrors-ua" remap="Ukraine">,
-	  <xref linkend="mirrors-uk" remap="UK">,
-	  <xref linkend="mirrors-us" remap="USA">.</para>
+	<para><link linkend="mirrors-ar">Argentina</link>, 
+	  <link linkend="mirrors-au">Australia</link>, 
+	  <link linkend="mirrors-br">Brazil</link>, 
+	  <link linkend="mirrors-ca">Canada</link>,
+	  <link linkend="mirrors-cz">Czech Republic</link>,
+	  <link linkend="mirrors-dk">Denmark</link>,
+	  <link linkend="mirrors-ee">Estonia</link>,
+	  <link linkend="mirrors-fi">Finland</link>,
+	  <link linkend="mirrors-fr">France</link>,
+	  <link linkend="mirrors-de">Germany</link>,
+	  <link linkend="mirrors-hk">Hong Kong</link>,
+	  <link linkend="mirrors-ie">Ireland</link>,
+	  <link linkend="mirrors-il">Israel</link>,
+	  <link linkend="mirrors-jp">Japan</link>,
+	  <link linkend="mirrors-kr">Korea</link>,
+	  <link linkend="mirrors-nl">Netherlands</link>,
+	  <link linkend="mirrors-pl">Poland</link>,
+	  <link linkend="mirrors-pt">Portugal</link>,
+	  <link linkend="mirrors-ru">Russia</link>,
+	  <link linkend="mirrors-za">South Africa</link>,
+	  <link linkend="mirrors-si">Slovenia</link>,
+	  <link linkend="mirrors-se">Sweden</link>,
+	  <link linkend="mirrors-tw">Taiwan</link>,
+	  <link linkend="mirrors-th">Thailand</link>,
+	  <link linkend="mirrors-ua">Ukraine</link>,
+	  <link linkend="mirrors-uk">UK</link>,
+	  <link linkend="mirrors-us">USA</link>.</para>
 	
 	
 	  <variablelist>
@@ -820,7 +820,7 @@
       <sect1 id="mirrors-ctm">
 	<title>CTM Sites</title>
 	
-	<para><xref linkend="ctm" remap="CTM">/FreeBSD is available via
+	<para><link linkend="ctm">CTM</link>/FreeBSD is available via
 	  anonymous FTP from the following mirror sites. If you choose to
 	  obtain CTM via anonymous FTP, please try to use a site near
 	  you.</para>
@@ -915,7 +915,7 @@
       <sect1 id="mirrors-cvsup">
 	<title>CVSup Sites</title>
 	
-	<para><xref linkend="cvsup" remap="CVSup"> servers for FreeBSD are
+	<para><link linkend="cvsup">CVSup</link> servers for FreeBSD are
 	  running at the following sites:</para>
 	
 	
@@ -1208,8 +1208,8 @@
 	  </variablelist>
 	
 	
-	<para>The following <application>CVSup</application> site is especially designed for <xref
-	    linkend="ctm" remap="CTM"> users. Unlike the other CVSup mirrors,
+	<para>The following <application>CVSup</application> site is especially designed for <link
+	    linkend="ctm">CTM</link> users. Unlike the other CVSup mirrors,
 	  it is kept up-to-date by <application>CTM</application>. That means if you <application>CVSup</application> <literal>cvs-all</literal> with <literal>release=cvs</literal>
 	  from this site, you get a version of the repository (including the
 	  inevitable <filename>.ctm_status</filename> file) which is
diff --git a/en_US.ISO_8859-1/books/handbook/ppp-and-slip/chapter.sgml b/en_US.ISO_8859-1/books/handbook/ppp-and-slip/chapter.sgml
index 944d656b11..488efe87c2 100644
--- a/en_US.ISO_8859-1/books/handbook/ppp-and-slip/chapter.sgml
+++ b/en_US.ISO_8859-1/books/handbook/ppp-and-slip/chapter.sgml
@@ -133,8 +133,8 @@ pseudo-device tun 1</programlisting>
 	    ppp connections at any one time then you will need to use <literal>16</literal>
 	    instead of <literal>1</literal>), then you should add the line, re-compile,
 	    re-install and boot the new kernel. Please refer to the 
-	    <xref linkend="kernelconfig" remap="Configuring the FreeBSD
-	      Kernel"> section for more information on kernel
+	    <link linkend="kernelconfig">Configuring the FreeBSD
+	      Kernel</link> section for more information on kernel
 	    configuration.</para>
 	  
 	  <para>You can check how many tunnel devices your current kernel has
@@ -160,8 +160,7 @@ tun3: flags=8050&lt;POINTOPOINT,RUNNING,MULTICAST&gt; mtu 1500</screen>
 	    and <citerefentry><refentrytitle>lkm</refentrytitle><manvolnum>4</manvolnum></citerefentry> pages for further details.</para>
 	  
 	  <para>You may also wish to take this opportunity to configure a
-	    firewall. Details can be found in the <xref linkend="firewalls"
-	      remap="Firewalls"> section.</para>
+	    firewall. Details can be found in the <link linkend="firewalls">Firewalls</link> section.</para>
 	  
 	</sect2>
 	
@@ -419,8 +418,8 @@ protocol: ppp</screen>
 		      needs. If you're using PAP or CHAP, there will be no
 		      login at this point, so your login string can be left
 		      blank. See
-		      <xref linkend="userppp-PAPnCHAP" remap="PAP and CHAP
-			authentication"> for further details.</para>
+		      <link linkend="userppp-PAPnCHAP">PAP and CHAP
+			authentication</link> for further details.</para>
 		  </listitem>
 		</varlistentry>
 		
@@ -467,8 +466,8 @@ protocol: ppp</screen>
 		      to use a &ldquo;guessed&rdquo; address, make sure that you create
 		      an entry in <filename>/etc/ppp/ppp.linkup</filename> as
 		      per the instructions for
-		      <xref linkend="userppp-dynamicIP" remap="PPP and Dynamic
-			IP addresses">. If this line is omitted, <command>ppp</command> cannot
+		      <link linkend="userppp-dynamicIP">PPP and Dynamic
+			IP addresses</link>. If this line is omitted, <command>ppp</command> cannot
 		      run in <option>-auto</option> or
 		      <option>-dynamic</option> mode.</para>
 		  </listitem>
@@ -518,9 +517,9 @@ protocol: ppp</screen>
 	      the local and remote addresses. This is done by &ldquo;guessing&rdquo; an
 	      IP number and allowing <command>ppp</command> to set it up correctly using the IP
 	      Configuration Protocol (IPCP) after connecting. The
-	      <filename>ppp.conf</filename> configuration is the same as <xref
-		linkend="userppp-staticIP" remap="PPP and
-		Static IP addresses">, with the following change:</para>
+	      <filename>ppp.conf</filename> configuration is the same as <link
+		linkend="userppp-staticIP">PPP and
+		Static IP addresses</link>, with the following change:</para>
 	    
 	    <programlisting>
 10      set ifaddr 10.0.0.1/0 10.0.0.2/0 255.255.255.0</programlisting>
@@ -643,8 +642,8 @@ gateway=YES</programlisting>
 	    <sect4>
 	      <title>Which getty?</title>
 	      
-	      <para><xref linkend="dialup" remap="Configuring FreeBSD for
-		  Dialup Services"> provides a good description on enabling
+	      <para><link linkend="dialup">Configuring FreeBSD for
+		  Dialup Services</link> provides a good description on enabling
 		dialup services using getty.</para>
 	      
 	      <para>An alternative to <command>getty</command> is <ulink
@@ -659,8 +658,8 @@ gateway=YES</programlisting>
 		support the automatic detection of PPP streams, allowing your
 		clients script-less access to your server.</para>
 	      
-	      <para>Refer to <xref linkend="userppp-mgetty" remap="Mgetty and
-		  AutoPPP"> for more information on <command>mgetty</command>.</para>
+	      <para>Refer to <link linkend="userppp-mgetty">Mgetty and
+		  AutoPPP</link> for more information on <command>mgetty</command>.</para>
 	      
 	    </sect4>
 	    
@@ -935,10 +934,9 @@ default:
 	      with PAP, are being transmitted down a serial line only.
 	      There's not much room for hackers to &ldquo;eavesdrop&rdquo;.</para>
 	    
-	    <para>Referring back to the <xref linkend="userppp-staticIP"
-		remap="PPP and Static IP addresses"> or <xref
-		linkend="userppp-dynamicIP" remap="PPP and Dynamic IP
-		addresses"> sections, the following alterations must be
+	    <para>Referring back to the <link linkend="userppp-staticIP">PPP and Static IP addresses</link> or <link
+		linkend="userppp-dynamicIP">PPP and Dynamic IP
+		addresses</link> sections, the following alterations must be
 	      made:</para>
 	    
 	    <programlisting>
@@ -2163,8 +2161,7 @@ pseudo-device sl 2</programlisting>
 	    maximum number of SLIP connections that may be operating
 	    simultaneously.</para>
 	  
-	  <para>Please refer to <xref linkend="kernelconfig"
-	      remap="Configuring the FreeBSD Kernel"> for help in
+	  <para>Please refer to <link linkend="kernelconfig">Configuring the FreeBSD Kernel</link> for help in
 	    reconfiguring your kernel.</para>
 	  
 	</sect2>
@@ -2274,8 +2271,8 @@ Shelmerg  dc-slip       sl-helmerg      0xfffffc00      autocomp</programlisting
 	      server (it is not &ldquo;true&rdquo; proxy ARP, but that is the
 	      terminology used in this document to describe it). If you are
 	      not sure which method to select or how to assign IP addresses,
-	      please refer to the TCP/IP books referenced in the <xref
-		linkend="slips-prereqs" remap="slips-prereqs"> section
+	      please refer to the TCP/IP books referenced in the <link
+		linkend="slips-prereqs">slips-prereqs</link> section
 	      and/or consult your IP network manager.</para>
 	    
 	    <para>If you are going to use a separate subnet for your SLIP
@@ -2471,7 +2468,7 @@ Shelmerg  dc-slip       sl-helmerg      0xfffffc00      autocomp</programlisting
 	      server and configure it to use the appropriate routing protocols
 	      (RIP/OSPF/BGP/EGP) to tell other routers about your SLIP subnet.
 	      You can use <command>gated</command> from the
-	      <xref linkend="ports" remap="ports collection"> or retrieve and
+	      <link linkend="ports">ports collection</link> or retrieve and
 	      build it yourself from <ulink
 		URL="ftp://ftp.gated.merit.edu/research.and.development/gated/">the GateD anonymous ftp site</ulink>; I believe the current version as of this writing is <filename>gated-R3_5Alpha_8.tar.Z</filename>, which includes support for FreeBSD &ldquo;out-of-the-box&rdquo;. Complete information and documentation on <command>gated</command> is available on the Web starting at <ulink URL="http://www.gated.merit.edu/">the Merit GateD Consortium</ulink>. Compile and install it, and then write a <filename>/etc/gated.conf</filename> file to configure your gated; here is a sample, similar to what the author used on a FreeBSD SLIP server:</para>
 	    
diff --git a/en_US.ISO_8859-1/books/handbook/printing/chapter.sgml b/en_US.ISO_8859-1/books/handbook/printing/chapter.sgml
index ca9921cd6a..47309e11ae 100644
--- a/en_US.ISO_8859-1/books/handbook/printing/chapter.sgml
+++ b/en_US.ISO_8859-1/books/handbook/printing/chapter.sgml
@@ -11,9 +11,9 @@
 	simply called LPD.</para>
       
       <para>If you are already familiar with LPD or another printer spooling
-	system, you may wish to skip to section <xref
-	  linkend="printing-intro-setup" remap="Setting up the spooling
-	  system">.</para>
+	system, you may wish to skip to section <link
+	  linkend="printing-intro-setup">Setting up the spooling
+	  system</link>.</para>
       
       
       <sect1 id="printing-intro-spooler">
@@ -124,15 +124,14 @@
 	  <itemizedlist>
 	    
 	    <listitem>
-	      <para>See section <xref linkend="printing-simple" remap="Simple
-		  Printer Setup"> to learn how to connect a printer, tell LPD
+	      <para>See section <link linkend="printing-simple">Simple
+		  Printer Setup</link> to learn how to connect a printer, tell LPD
 		how to communicate with it, and print plain text files to the
 		printer.</para>
 	    </listitem>
 	    
 	    <listitem>
-	      <para>See section <xref linkend="printing-advanced"
-		  remap="Advanced Printer Setup"> to find out how to print a
+	      <para>See section <link linkend="printing-advanced">Advanced Printer Setup</link> to find out how to print a
 		variety of special file formats, to print header pages, to
 		print across a network, to control access to printers, and to
 		do printer accounting.</para>
@@ -153,14 +152,14 @@
 	  <itemizedlist>
 	    
 	    <listitem>
-	      <para>Section <xref linkend="printing-hardware" remap="Hardware
-		  Setup"> gives some hints on connecting the printer to a port
+	      <para>Section <link linkend="printing-hardware">Hardware
+		  Setup</link> gives some hints on connecting the printer to a port
 		on your computer.</para>
 	    </listitem>
 	    
 	    <listitem>
-	      <para>Section <xref linkend="printing-software" remap="Software
-		  Setup"> shows how to setup the LPD spooler configuration
+	      <para>Section <link linkend="printing-software">Software
+		  Setup</link> shows how to setup the LPD spooler configuration
 		file <filename>/etc/printcap</filename>.</para>
 	    </listitem>
 	    
@@ -169,8 +168,8 @@
 	
 	<para>If you are setting up a printer that uses a network protocol to
 	  accept data to print instead of a serial or parallel interface, see
-	  <xref linkend="printing-advanced-network-net-if" remap="Printers
-	    With Networked Data Stream Interaces">.</para>
+	  <link linkend="printing-advanced-network-net-if">Printers
+	    With Networked Data Stream Interaces</link>.</para>
 	
 	<para>Although this section is called &ldquo;Simple Printer Setup,&rdquo; it is
 	  actually fairly complex. Getting the printer to work with your
@@ -189,8 +188,7 @@
 	  
 	  <para>If you have already connected your printer and have
 	    successfully printed with it under another operating system, you
-	    can probably skip to section <xref linkend="printing-software"
-	      remap="Software Setup">.</para>
+	    can probably skip to section <link linkend="printing-software">Software Setup</link>.</para>
 	  
 	  
 	  <sect3 id="printing-ports">
@@ -356,30 +354,29 @@
 	      
 	      <step>
 		<para>Configure your kernel, if necessary, for the port you
-		  are using for the printer; section <xref
-		    linkend="printing-kernel" remap="Kernel Configuration">
+		  are using for the printer; section <link
+		    linkend="printing-kernel">Kernel Configuration</link>
 		  tells you what you need to do.</para>
 	      </step>
 	      
 	      <step>
 		<para>Set the communications mode for the parallel port, if
-		  you are using a parallel port; section <xref
-		    linkend="printing-parallel-port-mode" remap="Setting the
-		    Communication Mode for the Parallel Port"> gives details.</para>
+		  you are using a parallel port; section <link
+		    linkend="printing-parallel-port-mode">Setting the
+		    Communication Mode for the Parallel Port</link> gives details.</para>
 	      </step>
 	      
 	      <step>
 		<para>Test if the operating system can send data to the
-		  printer. Section <xref linkend="printing-testing"
-		    remap="Checking Printer Communications"> gives some
+		  printer. Section <link linkend="printing-testing">Checking Printer Communications</link> gives some
 		  suggestions on how to do this.</para>
 	      </step>
 	      
 	      <step>
 		<para>Set up LPD for the printer by modifying the file
-		  <filename>/etc/printcap</filename>. Section <xref
-		    linkend="printing-printcap" remap="The /etc/printcap
-		    File"> shows you how.</para>
+		  <filename>/etc/printcap</filename>. Section <link
+		    linkend="printing-printcap">The /etc/printcap
+		    File</link> shows you how.</para>
 	      </step>
 	      
 	    </procedure>
@@ -566,8 +563,8 @@ device lpt0 at isa? port? tty vector lptintr</programlisting>
 		  
 		  <step>
 		    <para>Save the file. Then configure, build, and install
-		      the kernel, then reboot. See <xref
-			linkend="kernelconfig" remap="kernel configuration">
+		      the kernel, then reboot. See <link
+			linkend="kernelconfig">kernel configuration</link>
 		      for more details.</para>
 		  </step>
 		  
@@ -845,51 +842,48 @@ printer:dv=/dev/ttyd2:br#19200:pa=none</programlisting>
 		<step>
 		  <para>Pick a name (and a few convenient aliases) for the
 		    printer, and put them in the
-		    <filename>/etc/printcap</filename> file; see <xref
-		      linkend="printing-naming" remap="Naming the Printer">.</para>
+		    <filename>/etc/printcap</filename> file; see <link
+		      linkend="printing-naming">Naming the Printer</link>.</para>
 		</step>
 		
 		<step>
 		  <para>Turn off header pages (which are on by default) by
 		    inserting the <literal>sh</literal> capability;
-		    see <xref linkend="printing-no-header-pages"
-		      remap="Suppressing Header   Pages">.</para>
+		    see <link linkend="printing-no-header-pages">Suppressing Header   Pages</link>.</para>
 		</step>
 		
 		<step>
 		  <para>Make a spooling directory, and specify its location
 		    with the <literal>sd</literal> capability; see
-		    <xref linkend="printing-spooldir"
-		      remap="Making the Spooling   Directory">.</para>
+		    <link linkend="printing-spooldir">Making the Spooling   Directory</link>.</para>
 		</step>
 		
 		<step>
 		  <para>Set the <filename>/dev</filename> entry to use for the
 		    printer, and note it in <filename>/etc/printcap</filename>
 		    with the <literal>lp</literal> capability; see
-		    <xref
-		      linkend="printing-device" remap="Identifying the Printer
-		      Device">. Also, if the printer is on a serial port, set
+		    <link
+		      linkend="printing-device">Identifying the Printer
+		      Device</link>. Also, if the printer is on a serial port, set
 		    up the communication parameters with the
 		  <literal>fs</literal>, <literal>fc</literal>,
-		  <literal>xs</literal>, and <literal>xc</literal> capabilities; see <xref
-		      linkend="printing-commparam" remap="Configuring Spooler
-		      Communications Parameters">.</para>
+		  <literal>xs</literal>, and <literal>xc</literal> capabilities; see <link
+		      linkend="printing-commparam">Configuring Spooler
+		      Communications Parameters</link>.</para>
 		</step>
 		
 		<step>
-		  <para>Install a plain text input filter; see <xref
-		      linkend="printing-textfilter" remap="Installing the Text
-		      Filter"></para>
+		  <para>Install a plain text input filter; see <link
+		      linkend="printing-textfilter">Installing the Text
+		      Filter</link></para>
 		</step>
 		
 		<step>
 		  <para>Test the setup by printing something with the
 		    <citerefentry>
 		      <refentrytitle>lpr</refentrytitle></citerefentry>
-		    command; see <xref linkend="printing-trying" remap="Trying
-		      It Out"> and <xref linkend="printing-troubleshooting"
-		      remap="Troubleshooting">.</para>
+		    command; see <link linkend="printing-trying">Trying
+		      It Out</link> and <link linkend="printing-troubleshooting">Troubleshooting</link>.</para>
 		</step>
 		
 	      </procedure>
@@ -910,9 +904,9 @@ printer:dv=/dev/ttyd2:br#19200:pa=none</programlisting>
 	      print plain text jobs, you are strongly urged to add an
 	      additional step to the simple setup outlined above: install an
 	      automatic plain-text-to-PostScript (or other printer language)
-	      conversion program. Section <xref
-		linkend="printing-advanced-if-conversion" remap="Accommodating
-		Plain Text Jobs on PostScript Printers"> tells how to do
+	      conversion program. Section <link
+		linkend="printing-advanced-if-conversion">Accommodating
+		Plain Text Jobs on PostScript Printers</link> tells how to do
 	      this.</para>
 	    
 	    
@@ -1079,8 +1073,7 @@ bamboo|ps|PS|S|panasonic|Panasonic KX-P4455 PostScript v51.4:\
 	    <sect4 id="printing-device">
 	      <title>Identifying the Printer Device</title>
 	      
-	      <para>In section <xref linkend="printing-dev-ports"
-		  remap="Adding   /dev Entries for the Ports">, we identified
+	      <para>In section <link linkend="printing-dev-ports">Adding   /dev Entries for the Ports</link>, we identified
 		which entry in the <filename>/dev</filename> directory FreeBSD
 		will use to communicate with the printer. Now, we tell LPD
 		that information. When the spooling system has a job to
@@ -1116,9 +1109,9 @@ bamboo|ps|PS|S|panasonic|Panasonic KX-P4455 PostScript v51.4:\
 		FreeBSD.</para>
 	      
 	      <para>If the printer you are installing is connected to a
-		parallel port, skip to the section <xref
-		  linkend="printing-textfilter" remap="Installing        the
-		  Text Filter">. Otherwise, be sure to follow the
+		parallel port, skip to the section <link
+		  linkend="printing-textfilter">Installing        the
+		  Text Filter</link>. Otherwise, be sure to follow the
 		instructions in the next section.</para>
 	      
 	    </sect4>
@@ -1239,9 +1232,8 @@ bamboo|ps|PS|S|panasonic|Panasonic KX-P4455 PostScript v51.4:\
 		to read the job from standard input, perform any necessary
 		translation for the printer, and write the results to standard
 		output, which will get printed. For more information on the
-		text filter, see section <xref
-		  linkend="printing-advanced-filters"
-		  remap="Filters">.</para>
+		text filter, see section <link
+		  linkend="printing-advanced-filters">Filters</link>.</para>
 	      
 	      <para>For our simple printer setup, the text filter can be a
 		small shell script that just executes
@@ -1250,8 +1242,8 @@ bamboo|ps|PS|S|panasonic|Panasonic KX-P4455 PostScript v51.4:\
 		underlining for printers that might not deal with such
 		character streams well. And, of course, you can use any other
 		filter program you want. The filter <command>lpf</command> is described in detail in section
-		<xref linkend="printing-advanced-lpf" remap="lpf: a
-		  Text Filter">.</para>
+		<link linkend="printing-advanced-lpf">lpf: a
+		  Text Filter</link>.</para>
 	      
 	      <para>First, let us make the shell script
 		<filename>/usr/local/libexec/if-simple</filename> be a simple
@@ -1309,8 +1301,7 @@ bamboo|ps|PS|S|panasonic|Panasonic KX-P4455 PostScript v51.4:\
 	      <para>You can combine  <citerefentry>
 		  <refentrytitle>lpr</refentrytitle></citerefentry>
 		with the  <citerefentry>
-		  <refentrytitle>lptest</refentrytitle></citerefentry> program, introduced in section <xref linkend="printing-testing"
-		  remap="Checking Printer Communications"> to generate some
+		  <refentrytitle>lptest</refentrytitle></citerefentry> program, introduced in section <link linkend="printing-testing">Checking Printer Communications</link> to generate some
 		test text.</para>
 	      
 	      <para><emphasis>To test the simple LPD
@@ -1347,9 +1338,8 @@ $%&amp;'()*+,-./01234567
 		programs (for language-based printers) or running <citerefentry>
 		  <refentrytitle>lptest</refentrytitle></citerefentry> with different arguments. For example, <command>lptest 80 60</command> will produce 60 lines of 80 characters each.</para>
 	      
-	      <para>If the printer did not work, see the next section, <xref
-		  linkend="printing-troubleshooting"
-		  remap="Troubleshooting">.</para>
+	      <para>If the printer did not work, see the next section, <link
+		  linkend="printing-troubleshooting">Troubleshooting</link>.</para>
 	      
 	    </sect4>
 	    
@@ -1701,9 +1691,8 @@ rattan|line|diablo|lp|Diablo 630 Line Printer:\
 		
 	<para>There is also an administrative command, <citerefentry>
 	    <refentrytitle>lpc</refentrytitle></citerefentry>,
-	  described in the section <xref linkend="printing-lpc"
-	    remap="Administrating the
-	    LPD Spooler">, used to control printers and their queues.</para>
+	  described in the section <link linkend="printing-lpc">Administrating the
+	    LPD Spooler</link>, used to control printers and their queues.</para>
 	
 	<para>All three of the commands  <citerefentry>
 	    <refentrytitle>lpr</refentrytitle></citerefentry>, <citerefentry>
@@ -1768,9 +1757,8 @@ rattan|line|diablo|lp|Diablo 630 Line Printer:\
 	      <refentrytitle>lpr</refentrytitle></citerefentry> command
 	    can also accept a wide variety of options to control formatting,
 	    apply file conversions, generate multiple copies, and so forth.
-	    For more information, see the section <xref
-	      linkend="printing-lpr-options"
-	      remap="Printing Options">.</para>
+	    For more information, see the section <link
+	      linkend="printing-lpr-options">Printing Options</link>.</para>
 	  
 	</sect2>
 	
@@ -1811,7 +1799,7 @@ active kelly    9    /etc/host.conf, /etc/hosts.equiv   88 bytes
 	    job for a printer gets a unique job number. Most of the time you
 	    can ignore the job number, but you will need it if you want to
 	    cancel the job; see section
-	    <xref linkend="printing-lprm" remap="Removing Jobs"> for
+	    <link linkend="printing-lprm">Removing Jobs</link> for
 	    details.</para>
 	  
 	  <para>Job number nine consists of two files; multiple files given on
@@ -1993,9 +1981,9 @@ cfA013rose dequeued
 	      <para>All of these options except <option>-p</option> and
 		<option>-T</option> require conversion filters installed for
 		the destination printer. For example, the <option>-d</option>
-		option requires the DVI conversion filter. Section <xref
-		linkend="printing-advanced-convfilters" remap="Conversion
-		Filters"> gives details.</para>
+		option requires the DVI conversion filter. Section <link
+		linkend="printing-advanced-convfilters">Conversion
+		Filters</link> gives details.</para>
 	    </note>
 	    
 	    
@@ -2141,9 +2129,8 @@ cfA013rose dequeued
 		    <para>Produce a number of <replaceable>copies</replaceable> of each file in the job
 		      instead of just one copy. An administrator may disable
 		      this option to reduce printer wear-and-tear and
-		      encourage photocopier usage. See section <xref
-			linkend="printing-advanced-restricting-copies"
-			remap="Restricting Multiple Copies">.</para>
+		      encourage photocopier usage. See section <link
+			linkend="printing-advanced-restricting-copies">Restricting Multiple Copies</link>.</para>
 
 		    <para>This example prints three copies of
 		      <filename>parser.c</filename> followed by three copies
@@ -2217,8 +2204,8 @@ cfA013rose dequeued
 		<refentrytitle>lpr</refentrytitle></citerefentry>
 	      adjust the text that normally appears on a job's header page.
 	      If header pages are suppressed for the destination printer,
-	      these options have no effect. See section <xref
-		linkend="printing-advanced-header-pages" remap="Header Pages">
+	      these options have no effect. See section <link
+		linkend="printing-advanced-header-pages">Header Pages</link>
 	      for information about setting up header pages.</para>
 	    
 	    
@@ -2249,9 +2236,9 @@ cfA013rose dequeued
 
 		    <note>
 		      <para>At some sites, this option may have no effect due
-			to the way header pages are generated. See <xref
-			linkend="printing-advanced-header-pages" remap="Header
-			Pages"> for details.</para>
+			to the way header pages are generated. See <link
+			linkend="printing-advanced-header-pages">Header
+			Pages</link> for details.</para>
 		    </note>
 		  </listitem>
 		</varlistentry>
@@ -2479,9 +2466,9 @@ cfA013rose dequeued
 	    communicate with the printer and handle its device dependencies
 	    and special requirements. In the simple printer setup, we
 	    installed a plain text filter&mdash;an extremely simple one that
-	    should work with most printers (section <xref
-	      linkend="printing-textfilter" remap="Installing the
-	      Text Filter">).</para>
+	    should work with most printers (section <link
+	      linkend="printing-textfilter">Installing the
+	      Text Filter</link>).</para>
 	  
 	  <para>However, in order to take advantage of format conversion,
 	    printer accounting, specific printer quirks, and so on, you should
@@ -2504,8 +2491,7 @@ cfA013rose dequeued
 	    <itemizedlist>
 	      
 	      <listitem>
-		<para>Section <xref linkend="printing-advanced-filters"
-		    remap="How Filters Work">, tries to give an overview of a
+		<para>Section <link linkend="printing-advanced-filters">How Filters Work</link>, tries to give an overview of a
 		  filter's role in the printing process. You should read this
 		  section to get an understanding of what is happening &ldquo;under
 		  the hood&rdquo; when LPD uses filters. This knowledge could help
@@ -2517,10 +2503,9 @@ cfA013rose dequeued
 		<para>LPD expects every printer to be able to print plain text
 		  by default. This presents a problem for PostScript (or
 		  other language-based printers) which cannot directly print
-		  plain text. Section <xref
-		    linkend="printing-advanced-if-conversion"
-		    remap="Accommodating        Plain Text Jobs on PostScript
-		    Printers"> tells you what you should do to overcome this
+		  plain text. Section <link
+		    linkend="printing-advanced-if-conversion">Accommodating        Plain Text Jobs on PostScript
+		    Printers</link> tells you what you should do to overcome this
 		  problem. I recommend reading this section if you have a
 		  PostScript printer.</para>
 	      </listitem>
@@ -2529,8 +2514,7 @@ cfA013rose dequeued
 		<para>PostScript is a popular output format for many programs.
 		  Even some people (myself included) write PostScript code
 		  directly. But PostScript printers are expensive. Section
-		  <xref linkend="printing-advanced-ps"
-		    remap="Simulating PostScript on Non-PostScript Printers">
+		  <link linkend="printing-advanced-ps">Simulating PostScript on Non-PostScript Printers</link>
 		  tells how you can further modify a printer's text filter to
 		  accept and print PostScript data on a
 		  <emphasis>non-PostScript</emphasis> printer. I recommend
@@ -2539,8 +2523,7 @@ cfA013rose dequeued
 	      </listitem>
 	      
 	      <listitem>
-		<para>Section <xref linkend="printing-advanced-convfilters"
-		    remap="Conversion Filters"> tells about a way you can
+		<para>Section <link linkend="printing-advanced-convfilters">Conversion Filters</link> tells about a way you can
 		  automate the conversion of specific file formats, such as
 		  graphic or typesetting data, into formats your printer can
 		  understand. After reading this section, you should be able
@@ -2552,18 +2535,15 @@ cfA013rose dequeued
 	      </listitem>
 	      
 	      <listitem>
-		<para>Section <xref linkend="printing-advanced-of"
-		    remap="Output   Filters"> tells all about a not often used
+		<para>Section <link linkend="printing-advanced-of">Output   Filters</link> tells all about a not often used
 		  feature of LPD: output filters. Unless you are printing
-		  header pages (see <xref
-		    linkend="printing-advanced-header-pages"
-		    remap="Header Pages">), you can probably skip that section
+		  header pages (see <link
+		    linkend="printing-advanced-header-pages">Header Pages</link>), you can probably skip that section
 		  altogether.</para>
 	      </listitem>
 	      
 	      <listitem>
-		<para>Section <xref linkend="printing-advanced-lpf"
-		    remap="lpf: a Text Filter"> describes <command>lpf</command>, a fairly complete if simple text
+		<para>Section <link linkend="printing-advanced-lpf">lpf: a Text Filter</link> describes <command>lpf</command>, a fairly complete if simple text
 		  filter for line printers (and laser printers that act like
 		  line printers) that comes with FreeBSD. If you need a quick
 		  way to get printer accounting working for plain text, or if
@@ -2600,7 +2580,7 @@ cfA013rose dequeued
 	      printer. If the user wanted to print plain text, it would start
 	      the <literal>if</literal> filter (this is mostly
 	      true:
-	      see <xref linkend="printing-advanced-of" remap="Output Filters">
+	      see <link linkend="printing-advanced-of">Output Filters</link>
 	      for details).</para>
 	    
 	    <para>There are three kinds of filters you can specify in
@@ -2703,8 +2683,7 @@ cfA013rose dequeued
 		    directly printed, but you can install a conversion filter
 		    for ditroff files to convert the ditroff data into a form
 		    the printer can digest and print. Section
-		    <xref linkend="printing-advanced-convfilters"
-		      remap="Conversion Filters"> tells all about them.
+		    <link linkend="printing-advanced-convfilters">Conversion Filters</link> tells all about them.
 		    Conversion filters also need to do accounting, if you need
 		    printer accounting. Conversion filters are started with
 		    the following arguments:
@@ -2728,8 +2707,8 @@ cfA013rose dequeued
 		  <para>The <emphasis>output filter</emphasis> is used only if
 		    there is no text filter, or if header pages are enabled.
 		    In my experience, output filters are rarely used. Section
-		    <xref linkend="printing-advanced-of" remap="Output
-		      Filters"> describe them. There are only two arguments
+		    <link linkend="printing-advanced-of">Output
+		      Filters</link> describe them. There are only two arguments
 		    to an output filter:
 		  
 		    <cmdsynopsis>
@@ -2824,8 +2803,8 @@ cfA013rose dequeued
 	      the printer.</para>
 	    
 	    <para><command>lprps</command> is part of the FreeBSD
-	      ports collection (see <xref linkend="ports" remap="The Ports
-		Collection">). You
+	      ports collection (see <link linkend="ports">The Ports
+		Collection</link>). You
 	      can fetch, build and install it yourself, of course. After
 	      installing <command>lprps</command>, just specify the
 	      pathname to the <command>psif</command> program that
@@ -2873,8 +2852,8 @@ fi</programlisting>
 	    <para>In the above script, <command>textps</command> is a program we installed
 	      separately to convert plain text to PostScript. You can use any
 	      text-to-PostScript program you wish. The FreeBSD ports
-	      collection (see <xref linkend="ports" remap="The Ports
-		Collection">) includes a full featured text-to-PostScript
+	      collection (see <link linkend="ports">The Ports
+		Collection</link>) includes a full featured text-to-PostScript
 	      program called  <citerefentry>
 		<refentrytitle>a2ps</refentrytitle></citerefentry> that you might want to investigate.</para>
 	    
@@ -2960,8 +2939,8 @@ exit 2</programlisting>
 	  <sect3 id="printing-advanced-convfilters">
 	    <title>Conversion Filters</title>
 	    
-	    <para>After completing the simple setup described in <xref
-		linkend="printing-simple" remap="Simple Printer Setup">, the
+	    <para>After completing the simple setup described in <link
+		linkend="printing-simple">Simple Printer Setup</link>, the
 	      first thing you will probably want to do is install conversion
 	      filters for your favorite file formats (besides plain ASCII
 	      text).</para>
@@ -2993,16 +2972,15 @@ exit 2</programlisting>
 
 	      <para>We got LPD to do the DVI file conversion
 		for us by specifying the <option>-d</option> option. Section
-		<xref
-		  linkend="printing-lpr-options-format" remap="Formatting and
-		  Conversion Options"> lists the conversion options.</para>
+		<link
+		  linkend="printing-lpr-options-format">Formatting and
+		  Conversion Options</link> lists the conversion options.</para>
 	      
 	      <para>For each of the conversion options you want a printer to
 		support, install a <emphasis>conversion filter</emphasis> and
 		specify its pathname in <filename>/etc/printcap</filename>. A
 		conversion filter is like the text filter for the simple
-		printer setup (see section <xref linkend="printing-textfilter"
-		  remap="Installing the Text Filter">) except that instead of
+		printer setup (see section <link linkend="printing-textfilter">Installing the Text Filter</link>) except that instead of
 		printing plain text, the filter converts the file into a
 		format the printer can understand.</para>
 	      
@@ -3150,9 +3128,8 @@ bamboo|ps|PS|S|panasonic|Panasonic KX-P4455 PostScript v51.4:\
 exec /usr/local/bin/dvips -f | /usr/local/libexec/lprps "$@"</programlisting>
 
 	      <para>This script runs  <citerefentry>
-		  <refentrytitle>dvips</refentrytitle></citerefentry> in filter mode (the <option>-f</option> argument) on standard input, which is the job to print. It then starts the PostScript printer filter <command>lprps</command> (see section <xref linkend="printing-advanced-if-conversion"
-		  remap="Accommodating Plain Text Jobs on PostScript
-		  Printers">) with the arguments LPD passed to this script.
+		  <refentrytitle>dvips</refentrytitle></citerefentry> in filter mode (the <option>-f</option> argument) on standard input, which is the job to print. It then starts the PostScript printer filter <command>lprps</command> (see section <link linkend="printing-advanced-if-conversion">Accommodating Plain Text Jobs on PostScript
+		  Printers</link>) with the arguments LPD passed to this script.
 		<command>lprps</command> will use those arguments
 		to account for the pages printed.</para>
 	      
@@ -3260,8 +3237,8 @@ exit 2</programlisting>
 	      
 	      <para>Now, for the hard part: making the filter. For that, we
 		need a DVI-to-LaserJet/PCL conversion program. The FreeBSD
-		ports collection (see <xref linkend="ports" remap="The
-		  Ports Collection">) has one: <citerefentry>
+		ports collection (see <link linkend="ports">The
+		  Ports Collection</link>) has one: <citerefentry>
 		  <refentrytitle>dvi2xx</refentrytitle></citerefentry> is the
 		name of the package. Installing this package gives us the
 		program we need, <citerefentry>
@@ -3438,9 +3415,9 @@ exit 0</programlisting>
 	    <para>Do not be seduced by an output filter's simplicity. If you
 	      would like each file in a job to start on a different page an
 	      output filter <emphasis>will not work</emphasis>. Use a text
-	      filter (also known as an input filter); see section <xref
-		linkend="printing-textfilter" remap="Installing the Text
-		Filter">. Furthermore, an output filter is actually
+	      filter (also known as an input filter); see section <link
+		linkend="printing-textfilter">Installing the Text
+		Filter</link>. Furthermore, an output filter is actually
 	      <emphasis>more complex</emphasis> in that it has to examine the
 	      byte stream being sent to it for special flag characters and
 	      must send signals to itself on behalf of LPD.</para>
@@ -3455,9 +3432,9 @@ exit 0</programlisting>
 	    
 	    <para>On a single printer, LPD allows both an output filter and
 	      text or other filters. In such cases, LPD will start the output
-	      filter to print the header page (see section <xref
-		linkend="printing-advanced-header-pages" remap="Header
-		Pages">) only. LPD then expects the output filter to
+	      filter to print the header page (see section <link
+		linkend="printing-advanced-header-pages">Header
+		Pages</link>) only. LPD then expects the output filter to
 	      <emphasis>stop itself</emphasis> by sending two bytes to the
 	      filter: ASCII 031 followed by ASCII 001. When an output filter
 	      sees these two bytes (031, 001), it should stop by sending
@@ -3504,9 +3481,9 @@ exit 0</programlisting>
 	      <filename>/etc/printcap</filename> file. It uses these values
 	      to determine how much text can fit on a page and how many pages
 	      were in a user's job. For more information on printer
-	      accounting, see <xref
-		linkend="printing-advanced-acct" remap="Accounting for Printer
-		Usage">.</para>
+	      accounting, see <link
+		linkend="printing-advanced-acct">Accounting for Printer
+		Usage</link>.</para>
 	    
 	  </sect3>
 	</sect2>
@@ -3534,16 +3511,16 @@ exit 0</programlisting>
 	  <para>The LPD system can provide header pages automatically for your
 	    printouts <emphasis>if</emphasis> your printer can directly print
 	    plain text. If you have a PostScript printer, you will need an
-	    external program to generate the header page; see <xref
-	      linkend="printing-advanced-header-pages-ps" remap="Header Pages
-	      on    PostScript Printers">.</para>
+	    external program to generate the header page; see <link
+	      linkend="printing-advanced-header-pages-ps">Header Pages
+	      on    PostScript Printers</link>.</para>
 	  
 	  
 	  <sect3 id="printing-advanced-header-pages-enabling">
 	    <title>Enabling Header Pages</title>
 	    
-	    <para>In the <xref linkend="printing-simple" remap="Simple
-		Printer        Setup">, we turned off header pages by
+	    <para>In the <link linkend="printing-simple">Simple
+		Printer        Setup</link>, we turned off header pages by
 	      specifying <literal>sh</literal> (meaning &ldquo;suppress
 	      header&rdquo;) in the <filename>/etc/printcap</filename> file. To
 	      enable header pages for a printer, just remove the <literal>sh</literal> capability.</para>
@@ -3565,9 +3542,8 @@ printf "\033&amp;k2G" || exit 2 exec
 /usr/libexec/lpr/lpf</programlisting>
 	    
 	    <para>Specify the path to the output filter in the
-	      <literal>of</literal> capability. See <xref
-		linkend="printing-advanced-of"
-		remap="Output Filters"> for more information.</para>
+	      <literal>of</literal> capability. See <link
+		linkend="printing-advanced-of">Output Filters</link> for more information.</para>
 	    
 	    <para>Here is an example <filename>/etc/printcap</filename> file
 	      for the printer <literal>teak</literal> that we
@@ -3587,9 +3563,9 @@ teak|hp|laserjet|Hewlett Packard LaserJet 3Si:\
 	    <para>Now, when users print jobs to <literal>teak</literal>, they get a header page with each
 	      job. If users want to spend time searching for their printouts,
 	      they can suppress header pages by submitting the job with
-	      <command>lpr -h</command>; see <xref
-		linkend="printing-lpr-options-misc" remap="Header Page
-		Options"> for more  <citerefentry>
+	      <command>lpr -h</command>; see <link
+		linkend="printing-lpr-options-misc">Header Page
+		Options</link> for more  <citerefentry>
 		<refentrytitle>lpr</refentrytitle></citerefentry>
 	      options.</para>
 
@@ -3719,8 +3695,7 @@ rose:kelly  Job: outline  Date: Sun Sep 17 11:07:51 1995</programlisting>
 		
 		<listitem>
 		  <para>Install an alternative to LPD, such as LPDng or PLP.
-		    Section <xref linkend="printing-lpd-alternatives"
-		      remap="Alternatives to the Standard   Spooler"> tells
+		    Section <link linkend="printing-lpd-alternatives">Alternatives to the Standard   Spooler</link> tells
 		    more about other spooling software you can substitute for
 		    LPD.</para>
 		</listitem>
@@ -3896,8 +3871,7 @@ done
 	      argument list in order to determine the user and host name. The
 	      parsing for the other conversion filters is identical. The text
 	      filter takes a slightly different set of arguments, though (see
-	      section <xref linkend="printing-advanced-filters"
-		remap="How      Filters Work">).</para>
+	      section <link linkend="printing-advanced-filters">How      Filters Work</link>).</para>
 	    
 	    <para>As we have mentioned before, the above scheme, though fairly
 	      simple, disables the &ldquo;suppress header page&rdquo; option (the
@@ -3908,8 +3882,7 @@ done
 	    
 	    <para>To allow users to shut off header pages on a per-job basis,
 	      you will need to use the trick introduced in section
-	      <xref linkend="printing-advanced-header-pages-accounting"
-		remap="Accounting for Header Pages">: write an output filter
+	      <link linkend="printing-advanced-header-pages-accounting">Accounting for Header Pages</link>: write an output filter
 	      that parses the LPD-generated header page and produces a
 	      PostScript version. If the user submits the job with
 	      <command>lpr -h</command>, then LPD will not generate a header
@@ -3939,9 +3912,9 @@ done
 		  install a printer that has a conventional serial or parallel
 		  interface on one host. Then, you set up LPD to enable
 		  access to the printer from other hosts on the network.
-		  Section <xref
-		    linkend="printing-advanced-network-rm" remap="Printers
-		    Installed on Remote Hosts"> tells how to do this.</para>
+		  Section <link
+		    linkend="printing-advanced-network-rm">Printers
+		    Installed on Remote Hosts</link> tells how to do this.</para>
 	      </listitem>
 	      
 	      <listitem>
@@ -3956,9 +3929,8 @@ done
 		      <para>It might understand the LPD protocol and can even
 			queue jobs from remote hosts. In this case, it acts
 			just like a regular host running LPD. Follow the same
-			procedure in section <xref
-			  linkend="printing-advanced-network-rm"
-			  remap="Printers     Installed on Remote Hosts"> to
+			procedure in section <link
+			  linkend="printing-advanced-network-rm">Printers     Installed on Remote Hosts</link> to
 			set up such a printer.</para>
 		    </listitem>
 		    
@@ -3967,10 +3939,9 @@ done
 			In this case, you &ldquo;attach&rdquo; the printer to one host
 			on the network by making that host responsible for
 			spooling jobs and sending them to the printer.
-			Section <xref
-			  linkend="printing-advanced-network-net-if"
-			  remap="Printers     with Networked Data Stream
-			  Interfaces"> gives some suggestions on installing
+			Section <link
+			  linkend="printing-advanced-network-net-if">Printers     with Networked Data Stream
+			  Interfaces</link> gives some suggestions on installing
 			such printers.</para>
 		    </listitem>
 		    
@@ -3994,10 +3965,9 @@ done
 	    
 	    <para>To enable this kind of remote printing, first install a
 	      printer on one host, the <emphasis>printer host</emphasis>,
-	      using the simple printer setup described in <xref
-		linkend="printing-simple" remap="Simple Printer Setup">. Do
-	      any advanced setup in <xref linkend="printing-advanced"
-		remap="Advanced Printer Setup"> that you need. Make sure to
+	      using the simple printer setup described in <link
+		linkend="printing-simple">Simple Printer Setup</link>. Do
+	      any advanced setup in <link linkend="printing-advanced">Advanced Printer Setup</link> that you need. Make sure to
 	      test the printer and see if it works with the features of LPD
 	      you have enabled.</para>
 	    
@@ -4051,8 +4021,7 @@ done
 	      orchid to print to those printers. Here is the
 	      <filename>/etc/printcap</filename> file for <hostid>orchid</hostid> (back from
 	      section
-	      <xref linkend="printing-advanced-header-pages-enabling"
-		remap="Enabling Header Pages">). It already had the entry for
+	      <link linkend="printing-advanced-header-pages-enabling">Enabling Header Pages</link>). It already had the entry for
 	      the printer <literal>teak</literal>; we have added
 	      entries for the two printers on the host rose:</para>
 	      
@@ -4116,9 +4085,9 @@ bamboo|ps|PS|S|panasonic|Panasonic KX-P4455 PostScript v51.4:\
 	      expensive version), or one which just lets you send data to it
 	      as if you were using a serial or parallel port (the cheaper
 	      version). This section tells how to use the cheaper version.
-	      For the more expensive one, see the previous section <xref
-		linkend="printing-advanced-network-rm" remap="Printers
-		Installed on Remote Hosts">.</para>
+	      For the more expensive one, see the previous section <link
+		linkend="printing-advanced-network-rm">Printers
+		Installed on Remote Hosts</link>.</para>
 	    
 	    <para>The format of the <filename>/etc/printcap</filename> file
 	      lets you specify what serial or parallel interface to use, and
@@ -4213,8 +4182,7 @@ exit 0;</programlisting>
 	      </informalexample>
 	    
 	    <para>Note that if you have set up access to a printer remotely
-	      (see section <xref linkend="printing-advanced-network-rm"
-		remap="Printers Installed on Remote      Hosts">), you need
+	      (see section <link linkend="printing-advanced-network-rm">Printers Installed on Remote      Hosts</link>), you need
 	      the <literal>sc</literal> capability on the remote
 	      <filename>/etc/printcap</filename> files as well, or else users
 	      will still be able to submit multiple-copy jobs by using another
@@ -4299,8 +4267,7 @@ bamboo|ps|PS|S|panasonic|Panasonic KX-P4455 PostScript v51.4:\
 	    <para>As with the <literal>sc</literal> (suppress
 	      multiple copies) capability, you need to specify <literal>rg</literal> on remote hosts that also have access
 	      to your printers, if you feel it is appropriate (see section
-	      <xref linkend="printing-advanced-network-rm"
-		remap="Printers Installed on Remote Hosts">).</para>
+	      <link linkend="printing-advanced-network-rm">Printers Installed on Remote Hosts</link>).</para>
 	    
 	    <para>For example, we will let anyone access the printer
 	      <literal>rattan</literal>, but only those in group
@@ -4393,15 +4360,14 @@ bamboo|ps|PS|S|panasonic|Panasonic KX-P4455 PostScript v51.4:\
 	      remote users will not get those limits. You will need to
 	      specify the <literal>mx</literal> capability in the
 	      remote <filename>/etc/printcap</filename> files as well. See
-	      section <xref
-		linkend="printing-advanced-network-rm" remap="Printers
-		Installed      on Remote Hosts"> for more information on
+	      section <link
+		linkend="printing-advanced-network-rm">Printers
+		Installed      on Remote Hosts</link> for more information on
 	      remote printing.</para>
 	    
 	    <para>There is another specialized way to limit job sizes from
-	      remote printers; see section <xref
-		linkend="printing-advanced-restricting-remote"
-		remap="Restricting Jobs from Remote Printers">.</para>
+	      remote printers; see section <link
+		linkend="printing-advanced-restricting-remote">Restricting Jobs from Remote Printers</link>.</para>
 	    
 	  </sect3>
 	  
@@ -4547,9 +4513,8 @@ bamboo|ps|PS|S|panasonic|Panasonic KX-P4455 PostScript v51.4:\
 	    (to charge for other file formats), to count pages or query the
 	    printer for pages printed. You cannot get away with using the
 	    simple output filter, since it cannot do accounting. See section
-	    <xref
-	      linkend="printing-advanced-filter-intro"
-	      remap="Filters">.</para>
+	    <link
+	      linkend="printing-advanced-filter-intro">Filters</link>.</para>
 	  
 	  <para>Generally, there are two ways to do accounting:</para>
 	    <itemizedlist>
@@ -4597,14 +4562,14 @@ bamboo|ps|PS|S|panasonic|Panasonic KX-P4455 PostScript v51.4:\
 	    <para>FreeBSD comes with two programs that can get you set up
 	      with simple periodic accounting right away. They are the text
 	      filter <command>lpf</command>, described in section
-	      <xref linkend="printing-advanced-lpf" remap="lpf: a Text
-		Filter">, and <citerefentry>
+	      <link linkend="printing-advanced-lpf">lpf: a Text
+		Filter</link>, and <citerefentry>
 		<refentrytitle>pac</refentrytitle></citerefentry>, a
 	      program to gather and total entries from printer accounting
 	      files.</para>
 	    
-	    <para>As mentioned in the section on filters (<xref
-		linkend="printing-advanced-filters" remap="Filters">), LPD
+	    <para>As mentioned in the section on filters (<link
+		linkend="printing-advanced-filters">Filters</link>), LPD
 	      starts the text and the conversion filters with the name of the
 	      accounting file to use on the filter command line. The filters
 	      can use this argument to know where to write an accounting file
@@ -4791,8 +4756,8 @@ total                     337.00  154   $  6.74</screen>
 	      physical lines.</para>
 	    
 	    <para>The text filter <command>lpf</command>
-	      (introduced in <xref linkend="printing-advanced-lpf" remap="lpf:
-		a Text Filter">) takes into account these things when it does
+	      (introduced in <link linkend="printing-advanced-lpf">lpf:
+		a Text Filter</link>) takes into account these things when it does
 	      accounting. If you are writing a text filter which needs to do
 	      accounting, you might want to examine <command>lpf</command>'s source code.</para>
 	    
diff --git a/en_US.ISO_8859-1/books/handbook/quotas/chapter.sgml b/en_US.ISO_8859-1/books/handbook/quotas/chapter.sgml
index 500ae27751..9052bb131b 100644
--- a/en_US.ISO_8859-1/books/handbook/quotas/chapter.sgml
+++ b/en_US.ISO_8859-1/books/handbook/quotas/chapter.sgml
@@ -27,7 +27,7 @@ options QUOTA</programlisting>
 	  stock <filename>GENERIC</filename> kernel does not have this enabled
 	  by default, so you will have to configure, build and install a
 	  custom kernel in order to use  disk quotas. Please refer to the
-	  <xref linkend="kernelconfig" remap="Configuring the FreeBSD Kernel">
+	  <link linkend="kernelconfig">Configuring the FreeBSD Kernel</link>
 	  section for more information on kernel configuration.</para>
 	
 	<para>Next you will need to enable disk quotas in
diff --git a/en_US.ISO_8859-1/books/handbook/security/chapter.sgml b/en_US.ISO_8859-1/books/handbook/security/chapter.sgml
index 23f693a240..00f1b8aa4c 100644
--- a/en_US.ISO_8859-1/books/handbook/security/chapter.sgml
+++ b/en_US.ISO_8859-1/books/handbook/security/chapter.sgml
@@ -1072,7 +1072,7 @@ FreeBSD BUILT-19950429 (GR386) #0: Sat Apr 29 17:50:09 SAT 1995</screen>
 	    in the kernel, you will need to add one or more options to your
 	    kernel configuration file, depending on what facilities you want,
 	    and recompile your kernel. See
-	    <xref linkend="kernelconfig" remap="reconfiguring the kernel"> for
+	    <link linkend="kernelconfig">reconfiguring the kernel</link> for
 	    more details on how to recompile your kernel.</para>
 	  
 	  <para>There are currently three kernel configuration options
diff --git a/en_US.ISO_8859-1/books/handbook/serialcomms/chapter.sgml b/en_US.ISO_8859-1/books/handbook/serialcomms/chapter.sgml
index 62f687e41e..59b6b828f9 100644
--- a/en_US.ISO_8859-1/books/handbook/serialcomms/chapter.sgml
+++ b/en_US.ISO_8859-1/books/handbook/serialcomms/chapter.sgml
@@ -98,16 +98,16 @@
 	    <itemizedlist>
 	      
 	      <listitem>
-		<para><xref linkend="term-dumb" remap="Dumb terminals"></para>
+		<para><link linkend="term-dumb">Dumb terminals</link></para>
 	      </listitem>
 	      
 	      <listitem>
-		<para><xref linkend="term-pcs" remap="PCs acting as
-		    terminals"></para>
+		<para><link linkend="term-pcs">PCs acting as
+		    terminals</link></para>
 	      </listitem>
 	      
 	      <listitem>
-		<para><xref linkend="term-x" remap="X terminals"></para>
+		<para><link linkend="term-x">X terminals</link></para>
 	      </listitem>
 	      
 	    </itemizedlist>
@@ -143,7 +143,7 @@
 	  <sect3 id="term-pcs">
 	    <title>PCs Acting As Terminals</title>
 	    
-	    <para>If a <xref linkend="term-dumb" remap="dumb terminal"> has
+	    <para>If a <link linkend="term-dumb">dumb terminal</link> has
 	      just enough ability to display, send, and receive text, then
 	      certainly any spare personal computer can be a dumb terminal.
 	      All you need is the proper cable and some <emphasis>terminal
@@ -180,7 +180,7 @@
 	    right kind of cable and a serial port to which to connect it. This
 	    section tells you what to do. If you are already familiar with
 	    your terminal and the cable it requires, skip to
-	    <xref linkend="term-config" remap="Configuration">.</para>
+	    <link linkend="term-config">Configuration</link>.</para>
 	  
 	  
 	  <sect3 id="term-cables">
@@ -198,8 +198,7 @@
 		
 		<listitem>
 		  <para>If you are connecting a personal computer to act as a
-		    terminal, use a <xref linkend="term-null"
-		      remap="null-modem"> cable. A null-modem cable connects
+		    terminal, use a <link linkend="term-null">null-modem</link> cable. A null-modem cable connects
 		    two computers or terminals together.</para>
 		</listitem>
 		
@@ -207,9 +206,8 @@
 		  <para>If you have an actual terminal, your best source of
 		    information on what cable to use is the documentation that
 		    accompanied the terminal. If you do not have the
-		    documentation, then try a <xref linkend="term-null"
-		      remap="null-modem"> cable. If that does not work, then
-		    try a <xref linkend="term-std" remap="standard">
+		    documentation, then try a <link linkend="term-null">null-modem</link> cable. If that does not work, then
+		    try a <link linkend="term-std">standard</link>
 		    cable.</para>
 		</listitem>
 		
@@ -390,8 +388,7 @@
 	      
 	      <para>Note that you may have to configure your kernel to support
 		each serial port, especially if you have a multiport serial
-		card. See <xref linkend="kernelconfig"
-		  remap="Configuring the FreeBSD      Kernel"> for more
+		card. See <link linkend="kernelconfig">Configuring the FreeBSD      Kernel</link> for more
 		information.</para>
 	      
 	    </sect4>
diff --git a/en_US.ISO_8859-1/books/handbook/staff/chapter.sgml b/en_US.ISO_8859-1/books/handbook/staff/chapter.sgml
index ade629173f..1af92d2ec7 100644
--- a/en_US.ISO_8859-1/books/handbook/staff/chapter.sgml
+++ b/en_US.ISO_8859-1/books/handbook/staff/chapter.sgml
@@ -10,9 +10,8 @@
 	
 	<para>The FreeBSD core team constitutes the project's &ldquo;Board of
 	  Directors&rdquo;, responsible for deciding the project's overall goals
-	  and direction as well as managing <xref linkend="staff-who"
-	    remap="specific
-	    areas"> of the FreeBSD project landscape.</para>
+	  and direction as well as managing <link linkend="staff-who">specific
+	  areas</link> of the FreeBSD project landscape.</para>
 	
 	<para>(in alphabetical order by last name):</para>