Submitter said:

: The article "Java and Jakarta Tomcat on FreeBSD" is a bit stale. It
: contains stale download instructions for the JDK 1.3.1 SDK.  The
: language seems overly casual to me.  In addition, there are some
: typos and various minor English nits in the article.

PR:		docs/72500
Submitted by:	Chris Pepper <pepper@reppep.com>

en_US.ISO8859-1/articles/java-tomcat/article.sgml

@@ -105,28 +105,28 @@
   <sect1>
     <title>Introduction</title>
 
-    <para>The &java; programming language was birthed on <literal>May 23rd
+    <para>The &java; programming language was released on <literal>May 23rd
       1995</literal>.  One would expect that after all this time, &java;
-      applications would be easy to install and ready to run from a single
+      applications would be easy to install and ready to run from a
-      package, or port on FreeBSD, thus making it available for the
+      single package, or port on FreeBSD, thus making it easy to use.
-      <quote>masses</quote>.  This is not the case, unfortunately, as
+      This is not the case, unfortunately, as the &java; distribution is
-      the &java; distribution is held very closely by Sun Microsystems,
+      controlled very closely by Sun Microsystems, who prohibits
-      and prohibits re-distribution.  All &java; Applets must be compiled
+      re-distribution.  All &java; applets must be compiled from source
-      from source code, together with the &java; Development Kit from Sun
+      code, together with the &java; Development Kit from Sun
       Microsystems.  All these ingredients must be blended together in
       the right order, assembled, and compiled by the end user.  With
       such distribution philosophies at heart, it is my opinion that
-      &java; will always be developer or hacker use only.  I certainly
+      &java; on FreeBSD will always be for developer or hacker use only.
-      found this to be true when I needed to serve up some
+      I certainly found this to be true when I needed to serve up some
-      <filename>.jsp</filename> pages for a client on my web server,
+      <filename>.jsp</filename> pages for a client on my web server, and
-      and needed to get <filename
+      needed to get <filename
       role="package">www/jakarta-tomcat4</filename> to work with
       <filename role="package">www/apache13</filename> on my FreeBSD
       system.</para>
 
-    <para>The Tomcat portion of the install is very straight forward, but
+    <para>The Tomcat portion of the install is very straightforward, but
-      the difficulty I had was getting &java; Development Kit up and
+      the difficulty I had was getting the &java; Development Kit up and
-      running for FreeBSD 4.X, as Sun Microsystems only supplies
+      running on FreeBSD 4.X, as Sun only supplies
       binaries for Linux, &solaris;, and &windowsnt;.  This means that I
       had to compile my own &jdk; for FreeBSD.  I began by searching for
       documentation on the Internet.  I quickly found that there is more
@@ -144,9 +144,9 @@
     <title>The &java; Environment</title>
 
     <para>Ensure that you have the current ports collection as
-      <command>make</command> it will fail if it attempts to build older
+      <command>make</command> will fail if it attempts to build older
       source.  You can upgrade your entire ports collection by using
-      <application>CVSup</application>.  See <ulink
+      <application>CVSup</application>.  See the <ulink
       url="&url.books.handbook;/cvsup.html">Using CVSup</ulink> section
       of the Handbook for more information.  You can also download the
       ports you need manually from <ulink
@@ -154,21 +154,22 @@
       get you going.</para>
 
       <note>
-	<para>You will need the <literal>Linux Emulation</literal>
+	<para>You will need <literal>Linux Emulation</literal>
 	  (Linux-ABI) enabled in your kernel configuration.  Simply add
-	  the following option to your kernel configuration file and
+	  the following option to your kernel configuration file
-	  recompile it.  Instructions for building a kernel can be found
+	  recompile it, and reinstall the kernel.  Instructions for
-	  in the <ulink url="&url.books.handbook;/index.html">FreeBSD
+	  building a kernel can be found in the <ulink
+	  url="&url.books.handbook;/index.html">FreeBSD
 	  Handbook</ulink>.</para>
 
 	<programlisting>options		COMPAT_LINUX</programlisting>
 
 	<para>The above option will add Linux-ABI support to your
-	  kernel, when it is recompiled.</para>
+	  kernel when it is next recompiled.</para>
       </note>
 
-    <para>The list of dependencies below, are required to be installed
+    <para>The listed dependencies below are required to be installed
-      manually in a certain order.  Dependencies that are automatically
+      manually in a the proper order.  Dependencies that are automatically
       downloaded are not listed here.</para>
 
     <itemizedlist>
@@ -192,8 +193,8 @@
       </step>
 
       <step>
