Add source for updated download page, .htaccess file to redirect download.html to download.cgi, and an empty .gitignore file to prompt creation of the build dir for Git users

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@960257 13f79535-47bb-0310-9956-ffa450edef68

5 files changed, 201 insertions, 135 deletions

diff --git a/doc/website/README.txt b/doc/website/README.txt
index 9eb291bccf..4668e18d85 100644
--- a/doc/website/README.txt
+++ b/doc/website/README.txt
@@ -11,7 +11,7 @@ should be written in XHTML, with one <div/> element at the root - see
 
 Use wrap like this:
 
-$ tools/wrap templates/template.html content build
+$ tools/wrap templates/template.html content/<filename> build/<filename>
 
 Content for the main pages should be check into the content
 directory. Content for documentation is created in the ../book
diff --git a/doc/website/build/.gitignore b/doc/website/build/.gitignore
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/doc/website/build/.gitignore
diff --git a/doc/website/content/.htaccess b/doc/website/content/.htaccess
new file mode 100644
index 0000000000..767b20d6c2
--- /dev/null
+++ b/doc/website/content/.htaccess
@@ -0,0 +1,2 @@
+Redirect /download.html http://qpid.apache.org/download.cgi
+
diff --git a/doc/website/content/download.cgi b/doc/website/content/download.cgi
new file mode 100644
index 0000000000..ad78c43a97
--- /dev/null
+++ b/doc/website/content/download.cgi
@@ -0,0 +1,7 @@
+#!/bin/sh
+# Wrapper script around mirrors.cgi script
+# (we must change to that directory in order for python to pick up the
+#  python includes correctly)
+cd /www/www.apache.org/dyn/mirrors
+/www/www.apache.org/dyn/mirrors/mirrors.cgi $*
+
diff --git a/doc/website/content/download.html b/doc/website/content/download.html
index 00c2762987..9c4a9fe775 100644
--- a/doc/website/content/download.html
+++ b/doc/website/content/download.html
@@ -3,48 +3,72 @@
 
   <h2>Production Releases</h2>
 
-  <p>These releases are well tested and appropriate for production use. 0.6 is the latest release of Qpid.</p>
+  <p>These releases are well tested and appropriate for production use, use the links below to download them from one of our mirrors. Older versions can be found in the <a href="http://archive.apache.org/dist/qpid/">archive</a></p>
 
-  <p>Qpid supports the latest version of AMQP 0-10, and some components also the AMQP 0-8 and 0-9, earlier versions. The Java Broker and Client provide protocol negotiation. <a href="http://www.apache.org/dist/qpid/">Other versions can be found here</a></p>
+  <p>Qpid supports the latest version of AMQP 0-10, and some components also the earlier AMQP 0-8 and 0-9 versions. The Java Broker and Client provide protocol negotiation. For details on cross component compatibility among releases, see: <a href="./compatibility.html">AMQP Release Compatibility for Qpid</a></p>
 
-  <p>For details on cross component compatibility among releases, see: <a href="./compatibility.html">AMQP Release Compatibility for Qpid</a></p>
+  <p>If you have any questions about these releases, please email the <a href="mailto:users@qpid.apache.org">user list</a></p>
 
-  <p>If you have any questions about these releases, please mail the user list <a href="mailto:qpid-user@incubator.apache.org">user list</a></p>
+  <h2>Mirrors</h2>
 
+  <p>[if-any logo]
+<a href="[link]"><img align="right" src="[logo]" border="0" /></a>[end]
+The currently selected mirror is <b>[preferred]</b>. If you encounter a problem with this mirror, please select another.  If all mirrors are failing, there are <i>backup</i> mirrors (at the end of the list) that should be available, or you may also consult the <a href="http://www.apache.org/mirrors/">complete list</a> of mirrors.</p> 
 
-  <h2>Latest Release</h2>
+<form action="[location]" method="get" id="SelectMirror">
+<p>
+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" />
+</p>
+</form>
+
+  <p> It is good practice to <a href="#Download-Verify">verify</a> the integrity of the downloaded files using signatures downloaded from our <a href="http://www.apache.org/dist/qpid/">main distribution directory</a>.</p>
+
+  <h2>Latest Release: 0.6</h2>
+
+  <p>Individual PGP signatures are provided below, and the sha1sum output for each artefact is listed here: <a href="http://www.apache.org/dist/qpid/0.6/SHA1SUM">SHA1SUM</a>.</p>
 
   <h3>Multiple Component Packages</h3>
 
   <div>
-    <table><tbody>
+    <table class="download_table"><tbody>
 	<tr>
-	  <th> Component </th>
+	  <th class="download_table_col_1"> Component </th>
 
 	  <th> Download </th>
-	  <th> AMQP 0-10 </th>
-	  <th> AMQP 0-8/0-9 </th>
+	  <th class="download_table_amqp_col"> AMQP<br />0-10 </th>
+	  <th class="download_table_amqp_col"> AMQP<br />0-8/0-9 </th>
 	</tr>
 	<tr>
