diff --git a/general/genlib/libidn.xml b/general/genlib/libidn.xml
index 8f3061894f..8265862740 100644
--- a/general/genlib/libidn.xml
+++ b/general/genlib/libidn.xml
@@ -80,7 +80,7 @@
     a Java compiler—one of (looked for in this order)
     <xref linkend="gcc"/> (for the <command>gcj</command> program),
     <ulink url="http://jikes.sourceforge.net/">Jikes</ulink>,
-    <xref linkend="icedtea6"/>, or <xref linkend="jdk"/>,
+    <xref linkend="icedtea6"/>,<!-- or <xref linkend="jdk"/>,-->
     and a C# compiler&mdash;<ulink
     url="http://www.mono-project.com/Main_Page">Mono</ulink> or
     <ulink url="http://www.southern-storm.com.au/portable_net.html">
diff --git a/general/genutils/graphviz.xml b/general/genutils/graphviz.xml
index a53b6f28f0..d7efdfbf0c 100644
--- a/general/genutils/graphviz.xml
+++ b/general/genutils/graphviz.xml
@@ -115,7 +115,7 @@
     (<application>SWIG</application> must be installed or no bindings will be
     built),
     <xref linkend="guile"/>,
-    <xref linkend="icedtea6"/> or <xref linkend="jdk"/>,
+    <xref linkend="icedtea6"/><!-- or <xref linkend="jdk"/>-->,
     <xref linkend="php"/>,
     <xref linkend="python2"/>,
     <xref linkend="ruby"/>,
diff --git a/general/prog/gcc.xml b/general/prog/gcc.xml
index 0464507c25..958d7cd848 100644
--- a/general/prog/gcc.xml
+++ b/general/prog/gcc.xml
@@ -39,7 +39,7 @@
     Java, Objective C, Objective C++, and Ada. You should ensure you actually
     need one of these additional compilers (C and C++ are installed in LFS)
     before you install them. Additionally, there are instructions in the BLFS
-    book to install <xref linkend="icedtea6"/> or <xref linkend="jdk"/>),
+    book to install <xref linkend="icedtea6"/><!-- or <xref linkend="jdk"/>-->),
     which can be used instead of the Java provided by the
     <application>GCC</application> package. Many consider the Oracle JDK to be
     a more robust Java environment than the one provided by
diff --git a/general/prog/junit.xml b/general/prog/junit.xml
index 3e89bd141f..a9dfa58957 100644
--- a/general/prog/junit.xml
+++ b/general/prog/junit.xml
@@ -89,7 +89,7 @@ cp -v -R *.html *doc /usr/share/doc/junit-&junit-version;</userinput></screen>
    /usr/share/junit-&junit-version;/junit-&junit-version;.jar:/usr/share/junit-&junit-version;</userinput></screen>
 
     <para>To run the <application>JUnit</application> regression self-tests,
-    you'll need to have <xref linkend="icedtea6"/>, <xref linkend="jdk"/>, or
+    you'll need to have <xref linkend="icedtea6"/>,<!-- <xref linkend="jdk"/>,--> or
     <ulink url="http://jikes.sourceforge.net/">Jikes</ulink> installed and the
     <envar>CLASSPATH</envar> environment variable updated. Then, as an
     unprivileged user, issue:</para>
diff --git a/general/prog/subversion.xml b/general/prog/subversion.xml
index 3f66703103..b6c8eb4480 100644
--- a/general/prog/subversion.xml
+++ b/general/prog/subversion.xml
@@ -109,7 +109,7 @@
     <bridgehead renderas="sect4">Optional (for the Java Bindings)</bridgehead>
     <para role="optional">
       One of <xref linkend="icedtea6"/>, 
-      <xref linkend="jdk"/>,
+     <!-- <xref linkend="jdk"/>, -->
       <ulink url="http://www.inet.no/dante/">Dante</ulink>, or
       <ulink url="http://oss.software.ibm.com/developerworks/opensource/jikes/">Jikes</ulink>,
       and <xref linkend="junit"/> (to test the Java bindings)
diff --git a/general/sysutils/apache-ant.xml b/general/sysutils/apache-ant.xml
index 56d8581a9a..5ed7f9f0b9 100644
--- a/general/sysutils/apache-ant.xml
+++ b/general/sysutils/apache-ant.xml
@@ -74,8 +74,8 @@
     <bridgehead renderas="sect3">Apache Ant Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="icedtea6"/> or
-    <xref linkend="jdk"/></para>
+    <para role="required"><xref linkend="icedtea6"/><!-- or
+    <xref linkend="jdk"/>--></para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended"><xref linkend="junit"/></para>
diff --git a/gnome/add/libgda.xml b/gnome/add/libgda.xml
index 7f8d4d5b9e..817652fcbf 100644
--- a/gnome/add/libgda.xml
+++ b/gnome/add/libgda.xml
@@ -97,7 +97,7 @@
       <ulink url="http://www.firebirdsql.org/">firebird</ulink>,
       <xref linkend="gtk-doc"/>,
       <xref linkend="gtksourceview"/>,
-      <xref linkend="icedtea6"/> or <xref linkend="jdk"/>,
+      <xref linkend="icedtea6"/><!-- or <xref linkend="jdk"/>-->,
       <xref linkend="mysql"/>,
       <xref linkend="openldap"/> and
       <xref linkend="postgresql"/>
