X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=developer-duties.dbk;h=0ca0ee58701a8d389583f5e18f7483a922078c4f;hb=ce9016122bb6c67aa8407ec2e0b27ee40137819c;hp=120b89cbdc4afbb27b53a87b0d17db2c0164b294;hpb=bae8532415c6dd425040394761eb85e03726fbe7;p=developers-reference.git

diff --git a/developer-duties.dbk b/developer-duties.dbk
index 120b89c..0ca0ee5 100644
--- a/developer-duties.dbk
+++ b/developer-duties.dbk
@@ -37,7 +37,7 @@ given transition if you are not able to identify them.
 <title>Maintain packages in <literal>stable</literal></title>
 <para>
 Most of the package maintainer's work goes into providing updated
-versions of packages in <literal>unstable</literal>, but his job also entails taking care
+versions of packages in <literal>unstable</literal>, but their job also entails taking care
 of the packages in the current <literal>stable</literal> release.
 </para>
 <para>
@@ -77,7 +77,7 @@ can block the <literal>testing</literal> migration of many packages.
 </para>
 <para>
 Lack of attention to RC bugs is often interpreted by the QA team as a sign
-that the maintainer has disappeared without properly orphaning his package.
+that the maintainer has disappeared without properly orphaning their package.
 The MIA team might also get involved, which could result in your packages
 being orphaned (see <xref linkend="mia-qa" />).
 </para>
@@ -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>