-	  <td> Full release &amp; keys </td>
-	  <td> <a href="http://www.apache.org/dist/qpid/0.6/">http://www.apache.org/dist/qpid/0.6/</a> </td>
+	  <td class="download_table_col_1"> All released artefacts</td>
+	  <td> <a href="[preferred]/qpid/0.6/">/qpid/0.6/</a> </td>
 
-	  <td> Y </td>
-	  <td> Y </td>
+	  <td class="download_table_amqp_col"> Y </td>
+	  <td class="download_table_amqp_col"> Y </td>
 	</tr>
 	<tr>
-	  <td> C+&#43; broker &amp; client </td>
-	  <td> <a href="http://www.apache.org/dist/qpid/0.6/qpid-cpp-0.6.tar.gz">http://www.apache.org/dist/qpid/0.6/qpid-cpp-0.6.tar.gz</a> </td>
+	  <td class="download_table_col_1"> C+&#43; broker &amp; client </td>
+	  <td> <a href="[preferred]/qpid/0.6/qpid-cpp-0.6.tar.gz">qpid-cpp-0.6.tar.gz</a> [<a href="http://www.apache.org/dist/qpid/0.6/qpid-cpp-0.6.tar.gz.asc">PGP</a>] </td>
 
-	  <td> Y </td>
-	  <td>&nbsp;</td>
+	  <td class="download_table_amqp_col"> Y </td>
+	  <td class="download_table_amqp_col">&nbsp;</td>
 	</tr>
 	<tr>
-	  <td> Java broker, client &amp; tools </td>
-	  <td> <a href="http://www.apache.org/dist/qpid/0.6/qpid-java-0.6.tar.gz">http://www.apache.org/dist/qpid/0.6/qpid-java-0.6.tar.gz</a> </td>
-	  <td> Y </td>
+	  <td class="download_table_col_1"> Java broker, client &amp; tools </td>
+	  <td> <a href="[preferred]/qpid/0.6/qpid-java-0.6.tar.gz">qpid-java-0.6.tar.gz</a> [<a href="http://www.apache.org/dist/qpid/0.6/qpid-java-0.6.tar.gz.asc">PGP</a>] </td>
+	  <td class="download_table_amqp_col"> Y </td>
 
-	  <td> Y </td>
+	  <td class="download_table_amqp_col"> Y </td>
 	</tr>
     </tbody></table>
   </div>
@@ -54,20 +78,20 @@
 
   <p><b>Broker</b></p>
   <div>
-    <table><tbody>
+    <table class="download_table"><tbody>
 	<tr>
-	  <th> Language </th>
+	  <th class="download_table_col_1"> Language </th>
 
 	  <th> Download </th>
-	  <th> AMQP 0-10 </th>
-	  <th> AMQP 0-8/0-9 </th>
+	  <th class="download_table_amqp_col"> AMQP<br />0-10 </th>
+	  <th class="download_table_amqp_col"> AMQP<br />0-8/0-9 </th>
 	</tr>
 	<tr>
-	  <td> Java </td>
-	  <td> <a href="http://www.apache.org/dist/qpid/0.6/qpid-java-broker-0.6.tar.gz">http://www.apache.org/dist/qpid/0.6/qpid-java-broker-0.6.tar.gz</a> </td>
+	  <td class="download_table_col_1"> Java </td>
+	  <td> <a href="[preferred]/qpid/0.6/qpid-java-broker-0.6.tar.gz">qpid-java-broker-0.6.tar.gz</a> [<a href="http://www.apache.org/dist/qpid/0.6/qpid-java-broker-0.6.tar.gz.asc">PGP</a>] </td>
 
-	  <td> Y </td>
-	  <td> Y </td>
+	  <td class="download_table_amqp_col"> Y </td>
+	  <td class="download_table_amqp_col"> Y </td>
 	</tr>
     </tbody></table>
   </div>
@@ -75,54 +99,54 @@
 
   <p><b>Client</b></p>
   <div>
-    <table><tbody>
+    <table class="download_table"><tbody>
 	<tr>
-	  <th> Language </th>
+	  <th class="download_table_col_1"> Language </th>
 
 	  <th> Download </th>
-	  <th> AMQP 0-10 </th>
-	  <th> AMQP 0-8/0-9 </th>
+	  <th class="download_table_amqp_col"> AMQP<br />0-10 </th>
+	  <th class="download_table_amqp_col"> AMQP<br />0-8/0-9 </th>
 	</tr>
 	<tr>
