Index: general/prog/j2sdk.xml
===================================================================
--- general/prog/j2sdk.xml	(revision df5b04dd84c297ec72bec5d0e2835447298bf8d0)
+++ general/prog/j2sdk.xml	(revision 06aea651e0cadf2e496d57fc98dc3238b9a5b048)
@@ -1,5 +1,5 @@
-<sect1 id="j2sdk" xreflabel="j2sdk-&j2sdk-src-version;">
+<sect1 id="j2sdk" xreflabel="J2SDK-&j2sdk-src-version;">
 <?dbhtml filename="j2sdk.html" dir="general"?>
-<title>j2sdk-&j2sdk-src-version;</title>
+<title>J2SDK-&j2sdk-src-version;</title>
 
 &j2sdk-intro;
Index: general/prog/jdk/j2sdk-config.xml
===================================================================
--- general/prog/jdk/j2sdk-config.xml	(revision df5b04dd84c297ec72bec5d0e2835447298bf8d0)
+++ general/prog/jdk/j2sdk-config.xml	(revision 06aea651e0cadf2e496d57fc98dc3238b9a5b048)
@@ -1,20 +1,19 @@
 <sect2>
-<title>Configuring j2sdk</title>
+<title>Configuring <application>J2SDK</application></title>
 
 <sect3><title>Configuration Information</title>
 
-<para>We have two Java 2 SDK's installed in
+<para>We have two Java 2 <acronym>SDK</acronym>'s installed in
 <filename>/opt/j2sdk</filename>. Decide on which one you
 would like to use as the default. For example if you decide to use the source
-compiled j2sdk, do the following:</para>
+compiled <application>J2SDK</application>, do the following:</para>
 
-<para><screen><userinput>ln -nsf j2sdk-&j2sdk-src-version; /opt/j2sdk/j2sdk</userinput></screen></para>
+<screen><userinput><command>ln -nsf j2sdk-&j2sdk-src-version; /opt/j2sdk/j2sdk</command></userinput></screen>
 
 <para>Add the following lines to your shell startup file (e.g.
-<filename>/etc/profile</filename>).
-</para>
+<filename>/etc/profile</filename>).</para>
 
-<para><screen><userinput>export JAVA_HOME=/opt/j2sdk/j2sdk
-export PATH=$PATH:$JAVA_HOME/bin</userinput></screen></para>
+<screen><userinput>export JAVA_HOME=/opt/j2sdk/j2sdk
+export PATH=$PATH:$JAVA_HOME/bin</userinput></screen>
 
 <para>Add <filename>$JAVA_HOME/man</filename> to your
@@ -22,5 +21,6 @@
 <filename>/etc/man.conf</filename></para>
 
-<para>The java plugin is in the directory <filename class="directory">$JAVA_HOME/jre/plugin/i?86/ns610/</filename>.
+<para>The <application>Java</application> plugin is in the directory 
+<filename class="directory">$JAVA_HOME/jre/plugin/i?86/ns610/</filename>.
 Make a symbolic link to the file in that directory from your plugins directory.
 </para>
Index: general/prog/jdk/j2sdk-desc.xml
===================================================================
--- general/prog/jdk/j2sdk-desc.xml	(revision df5b04dd84c297ec72bec5d0e2835447298bf8d0)
+++ general/prog/jdk/j2sdk-desc.xml	(revision 06aea651e0cadf2e496d57fc98dc3238b9a5b048)
@@ -2,16 +2,17 @@
 <title>Contents</title>
 
-<para>The j2sdk package contains <userinput>appletviewer</userinput>,
-<userinput>extcheck</userinput>, <userinput>idlj</userinput>,
-<userinput>jar</userinput>, <userinput>jarsigner</userinput>,
-<userinput>java</userinput>, <userinput>javac</userinput>,
-<userinput>javadoc</userinput>, <userinput>javah</userinput>,
-<userinput>javap</userinput>, <userinput>jdb</userinput>,
-<userinput>keytool</userinput>, <userinput>native2ascii</userinput>,
-<userinput>orbd</userinput>, <userinput>policytool</userinput>,
-<userinput>rmic</userinput>, <userinput>rmid</userinput>,
-<userinput>rmiregistry</userinput>, <userinput>rmiregistry</userinput>,
-<userinput>serialver</userinput>, <userinput>servertool</userinput> and
-<userinput>tnameserv</userinput>.</para>
+<para>The <application>J2SDK</application> package contains 
+<command>appletviewer</command>,
+<command>extcheck</command>, <command>idlj</command>,
+<command>jar</command>, <command>jarsigner</command>,
+<command>java</command>, <command>javac</command>,
+<command>javadoc</command>, <command>javah</command>,
+<command>javap</command>, <command>jdb</command>,
+<command>keytool</command>, <command>native2ascii</command>,
+<command>orbd</command>, <command>policytool</command>,
+<command>rmic</command>, <command>rmid</command>,
+<command>rmiregistry</command>, <command>rmiregistry</command>,
+<command>serialver</command>, <command>servertool</command> and
+<command>tnameserv</command>.</para>
 
 </sect2>
