incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From build...@apache.org
Subject svn commit: r799010 - in /websites/staging/openofficeorg/trunk/content/openofficeorg: ./ docs/ docs/governance/
Date Sun, 20 Nov 2011 21:58:40 GMT
Author: buildbot
Date: Sun Nov 20 21:58:39 2011
New Revision: 799010

Log:
Staging update by buildbot

Added:
    websites/staging/openofficeorg/trunk/content/openofficeorg/trademarks.html
Modified:
    websites/staging/openofficeorg/trunk/content/openofficeorg/bug-tracking.html
    websites/staging/openofficeorg/trunk/content/openofficeorg/community-faqs.html
    websites/staging/openofficeorg/trunk/content/openofficeorg/contact.html
    websites/staging/openofficeorg/trunk/content/openofficeorg/developer-faqs.html
    websites/staging/openofficeorg/trunk/content/openofficeorg/docs/download_process.html
    websites/staging/openofficeorg/trunk/content/openofficeorg/docs/edit-cms.html
    websites/staging/openofficeorg/trunk/content/openofficeorg/docs/governance/consensusBuilding.html
    websites/staging/openofficeorg/trunk/content/openofficeorg/docs/governance/lazyConsensus.html
    websites/staging/openofficeorg/trunk/content/openofficeorg/docs/governance/voting.html
    websites/staging/openofficeorg/trunk/content/openofficeorg/get-involved.html
    websites/staging/openofficeorg/trunk/content/openofficeorg/index.html
    websites/staging/openofficeorg/trunk/content/openofficeorg/license.html
    websites/staging/openofficeorg/trunk/content/openofficeorg/mailing-lists.html
    websites/staging/openofficeorg/trunk/content/openofficeorg/people.html
    websites/staging/openofficeorg/trunk/content/openofficeorg/ppmc-faqs.html
    websites/staging/openofficeorg/trunk/content/openofficeorg/release-process.html
    websites/staging/openofficeorg/trunk/content/openofficeorg/security.html
    websites/staging/openofficeorg/trunk/content/openofficeorg/source.html
    websites/staging/openofficeorg/trunk/content/openofficeorg/svn-basics.html
    websites/staging/openofficeorg/trunk/content/openofficeorg/terms.html
    websites/staging/openofficeorg/trunk/content/openofficeorg/website-local.html

Modified: websites/staging/openofficeorg/trunk/content/openofficeorg/bug-tracking.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/bug-tracking.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/bug-tracking.html Sun Nov 20
21:58:39 2011
@@ -42,6 +42,7 @@
 <li><a href="/openofficeorg/index.html">About</a></li>
 <li><a href="http://incubator.apache.org/projects/openofficeorg.html">Incubator
page</a></li>
 <li><a href="/openofficeorg/license.html">License</a></li>
+<li><a href="/openofficeorg/trademarks.html">Trademarks</a></li>
 </ul>
 <h1 id="community">Community</h1>
 <ul>

Modified: websites/staging/openofficeorg/trunk/content/openofficeorg/community-faqs.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/community-faqs.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/community-faqs.html Sun Nov
20 21:58:39 2011
@@ -42,6 +42,7 @@
 <li><a href="/openofficeorg/index.html">About</a></li>
 <li><a href="http://incubator.apache.org/projects/openofficeorg.html">Incubator
page</a></li>
 <li><a href="/openofficeorg/license.html">License</a></li>
+<li><a href="/openofficeorg/trademarks.html">Trademarks</a></li>
 </ul>
 <h1 id="community">Community</h1>
 <ul>

Modified: websites/staging/openofficeorg/trunk/content/openofficeorg/contact.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/contact.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/contact.html Sun Nov 20 21:58:39
2011
@@ -42,6 +42,7 @@
 <li><a href="/openofficeorg/index.html">About</a></li>
 <li><a href="http://incubator.apache.org/projects/openofficeorg.html">Incubator
page</a></li>
 <li><a href="/openofficeorg/license.html">License</a></li>
+<li><a href="/openofficeorg/trademarks.html">Trademarks</a></li>
 </ul>
 <h1 id="community">Community</h1>
 <ul>

Modified: websites/staging/openofficeorg/trunk/content/openofficeorg/developer-faqs.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/developer-faqs.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/developer-faqs.html Sun Nov
20 21:58:39 2011
@@ -42,6 +42,7 @@
 <li><a href="/openofficeorg/index.html">About</a></li>
 <li><a href="http://incubator.apache.org/projects/openofficeorg.html">Incubator
