incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jeanwe...@apache.org
Subject svn commit: r800492 - in /websites/production/ooo-site: ./ content/license.html
Date Mon, 19 Dec 2011 06:16:17 GMT
Author: jeanweber
Date: Mon Dec 19 06:16:17 2011
New Revision: 800492

Log:
Updated Support page.

Modified:
    websites/production/ooo-site/   (props changed)
    websites/production/ooo-site/content/license.html

Propchange: websites/production/ooo-site/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 19 06:16:17 2011
@@ -1 +1 @@
-/websites/staging/ooo-site/trunk:797592-800468
+/websites/staging/ooo-site/trunk:797592-800491

Modified: websites/production/ooo-site/content/license.html
==============================================================================
--- websites/production/ooo-site/content/license.html (original)
+++ websites/production/ooo-site/content/license.html Mon Dec 19 06:16:17 2011
@@ -48,19 +48,18 @@
 
 
 
-<h2>Licenses of current Releases of the OpenOffice.org Suite</h2>
+<h2>Licenses of previous Releases of the OpenOffice.org Suite</h2>
 
-<p>OpenOffice.org uses a single open-source license for the source code and a separate
documentation license for most documents published on the website
-without the intention of being included in the product. The source-code license is the GNU
Lesser General Public License. Effective OpenOffice.org 3.0
-Beta, OpenOffice.org uses the <a href="licenses/lgpl_license.html">LGPL v3</a>.
The document license is the Public Document License (PDL).</p>
-
-<p>Works beside code donated to the project under cover of the Oracle Contributor Agreement
(OCA) are held jointly by Oracle for the project under the
-project's prevailing license, in this case, the LGPL v.3. Even if you have already submitted
a copyright agreement (e.g., the SCA or its predecessors),
-you may also sign the PDL per work contributed, in which case the PDL takes precendence.
In some cases, we also permit the use of the
-<span class="Header"> Creative Commons Attribution License (<a href="http://creativecommons.org/licenses/by-nd/2.5/">&quot;Attribution-NoDerivs
2.5&quot;</a>).
+  <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
+without the intention of being included in the product. The source-code license was the GNU
Lesser General Public License. Effective OpenOffice.org 3.0
+Beta, OpenOffice.org used the <a href="licenses/lgpl_license.html">LGPL v3</a>.
The document license was the Public Document License (PDL).</p>
+
+<p>Works beside code donated to the project under cover of the Oracle Contributor Agreement
(OCA) were held jointly by Oracle for the project under the
+project's prevailing license, in this case, the LGPL v.3. Even if you had already submitted
a copyright agreement (e.g., the SCA or its predecessors),
+you could also sign the PDL per work contributed, in which case the PDL took precendence.
In some cases, the use of the
+<span class="Header"> Creative Commons Attribution License (<a href="http://creativecommons.org/licenses/by-nd/2.5/">&quot;Attribution-NoDerivs
2.5&quot;</a>) was also permitted.
 See <a href="#below">below</a> for details on the circumstances of using this
license.</span></p>
 
-<p>Copies of the licenses are available. The PDL is in a static and editable form,
so that it can be used as designed:</p>
 
 <ul>
   <li>
@@ -81,10 +80,10 @@ http://www.gnu.org/licenses/gpl-faq.html
 
 <p class="Header">Code</p>
 
-<p>In order to contribute code to the project, you must sign and submit the Oracle
Contributor Agreement (OCA). This agreement jointly assigns copyright
+<p>In order to contribute code to the project, you had to sign and submit the Oracle
Contributor Agreement (OCA). This agreement jointly assigned copyright
 over your work to yourself and to Oracle. Details are available on the &quot;
 <a href="/contributing/programming.html#sca">Contributing</a>&quot; page,
and you can find a pdf of the OCA there. If you have
-questions on how it works, the <a href="FAQs/faq-questions.html#licensing">FAQ: Licensing</a>
section should answer them. The page also has guidelines on
+questions on how it worked, the <a href="FAQs/faq-questions.html#licensing">FAQ: Licensing</a>
section should answer them. The page also has guidelines on
 the use of the licenses.
 
 <p class="Header"><a id="below" name="below"></a>Other Works</p>



Mime
View raw message