Author: rjung
Date: Tue Jan  1 10:08:32 2008
New Revision: 607886

URL: http://svn.apache.org/viewvc?rev=607886&view=rev
Log:
Improve connectors download page:
- add more info about download verification
- introduce subsection structure
- tidy xml source

Modified:
    tomcat/site/trunk/docs/download-connectors.html
    tomcat/site/trunk/xdocs/download-connectors.xml

Modified: tomcat/site/trunk/docs/download-connectors.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-connectors.html?rev=607886&r1=607885&r2=607886&view=diff
==============================================================================
--- tomcat/site/trunk/docs/download-connectors.html (original)
+++ tomcat/site/trunk/docs/download-connectors.html Tue Jan  1 10:08:32 2008
@@ -189,87 +189,217 @@
 <td>
 <p>
 <blockquote>
-<p>We recommend you use a mirror to download our release
-            builds, but you <strong>must</strong> verify the integrity of
-            the downloaded files using signatures downloaded from our main 
-            distribution directories. Recent releases (48 hours) may not yet 
be available from the mirrors. </p>
-<p>You are currently using <b>[preferred]</b>.  If you
-            encounter a problem with this mirror, please select another
-            mirror.  If all mirrors are failing, there are <i>backup</i>
-            mirrors (at the end of the mirrors list) that should be
-            available.<br/>[if-any logo]<a href="[link]">
+
+      <p>Use the links below to download Tomcat Connectors from one of
+      our mirrors.  You <strong>must</strong> <a 
href="#Verify%20the%20Integrity%20of%20the%20Files">verify the
+      integrity</a> of the downloaded files using signatures downloaded from
+      our main distribution directory.</p>
+
+      <p>Only current recommended releases are available on the main
+      distribution site and its mirrors.  Older releases and the historical 
mod_jk2
+      are available from the
+      <a href="http://archive.apache.org/dist/tomcat/tomcat-connectors/";>
+      archive download site</a>.</p>
+
+      <p>Recent releases (48 hours) may not yet be available from the 
mirrors.</p>
+
+      <table border="0" cellspacing="0" cellpadding="2" width="100%">
+<tr>
+<td bgcolor="#828DA6">
+<font color="#ffffff" face="arial,helvetica,sanserif">
+<a name="Choose a Mirror">
+<strong>Choose a Mirror</strong>
+</a>
+</font>
+</td>
+</tr>
+<tr>
+<td>
+<blockquote>
+        <p>You are currently using <b>[preferred]</b>.  If you
+        encounter a problem with this mirror, please select another
+        mirror.  If all mirrors are failing, there are <i>backup</i>
+        mirrors (at the end of the mirrors list) that should be
+        available.<br/>
+        [if-any logo]
+          <a href="[link]">
 <img align="right" src="[logo]" border="0"/>
-</a>[end]</p>
+</a>
+        [end]
+        </p>
 <p>
 <form action="[location]" method="get" id="SelectMirror">
-              Other mirrors: <select name="Preferred">
-              [if-any http]
-                [for http]<option value="[http]">[http]</option>[end]
-              [end]
-              [if-any ftp]
-                [for ftp]<option value="[ftp]">[ftp]</option>[end]
-              [end]
-              [if-any backup]
-                [for backup]<option value="[backup]">[backup] 
(backup)</option>[end]
-              [end]
-              </select>
+        Other mirrors: <select name="Preferred">
+        [if-any http]
+          [for http]<option value="[http]">[http]</option>[end]
+        [end]
+        [if-any ftp]
+          [for ftp]<option value="[ftp]">[ftp]</option>[end]
+        [end]
+        [if-any backup]
+          [for backup]<option value="[backup]">[backup] (backup)</option>[end]
+        [end]
+        </select>
 <input type="submit" value="Change"/>
 </form>
 </p>
