incubator-general mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Jim Jagielski <...@apache.org>
Subject Re: cvs commit: incubator-site/src/documentation/resources/forms ASF_Contributor_License_1_form.pdf ASF_Contributor_License_2.pdf ASF_Contributor_License_2.txt
Date Thu, 31 Oct 2002 00:05:45 GMT
At 5:48 PM -0500 10/30/02, Rodent of Unusual Size wrote:
>Greg Stein wrote:
>>
>> Do you really want to keep the *old* form around?
>
>par' me, but i asked our secretary wtf was the difference and
>got no answer.  a quick vgrep didn't reveal anything.

Must have missed that. There are some textual and legal changes between
1 and 2, and 2 has been what we've been using for quite some time.
It's what I send to people, and it's what's on the Jakarta site
as well.

<jimsys:foundation/Licenses/contributions> % diff -u ASF_Contributor_License_1.txt ASF_Contributor_License_2.txt
--- ASF_Contributor_License_1.txt       Fri Mar 24 03:28:24 2000
+++ ASF_Contributor_License_2.txt       Fri Mar 24 03:32:13 2000
@@ -29,17 +29,22 @@
   _______________________________________  Country:   ___________________
 
 
-You hereby accept the following terms and conditions:
+You and the Foundation hereby accept and agree to the following terms
+and conditions:
 
 1. Your "Contributions" means all of your past, present and future
    contributions of object code, source code and documentation to the
-   Foundation, however submitted to the Foundation.
+   Foundation, however submitted to the Foundation, excluding any
+   submissions that are conspicuously marked or otherwise designated in
+   writing by You as "Not a Contribution."
 
 2. You hereby grant to the Foundation a non-exclusive, irrevocable,
    worldwide, no-charge, transferable copyright license to use,
    execute, prepare derivative works of, and distribute (internally
    and externally, in object code and, if included in your
-   Contributions, source code form) your Contributions.
+   Contributions, source code form) your Contributions.  Except for the
+   rights granted to the Foundation in this paragraph, You reserve all
+   right, title and interest in and to your Contributions.
 
 3. You represent that you are legally entitled to grant the above
    license.  If your employer(s) have rights to intellectual property
@@ -55,16 +60,16 @@
    limited to, related patents and trademarks) associated with any part
    of your Contribution(s) (including a copy of any applicable license
    agreement).  You agree to notify the Foundation of any facts or
-   circumstances of which you become aware and which would make Your
+   circumstances of which you become aware that would make Your
    representations in this Agreement inaccurate in any respect.
 
 5. You are not expected to provide support for your Contributions,
    except to the extent you desire to provide support.  You may provide
    support for free, for a fee, or not at all.  Your Contributions are
-   provided AS-IS, without warranty of any kind (either express or
-   implied) including, without limitation, any implied warranty of
-   merchantability and fitness for a particular purpose and any
-   warranty of non-infringement.
+   provided as-is, with all faults defects and errors, and without
+   warranty of any kind (either express or implied) including, without
+   limitation, any implied warranty of merchantability and fitness for
+   a particular purpose and any warranty of non-infringement.
 
 

-- 
===========================================================================
   Jim Jagielski   [|]   jim@jaguNET.com   [|]   http://www.jaguNET.com/
      "A society that will trade a little liberty for a little order
             will lose both and deserve neither" - T.Jefferson

Mime
View raw message