From: aba <aba@313b444b-1b9f-4f58-a734-7bb04f332e8d>
Date: Sat, 11 Nov 2006 18:12:23 +0000 (+0000)
Subject: maintainer vs DD
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=87a4ff9de36d068100b957d672d0cc79bb6666cb;p=developers-reference.git

maintainer vs DD


git-svn-id: svn://anonscm.debian.org/ddp/manuals/trunk/developers-reference@3941 313b444b-1b9f-4f58-a734-7bb04f332e8d
---

diff --git a/debian/changelog b/debian/changelog
index 667ff34..fa9b515 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ developers-reference (3.3.8) unstable; urgency=low
   * fix missing quite. Thanks, Franks Küster. Closes: #365994
   * use gnugp instead of gpg. Thanks, Justin Pryzby, Jon Dowland.
     Closes: #376411
+  * better destinction between maintainer and developer. Thanks for
+    the suggestion to Colin Tuckley. Closes: #380458
 
  -- Andreas Barth <aba@not.so.argh.org>  Sat, 11 Nov 2006 10:55:44 -0700
 
diff --git a/developers-reference.sgml b/developers-reference.sgml
index 36f0880..f4fb30c 100644
--- a/developers-reference.sgml
+++ b/developers-reference.sgml
@@ -7,7 +7,7 @@
   <!ENTITY % dynamicdata  SYSTEM "dynamic.ent" > %dynamicdata;
 
   <!-- CVS revision of this document -->
-  <!ENTITY cvs-rev "$Revision: 1.294 $">
+  <!ENTITY cvs-rev "$Revision: 1.295 $">
 
   <!-- if you are translating this document, please notate the CVS
        revision of the original developer's reference in cvs-en-rev -->
@@ -158,7 +158,7 @@ post to that list and an experienced developer will volunteer to help.
 In addition, if you have some packages ready for inclusion in Debian,
 but are waiting for your new maintainer application to go through, you
 might be able find a sponsor to upload your package for you.  Sponsors
-are people who are official Debian maintainers, and who are willing to
+are people who are official Debian Developers, and who are willing to
 criticize and upload your packages for you.
 <!-- FIXME - out of order
 Those who are seeking a
@@ -199,7 +199,8 @@ Before you actually register you should have shown that you can do
 competent work and will be a good contributor.
 You show this by submitting patches through the Bug Tracking System
 and having a package
-sponsored by an existing maintainer for a while.  Also, we expect that
+sponsored by an existing Debian Developer for a while.
+Also, we expect that
 contributors are interested in the whole project and not just in
 maintaining their own packages.  If you can help other maintainers by
 providing further information on a bug or even a patch, then do so!
@@ -207,11 +208,11 @@ providing further information on a bug or even a patch, then do so!
 Registration requires that you are familiar with Debian's philosophy
 and technical documentation.  Furthermore, you need a GnuPG key which
 has been signed by an existing Debian maintainer.  If your GnuPG key
-is not signed yet, you should try to meet a Debian maintainer in
+is not signed yet, you should try to meet a Debian Developer in
 person to get your key signed.  There's a <url id="&url-gpg-coord;"
 name="GnuPG Key Signing Coordination page"> which should help you find
-a maintainer close to you. 
-(If there is no Debian maintainer close to you,
+a Debian Developer close to you. 
+(If there is no Debian Developer close to you,
 alternative ways to pass the ID check may be permitted
 as an absolute exception on a case-by-case-basis.
 See the <url id="&url-newmaint-id;" name="identification page">
@@ -281,8 +282,8 @@ If you live in a country where use of
 cryptography even for authentication is forbidden
 then please contact us so we can make special arrangements.
 	<p>
-To apply as a new maintainer, you need an existing Debian maintainer
-to verify your application (an <em>advocate</em>).  After you have
+To apply as a new maintainer, you need an existing Debian Developer
+to support your application (an <em>advocate</em>).  After you have
 contributed to Debian for a while, and you want to apply to become a
 registered developer, an existing developer with whom you
 have worked over the past months has to express their belief that you