-<p>
-            The <code>KEYS</code> link links to the code signing keys used to 
sign the product. The <code>PGP</code> link downloads the OpenPGP compatible 
signature from our main site. 
-        </p>
-        <p>For more information concerning Tomcat Connectors (mod_jk), see the 
<a href="http://tomcat.apache.org/connectors-doc/"; class="name">Tomcat 
Connectors (mod_jk)</a> site. </p>
-        <div class="links">
-        <span class="link">
-<a href="http://www.apache.org/dist/tomcat/tomcat-connectors/KEYS";>KEYS</a>
-</span>
-        </div>
+        <p>You may also consult the <a 
href="http://www.apache.org/mirrors/";>complete
+        list of mirrors</a>.</p>
+      </blockquote>
+</td>
+</tr>
+<tr>
+<td>
+<br/>
+</td>
+</tr>
+</table>
+
+      <table border="0" cellspacing="0" cellpadding="2" width="100%">
+<tr>
+<td bgcolor="#828DA6">
+<font color="#ffffff" face="arial,helvetica,sanserif">
+<a name="Tomcat Connectors JK 1.2">
+<strong>Tomcat Connectors JK 1.2</strong>
+</a>
+</font>
+</td>
+</tr>
+<tr>
+<td>
+<blockquote>
+        <p>For more information concerning Tomcat Connectors (mod_jk), see the
+        <a href="http://tomcat.apache.org/connectors-doc/"; class="name">Tomcat 
Connectors (mod_jk)</a> site.</p>
         <ul class="downloads">
-        <li class="group">
-        <div class="links">
-<span class="label">JK 1.2
-</span>
-</div>
-        <ul>
-<li class="group">
-        <div class="links">
+          <li class="download">
+          <div class="links">
 <span class="label">Source (please choose the correct format for your 
platform)</span>
 </div>
-        <ul>
-<li class="download">
-<a 
href="[preferred]/tomcat/tomcat-connectors/jk/source/jk-1.2.26/tomcat-connectors-1.2.26-src.tar.gz">JK
 1.2.26 Source Release tar.gz</a> (e.g. Unix, Linux, Mac OS)
-        <ul class="attributes">
-<li>
-<span class="pgp">[<a 
href="http://www.apache.org/dist/tomcat/tomcat-connectors/jk/source/jk-1.2.26/tomcat-connectors-1.2.26-src.tar.gz.asc";>pgp</a>]</span>
-        </li>
-        </ul>
-        </li>
-        <li class="download">
-<a 
href="[preferred]/tomcat/tomcat-connectors/jk/source/jk-1.2.26/tomcat-connectors-1.2.26-src.zip">JK
 1.2.26 Source Release zip</a> (e.g. Windows)
-        <ul class="attributes">
-<li>
-<span class="pgp">[<a 
href="http://www.apache.org/dist/tomcat/tomcat-connectors/jk/source/jk-1.2.26/tomcat-connectors-1.2.26-src.zip.asc";>pgp</a>]</span>
-        </li>
-        </ul>
-        </li>
-        </ul>
-        </li>
-        <li class="download">
-<a href="[preferred]/tomcat/tomcat-connectors/jk/binaries/">JK 1.2 Binary 
Releases</a>
+          <ul>
+            <li class="download">
+              <a 
href="[preferred]/tomcat/tomcat-connectors/jk/source/jk-1.2.26/tomcat-connectors-1.2.26-src.tar.gz">
+                JK 1.2.26 Source Release tar.gz
+              </a> (e.g. Unix, Linux, Mac OS)
+            <ul class="attributes">
+              <li>
+<span class="pgp">
+                [<a 
href="http://www.apache.org/dist/tomcat/tomcat-connectors/jk/source/jk-1.2.26/tomcat-connectors-1.2.26-src.tar.gz.asc";>PGP</a>]
+              </span>
 </li>
-        </ul>
-        </li>
-        <li class="download">
-<a href="[preferred]/tomcat/tomcat-connectors/">browse download area</a>
+              <li>
+<span class="md5">
+                [<a 
href="http://www.apache.org/dist/tomcat/tomcat-connectors/jk/source/jk-1.2.26/tomcat-connectors-1.2.26-src.tar.gz.md5";>MD5</a>]
+              </span>
 </li>
