Fixed scripts that referred to README instead of README.txt.

Changes to web site template and content.


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

5 files changed, 34 insertions, 34 deletions

diff --git a/doc/website/content/documentation.html b/doc/website/content/documentation.html
index 7c30078fe6..c5099120cb 100644
--- a/doc/website/content/documentation.html
+++ b/doc/website/content/documentation.html
@@ -1,31 +1,31 @@
 <div class="main_text_area_body">
   <h1>Qpid Documentation</h1>
 
-  <h2 id="doc06">Documentation for Qpid 0.6 (development branch)</h2>
+  <h2 id="doc06">Documentation for Qpid 0.7 (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"
+      <a href="books/0.7/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/0.7/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/0.7/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>
+      <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.6/Programming-In-Apache-Qpid/pdf/Programming-In-Apache-Qpid.pdf"
+      <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.6/Programming-In-Apache-Qpid/html/index.html"
+      <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>
     <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>
+      <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>
 
-  <h2 id="doc05">Documentation for Qpid 0.5 (stable)</h2>
+  <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
@@ -35,19 +35,19 @@
     <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"
+      <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.5/AMQP-Messaging-Broker-CPP-Book/html/index.html">HTML</a></p></li>
+      <a href="books/0.6/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.5/AMQP-Messaging-Broker-Java-Book/pdf/AMQP-Messaging-Broker-Java-Book.pdf"
+      <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.5/AMQP-Messaging-Broker-Java-Book/html/index.html">HTML</a></p></li>
-    <li><p>For programming examples and documentation for Qpid 0.5,
+      <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.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>
+      <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="doc-archives">Documentation Archives</h2>
@@ -61,7 +61,7 @@
     <h2 id="qpid-wiki">Qpid Wiki</h2>
 
     <ul>
-      <li><p><a href="qpid.apache.org">Qpid Wiki</a></p></li>
+      <li><p><a href="qpid.apache.org/archives/wiki">Qpid Wiki</a></p></li>
     </ul>
 
 </div>
diff --git a/doc/website/content/getting_started.html b/doc/website/content/getting_started.html
index fce75fb211..c2de831176 100644
--- a/doc/website/content/getting_started.html
+++ b/doc/website/content/getting_started.html
@@ -1,15 +1,15 @@
 <div class="main_text_area_body" >
   <h1>Getting Started with Apache Qpid</h1>
   <p>To get started with Apache Qpid, follow the steps below.</p>
-
+ 
   <ol>
     <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/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/rasc.html" title="RASC">running a Qpid C++ broker (AMQP 0-10) </a></li>
+	<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><a href="http://qpid.apache.org/mgmtc.html" title="MgmtC++">Management tools </a>  (AMQP 0-10, works with the Qpid C++ broker)</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>
       </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/net-user-guide.html">.NET Tutorial </a></li>
+	    <li><a href="http://qpid.apache.org/archives/wiki/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="https://cwiki.apache.org/confluence/display/qpid/FAQ" title="FAQ">FAQ</a></li>
+	<li>Read the <a href="archives/wiki/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/qpid_integrated_with.html b/doc/website/content/qpid_integrated_with.html
index aa0f71c92e..541c8cac68 100644
--- a/doc/website/content/qpid_integrated_with.html
+++ b/doc/website/content/qpid_integrated_with.html
@@ -3,7 +3,7 @@
   <h1><a name="QpidIntegrations-AMQPintegrations"></a>AMQP integrations </h1>
 
   <ul>
-    <li><a href="http://qpid.apache.org/hermesjms.html" title="HermesJMS">HermesJMS</a>       - The integration of Hermes JMS with Qpid</li>
+    <li><a href="http://qpid.apache.org/archives/wiki/hermesjms.html" title="HermesJMS">HermesJMS</a>       - The integration of Hermes JMS with Qpid</li>
     <li>Twisted AMQP      - <a href="https://launchpad.net/txamqp" class="external-link" rel="nofollow">https://launchpad.net/txamqp</a></li>
     <li>Apache Camel      - <a href="http://activemq.apache.org/camel/amqp.html" class="external-link" rel="nofollow">http://activemq.apache.org/camel/amqp.html</a></li>
     <li>Apache Axis2 Java - <a href="http://wso2.org/library/3663" class="external-link" rel="nofollow">http://wso2.org/library/3663</a></li>
diff --git a/doc/website/template/style.css b/doc/website/template/style.css
index efa4ca3220..a241836155 100644
--- a/doc/website/template/style.css
+++ b/doc/website/template/style.css
@@ -176,21 +176,21 @@ body {
     width:196px; 
     float:left;
     padding:10px 15px 10px 15px;
-#    margin-left:0px;
+    margin-left:0px;
 }
 
 .feature_box_column2 {
     width:196px; 
     float:left;
     padding:10px 15px 10px 15px;
-#    margin-left:0px;
+    margin-left:0px;
 }
 
 .feature_box_column3 {
     width:196px; 
     float:left;
     padding:10px 15px 10px 15px;
-#    margin-left:0px;
+    margin-left:0px;
 }
 
 
diff --git a/doc/website/template/template.html b/doc/website/template/template.html
index e9986075be..54fa7fb15c 100644
--- a/doc/website/template/template.html
+++ b/doc/website/template/template.html
@@ -46,7 +46,7 @@
 	    <li><a href="getting_started.html">Getting Started</a></li>
 <!--	    <li><a href="roadmap.html">Roadmap</a></li> -->
 	    <li><a href="license.html">License</a></li>
-	    <li><a href="https://cwiki.apache.org/confluence/display/qpid/FAQ">FAQ</a></li>
+	    <li><a href="archives/wiki/faq.html">FAQ</a></li>
 	  </ul>
 	</div> <!-- end of menu_box_body --> 
 	<div class="menu_box_bottom"></div>
@@ -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#doc05">Version 0.5</a></li>
 	    <li><a href="documentation.html#doc-archives">Archive</a></li>
 	  </ul>
 	</div> <!-- end of menu_box_body -->
@@ -66,10 +66,10 @@
 	<div class="menu_box_body">
 	  <h3>Community</h3>
 	  <ul>
-	    <li><a href="http://qpid.apache.org/getting-involved.html">Getting Involved</a></li>
+	    <li><a href="http://qpid.apache.org/archives/wiki/getting-involved.html">Getting Involved</a></li>
 	    <li><a href="source_repository.html">Source Repository</a></li>
 	    <li><a href="mailing_lists.html">Mailing Lists</a></li>
-	    <li><a href="http://qpid.apache.org">Wiki</a></li>
+	    <li><a href="http://qpid.apache.org/archives/wiki">Wiki</a></li>
 	    <li><a href="https://issues.apache.org/jira/browse/qpid">Issue Reporting</a></li>
 	    <li><a href="people.html">People</a></li>
 <!--	    <li><a href="#">Project Status</a></li> -->
@@ -82,8 +82,8 @@
 	<div class="menu_box_body">
 	  <h3>Developers</h3>
 	  <ul>
-	    <li><a href="http://qpid.apache.org/building.html">Building Qpid</a></li>
-	    <li><a href="http://qpid.apache.org/developer-pages.html">Developer Pages</a></li>
+	    <li><a href="http://qpid.apache.org/archives/wiki/building.html">Building Qpid</a></li>
+	    <li><a href="http://qpid.apache.org/archives/wiki/developer-pages.html">Developer Pages</a></li>
 	  </ul>
 	</div> <!-- end of menu_box_body -->
 	<div class="menu_box_bottom"></div>