From 8f4930426b266bad37a3a069e7655b79c8d8e846 Mon Sep 17 00:00:00 2001
From: Robert Gemmell <robbie@apache.org>
Date: Fri, 29 Apr 2011 11:12:40 +0000
Subject: QPID-3230: merge the changes made to live site in r1097611 back to
 the source file

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1097771 13f79535-47bb-0310-9956-ffa450edef68
---
 doc/website/content/documentation.html | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/doc/website/content/documentation.html b/doc/website/content/documentation.html
index 0a49a7c50b..304c9ea26f 100644
--- a/doc/website/content/documentation.html
+++ b/doc/website/content/documentation.html
@@ -21,7 +21,7 @@
 <div class="main_text_area_body">
   <h1>Qpid Documentation</h1>
 
-  <h2 id="doc-release">Documentation for Qpid 0.8 release</h2>
+  <h2 id="doc-release">Documentation for Qpid 0.10 release</h2>
 
   <p>This documentation was converted from the Wiki and organized into
   book form. <a href="#doc-archives">The archives</a> contain the
@@ -31,25 +31,25 @@
     <li><a href="getting_started.html">Getting Started</a></li>
     <li><p>AMQP Messaging Broker (C++ implementation for Linux, Windows, Solaris)</p>
       <p>
-      <a href="books/0.8/AMQP-Messaging-Broker-CPP-Book/pdf/AMQP-Messaging-Broker-CPP-Book.pdf"
-	 name="AMQP Messaging Broker (C++ implemementation)">PDF</a> | 
-      <a href="books/0.8/AMQP-Messaging-Broker-CPP-Book/html/index.html">HTML</a></p></li>
+      <a href="books/0.10/AMQP-Messaging-Broker-CPP-Book/pdf/AMQP-Messaging-Broker-CPP-Book.pdf"
+	 name="AMQP Messaging Broker (C++ implemementation)">PDF</a> |
+      <a href="books/0.10/AMQP-Messaging-Broker-CPP-Book/html/index.html">HTML</a></p></li>
     <li><p>AMQP Messaging Broker (Java implemementation)</p>
-      <p><a href="books/0.8/AMQP-Messaging-Broker-Java-Book/pdf/AMQP-Messaging-Broker-Java-Book.pdf"
+      <p><a href="books/0.10/AMQP-Messaging-Broker-Java-Book/pdf/AMQP-Messaging-Broker-Java-Book.pdf"
 	 name="AMQP Messaging Broker (Java implemementation)">PDF</a> |
-      <a href="books/0.8/AMQP-Messaging-Broker-Java-Book/html/index.html">HTML</a></p></li>
+      <a href="books/0.10/AMQP-Messaging-Broker-Java-Book/html/index.html">HTML</a></p></li>
     <li><p>Programming in Apache Qpid: Cross-Platform AMQP Messaging in Java JMS, .NET, C++, and Python</p>
       <p>
-      <a href="books/0.8/Programming-In-Apache-Qpid/pdf/Programming-In-Apache-Qpid.pdf"
+      <a href="books/0.10/Programming-In-Apache-Qpid/pdf/Programming-In-Apache-Qpid.pdf"
 	 name="Cross-Platform AMQP Messaging in Java JMS, .NET, C++, and Python">PDF</a> |
-      <a href="books/0.8/Programming-In-Apache-Qpid/html/index.html"
+      <a href="books/0.10/Programming-In-Apache-Qpid/html/index.html"
 	 name="Cross-Platform AMQP Messaging in Java JMS, .NET, C++, and Python">HTML</a></p></li>
     <li><p>For programming examples and documentation for Qpid,
     see the <a href="getting_started.html">Getting Started</a>
     page.</p></li>
     <li><p>API Reference Documentation</p>
-      <p>C++:    <a href="apis/0.8/cpp/html/index.html">HTML</a> | <a href="apis/0.8/cpp/qpid-cpp-doxygen-0.8.html.tar.gz">qpid-cpp-doxygen-0.8.html.tar.gz</a></p>
-      <p>Python: <a href="apis/0.8/python/html/index.html">HTML</a> | <a href="apis/0.8/python/qpid-python-epydoc-0.8.html.tar.gz">qpid-python-epydoc-0.8.html.tar.gz</a></p></li>
+      <p>C++:    <a href="apis/0.10/cpp/html/index.html">HTML</a> | <a href="apis/0.10/cpp/qpid-cpp-doxygen-0.10.html.tar.gz">qpid-cpp-doxygen-0.10.html.tar.gz</a></p>
+      <p>Python: <a href="apis/0.10/python/html/index.html">HTML</a> | <a href="apis/0.10/python/qpid-python-epydoc-0.10.html.tar.gz">qpid-python-epydoc-0.10.html.tar.gz</a></p></li>
     </ul>
 
 
@@ -59,7 +59,7 @@
     <li><p>AMQP Messaging Broker (C++ implementation for Linux, Windows, Solaris)</p>
       <p>
       <a href="books/trunk/AMQP-Messaging-Broker-CPP-Book/pdf/AMQP-Messaging-Broker-CPP-Book.pdf"
-	 name="AMQP Messaging Broker (C++ implemementation)">PDF</a> | 
+	 name="AMQP Messaging Broker (C++ implemementation)">PDF</a> |
       <a href="books/trunk/AMQP-Messaging-Broker-CPP-Book/html/index.html">HTML</a></p></li>
     <li><p>AMQP Messaging Broker (Java implemementation)</p>
       <p><a href="books/trunk/AMQP-Messaging-Broker-Java-Book/pdf/AMQP-Messaging-Broker-Java-Book.pdf"
-- 
cgit v1.2.1