- Replace misused (empty) link elements with xref

18 files changed, 93 insertions, 102 deletions

diff --git a/de_DE.ISO8859-1/books/handbook/disks/chapter.xml b/de_DE.ISO8859-1/books/handbook/disks/chapter.xml
index eadbfe69ee..8974b76820 100644
--- a/de_DE.ISO8859-1/books/handbook/disks/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/disks/chapter.xml
@@ -1078,8 +1078,8 @@ umass0: detached</screen>
 
       <para>Welches Tool Sie zum Brennen von CDs benutzen, h�ngt davon
 	ab, ob Ihr CD-Brenner ein ATAPI-Ger�t ist oder nicht.
-	Mit ATAPI-CD-Brennern wird <command><link linkend="burncd">
-	</link>burncd</command> benutzt, das Teil des Basissystems ist.
+	Mit ATAPI-CD-Brennern wird <command>burncd</command> benutzt,
+	das Teil des Basissystems ist.
 	SCSI- und USB-CD-Brenner werden mit <command><link linkend="cdrecord">
 	cdrecord</link></command> aus <filename
 	role="package">sysutils/cdrtools</filename> benutzt.
diff --git a/en_US.ISO8859-1/articles/pam/article.xml b/en_US.ISO8859-1/articles/pam/article.xml
index 0bf1ea2848..deba48a499 100644
--- a/en_US.ISO8859-1/articles/pam/article.xml
+++ b/en_US.ISO8859-1/articles/pam/article.xml
@@ -834,8 +834,7 @@ sshd	password	required	pam_permit.so</programlisting>
       <title id="pam-config-breakdown.title">Breakdown of a
 	configuration line</title>
 
-      <para>As explained in the <link linkend="pam-config-file"
-	endterm="pam-config-file.title"></link> section, each line in
+      <para>As explained in <xref linkend="pam-config-file"/>, each line in
 	<filename>/etc/pam.conf</filename> consists of four or more
 	fields: the service name, the facility name, the control flag,
 	the module name, and zero or more module arguments.</para>
@@ -852,13 +851,10 @@ sshd	password	required	pam_permit.so</programlisting>
 	facility name.</para>
 
       <para>The facility is one of the four facility keywords
-	described in the <link linkend="pam-facilities-primitives"
-	endterm="pam-facilities-primitives.title"></link>
-	section.</para>
+	described in <xref linkend="pam-facilities-primitives"/>.</para>
 
       <para>Likewise, the control flag is one of the four keywords
-	described in the <link linkend="pam-chains-policies"
-	endterm="pam-chains-policies.title"></link> section,
+	described in <xref linkend="pam-chains-policies"/>,
 	describing how to interpret the return code from the module.
 	Linux-PAM supports an alternate syntax that lets you specify
 	the action to associate with each possible return code, but
@@ -1228,9 +1224,8 @@ sshd	password	required	pam_permit.so</programlisting>
       build this application on a system with a different PAM library,
       you will have to provide your own conversation function.  A
       robust conversation function is surprisingly difficult to
-      implement; the one presented in the <link
-      linkend="pam-sample-conv"
-      endterm="pam-sample-conv.title"></link> appendix is a good
+      implement; the one presented in <xref
+      linkend="pam-sample-conv"/> is a good
       starting point, but should not be used in real-world
       applications.</para>
 
diff --git a/en_US.ISO8859-1/books/handbook/desktop/chapter.xml b/en_US.ISO8859-1/books/handbook/desktop/chapter.xml
index fdbff70c96..cd599f7917 100644
--- a/en_US.ISO8859-1/books/handbook/desktop/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/desktop/chapter.xml
@@ -200,9 +200,9 @@
     </itemizedlist>
 
     <para>For information on how to configure a multimedia
-      environment, refer to <link linkend="multimedia"></link>.  For
+      environment, refer to <xref linkend="multimedia"/>.  For
       information on how to set up and use electronic mail, refer to
-      <link linkend="mail"></link>.</para>
+      <xref linkend="mail"/>.</para>
   </sect1>
 
   <sect1 id="desktop-browsers">
@@ -222,7 +222,7 @@
 
     <para>The <application>KDE</application> and
       <application>GNOME</application> desktop environments include
-      their own HTML browser.  Refer to <link linkend="x11-wm"></link>
+      their own HTML browser.  Refer to <xref linkend="x11-wm"/>
       for more information on how to set up these complete
       desktops.</para>
 
@@ -572,7 +572,7 @@
       </note>
 
       <para>To install &java; plugin support, follow the instructions
-	in <link linkend="moz-java-plugin"></link>.</para>
+	in <xref linkend="moz-java-plugin"/>.</para>
 
       <para>Once &java; support is installed, start
 	<application>Chromium</application>, and enter
diff --git a/en_US.ISO8859-1/books/handbook/disks/chapter.xml b/en_US.ISO8859-1/books/handbook/disks/chapter.xml
index 3042f6b3b8..65a7b3f721 100644
--- a/en_US.ISO8859-1/books/handbook/disks/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/disks/chapter.xml
@@ -613,7 +613,7 @@ bsdlabel -e ad3</programlisting>
 	  storage.  &man.vinum.4; implements the RAID-0, RAID-1 and
 	  RAID-5 models, both individually and in combination.</para>
 
