Index: general/prog/jdk.xml
===================================================================
--- general/prog/jdk.xml	(revision 68c8cba0c93d230de0898d117221dfb4527d0c7d)
+++ general/prog/jdk.xml	(revision 71cd2a5acadb73894397a5019f4925cb323e582b)
@@ -270,5 +270,8 @@
 done</userinput></screen>
 
-    <para>If your <application>X Window System</application> is installed into
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../xincludes/X11R6_symlink.xml"/>
+
+    <!-- <para>If your <application>X Window System</application> is installed into
     any prefix other than <filename class="directory">/usr/X11R6</filename>,
     execute the following command, replacing
@@ -276,5 +279,5 @@
     the <application>X Window System</application>:</para>
 
-<screen><userinput>find . -type f -exec sed -i 's@/usr/X11R6@<replaceable>&lt;PREFIX&gt;</replaceable>@g' {} \;</userinput></screen>
+<screen><userinput>find . -type f -exec sed -i 's@/usr/X11R6@<replaceable>&lt;PREFIX&gt;</replaceable>@g' {} \;</userinput></screen> -->
 
     <para>Set/unset some variables which affect the build:</para>
Index: multimedia/libdriv/sdl.xml
===================================================================
--- multimedia/libdriv/sdl.xml	(revision 68c8cba0c93d230de0898d117221dfb4527d0c7d)
+++ multimedia/libdriv/sdl.xml	(revision 71cd2a5acadb73894397a5019f4925cb323e582b)
@@ -79,5 +79,8 @@
     <title>Installation of SDL</title>
 
-    <para>If your <application>X Window System</application> is installed into
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../xincludes/X11R6_symlink.xml"/>
+
+    <!-- <para>If your <application>X Window System</application> is installed into
     any prefix other than <filename class="directory">/usr/X11R6</filename>,
     execute the following command, replacing
@@ -85,5 +88,5 @@
     the <application>X Window System</application>:</para>
 
-<screen><userinput>sed -i 's:/usr/X11R6:<replaceable>&lt;PREFIX&gt;</replaceable>:' configure</userinput></screen>
+<screen><userinput>sed -i 's:/usr/X11R6:<replaceable>&lt;PREFIX&gt;</replaceable>:' configure</userinput></screen> -->
 
     <para>Install <application>SDL</application> by running the
Index: x/lib/lesstif.xml
===================================================================
--- x/lib/lesstif.xml	(revision 68c8cba0c93d230de0898d117221dfb4527d0c7d)
+++ x/lib/lesstif.xml	(revision 71cd2a5acadb73894397a5019f4925cb323e582b)
@@ -108,5 +108,5 @@
     <filename class='directory'>/usr/X11R6</filename>.</para>
 
-<screen role="root"><userinput>ln -v -s <replaceable>/usr/X11R6</replaceable>/lib/X11/mwm /etc/X11</userinput></screen>
+<screen role="root"><userinput>ln -v -s <replaceable>&lt;/usr/X11R6&gt;</replaceable>/lib/X11/mwm /etc/X11</userinput></screen>
 
   </sect2>
@@ -135,5 +135,5 @@
 
     <para><command>ln -v -s
-    <replaceable>/usr/X11R6</replaceable>/lib/X11/mwm /etc/X11</command>:
+    <replaceable>&lt;/usr/X11R6&gt;</replaceable>/lib/X11/mwm /etc/X11</command>:
     Configuration directories located in the <application>X</application>
     installation prefix heirarchy typically have a symlink in the
Index: x/lib/qt.xml
===================================================================
--- x/lib/qt.xml	(revision 68c8cba0c93d230de0898d117221dfb4527d0c7d)
+++ x/lib/qt.xml	(revision 71cd2a5acadb73894397a5019f4925cb323e582b)
@@ -100,6 +100,9 @@
     <title>Installation of Qt</title>
 
-    <para>The <application>Qt</application> source hard codes the location
-    of the <application>X Window System</application> installtion to
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../xincludes/X11R6_symlink.xml"/>
+
+    <!--<para>The <application>Qt</application> source hard codes the location
+    of the <application>X Window System</application> installation to
     <filename class="directory">/usr/X11R6</filename>.  If you've installed
     the <application>X Window System</application> in any prefix other than
@@ -113,5 +116,5 @@
 do
     sed -i "s@/usr/X11R6@<replaceable>&lt;PREFIX&gt;</replaceable>@g" $file
-done</userinput></screen>
+done</userinput></screen> -->
 
     <para>There are several ways to install a complicated package such as
