Author: buildbot
Date: Sat Feb 16 23:05:20 2013
New Revision: 850809
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 Sat Feb 16 23:05:20 2013
@@ -1 +1 @@
-1446775
+1446975
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 Sat Feb 16
23:05:20 2013
@@ -115,15 +115,17 @@ sufficient for sustaining the developmen
<p>Some specific scenarios:</p>
<ul>
<li>For small bug fixes and enhancements, contributed by the original author
of the code, these are best submitted as patches attached to a <a
href="https://issues.apache.org/ooo/";>Bugzilla issue</a></li>
-<li>For larger contributions, contributed by a single original author, we
might ask you to submit an <a
href="http://www.apache.org/licenses/icla.txt";>Individual Contributor License
Agreement (ICLA)</a> form. This helps
- project the users of Apache OpenOffice. All project Committers have also
signed this form.</li>
-<li>For contributions of multi-author code, it is best to start a discussion
on our <a href="d...@openoffice.apache.org">dev mailing list</a> so we can
discuss the most appropriate way of processing it.</li>
+<li>For larger contributions, contributed by a single original author, we
might ask you to
+ submit an <a href="http://www.apache.org/licenses/icla.txt";>Individual
Contributor License Agreement (ICLA)</a> form.
+ The copyright on your code will still belong to you, but the ICLA helps
+ protect the users of Apache OpenOffice. All project Committers have also
signed this form.</li>
+<li>For contributions of multi-author code, it is best to start a discussion
on our <a href="mailto:d...@openoffice.apache.org";>dev mailing list</a> so we
can discuss the most appropriate way of processing it.</li>
<li>For large codebases developed outside of Apache, especially ones created
behind a corporate firewall, we typically require a <a
href="http://www.apache.org/licenses/cla-corporate.txt";>Software Grant
Agreement</a>
before we can accept the contribution. Again, an early discussion on our <a
href="mailto:d...@openoffice.apache.org";>dev mailing list</a> is
recommended.</li>
</ul>
<p>Note: It is perfectly fine for a programmer to contribute the same bug fix
or feature patch to multiple open source projects. As the author you have the
right to make your code available
to us under the Apache License as well as to make the same code available to
another project under LGPL. Similarly, if you have code that you've
contributed to another project under
-MPL or LPGL you can also make it available to us under the Apache License,
maximizing the number of people who will benefit from your work. For small
patches it would be sufficient to
+MPL or LGPL you can also make it available to us under the Apache License,
maximizing the number of people who will benefit from your work. For small
patches it would be sufficient to
<a href="mailto:d...@openoffice.apache.org";>send us a note</a> pointing to an
existing patch or VCS revision containing your contribution and stating that
you wish to contribute it to
us under the Apache License as well.</p>
</div>