@@ -20,81 +21,98 @@
 
 <sect3><title>appletviewer</title> 
-<para>appletviewer runs Java applets outside of the context of a
+<para><command>appletviewer</command> runs
+<application>Java</application> applets outside of the context of a
 browser.</para></sect3>
 
 <sect3><title>extcheck</title>
-<para>extcheck checks a specified jar file for title and version
-conflicts with any extensions installed in the JDK software.</para></sect3>
+<para><command>extcheck</command> checks a specified <filename>JAR</filename> 
+file for title and version conflicts with any extensions installed in the 
+<acronym>JDK</acronym> software.</para></sect3>
 
 <sect3><title>idlj</title>
-<para>idlj generates Java bindings from a given IDL file.</para></sect3>
+<para><command>idlj</command> generates <application>Java</application> 
+bindings from a given <acronym>IDL</acronym> file.</para></sect3>
 
 <sect3><title>jar</title>
-<para>jar combines multiple files into a single JAR archive file.</para></sect3>
+<para><command>jar</command> combines multiple files into a single
+<acronym>JAR</acronym> archive file.</para></sect3>
 
 <sect3><title>jarsigner</title>
-<para>jarsigner signs JAR (Java ARchive) files and verifies the
-signatures and integrity of a signed JAR.</para></sect3>
+<para><command>jarsigner</command> signs <filename>JAR</filename> 
+(Java ARchive) files and verifies the signatures and integrity of a signed 
+<filename>JAR</filename>.</para></sect3>
 
 <sect3><title>java</title>
-<para>java launches a Java application by starting a Java runtime
+<para><command>java</command> launches a <application>Java</application> 
+application by starting a <application>Java</application> runtime
 environment, loading a specified class and invoking that class's main
 method.</para></sect3>
 
 <sect3><title>javac</title>
-<para>javac reads class and interface definitions, written in the Java
-programming language, and compiles them into bytecode class files.</para></sect3>
+<para><command>javac</command> reads class and interface definitions, written 
+in the <application>Java</application> programming language, and compiles them 
+into bytecode class files.</para></sect3>
 
 <sect3><title>javadoc</title>
-<para>javadoc parses the declarations and documentation comments in a set
-of Java source files and produces a corresponding set of HTML pages
-describing the classes, interfaces, constructors, methods, and fields.</para></sect3>
+<para><command>javadoc</command> parses the declarations and documentation 
+comments in a set of <application>Java</application> source files and produces 
+a corresponding set of <acronym>HTML</acronym> pages describing the classes, 
+interfaces, constructors, methods, and fields.</para></sect3>
 
 <sect3><title>javah</title>
-<para>javah generates C header and source files that are needed to
-implement native methods.</para></sect3>
+<para><command>javah</command> generates <application>C</application> header 
+and source files that are needed to implement native methods.</para></sect3>
 
 <sect3><title>javap</title>
-<para>javap disassembles a Java class file.</para></sect3>
+<para><command>javap</command> disassembles a
+<application>Java</application> class file.</para></sect3>
 
 <sect3><title>jdb</title>
-<para>jdb is a simple command-line debugger for Java classes.</para></sect3>
+<para><command>jdb</command> is a simple command-line debugger for
+<application>Java</application> classes.</para></sect3>
 
 <sect3><title>keytool</title>
-<para>keytool is a key and certificate management utility.</para></sect3>
+<para><command>keytool</command> is a key and certificate management utility.</para></sect3>
 
 <sect3><title>native2ascii</title>
-<para>native2ascii converts files that contain non-supported character encoding
-into files containing Latin-1 or Unicode-encoded characters.</para></sect3>
+<para><command>native2ascii</command> converts files that contain non-supported 
+character encoding into files containing Latin-1 or Unicode-encoded characters.
+</para></sect3>
 
 <sect3><title>orbd</title>
