[Emacs-diffs] /srv/bzr/emacs/emacs-24 r107868: * etc/CONTRIBUTE: Expand a bit on copyright assignments.

[Glenn Morris]

------------------------------------------------------------
revno: 107868
committer: Glenn Morris <address@hidden>
branch nick: emacs-24
timestamp: Fri 2012-04-20 00:49:19 -0700
message:
  * etc/CONTRIBUTE: Expand a bit on copyright assignments.
modified:
  etc/CONTRIBUTE
  etc/ChangeLog

=== modified file 'etc/CONTRIBUTE'
--- a/etc/CONTRIBUTE    2012-01-19 07:21:25 +0000
+++ b/etc/CONTRIBUTE    2012-04-20 07:49:19 +0000
@@ -1,4 +1,4 @@
-Copyright (C) 2006-2012  Free Software Foundation, Inc.
+Copyright (C) 2006-2012 Free Software Foundation, Inc.
 See end for license conditions.
 
 
@@ -44,13 +44,24 @@
 
 * Copyright Assignment
 
+The FSF (Free Software Foundation) is the copyright holder for GNU Emacs.
+The FSF is a nonprofit with a worldwide mission to promote computer
+user freedom and to defend the rights of all free software users.
+For general information, see the website http://www.fsf.org/ .
+
+Generally speaking, for non-trivial contributions to GNU Emacs we
+require that the copyright be assigned to the FSF.  For the reasons
+behind this, see: http://www.gnu.org/licenses/why-assign.html .
+
+Copyright assignment is a simple process.  If you live in the US, you
+can do it entirely electronically.  We can help you get started, and
+answer any questions you may have (or point you to the people with the
+answers), at the address@hidden mailing list.
+
+A copyright disclaimer is also a possibility, but we prefer an assignment.
 We can accept small changes (roughly, fewer than 15 lines) without
-legal papers.  Anything more substantial requires a copyright
-disclaimer or assignment (the latter is preferred, especially for
-larger changes).  Both of these involved filling out a short form and
-filing it with the FSF.  The process is straightforward -- contact us
-at address@hidden to obtain the relevant forms.
-
+an assignment.  This is a cumulative limit (e.g. three separate 5 line
+patches) over all your contributions.
 
 * Getting the Source Code
 

=== modified file 'etc/ChangeLog'
--- a/etc/ChangeLog     2012-04-20 07:37:20 +0000
+++ b/etc/ChangeLog     2012-04-20 07:49:19 +0000
@@ -1,5 +1,7 @@
 2012-04-20  Glenn Morris  <address@hidden>
 
+       * CONTRIBUTE: Expand a bit on copyright assignments.
+
        * MORE.STUFF: General update.  Mention list-packages.
        Remove many old/outdated URLs.