assignment: Apply further wording updates from Pam/Denver.

www/conservancy/apps/assignment/forms.py

@@ -37,7 +37,6 @@ class AssignmentForm(forms.ModelForm):
     agreement_terms = forms.CharField(
         widget=forms.Textarea(attrs={'readonly': 'readonly'}),
         initial=TERMS,
-        help_text='Please be aware that some employment agreements explicitly transfer copyright ownership to the employer. We recommend you review your recent employment agreements for such clauses.',
     )
 
     def __init__(self, *args, **kwargs):

www/conservancy/apps/assignment/models.py

@@ -31,12 +31,12 @@ class Assignment(models.Model):
     email = models.EmailField('Email address (to contact you if we have questions)')
     country_of_residence = CountryField()
     repositories = models.TextField(
-        'Code repositories containing contributions of yours whose copyright you\'d like to assign',
+        'Code repositories containing contributions of yours whose copyright you are assigning',
         help_text='List of URLs, one per line',
         validators=[validate_mutiple_urls],
     )
     all_emails = models.TextField(
-        'All email addresses used by you to contribute to the above (i.e. in the commit logs)',
+        'All email addresses or other unique user identities, such as nicknames or handles, used by you to contribute to the above (i.e. in the commit logs)',
     )
     period_begins = models.DateField(
         'Assignment period begins',
@@ -55,5 +55,5 @@ class Assignment(models.Model):
         null=True,
     )
     attestation_of_copyright = models.BooleanField(
-        'I agree to be bound by the terms of the Copyright Assignment Agreement above, and that I own the copyright in the works defined above',
+        'By checking the box below, I am confirming that I agree to be bound by the terms of the Copyright Assignment Agreement above.',
     )

www/conservancy/apps/assignment/terms.py

