Update the license details to reflect current practice, to avoid confusion

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1239253 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Nick Burch 2012-02-01 18:31:35 +00:00
parent bcb898e977
commit 3ab1ff0304
1 changed files with 9 additions and 7 deletions

View File

@ -50,8 +50,9 @@
</p>
<ol>
<li>
All classes and interfaces MUST have, right at the beginning, the POI
License (see poi/doc/LICENSE).
All classes and interfaces MUST have, right at the
beginning of the file, the Apache Software License
2.0 License Header. (see /legal/LICENSE).
</li>
<li>
All classes and interfaces MUST include class javadoc. Conventionally,
@ -75,11 +76,12 @@
<section><title>Amendments (informal by extension and not by vote)</title>
<section><title>License</title>
<p>
As opposed to the formerly used POI License which was
based on the Apache Public License, now that POI is part of
Jakarta, use the APL 1.1 for the header. Currently, the
Apache Software Foundation requires us to use the full
long version.
As opposed to the formerly used POI License (which was
based on the Apache Public License), now that POI is
part of Apache, use the standard Apache Software
License 2.0 header. As per standard Apache Software
Foundation policy, the full (long) version of the
header should be used.
</p>
</section>
<section><title>2 cents</title>