Wove in the documentation pages.

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

5 files changed, 100 insertions, 35 deletions

diff --git a/doc/website/content/documentation.html b/doc/website/content/documentation.html
new file mode 100644
index 0000000000..c258be0956
--- /dev/null
+++ b/doc/website/content/documentation.html
@@ -0,0 +1,67 @@
+<div id="main_text_area_body"  xmlns="http://www.w3.org/1999/xhtml" >
+  <h1>Qpid Documentation</h1>
+
+  <h2 id="doc06">Documentation for Qpid 0.6 (development branch)</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"
+	 name="AMQP Messaging Broker (C++ implemementation)">PDF</a> | 
+      <a href="books/0.6/AMQP-Messaging-Broker-CPP-Book/html/index.html">HTML</a></li></p>
+    <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"
+	 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>Programming in Apache Qpid: Cross-Platform AMQP Messaging in Java JMS, .NET, C++, and Python</p>
+      <p>
+      <a href="books/0.6/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.6/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>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>
+
+  <h2 id="doc05">Documentation for Qpid 0.5 (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>
+
+  <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.5/AMQP-Messaging-Broker-CPP-Book/pdf/AMQP-Messaging-Broker-CPP-Book.pdf"
+	 name="AMQP Messaging Broker (C++ implemementation)">PDF</a> | 
+      <a href="books/0.5/AMQP-Messaging-Broker-CPP-Book/html/index.html">HTML</a></li></p>
+    <li><p>AMQP Messaging Broker (Java implemementation)</p>
+      <p><a href="books/0.5/AMQP-Messaging-Broker-Java-Book/pdf/AMQP-Messaging-Broker-Java-Book.pdf"
+	 name="AMQP Messaging Broker (Java implemementation)">PDF</a> |
+      <a href="books/0.5/AMQP-Messaging-Broker-Java-Book/html/index.html">HTML</a></p></li>
+    <li><p>For programming examples and documentation for Qpid 0.5,
+    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.5/cpp/html/index.html">HTML</a> | <a href="apis/0.5/cpp/qpid-cpp-doxygen-0.5.html.tar.gz">qpid-cpp-doxygen-0.5.html.tar.gz</a></p>
+      <p>Python: <a href="apis/0.5/python/html/index.html">HTML</a> | <a href="apis/0.5/python/qpid-python-epydoc-0.5.html.tar.gz">qpid-python-epydoc-0.5.html.tar.gz</a></p></li>
+    </ul>
+
+    <h2 id="doc-archives">Documentation Archives</h2>
+
+    <ul>
+      <li><p>Qpid Wiki converted to PDF format on 26 May 2010</p>
+      <a href="archives/qpid-2010-05-26.html.zip">HTML</a> |
+      <a href="archives/qpid-2010-05-26.pdf">PDF</a> </li>
+    </ul>
+
+    <h2 id="qpid-wiki">Qpid Wiki</h2>
+
+    <ul>
+      <li><p><a href="qpid.apache.org">Qpid Wiki</p></li>
+    </ul>
+
+</div>
diff --git a/doc/website/content/getting_started.html b/doc/website/content/getting_started.html
index 9509cb6533..9a313af3c4 100644
--- a/doc/website/content/getting_started.html
+++ b/doc/website/content/getting_started.html
@@ -51,11 +51,7 @@
     </li>
     <li>Read the API Guides and Documentation
       <ul>
-	<li><a href="http://qpid.apache.org/docs/api/cpp/html/index.html">C++ Client API (AMQP 0-10) </a></li>
-
-	<li><a href="http://cwiki.apache.org/confluence/display/qpid/How+to+Use+JNDI">JNDI Configuration for Java JMS </a></li>
-	<li><a href="http://qpid.apache.org/docs/api/python/html/index.html">Python Client API  (AMQP 0-10) </a></li>
-	<li><a href="documentation.html" title="Documentation">Documentation</a></li>
+	<li><p><a href="documentation.html">API Guides and Documentation</a></li>
       </ul>
     </li>
     <li>Get your Questions Answered
diff --git a/doc/website/content/home.html b/doc/website/content/home.html
index f0def2c310..8a22720492 100644
--- a/doc/website/content/home.html
+++ b/doc/website/content/home.html
@@ -27,15 +27,9 @@
     <div id="feature_box_column1">
       <h3>AMQP Brokers</h3>
       <ul>
-	<li><a href="#">Java Broker</a>
-	  <ul>
-	    <li><a href="#">Feature Guide</a></li> 
-	  </ul>
+	<li><p>Java Implementation</p>
 	</li>
-	<li><a href="#">C++ Broker (Linux/Windows)</a>
-	  <ul>
-	    <li><a href="#">Feature Guide</a></li>
-	  </ul>
+	<li><p>C++ Implementation</p>
 	</li>
       </ul>
       <br/>
@@ -45,22 +39,22 @@
     <div id="feature_box_column2">
       <h3>AMQP Client APIs</h3>
       <ul>
-	<li><a href="#">Java (JMS 1.1 compliant)</a></li>
-	<li><a href="#">C++ (Linux/Windows)</a></li>
-	<li><a href="#">C# .NET</a></li>
-	<li><a href="#">WCF Adapter (Windows Only)</a></li>
-	<li><a href="#">Python</a></li>
-	<li><a href="#">Ruby</a></li>
+	<li>Java (JMS 1.1 compliant)</li>
+	<li>C++ (Linux/Windows)</li>
+	<li>C# .NET</li>
+	<li>WCF Adapter (Windows Only)</li>
+	<li>Python</li>
+	<li>Ruby</li>
       </ul>
     </div> <!-- end of feature_box_column -->
 
     <div id="feature_box_column3">
       <h3>Qpid Management</h3>
       <ul>
-	<li><a href="#">QMF Python API</a></li>
-	<li><a href="#">QMF C++ API</a> </li>
-	<li><a href="#">Python tools</a></li>
-	<li><a href="#">QMan (QMF&lt;=>JMX)</a></li>
+	<li>QMF Python API</li>
+	<li>QMF C++ API </li>
+	<li>Python tools</li>
+	<li>QMan (QMF&lt;=>JMX)</li>
       </ul>
     </div> <!-- end of feature_box_column -->
 
diff --git a/doc/website/content/license.html b/doc/website/content/license.html
new file mode 100644
index 0000000000..e59d55ab95
--- /dev/null
+++ b/doc/website/content/license.html
@@ -0,0 +1,10 @@
+<div id="main_text_area_body"  xmlns="http://www.w3.org/1999/xhtml">
+  <h1>Licensing</h1>
+
+  <p>Qpid is licensed under the Apache License, Version 2.0h:</p>
+
+  <p><a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a></p>
+
+  <p>Please look at the notice files provided with the downloads to see the list of embedded components.</p>
+
+</div>
diff --git a/doc/website/content/people.html b/doc/website/content/people.html
index 9cb7e53cb7..8bded7038c 100644
--- a/doc/website/content/people.html
+++ b/doc/website/content/people.html
@@ -16,7 +16,6 @@
   <p>If you would like to contribute to Qpid please look at the Get
   Involved page to see how you can contribute.</p>
 
-  <div>
   <ul>
     <li>Aidan Skinner</li>
     <li>Alan Conway</li>
@@ -47,7 +46,6 @@
     <li>Ted Ross</li>
     <li>Yoav Shapira</li>
   </ul>
-  </div>
 
   <h2>Contributors</h2>
 
@@ -61,16 +59,16 @@
     <li>Steve Vinoski</li>
     <li>Steven Shaw</li>
     <li>Tomas Restrepo</li>
-</li>
+  </ul>
 
-<h2>Mentors</h2>
+  <h2>Mentors</h2>
 
-<p>And many thanks to our project's mentors:</p>
+  <p>And many thanks to our project's mentors:</p>
 
-<ul>
-  <li>Cliff Schmidt</li>
-  <li>Craig Russell</li>
-  <li>Paul Fremantle</li>
-  <li>Yoav Shapira</li>
- <li>Scott Deboy</li>
-</ul>
+  <ul>
+    <li>Cliff Schmidt</li>
+    <li>Craig Russell</li>
+    <li>Paul Fremantle</li>
+    <li>Yoav Shapira</li>
+    <li>Scott Deboy</li>
+  </ul>