-	  <td> C# (.NET, WCF) WCF channel (C+&#43; Broker Compatible) </td>
-	  <td> <a href="http://www.apache.org/dist/qpid/0.6/qpid-wcf-0.6.zip">http://www.apache.org/dist/qpid/0.6/qpid-wcf-0.6.zip</a> </td>
+	  <td class="download_table_col_1"> C# (.NET, WCF) WCF channel (C+&#43; Broker Compatible) </td>
+	  <td> <a href="[preferred]/qpid/0.6/qpid-wcf-0.6.zip">qpid-wcf-0.6.zip</a> [<a href="http://www.apache.org/dist/qpid/0.6/qpid-wcf-0.6.zip.asc">PGP</a>] </td>
 
-	  <td> Y </td>
-	  <td>&nbsp;</td>
+	  <td class="download_table_amqp_col"> Y </td>
+	  <td class="download_table_amqp_col">&nbsp;</td>
 	</tr>
 	<tr>
-	  <td> C# (.NET, WCF, Excel) 0-10 client (C+&#43; Broker Compatible) </td>
-	  <td> <a href="http://www.apache.org/dist/qpid/0.6/qpid-dotnet-0-10-0.6.zip">http://www.apache.org/dist/qpid/0.6/qpid-dotnet-0-10-0.6.zip</a> </td>
-	  <td> Y </td>
+	  <td class="download_table_col_1"> C# (.NET, WCF, Excel) 0-10 client (C+&#43; Broker Compatible) </td>
+	  <td> <a href="[preferred]/qpid/0.6/qpid-dotnet-0-10-0.6.zip">qpid-dotnet-0-10-0.6.zip</a> [<a href="http://www.apache.org/dist/qpid/0.6/qpid-dotnet-0-10-0.6.zip.asc">PGP</a>] </td>
+	  <td class="download_table_amqp_col"> Y </td>
 
-	  <td>&nbsp;</td>
+	  <td class="download_table_amqp_col">&nbsp;</td>
 	</tr>
 	<tr>
-	  <td> C# (.NET) 0-8 client (Java Broker Compatible) </td>
-	  <td> <a href="http://www.apache.org/dist/qpid/0.6/qpid-dotnet-0-8-0.6.zip">http://www.apache.org/dist/qpid/0.6/qpid-dotnet-0-8-0.6.zip</a> </td>
-	  <td>&nbsp;</td>
-	  <td> Y </td>
+	  <td class="download_table_col_1"> C# (.NET) 0-8 client (Java Broker Compatible) </td>
+	  <td> <a href="[preferred]/qpid/0.6/qpid-dotnet-0-8-0.6.zip">qpid-dotnet-0-8-0.6.zip</a> [<a href="http://www.apache.org/dist/qpid/0.6/qpid-dotnet-0-8-0.6.zip.asc">PGP</a>] </td>
+	  <td class="download_table_amqp_col">&nbsp;</td>
+	  <td class="download_table_amqp_col"> Y </td>
 	</tr>
 	<tr>
-	  <td> Java </td>
+	  <td class="download_table_col_1"> Java </td>
 
-	  <td> <a href="http://www.apache.org/dist/qpid/0.6/qpid-java-client-0.6.tar.gz">http://www.apache.org/dist/qpid/0.6/qpid-java-client-0.6.tar.gz</a> </td>
-	  <td> Y </td>
-	  <td> Y </td>
+	  <td> <a href="[preferred]/qpid/0.6/qpid-java-client-0.6.tar.gz">qpid-java-client-0.6.tar.gz</a> [<a href="http://www.apache.org/dist/qpid/0.6/qpid-java-client-0.6.tar.gz.asc">PGP</a>] </td>
+	  <td class="download_table_amqp_col"> Y </td>
+	  <td class="download_table_amqp_col"> Y </td>
 	</tr>
 	<tr>
-	  <td> Python </td>
-	  <td> <a href="http://www.apache.org/dist/qpid/0.6/qpid-python-0.6.tar.gz">http://www.apache.org/dist/qpid/0.6/qpid-python-0.6.tar.gz</a> </td>
+	  <td class="download_table_col_1"> Python </td>
+	  <td> <a href="[preferred]/qpid/0.6/qpid-python-0.6.tar.gz">qpid-python-0.6.tar.gz</a> [<a href="http://www.apache.org/dist/qpid/0.6/qpid-python-0.6.tar.gz.asc">PGP</a>] </td>
 
-	  <td> Y </td>
-	  <td> Y </td>
+	  <td class="download_table_amqp_col"> Y </td>
+	  <td class="download_table_amqp_col"> Y </td>
 	</tr>
 	<tr>
-	  <td> Ruby </td>
-	  <td> <a href="http://www.apache.org/dist/qpid/0.6/qpid-ruby-0.6.tar.gz">http://www.apache.org/dist/qpid/0.6/qpid-ruby-0.6.tar.gz</a> </td>
-	  <td> Y </td>
+	  <td class="download_table_col_1"> Ruby </td>
+	  <td> <a href="[preferred]/qpid/0.6/qpid-ruby-0.6.tar.gz">qpid-ruby-0.6.tar.gz</a> [<a href="http://www.apache.org/dist/qpid/0.6/qpid-ruby-0.6.tar.gz.asc">PGP</a>] </td>
+	  <td class="download_table_amqp_col"> Y </td>
 
