From edbdf22725cc1bf0d7886d1121cb0e14f3f943cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antoine=20Beaupr=C3=A9?= <anarcat@debian.org>
Date: Thu, 27 Oct 2016 14:27:25 -0400
Subject: [PATCH] move code of conducts contacts to a special section

---
 CONTRIBUTING.rst       | 15 ++++++++++++++-
 monkeysign/__init__.py |  4 ++--
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 4f697fc..d33bfde 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -69,7 +69,7 @@ Enforcement
 -----------
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting a :doc:`project maintainer <credits>` individually. All
+reported by contacting one of the persons :ref:`listed below <conduct_contacts>` individually. All
 complaints will be reviewed and investigated and will result in a response that
 is deemed necessary and appropriate to the circumstances. Project maintainers are
 obligated to maintain confidentiality with regard to the reporter of an incident.
@@ -85,6 +85,19 @@ reports.
 
 .. _enforcement: https://www.djangoproject.com/conduct/enforcement-manual/
 
+.. _conduct_contacts:
+
+Contacts
+--------
+
+The following people have volunteered to be available to respond to
+Code of Conduct reports. They have reviewed existing literature and
+agree to follow the aforementioned process in good faith. They also
+accept OpenPGP-encrypted email:
+
+* Antoine Beaupré <anarcat@debian.org>
+* Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+
 Attribution
 -----------
 
diff --git a/monkeysign/__init__.py b/monkeysign/__init__.py
index 6c8102c..7fba7dd 100644
--- a/monkeysign/__init__.py
+++ b/monkeysign/__init__.py
@@ -56,8 +56,8 @@ __documentation__ = 'http://monkeysign.readthedocs.io/en/' + __version__
 # credits-start
 __authors__ = ['In alphabetical order:',
                '',
-               'Antoine Beaupré <anarcat@debian.org>',
-               'Daniel Kahn Gillmor <dkg@fifthhorseman.net>',
+               'Antoine Beaupré',
+               'Daniel Kahn Gillmor',
                'Gabriel Fillion',
                'Jérôme Charaoui',
                'Kristian Fiskerstrand',
-- 
GitLab