-        <li>
-<a 
href="http://archive.apache.org/dist/tomcat/tomcat-connectors/";>archives...</a>
+            </ul>
+            </li>
+            <li class="download">
+              <a 
href="[preferred]/tomcat/tomcat-connectors/jk/source/jk-1.2.26/tomcat-connectors-1.2.26-src.zip">
+                JK 1.2.26 Source Release zip
+              </a> (e.g. Windows)
+            <ul class="attributes">
+              <li>
+<span class="pgp">
+                [<a 
href="http://www.apache.org/dist/tomcat/tomcat-connectors/jk/source/jk-1.2.26/tomcat-connectors-1.2.26-src.zip.asc";>PGP</a>]
+              </span>
 </li>
-        <li>The historical mod_jk2 could be found in the <a 
href="http://archive.apache.org/dist/tomcat/tomcat-connectors/";>archives</a>
+              <li>
+<span class="md5">
+                [<a 
href="http://www.apache.org/dist/tomcat/tomcat-connectors/jk/source/jk-1.2.26/tomcat-connectors-1.2.26-src.zip.md5";>MD5</a>]
+              </span>
 </li>
+            </ul>
+            </li>
+          </ul>
+          </li>
+          <li class="download">
+            <a href="[preferred]/tomcat/tomcat-connectors/jk/binaries/">Binary 
Releases</a>
+          </li>
+          <li class="download">
+            <a href="[preferred]/tomcat/tomcat-connectors/">Browse Download 
Area</a>
+          </li>
+          <li class="download">
+            <a 
href="http://archive.apache.org/dist/tomcat/tomcat-connectors/";>Browse 
Archive</a>
+          </li>
         </ul>
-        </blockquote>
+
+        <p>tomcat-connectors-1.2.26-src.* is signed by Rainer Jung 
(<code>35C7E942</code>).</p>
+
+      </blockquote>
+</td>
+</tr>
+<tr>
+<td>
+<br/>
+</td>
+</tr>
+</table>
+
+      <table border="0" cellspacing="0" cellpadding="2" width="100%">
+<tr>
+<td bgcolor="#828DA6">
+<font color="#ffffff" face="arial,helvetica,sanserif">
+<a name="Verify the Integrity of the Files">
+<strong>Verify the Integrity of the Files</strong>
+</a>
+</font>
+</td>
+</tr>
+<tr>
+<td>
+<blockquote>
+
+        <p>It is essential that you verify the integrity of the downloaded
+        files using the PGP or MD5 signatures. The PGP signatures can be 
verified using PGP or GPG.
+        First download the <a 
href="http://www.apache.org/dist/tomcat/tomcat-connectors/KEYS";>KEYS</a>
+        as well as the <code>PGP</code> signature file for the relevant
+        distribution.  Make sure you get these files from the <a 
href="http://www.apache.org/dist/tomcat/tomcat-connectors/";>main site</a>,
+        rather than from a mirror. The above [<code>PGP</code>] links 
automatically
+        retrieve the signature files from the main site. Then verify the 
signatures
+        using</p>
+
+        <p>
+<code>
+        % pgpk -a KEYS<br/>
+        % pgpv tomcat-connectors-1.2.26-src.tar.gz.asc<br/>
+        </code>
+        <em>or</em>
+<br/>
+        <code>
+        % pgp -ka KEYS<br/>
+        % pgp tomcat-connectors-1.2.26-src.tar.gz.asc<br/>
+        </code>
+        <em>or</em>
+<br/>
+        <code>
+        % gpg --import KEYS<br/>
+        % gpg --verify tomcat-connectors-1.2.26-src.tar.gz.asc
+        </code>
+</p>
+
+        <p>Alternatively, you can verify the MD5 signature (hash value) on the 
files.
+        Make sure you get these files from the <a 
href="http://www.apache.org/dist/tomcat/tomcat-connectors/";>main site</a>,
+        rather than from a mirror. The above [<code>MD5</code>] links 
automatically
+        retrieve the signature files from the main site.</p>
+        <p>Check the integrity of your download by comparing the downloaded MD5
+        signature files with the MD5 signature of the downloaded archives 
created on
+        your system. A unix program called <code>md5</code> or 
<code>md5sum</code> is
+        included in many unix distributions.  It is also available as part of
+        <a href="http://www.gnu.org/software/textutils/textutils.html";>GNU
+        Textutils</a>. Windows users can get binary md5 programs from <a 
href="http://www.fourmilab.ch/md5/";>here</a>, <a 
href="http://www.pc-tools.net/win32/freeware/console/";>here</a>, or
+        <a href="http://www.slavasoft.com/fsum/";>here</a>.</p>
+
+      </blockquote>
+</td>
+</tr>
+<tr>
+<td>
+<br/>
+</td>
+</tr>
+</table>
+
+    </blockquote>
 </p>
 </td>
 </tr>