-	  <td> Y </td>
+	  <td class="download_table_amqp_col"> Y </td>
 	</tr>
     </tbody></table>
   </div>
@@ -132,23 +156,26 @@
 
   <p>C+&#43; broker management</p>
   <div>
-    <table><tbody>
+    <table class="download_table"><tbody>
 
 	<tr>
-	  <th> Component </th>
+	  <th class="download_table_col_1"> Component </th>
 	  <th> Download </th>
-	  <th> AMQP 0-10 </th>
+	  <th class="download_table_amqp_col"> AMQP<br />0-10 </th>
+	  <th class="download_table_amqp_col"> AMQP<br />0-8/0-9 </th>
 	</tr>
 	<tr>
-	  <td> cmd line (packaged with python) </td>
-	  <td> <a href="http://www.apache.org/dist/qpid/0.6/qpid-python-0.6.tar.gz">http://www.apache.org/dist/qpid/0.6/qpid-python-0.6.tar.gz</a> </td>
+	  <td class="download_table_col_1"> cmd line (packaged with python) </td>
+	  <td> <a href="[preferred]/qpid/0.6/qpid-python-0.6.tar.gz">qpid-python-0.6.tar.gz</a> [<a href="http://www.apache.org/dist/qpid/0.6/qpid-python-0.6.tar.gz.asc">PGP</a>] </td>
 
-	  <td> Y </td>
+	  <td class="download_table_amqp_col"> Y </td>
+	  <td class="download_table_amqp_col">&nbsp;</td>
 	</tr>
 	<tr>
-	  <td> QMan JMX bridge, WS-DM </td>
-	  <td> <a href="http://www.apache.org/dist/qpid/0.6/qpid-management-client-0.6.tar.gz">http://www.apache.org/dist/qpid/0.6/qpid-management-client-0.6.tar.gz</a> </td>
-	  <td> Y </td>
+	  <td class="download_table_col_1"> QMan JMX bridge, WS-DM </td>
+	  <td> <a href="[preferred]/qpid/0.6/qpid-management-client-0.6.tar.gz">qpid-management-client-0.6.tar.gz</a> [<a href="http://www.apache.org/dist/qpid/0.6/qpid-management-client-0.6.tar.gz.asc">PGP</a>] </td>
+	  <td class="download_table_amqp_col"> Y </td>
+	  <td class="download_table_amqp_col">&nbsp;</td>
 	</tr>
     </tbody></table>
 
@@ -157,15 +184,15 @@
 
   <p>Java broker management</p>
   <div>
-    <table><tbody>
+    <table class="download_table"><tbody>
 	<tr>
-	  <th> Component </th>
+	  <th class="download_table_col_1"> Component </th>
 	  <th> Download </th>
 	</tr>
 	<tr>
-	  <td> JMX Management Console <br  /> </td>
+	  <td class="download_table_col_1"> JMX Management Console <br  /> </td>
 
-	  <td> <a href="http://www.apache.org/dist/qpid/0.6/qpid-jmx-management-console-0.6-linux-gtk-x86.tar.gz">Linux x86</a> <a href="http://www.apache.org/dist/qpid/0.6//qpid-jmx-management-console-0.6-linux-gtk-x86_64.tar.gz">Linux x86_64</a> <a href="http://www.apache.org/dist/qpid/0.6//qpid-jmx-management-console-0.6-macosx.zip">Mac OS X</a> <a href="http://www.apache.org/dist/qpid/0.6/qpid-jmx-management-console-0.6-solaris-gtk-sparc.tar.gz">Solaris 10 Sparc</a> <a href="http://www.apache.org/dist/qpid/0.6//qpid-jmx-management-console-0.6-win32-win32-x86.zip">Windows x86</a> </td>
+	  <td> <a href="[preferred]/qpid/0.6/qpid-jmx-management-console-0.6-linux-gtk-x86.tar.gz">Linux x86</a> [<a href="http://www.apache.org/dist/qpid/0.6/qpid-jmx-management-console-0.6-linux-gtk-x86.tar.gz.asc">PGP</a>] | <a href="[preferred]/qpid/0.6/qpid-jmx-management-console-0.6-linux-gtk-x86_64.tar.gz">Linux x86_64</a> [<a href="http://www.apache.org/dist/qpid/0.6/qpid-jmx-management-console-0.6-linux-gtk-x86_64.tar.gz.asc">PGP</a>] | <a href="[preferred]/qpid/0.6/qpid-jmx-management-console-0.6-macosx.zip">Mac OS X</a> [<a href="http://www.apache.org/dist/qpid/0.6/qpid-jmx-management-console-0.6-macosx.zip.asc">PGP</a>] | <a href="[preferred]/qpid/0.6/qpid-jmx-management-console-0.6-solaris-gtk-sparc.tar.gz">Solaris 10 Sparc</a> [<a href="http://www.apache.org/dist/qpid/0.6/qpid-jmx-management-console-0.6-solaris-gtk-sparc.tar.gz.asc">PGP</a>] | <a href="[preferred]/qpid/0.6/qpid-jmx-management-console-0.6-win32-win32-x86.zip">Windows x86</a> [<a href="http://www.apache.org/dist/qpid/0.6/qpid-jmx-management-console-0.6-win32-win32-x86.zip.asc">PGP</a>] </td>
 	</tr>
     </tbody></table>
   </div>