-	<para>Refer to <link linkend="vinum-vinum"></link> for more
+	<para>Refer to <xref linkend="vinum-vinum"/> for more
 	  information about &man.vinum.4;.</para>
       </sect3>
     </sect2>
@@ -824,7 +824,7 @@ da0: 126MB (258048 512 byte sectors: 64H 32S/T 126C)</screen>
 &lt;Generic Traveling Disk 1.11&gt;      at scbus0 target 0 lun 0 (da0,pass0)</screen>
 
       <para>If the drive comes with a file system, it can be mounted.
-	Refer to <link linkend="disks-adding"></link> for
+	Refer to <xref linkend="disks-adding"/> for
 	instructions on how to format and create partitions on the USB
 	drive.</para>
 
@@ -1201,8 +1201,8 @@ scsibus1:
 	  <screen>&prompt.user; <userinput>cdrecord -v dev=<replaceable>2,0</replaceable> -dao -useinfo  *.wav</userinput></screen>
 
 	  <para>Make sure that <replaceable>2,0</replaceable> is set
-	    appropriately, as described in <link
-	      linkend="cdrecord"></link>.</para>
+	    appropriately, as described in <xref
+	      linkend="cdrecord"/>.</para>
 	</step>
       </procedure>
 
@@ -1503,7 +1503,7 @@ cd0: Attempt to query device size failed: NOT READY, Medium not present - tray c
 	    as a removable hard drive.  However, this media is not
 	    compatible with most DVD-ROM drives and DVD-Video players
 	    as only a few DVD writers support the DVD-RAM format.
-	    Refer to <link linkend="creating-dvd-ram"></link> for more
+	    Refer to <xref linkend="creating-dvd-ram"/> for more
 	    information on DVD-RAM use.</para>
 	</listitem>
 
@@ -1547,7 +1547,7 @@ cd0: Attempt to query device size failed: NOT READY, Medium not present - tray c
 	therefore <link linkend="atapicam">ATAPI/CAM support</link>
 	must be loaded or statically compiled into the kernel.  This
 	support is not needed if the burner uses the USB interface.
-	Refer to <link linkend="usb-disks"></link> for more details
+	Refer to <xref linkend="usb-disks"/> for more details
 	on USB device configuration.</para>
 
       <para>DMA access must also be enabled for ATAPI devices, by
@@ -3035,8 +3035,8 @@ Filesystem 1K-blocks Used Avail Capacity  Mounted on
 
       <para>The <filename>GENERIC</filename> kernel does not
 	have this enabled by default, so a custom kernel must be
-	compiled in order to use disk quotas.  Refer to <link
-	  linkend="kernelconfig"></link> for more information on
+	compiled in order to use disk quotas.  Refer to <xref
+	  linkend="kernelconfig"/> for more information on
 	kernel configuration.</para>
 
       <para>Next, enable disk quotas in
@@ -3338,7 +3338,7 @@ Password:</screen>
 	    <title>Add the New Hard Drive</title>
 
 	    <para>Install the new drive to the system as explained in
-	      <link linkend="disks-adding"></link>.  For the purposes
+	      <xref linkend="disks-adding"/>.  For the purposes
 	      of this example, a new hard drive partition has been
 	      added as <devicename>/dev/ad4s1c</devicename> and
 	      <devicename>/dev/ad0s1<replaceable>*</replaceable></devicename>
@@ -4298,7 +4298,7 @@ Device          1K-blocks     Used    Avail Capacity
 	  other, and both are configured as primary nodes, the
 	  condition is called <literal>split-brain</literal>.  To
 	  troubleshoot this situation, follow the steps described in
-	  <link linkend="disks-hast-sb"></link>.</para>
+	  <xref linkend="disks-hast-sb"/>.</para>
       </caution>
 
       <para>Verify the result by running &man.hastctl.8; on each
@@ -4354,7 +4354,7 @@ Device          1K-blocks     Used    Avail Capacity
 	  same network segment to share an IP address.  Set up
 	  <acronym>CARP</acronym> on both nodes of the cluster
 	  according to the documentation available in
-	  <link linkend="carp"></link>.  After setup, each node will
+	  <xref linkend="carp"/>.  After setup, each node will
 	  have its own <devicename>carp0</devicename> interface with a
 	  shared IP address of
 	  <replaceable>172.16.0.254</replaceable>.  The primary
diff --git a/en_US.ISO8859-1/books/handbook/firewalls/chapter.xml b/en_US.ISO8859-1/books/handbook/firewalls/chapter.xml
index 0a08053a70..1a1981fa35 100644
--- a/en_US.ISO8859-1/books/handbook/firewalls/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/firewalls/chapter.xml
@@ -660,7 +660,7 @@ ipnat_rules="/etc/ipnat.rules"    # rules definition file for ipnat</programlist
 
       <para>There is a way to build IPF rules that utilize the power
 	of script symbolic substitution.  For more information, see