Modified: tomcat/site/trunk/xdocs/download-connectors.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/download-connectors.xml?rev=607886&r1=607885&r2=607886&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/download-connectors.xml (original)
+++ tomcat/site/trunk/xdocs/download-connectors.xml Tue Jan  1 10:08:32 2008
@@ -1,54 +1,141 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document><properties><title>Tomcat Connectors (mod_jk) 
Downloads</title></properties><body><section name="Tomcat Connectors (mod_jk) 
Downloads"><p>We recommend you use a mirror to download our release
-            builds, but you <strong>must</strong> verify the integrity of
-            the downloaded files using signatures downloaded from our main 
-            distribution directories. Recent releases (48 hours) may not yet 
be available from the mirrors. </p><p>You are currently using 
<b>[preferred]</b>.  If you
-            encounter a problem with this mirror, please select another
-            mirror.  If all mirrors are failing, there are <i>backup</i>
-            mirrors (at the end of the mirrors list) that should be
-            available.<br/>[if-any logo]<a href="[link]"><img align="right" 
src="[logo]" border="0"/></a>[end]</p><p><form action="[location]" method="get" 
id="SelectMirror">
-              Other mirrors: <select name="Preferred">
-              [if-any http]
-                [for http]<option value="[http]">[http]</option>[end]
-              [end]
-              [if-any ftp]
-                [for ftp]<option value="[ftp]">[ftp]</option>[end]
-              [end]
-              [if-any backup]
-                [for backup]<option value="[backup]">[backup] 
(backup)</option>[end]
-              [end]
-              </select><input type="submit" value="Change"/></form></p><p>
-            The <code>KEYS</code> link links to the code signing keys used to 
sign the product. The <code>PGP</code> link downloads the OpenPGP compatible 
signature from our main site. 
-        </p>
-        <p>For more information concerning Tomcat Connectors (mod_jk), see the 
<a href="http://tomcat.apache.org/connectors-doc/"; class="name">Tomcat 
Connectors (mod_jk)</a> site. </p>
-        <div class="links">
-        <span class="link"><a 
href="http://www.apache.org/dist/tomcat/tomcat-connectors/KEYS";>KEYS</a></span>
-        </div>
+<document>
+  <properties><title>Tomcat Connectors (mod_jk) Downloads</title></properties>
+  <body>
+    <section name="Tomcat Connectors (mod_jk) Downloads">
+
+      <p>Use the links below to download Tomcat Connectors from one of
+      our mirrors.  You <strong>must</strong> <a 
href="#Verify%20the%20Integrity%20of%20the%20Files">verify the
+      integrity</a> of the downloaded files using signatures downloaded from
+      our main distribution directory.</p>
+
+      <p>Only current recommended releases are available on the main
+      distribution site and its mirrors.  Older releases and the historical 
mod_jk2
+      are available from the
+      <a href="http://archive.apache.org/dist/tomcat/tomcat-connectors/";>
+      archive download site</a>.</p>
+
+      <p>Recent releases (48 hours) may not yet be available from the 
mirrors.</p>
+
+      <subsection name="Choose a Mirror">
+        <p>You are currently using <b>[preferred]</b>.  If you
+        encounter a problem with this mirror, please select another
+        mirror.  If all mirrors are failing, there are <i>backup</i>
+        mirrors (at the end of the mirrors list) that should be
+        available.<br/>
+        [if-any logo]
+          <a href="[link]"><img align="right" src="[logo]" border="0"/></a>
+        [end]
+        </p><p><form action="[location]" method="get" id="SelectMirror">
+        Other mirrors: <select name="Preferred">
+        [if-any http]
+          [for http]<option value="[http]">[http]</option>[end]
+        [end]
+        [if-any ftp]
+          [for ftp]<option value="[ftp]">[ftp]</option>[end]
+        [end]
+        [if-any backup]
+          [for backup]<option value="[backup]">[backup] (backup)</option>[end]
+        [end]
+        </select><input type="submit" value="Change"/></form></p>
+        <p>You may also consult the <a 
href="http://www.apache.org/mirrors/";>complete
+        list of mirrors</a>.</p>
+      </subsection>
+
+      <subsection name="Tomcat Connectors JK 1.2">
+        <p>For more information concerning Tomcat Connectors (mod_jk), see the
+        <a href="http://tomcat.apache.org/connectors-doc/"; class="name">Tomcat 
Connectors (mod_jk)</a> site.</p>
         <ul class="downloads">