-	<para>Next get out your web browser and head on over to
+	<para>Next open your web browser and head over to <ulink
-	  <ulink url="http://java.sun.com/j2se/1.3/download-linux.html"></ulink>
+          url="http://java.sun.com/j2se/1.3/download-linux.html"></ulink>
 	  and find SDK downloads. Click on the <quote>continue</quote>
 	  button below <quote>GNUZIP Tar Shell Script</quote>.  Be sure
 	  you read every word of the license page before you click on
@@ -205,25 +206,25 @@
 	  <quote>Open</quote> button rather than the <quote>Save</quote>
 	  button.  You will be presented with another <quote>File
 	  Download</quote> box - this time choose <quote>Save</quote>
-	  and you will be able to save
+	  and you will be able to get
           <filename>j2sdk-1_3_1_10-linux-i386.bin</filename>.
-	  Place it in <filename>/usr/ports/distfiles</filename>.</para>
+	  Put it in <filename>/usr/ports/distfiles</filename>.</para>
       </step>
 
       <step>
 	<para>Go to <ulink
-	  url="http://www.sun.com/software/java2/download.html"></ulink>.
+	  url="http://wwws.sun.com/software/communitysource/j2se/java2/download.html"></ulink>.
-	  In the table under <literal>Produce Description</literal>,
+	  In the table under <literal>Download Link(s)</literal>,
-	  named <literal>Java 2 SDK 1.3.1</literal>, go to the
+	  for <literal>Java 2 SDK 1.3.1</literal>, go to the
-	  right-hand cell and click <quote>download</quote>.  You will
+	  right-hand cell and click <quote>Download</quote>.  You will
 	  be taken to the <quote>Sign On</quote> page, where you must
 	  sign in if you already have an account, or register for
-	  access.  Once you have signed on, you will be taken to the
+	  access otherwise.  Once you have signed in, you will be taken to the
 	  <quote>Legal</quote> page, where you must accept the license
 	  agreement; scroll down (reading the license) and click on the
-	  <quote>Continue</quote> button.  Next page, is the
+	  <quote>Continue</quote> button.  The next page is the
 	  <quote>Receipt</quote> page.  This is where you will save your
-	  order number.  You will be able to choose the location that is
+	  order number.  You will be able to choose the server that is
 	  nearest to you.  Click on <quote>Java 2 SDK, Standard Edition,
 	  version 1.3.1</quote>.  Save the
 	  <filename>j2sdk-1_3_1-src.tar.gz</filename> to the
@@ -235,7 +236,7 @@
       <para>It is very important for you to read the License Agreement
 	which has been issued by Sun Microsystems Corp.  There are
 	several restrictions in place on the use of &java;, which you must
-	address. The FreeBSD Project does not take any responsibilities
+	address. The FreeBSD Project does not take any responsibility
 	for your actions.</para>
       
       <para>Do not discard any of the downloaded files, as they will be
@@ -280,27 +281,30 @@ Classic VM (build 1.3.1_02-b02, green threads, nojit)</programlisting>
     <procedure>
       <step>
 	<para>Make sure you have the
-	  <filename>j2sdk-1_3_1-src.tar.gz</filename> file in your
+	  <filename>j2sdk-1_3_1-src.tar.gz</filename> file in
 	  <filename>/usr/ports/distfiles</filename>.  This file is needed
-	  for applying the <quote>patch-set</quote> discussed below.</para>
+	  for applying the <quote>patchset</quote> discussed below.</para>
       </step>
 
       <step>
-	<para>You will need to download the <literal>patch set</literal>
+	<para>You will need to download the <literal>patchset</literal>
-	  for building the port.  The patch-set file is called
+	  for building the port.  The patchset file is called
 	  <filename>bsd-jdk131-patches-9.tar.gz</filename>.  You should
-	  also make sure the integrity of the files by matching it with
+	  verify the integrity of the file by checking its
-	  the following <acronym>MD5</acronym> checksum.</para>
+	  <acronym>MD5</acronym> checksum to make sure your copy isn't
+	  corrupt.</para>
+
+        <screen>md5 bsd-jdk131-patches-9.tar.gz</screen>
 
         <programlisting>
 MD5 (bsd-jdk131-patches-9.tar.gz) = 29c83880d3555abcf74fc7df9db1959f</programlisting>
 
-        <para>The patch-set is available from:  <ulink
+        <para>The patchset is available from: <ulink
 	  url="http://www.eyesbeyond.com/freebsddom/java/index.html"></ulink></para>
       </step>
     </procedure>
 
-    <para>The last procedure discussed above (building the native
+    <para>The last step above (building the native
       &jdk;) will take some time.</para>
   </sect1>