-	<link linkend="firewalls-ipf-rules-script"></link>.</para>
+	<xref linkend="firewalls-ipf-rules-script"/>.</para>
     </sect2>
 
     <sect2>
@@ -2194,7 +2194,7 @@ ipfw add deny out</programlisting>
 
       <para>If the machine is acting as a gateway providing
 	<acronym>NAT</acronym> using &man.natd.8;,
-	refer to <link linkend="network-natd"></link> for information
+	refer to <xref linkend="network-natd"/> for information
 	regarding the required <filename>/etc/rc.conf</filename>
 	options.</para>
     </sect2>
diff --git a/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.xml b/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.xml
index 6916d30bfc..f163e5cb07 100644
--- a/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.xml
@@ -291,8 +291,8 @@ following line in &man.loader.conf.5;:
       <para>If <filename class="directory">/usr/src/</filename> does
 	not exist or it is empty, source has not been installed.  The
 	easiest way to install source is to use
-	<application>svn</application> as described in <link
-	  linkend="svn"></link>.  One should also create a symlink to
+	<application>svn</application> as described in <xref
+	  linkend="svn"/>.  One should also create a symlink to
 	<filename class="directory">/usr/src/sys/</filename>:</para>
 
 	<screen>&prompt.root; <userinput>ln -s /usr/src/sys /sys</userinput></screen>
@@ -614,7 +614,7 @@ cpu          I686_CPU</programlisting>
     <para>This option enables kernel support for access control lists
       (<acronym>ACL</acronym>s).  This relies on the use of extended
       attributes and <acronym>UFS2</acronym>, and the feature is
-      described in detail in <link linkend="fs-acl"></link>.
+      described in detail in <xref linkend="fs-acl"/>.
       <acronym>ACL</acronym>s are enabled by default and should not be
       disabled in the kernel if they have been used previously on a
       file system, as this will remove the ACLs, changing the way
diff --git a/en_US.ISO8859-1/books/handbook/l10n/chapter.xml b/en_US.ISO8859-1/books/handbook/l10n/chapter.xml
index 3af373fc6c..1fbe10fc99 100644
--- a/en_US.ISO8859-1/books/handbook/l10n/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/l10n/chapter.xml
@@ -638,7 +638,7 @@ keychange="<replaceable>fkey_number sequence</replaceable>"</programlisting>
 
       <para>Although <application>Xorg</application> is not installed
 	with &os;, it can be installed from the Ports Collection.
-	Refer to <link linkend="x11"></link> for more information on
+	Refer to <xref linkend="x11"/> for more information on
 	how to do this.  This section discusses how to localize
 	<application>Xorg</application> once it is installed.</para>
 
diff --git a/en_US.ISO8859-1/books/handbook/linuxemu/chapter.xml b/en_US.ISO8859-1/books/handbook/linuxemu/chapter.xml
index a2a1fa0f94..f1de8f6b06 100644
--- a/en_US.ISO8859-1/books/handbook/linuxemu/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/linuxemu/chapter.xml
@@ -134,8 +134,8 @@ Id Refs Address    Size     Name
     <para>Users who prefer to statically link &linux; binary
       compatibility into the kernel should add <literal>options
 	COMPAT_LINUX</literal> to the custom kernel configuration
-      file.  Compile and install the new kernel as described in <link
-	linkend="kernelconfig"></link>.</para>
+      file.  Compile and install the new kernel as described in <xref
+	linkend="kernelconfig"/>.</para>
 
     <sect2 id="linuxemu-libs-manually">
       <title>Installing Libraries Manually</title>
@@ -686,7 +686,7 @@ FEATURE Maple maplelmg 2000.0831 permanent 1 XXXXXXXXXXXX \
 	6.5</application> onto a &os; system.  It works quite well,
       with the exception of the
       <application>&java.virtual.machine;</application> which is
-      described further in <link linkend="matlab-jre"></link>.</para>
+      described further in <xref linkend="matlab-jre"/>.</para>
 
     <para>The &linux; version of <application>&matlab;</application>
       can be purchased and licensed from <ulink
diff --git a/en_US.ISO8859-1/books/handbook/serialcomms/chapter.xml b/en_US.ISO8859-1/books/handbook/serialcomms/chapter.xml
index 53d1e21e03..86436fe80a 100644
--- a/en_US.ISO8859-1/books/handbook/serialcomms/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/serialcomms/chapter.xml
@@ -1420,7 +1420,7 @@ vq|VH57600|Very High Speed Modem at 57600,8-bit:\
 	</indexterm>
 
 	<para>Configuration of <filename>/etc/ttys</filename>
-	  is covered in <link linkend="ex-etc-ttys"></link>.
+	  is covered in <xref linkend="ex-etc-ttys"/>.
 	  Configuration for modems is similar, but a different
 	  argument is passed to <command>getty</command> and a
 	  different terminal type is specified.  The general format
@@ -2103,7 +2103,7 @@ raisechar=^^</programlisting>
 	developers who want to debug the kernel or device
 	drivers.</para>
 
