Update documentation page and menu links to reference 0.8 and trunk, instead of 0.6 and 0.7

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

2 files changed, 31 insertions, 32 deletions

diff --git a/doc/website/content/documentation.html b/doc/website/content/documentation.html
index 6540d99e68..03b99797a0 100644
--- a/doc/website/content/documentation.html
+++ b/doc/website/content/documentation.html
@@ -21,54 +21,53 @@
 <div class="main_text_area_body">
   <h1>Qpid Documentation</h1>
 
-  <h2 id="doc06">Documentation for Qpid 0.7 (development branch)</h2>
+  <h2 id="doc-release">Documentation for Qpid 0.8 release</h2>
+
+  <p>This documentation was converted from the Wiki and organized into
+  book form. <a href="#doc-archives">The archives</a> contain the
+  original content of the Wiki.</p>
 
   <ul>
     <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.7/AMQP-Messaging-Broker-CPP-Book/pdf/AMQP-Messaging-Broker-CPP-Book.pdf"
+      <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.7/AMQP-Messaging-Broker-CPP-Book/html/index.html">HTML</a></p></li>
+      <a href="books/0.8/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.7/AMQP-Messaging-Broker-Java-Book/pdf/AMQP-Messaging-Broker-Java-Book.pdf"
+      <p><a href="books/0.8/AMQP-Messaging-Broker-Java-Book/pdf/AMQP-Messaging-Broker-Java-Book.pdf"
 	 name="AMQP Messaging Broker (Java implemementation)">PDF</a> |
-      <a href="books/0.7/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.7/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.7/Programming-In-Apache-Qpid/html/index.html"
-	 name="Cross-Platform AMQP Messaging in Java JMS, .NET, C++, and Python">HTML</a></p></li>
+      <a href="books/0.8/AMQP-Messaging-Broker-Java-Book/html/index.html">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.7/cpp/html/index.html">HTML</a> | <a href="apis/0.7/cpp/qpid-cpp-doxygen-0.7.html.tar.gz">qpid-cpp-doxygen-0.7.html.tar.gz</a></p>
-      <p>Python: <a href="apis/0.7/python/html/index.html">HTML</a> | <a href="apis/0.7/python/qpid-python-epydoc-0.7.html.tar.gz">qpid-python-epydoc-0.7.html.tar.gz</a></p></li>
-  </ul>
+      <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>
+    </ul>
 
-  <h2 id="doc05">Documentation for Qpid 0.6 (stable)</h2>
-
-  <p>This documentation was converted from the Wiki and organized into
-  book form. <a href="#doc-archives">The archives</a> contain the
-  original content of the Wiki.</p>
 
+  <h2 id="doc-trunk">Documentation for Qpid development trunk</h2>
   <ul>
     <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.6/AMQP-Messaging-Broker-CPP-Book/pdf/AMQP-Messaging-Broker-CPP-Book.pdf"
+      <a href="books/trunk/AMQP-Messaging-Broker-CPP-Book/pdf/AMQP-Messaging-Broker-CPP-Book.pdf"
 	 name="AMQP Messaging Broker (C++ implemementation)">PDF</a> | 
-      <a href="books/0.6/AMQP-Messaging-Broker-CPP-Book/html/index.html">HTML</a></p></li>
+      <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/0.6/AMQP-Messaging-Broker-Java-Book/pdf/AMQP-Messaging-Broker-Java-Book.pdf"
+      <p><a href="books/trunk/AMQP-Messaging-Broker-Java-Book/pdf/AMQP-Messaging-Broker-Java-Book.pdf"
 	 name="AMQP Messaging Broker (Java implemementation)">PDF</a> |
-      <a href="books/0.6/AMQP-Messaging-Broker-Java-Book/html/index.html">HTML</a></p></li>
-    <li><p>For programming examples and documentation for Qpid 0.6,
-    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.6/cpp/html/index.html">HTML</a> | <a href="apis/0.6/cpp/qpid-cpp-doxygen-0.6.html.tar.gz">qpid-cpp-doxygen-0.6.html.tar.gz</a></p>
-      <p>Python: <a href="apis/0.6/python/html/index.html">HTML</a> | <a href="apis/0.6/python/qpid-python-epydoc-0.6.html.tar.gz">qpid-python-epydoc-0.6.html.tar.gz</a></p></li>
-    </ul>
+      <a href="books/trunk/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/trunk/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/trunk/Programming-In-Apache-Qpid/html/index.html"
+	 name="Cross-Platform AMQP Messaging in Java JMS, .NET, C++, and Python">HTML</a></p></li>
+  </ul>
+
+
 
     <h2 id="doc-archives">Documentation Archives</h2>
 
diff --git a/doc/website/template/template.html b/doc/website/template/template.html
index 3ae98bcd7a..333508ecfb 100644
--- a/doc/website/template/template.html
+++ b/doc/website/template/template.html
@@ -55,8 +55,8 @@
 	<div class="menu_box_body">
 	  <h3>Documentation</h3>
 	  <ul>
-	    <li><a href="documentation.html#doc07">Version 0.7</a></li>
-	    <li><a href="documentation.html#doc06">Version 0.6</a></li>
+	    <li><a href="documentation.html#doc-release">0.8 Release</a></li>
+	    <li><a href="documentation.html#doc-trunk">Trunk</a></li>
 	    <li><a href="documentation.html#doc-archives">Archive</a></li>
 	  </ul>
 	</div> <!-- end of menu_box_body -->