-<para>orbd is used to enable clients to transparently locate and invoke
-persistent objects on servers in the CORBA environment.</para></sect3>
+<para><command>orbd</command> is used to enable clients to transparently locate 
+and invoke persistent objects on servers in the <acronym>CORBA</acronym> 
+environment.</para></sect3>
 
 <sect3><title>policytool</title>
-<para>policytool creates and manages a policy file graphically.</para></sect3>
+<para><command>policytool</command> creates and manages a policy file 
+graphically.</para></sect3>
 
 <sect3><title>rmic</title>
-<para>rmic generates stub and skeleton class files for remote objects
-from the names of compiled Java classes that contain remote object
-implementations.</para></sect3>
+<para><command>rmic</command> generates stub and skeleton class files for 
+remote objects from the names of compiled <application>Java</application> 
+classes that contain remote object implementations.</para></sect3>
 
 <sect3><title>rmid</title>
-<para>rmid starts the activation system daemon.</para></sect3>
+<para><command>rmid</command> starts the activation system daemon.</para>
+</sect3>
 
 <sect3><title>rmiregistry</title>
-<para>rmiregistry creates and starts a remote object registry on the
-specified port on the current host.</para></sect3>
+<para><command>rmiregistry</command> creates and starts a remote object 
+registry on the specified port on the current host.</para></sect3>
 
 <sect3><title>serialver</title>
-<para>serialver returns the serialVersionUID for one or more classes in
-a form suitable for copying into an evolving class.</para></sect3>
+<para><command>serialver</command> returns the serialVersionUID for one or 
+more classes in a form suitable for copying into an evolving class.</para>
+</sect3>
 
 <sect3><title>servertool</title>
-<para>servertool provides an ease-of-use interface for application
-programmers to register, unregister, startup and shutdown a server.</para></sect3>
+<para><command>servertool</command> provides an ease-of-use interface for 
+application programmers to register, unregister, startup and shutdown a server.
+</para></sect3>
 
 <sect3><title>tnameserv</title>
-<para>tnameserv starts the Java IDL name server.</para></sect3>
+<para><command>tnameserv</command> starts the <application>Java</application> 
+<acronym>IDL</acronym> name server.</para></sect3>
 
 
Index: general/prog/jdk/j2sdk-exp.xml
===================================================================
--- general/prog/jdk/j2sdk-exp.xml	(revision df5b04dd84c297ec72bec5d0e2835447298bf8d0)
+++ general/prog/jdk/j2sdk-exp.xml	(revision 06aea651e0cadf2e496d57fc98dc3238b9a5b048)
@@ -2,56 +2,63 @@
 <title>Command explanations</title>
 
-<para><userinput>T=`grep...</userinput> : Determines the part where the tarfile begins in the self extracting archive.</para>
+<para><command>T=`grep...</command> : Determines the part where the tarfile 
+begins in the self extracting archive.</para>
 
-<para><userinput>patch -Np1 -i j2sdk-${VERSION}-fix-intl-files.patch</userinput> : Patch to fix duplicate messages in the intl files.</para>
-<para><userinput>patch -Np1 -i j2sdk-${VERSION}-link-missing-libs.patch</userinput> : Patch to add missing libs to fix unresolved symbols.</para>
-<para><userinput>patch -Np1 -i j2sdk-${VERSION}-remove-fixed-paths.patch</userinput> : The build wants
-the binaries in specific locations, this patch modifies this to use the
-current <envar>PATH</envar> environment to find binaries.</para>
-<para><userinput>patch -Np1 -i j2sdk-${VERSION}-syntax-fixes.patch</userinput> : Patch to fix syntax for gcc3.</para>
-<para><userinput>patch -Np1 -i j2sdk-${VERSION}-use-included-motif.patch</userinput> : Patch to rename the internal motif library to avoid conflicts with an incompatible system installed version.</para>
+<para><command>patch -Np1 -i j2sdk-${VERSION}-fix-intl-files.patch</command> : 
+Patch to fix duplicate messages in the intl files.</para>
+<para><command>patch -Np1 -i j2sdk-${VERSION}-link-missing-libs.patch</command> : Patch to add missing libs to fix unresolved symbols.</para>
+<para><command>patch -Np1 -i j2sdk-${VERSION}-remove-fixed-paths.patch
+</command> : The build wants the binaries in specific locations, this patch 
+modifies this to use the current <envar>PATH</envar> environment to find 
+binaries.</para>
+<para><command>patch -Np1 -i j2sdk-${VERSION}-syntax-fixes.patch</command> : 
+Patch to fix syntax for <application><acronym>GCC</acronym>-3</application>.
+</para>
+<para><command>patch -Np1 -i j2sdk-${VERSION}-use-included-motif.patch
+</command> : Patch to rename the internal motif library to avoid conflicts with 
+an incompatible system installed version.</para>
 