-      <para>As described in <link linkend="boot"></link>, &os; employs
+      <para>As described in <xref linkend="boot"/>, &os; employs
 	a three stage bootstrap.  The first two stages are in the boot
 	block code which is stored at the beginning of the &os;
 	slice on the boot disk.  The boot block then loads and runs
@@ -2166,8 +2166,8 @@ raisechar=^^</programlisting>
 	  <indexterm><primary>null-modem cable</primary></indexterm>
 
 	  <para>Use either a null-modem cable or a standard serial
-	    cable and a null-modem adapter.  See <link
-	      linkend="serial-cables-ports"></link> for a discussion
+	    cable and a null-modem adapter.  See <xref
+	      linkend="serial-cables-ports"/> for a discussion
 	    on serial cables.</para>
 	</step>
 
@@ -2482,7 +2482,7 @@ boot:</screen>
       <para>During the third stage of the boot process, one can still
 	switch between the internal console and the serial console by
 	setting appropriate environment variables in the boot loader.
-	See <link linkend="serialconsole-loader"></link> for more
+	See <xref linkend="serialconsole-loader"/> for more
 	information.</para>
     </sect2>
 
@@ -2635,8 +2635,8 @@ boot:</screen>
 	  <listitem>
 	    <para>Recompile the boot blocks with
 	      <makevar>BOOT_COMCONSOLE_SPEED</makevar> set to the
-	      new console speed.  See <link
-		linkend="serialconsole-com2"></link> for detailed
+	      new console speed.  See <xref
+		linkend="serialconsole-com2"/> for detailed
 	      instructions about building and installing new boot
 	      blocks.</para>
 
@@ -2686,8 +2686,8 @@ console="comconsole,vidconsole"</programlisting>
 
 	<procedure>
 	  <step>
-	    <para>Get the kernel source as described in <link
-		linkend="updating-upgrading"></link>.</para>
+	    <para>Get the kernel source as described in <xref
+		linkend="updating-upgrading"/>.</para>
 	  </step>
 
 	  <step>
@@ -2844,8 +2844,8 @@ ttyu3 "/usr/libexec/getty std.9600" unknown off secure</programlisting>
 
 	<para>The boot loader needs to be compiled in order to use a
 	  serial port other than <devicename>sio0</devicename> for the
-	  serial console.  Follow the procedure described in <link
-	    linkend="serialconsole-com2"></link>.</para>
+	  serial console.  Follow the procedure described in <xref
+	    linkend="serialconsole-com2"/>.</para>
       </sect3>
     </sect2>
 
diff --git a/en_US.ISO8859-1/books/handbook/users/chapter.xml b/en_US.ISO8859-1/books/handbook/users/chapter.xml
index 2a3cfbcfe4..c6be01a81e 100644
--- a/en_US.ISO8859-1/books/handbook/users/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/users/chapter.xml
@@ -594,7 +594,7 @@ Other information:</screen>
 	  &man.ypchsh.1;.  <acronym>NIS</acronym> support is
 	  automatic, so specifying the <literal>yp</literal> before
 	  the command is not necessary.  How to configure NIS is
-	  covered in <link linkend="network-servers"></link>.</para>
+	  covered in <xref linkend="network-servers"/>.</para>
       </note>
     </sect2>
     <sect2 id="users-passwd">
@@ -685,8 +685,8 @@ passwd: done</screen>
     <indexterm><primary>disk quotas</primary></indexterm>
     <para>Disk quotas limit the amount of disk space available to
       users and provide a way to quickly check that usage without
-      calculating it every time.  Quotas are discussed in <link
-	linkend="quotas"></link>.</para>
+      calculating it every time.  Quotas are discussed in <xref
+	linkend="quotas"/>.</para>
 
     <para>The other resource limits include ways to limit the amount
       of CPU, memory, and other resources a user may consume.  These
diff --git a/en_US.ISO8859-1/books/handbook/vinum/chapter.xml b/en_US.ISO8859-1/books/handbook/vinum/chapter.xml
index e3dc800c4a..0b0dc34114 100644
--- a/en_US.ISO8859-1/books/handbook/vinum/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/vinum/chapter.xml
@@ -142,7 +142,7 @@
       relationships.  It works well when the access to the virtual
       disk is spread evenly about its address space.  When access is
       concentrated on a smaller area, the improvement is less marked.
-      <link linkend="vinum-concat"></link> illustrates the sequence in
+      <xref linkend="vinum-concat"/> illustrates the sequence in
       which storage units are allocated in a concatenated
       organization.</para>
 
@@ -179,7 +179,7 @@
       somewhat more effort to locate the data, and it can cause
       additional I/O load where a transfer is spread over multiple
       disks, but it can also provide a more constant load across the
-      disks.  <link linkend="vinum-striped"></link> illustrates the
+      disks.  <xref linkend="vinum-striped"/> illustrates the
       sequence in which storage units are allocated in a striped
       organization.</para>
 
@@ -379,7 +379,7 @@
 	</listitem>
       </itemizedlist>
 
