You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cr...@apache.org on 2004/07/23 05:13:15 UTC

cvs commit: cocoon-site/src/documentation/content/xdocs/community contrib.xml

crossley    2004/07/22 20:13:15

  Modified:    src/documentation/content/xdocs/community contrib.xml
  Log:
  Try to clarify the licensing requirements.
  Still need to attend to the discussion of the CLA and the old contrib directory.
  
  Revision  Changes    Path
  1.4       +10 -5     cocoon-site/src/documentation/content/xdocs/community/contrib.xml
  
  Index: contrib.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-site/src/documentation/content/xdocs/community/contrib.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- contrib.xml	22 Jun 2004 02:09:34 -0000	1.3
  +++ contrib.xml	23 Jul 2004 03:13:15 -0000	1.4
  @@ -19,7 +19,8 @@
      volunteer project under the auspices of the
      <link href="http://www.apache.org/">Apache Software Foundation (ASF)</link>,
      and, in harmony with the Apache webserver itself, it is released under
  -   a very open license.
  +   a very open 
  +   <link href="http://www.apache.org/licenses/">license</link>.
      This means there are many ways to contribute to the project - either
      with direct participation (coding, documenting, answering questions,
      proposing ideas, reporting bugs, suggesting bug-fixes, etc..) or by resource
  @@ -167,11 +168,15 @@
     <p>To avoid legal problems, the Apache Project Management Committee (PMC) have agreed on
      a policy for under what licensing code can be accepted into Apache projects:</p>
     <ul>
  -   <li>Source code files must be under the Apache license and must have copyright assigned to
  +   <li>Source code files (which include every file, code and documentation)
  +   must be under the
  +   <link href="http://www.apache.org/licenses/">Apache license</link>.
  +    and must have copyright assigned to
       the Apache Software Foundation.</li>
  -   <li>Jar files need only be released under a license that permits free redistribution
  -    and does not cover new files added to the jar/library (so the GPL and LGPL are not allowed,
  -    but MPL and Apache licenses are, for example).</li>
  +   <li>Jar files need to be released under a license that permits free
  +    redistribution (i.e. not any more restrictive than the Apache License).
  +    So for example, the GPL and LGPL are not allowed,
  +    but MPL and Apache licenses are allowed.</li>
     </ul>
     <p><strong>By submitting a patch, you signify your understanding and acceptance of these
      conditions</strong> - like most open source projects,