-<para><userinput>export ALT_BOOTDIR="$JAVA_HOME"</userinput> : This
-var sets location of the bootstrap JDK.
+<para><command>export ALT_BOOTDIR="$JAVA_HOME"</command> : This var sets 
+location of the bootstrap <acronym>JDK</acronym>.
 </para>
 
-<para><userinput>export ALT_MOZILLA_PATH=$PWD</userinput> : This sets the
-variable that points to where you unzipped the mozilla headers.</para>
+<para><command>export ALT_MOZILLA_PATH=$PWD</command> : This sets the
+variable that points to where you unzipped the <application>Mozilla
+</application> headers.</para>
 
-<para><userinput>export ALT_DEVTOOLS_PATH="/usr/bin"</userinput> : This
+<para><command>export ALT_DEVTOOLS_PATH="/usr/bin"</command> : This
 changes the location where the build finds the needed executables.
 </para>
 
-<para><userinput>export BUILD_NUMBER="blfs-`date +%s`"</userinput> : This will
+<para><command>export BUILD_NUMBER="blfs-`date +%s`"</command> : This will
 help you identify this compiled version of the runtime environment and
 virtual machine by appending this information to the version in the
-output to "java -version".</para>
+output to <command>java -version</command>.</para>
 
-<para><userinput>export DEV_ONLY=true</userinput> : This command
+<para><command>export DEV_ONLY=true</command> : This command
 eliminates compiling the documentation and eliminates a dependency for
-rpm. </para>
+<application>rpm</application>. </para>
 
-<para><userinput>unset JAVA_HOME</userinput> : This clears the
+<para><command>unset JAVA_HOME</command> : This clears the
 <envar>JAVA_HOME</envar>
 variable and prevents misdirection during compile.</para>
 
-<para><userinput>unset CLASSPATH</userinput> : This clears the
-<envar>CLASSPATH</envar>
-variable and prevents misdirection during compile.</para>
-
-<para><userinput>unset CFLAGS...</userinput> : These flags cause miscompilation
-of the build. Never set these.
+<para><command>unset CLASSPATH</command> : This clears the
+<envar>CLASSPATH</envar> variable and prevents misdirection during compile.
 </para>
 
-<para><userinput>export INSANE=true</userinput> : Unless you specify that you
+<para><command>unset CFLAGS...</command> : These flags cause miscompilation
+of the build. Never set these.</para>
+
+<para><command>export INSANE=true</command> : Unless you specify that you
 are insane the build will not proceed. The certified platform for the build is
 Redhat 6.1. The above variable ensures that all the errors related to
 compiling on a non-certified platform will be converted to warnings.</para>
 
-<para><userinput>export MAKE_VERBOSE=true</userinput> : Allows the current
+<para><command>export MAKE_VERBOSE=true</command> : Allows the current
 compilation command to be displayed on the console.</para>
 
-<para><userinput>export ALT_CACERTS_FILE...</userinput> : Specifies the certificate
-file to use.</para>
+<para><command>export ALT_CACERTS_FILE...</command> : Specifies the 
+certificate file to use.</para>
 
 </sect2>
Index: general/prog/jdk/j2sdk-inst.xml
===================================================================
--- general/prog/jdk/j2sdk-inst.xml	(revision df5b04dd84c297ec72bec5d0e2835447298bf8d0)
+++ general/prog/jdk/j2sdk-inst.xml	(revision 06aea651e0cadf2e496d57fc98dc3238b9a5b048)
@@ -1,13 +1,13 @@
 <sect2>
-<title>Installation of j2sdk</title>
+<title>Installation of <application>J2SDK</application></title>
 
-<para>Both versions will be installed in parallel. You may choose to keep either
-or both.</para>
+<para>Both versions will be installed in parallel. You may choose to keep 
+either or both.</para>
 