-      <para><link linkend="vinum-comparison"></link> summarizes the
+      <para><xref linkend="vinum-comparison"/> summarizes the
 	advantages and disadvantages of each plex organization.</para>
 
       <table id="vinum-comparison" frame="none">
@@ -512,8 +512,8 @@
 	S myvol.p0.s0           State: up       PO:        0  B Size:      512 MB</programlisting>
 
       <para>This output shows the brief listing format of
-	&man.gvinum.8;.  It is represented graphically in <link
-	  linkend="vinum-simple-vol"></link>.</para>
+	&man.gvinum.8;.  It is represented graphically in <xref
+	  linkend="vinum-simple-vol"/>.</para>
 
       <para>
 	<figure id="vinum-simple-vol">
@@ -579,7 +579,7 @@
 	S mirror.p0.s0          State: up       PO:        0  B Size:        512 MB
 	S mirror.p1.s0          State: empty    PO:        0  B Size:        512 MB</programlisting>
 
-      <para><link linkend="vinum-mirrored-vol"></link> shows the
+      <para><xref linkend="vinum-mirrored-vol"/> shows the
 	structure graphically.</para>
 
       <para>
@@ -658,8 +658,8 @@
 	  <graphic fileref="vinum/vinum-striped-vol"/>
 	</figure></para>
 
-      <para>This volume is represented in <link
-	  linkend="vinum-striped-vol"></link>.  The darkness of the
+      <para>This volume is represented in <xref
+	  linkend="vinum-striped-vol"/>.  The darkness of the
 	stripes indicates the position within the plex address space,
 	where the lightest stripes come first and the darkest
 	last.</para>
@@ -693,7 +693,7 @@
 	writes do not go to the same subdisks even if a transfer goes
 	over two drives.</para>
 
-      <para><link linkend="vinum-raid10-vol"></link> represents the
+      <para><xref linkend="vinum-raid10-vol"/> represents the
 	structure of this volume.</para>
 
       <para>
@@ -1134,8 +1134,8 @@ Subdisk root.p1.s0:
 	within the <devicename>vinum</devicename> partition
 	<literal>h</literal>, and the offset of this partition
 	within the device or slice.  This is a typical setup that is
-	necessary to avoid the problem described in <link
-	  linkend="vinum-root-panic"></link>.  The entire
+	necessary to avoid the problem described in <xref
+	  linkend="vinum-root-panic"/>.  The entire
 	<literal>a</literal> partition is completely within the
 	<literal>h</literal> partition containing all the
 	<devicename>vinum</devicename> data for this device.</para>
@@ -1232,8 +1232,8 @@ Subdisk root.p1.s0:
 	<para>Similarly, if the above situation has been recovered,
 	  by booting from a <quote>Fixit</quote> media, and the
 	  bootstrap has been re-installed using
-	  <command>bsdlabel -B</command> as described in <link
-	    linkend="boot-boot1"></link>, the bootstrap will trash the
+	  <command>bsdlabel -B</command> as described in <xref
+	    linkend="boot-boot1"/>, the bootstrap will trash the
 	  <devicename>vinum</devicename> header, and
 	  <devicename>vinum</devicename> will no longer find its
 	  disk(s).  Though no actual <devicename>vinum</devicename>
diff --git a/en_US.ISO8859-1/books/handbook/virtualization/chapter.xml b/en_US.ISO8859-1/books/handbook/virtualization/chapter.xml
index fffefbac57..10cf700741 100644
--- a/en_US.ISO8859-1/books/handbook/virtualization/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/virtualization/chapter.xml
@@ -270,8 +270,8 @@
 	      the host &mac;.  This can be accomplished by adding
 	      <literal>ifconfig_ed0="DHCP"</literal> to
 	      <filename>/etc/rc.conf</filename>.  More advanced
-	      networking setups are described in <link
-		linkend="advanced-networking"></link>.</para>
+	      networking setups are described in <xref
+		linkend="advanced-networking"/>.</para>
 	  </step>
 	</procedure>
       </sect3>
@@ -780,8 +780,8 @@ xenbr1          8000.feffffffffff   no                  vif0.1
 	      the &microsoft.windows; host.  This can be accomplished
 	      by adding <literal>ifconfig_de0="DHCP"</literal> to
 	      <filename>/etc/rc.conf</filename>.  More advanced
-	      networking setups are described in <link
-		linkend="advanced-networking"></link>.</para>
+	      networking setups are described in <xref
+		linkend="advanced-networking"/>.</para>
 	  </step>
 	</procedure>
       </sect3>
@@ -983,8 +983,8 @@ xenbr1          8000.feffffffffff   no                  vif0.1
 	      the host &mac;.  This can be accomplished by adding
 	      <literal>ifconfig_em0="DHCP"</literal> to
 	      <filename>/etc/rc.conf</filename>.  More advanced
-	      networking setups are described in <link
-		linkend="advanced-networking"></link>.</para>
+	      networking setups are described in <xref
+		linkend="advanced-networking"/>.</para>
 	  </step>
 	</procedure>
       </sect3>
