Author: buildbot
Date: Wed Feb 13 15:10:17 2013
New Revision: 850506
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 Feb 13 15:10:17 2013
@@ -1 +1 @@
-1445639
+1445650
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 Feb 13
15:10:17 2013
@@ -100,31 +100,31 @@
<h1 class="title">Contributing Code to Apache OpenOffice</h1>
<p>If you have code that you want to contribute to the Apache OpenOffice
project, then we would <a href="mailto:[email protected]";>love to talk
to you</a> about this.</p>
-<p>Apache projects put a strong emphasis on code pedigree and reviewing and
documenting licences and notices, more so than many other open source projects.
This is done to make our
+<p>Apache projects put a strong emphasis on code pedigree and reviewing and
documenting licenses and notices, more so than many other open source projects.
This is done to make our
projects more valuable to users, especially to other developers. This is one
of the ways we add value, one of the things that makes Apache special. So
please don't be offended
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 licence 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. 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 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
require participation from the original author(s) of the code, though this is
encouraged. But we will want to see that there is support in the community
sufficient for sustaining the development of significant contributions.</li>
</ul>
-<p>Some specfic scenarios:</p>
+<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 contributons, 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
+<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="[email protected]">dev mailing list</a> so we can
discuss the most appropriate way of processing it.</li>
-<li>For larges 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>
+<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:[email protected]";>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 Licence 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
+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
-<a href="mailto:[email protected]";>send us a note</a> pointing to an
existing patch or VCS revision containing your contribution and stating that
you wish to make it contribute it to
+<a href="mailto:[email protected]";>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>