@@ -175,38 +202,38 @@
 
   <p>The Windows installer is available from <a href="http://www.riverace.com/qpid/downloads.htm">http://www.riverace.com/qpid/downloads.htm</a>. It is built from the 0.6 C+&#43; broker &amp; client and C# WCF Channel source distributions listed above. It has been tested for Windows XP SP3 and above.</p>
 
-  <h2><a name="Download-PreviousRelease"></a>Previous Release</h2>
+  <h2><a name="Download-PreviousRelease"></a>Previous Release: 0.5</h2>
 
   <h3><a name="Download-MultipleComponentPackages"></a>Multiple Component Packages</h3>
 
   <div>
-    <table><tbody>
+    <table class="download_table"><tbody>
 	<tr>
-	  <th> Component </th>
+	  <th class="download_table_col_1"> Component </th>
 	  <th> Download </th>
-	  <th> AMQP 0-10 </th>
-	  <th> AMQP 0-8/0-9 </th>
+	  <th class="download_table_amqp_col"> AMQP<br />0-10 </th>
+	  <th class="download_table_amqp_col"> AMQP<br />0-8/0-9 </th>
 	</tr>
 
 	<tr>
-	  <td> Full release &amp; keys </td>
-	  <td> <a href="http://www.apache.org/dist/qpid/0.5/">http://www.apache.org/dist/qpid/0.5/</a> </td>
-	  <td> Y </td>
-	  <td> Y </td>
+	  <td class="download_table_col_1"> All release artefacts</td>
+	  <td> <a href="[preferred]/qpid/0.5/">/qpid/0.5/</a> </td>
+	  <td class="download_table_amqp_col"> Y </td>
+	  <td class="download_table_amqp_col"> Y </td>
 	</tr>
 
 	<tr>
-	  <td> C+&#43; broker &amp; client </td>
-	  <td> <a href="http://www.apache.org/dist/qpid/0.5/qpid-cpp-0.5.tar.gz">http://www.apache.org/dist/qpid/0.5/qpid-cpp-0.5.tar.gz</a> </td>
-	  <td> Y </td>
-	  <td>&nbsp;</td>
+	  <td class="download_table_col_1"> C+&#43; broker &amp; client </td>
+	  <td> <a href="[preferred]/qpid/0.5/qpid-cpp-0.5.tar.gz">qpid-cpp-0.5.tar.gz</a> [<a href="http://www.apache.org/dist/qpid/0.5/qpid-cpp-0.5.tar.gz.asc">PGP</a>] </td>
+	  <td class="download_table_amqp_col"> Y </td>
+	  <td class="download_table_amqp_col">&nbsp;</td>
 	</tr>
 
 	<tr>
-	  <td> Java broker, client &amp; tools </td>
-	  <td> <a href="http://www.apache.org/dist/qpid/0.5/qpid-java-0.5.tar.gz">http://www.apache.org/dist/qpid/0.5/qpid-java-0.5.tar.gz</a> </td>
-	  <td> client </td>
-	  <td> Y </td>
+	  <td class="download_table_col_1"> Java broker, client &amp; tools </td>
+	  <td> <a href="[preferred]/qpid/0.5/qpid-java-0.5.tar.gz">qpid-java-0.5.tar.gz</a> [<a href="http://www.apache.org/dist/qpid/0.5/qpid-java-0.5.tar.gz.asc">PGP</a>] </td>
+	  <td class="download_table_amqp_col"> client </td>
+	  <td class="download_table_amqp_col"> Y </td>
 	</tr>
 
     </tbody></table>
@@ -217,19 +244,19 @@
 
   <p><b>Broker</b></p>
   <div>
-    <table><tbody>
+    <table class="download_table"><tbody>
 	<tr>
-	  <th> Language </th>
+	  <th class="download_table_col_1"> Language </th>
 	  <th> Download </th>
 
-	  <th> AMQP 0-10 </th>
-	  <th> AMQP 0-8/0-9 </th>
+	  <th class="download_table_amqp_col"> AMQP<br />0-10 </th>
+	  <th class="download_table_amqp_col"> AMQP<br />0-8/0-9 </th>
 	</tr>
 	<tr>