-        <li class="group">
-        <div class="links"><span class="label">JK 1.2
-</span></div>
-        <ul><li class="group">
-        <div class="links"><span class="label">Source (please choose the 
correct format for your platform)</span></div>
-        <ul><li class="download"><a 
href="[preferred]/tomcat/tomcat-connectors/jk/source/jk-1.2.26/tomcat-connectors-1.2.26-src.tar.gz">JK
 1.2.26 Source Release tar.gz</a> (e.g. Unix, Linux, Mac OS)
-        <ul class="attributes"><li><span class="pgp">[<a 
href="http://www.apache.org/dist/tomcat/tomcat-connectors/jk/source/jk-1.2.26/tomcat-connectors-1.2.26-src.tar.gz.asc";>pgp</a>]</span>
-        </li>
+          <li class="download">
+          <div class="links"><span class="label">Source (please choose the 
correct format for your platform)</span></div>
+          <ul>
+            <li class="download">
+              <a 
href="[preferred]/tomcat/tomcat-connectors/jk/source/jk-1.2.26/tomcat-connectors-1.2.26-src.tar.gz">
+                JK 1.2.26 Source Release tar.gz
+              </a> (e.g. Unix, Linux, Mac OS)
+            <ul class="attributes">
+              <li><span class="pgp">
+                [<a 
href="http://www.apache.org/dist/tomcat/tomcat-connectors/jk/source/jk-1.2.26/tomcat-connectors-1.2.26-src.tar.gz.asc";>PGP</a>]
+              </span></li>
+              <li><span class="md5">
+                [<a 
href="http://www.apache.org/dist/tomcat/tomcat-connectors/jk/source/jk-1.2.26/tomcat-connectors-1.2.26-src.tar.gz.md5";>MD5</a>]
+              </span></li>
+            </ul>
+            </li>
+            <li class="download">
+              <a 
href="[preferred]/tomcat/tomcat-connectors/jk/source/jk-1.2.26/tomcat-connectors-1.2.26-src.zip">
+                JK 1.2.26 Source Release zip
+              </a> (e.g. Windows)
+            <ul class="attributes">
+              <li><span class="pgp">
+                [<a 
href="http://www.apache.org/dist/tomcat/tomcat-connectors/jk/source/jk-1.2.26/tomcat-connectors-1.2.26-src.zip.asc";>PGP</a>]
+              </span></li>
+              <li><span class="md5">
+                [<a 
href="http://www.apache.org/dist/tomcat/tomcat-connectors/jk/source/jk-1.2.26/tomcat-connectors-1.2.26-src.zip.md5";>MD5</a>]
+              </span></li>
+            </ul>
+            </li>
+          </ul>
+          </li>
+          <li class="download">
+            <a href="[preferred]/tomcat/tomcat-connectors/jk/binaries/">Binary 
Releases</a>
+          </li>
+          <li class="download">
+            <a href="[preferred]/tomcat/tomcat-connectors/">Browse Download 
Area</a>
+          </li>
+          <li class="download">
+            <a 
href="http://archive.apache.org/dist/tomcat/tomcat-connectors/";>Browse 
Archive</a>
+          </li>
         </ul>
