Replace

<xref linkend="target" remap="foo">

with

    <link linkend="target">foo</link>

Internal links within the Handbook now do the right thing.

en/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>