-	  <td> Java </td>
-	  <td> <a href="http://www.apache.org/dist/qpid/0.5/qpid-java-broker-0.5.tar.gz">http://www.apache.org/dist/qpid/0.5/qpid-java-broker-0.5.tar.gz</a> </td>
-	  <td>&nbsp;</td>
-	  <td> Y </td>
+	  <td class="download_table_col_1"> Java </td>
+	  <td> <a href="[preferred]/qpid/0.5/qpid-java-broker-0.5.tar.gz">qpid-java-broker-0.5.tar.gz</a> [<a href="http://www.apache.org/dist/qpid/0.5/qpid-java-broker-0.5.tar.gz.asc">PGP</a>] </td>
+	  <td class="download_table_amqp_col">&nbsp;</td>
+	  <td class="download_table_amqp_col"> Y </td>
 
 	</tr>
     </tbody></table>
@@ -238,47 +265,47 @@
 
   <p><b>Client</b></p>
   <div>
-    <table><tbody>
+    <table class="download_table"><tbody>
 	<tr>
-	  <th> Language </th>
+	  <th class="download_table_col_1"> Language </th>
 	  <th> Download </th>
-	  <th> AMQP 0-10 </th>
+	  <th class="download_table_amqp_col"> AMQP<br />0-10 </th>
 
-	  <th> AMQP 0-8/0-9 </th>
+	  <th class="download_table_amqp_col"> AMQP<br />0-8/0-9 </th>
 	</tr>
 	<tr>
-	  <td> C# (.NET, WCF, Excel) 0-10 client (C+&#43; Broker Compatible) </td>
-	  <td> <a href="http://www.apache.org/dist/qpid/0.5/qpid-dotnet-0-10-0.5.zip">http://www.apache.org/dist/qpid/0.5/qpid-dotnet-0-10-0.5.zip</a> </td>
-	  <td> Y </td>
+	  <td class="download_table_col_1"> C# (.NET, WCF, Excel) 0-10 client (C+&#43; Broker Compatible) </td>
+	  <td> <a href="[preferred]/qpid/0.5/qpid-dotnet-0-10-0.5.zip">qpid-dotnet-0-10-0.5.zip</a> [<a href="http://www.apache.org/dist/qpid/0.5/qpid-dotnet-0-10-0.5.zip.asc">PGP</a>] </td>
+	  <td class="download_table_amqp_col"> Y </td>
 
 	  <td>&nbsp;</td>
 	</tr>
 	<tr>
-	  <td> C# (.NET) 0-8 client (Java Broker Compatible) </td>
-	  <td> <a href="http://www.apache.org/dist/qpid/0.5/qpid-dotnet-0-8-0.5.zip">http://www.apache.org/dist/qpid/0.5/qpid-dotnet-0-8-0.5.zip</a> </td>
-	  <td>&nbsp;</td>
-	  <td> Y </td>
+	  <td class="download_table_col_1"> C# (.NET) 0-8 client (Java Broker Compatible) </td>
+	  <td> <a href="[preferred]/qpid/0.5/qpid-dotnet-0-8-0.5.zip">qpid-dotnet-0-8-0.5.zip</a> [<a href="http://www.apache.org/dist/qpid/0.5/qpid-dotnet-0-8-0.5.zip.asc">PGP</a>] </td>
+	  <td class="download_table_amqp_col">&nbsp;</td>
+	  <td class="download_table_amqp_col"> Y </td>
 	</tr>
 	<tr>
-	  <td> Java </td>
+	  <td class="download_table_col_1"> Java </td>
 
-	  <td> <a href="http://www.apache.org/dist/qpid/0.5/qpid-java-client-0.5.tar.gz">http://www.apache.org/dist/qpid/0.5/qpid-java-client-0.5.tar.gz</a> </td>
-	  <td> Y </td>
-	  <td> Y </td>
+	  <td> <a href="[preferred]/qpid/0.5/qpid-java-client-0.5.tar.gz">qpid-java-client-0.5.tar.gz</a> [<a href="http://www.apache.org/dist/qpid/0.5/qpid-java-client-0.5.tar.gz.asc">PGP</a>] </td>
+	  <td class="download_table_amqp_col"> Y </td>
+	  <td class="download_table_amqp_col"> Y </td>
 	</tr>
 	<tr>
-	  <td> Python </td>
-	  <td> <a href="http://www.apache.org/dist/qpid/0.5/qpid-python-0.5.tar.gz">http://www.apache.org/dist/qpid/0.5/qpid-python-0.5.tar.gz</a> </td>
+	  <td class="download_table_col_1"> Python </td>
+	  <td> <a href="[preferred]/qpid/0.5/qpid-python-0.5.tar.gz">qpid-python-0.5.tar.gz</a> [<a href="http://www.apache.org/dist/qpid/0.5/qpid-python-0.5.tar.gz.asc">PGP</a>] </td>
 
-	  <td> Y </td>
-	  <td> Y </td>
+	  <td class="download_table_amqp_col"> Y </td>
+	  <td class="download_table_amqp_col"> Y </td>
 	</tr>
 	<tr>