page</a></li>
 <li><a href="/openofficeorg/license.html">License</a></li>
+<li><a href="/openofficeorg/trademarks.html">Trademarks</a></li>
 </ul>
 <h1 id="community">Community</h1>
 <ul>

Modified: websites/staging/openofficeorg/trunk/content/openofficeorg/docs/download_process.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/docs/download_process.html
(original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/docs/download_process.html
Sun Nov 20 21:58:39 2011
@@ -42,6 +42,7 @@
 <li><a href="/openofficeorg/index.html">About</a></li>
 <li><a href="http://incubator.apache.org/projects/openofficeorg.html">Incubator
page</a></li>
 <li><a href="/openofficeorg/license.html">License</a></li>
+<li><a href="/openofficeorg/trademarks.html">Trademarks</a></li>
 </ul>
 <h1 id="community">Community</h1>
 <ul>

Modified: websites/staging/openofficeorg/trunk/content/openofficeorg/docs/edit-cms.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/docs/edit-cms.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/docs/edit-cms.html Sun Nov
20 21:58:39 2011
@@ -42,6 +42,7 @@
 <li><a href="/openofficeorg/index.html">About</a></li>
 <li><a href="http://incubator.apache.org/projects/openofficeorg.html">Incubator
page</a></li>
 <li><a href="/openofficeorg/license.html">License</a></li>
+<li><a href="/openofficeorg/trademarks.html">Trademarks</a></li>
 </ul>
 <h1 id="community">Community</h1>
 <ul>
@@ -135,7 +136,7 @@ executing this:</p>
 <h3 id="prerequisites">Prerequisites</h3>
 <h4 id="browser_bookmark">Browser bookmark</h4>
 <p>Normally you see the webpage in your browser. To update this page with an
-inline-editor and little preview you use the <a href="javascript:void(location.href=&apos;https://cms.apache.org/redirect?uri=&apos;+escape(location.href))">Apache
CMS</a> JavaScript bookmarklet.  Drag that 
+inline-editor and little preview you use the <a href="javascript:void(location.href='https://cms.apache.org/redirect?uri='+escape(location.href))">Apache
CMS</a> JavaScript bookmarklet.  Drag that 
 link to your browser's toolbar.  For more information see <a href="https://cms.apache.org/#bookmark">here</a>.</p>
 <h4 id="apache_id">Apache ID</h4>
 <p>Furthermore, you need an Apache ID to authenticate to the system.</p>

Modified: websites/staging/openofficeorg/trunk/content/openofficeorg/docs/governance/consensusBuilding.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/docs/governance/consensusBuilding.html
(original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/docs/governance/consensusBuilding.html
Sun Nov 20 21:58:39 2011
@@ -42,6 +42,7 @@
 <li><a href="/openofficeorg/index.html">About</a></li>
 <li><a href="http://incubator.apache.org/projects/openofficeorg.html">Incubator
page</a></li>
 <li><a href="/openofficeorg/license.html">License</a></li>
+<li><a href="/openofficeorg/trademarks.html">Trademarks</a></li>
 </ul>
 <h1 id="community">Community</h1>
 <ul>

Modified: websites/staging/openofficeorg/trunk/content/openofficeorg/docs/governance/lazyConsensus.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/docs/governance/lazyConsensus.html
(original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/docs/governance/lazyConsensus.html
Sun Nov 20 21:58:39 2011
@@ -42,6 +42,7 @@
 <li><a href="/openofficeorg/index.html">About</a></li>
 <li><a href="http://incubator.apache.org/projects/openofficeorg.html">Incubator
page</a></li>
 <li><a href="/openofficeorg/license.html">License</a></li>
+<li><a href="/openofficeorg/trademarks.html">Trademarks</a></li>
 </ul>
 <h1 id="community">Community</h1>
 <ul>

Modified: websites/staging/openofficeorg/trunk/content/openofficeorg/docs/governance/voting.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/docs/governance/voting.html
(original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/docs/governance/voting.html
Sun Nov 20 21:58:39 2011
@@ -42,6 +42,7 @@
 <li><a href="/openofficeorg/index.html">About</a></li>
 <li><a href="http://incubator.apache.org/projects/openofficeorg.html">Incubator
page</a></li>
 <li><a href="/openofficeorg/license.html">License</a></li>
+<li><a href="/openofficeorg/trademarks.html">Trademarks</a></li>
 </ul>
 <h1 id="community">Community</h1>
 <ul>

Modified: websites/staging/openofficeorg/trunk/content/openofficeorg/get-involved.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/get-involved.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/get-involved.html Sun Nov 20
21:58:39 2011
@@ -42,6 +42,7 @@
 <li><a href="/openofficeorg/index.html">About</a></li>
 <li><a href="http://incubator.apache.org/projects/openofficeorg.html">Incubator
page</a></li>
 <li><a href="/openofficeorg/license.html">License</a></li>
+<li><a href="/openofficeorg/trademarks.html">Trademarks</a></li>
 </ul>
 <h1 id="community">Community</h1>
 <ul>

Modified: websites/staging/openofficeorg/trunk/content/openofficeorg/index.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/index.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/index.html Sun Nov 20 21:58:39
2011
@@ -42,6 +42,7 @@
 <li><a href="/openofficeorg/index.html">About</a></li>
 <li><a href="http://incubator.apache.org/projects/openofficeorg.html">Incubator
page</a></li>
 <li><a href="/openofficeorg/license.html">License</a></li>
+<li><a href="/openofficeorg/trademarks.html">Trademarks</a></li>
 </ul>
 <h1 id="community">Community</h1>
 <ul>

Modified: websites/staging/openofficeorg/trunk/content/openofficeorg/license.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/license.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/license.html Sun Nov 20 21:58:39
2011
@@ -42,6 +42,7 @@
 <li><a href="/openofficeorg/index.html">About</a></li>
 <li><a href="http://incubator.apache.org/projects/openofficeorg.html">Incubator
page</a></li>
 <li><a href="/openofficeorg/license.html">License</a></li>
+<li><a href="/openofficeorg/trademarks.html">Trademarks</a></li>
 </ul>
 <h1 id="community">Community</h1>
 <ul>

Modified: websites/staging/openofficeorg/trunk/content/openofficeorg/mailing-lists.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/mailing-lists.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/mailing-lists.html Sun Nov
20 21:58:39 2011
@@ -42,6 +42,7 @@
 <li><a href="/openofficeorg/index.html">About</a></li>
 <li><a href="http://incubator.apache.org/projects/openofficeorg.html">Incubator
page</a></li>
 <li><a href="/openofficeorg/license.html">License</a></li>
+<li><a href="/openofficeorg/trademarks.html">Trademarks</a></li>
 </ul>
 <h1 id="community">Community</h1>
 <ul>

Modified: websites/staging/openofficeorg/trunk/content/openofficeorg/people.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/people.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/people.html Sun Nov 20 21:58:39
2011
@@ -42,6 +42,7 @@
 <li><a href="/openofficeorg/index.html">About</a></li>
 <li><a href="http://incubator.apache.org/projects/openofficeorg.html">Incubator
page</a></li>
 <li><a href="/openofficeorg/license.html">License</a></li>
+<li><a href="/openofficeorg/trademarks.html">Trademarks</a></li>
 </ul>
 <h1 id="community">Community</h1>
 <ul>

Modified: websites/staging/openofficeorg/trunk/content/openofficeorg/ppmc-faqs.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/ppmc-faqs.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/ppmc-faqs.html Sun Nov 20 21:58:39
2011
@@ -42,6 +42,7 @@
 <li><a href="/openofficeorg/index.html">About</a></li>
 <li><a href="http://incubator.apache.org/projects/openofficeorg.html">Incubator
page</a></li>
 <li><a href="/openofficeorg/license.html">License</a></li>
+<li><a href="/openofficeorg/trademarks.html">Trademarks</a></li>
 </ul>
 <h1 id="community">Community</h1>
 <ul>

Modified: websites/staging/openofficeorg/trunk/content/openofficeorg/release-process.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/release-process.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/release-process.html Sun Nov
20 21:58:39 2011
@@ -42,6 +42,7 @@
 <li><a href="/openofficeorg/index.html">About</a></li>
 <li><a href="http://incubator.apache.org/projects/openofficeorg.html">Incubator
page</a></li>
 <li><a href="/openofficeorg/license.html">License</a></li>
+<li><a href="/openofficeorg/trademarks.html">Trademarks</a></li>
 </ul>
 <h1 id="community">Community</h1>
 <ul>

Modified: websites/staging/openofficeorg/trunk/content/openofficeorg/security.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/security.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/security.html Sun Nov 20 21:58:39
2011
@@ -42,6 +42,7 @@
 <li><a href="/openofficeorg/index.html">About</a></li>
 <li><a href="http://incubator.apache.org/projects/openofficeorg.html">Incubator
page</a></li>
 <li><a href="/openofficeorg/license.html">License</a></li>
+<li><a href="/openofficeorg/trademarks.html">Trademarks</a></li>
 </ul>
 <h1 id="community">Community</h1>
 <ul>

Modified: websites/staging/openofficeorg/trunk/content/openofficeorg/source.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/source.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/source.html Sun Nov 20 21:58:39
2011
@@ -42,6 +42,7 @@
 <li><a href="/openofficeorg/index.html">About</a></li>
 <li><a href="http://incubator.apache.org/projects/openofficeorg.html">Incubator
page</a></li>
 <li><a href="/openofficeorg/license.html">License</a></li>
+<li><a href="/openofficeorg/trademarks.html">Trademarks</a></li>
 </ul>
 <h1 id="community">Community</h1>
 <ul>

Modified: websites/staging/openofficeorg/trunk/content/openofficeorg/svn-basics.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/svn-basics.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/svn-basics.html Sun Nov 20
21:58:39 2011
@@ -42,6 +42,7 @@
 <li><a href="/openofficeorg/index.html">About</a></li>
 <li><a href="http://incubator.apache.org/projects/openofficeorg.html">Incubator
page</a></li>
 <li><a href="/openofficeorg/license.html">License</a></li>
+<li><a href="/openofficeorg/trademarks.html">Trademarks</a></li>
 </ul>
 <h1 id="community">Community</h1>
 <ul>

Modified: websites/staging/openofficeorg/trunk/content/openofficeorg/terms.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/terms.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/terms.html Sun Nov 20 21:58:39
2011
@@ -42,6 +42,7 @@
 <li><a href="/openofficeorg/index.html">About</a></li>
 <li><a href="http://incubator.apache.org/projects/openofficeorg.html">Incubator
page</a></li>
 <li><a href="/openofficeorg/license.html">License</a></li>
+<li><a href="/openofficeorg/trademarks.html">Trademarks</a></li>
 </ul>
 <h1 id="community">Community</h1>
 <ul>

Added: websites/staging/openofficeorg/trunk/content/openofficeorg/trademarks.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/trademarks.html (added)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/trademarks.html Sun Nov 20
21:58:39 2011
@@ -0,0 +1,136 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<!--
+
+    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.
+-->
+
+<link href="/openofficeorg/css/ooo.css" rel="stylesheet" type="text/css">
+
+<title>Apache OpenOffice Trademarks</title>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+
+</head>
+
+<body>
+  <div id="banner">
+    <div id="bannerleft"><a alt="Apache OpenOffice.org (incubating)" href="http://incubator.apache.org/openofficeorg/">
+      <img id="logo" alt="Apache OpenOffice.org (Incubating)" src="/openofficeorg/images/ooo-logo.png"/></a></div>
+    <div id="bannerright"><a alt="Apache Incubator" href="http://incubator.apache.org">
+      <img id="asf-logo" alt="Apache Incubator" src="/openofficeorg/images/apache-incubator-logo.png"/></a></div>
+   <div id="bannercenter"><br/>(incubating)&nbsp;|&nbsp;The Free and
Open Productivity Suite</div>
+  </div>
+  <div id="clear"></div>
+  
+  <div id="sidenav">
+    <h1 id="general">General</h1>
+<ul>
+<li><a href="/openofficeorg/index.html">About</a></li>
+<li><a href="http://incubator.apache.org/projects/openofficeorg.html">Incubator
page</a></li>
+<li><a href="/openofficeorg/license.html">License</a></li>
+<li><a href="/openofficeorg/trademarks.html">Trademarks</a></li>
+</ul>
+<h1 id="community">Community</h1>
+<ul>
+<li><a href="/openofficeorg/get-involved.html">Get Involved</a></li>
+<li><a href="/openofficeorg/mailing-lists.html">Mailing Lists</a></li>
+<li><a href="http://support.openoffice.org/">Support</a></li>
+<li><a href="https://cwiki.apache.org/confluence/display/OOOUSERS/">Planning
Wiki</a></li>
+<li><a href="/openofficeorg/people.html">People</a></li>
+<li><a href="/openofficeorg/community-faqs.html">Community FAQs</a></li>
+</ul>
+<h1 id="development">Development</h1>
+<ul>
+<li><a href="/openofficeorg/source.html">Source Code</a></li>
+<li><a href="/openofficeorg/bug-tracking.html">Bug Tracking</a></li>
+<li><a href="/openofficeorg/website-local.html">Website</a></li>
+<li><a href="https://cwiki.apache.org/confluence/display/OOODEV/">Extra Wiki</a></li>
+<li><a href="/openofficeorg/security.html">Security Reports</a></li>
+<li><a href="/openofficeorg/developer-faqs.html">Developer FAQs</a></li>
+</ul>
+<h1 id="ppmc">PPMC</h1>
+<ul>
+<li><a href="/openofficeorg/ppmc-faqs.html">PPMC FAQs</a><br />
+</li>
+<li><a href="http://blogs.apache.org/OOo/">Project Blog</a></li>
+</ul>
+<h1 id="asf">ASF</h1>
+<ul>
+<li><a href="http://www.apache.org">Apache Software Foundation</a></li>
+<li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
+<li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+</ul>
+  </div>
+  <div id="contenta">
+  
+    <h1 class="title">Apache OpenOffice Trademarks</h1>
+    <p>The Apache Software Foundation hold trademarks on behalf of its
+projects.  For the Apache OpenOffice project these trademarks include
+the names Apache OpenOffice and OpenOffice.org, as well as the
+graphical logo.  Use of these marks is prohibited without explicit
+permission from ASF.</p>
+<p>However, the Apache OpenOffice project is happy to work with 3rd
+parties who desire to use these trademarks in ways that are beneficial
+to the project, which do not imply endorsement by ASF, and which are
+fully in conformance with Apache policies.</p>
+<p>To request such permission, follow these steps:</p>
+<p>1) First familiarize yourself with the Apache Trademark Policy [1].
+Many of the common cases are already addressed there.  And some uses
+of ASF marks ("nominative use") are automatically allowed.</p>
+<p>2) Email a proposal to ooo-private@incubator.apache.org.  In the
+proposal, please include:</p>
+<p>a) Name and contact information of the company, organization or person
+requesting the permission</p>
+<p>b) A list of what ASF controlled marks you wish to use</p>
+<p>c) A description of how these marks would be used.  Give supporting
+detail, along with context  If you are requesting use of the logo, for
+example, provide a prototype of how the logo would appear in the
+context of the overall design.</p>
+<p>d) Any other information you think would be useful, e.g., any impeding deadlines</p>
+<p>2) On receipt of the proposal, the Apache OpenOffice PMC will review
+and decide whether or not to recommend approval.</p>
+<p>3) If the PMC recommends approval, then they will forward their
+recommendation, along with your proposal and any follow up
+communications, to the Apache V.P. of Brand Management for final
+approval.</p>
+<p>4) We will then notify you of the outcome.</p>
+  </div>
+
+  <div id="footera">
+    <div id="poweredby">
+      <p><img src="/openofficeorg/images/feather-small.gif"/><br/>Powered
by the Apache CMS.</p>
+    </div>
+    <div id="copyrighta">
+      <p>
+	Apache "OpenOffice.org" is an effort undergoing incubation at The Apache Software Foundation
(ASF), sponsored by the Apache Incubator.
+	Incubation is required of all newly accepted projects until a further review indicates that
the infrastructure, communications, and
+	decision making process	have stabilized in a manner consistent with other successful ASF
projects. While incubation status is
+	not necessarily a reflection of the completeness or stability of the code, it does indicate
that the project has
+	yet to be fully endorsed by the ASF.</p>
+      <p>
+	Copyright &copy; 2011 The Apache Software Foundation Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
License, Version 2.0</a>.
+	<a href="/openofficeorg/contact.html">Contact Us</a> |
+	<a href="/openofficeorg/terms.html">Terms of Use</a>
+	<br />Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
+	<br />OpenOffice.org and the seagull logo are registered trademarks of The Apache
Software Foundation.
+	<br />Other names appearing on the site may be trademarks of their respective owners.
+      </p>
+    </div>
+  </div>
+
+</body>
+</html>

Modified: websites/staging/openofficeorg/trunk/content/openofficeorg/website-local.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/website-local.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/website-local.html Sun Nov
20 21:58:39 2011
@@ -42,6 +42,7 @@
 <li><a href="/openofficeorg/index.html">About</a></li>
 <li><a href="http://incubator.apache.org/projects/openofficeorg.html">Incubator
page</a></li>
 <li><a href="/openofficeorg/license.html">License</a></li>
+<li><a href="/openofficeorg/trademarks.html">Trademarks</a></li>
 </ul>
 <h1 id="community">Community</h1>
 <ul>



Mime
View raw message