diff --git a/postlfs/security/cyrus-sasl.xml b/postlfs/security/cyrus-sasl.xml
index ae915a5816..5d8a0c73b5 100644
--- a/postlfs/security/cyrus-sasl.xml
+++ b/postlfs/security/cyrus-sasl.xml
@@ -81,7 +81,7 @@
     <para role="optional"><xref linkend="linux-pam"/>,
     <xref linkend="openldap"/>,
     <xref linkend="mitkrb"/>,
-    <xref linkend="icedtea6"/> or <xref linkend="jdk"/>,
+    <xref linkend="icedtea6"/><!-- or <xref linkend="jdk"/>-->,
     <xref linkend="mysql"/>,
     <xref linkend="postgresql"/>,
     <xref linkend="sqlite"/>,
diff --git a/postlfs/security/openssh.xml b/postlfs/security/openssh.xml
index 5bb5dab2cc..e8eb882228 100644
--- a/postlfs/security/openssh.xml
+++ b/postlfs/security/openssh.xml
@@ -95,7 +95,7 @@
 
     <bridgehead renderas="sect4">Optional Runtime (Used only to gather entropy)</bridgehead>
     <para role="optional">
-      <xref linkend="icedtea6"/> or <xref linkend="jdk"/>,
+      <xref linkend="icedtea6"/><!-- or <xref linkend="jdk"/>-->,
       <xref linkend="net-tools"/> and
       <xref linkend="sysstat"/>.
     </para>
diff --git a/pst/printing/cups.xml b/pst/printing/cups.xml
index 5a1ca2c418..2abea23264 100644
--- a/pst/printing/cups.xml
+++ b/pst/printing/cups.xml
@@ -80,7 +80,7 @@
       <xref linkend="php"/>,
       <xref linkend="gs"/>,
       <xref linkend="python2"/>,
-      <xref linkend="icedtea6"/> or <xref linkend="jdk"/>,
+      <xref linkend="icedtea6"/><!-- or <xref linkend="jdk"/>-->,
       <ulink url="http://portland.freedesktop.org/wiki/">Xdg-utils</ulink>,
       <ulink url="http://www.openslp.org/">OpenSLP</ulink>,
       <ulink
diff --git a/server/databases/db.xml b/server/databases/db.xml
index c80584667c..d7f0f052d4 100644
--- a/server/databases/db.xml
+++ b/server/databases/db.xml
@@ -78,7 +78,7 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
       <xref linkend="tcl"/>,
-      <xref linkend="icedtea6"/> or <xref linkend="jdk"/>, and
+      <xref linkend="icedtea6"/><!-- or <xref linkend="jdk"/>-->, and
       <xref linkend="sharutils"/> (for the <command>uudecode</command> command)
     </para>
 
@@ -154,7 +154,7 @@ cd ..</userinput></screen>
       <para>
         If you plan on installing <application>Berkeley DB</application> with
         Java support, you should check the system for certain versions of
-        <xref linkend="jdk"/> and <xref linkend="gmime"/>. Specifically, if
+       <!-- <xref linkend="jdk"/> and--> <xref linkend="gmime"/>. Specifically, if
         <application>JDK</application>-6 Update X and the
         <command>uudecode</command> program from the
         <application>GMime</application> program is on the system, the build
diff --git a/server/other/virtuoso.xml b/server/other/virtuoso.xml
index e6fb850560..c299209d66 100644
--- a/server/other/virtuoso.xml
+++ b/server/other/virtuoso.xml
@@ -81,9 +81,9 @@
     <para role="recommended">
     <xref linkend="libiodbc"/>,
     <xref linkend="libxml2"/>,
-    <xref linkend="openssl"/>,
-    <xref linkend="openldap"/> and
-    <xref linkend="jdk"/>
+    <xref linkend="openssl"/> and
+    <xref linkend="openldap"/>.
+   <!--<xref linkend="jdk"/>-->
     </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
@@ -144,10 +144,10 @@ make</userinput></screen>
     <application>Python</application> is installed. It enables the
     use of <application>Python</application> by 
     <application>Virtuoso</application>.</para>
-
-    <para><option>--with-jdk4</option>: Add this option to specify the path
+<!--
+    <para><option>-&#45;with-jdk4</option>: Add this option to specify the path
     to the <xref linkend="jdk"/> and to enable making use of Java.</para>
-
+-->
     <para><option>--with-port</option>: Add this if you want the  
     <application>virtuoso</application> server to listen on another port than
     1111.</para>
diff --git a/xfce/core/xfce4-session.xml b/xfce/core/xfce4-session.xml
index d210191b34..e99903de36 100644
--- a/xfce/core/xfce4-session.xml
+++ b/xfce/core/xfce4-session.xml
@@ -137,7 +137,8 @@ make</userinput></screen>
       <systemitem class="username">root</systemitem> user:
     </para>
 
-<screen role="root"><userinput>echo <replaceable>USERNAME</replaceable> ${HOSTNAME} = NOPASSWD: /usr/lib/xfce4/session/xfsm-shutdown-helper &gt;&gt; /etc/sudoers</userinput></screen>
+<screen role="root"><userinput>echo <replaceable>USERNAME</replaceable> ${HOSTNAME} = NOPASSWD: /usr/lib/xfce4/session/xfsm-shutdown-helper \
+  &gt;&gt; /etc/sudoers</userinput></screen>
   </sect2>
 
   <sect2 role="content">