-	  <td> Ruby </td>
-	  <td> <a href="http://www.apache.org/dist/qpid/0.5/qpid-ruby-0.5.tar.gz">http://www.apache.org/dist/qpid/0.5/qpid-ruby-0.5.tar.gz</a> </td>
-	  <td> Y </td>
+	  <td class="download_table_col_1"> Ruby </td>
+	  <td> <a href="[preferred]/qpid/0.5/qpid-ruby-0.5.tar.gz">qpid-ruby-0.5.tar.gz</a> [<a href="http://www.apache.org/dist/qpid/0.5/qpid-ruby-0.5.tar.gz.asc">PGP</a>] </td>
+	  <td class="download_table_amqp_col"> Y </td>
 
-	  <td> Y </td>
+	  <td class="download_table_amqp_col"> Y </td>
 	</tr>
     </tbody></table>
   </div>
@@ -288,23 +315,26 @@
 
   <p>C+&#43; broker management</p>
   <div>
-    <table><tbody>
+    <table class="download_table"><tbody>
 
 	<tr>
-	  <th> Component </th>
+	  <th class="download_table_col_1"> Component </th>
 	  <th> Download </th>
-	  <th> AMQP 0-10 </th>
+	  <th class="download_table_amqp_col"> AMQP<br />0-10 </th>
+	  <th class="download_table_amqp_col"> AMQP<br />0-8/0-9 </th>
 	</tr>
 	<tr>
-	  <td> cmd line (packaged with python) </td>
-	  <td> <a href="http://www.apache.org/dist/qpid/0.5/qpid-python-0.5.tar.gz">http://www.apache.org/dist/qpid/0.5/qpid-python-0.5.tar.gz</a> </td>
+	  <td class="download_table_col_1"> cmd line (packaged with python) </td>
+	  <td> <a href="[preferred]/qpid/0.5/qpid-python-0.5.tar.gz">qpid-python-0.5.tar.gz</a> [<a href="http://www.apache.org/dist/qpid/0.5/qpid-python-0.5.tar.gz.asc">PGP</a>] </td>
 
-	  <td> Y </td>
+	  <td class="download_table_amqp_col"> Y </td>
+	  <td class="download_table_amqp_col">&nbsp;</td>
 	</tr>
 	<tr>
-	  <td> QMan JMX bridge, WS-DM </td>
-	  <td> <a href="http://www.apache.org/dist/qpid/0.5/qpid-management-client-0.5.tar.gz">http://www.apache.org/dist/qpid/0.5/qpid-management-client-0.5.tar.gz</a> </td>
-	  <td> Y </td>
+	  <td class="download_table_col_1"> QMan JMX bridge, WS-DM </td>
+	  <td> <a href="[preferred]/qpid/0.5/qpid-management-client-0.5.tar.gz">qpid-management-client-0.5.tar.gz</a> [<a href="http://www.apache.org/dist/qpid/0.5/qpid-management-client-0.5.tar.gz.asc">PGP</a>] </td>
+	  <td class="download_table_amqp_col"> Y </td>
+	  <td class="download_table_amqp_col">&nbsp;</td>
 	</tr>
     </tbody></table>
 
@@ -313,19 +343,19 @@
 
   <p>Java broker management</p>
   <div>
-    <table><tbody>
+    <table class="download_table"><tbody>
 	<tr>
-	  <th> Component </th>
+	  <th class="download_table_col_1"> Component </th>
 	  <th> Download </th>
 	</tr>
 	<tr>
-	  <td> JMX Management Console </td>
+	  <td class="download_table_col_1"> JMX Management Console </td>
 
-	  <td> <a href="http://www.apache.org/dist/qpid/0.5/qpid-management-eclipse-plugin-0.5-linux-gtk-x86.tar.gz">Linux x86</a> <a href="http://www.apache.org/dist/qpid/0.5/qpid-management-eclipse-plugin-0.5-linux-gtk-x86_64.tar.gz">Linux x86_64</a> <a href="http://www.apache.org/dist/qpid/0.5/qpid-management-eclipse-plugin-0.5-macosx.zip">Mac OS X</a> <a href="http://www.apache.org/dist/qpid/0.5/qpid-management-eclipse-plugin-0.5-win32-win32-x86.zip">Windows x86</a> </td>
+	  <td> <a href="[preferred]/qpid/0.5/qpid-management-eclipse-plugin-0.5-linux-gtk-x86.tar.gz">Linux x86</a> [<a href="http://www.apache.org/dist/qpid/0.5/qpid-management-eclipse-plugin-0.5-linux-gtk-x86.tar.gz.asc">PGP</a>] | <a href="[preferred]/qpid/0.5/qpid-management-eclipse-plugin-0.5-linux-gtk-x86_64.tar.gz">Linux x86_64</a> [<a href="http://www.apache.org/dist/qpid/0.5/qpid-management-eclipse-plugin-0.5-linux-gtk-x86_64.tar.gz.asc">PGP</a>] | <a href="[preferred]/qpid/0.5/qpid-management-eclipse-plugin-0.5-macosx.zip">Mac OS X</a> [<a href="http://www.apache.org/dist/qpid/0.5/qpid-management-eclipse-plugin-0.5-macosx.zip.asc">PGP</a>] | <a href="[preferred]/qpid/0.5/qpid-management-eclipse-plugin-0.5-win32-win32-x86.zip">Windows x86</a> [<a href="http://www.apache.org/dist/qpid/0.5/qpid-management-eclipse-plugin-0.5-win32-win32-x86.zip.asc">PGP</a>] </td>
 	</tr>
 	<tr>
