svn commit: r853237 - in /websites/staging/openoffice/trunk/content: ./ contributing-code.html

[bu...@apache.org]

Author: buildbot
Date: Wed Mar  6 08:58:06 2013
New Revision: 853237

Log:
Staging update by buildbot for openoffice

Modified:
    websites/staging/openoffice/trunk/content/   (props changed)
    websites/staging/openoffice/trunk/content/contributing-code.html

Propchange: websites/staging/openoffice/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Wed Mar  6 08:58:06 2013
@@ -1 +1 @@
-1452468
+1453220

Modified: websites/staging/openoffice/trunk/content/contributing-code.html
==============================================================================
--- websites/staging/openoffice/trunk/content/contributing-code.html (original)
+++ websites/staging/openoffice/trunk/content/contributing-code.html Wed Mar  6 08:58:06 2013
@@ -105,7 +105,12 @@ projects more valuable to users, especia
 if one of the first things we question you about is the license and the pedigree of the code. </p>
 <p>The main requirements for contributing code to Apache OpenOffice are:</p>
 <ul>
-<li>The code must be under the Apache License 2.0.  Any dependencies must also be under that license or a <a href="http://www.apache.org/legal/resolved.html#category-a">similar permissive license</a>.</li>
+<li>The code must be under the Apache License 2.0 and it must be
+contributed by or with permission of the original author(s) of the code.
+Dependencies on third party libraries should be
+discussed on the <a href="http://openoffice.apache.org/mailing-lists.html#development-mailing-list-public">dev list</a>,
+to see how these can be brought into conformance with
+<a href="http://www.apache.org/legal/resolved.html#category-a">ASF policy</a>.</li>
 <li>The code must be of sufficient quality and value  to the project that our programmer (Committers) approve it, or at least don't reject it.</li>
 <li>We're happy to accept a small patch to fix a bug here or there, without further commitment from the code author.  But the larger the contribution 
 the greater is the need for help integrating, testing and maintaining the code.  This doesn't necessarily