Author: buildbot
Date: Mon Jan 21 23:10:33 2013
New Revision: 847493
Log:
Staging update by buildbot for ooo-site
Modified:
websites/staging/ooo-site/trunk/cgi-bin/ (props changed)
websites/staging/ooo-site/trunk/content/ (props changed)
websites/staging/ooo-site/trunk/content/license.html
Propchange: websites/staging/ooo-site/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Mon Jan 21 23:10:33 2013
@@ -1 +1 @@
-1436507
+1436684
Propchange: websites/staging/ooo-site/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Mon Jan 21 23:10:33 2013
@@ -1 +1 @@
-1436507
+1436684
Modified: websites/staging/ooo-site/trunk/content/license.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/license.html (original)
+++ websites/staging/ooo-site/trunk/content/license.html Mon Jan 21 23:10:33
2013
@@ -4,9 +4,7 @@
<link href="/css/ooo.css" rel="stylesheet" type="text/css">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
- <title>OpenOffice.org License</title>
-
-
+ <title>Licenses</title>
<!--#include virtual="/google-analytics.js" -->
@@ -25,21 +23,22 @@
-<h2>Privacy Policy</h2>
-
-<p>Our Privacy Policy is described <a
href="http://www.openoffice.org/privacy.html";>here</a>
-<h2>Licenses & Copyrights of www.openoffice.org at the Apache Software
Foundation</h2>
+<h2>Licenses & Copyrights for the www.openoffice.org website</h2>
-<p>Portions of OpenOffice.org are Copyright 1999, 2010 by contributing authors
and Oracle and/or its affiliates.</p>
+<p>Portions of www.openoffice.org are Copyright 1999, 2010 by contributing
authors and Oracle and/or its affiliates.</p>
<p>Sections or single pages are covered by certain licenses. If a license
notice is displayed, you may use the content of that page according to that
license.</p>
<p>In all other cases, the page is licensed under the Apache License, Version
2.0 <a href="http://www.apache.org/licenses/LICENSE-2.0.html";>(ALv2)</a>.</p>
+<h2>Apache OpenOffice software</h2>
+<p>
+ Apache OpenOffice releases are made available under the <a
href="http://www.apache.org/licenses/LICENSE-2.0.html";>Apache License 2.0</a>.
+</p>
-<h2 id="ooo3_lgpl" name="ooo3_lgpl">Licenses of Legacy Releases of the
OpenOffice.org Suite</h2>
+<h2>Licenses of Legacy Releases of OpenOffice.org software</h2>
<p>Apache Releases follow specific policies concerning licensing that are
closely tied to the branding of the product. It still may be possible, however,
to find older releases through third parties or Internet archives that lie out
of the control of the Apache Project. For this reason it is highly recommended
to review carefully the documentation included with the software.<p>
<p>For past releases under the SUN/Oracle umbrella, OpenOffice.org used a
single open-source license for the source code and a separate documentation
license for most documents published on the website
