Rename home.html to index.html, merge some missed updates to the published content back into the source tree

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

4 files changed, 19 insertions, 7 deletions

diff --git a/doc/website/content/documentation.html b/doc/website/content/documentation.html
index c5099120cb..f7127288d2 100644
--- a/doc/website/content/documentation.html
+++ b/doc/website/content/documentation.html
@@ -55,13 +55,13 @@
     <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></p></li>
+      <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/archives/wiki">Qpid Wiki</a></p></li>
+      <li><p><a href="https://cwiki.apache.org/qpid/">Qpid Wiki</a></p></li>
     </ul>
 
 </div>
diff --git a/doc/website/content/getting_started.html b/doc/website/content/getting_started.html
index c2de831176..4dc2df99e6 100644
--- a/doc/website/content/getting_started.html
+++ b/doc/website/content/getting_started.html
@@ -6,10 +6,10 @@
     <li>Download the software <a href="download.html" title="Download">Download</a></li>
     <li>Start a broker.
       <ul>
-	<li>Instructions for <a href="http://qpid.apache.org/archives/wiki/getting-started-guide.html" title="Getting Started Guide">running a Qpid Java broker (AMQP 0-8, 0-9) </a></li>
-	<li>Instructions for <a href="http://qpid.apache.org/archives/wiki/rasc.html" title="RASC">running a Qpid C++ broker (AMQP 0-10) </a></li>
+	<li>Instructions for <a href="https://cwiki.apache.org/qpid/getting-started-guide.html" title="Getting Started Guide">running a Qpid Java broker (AMQP 0-8, 0-9) </a></li>
+	<li>Instructions for <a href="http://qpid.apache.org/books/0.7/AMQP-Messaging-Broker-CPP-Book/html/ch01.html#section-Running-a-Qpid-CPP-Broker" title="RASC">running a Qpid C++ broker (AMQP 0-10) </a></li>
 
-	<li><a href="http://qpid.apache.org/archives/wiki/mgmtc.html" title="MgmtC++">Management tools </a>  (AMQP 0-10, works with the Qpid C++ broker)</li>
+	<li><a href="https://cwiki.apache.org/qpid/mgmtc.html" title="MgmtC++">Management tools </a>  (AMQP 0-10, works with the Qpid C++ broker)</li>
       </ul>
     </li>
     <li>Run an example program from the downloaded software, or from the following URLs (these are svn URLs, which you can use to browse the examples or check them out):
@@ -44,7 +44,7 @@
 	  <ul>
 	    <li>Examples: <a href="http://svn.apache.org/viewvc/qpid/trunk/qpid/dotnet/client-010/examples/">http://svn.apache.org/viewvc/qpid/trunk/qpid/dotnet/client-010/examples/ </a></li>
 
-	    <li><a href="http://qpid.apache.org/archives/wiki/net-user-guide.html">.NET Tutorial </a></li>
+	    <li><a href="https://cwiki.apache.org/qpid/net-user-guide.html">.NET Tutorial </a></li>
 	  </ul>
 	</li>
       </ul>
@@ -56,7 +56,7 @@
     </li>
     <li>Get your Questions Answered
       <ul>
-	<li>Read the <a href="archives/wiki/faq.html" title="FAQ">FAQ</a></li>
+	<li>Read the <a href="https://cwiki.apache.org/qpid/faq.html" title="FAQ">FAQ</a></li>
 
 	<li>Ask a question on the user list <a href="mailto:users-subscribe@qpid.apache.org">users-subscribe@qpid.apache.org</a></li>
       </ul>
diff --git a/doc/website/content/home.html b/doc/website/content/index.html
index ee8220a26a..ee8220a26a 100644
--- a/doc/website/content/home.html
+++ b/doc/website/content/index.html
diff --git a/doc/website/template/style.css b/doc/website/template/style.css
index d90d22f3f0..fdf2e28409 100644
--- a/doc/website/template/style.css
+++ b/doc/website/template/style.css
@@ -241,4 +241,16 @@ body {
     color:#000000;
 }
 
+.download_table {
+    width:100%;
+}
+
+.download_table_col_1 {
+    width:240px;
+}
+
+.download_table_amqp_col {
+    text-align:center;
+    width:80px;
+}