aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2012-04-20 00:49:19 -0700
committerGlenn Morris2012-04-20 00:49:19 -0700
commit50e5ebca7edcf5299b89ff74499991de01e22046 (patch)
tree3bba7c2f03780c032383f0bdbeabbbf096fd97c4
parentc04627ac2b93ea0795b2c206029d7eab9227b407 (diff)
downloademacs-50e5ebca7edcf5299b89ff74499991de01e22046.tar.gz
emacs-50e5ebca7edcf5299b89ff74499991de01e22046.zip
* etc/CONTRIBUTE: Expand a bit on copyright assignments.
-rw-r--r--etc/CONTRIBUTE25
-rw-r--r--etc/ChangeLog2
2 files changed, 20 insertions, 7 deletions
diff --git a/etc/CONTRIBUTE b/etc/CONTRIBUTE
index 06b9a9e45a5..aff350f9642 100644
--- a/etc/CONTRIBUTE
+++ b/etc/CONTRIBUTE
@@ -1,4 +1,4 @@
1Copyright (C) 2006-2012 Free Software Foundation, Inc. 1Copyright (C) 2006-2012 Free Software Foundation, Inc.
2See end for license conditions. 2See end for license conditions.
3 3
4 4
@@ -44,13 +44,24 @@ Ref: The "Tips" Appendix in the Emacs Lisp Reference.
44 44
45* Copyright Assignment 45* Copyright Assignment
46 46
47We can accept small changes (roughly, fewer than 15 lines) without 47The FSF (Free Software Foundation) is the copyright holder for GNU Emacs.
48legal papers. Anything more substantial requires a copyright 48The FSF is a nonprofit with a worldwide mission to promote computer
49disclaimer or assignment (the latter is preferred, especially for 49user freedom and to defend the rights of all free software users.
50larger changes). Both of these involved filling out a short form and 50For general information, see the website http://www.fsf.org/ .
51filing it with the FSF. The process is straightforward -- contact us 51
52at emacs-devel@gnu.org to obtain the relevant forms. 52Generally speaking, for non-trivial contributions to GNU Emacs we
53require that the copyright be assigned to the FSF. For the reasons
54behind this, see: http://www.gnu.org/licenses/why-assign.html .
53 55
56Copyright assignment is a simple process. If you live in the US, you
57can do it entirely electronically. We can help you get started, and
58answer any questions you may have (or point you to the people with the
59answers), at the emacs-devel@gnu.org mailing list.
60
61A copyright disclaimer is also a possibility, but we prefer an assignment.
62We can accept small changes (roughly, fewer than 15 lines) without
63an assignment. This is a cumulative limit (e.g. three separate 5 line
64patches) over all your contributions.
54 65
55* Getting the Source Code 66* Getting the Source Code
56 67
diff --git a/etc/ChangeLog b/etc/ChangeLog
index f3bb51500dd..d69d066f292 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,5 +1,7 @@
12012-04-20 Glenn Morris <rgm@gnu.org> 12012-04-20 Glenn Morris <rgm@gnu.org>
2 2
3 * CONTRIBUTE: Expand a bit on copyright assignments.
4
3 * MORE.STUFF: General update. Mention list-packages. 5 * MORE.STUFF: General update. Mention list-packages.
4 Remove many old/outdated URLs. 6 Remove many old/outdated URLs.
5 7