-<para>Installation of the precompiled JDK is easy, change the executable bit for
-the downloaded file, change to the directory where you want it installed
-and execute the downloaded file.</para>
+<para>Installation of the precompiled <acronym>JDK</acronym> is easy, change 
+the executable bit for the downloaded file, change to the directory where you 
+want it installed and execute the downloaded file.</para>
 
-<para><screen><userinput>VERSION=&j2sdk-bin-version; &amp;&amp;
+<screen><userinput><command>VERSION=&j2sdk-bin-version; &amp;&amp;
 MV=`echo $VERSION | cut -d "_" -f 1,1` &amp;&amp;
 V=`echo ${VERSION} | sed -e "s/\./_/g"` &amp;&amp;
@@ -16,5 +16,5 @@
 cd j2sdk${VERSION} &amp;&amp;
 install -d /opt/j2sdk/j2sdk-precompiled-${MV} &amp;&amp;
-mv * /opt/j2sdk/j2sdk-precompiled-${MV}</userinput></screen></para>
+mv * /opt/j2sdk/j2sdk-precompiled-${MV}</command></userinput></screen>
 
 <para>The binary version is now installed.</para>
@@ -23,11 +23,11 @@
 section.</para>
 
-<para>Add the recently compiled JDK to the path.</para>
-<screen><userinput>export JAVA_HOME=/opt/j2sdk/j2sdk-precompiled-${MV} &amp;&amp;
-export PATH=$PATH:${JAVA_HOME}/bin</userinput></screen>
+<para>Add the recently compiled <acronym>JDK</acronym> to the path.</para>
+<screen><userinput><command>export JAVA_HOME=/opt/j2sdk/j2sdk-precompiled-${MV} &amp;&amp;
+export PATH=$PATH:${JAVA_HOME}/bin</command></userinput></screen>
 
 <para>Unzip and patch the source:</para>
 
-<para><screen><userinput>VERSION=&j2sdk-src-version; &amp;&amp;
+<screen><userinput><command>VERSION=&j2sdk-src-version; &amp;&amp;
 V=`echo $VERSION | sed -e "s/\./_/g"` &amp;&amp;
 unzip j2sdk-${V}-src-scsl.zip &amp;&amp;
@@ -38,8 +38,8 @@
 patch -Np1 -i j2sdk-${VERSION}-remove-fixed-paths.patch &amp;&amp;
 patch -Np1 -i j2sdk-${VERSION}-syntax-fixes.patch &amp;&amp;
-patch -Np1 -i j2sdk-${VERSION}-use-included-motif.patch</userinput></screen></para>
+patch -Np1 -i j2sdk-${VERSION}-use-included-motif.patch</command></userinput></screen>
 
 <para>Set some vars which affect the build:</para>
-<para><screen><userinput>export ALT_BOOTDIR="$JAVA_HOME" &amp;&amp;
+<screen><userinput><command>export ALT_BOOTDIR="$JAVA_HOME" &amp;&amp;
 unset JAVA_HOME &amp;&amp;
 unset CLASSPATH
@@ -53,28 +53,32 @@
 export INSANE=true &amp;&amp;
 export MAKE_VERBOSE=true &amp;&amp;
-export ALT_CACERTS_FILE=${ALT_BOOTDIR}/jre/lib/security/cacerts</userinput></screen></para>
+export ALT_CACERTS_FILE=${ALT_BOOTDIR}/jre/lib/security/cacerts</command></userinput></screen>
 
-<para>Additionally, if you would like to make in parallel, add the following (adjust
-<envar>MAKE_PARALLEL</envar> to your liking):</para>
-<para><screen><userinput>export HOTSPOT_BUILD_JOBS=$MAKE_PARALLEL</userinput></screen></para>
+<para>Additionally, if you would like to make in parallel, add the following 
+(adjust <envar>MAKE_PARALLEL</envar> to your liking):</para>
+<screen><userinput><command>export HOTSPOT_BUILD_JOBS=$MAKE_PARALLEL</command></userinput></screen>
 
-<para>The included motif doesn't build properly with the current glibc/xfree86.
-A solution is to build the motif library before compiling the j2sdk. Note that
-the motif build fails during the first run owing to some syntax error. The
-brute force and easiest solution is to rerun the make command:)</para>
+<para>The included <application>Motif</application> doesn't build properly with 
+the current <application>Glibc</application>/<application>XFree86
+</application>. A solution is to build the <application>Motif</application> 
+library before compiling the <application>J2SDK</application>. Note that
+the <application>Motif</application> build fails during the first run owing to 
+some syntax error. The brute force and easiest solution is to rerun the
+<command>make</command> command:)</para>
 
