Mention Debian Maintainers and the debian-maintainers package. (#483225)

[developers-reference.git] / pkgs.dbk

diff --git a/pkgs.dbk b/pkgs.dbk
index f63c3442b6e35351803edba175ffeb1b24436cf0..15cb2f00a91c4a4e68fed3a9234b0a285972abfe 100644 (file)
--- a/pkgs.dbk
+++ b/pkgs.dbk
@@ -373,7 +373,8 @@ and dsc-file) with anonymous ftp to <literal>&ftp-master-host;</literal> in
 the directory <ulink
 url="ftp://&ftp-master-host;&upload-queue;">&upload-queue;</ulink>.
 To get the files processed there, they need to be signed with a key in the
-debian keyring.
+Debian Developers keyring or the Debian Maintainers keyring
+(see <ulink url="&url-wiki-dm;"></ulink>).
 </para>
 <para>
 Please note that you should transfer the changes file last.  Otherwise, your
@@ -391,13 +392,6 @@ the Debian package <xref linkend="dcut"/> .
 </para>
 </section>
 
-<section id="upload-non-us">
-<title>Uploading to <literal>non-US</literal></title>
-<para>
-<emphasis>Note:</emphasis> non-us was discontinued with the release of sarge.
-</para>
-</section>
-
 <section id="delayed-incoming">
 <title>Delayed uploads</title>
 <para>
@@ -2102,7 +2096,9 @@ co-maintainers.
 Generally there is a primary maintainer and one or more co-maintainers.  The
 primary maintainer is the person whose name is listed in the
 <literal>Maintainer</literal> field of the <filename>debian/control</filename>
-file.  Co-maintainers are all the other maintainers.
+file.  Co-maintainers are all the other maintainers,
+usually listed in the <literal>Uploaders</literal> field of the
+<filename>debian/control</filename> file.
 </para>
 <para>
 In its most basic form, the process of adding a new co-maintainer is quite
@@ -2120,7 +2116,7 @@ such as <command>CVS</command> or <command>Subversion</command>.  Alioth (see
 <listitem>
 <para>
 Add the co-maintainer's correct maintainer name and address to the
-<literal>Uploaders</literal> field in the global part of the
+<literal>Uploaders</literal> field in the first paragraph of the
 <filename>debian/control</filename> file.
 </para>
 <screen>
@@ -2209,8 +2205,9 @@ during a freeze, or testing transitions may be switched off altogether;
 </listitem>
 <listitem>
 <para>
-It must have the same number or fewer release-critical bugs than the version
-currently available in <emphasis>testing</emphasis>;
+It must not have new release-critical bugs (RC bugs affecting the version
+available in <emphasis>unstable</emphasis>, but not affecting the version in 
+<emphasis>testing</emphasis>);
 </para>
 </listitem>
 <listitem>