[Python-checkins] devguide: Don't ask contributors to add themselves to Misc/ACKS, it is the core

[antoine.pitrou]

http://hg.python.org/devguide/rev/51cbc121628e
changeset:   621:51cbc121628e
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Sat Jun 01 21:21:31 2013 +0200
summary:
  Don't ask contributors to add themselves to Misc/ACKS, it is the core developer's job.
(as discussed on core-mentorship, with Nick's and Terry's approval)

files:
  patch.rst |  38 +++++++++++++++++++++++++++-----------
  1 files changed, 27 insertions(+), 11 deletions(-)


diff --git a/patch.rst b/patch.rst
--- a/patch.rst
+++ b/patch.rst
@@ -74,17 +74,6 @@
 Fifth, proper :ref:`documentation <documenting>`
 additions/changes should be included.
 
-Sixth, if you are not already in the ``Misc/ACKS`` file then add your name. If
-you have taken the time to diagnose a problem, invent a solution, code it up,
-and submit a patch you deserve to be recognized as having contributed to
-Python. This also means you need to fill out a `contributor form`_ which
-allows the `Python Software Foundation`_ to license your code for use with
-Python (you retain the copyright).
-
-
-.. _contributor form: http://www.python.org/psf/contrib/
-.. _Python Software Foundation: http://www.python.org/psf/
-
 
 .. _patch-generation:
 
@@ -113,6 +102,24 @@
 **single, condensed** patch rather than a series of several changesets.
 
 
+Licensing
+---------
+
+For non-trivial changes, we must have your formal approval for distributing
+your work under the `PSF license`_.  Therefore, you need to fill out a
+`contributor form`_ which allows the `Python Software Foundation`_ to
+license your code for use with Python (you retain the copyright).
+
+.. note::
+   You only have to sign this document once, it will then apply to all
+   your further contributions to Python.
+
+
+.. _PSF license: http://docs.python.org/3.4/license.html#terms-and-conditions-for-accessing-or-otherwise-using-python
+.. _contributor form: http://www.python.org/psf/contrib/
+.. _Python Software Foundation: http://www.python.org/psf/
+
+
 Submitting
 ----------
 
@@ -166,3 +173,12 @@
 with the next major release of Python. It may also be backported to older
 versions of Python as a bugfix if the core developer doing the commit believes
 it is warranted.
+
+
+Crediting
+---------
+
+Non-trivial contributions are credited in the ``Misc/ACKS`` file (and, most
+often, in a contribution's ``Misc/NEWS`` entry as well).  This is something
+the core developer will do when committing your patch, you don't have to
+propose the addition by yourself.

-- 
Repository URL: http://hg.python.org/devguide