-<para><screen><userinput>cd motif/lib/Xm &amp;&amp;
+<screen><userinput><command>cd motif/lib/Xm &amp;&amp;
 make || make &amp;&amp;
-cd ../../..</userinput></screen></para>
+cd ../../..</command></userinput></screen>
 
-<para>Make and Install j2sdk with the following commands. There will be a lot of
-messages about missing files that look like errors. As long as the build doesn't
-stop, the messages are harmless, so ignore them.</para>
+<para>Make and Install <application>J2SDK</application> with the following 
+commands. There will be a lot of messages about missing files that look like 
+errors. As long as the build doesn't stop, the messages are harmless, so ignore 
+them.</para>
 
-<para><screen><userinput>cd control/make &amp;&amp;
+<screen><userinput><command>cd control/make &amp;&amp;
 make &amp;&amp;
 cd ../.. &amp;&amp;
 cd control/build/linux-i?86 &amp;&amp;
-cp -a j2sdk-image /opt/j2sdk/j2sdk-&j2sdk-src-version;</userinput></screen></para>
+cp -a j2sdk-image /opt/j2sdk/j2sdk-&j2sdk-src-version;</command></userinput></screen>
 
 </sect2>
Index: general/prog/jdk/j2sdk-intro.xml
===================================================================
--- general/prog/jdk/j2sdk-intro.xml	(revision df5b04dd84c297ec72bec5d0e2835447298bf8d0)
+++ general/prog/jdk/j2sdk-intro.xml	(revision 06aea651e0cadf2e496d57fc98dc3238b9a5b048)
@@ -2,51 +2,64 @@
 <title>Introduction to j2sdk</title>
 
-<screen>Download location (HTTP):       <ulink url="&j2sdk-download-http;"/>
-Download location (FTP):        <ulink url="&j2sdk-download-ftp;"/>
-Version used (binary):          &j2sdk-bin-version;
-Version used (source):          &j2sdk-src-version;
-Package size (binary):          &j2sdk-bin-size;
-Package size (source):          &j2sdk-src-size;
-Estimated Disk space required:  &j2sdk-src-buildsize;</screen>
-
-<para>The j2sdk package contains Sun's java development environment.
-This is useful for developing java programs and provides the runtime
-environment necessary to run java programs.  It also includes a plug-in
-for browsers so that they can be java aware.</para>
+<para>The <application>J2SDK</application> package contains Sun's
+<application>Java</application> development environment. This is useful for 
+developing <application>Java</application> programs and provides the runtime
+environment necessary to run <application>Java</application> programs.  It also 
+includes a plug-in for browsers so that they can be <application>Java
+</application> aware.</para>
 
 <para>
-The JDK comes in two flavors, a precompiled binary and a source package. The
-precompiled binary is linked against gcc2 libraries. Due to the incompatibilities
-between gcc2 and gcc3, the precompiled java plugin causes problems when gcc3
-compiled packages (for example mozilla) try to load the java plugin.
-The source package requires registration at the Sun developer site and accepting
-the Sun Community Source License.
+The <acronym>JDK</acronym> comes in two flavors, a precompiled binary and a 
+source package. The precompiled binary is linked against <acronym>GCC
+</acronym>-2 libraries. Due to the incompatibilities between
+<acronym>GCC</acronym>-2 and <acronym>GCC</acronym>-3, the precompiled java 
+plugin causes problems when <acronym>GCC</acronym>-3 compiled packages (for 
+example <application>Mozilla</application>) try to load the <application>Java
+</application> plugin. The source package requires registration at the Sun 
+developer site and accepting the Sun Community Source License.
 The source code cannot be downloaded from some countries, so for users
-from those countries, the binary may be the only option.
-</para>
+from those countries, the binary may be the only option.</para>
 
-<para>Even if you plan on compiling the jdk source, you will need to download
-the binary version to bootstrap the jdk build.
-Follow the above link to download both source and binary packages. When
-downloading the source also download the mozilla headers package available at
-the same location.
-</para>
+<para>Even if you plan on compiling the <acronym>JDK</acronym> source, you will 
+need to download the binary version to bootstrap the <acronym>JDK</acronym> 
+build. Follow the below link to download both source and binary packages. When
+downloading the source also download the <application>Mozilla</application> 
+headers package available at the same location.</para>
 
