Author: robbie
Date: Sat Dec 11 16:16:44 2010
New Revision: 1044676

URL: http://svn.apache.org/viewvc?rev=1044676&view=rev
Log:
publish website changes to conform with the Apache Project Branding Requirements

Removed:
    qpid/site/docs/license.html
Modified:
    qpid/site/docs/.htaccess
    qpid/site/docs/acknowledgements.html
    qpid/site/docs/amqp.html
    qpid/site/docs/compatibility.html
    qpid/site/docs/documentation.html
    qpid/site/docs/download.html
    qpid/site/docs/getting_involved.html
    qpid/site/docs/getting_started.html
    qpid/site/docs/images/header.png
    qpid/site/docs/images/qpid-logo.png
    qpid/site/docs/index.html
    qpid/site/docs/mailing_lists.html
    qpid/site/docs/people.html
    qpid/site/docs/qpid_integrated_with.html
    qpid/site/docs/qpid_project_etiquette_guide.html
    qpid/site/docs/release_notes_0.8.html
    qpid/site/docs/source_repository.html

Modified: qpid/site/docs/.htaccess
URL: 
http://svn.apache.org/viewvc/qpid/site/docs/.htaccess?rev=1044676&r1=1044675&r2=1044676&view=diff
==============================================================================
--- qpid/site/docs/.htaccess (original)
+++ qpid/site/docs/.htaccess Sat Dec 11 16:16:44 2010
@@ -1,2 +1,20 @@
+#
+# 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.
+#
 Redirect /download.html http://qpid.apache.org/download.cgi
-
+Redirect /licence.html http://www.apache.org/licences/

Modified: qpid/site/docs/acknowledgements.html
URL: 
http://svn.apache.org/viewvc/qpid/site/docs/acknowledgements.html?rev=1044676&r1=1044675&r2=1044676&view=diff
==============================================================================
--- qpid/site/docs/acknowledgements.html (original)
+++ qpid/site/docs/acknowledgements.html Sat Dec 11 16:16:44 2010
@@ -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>
@@ -154,7 +152,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>

Modified: qpid/site/docs/amqp.html
URL: 
http://svn.apache.org/viewvc/qpid/site/docs/amqp.html?rev=1044676&r1=1044675&r2=1044676&view=diff
==============================================================================
--- qpid/site/docs/amqp.html (original)
+++ qpid/site/docs/amqp.html Sat Dec 11 16:16:44 2010
@@ -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>
@@ -186,7 +184,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>

Modified: qpid/site/docs/compatibility.html
URL: 
http://svn.apache.org/viewvc/qpid/site/docs/compatibility.html?rev=1044676&r1=1044675&r2=1044676&view=diff
==============================================================================
--- qpid/site/docs/compatibility.html (original)
+++ qpid/site/docs/compatibility.html Sat Dec 11 16:16:44 2010
@@ -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>
@@ -501,7 +499,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>

Modified: qpid/site/docs/documentation.html
URL: 
http://svn.apache.org/viewvc/qpid/site/docs/documentation.html?rev=1044676&r1=1044675&r2=1044676&view=diff
==============================================================================
--- qpid/site/docs/documentation.html (original)
+++ qpid/site/docs/documentation.html Sat Dec 11 16:16:44 2010
@@ -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>
@@ -207,7 +205,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>

Modified: qpid/site/docs/download.html
URL: 
http://svn.apache.org/viewvc/qpid/site/docs/download.html?rev=1044676&r1=1044675&r2=1044676&view=diff
==============================================================================
--- qpid/site/docs/download.html (original)
+++ qpid/site/docs/download.html Sat Dec 11 16:16:44 2010
@@ -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>
@@ -581,7 +579,11 @@ Other mirrors: <select name="Preferred">
       </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>

Modified: qpid/site/docs/getting_involved.html
URL: 
http://svn.apache.org/viewvc/qpid/site/docs/getting_involved.html?rev=1044676&r1=1044675&r2=1044676&view=diff
==============================================================================
--- qpid/site/docs/getting_involved.html (original)
+++ qpid/site/docs/getting_involved.html Sat Dec 11 16:16:44 2010
@@ -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>
@@ -184,7 +182,11 @@ The Qpid Team.</p>
       </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>

