updates to make the website conform with the Apache Project Branding Requirements

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

6 files changed, 25 insertions, 46 deletions

diff --git a/qpid/doc/website/content/.htaccess b/qpid/doc/website/content/.htaccess
index 3269f4838d..d26b5013e4 100644
--- a/qpid/doc/website/content/.htaccess
+++ b/qpid/doc/website/content/.htaccess
@@ -17,4 +17,4 @@
 # under the License.
 #
 Redirect /download.html http://qpid.apache.org/download.cgi
-
+Redirect /licence.html http://www.apache.org/licences/
diff --git a/qpid/doc/website/content/index.html b/qpid/doc/website/content/index.html
index 674e74470a..16e96ebc7a 100644
--- a/qpid/doc/website/content/index.html
+++ b/qpid/doc/website/content/index.html
@@ -20,6 +20,12 @@
 -->
 <div class="main_text_area_body">
   <h1>Introduction</h1>
+
+  <p>Apache Qpid&#8482; is a cross-platform Enterprise
+    Messaging system which implements the Advanced Message Queuing Protocol
+    (AMQP), providing message brokers written in C++ and
+    Java, along with clients for C++, Java JMS, .Net, Python, and Ruby.</p>
+
   <p>Enterprise Messaging systems let programs communicate by
     exchanging messages, much as people communicate by
     exchanging email. Unlike email, enterprise messaging systems
@@ -28,8 +34,7 @@
     Enterprise Messaging systems, so programmers either wrote
     their own, or used expensive proprietary systems.</p>
 
-  <p>AMQP <a href="http://www.amqp.org/">Advanced Message
-      Queuing Protocol</a> is the first open standard for
+  <p><a href="http://www.amqp.org/">AMQP</a> is the first open standard for
     Enterprise Messaging. It is designed to support messaging
     for just about any distributed or business
     application. Routing can be configured flexibly, easily
@@ -43,6 +48,8 @@
     extremely fast. Apache Qpid <a href="compatibility.html"
     title="AMQP compatibility">aims to be 100% AMQP Compliant</a>.</p>
 
+  <p>This is a project of the <a href="http://www.apache.org/">Apache Software Foundation.</a></p>
+
   <div class="feature_box">
     <div class="feature_box_column1">
       <h3>AMQP Brokers</h3>
@@ -74,7 +81,7 @@
 	<li>QMF Python API</li>
 	<li>QMF C++ API </li>
 	<li>Python tools</li>
-	<li>QMan (QMF&lt;=>JMX)</li>
+	<li>JMX</li>
       </ul>
     </div> <!-- end of feature_box_column -->
 
diff --git a/qpid/doc/website/content/license.html b/qpid/doc/website/content/license.html
deleted file mode 100644
index c79ff3229e..0000000000
--- a/qpid/doc/website/content/license.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!--
- -
- - Licensed to the Apache Software Foundation (ASF) under one
- - or more contributor license agreements.  See the NOTICE file
- - distributed with this work for additional information
- - regarding copyright ownership.  The ASF licenses this file
- - to you under the Apache License, Version 2.0 (the
- - "License"); you may not use this file except in compliance
- - with the License.  You may obtain a copy of the License at
- -
- -   http://www.apache.org/licenses/LICENSE-2.0
- -
- - Unless required by applicable law or agreed to in writing,
- - software distributed under the License is distributed on an
- - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- - KIND, either express or implied.  See the License for the
- - specific language governing permissions and limitations
- - under the License.
- -
--->
-<div class="main_text_area_body">
-  <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/qpid/doc/website/template/images/header.png b/qpid/doc/website/template/images/header.png
index 9cd149fb29..66e35d7e37 100644
--- a/qpid/doc/website/template/images/header.png
+++ b/qpid/doc/website/template/images/header.png
diff --git a/qpid/doc/website/template/images/qpid-logo.png b/qpid/doc/website/template/images/qpid-logo.png
index f6d4bfdbad..95d49ea469 100644
--- a/qpid/doc/website/template/images/qpid-logo.png
+++ b/qpid/doc/website/template/images/qpid-logo.png
diff --git a/qpid/doc/website/template/template.html b/qpid/doc/website/template/template.html
index 333508ecfb..2738085e00 100644
--- a/qpid/doc/website/template/template.html
+++ b/qpid/doc/website/template/template.html
@@ -23,17 +23,17 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title>Apache Qpid: Open Source AMQP Messaging</title>
+    <title>Apache Qpid&#8482;: Open Source AMQP Messaging</title>
     <link href="style.css" rel="stylesheet" type="text/css"/>
   </head>
 
   <body>
     <div class="container">
       <div class="header">
-	<div class="logo">
-	  <h1>Apache Qpid</h1>
-	  <h2>Open Source AMQP Messaging</h2>
-	</div>
+        <div class="logo">
+          <h1>Apache Qpid&#8482;</h1>
+          <h2>Open Source AMQP Messaging</h2>
+        </div>
       </div>  <!-- end of header --> 
 
       <div class="menu_box">
@@ -44,8 +44,7 @@
 	    <li><a href="index.html">Home</a></li>
 	    <li><a href="download.cgi">Download</a></li>
 	    <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="http://www.apache.org/licenses/">License</a></li>
 	    <li><a href="https://cwiki.apache.org/qpid/faq.html">FAQ</a></li>
 	  </ul>
 	</div> <!-- end of menu_box_body --> 
@@ -72,7 +71,6 @@
 	    <li><a href="https://cwiki.apache.org/qpid/">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> -->
 	    <li><a href="acknowledgements.html">Acknowledgements</a></li>
 	  </ul>
 	</div> <!-- end of menu_box_body -->
@@ -99,12 +97,12 @@
 
 	<div class="menu_box_top"></div>
 	<div class="menu_box_body">
-	  <h3>About The ASF</h3>
+	  <h3>About Apache</h3>
 	  <ul>
-	    <li><a href="http://www.apache.org">ASF</a></li>
-	    <li><a href="http://www.apache.org/foundation/how-it-works.html">How it works</a></li>
+	    <li><a href="http://www.apache.org">Home</a></li>
 	    <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
 	    <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
+	    <li><a href="http://www.apache.org/security/">Security</a></li>
 	  </ul>
 	</div> <!-- end of menu_box_body -->
 	<div class="menu_box_bottom"></div>
@@ -116,7 +114,11 @@
       </div>
 
       <div class="footer">
-	Apache Qpid, Enterprise AMQP Messaging &#xA9; 2004-2010 The Apache Software Foundation.
+        <p>
+          &#xA9; 2004-2010 The Apache Software Foundation.<br />
+          Apache Qpid, Qpid, Apache, the Apache feather logo, and the Apache Qpid project logo are trademarks of The Apache Software Foundation.<br />
+          All other marks mentioned may be trademarks or registered trademarks of their respective owners.
+        </p>
       </div>
 
     </div>