From 941e97b3bc3270bc3b76e30835ee21587d59d200 Mon Sep 17 00:00:00 2001
From: lucas <lucas@313b444b-1b9f-4f58-a734-7bb04f332e8d>
Date: Sat, 30 Jul 2011 14:00:12 +0000
Subject: [PATCH] Document the process of returning after retirement. Patch
 from Serafeim Zanikolas. Closes: #540249

git-svn-id: svn://anonscm.debian.org/ddp/manuals/trunk/developers-reference@8906 313b444b-1b9f-4f58-a734-7bb04f332e8d
---
 common.ent           |  1 +
 debian/changelog     |  4 +++-
 developer-duties.dbk | 38 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/common.ent b/common.ent
index 9d88041..dad0d41 100644
--- a/common.ent
+++ b/common.ent
@@ -133,6 +133,7 @@
 <!-- Debian email addresses -->
 <!ENTITY email-listmaster "<email>listmaster@&lists-host;</email>">
 <!ENTITY email-devel-ref "<email>developers-reference@&packages-host;</email>">
+<!ENTITY email-debian-account-manager "<email>da-manager@debian.org</email>">
 <!ENTITY email-debian-changes "<email>debian-changes@lists.debian.org</email>">
 <!ENTITY email-debian-devel "<email>debian-devel@&lists-host;</email>">
 <!ENTITY email-debian-devel-announce "<email>debian-devel-announce@&lists-host;</email>">
diff --git a/debian/changelog b/debian/changelog
index e0a2cf6..4adf589 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,8 +8,10 @@ developers-reference (3.4.6) UNRELEASED; urgency=low
   * Update my email address.
   * Encourage the use of RT to contact the security team.
     Patch from Thijs Kinkhorst. Closes: #610782
+  * Document the process of returning after retirement.
+    Patch from Serafeim Zanikolas. Closes: #540249
 
- -- Lucas Nussbaum <lucas@debian.org>  Sat, 30 Jul 2011 15:52:49 +0200
+ -- Lucas Nussbaum <lucas@debian.org>  Sat, 30 Jul 2011 15:58:53 +0200
 
 developers-reference (3.4.5) unstable; urgency=low
 
diff --git a/developer-duties.dbk b/developer-duties.dbk
index 120b89c..6b60b65 100644
--- a/developer-duties.dbk
+++ b/developer-duties.dbk
@@ -271,6 +271,44 @@ RT' somewhere in the subject line (case doesn't matter).
 </para>
 </listitem>
 </orderedlist>
+<para>
+It is important that the above process is followed, because finding inactive
+developers and orphaning their packages takes significant time and effort.
+</para>
+</section>
+
+<section id="returning">
+<title>Returning after retirement</title>
+<para>
+A retired developer's account is marked as "emeritus" when the process in
+<xref linkend="s3.7"/> is followed, and "disabled" otherwise. Retired
+developers with an "emeritus" account can get their account re-activated as
+follows:
+</para>
+
+<itemizedlist>
+<listitem>
+<para>
+Contact &email-debian-account-manager;.
+</para>
+</listitem>
+<listitem>
+<para>
+Go through a shortened NM process (to ensure that the returning developer
+still knows important parts of P&amp;P and T&amp;S).
+</para>
+</listitem>
+<listitem>
+<para>
+Prove that they still control the GPG key associated with the account, or
+provide proof of identify on a new GPG key, with at least two signatures from
+other developers.
+</para>
+</listitem>
+</itemizedlist>
+<para>
+Retired developers with a "disabled" account need to go through NM again.
+</para>
 </section>
 </section>
 
-- 
2.30.2