diff --git a/fr_FR.ISO8859-1/articles/pam/article.xml b/fr_FR.ISO8859-1/articles/pam/article.xml
index f9459e0883..3e1d5fc4ea 100644
--- a/fr_FR.ISO8859-1/articles/pam/article.xml
+++ b/fr_FR.ISO8859-1/articles/pam/article.xml
@@ -827,9 +827,8 @@ sshd	password	required	pam_permit.so</programlisting>
       <title id="pam-config-breakdown.title">Breakdown of a
 	configuration line</title>
 
-      <para>Comme      expliqu�     dans     la      section     <link
-	linkend="pam-config-file-locations"
-	endterm="pam-config-file-locations.title"></link>,  chaque ligne de
+      <para>Comme      expliqu�     dans     <xref
+	linkend="pam-config-file-locations"/>, chaque ligne de
 	<filename>pam.conf</filename> consiste en quatre champs ou plus: le
 	nom de service, le nom du m�canisme, le drapeau de contr�le, le nom
 	du module et la pr�sence ou non d'arguments pour le module.</para>
@@ -848,13 +847,11 @@ sshd	password	required	pam_permit.so</programlisting>
       commencent par le nom du m�canisme.</para>
 
 
-      <para>Le m�canisme est  l'un des quatre mots clef  d�crit dans la
-      section         <link        linkend="pam-facilities-primitives"
-      endterm="pam-facilities-primitives.title"></link></para>
+      <para>Le m�canisme est  l'un des quatre mots clef  d�crit dans
+      <xref        linkend="pam-facilities-primitives"/>.</para>
 
       <para>De m�me, le  drapeau de contr�le est l'un  des quatre mots
-      clef d�crits dans la section <link linkend="pam-chains-policies"
-      endterm="pam-chains-policies.title"></link>  et  d�crit comment
+      clef d�crits dans <xref linkend="pam-chains-policies"/> et  d�crit comment
       le   module   doit   interpr�ter    le   code   de   retour   du
       module.  Linux-PAM  supporte une  syntaxe  alternative qui  vous
       laisse  sp�cifier l'action &agrave;  associer &agrave;  chaque code  de retour
@@ -1212,8 +1209,8 @@ sshd	password	required	pam_permit.so</programlisting>
     biblioth�que  PAM  diff�rente  vous  devrez fournir  votre  propre
     fonction de conversation. Une fonction de conversation robuste est
     �tonnamment   difficile  &agrave;   impl�menter;  celle   pr�sent�e  dans
-    l'appendice<link                          linkend="pam-sample-conv"
-    endterm="pam-sample-conv.title"></link>   est  un  bon   point  de
+    <xref                          linkend="pam-sample-conv"/>
+    est  un  bon   point  de
     d�part, mais  ne devrait pas  �tre utilis�e dans  des applications
     r�elles.</para>
 
diff --git a/ja_JP.eucJP/books/handbook/desktop/chapter.xml b/ja_JP.eucJP/books/handbook/desktop/chapter.xml
index 3d92a21015..efb8258b30 100644
--- a/ja_JP.eucJP/books/handbook/desktop/chapter.xml
+++ b/ja_JP.eucJP/books/handbook/desktop/chapter.xml
@@ -234,7 +234,7 @@
       <application>GNOME</application> �ǥ����ȥå״Ķ��ˤϡ�
       ���줾�� HTML �֥饦�����Ѱդ���Ƥ��ޤ���
       �����Υǥ����ȥå״Ķ������ꤹ�뤿��ξ���ˤĤ��Ƥ�
-      <link linkend="x11-wm"></link> �򻲾Ȥ��Ƥ���������</para>
+      <xref linkend="x11-wm"/> �򻲾Ȥ��Ƥ���������</para>
 
     <para>���̤ʥ֥饦���Ȥ��Ƥϡ�
       <filename role="package">www/dillo2</filename>,
@@ -591,7 +591,7 @@
       </note>
 
       <para>&java; �ץ饰����򥤥󥹥ȡ��뤹��ˤϡ�
-	<link linkend="moz-java-plugin"></link>
+	<xref linkend="moz-java-plugin"/>
 	�˽񤫤�Ƥ�����˽��äƤ���������</para>
 
       <para>&java; �Υ��ݡ��Ȥ򥤥󥹥ȡ��뤷���顢
diff --git a/mn_MN.UTF-8/books/handbook/serialcomms/chapter.xml b/mn_MN.UTF-8/books/handbook/serialcomms/chapter.xml
index 57df2bb515..60227c8080 100644
--- a/mn_MN.UTF-8/books/handbook/serialcomms/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/serialcomms/chapter.xml
@@ -1349,7 +1349,7 @@ vq|VH57600|Very High Speed Modem at 57600,8-bit:\
 	</indexterm>
 
 	<para><filename>/etc/ttys</filename> файлын тохиргоо
-	<link linkend="ex-etc-ttys"></link> хэсэгт яригдсан байгаа.
+	<xref linkend="ex-etc-ttys"/> хэсэгт яригдсан байгаа.
 	Модемуудын тохиргоо төстэй боловч бид өөр терминалын төрлийг заахын тулд
 	<command>getty</command> уруу өөр нэмэлт өгөгдлүүдийг дамжуулах ёстой.
 	Түгжигдсэн хурдтай болон таарах хурдтай тохиргоонуудын ерөнхий хэлбэр нь
