Applied Justin's patch from QPID-3230.

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

2 files changed, 34 insertions, 74 deletions

diff --git a/qpid/doc/website/content/compatibility.html b/qpid/doc/website/content/compatibility.html
index af99670da9..a642beb715 100644
--- a/qpid/doc/website/content/compatibility.html
+++ b/qpid/doc/website/content/compatibility.html
@@ -19,46 +19,29 @@
  -
 -->
 <div class="main_text_area_body">
-  <p><b>Qpid provides the most complete and compatible implementation of AMQP. And is the most aggressive in implementing the latest version of the specification. Qpid can be</b> <b><a href="./download.cgi" title="Download"><b>downloaded here</b></a></b></p>
+  <p><b>Qpid provides the most complete and compatible implementation of AMQP and is the most aggressive in implementing the latest version of the specification. Qpid can be</b> <b><a href="./download.cgi" title="Download"><b>downloaded here</b></a></b>.</p>
 
   <p>There are two brokers:</p>
 
-  <p>C+&#43; with support for AMQP 0-10<br/>
-    Java with support for AMQP 0-8, 0-9, and 0-10.</p>
-
-  <p>There are client libraries for C++, Java (JMS), .Net (written in C#), python and ruby.</p>
-
   <ul>
-    <li>All clients support 0-10 and interoperate with both brokers as of 0.6.</li>
+    <li>C+&#43; with support for AMQP 0-10.</li>
+    <li>Java with support for AMQP 0-8, 0-9, and 0-10.</li>
   </ul>
 
+  <p>There are client libraries for C++, Java (JMS), .Net (written in C#), python and ruby.</p>
 
   <ul>
+    <li>All clients support 0-10 and interoperate with both brokers as of 0.6.</li>
     <li>The JMS client supports 0-8, 0-9 and 0-10 and interoperates with both brokers.</li>
-  </ul>
-
-
-  <ul>
     <li>The python and ruby clients will also support all versions, but the API is dynamically driven by the specification used and so differs between versions. To work with the C+&#43; broker you must use 0-10. To work with the Java broker you can use any version as of 0.6, or prior to 0.6 you can use 0-8 or 0-9.</li>
-
-  </ul>
-
-
-  <ul>
-    <li>There are two separate C# clients, one for 0-8 that interoperates only with the Java broker, and one for 0-10.</li>
-  </ul>
-
-
-  <ul>
     <li>There is also a WCF channel, which wraps the 0-10 native C++ client library.</li>
   </ul>
 
-
   <p>QMF Management is supported in Ruby, Python, C++, and can be translated to Java JMX &amp; WS-DM via the QMan management tool.</p>
 
   <h3><a name="AMQPcompatibility-AMQPCompatibilityofQpidreleases%3A"></a>AMQP Compatibility of Qpid releases:</h3>
 
-  <p>Qpid implements the AMQP Specification, and as the specification has progressed Qpid is keeping up with the updates. This means that different Qpid versions support different versions of AMQP. Here is a simple guide on what use.</p>
+  <p>Qpid implements the AMQP Specification, and as the specification has progressed Qpid is keeping up with the updates. This means that different Qpid versions support different versions of AMQP. Here is a simple guide on what to use.</p>
 
   <p>Here is a matrix that describes the different versions supported by each release<br/>
     Y  = supported<br/>
@@ -270,7 +253,7 @@
 	</tr>
 	<tr>
 	  <td > Java client </td>
-	  <td > M3, M4, 0.5, 0.6, 0.8</td>
+	  <td > M3, M4, 0.5, 0.6, 0.8, 0.10</td>
 
 	  <td > Y </td>
 	  <td > Y </td>
@@ -286,7 +269,7 @@
 	</tr>
 	<tr>
 	  <td > Java broker </td>
-	  <td > 0.6, 0.8</td>
+	  <td > 0.6, 0.8, 0.10</td>
 
 	  <td > Y </td>
 	  <td > Y </td>
@@ -310,7 +293,7 @@
 	</tr>
 	<tr>
 	  <td > C+&#43; client/broker </td>
-	  <td > M3, M4, 0.5, 0.6, 0.8</td>
+	  <td > M3, M4, 0.5, 0.6, 0.8, 0.10</td>
 
 	  <td > N </td>
 	  <td > N </td>
@@ -326,7 +309,7 @@
 	</tr>
 	<tr>
 	  <td > Python client </td>
-	  <td > M3, M4, 0.5, 0.6, 0.8</td>
+	  <td > M3, M4, 0.5, 0.6, 0.8, 0.10</td>
 
 	  <td > Y </td>
 	  <td > Y </td>
@@ -374,7 +357,7 @@
 	</tr>
 	<tr>
 	  <td > WCF channel </td>
-	  <td > 0.6, 0.8</td>
+	  <td > 0.6, 0.8, 0.10</td>
 
 	  <td > N </td>
 	  <td > N </td>
@@ -383,4 +366,3 @@
     </tbody></table>
   </div>
 </div>
-
diff --git a/qpid/doc/website/content/download.html b/qpid/doc/website/content/download.html
index 8a8c5db9c8..66160bf9f2 100644
--- a/qpid/doc/website/content/download.html
+++ b/qpid/doc/website/content/download.html
@@ -54,10 +54,9 @@ Other mirrors: <select name="Preferred">
 
   <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.10</h2>
 
-  <h2>Latest Release: 0.8</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.8/SHA1SUM">SHA1SUM</a>.</p>
+  <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.10/SHA1SUM">SHA1SUM</a>.</p>
 
   <h3>Multiple Component Packages</h3>
 
@@ -72,28 +71,28 @@ Other mirrors: <select name="Preferred">
 	</tr>
 	<tr>
 	  <td class="download_table_col_1"> Full source release</td>
-	  <td> <a href="[preferred]/qpid/0.8/qpid-0.8.tar.gz">qpid-0.8.tar.gz</a> [<a href="http://www.apache.org/dist/qpid/0.8/qpid-0.8.tar.gz.asc">PGP</a>] </td>
+	  <td> <a href="[preferred]/qpid/0.10/qpid-0.10.tar.gz">qpid-0.10.tar.gz</a> [<a href="http://www.apache.org/dist/qpid/0.10/qpid-0.10.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 class="download_table_col_1"> C+&#43; broker &amp; client </td>
-	  <td> <a href="[preferred]/qpid/0.8/qpid-cpp-0.8.tar.gz">qpid-cpp-0.8.tar.gz</a> [<a href="http://www.apache.org/dist/qpid/0.8/qpid-cpp-0.8.tar.gz.asc">PGP</a>] </td>
+	  <td> <a href="[preferred]/qpid/0.10/qpid-cpp-0.10.tar.gz">qpid-cpp-0.10.tar.gz</a> [<a href="http://www.apache.org/dist/qpid/0.10/qpid-cpp-0.10.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 class="download_table_col_1"> Java broker, client &amp; tools </td>
-	  <td> <a href="[preferred]/qpid/0.8/qpid-java-0.8.tar.gz">qpid-java-0.8.tar.gz</a> [<a href="http://www.apache.org/dist/qpid/0.8/qpid-java-0.8.tar.gz.asc">PGP</a>] </td>
+	  <td> <a href="[preferred]/qpid/0.10/qpid-java-0.10.tar.gz">qpid-java-0.10.tar.gz</a> [<a href="http://www.apache.org/dist/qpid/0.10/qpid-java-0.10.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 class="download_table_col_1"> All released artefacts</td>
-	  <td> <a href="[preferred]/qpid/0.8/">/qpid/0.8/</a> </td>
+	  <td> <a href="[preferred]/qpid/0.10/">/qpid/0.10/</a> </td>
 
 	  <td class="download_table_amqp_col"> Y </td>
 	  <td class="download_table_amqp_col"> Y </td>
@@ -101,7 +100,6 @@ Other mirrors: <select name="Preferred">
     </tbody></table>
   </div>
 
-
   <h3><a name="Download-SingleComponentPackage"></a>Single Component Packages</h3>
 
   <p><b>Broker</b></p>
@@ -116,7 +114,7 @@ Other mirrors: <select name="Preferred">
 	</tr>
 	<tr>
 	  <td class="download_table_col_1"> Java </td>
-	  <td> <a href="[preferred]/qpid/0.8/qpid-java-broker-0.8.tar.gz">qpid-java-broker-0.8.tar.gz</a> [<a href="http://www.apache.org/dist/qpid/0.8/qpid-java-broker-0.8.tar.gz.asc">PGP</a>] </td>
+	  <td> <a href="[preferred]/qpid/0.10/qpid-java-broker-0.10.tar.gz">qpid-java-broker-0.10.tar.gz</a> [<a href="http://www.apache.org/dist/qpid/0.10/qpid-java-broker-0.10.tar.gz.asc">PGP</a>] </td>
 
 	  <td class="download_table_amqp_col"> Y </td>
 	  <td class="download_table_amqp_col"> Y </td>
@@ -124,7 +122,6 @@ Other mirrors: <select name="Preferred">
     </tbody></table>
   </div>
 
-
   <p><b>Client</b></p>
   <div>
     <table class="download_table"><tbody>
@@ -137,49 +134,28 @@ Other mirrors: <select name="Preferred">
 	</tr>
 	<tr>
 	  <td class="download_table_col_1"> C# (.NET, WCF) WCF channel (C+&#43; Broker Compatible) </td>
-	  <td> <a href="[preferred]/qpid/0.8/qpid-wcf-0.8.zip">qpid-wcf-0.8.zip</a> [<a href="http://www.apache.org/dist/qpid/0.8/qpid-wcf-0.8.zip.asc">PGP</a>] </td>
+	  <td> <a href="[preferred]/qpid/0.10/qpid-wcf-0.10.zip">qpid-wcf-0.10.zip</a> [<a href="http://www.apache.org/dist/qpid/0.10/qpid-wcf-0.10.zip.asc">PGP</a>] </td>
 
 	  <td class="download_table_amqp_col"> Y </td>
 	  <td class="download_table_amqp_col">&nbsp;</td>
 	</tr>
 	<tr>
-	  <td class="download_table_col_1"> C# (.NET, WCF, Excel) 0-10 client (C+&#43; Broker Compatible) </td>
-	  <td> <a href="[preferred]/qpid/0.8/qpid-dotnet-0-10-0.8.zip">qpid-dotnet-0-10-0.8.zip</a> [<a href="http://www.apache.org/dist/qpid/0.8/qpid-dotnet-0-10-0.8.zip.asc">PGP</a>] </td>
-	  <td class="download_table_amqp_col"> Y </td>
-
-	  <td class="download_table_amqp_col">&nbsp;</td>
-	</tr>
-	<tr>
-	  <td class="download_table_col_1"> C# (.NET) 0-8 client (Java Broker Compatible) </td>
-	  <td> <a href="[preferred]/qpid/0.8/qpid-dotnet-0-8-0.8.zip">qpid-dotnet-0-8-0.8.zip</a> [<a href="http://www.apache.org/dist/qpid/0.8/qpid-dotnet-0-8-0.8.zip.asc">PGP</a>] </td>
-	  <td class="download_table_amqp_col">&nbsp;</td>
-	  <td class="download_table_amqp_col"> Y </td>
-	</tr>
-	<tr>
 	  <td class="download_table_col_1"> Java </td>
 
-	  <td> <a href="[preferred]/qpid/0.8/qpid-java-client-0.8.tar.gz">qpid-java-client-0.8.tar.gz</a> [<a href="http://www.apache.org/dist/qpid/0.8/qpid-java-client-0.8.tar.gz.asc">PGP</a>] </td>
+	  <td> <a href="[preferred]/qpid/0.10/qpid-java-client-0.10.tar.gz">qpid-java-client-0.10.tar.gz</a> [<a href="http://www.apache.org/dist/qpid/0.10/qpid-java-client-0.10.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 class="download_table_col_1"> Python </td>
-	  <td> <a href="[preferred]/qpid/0.8/qpid-python-0.8.tar.gz">qpid-python-0.8.tar.gz</a> [<a href="http://www.apache.org/dist/qpid/0.8/qpid-python-0.8.tar.gz.asc">PGP</a>] </td>
+	  <td> <a href="[preferred]/qpid/0.10/qpid-python-0.10.tar.gz">qpid-python-0.10.tar.gz</a> [<a href="http://www.apache.org/dist/qpid/0.10/qpid-python-0.10.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 class="download_table_col_1"> Ruby </td>
-	  <td> <a href="[preferred]/qpid/0.8/qpid-ruby-0.8.tar.gz">qpid-ruby-0.8.tar.gz</a> [<a href="http://www.apache.org/dist/qpid/0.8/qpid-ruby-0.8.tar.gz.asc">PGP</a>] </td>
-	  <td class="download_table_amqp_col"> Y </td>
-
-	  <td class="download_table_amqp_col"> Y </td>
-	</tr>
     </tbody></table>
   </div>
 
-
   <p><b>Management tools</b></p>
 
   <p>C+&#43; broker management</p>
@@ -193,9 +169,14 @@ Other mirrors: <select name="Preferred">
 	  <th class="download_table_amqp_col"> AMQP<br />0-8/0-9 </th>
 	</tr>
 	<tr>
-	  <td class="download_table_col_1"> Cmd line tools <br /> (packaged in full-release)</td>
-	  <td> <a href="[preferred]/qpid/0.8/qpid-0.8.tar.gz">qpid-0.8.tar.gz</a> [<a href="http://www.apache.org/dist/qpid/0.8/qpid-0.8.tar.gz.asc">PGP</a>] </td>
-
+	  <td class="download_table_col_1">Command-line tools</td>
+	  <td> <a href="[preferred]/qpid/0.10/qpid-tools-0.10.tar.gz">qpid-tools-0.10.tar.gz</a> [<a href="http://www.apache.org/dist/qpid/0.10/qpid-tools-0.10.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 class="download_table_col_1">QMF APIs</td>
+	  <td> <a href="[preferred]/qpid/0.10/qpid-qmf-0.10.tar.gz">qpid-qmf-0.10.tar.gz</a> [<a href="http://www.apache.org/dist/qpid/0.10/qpid-qmf-0.10.tar.gz.asc">PGP</a>] </td>
 	  <td class="download_table_amqp_col"> Y </td>
 	  <td class="download_table_amqp_col">&nbsp;</td>
 	</tr>
@@ -203,7 +184,6 @@ Other mirrors: <select name="Preferred">
 
   </div>
 
-
   <p>Java broker management</p>
   <div>
     <table class="download_table"><tbody>
@@ -214,13 +194,11 @@ Other mirrors: <select name="Preferred">
 	<tr>
 	  <td class="download_table_col_1"> JMX Management Console <br  /> </td>
 
-	  <td> <a href="[preferred]/qpid/0.8/qpid-jmx-management-console-0.8-linux-gtk-x86.tar.gz">Linux x86</a> [<a href="http://www.apache.org/dist/qpid/0.8/qpid-jmx-management-console-0.8-linux-gtk-x86.tar.gz.asc">PGP</a>] | <a href="[preferred]/qpid/0.8/qpid-jmx-management-console-0.8-linux-gtk-x86_64.tar.gz">Linux x86_64</a> [<a href="http://www.apache.org/dist/qpid/0.8/qpid-jmx-management-console-0.8-linux-gtk-x86_64.tar.gz.asc">PGP</a>] | <a href="[preferred]/qpid/0.8/qpid-jmx-management-console-0.8-macosx.zip">Mac OS X</a> [<a href="http://www.apache.org/dist/qpid/0.8/qpid-jmx-management-console-0.8-macosx.zip.asc">PGP</a>] | <a href="[preferred]/qpid/0.8/qpid-jmx-management-console-0.8-solaris-gtk-sparc.tar.gz">Solaris 10 Sparc</a> [<a href="http://www.apache.org/dist/qpid/0.8/qpid-jmx-management-console-0.8-solaris-gtk-sparc.tar.gz.asc">PGP</a>] | <a href="[preferred]/qpid/0.8/qpid-jmx-management-console-0.8-win32-win32-x86.zip">Windows x86</a> [<a href="http://www.apache.org/dist/qpid/0.8/qpid-jmx-management-console-0.8-win32-win32-x86.zip.asc">PGP</a>] </td>
+	  <td> <a href="[preferred]/qpid/0.10/qpid-jmx-management-console-0.10-linux-gtk-x86.tar.gz">Linux x86</a> [<a href="http://www.apache.org/dist/qpid/0.10/qpid-jmx-management-console-0.10-linux-gtk-x86.tar.gz.asc">PGP</a>] | <a href="[preferred]/qpid/0.10/qpid-jmx-management-console-0.10-linux-gtk-x86_64.tar.gz">Linux x86_64</a> [<a href="http://www.apache.org/dist/qpid/0.10/qpid-jmx-management-console-0.10-linux-gtk-x86_64.tar.gz.asc">PGP</a>] | <a href="[preferred]/qpid/0.10/qpid-jmx-management-console-0.10-macosx.zip">Mac OS X</a> [<a href="http://www.apache.org/dist/qpid/0.10/qpid-jmx-management-console-0.10-macosx.zip.asc">PGP</a>] | <a href="[preferred]/qpid/0.10/qpid-jmx-management-console-0.10-solaris-gtk-sparc.tar.gz">Solaris 10 Sparc</a> [<a href="http://www.apache.org/dist/qpid/0.10/qpid-jmx-management-console-0.10-solaris-gtk-sparc.tar.gz.asc">PGP</a>] | <a href="[preferred]/qpid/0.10/qpid-jmx-management-console-0.10-win32-win32-x86.zip">Windows x86</a> [<a href="http://www.apache.org/dist/qpid/0.10/qpid-jmx-management-console-0.10-win32-win32-x86.zip.asc">PGP</a>] </td>
 	</tr>
     </tbody></table>
   </div>
 
-
-
   <h2><a name="Download-PreviousRelease"></a>Previous Releases</h2>
 
   <p>Previous releases are available from <a href="http://archive.apache.org/dist/qpid/">http://archive.apache.org/dist/qpid/
@@ -276,7 +254,7 @@ Other mirrors: <select name="Preferred">
 
   <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>
+  <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>
@@ -288,17 +266,17 @@ Other mirrors: <select name="Preferred">
   <p>
   <code>
 % pgpk -a KEYS<br />
-% pgpv qpid-0.8.tar.gz.asc<br />
+% pgpv qpid-0.10.tar.gz.asc<br />
   </code>
   <em>or</em><br />
   <code>
 % pgp -ka KEYS<br />
-% pgp qpid-0.8.tar.gz.asc<br />
+% pgp qpid-0.10.tar.gz.asc<br />
   </code>
   <em>or</em><br />
   <code>
 % gpg --import KEYS<br />
-% gpg --verify qpid-0.8.tar.gz.asc
+% gpg --verify qpid-0.10.tar.gz.asc
   </code>
   </p>