-<para>Download the patches for j2sdk source from <ulink url="&hfile-root;"/>.
-</para>
+<para>For users who cannot download the <application>J2SDK</application> source owing to license restrictions, <application>blackdown
+</application> has an <acronym>GCC</acronym>-3 based precompiled version.
+Check out <ulink url="http://www.blackdown.org/"/> for more
+information.</para>
 
-<!--
-<para>If you have difficulties in building the jdk, check out the javafromscratch
-hint at <ulink url="http://www.linuxfromscratch.org/~tushar/"/> for some workarounds.
-</para>
--->
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&j2sdk-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&j2sdk-download-ftp;"/></para></listitem>
+<listitem><para>Version used (binary):
+&j2sdk-bin-version;</para></listitem>
+<listitem><para>Download size (binary): &j2sdk-bin-size;</para></listitem>
+<listitem><para>Download size (source): &j2sdk-src-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&j2sdk-src-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&j2sdk-time;</para></listitem></itemizedlist>
+</sect3>
 
-<para>For users who cannot download the j2sdk source owing to license
-restrictions, blackdown has a gcc3 based precompiled version.
-Check out <ulink url="http://www.blackdown.org/"/> for more information.</para>
+<sect3><title>Additional downloads</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Required Patches:
+<ulink url="&hfile-root;"/></para></listitem></itemizedlist>
+</sect3>
 
-<screen>j2sdk depends on:
-<xref linkend="xfree86"/>, <xref linkend="zip"/>, <xref linkend="unzip"/>, 
-<xref linkend="cpio"/>, <xref linkend="tcsh"/> and <xref linkend="gcc2"/></screen>
+
+<sect3><title><application>J2SDK</application> dependencies</title>
+<sect4><title>Required</title>
+<para><xref linkend="xfree86"/>, <xref linkend="zip"/>, <xref
+linkend="unzip"/>, <xref linkend="cpio"/>, <xref linkend="tcsh"/> and <xref
+linkend="gcc2"/></para></sect4>
+</sect3>
+
 
 </sect2>
Index: general/prog/jdk/j2sdk.ent
===================================================================
--- general/prog/jdk/j2sdk.ent	(revision df5b04dd84c297ec72bec5d0e2835447298bf8d0)
+++ general/prog/jdk/j2sdk.ent	(revision 06aea651e0cadf2e496d57fc98dc3238b9a5b048)
@@ -12,4 +12,4 @@
 <!ENTITY j2sdk-download-http "http://freshmeat.net/projects/sunjdk">
 <!ENTITY j2sdk-download-ftp "">
-<!ENTITY j2sdk-time "169.12 SBU">
+<!ENTITY j2sdk-time "85 SBU">
 
Index: general/prog/prog.xml
===================================================================
--- general/prog/prog.xml	(revision df5b04dd84c297ec72bec5d0e2835447298bf8d0)
+++ general/prog/prog.xml	(revision 06aea651e0cadf2e496d57fc98dc3238b9a5b048)
@@ -2,4 +2,9 @@
 <?dbhtml filename="prog.html" dir="general"?>
 <title>Programming</title>
+
+<para>An <acronym>LFS</acronym> is a development system, but only for
+<application>C</application>, <application>C++</application> and
+<application>Perl</application>. This chapter expands the languages
+available.</para>
 
 &Python;
Index: pst/scanning/sane/sane.ent
===================================================================
--- pst/scanning/sane/sane.ent	(revision df5b04dd84c297ec72bec5d0e2835447298bf8d0)
+++ pst/scanning/sane/sane.ent	(revision 06aea651e0cadf2e496d57fc98dc3238b9a5b048)
@@ -11,5 +11,5 @@
 "ftp://ftp.mostang.com/pub/sane/sane-backends-1.0.12.tar.gz">
 <!ENTITY sane-fe-download-ftp
-"ftp://ftp.mostang.com/pub/sane/sane-frontends-1.0.12.tar.gz">
+"ftp://ftp.mostang.com/pub/sane/sane-frontends-1.0.11.tar.gz">
 <!ENTITY sane-be-size "2.2 MB">
 <!ENTITY sane-fe-size "174 kb">