@@ -1999,7 +1999,7 @@ raisechar=^^</programlisting>
 	хүссэн системийн администраторууд болон цөм эсвэл төхөөрөмжийн драйверуудыг
 	дибаг хийхийг хүссэн хөгжүүлэгчид юм.</para>
 
-      <para><link linkend="boot"></link>-т тайлбарласнаар &os; нь гурван шаттай эхлүүлэгчийг
+      <para><xref linkend="boot"/>-т тайлбарласнаар &os; нь гурван шаттай эхлүүлэгчийг
 	хэрэглэдэг. Эхний хоёр шат нь ачаалах диск дээрх &os;-ийн зүсмэлийн эхлэл дээр
 	хадгалагддаг ачаалах блокийн кодод байдаг. Ачаалах блок нь ачаалагч дуудагчийг
 	(<filename>/boot/loader</filename>) гурав дахь шатны код болгон дуудаж
@@ -2059,7 +2059,7 @@ raisechar=^^</programlisting>
 
 	  <para>Танд null-модем кабель эсвэл стандарт цуваа кабель болон null-модем
 		хувиргагч хэрэгтэй болно. Цуваа кабелиудын тухай хэлэлцүүлгийг
-		<link linkend="serial-cables-ports"></link> хэсгээс үзнэ үү.</para>
+		<xref linkend="serial-cables-ports"/> хэсгээс үзнэ үү.</para>
 	</step>
 
 	<step>
@@ -2347,7 +2347,7 @@ boot:</screen>
       <para>Ачаалагч дуудагч дуудагдсаны дараа та ачаалах процессийн гурав дахь
 	шатанд байгаа бол ачаалагч дуудагчид зохих орчны хувьсагчуудыг тохируулж
 	дотоод консол болон цуваа консолын хооронд та шилжиж чадсан хэвээр байх
-	болно. <link linkend="serialconsole-loader"></link>-г үзнэ үү.</para>
+	болно. <xref linkend="serialconsole-loader"/>-г үзнэ үү.</para>
     </sect2>
 
   <sect2 id="serialconsole-summary">
@@ -2500,7 +2500,7 @@ boot:</screen>
 	    <para>Ачаалах блокуудыг консолын шинэ хурд заагдсан
 		<makevar>BOOT_COMCONSOLE_SPEED</makevar> хувьсагчтай цуг
 		дахин эмхэтгэнэ. Шинэ ачаалах блокуудыг бүтээж суулгах талаар
-		дэлгэрэнгүй заавруудыг <link linkend="serialconsole-com2"></link>-с
+		дэлгэрэнгүй заавруудыг <xref linkend="serialconsole-com2"/>-с
 		үзнэ үү.</para>
 
 	    <para>Хэрэв цуваа консол нь <option>-h</option> тохируулгатайгаар
@@ -2552,7 +2552,7 @@ console="comconsole,vidconsole"</programlisting>
 
 	<procedure>
 	  <step>
-	    <para>Цөмийн эхийг авна. (<link linkend="updating-upgrading"></link> бүлгийг үзнэ үү)</para>
+	    <para>Цөмийн эхийг авна. (<xref linkend="updating-upgrading"/> бүлгийг үзнэ үү)</para>
 	  </step>
 
 	  <step>
diff --git a/mn_MN.UTF-8/books/handbook/users/chapter.xml b/mn_MN.UTF-8/books/handbook/users/chapter.xml
index 5fb93fff51..b1171818c7 100644
--- a/mn_MN.UTF-8/books/handbook/users/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/users/chapter.xml
@@ -570,7 +570,7 @@ Other information:</screen>
 	  &man.ypchfn.1;, болон &man.ypchsh.1; нартай ижилхэн холбоос.
 	  NIS дэмжлэг автоматаар хийгдсэн байгаа. Тийм болохоор тушаалын
 	  урд нь <literal>yp</literal> угтвар залгах шаардлагагүй.
-	  NIS хэрхэн тохируулах талаар <link linkend="network-servers"></link>
+	  NIS хэрхэн тохируулах талаар <xref linkend="network-servers"/>
 	  хэсэгт тайлбарлагдах болно.</para>
       </note>
     </sect2>
@@ -659,8 +659,8 @@ passwd: done</screen>
     <indexterm><primary>дискний хуваарилалт</primary></indexterm>
     <para>Дискийн хуваарилалт нь хэрэглэгчийн диск хэрэглэх хэмжээг
 	зааглаж өгдөг бөгөөд тухай бүрд уг хэмжээг тооцож бодолгүй
-	шуурхай шалгах боломж өгдөг. Хуваарилалт нь <link
-      linkend="quotas"></link> бүлэгт авч хэлэлцэгдсэн.</para>
+	шуурхай шалгах боломж өгдөг. Хуваарилалт нь <xref
+      linkend="quotas"/> бүлэгт авч хэлэлцэгдсэн.</para>
 
     <para>Бусад нөөцийн хязгаарлалтуудад Процессор,
 	санах ойн хэмжээ болон бусад хэрэглэгчийн хэрэглэх нөөцүүд