@@ -3,119 +3,53 @@ import textwrap
 TERMS = textwrap.dedent("""\
     Copyright Assignment Agreement
 
-    By checking the box below and submitting this form, you (``Assignor'')
+    By checking the box below and submitting this form, you (``Assignor'') enter
-    enter into this Agreement between Assignor and
+    into this Agreement between Assignor and the Software Freedom Conservancy,
-    the Software Freedom Conservancy, Inc., a New York nonprofit corporation
+    Inc., a New York nonprofit corporation located in Brooklyn, New York, which
-    located in Brooklyn, New York, which has received recognition of exemption
+    has received recognition of exemption from federal income tax under Section
-    from federal income tax under Section 501(c)(3) of the Internal Revenue
+    501(c)(3) of the Internal Revenue Code and classification as a public
-    Code and classification as a public charity (the ``Conservancy'').
+    charity (the ``Conservancy'').
 
     For good and valuable consideration, receipt of which is hereby
-    acknowledged, Assignor hereby transfers to the Conservancy its entire
+    acknowledged, Assignor hereby transfers to the Conservancy their entire
-    right, title, and interest (including all rights under copyright) in the
+    right, title, and interest in the copyright in the works identified by the
-    work identified by the repositories, email addresses, names, and time
+    repositories, email addresses, names, and time periods listed above (the
-    periods listed above, including original code,
+    “Works”). To the extent that the Assignor is assigning future rights, and
-    accompanying documentation and supporting files, changes and enhancements
+    the rights in future works do not vest in Conservancy upon the Works’
-    to the code and accompanying files, subject to the conditions
+    creation, Assignor agrees to assign, immediately following the creation, all
-    below.  The original code, files, changes and enhancements, and
+    rights to Conservancy and irrevocably appoint Conservancy as their
-    modifications are herein called the ``Work''.
+    attorney-in-fact to take any necessary steps to perfect Conservancy’s rights
+    under this Agreement.
 
-    For the purposes of this contract, a work ``based on the Work'' means any
+    The Conservancy will use its discretion for any relicensing of the Works
-    work that in whole or in part incorporates or is derived from all or part
+    under other free and open source software licenses. Decisions about
-    of the Work.  The Conservancy promises that the Work and any work ``based
+    relicensing made by Conservancy will apply to its assignees and successors.
-    on the Work'' distributed by the Conservancy or its assignees will be
+    If you have any questions about Conservancy's relicensing philosophy, and
-    distributed under one or more of the following licenses:
+    what limitations it may have because it is a public charity, please contact
+    us at copyright-assignment@sfconservancy.org .
 
-    * the license as set forth in Exhibit A (the ``MIT License''),
+    The Conservancy hereby grants Assignor a royalty-free non-exclusive license
-
+    to use the interests assigned hereunder for any purpose. The Conservancy's
-    * the GNU General Public License v2 or any later version (``GPL''),
+    rights shall otherwise continue unchanged.
-      as published by the Free Software Foundation, Inc.,
-
-    * the ``CC-By'' license as published by the Creative Commons, Inc.,
-
-    * the Creative Commons Attribution-ShareAlike 3.0 United States license
-      (``CC-By-SA''),
-
-    * any other license determined to be a free software license by the
-      Free Software Foundation (``FSF'') and approved as an open source
-      license by the Open Source Initiative (``OSI''),
-
-    * any other license determined to be a free culture compatible
-      license by the Creative Commons Corporation (``Creative
-      Commons'') and freedomdefined.org (``Freedom Defined'').
-
-    In the event that either FSF or OSI ceases to maintain a list of approved
-    licenses for a period of one year and, for a period of six months, fails
-    to respond to a written request from the Conservancy regarding evaluation
-    of a new license which is not currently listed on either approved lists
-    (is ``Dormant''), the work may be distributed under that new license,
-    provided that new license is approved as a free software or open source
-    license by one of FSF or OSI, and the Conservancy also independently
-    determines the new license will allow the software to be freely copied,
-    modified, and redistributed by all its users (is a ``Free License''). In
-    the event that both FSF and OSI are Dormant, the Work may be distributed
-    under a license the Conservancy independently determines is a Free
-    Software License.
-
-    In the event that either Creative Commons or Freedom Defined is Dormant,
-    the Work may be distributed under that new license, provided that new
-    license is approved as a free culture compatible license by one of the
-    Creative Commons or Freedom Defined, and the Conservancy also
-    independently determines the new license is a Free License.  In the event
-    that both Creative Commons and Freedom Defined are Dormant, the Work may
-    be distributed under a license the Conservancy independently determines is
-    a Free Culture License.
-
-    The Conservancy promises that any program ``based on the Work'' offered to
-    the public by the Conservancy or its assignees shall be offered in a
-    machine-readable source format, in addition to any other forms of the
-    Conservancy's choosing.  However, the Conservancy is free to choose at its
-    convenience the media of distribution for the machine-readable source
-    format.
-
-    The Conservancy hereby grants Assignor a royalty-free non-exclusive
-    license to use or sub-license the interests assigned hereunder for any
-    purpose.  The Conservancy's rights shall otherwise continue unchanged.
 
     Assignor hereby grants to the Conservancy and to recipients of software
     distributed by the Conservancy a perpetual, worldwide, non-exclusive,
     no-charge, royalty-free, irrevocable patent license to make, have made,
-    use, offer to sell, sell, import, and otherwise transfer the Work, where
+    use, offer to sell, sell, import, and otherwise transfer the Works, where
     such license applies only to those patent claims licensable by Assignor
-    that are necessarily infringed by the Work alone or by combination of
+    that are necessarily infringed by the Works alone or by combination of
-    Assignor's contributions with the Work to which such contributions were
+    Assignor's contributions with the Works to which such contributions were
     submitted.
 
-    Assignor hereby represents and warrants that it is the sole copyright
+    Assignor hereby represents and warrants that the email addresses and user
-    holder for the Work assigned hereunder and that it has the right and power
+    identities identified above are unique to the Assignor, that no one but the
-    to enter into this contract. Assignor hereby indemnifies and holds
+    Assignor has made contributions using the email addresses and user
-    harmless the Conservancy, its officers, employees, and agents against any
+    identities identified above, that the Assignor is the sole copyright holder
-    and all claims, actions or damages (including reasonable attorney's fees)
+    for the Works assigned hereunder, and that the Assignor has the right and
-    asserted by or paid to any party on account of a breach or alleged breach
+    power to enter into this contract. Assignor hereby indemnifies and holds
-    of the foregoing warranty.  Assignor makes no other express or implied
+    harmless the Conservancy, its officers, employees, agents, successors, and
-    warranty (including without limitation, in this disclaimer of warranty,
+    assigns against any and all claims, actions or damages (including reasonable
-    any warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+    attorney's fees) asserted by or paid to any party on account of a breach or
-    PURPOSE).
+    alleged breach of the foregoing warranty. Assignor makes no other express or
-
+    implied warranty (including without limitation any warranty of
-
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE).""")
-    Exhibit A
-    The MIT License
-
-    Permission is hereby granted, free of charge, to any person obtaining a
-    copy of this software and associated documentation files (the
-    ``Software''), to deal in the Software without restriction, including
-    without limitation the rights to use, copy, modify, merge, publish,
-    distribute, sublicense, and/or sell copies of the Software, and to permit
-    persons to whom the Software is furnished to do so, subject to the
-    following conditions:
-
-    The above copyright notice and this permission notice shall be included in
-    all copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-    THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-    DEALINGS IN THE SOFTWARE.""")

www/conservancy/templates/assignment/assignment_form.html

@@ -6,15 +6,17 @@
   <div class="mw7 mb5">
     <p>Thank you for considering assigning your copyright to the Software Freedom Conservancy. Your assignment helps us enforce free and open source software licenses.</p>
 
-    <p>By filling in and submitting the below form, you agree to assign your copyrights in the specified projects to Software Freedom Conservancy, which means that Conservancy can enforce the licenses that your code is under in court, without you needing to be involved.  Conservancy agrees to keep your code under a free and open source license.</p>
+    <p>By filling in and submitting the below form, you agree to assign your copyrights in the specified projects to Software Freedom Conservancy, which means that Conservancy can enforce the licenses for your code in court, minimizing the need for you to be involved.  Conservancy agrees to keep your code under a free and open source license.</p>
 
-    <p>If you have any questions about assigning your copyright to Conservancy, please don't hesitate to email us at <a href="mailto:info@sfconservancy.org">info@sfconservancy.org</a>.</p>
+    <p>If you have any questions about assigning your copyright to Conservancy, please don't hesitate to email us at <a href="mailto:copyright-assignment@sfconservancy.org">copyright-assignment@sfconservancy.org</a>.</p>
 
     <form id="assignment-form" action="." method="post" class="mw7">
       {% csrf_token %}
       {{ form.as_p }}
 
-      <p><em>After submitting this agreement, if you would like to make any changes, you must let us know within 7 days by emailing <a href="mailto:info@sfconservancy.org">info@sfconservancy.org</a>, which is also where you can reach us if you have any questions.</em></p>
+      <p><em>Please be aware that your employer or a contractor may own the rights in your work by virtue of their employment of you or by explicit transfer of ownership in an agreement. We recommend you review any relevant agreements or consult with a lawyer if you are not sure.</em></p>
+
+      <p><em>After submitting this agreement, if you would like to make any changes, you must let us know within 7 days by emailing <a href="mailto:copyright-assignment@sfconservancy.org">copyright-assignment@sfconservancy.org</a>, which is also where you can reach us if you have any questions.</em></p>
       <p><button type="submit" class="ph3 pv2">Submit</button></p>
     </form>
   </div>

www/conservancy/templates/assignment/thanks.html

@@ -7,7 +7,7 @@
   <div class="mw7 mb5">
     <p>Thank you for assigning your copyright to Software Freedom Conservancy! We have recorded the below information regarding the assignment and the works.</p>
     <p>We will be sending out verification emails to the email addresses you used to contribute, as specified below, in the coming weeks.  Please follow the instructions there to complete the verification at that time.</p>
-    <p>If you would like to make any changes, you must let us know within 7 days by emailing <a href="mailto:info@sfconservancy.org">info@sfconservancy.org</a>, which is also where you can reach us if you have any questions.</p>
+    <p>If you would like to make any changes, you must let us know within 7 days by emailing <a href="mailto:copyright-assignment@sfconservancy.org">copyright-assignment@sfconservancy.org</a>, which is also where you can reach us if you have any questions.</p>
     <form>
       {{ form.as_p }}
     </form>