Replace

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

with

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

Internal links within the Handbook now do the right thing.

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