diff --git a/mn_MN.UTF-8/books/handbook/virtualization/chapter.xml b/mn_MN.UTF-8/books/handbook/virtualization/chapter.xml
index af962f3378..09895c5d96 100644
--- a/mn_MN.UTF-8/books/handbook/virtualization/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/virtualization/chapter.xml
@@ -270,8 +270,8 @@
 		ижил локал сүлжээнд виртуал машиныг холбохын тулд DHCP-г
 		ашиглах явдал юм. Үүнийг <filename>/etc/rc.conf</filename>
 		файлд <literal>ifconfig_ed0="DHCP"</literal> гэж
-		нэмэн хийж болно. Сүлжээний илүү нарийн тохиргоонууд <link
-		linkend="advanced-networking"></link>-д тайлбарлагдсан
+		нэмэн хийж болно. Сүлжээний илүү нарийн тохиргоонууд <xref
+		linkend="advanced-networking"/>-д тайлбарлагдсан
 		байгаа.</para>
 	    </step>
           </procedure>
@@ -765,7 +765,7 @@ xenbr1          8000.feffffffffff   no                  vif0.1
 		DHCP-ийг ашиглах явдал юм. <literal>ifconfig_de0="DHCP"</literal>
 		мөрийг <filename>/etc/rc.conf</filename> файлд нэмж
 		үүнийг хийнэ. Сүлжээний илүү нарийн тохиргоонуудын
-		талаар <link linkend="advanced-networking"></link> дээр
+		талаар <xref linkend="advanced-networking"/> дээр
 		тайлбарласан байгаа болно.</para>
 	    </step>
           </procedure>
@@ -963,7 +963,7 @@ xenbr1          8000.feffffffffff   no                  vif0.1
 		юм. <filename>/etc/rc.conf</filename> файлд
 		<literal>ifconfig_em0="DHCP"</literal> мөрийг нэмснээр
 		үүнийг хийж болно. Сүлжээний илүү дэлгэрэнгүй тохиргоонуудын
-		талаар <link linkend="advanced-networking"></link>-д тайлбарласан
+		талаар <xref linkend="advanced-networking"/>-д тайлбарласан
 		байгаа.</para>
 	    </step>
           </procedure>
diff --git a/ru_RU.KOI8-R/articles/pam/article.xml b/ru_RU.KOI8-R/articles/pam/article.xml
index d10d4b116b..718427da2b 100644
--- a/ru_RU.KOI8-R/articles/pam/article.xml
+++ b/ru_RU.KOI8-R/articles/pam/article.xml
@@ -849,8 +849,8 @@ sshd   password        required        pam_permit.so</programlisting>
     <section id="pam-config-breakdown">
       <title id="pam-config-breakdown.title">��������� ������ ���������</title>
 
-      <para>��� ��� ��������� � ������� <link linkend="pam-config-file"
-        endterm="pam-config-file.title"></link>, ������ ������ �����
+      <para>��� ��� ��������� � <xref linkend="pam-config-file"/>,
+        ������ ������ �����
         <filename>/etc/pam.conf</filename> ������� �� ����ң� ��� ��������
         ���������� �����: ����� �������, ����� ����������, ������������ �����,
         ����� ������ � �������������� ���������� ������, ������� �����
@@ -867,12 +867,11 @@ sshd   password        required        pam_permit.so</programlisting>
         ������ ���������� � �������� ����������.</para>
 
       <para>��� ���������� ������������ ����� ���� �� ����ң� �������� ����,
-        ��������� � ����� <link linkend="pam-facilities-primitives"
-        endterm="pam-facilities-primitives.title"></link>.</para>
+        ��������� � <xref linkend="pam-facilities-primitives"/>.</para>
 
       <para>����� ����� ����������� ���� �������� ����� �� ����ң� ��������
-        ����, ��������� � ������� <link linkend="pam-chains-policies"
-        endterm="pam-chains-policies.title"></link>, � ������� ����������, ���
+        ����, ��������� � <xref linkend="pam-chains-policies"/>,
+        � ������� ����������, ���
         ���������������� ������������ �� ������ ���.  � Linux-PAM
         �������������� �������������� ���������, ������� ��������� �������
         ��������, ��������� � ������ ��������� ����� ��������, �� �����
@@ -1268,8 +1267,8 @@ sshd   password        required        pam_permit.so</programlisting>
       ���� �� ����������� ������� ��� ���������� � ������� � ������
       ����������� PAM, ��� ���������� ����� ������� ����������� �������
       ��������������.  ��ģ���� ������� �������������� ���������� ������
-      ��������; ��, ��� ��������� � ���������� <link linkend="pam-sample-conv"
-      endterm="pam-sample-conv.title"></link>, ������ � �������� ���������
+      ��������; ��, ��� ��������� � <xref linkend="pam-sample-conv"/>,
+      ������ � �������� ���������
       �����, �� � �������� ����������� �������������� �� �����.</para>
 
     <programlisting>