Modified: qpid/site/docs/getting_started.html
URL: 
http://svn.apache.org/viewvc/qpid/site/docs/getting_started.html?rev=1044676&r1=1044675&r2=1044676&view=diff
==============================================================================
--- qpid/site/docs/getting_started.html (original)
+++ qpid/site/docs/getting_started.html Sat Dec 11 16:16:44 2010
@@ -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>
@@ -200,7 +198,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>

Modified: qpid/site/docs/images/header.png
URL: 
http://svn.apache.org/viewvc/qpid/site/docs/images/header.png?rev=1044676&r1=1044675&r2=1044676&view=diff
==============================================================================
Files qpid/site/docs/images/header.png (original) and 
qpid/site/docs/images/header.png Sat Dec 11 16:16:44 2010 differ

Modified: qpid/site/docs/images/qpid-logo.png
URL: 
http://svn.apache.org/viewvc/qpid/site/docs/images/qpid-logo.png?rev=1044676&r1=1044675&r2=1044676&view=diff
==============================================================================
Files qpid/site/docs/images/qpid-logo.png (original) and 
qpid/site/docs/images/qpid-logo.png Sat Dec 11 16:16:44 2010 differ

Modified: qpid/site/docs/index.html
URL: 
http://svn.apache.org/viewvc/qpid/site/docs/index.html?rev=1044676&r1=1044675&r2=1044676&view=diff
==============================================================================
--- qpid/site/docs/index.html (original)
+++ qpid/site/docs/index.html Sat Dec 11 16:16:44 2010
@@ -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>
@@ -134,6 +132,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
@@ -142,8 +146,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
@@ -157,6 +160,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>
@@ -188,7 +193,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 -->
 
@@ -199,7 +204,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>

Modified: qpid/site/docs/mailing_lists.html
URL: 
http://svn.apache.org/viewvc/qpid/site/docs/mailing_lists.html?rev=1044676&r1=1044675&r2=1044676&view=diff
==============================================================================
--- qpid/site/docs/mailing_lists.html (original)
+++ qpid/site/docs/mailing_lists.html Sat Dec 11 16:16:44 2010
@@ -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>
@@ -197,7 +195,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>

Modified: qpid/site/docs/people.html
URL: 
http://svn.apache.org/viewvc/qpid/site/docs/people.html?rev=1044676&r1=1044675&r2=1044676&view=diff
==============================================================================
--- qpid/site/docs/people.html (original)
+++ qpid/site/docs/people.html Sat Dec 11 16:16:44 2010
@@ -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>
@@ -213,7 +211,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>

Modified: qpid/site/docs/qpid_integrated_with.html
URL: 
http://svn.apache.org/viewvc/qpid/site/docs/qpid_integrated_with.html?rev=1044676&r1=1044675&r2=1044676&view=diff
==============================================================================
--- qpid/site/docs/qpid_integrated_with.html (original)
+++ qpid/site/docs/qpid_integrated_with.html Sat Dec 11 16:16:44 2010
@@ -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>
@@ -155,7 +153,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>

Modified: qpid/site/docs/qpid_project_etiquette_guide.html
URL: 
http://svn.apache.org/viewvc/qpid/site/docs/qpid_project_etiquette_guide.html?rev=1044676&r1=1044675&r2=1044676&view=diff
==============================================================================
--- qpid/site/docs/qpid_project_etiquette_guide.html (original)
+++ qpid/site/docs/qpid_project_etiquette_guide.html Sat Dec 11 16:16:44 2010
@@ -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>
@@ -219,7 +217,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>

Modified: qpid/site/docs/release_notes_0.8.html
URL: 
http://svn.apache.org/viewvc/qpid/site/docs/release_notes_0.8.html?rev=1044676&r1=1044675&r2=1044676&view=diff
==============================================================================
--- qpid/site/docs/release_notes_0.8.html (original)
+++ qpid/site/docs/release_notes_0.8.html Sat Dec 11 16:16:44 2010
@@ -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>
@@ -552,7 +550,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>

Modified: qpid/site/docs/source_repository.html
URL: 
http://svn.apache.org/viewvc/qpid/site/docs/source_repository.html?rev=1044676&r1=1044675&r2=1044676&view=diff
==============================================================================
--- qpid/site/docs/source_repository.html (original)
+++ qpid/site/docs/source_repository.html Sat Dec 11 16:16:44 2010
@@ -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>
@@ -189,7 +187,11 @@ http://svn.apache.org/repos/asf/qpid/tru
       </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>



---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project:      http://qpid.apache.org
Use/Interact: mailto:[email protected]

Reply via email to