From bdf7e1bf07691d6ad9c00013df1fc5b642b9a7cf Mon Sep 17 00:00:00 2001
From: Randy McMurchy <randy@linuxfromscratch.org>
Date: Mon, 6 Jun 2005 17:30:19 +0000
Subject: [PATCH] Fixed typos and updated JDK binary version to 1.5.0_03 in the
 JDK instructions

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@4559 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 general.ent                        |  2 +-
 general/prog/jdk.xml               | 24 ++++++++++++------------
 introduction/welcome/changelog.xml |  3 ++-
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/general.ent b/general.ent
index eb634614dd..b8ba6ea39c 100644
--- a/general.ent
+++ b/general.ent
@@ -137,7 +137,7 @@
 <!ENTITY gcc-version                  "3.4.3">
 <!ENTITY gcc3-version                 "3.3.4">
 <!ENTITY guile-version                "1.6.7">
-<!ENTITY jdk-bin-version              "1.5.0_02">
+<!ENTITY jdk-bin-version              "1.5.0_03">
 <!ENTITY jdk-src-version              "1.5.0">
 <!ENTITY librep-version               "0.17">
 <!ENTITY NASM-version                 "0.98.39">
diff --git a/general/prog/jdk.xml b/general/prog/jdk.xml
index f4fdc953f2..fd051e3f31 100644
--- a/general/prog/jdk.xml
+++ b/general/prog/jdk.xml
@@ -6,9 +6,9 @@
 
   <!ENTITY jdk-download-source "http://java.sun.com/j2se/jrl_download.html">
   <!ENTITY jdk-download-binary "http://java.sun.com/j2se/1.5.0/download.jsp">
-  <!ENTITY jdk-source-md5sum   "http://anduin.linuxfromscratch.org/sources/BLFS/SVN/I-K/jdk/jdk-&jdk-src-version;.md5sums">
-  <!ENTITY jdk-bin-md5sum      "562d9797af801bfbe2b5e44417d8ccc4">
-  <!ENTITY jdk-bin-size        "45 MB">
+  <!ENTITY jdk-source-md5sum   "http://anduin.linuxfromscratch.org/sources/BLFS/SVN/I-K/JDK/jdk-&jdk-src-version;.md5sums">
+  <!ENTITY jdk-bin-md5sum      "bc221641fcfdc9268499001326fc8ebb">
+  <!ENTITY jdk-bin-size        "48.7 MB">
   <!ENTITY jdk-src-size        "65.7 MB (three .zip files)">
   <!ENTITY jdk-src-buildsize   "1444 MB">
   <!ENTITY jdk-time            "33.06 SBU">
@@ -47,14 +47,14 @@
     <para>In order to use the source code and patches, you must read and agree
     to the Sun <ulink url="http://java.sun.com/j2se/1.5.0/jrl_5.0-license.txt">
     Java Research License</ulink>. In addition, the source code cannot be
-    downloaded from some countries, so for users from those countries, the binary
+    downloaded from some countries, so for users in those countries, the binary
     is the only option.</para>
 
     <para>If you plan on compiling the <application>JDK</application> source, you
     will still need to download the binary version to bootstrap the
     <application>JDK</application> build.  You will need to download a total of four
     files to complete the source build:
-    <filename>jdk-1_5_0_02-linux-i586.bin</filename>,
+    <filename>jdk-1_5_0_03-linux-i586.bin</filename>,
     <filename>jdk-1_5_0-src-jrl.zip</filename>,
     <filename>jdk-1_5_0-bin-jrl.zip</filename>,
     and <filename>jdk-1_5_0-mozilla_headers-unix.zip</filename>.</para>
@@ -65,7 +65,7 @@
         <para>Binary download: <ulink url="&jdk-download-binary;"/></para>
       </listitem>
       <listitem>
-        <para>Version used (binary): <ulink url="&jdk-bin-version;"/></para>
+        <para>Version used (binary): &jdk-bin-version;</para>
       </listitem>
       <listitem>
         <para>Download MD5 sum (binary): &jdk-bin-md5sum;</para>
@@ -74,7 +74,7 @@
         <para>Source download: <ulink url="&jdk-download-source;"/></para>
       </listitem>
       <listitem>
-        <para>Download MD5 sum (source): &jdk-source-md5sum;</para>
+        <para>Download MD5 sum (source): <ulink url="&jdk-source-md5sum;"/></para>
       </listitem>
       <listitem>
         <para>Download size (binary): &jdk-bin-size;</para>
@@ -120,16 +120,16 @@
       <listitem>
         <para><ulink
         url="&patch-root;/jdk-&jdk-src-version;-remove_debug_image-1.patch"/>
-        (Skips compiling of the <application>JDK</application> debug image)</para>
+        (skips compiling of the <application>JDK</application> debug image)</para>
       </listitem>
       <listitem>
         <para><ulink
         url="&patch-root;/jdk-&jdk-src-version;-static_cxx-1.patch"/>
-        (Forces dynamic linking to gcc libs)</para></listitem>
+        (forces dynamic linking to <application>GCC</application> libs)</para></listitem>
       <listitem>
         <para><ulink
         url="&patch-root;/jdk-&jdk-src-version;-xorg-6.8.1-1.patch"/>
-        (Only required if building agianst <xref linkend="xorg"/>)</para>
+        (only required if building against <xref linkend="xorg"/>)</para>
       </listitem>
     </itemizedlist>
 
@@ -227,7 +227,7 @@ export ALT_CACERTS_FILE=${ALT_BOOTDIR}/jre/lib/security/cacerts</userinput></scr
 
     <para>Build the <application>JDK</application> with the following
     commands. There will be a lot of messages about missing files that look like
-    errors. These are caused by not meeting the expected build environemnt
+    errors. These are caused by not meeting the expected build environment
     (Red Hat).  As long as the build doesn't stop, the messages
     are harmless.</para>
 
@@ -310,7 +310,7 @@ unset ALT_CACERTS_FILE</userinput></screen>
     <sect3>
       <title>Configuration Information</title>
 
-      <para>There are now two Java 2 SDK's installed in
+      <para>There are now two Java 2 SDKs installed in
       <filename>/opt/jdk</filename>. You should decide on which one you
       would like to use as the default. For example if you decide to use the source
       compiled <application>JDK</application>, do the following:</para>
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 923699719e..e70bad524d 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -26,7 +26,8 @@
 
     <listitem>
       <para>June 6th, 2005 [randy]: Added a note to the Samba instructions
-      about unprivileged users mounting SMB shares.</para>
+      about unprivileged users mounting SMB shares; updated JDK binary version
+      to 1.5.0_03.</para>
     </listitem>
 
     <listitem>