-        </li>
-        <li class="download"><a 
href="[preferred]/tomcat/tomcat-connectors/jk/source/jk-1.2.26/tomcat-connectors-1.2.26-src.zip">JK
 1.2.26 Source Release zip</a> (e.g. Windows)
-        <ul class="attributes"><li><span class="pgp">[<a 
href="http://www.apache.org/dist/tomcat/tomcat-connectors/jk/source/jk-1.2.26/tomcat-connectors-1.2.26-src.zip.asc";>pgp</a>]</span>
-        </li>
-        </ul>
-        </li>
-        </ul>
-        </li>
-        <li class="download"><a 
href="[preferred]/tomcat/tomcat-connectors/jk/binaries/">JK 1.2 Binary 
Releases</a></li>
-        </ul>
-        </li>
-        <li class="download"><a 
href="[preferred]/tomcat/tomcat-connectors/">browse download area</a></li>
-        <li><a 
href="http://archive.apache.org/dist/tomcat/tomcat-connectors/";>archives...</a></li>
-        <li>The historical mod_jk2 could be found in the <a 
href="http://archive.apache.org/dist/tomcat/tomcat-connectors/";>archives</a></li>
-        </ul>
-        </section>
-        </body>
+
+        <p>tomcat-connectors-1.2.26-src.* is signed by Rainer Jung 
(<code>35C7E942</code>).</p>
+
+      </subsection>
+
+      <subsection name="Verify the Integrity of the Files">
+
+        <p>It is essential that you verify the integrity of the downloaded
+        files using the PGP or MD5 signatures. The PGP signatures can be 
verified using PGP or GPG.
+        First download the <a 
href="http://www.apache.org/dist/tomcat/tomcat-connectors/KEYS";>KEYS</a>
+        as well as the <code>PGP</code> signature file for the relevant
+        distribution.  Make sure you get these files from the <a
+        href="http://www.apache.org/dist/tomcat/tomcat-connectors/";>main 
site</a>,
+        rather than from a mirror. The above [<code>PGP</code>] links 
automatically
+        retrieve the signature files from the main site. Then verify the 
signatures
+        using</p>
+
+        <p><code>
+        % pgpk -a KEYS<br />
+        % pgpv tomcat-connectors-1.2.26-src.tar.gz.asc<br />
+        </code>
+        <em>or</em><br />
+        <code>
+        % pgp -ka KEYS<br />
+        % pgp tomcat-connectors-1.2.26-src.tar.gz.asc<br />
+        </code>
+        <em>or</em><br />
+        <code>
+        % gpg --import KEYS<br />
+        % gpg --verify tomcat-connectors-1.2.26-src.tar.gz.asc
+        </code></p>
+
+        <p>Alternatively, you can verify the MD5 signature (hash value) on the 
files.
+        Make sure you get these files from the <a
+        href="http://www.apache.org/dist/tomcat/tomcat-connectors/";>main 
site</a>,
+        rather than from a mirror. The above [<code>MD5</code>] links 
automatically
+        retrieve the signature files from the main site.</p>
+        <p>Check the integrity of your download by comparing the downloaded MD5
+        signature files with the MD5 signature of the downloaded archives 
created on
+        your system. A unix program called <code>md5</code> or 
<code>md5sum</code> is
+        included in many unix distributions.  It is also available as part of
+        <a href="http://www.gnu.org/software/textutils/textutils.html";>GNU
+        Textutils</a>. Windows users can get binary md5 programs from <a
+        href="http://www.fourmilab.ch/md5/";>here</a>, <a
+        href="http://www.pc-tools.net/win32/freeware/console/";>here</a>, or
+        <a href="http://www.slavasoft.com/fsum/";>here</a>.</p>
+
+      </subsection>
+
+    </section>
+  </body>
 </document>



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to