incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From build...@apache.org
Subject svn commit: r800605 - /websites/staging/ooo-site/trunk/content/license.html
Date Tue, 20 Dec 2011 04:30:35 GMT
Author: buildbot
Date: Tue Dec 20 04:30:35 2011
New Revision: 800605

Log:
Staging update by buildbot

Modified:
    websites/staging/ooo-site/trunk/content/license.html

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 Tue Dec 20 04:30:35 2011
@@ -48,15 +48,16 @@
 
 
 
-<h2>Licenses of previous Releases of the OpenOffice.org Suite</h2>
+<h2>Licenses of Legacy Releases of the OpenOffice.org Suite</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 recomended 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
 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>
+Beta, OpenOffice.org used the <a href="http://www.gnu.org/licenses/lgpl.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
+you could also sign the PDL per work contributed, in which case the PDL took precedence.
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>
 
@@ -69,7 +70,7 @@ See <a href="#below">below</a> for detai
     <a href="/licenses/PDL.rtf">RTF (text)</a>
   </li>
   <li>
-    <a href="/licenses/lgpl_license.html">
+    <a href="http://www.gnu.org/licenses/lgpl.html">
     GNU Lesser General Public License v3</a> (LGPL) (Effective with OpenOffice.org
3.0 Beta)
   </li>
 </ul>
@@ -78,24 +79,16 @@ See <a href="#below">below</a> for detai
 more information on the LGPL, please also visit the Free Software Foundation's FAQ: <a
href="http://www.gnu.org/licenses/gpl-faq.html" target="_blank">
 http://www.gnu.org/licenses/gpl-faq.html</a>.</p>
 
-<p class="Header">Code</p>
-
-<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 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>
 
-<p>Our preference is always for contributions of editable work. But in those cases
where editable material is difficult to obtain, there are several
-options; all presume you hold copyright in the work:</p>
+<p>The preference was always for contributions of editable work. But in those cases
where editable material was difficult to obtain, there were several
+options; all presumed that the developer held copyright in the work:</p>
 <ul>
-  <li>You can sign the OCA, which covers all work (and not just code) contributed to
OpenOffice.org by you;</li>
-  <li>If your country's laws allow it, you can make it public domain by declaring as
much in a signed document (check if it is possible, first!); or</li>
-  <li><span class="Header">You can use the Creative Commons Attribution License
(<a href="http://creativecommons.org/licenses/by-nd/2.5/">
-  &quot;Attribution-NoDerivs 2.5&quot;</a>). We only accept work under this
license that is non-editable and for which there is no editable version that
-  can be contributed to the project.</span></li>
+  <li>Developers would have signed a Contributor Agreement, which covers all work (and
not just code) contributed to OpenOffice.org by you;</li>
+  <li>In countries where laws allow it, the developer could make it public domain by
declaring as much in a signed document; or</li>
+  <li><span class="Header">developers could use the Creative Commons Attribution
License (<a href="http://creativecommons.org/licenses/by-nd/2.5/">
+    &quot;Attribution-NoDerivs 2.5&quot;</a>). SUN/Oracle only accepted work
under this license that was non-editable and for which there was no editable version that
+  could be contributed to the project.</span></li>
 </ul>
 
 



Mime
View raw message