-	  <td> Command line interface </td>
-	  <td> <a href="http://www.apache.org/dist/qpid/0.5/qpid-management-tools-qpid-cli-0.5.tar.gz">http://www.apache.org/dist/qpid/0.5/qpid-management-tools-qpid-cli-0.5.tar.gz</a> </td>
+	  <td class="download_table_col_1"> Command line interface </td>
+	  <td> <a href="[preferred]/qpid/0.5/qpid-management-tools-qpid-cli-0.5.tar.gz">qpid-management-tools-qpid-cli-0.5.tar.gz</a> [<a href="http://www.apache.org/dist/qpid/0.5/qpid-management-tools-qpid-cli-0.5.tar.gz.asc">PGP</a>] </td>
 
 	</tr>
     </tbody></table>
@@ -378,7 +408,7 @@
 
   <h3><a name="Download-WindowsInstaller"></a>Windows Installer</h3>
 
-  <p>The Windows installer is available from <a href="http://www.apache.org/dist/qpid/0.5-windows/qpidc-0.5.msi">http://www.apache.org/dist/qpid/0.5-windows/qpidc-0.5.msi</a>. It is built from the 0.5 C+&#43; broker and client source distribution listed above. It has been tested for Windows XP SP2 and above.</p>
+  <p>The Windows installer is available from <a href="[preferred]/qpid/0.5-windows/qpidc-0.5.msi">[preferred]/qpid/0.5-windows/qpidc-0.5.msi</a> [<a href="http://www.apache.org/dist/qpid/0.5-windows/qpidc-0.5.msi.asc">PGP</a>]. It is built from the 0.5 C+&#43; broker and client source distribution listed above. It has been tested for Windows XP SP2 and above.</p>
 
   <p>The Windows executables require the Visual C+&#43; 2008 SP1 run-time components. If the Visual C+&#43; 2008 SP1 runtime is not available, the Qpid broker will not execute. If you intend to run the broker and Visual C+&#43; 2008 is not installed, you must install the Visual C+&#43; 2008 SP1 Redistributable. Please see <a href="http://www.microsoft.com/downloads/details.aspx?familyid=A5C84275-3B97-4AB7-A40D-3802B2AF5FC2&amp;displaylang=en">http://www.microsoft.com/downloads/details.aspx?familyid=A5C84275-3B97-4AB7-A40D-3802B2AF5FC2&amp;displaylang=en</a> for download and installation instructions.</p>
 
@@ -387,5 +417,32 @@
   <h2><a name="Download-SourceCodeRepository"></a>Source Code Repository</h2>
 
   <p>The latest version of the code is always available in the <a href="source_repository.html" title="Source Repository">Source Repository</a>.</p>
+
+
+  <h2><a name="Download-Verify"></a>Verify the integrity of the files</h2>
+
+  <p>It is essential that you verify the integrity of the downloaded files using the PGP signatures or SHA1 checksums.</p>
+
+  <p>The PGP signatures can be verified using PGP or GPG. First download the <a href="http://www.apache.org/dist/qpid/KEYS">KEYS</a> file as well as the <code>.asc</code> PGP signature file for the relevant artefact. Make sure you get these files from the relevant subdirectory of the <a href="http://www.apache.org/dist/qpid/">main distribution directory</a>, rather than from a mirror. Then verify the signatures using:</p>
+
+  <p>
+  <code>
+% pgpk -a KEYS<br />
+% pgpv qpid-0.6.tar.gz.asc<br />
+  </code>
+  <em>or</em><br />
+  <code>
+% pgp -ka KEYS<br />
+% pgp qpid-0.6.tar.gz.asc<br />
+  </code>
+  <em>or</em><br />
+  <code>
+% gpg --import KEYS<br />
+% gpg --verify qpid-0.6.tar.gz.asc
+  </code>
+  </p>
+
+<p>Alternatively, you can verify the SHA1 checksum of the files. A unix program called <code>sha1</code> or <code>sha1sum</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>. For windows users, <a href="http://www.slavasoft.com/fsum/">fsum</a> supports SHA1. Ensure your generated checksum string matches the string published in the SHA1SUM file included with each release. Again, make sure you get this file from the relevant subdirectory of the <a href="http://www.apache.org/dist/qpid/">main distribution directory</a>, rather than from a mirror</p>
+
 </div>