You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by wa...@apache.org on 2012/10/19 02:30:23 UTC

svn commit: r1399937 - in /incubator/ooo/ooo-site/trunk/templates: footer.html skeleton.html

Author: wave
Date: Fri Oct 19 00:30:22 2012
New Revision: 1399937

URL: http://svn.apache.org/viewvc?rev=1399937&view=rev
Log:
Remove the incubation disclaimer

Modified:
    incubator/ooo/ooo-site/trunk/templates/footer.html
    incubator/ooo/ooo-site/trunk/templates/skeleton.html

Modified: incubator/ooo/ooo-site/trunk/templates/footer.html
URL: http://svn.apache.org/viewvc/incubator/ooo/ooo-site/trunk/templates/footer.html?rev=1399937&r1=1399936&r2=1399937&view=diff
==============================================================================
--- incubator/ooo/ooo-site/trunk/templates/footer.html (original)
+++ incubator/ooo/ooo-site/trunk/templates/footer.html Fri Oct 19 00:30:22 2012
@@ -5,15 +5,9 @@
 	<a href="/license.html">Copyright &amp; License</a> | <a href="/privacy.html">Privacy</a> | <a href="/contact_us.html">Contact Us</a> | <a href="http://www.apache.org/foundation/contributing.html#Paypal">Donate</a>
       </p>
       <p>
-	Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
+	Apache, the Apache feather logo, and OpenOffice are trademarks of The Apache Software Foundation.
 	OpenOffice.org and the seagull logo are registered trademarks of The Apache Software Foundation.
 	Other names appearing on the site may be trademarks of their respective owners.
       </p>
-      <p>
-	Apache OpenOffice 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>
     </div>
   </div>

Modified: incubator/ooo/ooo-site/trunk/templates/skeleton.html
URL: http://svn.apache.org/viewvc/incubator/ooo/ooo-site/trunk/templates/skeleton.html?rev=1399937&r1=1399936&r2=1399937&view=diff
==============================================================================
--- incubator/ooo/ooo-site/trunk/templates/skeleton.html (original)
+++ incubator/ooo/ooo-site/trunk/templates/skeleton.html Fri Oct 19 00:30:22 2012
@@ -2,6 +2,7 @@
 <html>
 <head>
 <link href="/css/ooo.css" rel="stylesheet" type="text/css">
+{% if addtitle $}<title>{{ title }}</title>{% endif %}
 {% if head %}{{ head|safe }}{% else %}
 <title>{% block title %}{{ headers.title }}{% endblock %}</title>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">