POT updated in order to fit with last changes.

[developers-reference.git] / po4a / po / pkgs.pot

diff --git a/po4a/po/pkgs.pot b/po4a/po/pkgs.pot
index 994e65d8ab3013e311a01ce7dd6df197ccae23b7..aa9eabb2d5a76d23b2528d0e0535090dfa079efe 100644 (file)
--- a/po4a/po/pkgs.pot
+++ b/po4a/po/pkgs.pot
@@ -1,12 +1,13 @@
 # SOME DESCRIPTIVE TITLE
 # Copyright (C) YEAR Free Software Foundation, Inc.
 # SOME DESCRIPTIVE TITLE
 # Copyright (C) YEAR Free Software Foundation, Inc.

+# This file is distributed under the same license as the PACKAGE package.

 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

-# 
+#

 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"

-"POT-Creation-Date: 2007-06-26 16:13+0000\n"
+"POT-Creation-Date: 2010-05-31 18:23-0400\n"

 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"


@@ -14,140 +15,152 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: ENCODING"
 
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: ENCODING"
 

-# type: Content of: <chapter><title>
-#: pkgs.dbk:5
+#. type: Content of: <chapter><title>
+#: pkgs.dbk:7

 msgid "Managing Packages"
 msgstr ""
 
 msgid "Managing Packages"
 msgstr ""
 

-# type: Content of: <chapter><para>
-#: pkgs.dbk:7
+#. type: Content of: <chapter><para>
+#: pkgs.dbk:9

 msgid ""
 "This chapter contains information related to creating, uploading, "
 "maintaining, and porting packages."
 msgstr ""
 
 msgid ""
 "This chapter contains information related to creating, uploading, "
 "maintaining, and porting packages."
 msgstr ""
 

-# type: Content of: <chapter><section><title>
-#: pkgs.dbk:11
+#. type: Content of: <chapter><section><title>
+#: pkgs.dbk:13

 msgid "New packages"
 msgstr ""
 
 msgid "New packages"
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: pkgs.dbk:13
+#. type: Content of: <chapter><section><para>
+#: pkgs.dbk:15

 msgid ""
 "If you want to create a new package for the Debian distribution, you should "
 msgid ""
 "If you want to create a new package for the Debian distribution, you should "

-"first check the <ulink "
-"url=\"http://www.debian.org/devel/wnpp/\">Work-Needing and Prospective "
+"first check the <ulink url=\"&url-wnpp;\">Work-Needing and Prospective "

 "Packages (WNPP)</ulink> list.  Checking the WNPP list ensures that no one is "
 "already working on packaging that software, and that effort is not "
 "Packages (WNPP)</ulink> list.  Checking the WNPP list ensures that no one is "
 "already working on packaging that software, and that effort is not "

-"duplicated.  Read the <ulink url=\"http://www.debian.org/devel/wnpp/\">WNPP "
-"web pages</ulink> for more information."
+"duplicated.  Read the <ulink url=\"&url-wnpp;\">WNPP web pages</ulink> for "
+"more information."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: pkgs.dbk:21
+#. type: Content of: <chapter><section><para>
+#: pkgs.dbk:23

 msgid ""
 "Assuming no one else is already working on your prospective package, you "
 msgid ""
 "Assuming no one else is already working on your prospective package, you "

-"must then submit a bug report (<xref linkend=\"submit-bug\"/> ) against the "
+"must then submit a bug report (<xref linkend=\"submit-bug\"/>) against the "

 "pseudo-package <systemitem role=\"package\">wnpp</systemitem> describing "
 "your plan to create a new package, including, but not limiting yourself to, "
 "a description of the package, the license of the prospective package, and "
 "the current URL where it can be downloaded from."
 msgstr ""
 
 "pseudo-package <systemitem role=\"package\">wnpp</systemitem> describing "
 "your plan to create a new package, including, but not limiting yourself to, "
 "a description of the package, the license of the prospective package, and "
 "the current URL where it can be downloaded from."
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: pkgs.dbk:29
+#. type: Content of: <chapter><section><para>
+#: pkgs.dbk:31

 msgid ""
 msgid ""

-"You should set the subject of the bug to ``ITP: "
+"You should set the subject of the bug to <literal>ITP: "

 "<replaceable>foo</replaceable> -- <replaceable>short "
 "<replaceable>foo</replaceable> -- <replaceable>short "

-"description</replaceable>'', substituting the name of the new package for "
-"<replaceable>foo</replaceable>.  The severity of the bug report must be set "
-"to <emphasis>wishlist</emphasis>.  If you feel it's necessary, send a copy "
-"to <email>debian-devel@lists.debian.org</email> by putting the address in "
-"the <literal>X-Debbugs-CC:</literal> header of the message (no, don't use "
-"<literal>CC:</literal>, because that way the message's subject won't "
-"indicate the bug number)."
-msgstr ""
-
-# type: Content of: <chapter><section><para>
-#: pkgs.dbk:39
+"description</replaceable></literal>, substituting the name of the new "
+"package for <replaceable>foo</replaceable>.  The severity of the bug report "
+"must be set to <literal>wishlist</literal>.  Please send a copy to "
+"&email-debian-devel; by using the X-Debbugs-CC header (don't use CC:, "
+"because that way the message's subject won't indicate the bug number). If "
+"you are packaging so many new packages (>10)  that notifying the mailing "
+"list in separate messages is too disruptive, send a summary after filing the "
+"bugs to the debian-devel list instead.  This will inform the other "
+"developers about upcoming packages and will allow a review of your "
+"description and package name."
+msgstr ""
+
+#. type: Content of: <chapter><section><para>
+#: pkgs.dbk:45

 msgid ""
 "Please include a <literal>Closes: "
 msgid ""
 "Please include a <literal>Closes: "

-"bug#<replaceable>nnnnn</replaceable></literal> entry in the changelog of the "
+"#<replaceable>nnnnn</replaceable></literal> entry in the changelog of the "

 "new package in order for the bug report to be automatically closed once the "
 "new package is installed in the archive (see <xref "
 "new package in order for the bug report to be automatically closed once the "
 "new package is installed in the archive (see <xref "

-"linkend=\"upload-bugfix\"/> )."
+"linkend=\"upload-bugfix\"/>)."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: pkgs.dbk:45
+#. type: Content of: <chapter><section><para>
+#: pkgs.dbk:51

 msgid ""
 msgid ""

-"When closing security bugs include CVE numbers as well as the Closes: "
-"#nnnnn.  This is useful for the security team to track vulnerabilities.  If "
-"an upload is made to fix the bug before the advisory ID is known, it is "
-"encouraged to modify the historical changelog entry with the next upload.  "
-"Even in this case, please include all available pointers to background "
-"information in the original changelog entry."
+"If you think your package needs some explanations for the administrators of "
+"the NEW package queue, include them in your changelog, send to "
+"&email-ftpmaster; a reply to the email you receive as a maintainer after "
+"your upload, or reply to the rejection email in case you are already "
+"re-uploading."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: pkgs.dbk:53
+#. type: Content of: <chapter><section><para>
+#: pkgs.dbk:57
+msgid ""
+"When closing security bugs include CVE numbers as well as the "
+"<literal>Closes: #<replaceable>nnnnn</replaceable></literal> This is useful "
+"for the security team to track vulnerabilities.  If an upload is made to fix "
+"the bug before the advisory ID is known, it is encouraged to modify the "
+"historical changelog entry with the next upload.  Even in this case, please "
+"include all available pointers to background information in the original "
+"changelog entry."
+msgstr ""
+
+#. type: Content of: <chapter><section><para>
+#: pkgs.dbk:66

 msgid ""
 "There are a number of reasons why we ask maintainers to announce their "
 "intentions:"
 msgstr ""
 
 msgid ""
 "There are a number of reasons why we ask maintainers to announce their "
 "intentions:"
 msgstr ""
 

-# type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: pkgs.dbk:59
+#. type: Content of: <chapter><section><itemizedlist><listitem><para>
+#: pkgs.dbk:72

 msgid ""
 "It helps the (potentially new) maintainer to tap into the experience of "
 "people on the list, and lets them know if anyone else is working on it "
 "already."
 msgstr ""
 
 msgid ""
 "It helps the (potentially new) maintainer to tap into the experience of "
 "people on the list, and lets them know if anyone else is working on it "
 "already."
 msgstr ""
 

-# type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: pkgs.dbk:65
+#. type: Content of: <chapter><section><itemizedlist><listitem><para>
+#: pkgs.dbk:78

 msgid ""
 "It lets other people thinking about working on the package know that there "
 "already is a volunteer, so efforts may be shared."
 msgstr ""
 
 msgid ""
 "It lets other people thinking about working on the package know that there "
 "already is a volunteer, so efforts may be shared."
 msgstr ""
 

-# type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: pkgs.dbk:71
+#. type: Content of: <chapter><section><itemizedlist><listitem><para>
+#: pkgs.dbk:84

 msgid ""
 "It lets the rest of the maintainers know more about the package than the one "
 "line description and the usual changelog entry ``Initial release'' that gets "
 msgid ""
 "It lets the rest of the maintainers know more about the package than the one "
 "line description and the usual changelog entry ``Initial release'' that gets "

-"posted to <literal>debian-devel-changes</literal>."
+"posted to &email-debian-devel-changes;."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: pkgs.dbk:78
+#. type: Content of: <chapter><section><itemizedlist><listitem><para>
+#: pkgs.dbk:91

 msgid ""
 msgid ""

-"It is helpful to the people who live off unstable (and form our first line "
-"of testers).  We should encourage these people."
+"It is helpful to the people who live off <literal>unstable</literal> (and "
+"form our first line of testers).  We should encourage these people."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: pkgs.dbk:84
+#. type: Content of: <chapter><section><itemizedlist><listitem><para>
+#: pkgs.dbk:97

 msgid ""
 "The announcements give maintainers and other interested parties a better "
 "feel of what is going on, and what is new, in the project."
 msgstr ""
 
 msgid ""
 "The announcements give maintainers and other interested parties a better "
 "feel of what is going on, and what is new, in the project."
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: pkgs.dbk:90
+#. type: Content of: <chapter><section><para>
+#: pkgs.dbk:103

 msgid ""
 msgid ""

-"Please see <ulink "
-"url=\"http://ftp-master.debian.org/REJECT-FAQ.html\"></ulink> for common "
-"rejection reasons for a new package."
+"Please see <ulink url=\"http://&ftp-master-host;/REJECT-FAQ.html\"></ulink> "
+"for common rejection reasons for a new package."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><title>
-#: pkgs.dbk:96
+#. type: Content of: <chapter><section><title>
+#: pkgs.dbk:109

 msgid "Recording changes in the package"
 msgstr ""
 
 msgid "Recording changes in the package"
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: pkgs.dbk:98
+#. type: Content of: <chapter><section><para>
+#: pkgs.dbk:111

 msgid ""
 "Changes that you make to the package need to be recorded in the "
 "<filename>debian/changelog</filename>.  These changes should provide a "
 msgid ""
 "Changes that you make to the package need to be recorded in the "
 "<filename>debian/changelog</filename>.  These changes should provide a "


@@ -160,74 +173,74 @@ msgid ""
 "for native packages."
 msgstr ""
 
 "for native packages."
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: pkgs.dbk:109
+#. type: Content of: <chapter><section><para>
+#: pkgs.dbk:122

 msgid ""
 "The <filename>debian/changelog</filename> file conforms to a certain "
 "structure, with a number of different fields.  One field of note, the "
 msgid ""
 "The <filename>debian/changelog</filename> file conforms to a certain "
 "structure, with a number of different fields.  One field of note, the "

-"<emphasis>distribution</emphasis>, is described in <xref "
-"linkend=\"distribution\"/> .  More information about the structure of this "
+"<literal>distribution</literal>, is described in <xref "
+"linkend=\"distribution\"/>.  More information about the structure of this "

 "file can be found in the Debian Policy section titled "
 "<filename>debian/changelog</filename>."
 msgstr ""
 
 "file can be found in the Debian Policy section titled "
 "<filename>debian/changelog</filename>."
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: pkgs.dbk:117
+#. type: Content of: <chapter><section><para>
+#: pkgs.dbk:130

 msgid ""
 "Changelog entries can be used to automatically close Debian bugs when the "
 "package is installed into the archive.  See <xref "
 msgid ""
 "Changelog entries can be used to automatically close Debian bugs when the "
 "package is installed into the archive.  See <xref "

-"linkend=\"upload-bugfix\"/> ."
+"linkend=\"upload-bugfix\"/>."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: pkgs.dbk:121
+#. type: Content of: <chapter><section><para>
+#: pkgs.dbk:134

 msgid ""
 "It is conventional that the changelog entry of a package that contains a new "
 "upstream version of the software looks like this:"
 msgstr ""
 
 msgid ""
 "It is conventional that the changelog entry of a package that contains a new "
 "upstream version of the software looks like this:"
 msgstr ""
 

-# type: Content of: <chapter><section><screen>
-#: pkgs.dbk:125
+#. type: Content of: <chapter><section><screen>
+#: pkgs.dbk:138

 #, no-wrap
 #, no-wrap

-msgid "* new upstream version"
+msgid "  * New upstream release.\n"

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: pkgs.dbk:128
+#. type: Content of: <chapter><section><para>
+#: pkgs.dbk:141

 msgid ""
 "There are tools to help you create entries and finalize the "
 "<filename>changelog</filename> for release — see <xref "
 msgid ""
 "There are tools to help you create entries and finalize the "
 "<filename>changelog</filename> for release — see <xref "

-"linkend=\"devscripts\"/> and <xref linkend=\"dpkg-dev-el\"/> ."
+"linkend=\"devscripts\"/> and <xref linkend=\"dpkg-dev-el\"/>."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: pkgs.dbk:133
-msgid "See also <xref linkend=\"bpp-debian-changelog\"/> ."
+#. type: Content of: <chapter><section><para>
+#: pkgs.dbk:146
+msgid "See also <xref linkend=\"bpp-debian-changelog\"/>."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><title>
-#: pkgs.dbk:138
+#. type: Content of: <chapter><section><title>
+#: pkgs.dbk:151

 msgid "Testing the package"
 msgstr ""
 
 msgid "Testing the package"
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: pkgs.dbk:140
+#. type: Content of: <chapter><section><para>
+#: pkgs.dbk:153

 msgid ""
 "Before you upload your package, you should do basic testing on it.  At a "
 "minimum, you should try the following activities (you'll need to have an "
 "older version of the same Debian package around):"
 msgstr ""
 
 msgid ""
 "Before you upload your package, you should do basic testing on it.  At a "
 "minimum, you should try the following activities (you'll need to have an "
 "older version of the same Debian package around):"
 msgstr ""
 

-# type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: pkgs.dbk:147
+#. type: Content of: <chapter><section><itemizedlist><listitem><para>
+#: pkgs.dbk:160

 msgid ""
 "Install the package and make sure the software works, or upgrade the package "
 "from an older version to your new version if a Debian package for it already "
 "exists."
 msgstr ""
 
 msgid ""
 "Install the package and make sure the software works, or upgrade the package "
 "from an older version to your new version if a Debian package for it already "
 "exists."
 msgstr ""
 

-# type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: pkgs.dbk:154
+#. type: Content of: <chapter><section><itemizedlist><listitem><para>
+#: pkgs.dbk:167

 msgid ""
 "Run <command>lintian</command> over the package.  You can run "
 "<command>lintian</command> as follows: <literal>lintian -v "
 msgid ""
 "Run <command>lintian</command> over the package.  You can run "
 "<command>lintian</command> as follows: <literal>lintian -v "


@@ -239,94 +252,97 @@ msgid ""
 "problem."
 msgstr ""
 
 "problem."
 msgstr ""
 

-# type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: pkgs.dbk:163
+#. type: Content of: <chapter><section><itemizedlist><listitem><para>
+#: pkgs.dbk:176

 msgid ""
 "Normally, a package should <emphasis>not</emphasis> be uploaded if it causes "
 "lintian to emit errors (they will start with <literal>E</literal>)."
 msgstr ""
 
 msgid ""
 "Normally, a package should <emphasis>not</emphasis> be uploaded if it causes "
 "lintian to emit errors (they will start with <literal>E</literal>)."
 msgstr ""
 

-# type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: pkgs.dbk:167
+#. type: Content of: <chapter><section><itemizedlist><listitem><para>
+#: pkgs.dbk:180

 msgid ""
 "For more information on <command>lintian</command>, see <xref "
 msgid ""
 "For more information on <command>lintian</command>, see <xref "

-"linkend=\"lintian\"/> ."
+"linkend=\"lintian\"/>."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: pkgs.dbk:173
+#. type: Content of: <chapter><section><itemizedlist><listitem><para>
+#: pkgs.dbk:186

 msgid ""
 msgid ""

-"Optionally run <xref linkend=\"debdiff\"/> to analyze changes from an older "
-"version, if one exists."
+"Optionally run <command>debdiff</command> (see <xref linkend=\"debdiff\"/>) "
+"to analyze changes from an older version, if one exists."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: pkgs.dbk:179
+#. type: Content of: <chapter><section><itemizedlist><listitem><para>
+#: pkgs.dbk:192

 msgid ""
 "Downgrade the package to the previous version (if one exists) — this tests "
 "the <filename>postrm</filename> and <filename>prerm</filename> scripts."
 msgstr ""
 
 msgid ""
 "Downgrade the package to the previous version (if one exists) — this tests "
 "the <filename>postrm</filename> and <filename>prerm</filename> scripts."
 msgstr ""
 

-# type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: pkgs.dbk:185
+#. type: Content of: <chapter><section><itemizedlist><listitem><para>
+#: pkgs.dbk:198

 msgid "Remove the package, then reinstall it."
 msgstr ""
 
 msgid "Remove the package, then reinstall it."
 msgstr ""
 

-# type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: pkgs.dbk:190
+#. type: Content of: <chapter><section><itemizedlist><listitem><para>
+#: pkgs.dbk:203

 msgid ""
 "Copy the source package in a different directory and try unpacking it and "
 "rebuilding it.  This tests if the package relies on existing files outside "
 "of it, or if it relies on permissions being preserved on the files shipped "
 msgid ""
 "Copy the source package in a different directory and try unpacking it and "
 "rebuilding it.  This tests if the package relies on existing files outside "
 "of it, or if it relies on permissions being preserved on the files shipped "

-"inside the .diff.gz file."
+"inside the <filename>.diff.gz</filename> file."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><title>
-#: pkgs.dbk:200
+#. type: Content of: <chapter><section><title>
+#: pkgs.dbk:213

 msgid "Layout of the source package"
 msgstr ""
 
 msgid "Layout of the source package"
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: pkgs.dbk:202
+#. type: Content of: <chapter><section><para>
+#: pkgs.dbk:215

 msgid "There are two types of Debian source packages:"
 msgstr ""
 
 msgid "There are two types of Debian source packages:"
 msgstr ""
 

-# type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: pkgs.dbk:207
+#. type: Content of: <chapter><section><itemizedlist><listitem><para>
+#: pkgs.dbk:220

 msgid ""
 msgid ""

-"the so-called <emphasis>native</emphasis> packages, where there is no "
+"the so-called <literal>native</literal> packages, where there is no "

 "distinction between the original sources and the patches applied for Debian"
 msgstr ""
 
 "distinction between the original sources and the patches applied for Debian"
 msgstr ""
 

-# type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: pkgs.dbk:213
+#. type: Content of: <chapter><section><itemizedlist><listitem><para>
+#: pkgs.dbk:226

 msgid ""
 "the (more common) packages where there's an original source tarball file "
 msgid ""
 "the (more common) packages where there's an original source tarball file "

-"accompanied by another file that contains the patches applied for Debian"
+"accompanied by another file that contains the changes made by Debian"

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: pkgs.dbk:219
+#. type: Content of: <chapter><section><para>
+#: pkgs.dbk:232

 msgid ""
 "For the native packages, the source package includes a Debian source control "
 msgid ""
 "For the native packages, the source package includes a Debian source control "

-"file (<literal>.dsc</literal>) and the source tarball "
-"(<literal>.tar.gz</literal>).  A source package of a non-native package "
-"includes a Debian source control file, the original source tarball "
-"(<literal>.orig.tar.gz</literal>) and the Debian patches "
-"(<literal>.diff.gz</literal>)."
+"file (<filename>.dsc</filename>) and the source tarball "
+"(<filename>.tar.{gz,bz2,lzma}</filename>). A source package of a non-native "
+"package includes a Debian source control file, the original source tarball "
+"(<filename>.orig.tar.{gz,bz2,lzma}</filename>) and the Debian changes "
+"(<filename>.diff.gz</filename> for the source format “1.0” or "
+"<filename>.debian.tar.{gz,bz2,lzma}</filename> for the source format “3.0 "
+"(quilt)”)."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: pkgs.dbk:227
+#. type: Content of: <chapter><section><para>
+#: pkgs.dbk:241

 msgid ""
 msgid ""

-"Whether a package is native or not is determined when it is built by "
-"<citerefentry> <refentrytitle>dpkg-buildpackage</refentrytitle> "
-"<manvolnum>1</manvolnum> </citerefentry>.  The rest of this section relates "
-"only to non-native packages."
+"With source format “1.0”, whether a package is native or not was determined "
+"by <command>dpkg-source</command> at build time. Nowadays it is recommended "
+"to be explicit about the desired source format by putting either “3.0 "
+"(quilt)” or “3.0 (native)” in <filename>debian/source/format</filename>.  "
+"The rest of this section relates only to non-native packages."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: pkgs.dbk:233
+#. type: Content of: <chapter><section><para>
+#: pkgs.dbk:248

 msgid ""
 "The first time a version is uploaded which corresponds to a particular "
 "upstream version, the original source tar file should be uploaded and "
 msgid ""
 "The first time a version is uploaded which corresponds to a particular "
 "upstream version, the original source tar file should be uploaded and "


@@ -335,19 +351,19 @@ msgid ""
 "<filename>.dsc</filename> files, and will not need to be re-uploaded."
 msgstr ""
 
 "<filename>.dsc</filename> files, and will not need to be re-uploaded."
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: pkgs.dbk:240
+#. type: Content of: <chapter><section><para>
+#: pkgs.dbk:255

 msgid ""
 "By default, <command>dpkg-genchanges</command> and "
 "<command>dpkg-buildpackage</command> will include the original source tar "
 msgid ""
 "By default, <command>dpkg-genchanges</command> and "
 "<command>dpkg-buildpackage</command> will include the original source tar "

-"file if and only if the Debian revision part of the source version number is "
-"0 or 1, indicating a new upstream version.  This behavior may be modified by "
-"using <literal>-sa</literal> to always include it or <literal>-sd</literal> "
-"to always leave it out."
+"file if and only if the current changelog entry has a different upstream "
+"version from the preceding entry. This behavior may be modified by using "
+"<literal>-sa</literal> to always include it or <literal>-sd</literal> to "
+"always leave it out."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: pkgs.dbk:248
+#. type: Content of: <chapter><section><para>
+#: pkgs.dbk:263

 msgid ""
 "If no original source is included in the upload, the original source "
 "tar-file used by <command>dpkg-source</command> when constructing the "
 msgid ""
 "If no original source is included in the upload, the original source "
 "tar-file used by <command>dpkg-source</command> when constructing the "


@@ -356,328 +372,303 @@ msgid ""
 "the archive."
 msgstr ""
 
 "the archive."
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: pkgs.dbk:255
+#. type: Content of: <chapter><section><para>
+#: pkgs.dbk:270

 msgid ""
 "Please notice that, in non-native packages, permissions on files that are "
 msgid ""
 "Please notice that, in non-native packages, permissions on files that are "

-"not present in the .orig.tar.gz will not be preserved, as diff does not "
-"store file permissions in the patch."
+"not present in the <filename>*.orig.tar.{gz,bz2,lzma}</filename> will not be "
+"preserved, as diff does not store file permissions in the patch. However "
+"when using source format “3.0 (quilt)”, permissions of files inside the "
+"<filename>debian</filename> directory are preserved since they are stored in "
+"a tar archive."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><title>
-#: pkgs.dbk:262
+#. type: Content of: <chapter><section><title>
+#: pkgs.dbk:279

 msgid "Picking a distribution"
 msgstr ""
 
 msgid "Picking a distribution"
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: pkgs.dbk:264
+#. type: Content of: <chapter><section><para>
+#: pkgs.dbk:281

 msgid ""
 "Each upload needs to specify which distribution the package is intended "
 "for.  The package build process extracts this information from the first "
 "line of the <filename>debian/changelog</filename> file and places it in the "
 msgid ""
 "Each upload needs to specify which distribution the package is intended "
 "for.  The package build process extracts this information from the first "
 "line of the <filename>debian/changelog</filename> file and places it in the "

-"<literal>Distribution</literal> field of the <literal>.changes</literal> "
+"<literal>Distribution</literal> field of the <filename>.changes</filename> "

 "file."
 msgstr ""
 
 "file."
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: pkgs.dbk:270
+#. type: Content of: <chapter><section><para>
+#: pkgs.dbk:287

 msgid ""
 msgid ""

-"There are several possible values for this field: `stable', `unstable', "
-"`testing-proposed-updates' and `experimental'.  Normally, packages are "
-"uploaded into <emphasis>unstable</emphasis>."
+"There are several possible values for this field: <literal>stable</literal>, "
+"<literal>unstable</literal>, <literal>testing-proposed-updates</literal> and "
+"<literal>experimental</literal>.  Normally, packages are uploaded into "
+"<literal>unstable</literal>."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: pkgs.dbk:275
+#. type: Content of: <chapter><section><para>
+#: pkgs.dbk:293

 msgid ""
 msgid ""

-"Actually, there are two other possible distributions: `stable-security' and "
-"`testing-security', but read <xref linkend=\"bug-security\"/> for more "
-"information on those."
+"Actually, there are two other possible distributions: "
+"<literal>stable-security</literal> and <literal>testing-security</literal>, "
+"but read <xref linkend=\"bug-security\"/> for more information on those."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: pkgs.dbk:280
+#. type: Content of: <chapter><section><para>
+#: pkgs.dbk:298

 msgid ""
 "It is not possible to upload a package into several distributions at the "
 "same time."
 msgstr ""
 
 msgid ""
 "It is not possible to upload a package into several distributions at the "
 "same time."
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: pkgs.dbk:284
-msgid "Special case: uploads to the <emphasis>stable</emphasis> distribution"
+#. type: Content of: <chapter><section><section><title>
+#: pkgs.dbk:302
+msgid ""
+"Special case: uploads to the <literal>stable</literal> and "
+"<literal>oldstable</literal> distributions"

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:286
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:305

 msgid ""
 msgid ""

-"Uploading to <emphasis>stable</emphasis> means that the package will "
-"transfered to the <emphasis>p-u-new</emphasis>-queue for review by the "
-"stable release managers, and if approved will be installed in "
+"Uploading to <literal>stable</literal> means that the package will "
+"transferred to the <literal>proposed-updates-new</literal> queue for review "
+"by the stable release managers, and if approved will be installed in "

 "<filename>stable-proposed-updates</filename> directory of the Debian "
 "<filename>stable-proposed-updates</filename> directory of the Debian "

-"archive.  From there, it will be included in <emphasis>stable</emphasis> "
-"with the next point release."
+"archive.  From there, it will be included in <literal>stable</literal> with "
+"the next point release."
+msgstr ""
+
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:313
+msgid ""
+"To ensure that your upload will be accepted, you should discuss the changes "
+"with the stable release team before you upload. For that, send a mail to the "
+"&email-debian-release; mailing list, including the patch you want to apply "
+"to the package version currently in <literal>stable</literal>. Always be "
+"verbose and detailed in your changelog entries for uploads to the "
+"<literal>stable</literal> distribution."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:294
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:321

 msgid ""
 msgid ""

-"Extra care should be taken when uploading to <emphasis>stable</emphasis>.  "
-"Basically, a package should only be uploaded to stable if one of the "
-"following happens:"
+"Extra care should be taken when uploading to <literal>stable</literal>.  "
+"Basically, a package should only be uploaded to <literal>stable</literal> if "
+"one of the following happens:"

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:301
+#. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
+#: pkgs.dbk:328

 msgid "a truly critical functionality problem"
 msgstr ""
 
 msgid "a truly critical functionality problem"
 msgstr ""
 

-# type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:306
+#. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
+#: pkgs.dbk:333

 msgid "the package becomes uninstallable"
 msgstr ""
 
 msgid "the package becomes uninstallable"
 msgstr ""
 

-# type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:311
+#. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
+#: pkgs.dbk:338

 msgid "a released architecture lacks the package"
 msgstr ""
 
 msgid "a released architecture lacks the package"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:316
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:343

 msgid ""
 msgid ""

-"In the past, uploads to <emphasis>stable</emphasis> were used to address "
+"In the past, uploads to <literal>stable</literal> were used to address "

 "security problems as well.  However, this practice is deprecated, as uploads "
 "used for Debian security advisories are automatically copied to the "
 "appropriate <filename>proposed-updates</filename> archive when the advisory "
 "is released.  See <xref linkend=\"bug-security\"/> for detailed information "
 "security problems as well.  However, this practice is deprecated, as uploads "
 "used for Debian security advisories are automatically copied to the "
 "appropriate <filename>proposed-updates</filename> archive when the advisory "
 "is released.  See <xref linkend=\"bug-security\"/> for detailed information "

-"on handling security problems."
+"on handling security problems. If the security teams deems the problem to be "
+"too benign to be fixed through a <literal>DSA</literal>, the stable release "
+"managers are usually willing to include your fix nonetheless in a regular "
+"upload to <literal>stable</literal>."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:324
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:354

 msgid ""
 "Changing anything else in the package that isn't important is discouraged, "
 "because even trivial fixes can cause bugs later on."
 msgstr ""
 
 msgid ""
 "Changing anything else in the package that isn't important is discouraged, "
 "because even trivial fixes can cause bugs later on."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:328
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:358

 msgid ""
 msgid ""

-"Packages uploaded to <emphasis>stable</emphasis> need to be compiled on "
-"systems running <emphasis>stable</emphasis>, so that their dependencies are "
+"Packages uploaded to <literal>stable</literal> need to be compiled on "
+"systems running <literal>stable</literal>, so that their dependencies are "

 "limited to the libraries (and other packages) available in "
 "limited to the libraries (and other packages) available in "

-"<emphasis>stable</emphasis>; for example, a package uploaded to "
-"<emphasis>stable</emphasis> that depends on a library package that only "
-"exists in unstable will be rejected.  Making changes to dependencies of "
-"other packages (by messing with <literal>Provides</literal> or shlibs "
-"files), possibly making those other packages uninstallable, is strongly "
-"discouraged."
+"<literal>stable</literal>; for example, a package uploaded to "
+"<literal>stable</literal> that depends on a library package that only exists "
+"in <literal>unstable</literal> will be rejected.  Making changes to "
+"dependencies of other packages (by messing with <literal>Provides</literal> "
+"or <filename>shlibs</filename> files), possibly making those other packages "
+"uninstallable, is strongly discouraged."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:338
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:368

 msgid ""
 msgid ""

-"The Release Team (which can be reached at "
-"<email>debian-release@lists.debian.org</email>) will regularly evaluate the "
-"uploads To <emphasis>stable-proposed-updates</emphasis> and decide if your "
-"package can be included in <emphasis>stable</emphasis>.  Please be clear "
-"(and verbose, if necessary) in your changelog entries for uploads to "
-"<emphasis>stable</emphasis>, because otherwise the package won't be "
-"considered for inclusion."
+"Uploads to the <literal>oldstable</literal> distributions are possible as "
+"long as it hasn't been archived. The same rules as for "
+"<literal>stable</literal> apply."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:347
-msgid ""
-"It's best practice to speak with the stable release manager "
-"<emphasis>before</emphasis> uploading to "
-"<emphasis>stable</emphasis>/<emphasis>stable-proposed-updates</emphasis>, so "
-"that the uploaded package fits the needs of the next point release."
+#. type: Content of: <chapter><section><section><title>
+#: pkgs.dbk:375
+msgid "Special case: uploads to <literal>testing/testing-proposed-updates</literal>"

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: pkgs.dbk:355
-msgid ""
-"Special case: uploads to "
-"<emphasis>testing/testing-proposed-updates</emphasis>"
-msgstr ""
-
-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:357
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:377

 msgid ""
 "Please see the information in the <link linkend=\"t-p-u\">testing "
 "section</link> for details."
 msgstr ""
 
 msgid ""
 "Please see the information in the <link linkend=\"t-p-u\">testing "
 "section</link> for details."
 msgstr ""
 

-# type: Content of: <chapter><section><title>
-#: pkgs.dbk:365
+#. type: Content of: <chapter><section><title>
+#: pkgs.dbk:385

 msgid "Uploading a package"
 msgstr ""
 
 msgid "Uploading a package"
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: pkgs.dbk:367
+#. type: Content of: <chapter><section><section><title>
+#: pkgs.dbk:387

 msgid "Uploading to <literal>ftp-master</literal>"
 msgstr ""
 
 msgid "Uploading to <literal>ftp-master</literal>"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:369
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:389

 msgid ""
 "To upload a package, you should upload the files (including the signed "
 "changes and dsc-file) with anonymous ftp to "
 msgid ""
 "To upload a package, you should upload the files (including the signed "
 "changes and dsc-file) with anonymous ftp to "

-"<literal>ftp-master.debian.org</literal> in the directory <ulink "
-"url=\"ftp://ftp-master.debian.org/pub/UploadQueue/\">/pub/UploadQueue/</ulink>.  "
-"To get the files processed there, they need to be signed with a key in the "
-"debian keyring."
+"<literal>&ftp-upload-host;</literal> in the directory <ulink "
+"url=\"ftp://&ftp-upload-host;&upload-queue;\">&upload-queue;</ulink>.  To "
+"get the files processed there, they need to be signed with a key in the "
+"Debian Developers keyring or the Debian Maintainers keyring (see <ulink "
+"url=\"&url-wiki-dm;\"></ulink>)."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:377
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:398

 msgid ""
 "Please note that you should transfer the changes file last.  Otherwise, your "
 "upload may be rejected because the archive maintenance software will parse "
 "the changes file and see that not all files have been uploaded."
 msgstr ""
 
 msgid ""
 "Please note that you should transfer the changes file last.  Otherwise, your "
 "upload may be rejected because the archive maintenance software will parse "
 "the changes file and see that not all files have been uploaded."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:382
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:403

 msgid ""
 msgid ""

-"You may also find the Debian packages <xref linkend=\"dupload\"/> or <xref "
-"linkend=\"dput\"/> useful when uploading packages.  These handy programs "
-"help automate the process of uploading packages into Debian."
-msgstr ""
-
-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:387
-msgid ""
-"For removing packages, please see the README file in that ftp directory, and "
-"the Debian package <xref linkend=\"dcut\"/> ."
-msgstr ""
-
-# type: Content of: <chapter><section><section><title>
-#: pkgs.dbk:393
-msgid "Uploading to <literal>non-US</literal>"
+"You may also find the Debian packages <link "
+"linkend=\"dupload\">dupload</link> or <link linkend=\"dput\">dput</link> "
+"useful when uploading packages.These handy programs help automate the "
+"process of uploading packages into Debian."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:395
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:408

 msgid ""
 msgid ""

-"<emphasis>Note:</emphasis> non-us was discontinued with the release of "
-"sarge."
+"For removing packages, please see <ulink "
+"url=\"ftp://&ftp-upload-host;&upload-queue;README\"/> and the Debian package "
+"<link linkend=\"dcut\">dcut</link>."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: pkgs.dbk:400
+#. type: Content of: <chapter><section><section><title>
+#: pkgs.dbk:415

 msgid "Delayed uploads"
 msgstr ""
 
 msgid "Delayed uploads"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:402
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:418

 msgid ""
 msgid ""

-"Delayed uploads are done for the moment via the delayed queue at gluck.  The "
-"upload-directory is "
-"<literal>gluck:~tfheen/DELAYED/[012345678]-day</literal>.  0-day is uploaded "
-"multiple times per day to ftp-master."
+"It is sometimes useful to upload a package immediately, but to want this "
+"package to arrive in the archive only a few days later. For example, when "
+"preparing a <link linkend=\"nmu\">Non-Maintainer Upload</link>, you might "
+"want to give the maintainer a few days to react."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:407
-msgid "With a fairly recent dput, this section"
-msgstr ""
-
-# type: Content of: <chapter><section><section><screen>
-#: pkgs.dbk:410
-#, no-wrap
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:425

 msgid ""
 msgid ""

-"[tfheen_delayed]\n"
-"method = scp\n"
-"fqdn = gluck.debian.org\n"
-"incoming = ~tfheen"
+"An upload to the delayed directory keeps the package in <ulink "
+"url=\"http://ftp-master.debian.org/deferred.html\">the deferred uploads "
+"queue</ulink>.  When the specified waiting time is over, the package is "
+"moved into the regular incoming directory for processing.  This is done "
+"through automatic uploading to <literal>&ftp-upload-host;</literal> in "
+"upload-directory <literal>DELAYED/[012345678]-day</literal>. 0-day is "
+"uploaded multiple times per day to <literal>&ftp-upload-host;</literal>."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:416
-msgid "in ~/.dput.cf should work fine for uploading to the DELAYED queue."
-msgstr ""
-
-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:419
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:435

 msgid ""
 msgid ""

-"<emphasis>Note:</emphasis> Since this upload queue goes to "
-"<literal>ftp-master</literal>, the prescription found in <xref "
-"linkend=\"upload-ftp-master\"/> applies here as well."
+"With dput, you can use the <literal>--delayed "
+"<replaceable>DELAY</replaceable></literal> parameter to put the package into "
+"one of the queues."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: pkgs.dbk:426
+#. type: Content of: <chapter><section><section><title>
+#: pkgs.dbk:441

 msgid "Security uploads"
 msgstr ""
 
 msgid "Security uploads"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:428
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:443

 msgid ""
 "Do <emphasis role=\"strong\">NOT</emphasis> upload a package to the security "
 msgid ""
 "Do <emphasis role=\"strong\">NOT</emphasis> upload a package to the security "

-"upload queue (oldstable-security, stable-security, etc.) without prior "
-"authorization from the security team.  If the package does not exactly meet "
-"the team's requirements, it will cause many problems and delays in dealing "
-"with the unwanted upload.  For details, please see section <xref "
-"linkend=\"bug-security\"/> ."
+"upload queue (<literal>oldstable-security</literal>, "
+"<literal>stable-security</literal>, etc.) without prior authorization from "
+"the security team.  If the package does not exactly meet the team's "
+"requirements, it will cause many problems and delays in dealing with the "
+"unwanted upload.  For details, please see <xref linkend=\"bug-security\"/>."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: pkgs.dbk:438
+#. type: Content of: <chapter><section><section><title>
+#: pkgs.dbk:453

 msgid "Other upload queues"
 msgstr ""
 
 msgid "Other upload queues"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:440
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:455

 msgid ""
 msgid ""

-"The scp queues on ftp-master, and security are mostly unusable due to the "
-"login restrictions on those hosts."
+"There is an alternative upload queue in Europe at <ulink "
+"url=\"ftp://&ftp-eu-upload-host;&upload-queue;\"/>. It operates in the same "
+"way as <literal>&ftp-upload-host;</literal>, but should be faster for "
+"European developers."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:444
-msgid ""
-"The anonymous queues on ftp.uni-erlangen.de and ftp.uk.debian.org are "
-"currently down.  Work is underway to resurrect them."
-msgstr ""
-
-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:448
-msgid ""
-"The queues on master.debian.org, samosa.debian.org, master.debian.or.jp, and "
-"ftp.chiark.greenend.org.uk are down permanently, and will not be "
-"resurrected.  The queue in Japan will be replaced with a new queue on "
-"hp.debian.or.jp some day."
-msgstr ""
-
-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:454
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:461

 msgid ""
 msgid ""

-"For the time being, the anonymous ftp queue on auric.debian.org (the former "
-"ftp-master) works, but it is deprecated and will be removed at some point in "
-"the future."
+"Packages can also be uploaded via ssh to "
+"<literal>&ssh-upload-host;</literal>; files should be put "
+"<literal>/srv/upload.debian.org/UploadQueue</literal>. This queue does not "
+"support <link linkend=\"delayed-incoming\">delayed uploads</link>."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: pkgs.dbk:461
+#. type: Content of: <chapter><section><section><title>
+#: pkgs.dbk:469

 msgid "Notification that a new package has been installed"
 msgstr ""
 
 msgid "Notification that a new package has been installed"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:463
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:471

 msgid ""
 "The Debian archive maintainers are responsible for handling package "
 "uploads.  For the most part, uploads are automatically handled on a daily "
 "basis by the archive maintenance tools, <command>katie</command>.  "
 msgid ""
 "The Debian archive maintainers are responsible for handling package "
 "uploads.  For the most part, uploads are automatically handled on a daily "
 "basis by the archive maintenance tools, <command>katie</command>.  "

-"Specifically, updates to existing packages to the `unstable' distribution "
-"are handled automatically.  In other cases, notably new packages, placing "
-"the uploaded package into the distribution is handled manually.  When "
-"uploads are handled manually, the change to the archive may take up to a "
-"month to occur.  Please be patient."
+"Specifically, updates to existing packages to the "
+"<literal>unstable</literal> distribution are handled automatically.  In "
+"other cases, notably new packages, placing the uploaded package into the "
+"distribution is handled manually.  When uploads are handled manually, the "
+"change to the archive may take up to a month to occur.  Please be patient."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:472
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:481

 msgid ""
 "In any case, you will receive an email notification indicating that the "
 "package has been added to the archive, which also indicates which bugs will "
 msgid ""
 "In any case, you will receive an email notification indicating that the "
 "package has been added to the archive, which also indicates which bugs will "


@@ -685,28 +676,28 @@ msgid ""
 "checking if any bugs you meant to close didn't get triggered."
 msgstr ""
 
 "checking if any bugs you meant to close didn't get triggered."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:478
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:487

 msgid ""
 "The installation notification also includes information on what section the "
 "package was inserted into.  If there is a disparity, you will receive a "
 "separate email notifying you of that.  Read on below."
 msgstr ""
 
 msgid ""
 "The installation notification also includes information on what section the "
 "package was inserted into.  If there is a disparity, you will receive a "
 "separate email notifying you of that.  Read on below."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:483
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:492

 msgid ""
 "Note that if you upload via queues, the queue daemon software will also send "
 "you a notification by email."
 msgstr ""
 
 msgid ""
 "Note that if you upload via queues, the queue daemon software will also send "
 "you a notification by email."
 msgstr ""
 

-# type: Content of: <chapter><section><title>
-#: pkgs.dbk:491
+#. type: Content of: <chapter><section><title>
+#: pkgs.dbk:500

 msgid "Specifying the package section, subsection and priority"
 msgstr ""
 
 msgid "Specifying the package section, subsection and priority"
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: pkgs.dbk:493
+#. type: Content of: <chapter><section><para>
+#: pkgs.dbk:502

 msgid ""
 "The <filename>debian/control</filename> file's <literal>Section</literal> "
 "and <literal>Priority</literal> fields do not actually specify where the "
 msgid ""
 "The <filename>debian/control</filename> file's <literal>Section</literal> "
 "and <literal>Priority</literal> fields do not actually specify where the "


@@ -716,200 +707,197 @@ msgid ""
 "<filename>debian/control</filename> file are actually just hints."
 msgstr ""
 
 "<filename>debian/control</filename> file are actually just hints."
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: pkgs.dbk:501
+#. type: Content of: <chapter><section><para>
+#: pkgs.dbk:510

 msgid ""
 "The archive maintainers keep track of the canonical sections and priorities "
 msgid ""
 "The archive maintainers keep track of the canonical sections and priorities "

-"for packages in the <emphasis>override file</emphasis>.  If there is a "
-"disparity between the <emphasis>override file</emphasis> and the package's "
+"for packages in the <literal>override file</literal>.  If there is a "
+"disparity between the <literal>override file</literal> and the package's "

 "fields as indicated in <filename>debian/control</filename>, then you will "
 "receive an email noting the divergence when the package is installed into "
 "the archive.  You can either correct your "
 "<filename>debian/control</filename> file for your next upload, or else you "
 "fields as indicated in <filename>debian/control</filename>, then you will "
 "receive an email noting the divergence when the package is installed into "
 "the archive.  You can either correct your "
 "<filename>debian/control</filename> file for your next upload, or else you "

-"may wish to make a change in the <emphasis>override file</emphasis>."
+"may wish to make a change in the <literal>override file</literal>."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: pkgs.dbk:511
+#. type: Content of: <chapter><section><para>
+#: pkgs.dbk:520

 msgid ""
 "To alter the actual section that a package is put in, you need to first make "
 "sure that the <filename>debian/control</filename> file in your package is "
 msgid ""
 "To alter the actual section that a package is put in, you need to first make "
 "sure that the <filename>debian/control</filename> file in your package is "

-"accurate.  Next, send an email <email>override-change@debian.org</email> or "
-"submit a bug against <systemitem "
+"accurate.  Next, submit a bug against <systemitem "

 "role=\"package\">ftp.debian.org</systemitem> requesting that the section or "
 "priority for your package be changed from the old section or priority to the "
 "role=\"package\">ftp.debian.org</systemitem> requesting that the section or "
 "priority for your package be changed from the old section or priority to the "

-"new one.  Be sure to explain your reasoning."
+"new one. Use a Subject like <literal>override: PACKAGE1:section/priority, "
+"[...], PACKAGEX:section/priority</literal>, and include the justification "
+"for the change in the body of the bug report."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: pkgs.dbk:519
+#. type: Content of: <chapter><section><para>
+#: pkgs.dbk:531

 msgid ""
 msgid ""

-"For more information about <emphasis>override files</emphasis>, see "
+"For more information about <literal>override files</literal>, see "

 "<citerefentry> <refentrytitle>dpkg-scanpackages</refentrytitle> "
 "<manvolnum>1</manvolnum> </citerefentry> and <ulink "
 "<citerefentry> <refentrytitle>dpkg-scanpackages</refentrytitle> "
 "<manvolnum>1</manvolnum> </citerefentry> and <ulink "

-"url=\"http://www.debian.org/Bugs/Developer#maintincorrect\"></ulink>."
+"url=\"&url-bts-devel;#maintincorrect\"></ulink>."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: pkgs.dbk:525
+#. type: Content of: <chapter><section><para>
+#: pkgs.dbk:537

 msgid ""
 "Note that the <literal>Section</literal> field describes both the section as "
 "well as the subsection, which are described in <xref "
 msgid ""
 "Note that the <literal>Section</literal> field describes both the section as "
 "well as the subsection, which are described in <xref "

-"linkend=\"archive-sections\"/> .  If the section is main, it should be "
+"linkend=\"archive-sections\"/>.  If the section is main, it should be "

 "omitted.  The list of allowable subsections can be found in <ulink "
 "omitted.  The list of allowable subsections can be found in <ulink "

-"url=\"http://www.debian.org/doc/debian-policy/ch-archive.html#s-subsections\"></ulink>."
+"url=\"&url-debian-policy;ch-archive.html#s-subsections\"></ulink>."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><title>
-#: pkgs.dbk:534
+#. type: Content of: <chapter><section><title>
+#: pkgs.dbk:546

 msgid "Handling bugs"
 msgstr ""
 
 msgid "Handling bugs"
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: pkgs.dbk:536
+#. type: Content of: <chapter><section><para>
+#: pkgs.dbk:548

 msgid ""
 "Every developer has to be able to work with the Debian <ulink "
 msgid ""
 "Every developer has to be able to work with the Debian <ulink "

-"url=\"http://www.debian.org/Bugs/\">bug tracking system</ulink>.  This "
-"includes knowing how to file bug reports properly (see <xref "
-"linkend=\"submit-bug\"/> ), how to update them and reorder them, and how to "
-"process and close them."
+"url=\"&url-bts;\">bug tracking system</ulink>.  This includes knowing how to "
+"file bug reports properly (see <xref linkend=\"submit-bug\"/>), how to "
+"update them and reorder them, and how to process and close them."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: pkgs.dbk:542
+#. type: Content of: <chapter><section><para>
+#: pkgs.dbk:554

 msgid ""
 "The bug tracking system's features are described in the <ulink "
 msgid ""
 "The bug tracking system's features are described in the <ulink "

-"url=\"http://www.debian.org/Bugs/Developer\">BTS documentation for "
-"developers</ulink>.  This includes closing bugs, sending followup messages, "
-"assigning severities and tags, marking bugs as forwarded, and other issues."
+"url=\"&url-bts-devel;\">BTS documentation for developers</ulink>.  This "
+"includes closing bugs, sending followup messages, assigning severities and "
+"tags, marking bugs as forwarded, and other issues."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: pkgs.dbk:548
+#. type: Content of: <chapter><section><para>
+#: pkgs.dbk:560

 msgid ""
 "Operations such as reassigning bugs to other packages, merging separate bug "
 "reports about the same issue, or reopening bugs when they are prematurely "
 "closed, are handled using the so-called control mail server.  All of the "
 "commands available on this server are described in the <ulink "
 msgid ""
 "Operations such as reassigning bugs to other packages, merging separate bug "
 "reports about the same issue, or reopening bugs when they are prematurely "
 "closed, are handled using the so-called control mail server.  All of the "
 "commands available on this server are described in the <ulink "

-"url=\"http://www.debian.org/Bugs/server-control\">BTS control server "
-"documentation</ulink>."
+"url=\"&url-bts-control;\">BTS control server documentation</ulink>."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: pkgs.dbk:556
+#. type: Content of: <chapter><section><section><title>
+#: pkgs.dbk:568

 msgid "Monitoring bugs"
 msgstr ""
 
 msgid "Monitoring bugs"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:558
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:570

 msgid ""
 "If you want to be a good maintainer, you should periodically check the "
 msgid ""
 "If you want to be a good maintainer, you should periodically check the "

-"<ulink url=\"http://www.debian.org/Bugs/\">Debian bug tracking system "
-"(BTS)</ulink> for your packages.  The BTS contains all the open bugs against "
-"your packages.  You can check them by browsing this page: "
-"<literal>http://bugs.debian.org/<replaceable>yourlogin</replaceable>@debian.org</literal>."
+"<ulink url=\"&url-bts;\">Debian bug tracking system (BTS)</ulink> for your "
+"packages.  The BTS contains all the open bugs against your packages.  You "
+"can check them by browsing this page: "
+"<literal>http://&bugs-host;/<replaceable>yourlogin</replaceable>@debian.org</literal>."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:565
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:577

 msgid ""
 "Maintainers interact with the BTS via email addresses at "
 msgid ""
 "Maintainers interact with the BTS via email addresses at "

-"<literal>bugs.debian.org</literal>.  Documentation on available commands can "
-"be found at <ulink url=\"http://www.debian.org/Bugs/\"></ulink>, or, if you "
-"have installed the <systemitem role=\"package\">doc-debian</systemitem> "
-"package, you can look at the local files "
-"<filename>/usr/share/doc/debian/bug-*</filename>."
+"<literal>&bugs-host;</literal>.  Documentation on available commands can be "
+"found at <ulink url=\"&url-bts;\"></ulink>, or, if you have installed the "
+"<systemitem role=\"package\">doc-debian</systemitem> package, you can look "
+"at the local files &file-bts-docs;."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:572
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:584

 msgid ""
 "Some find it useful to get periodic reports on open bugs.  You can add a "
 "cron job such as the following if you want to get a weekly email outlining "
 "all the open bugs against your packages:"
 msgstr ""
 
 msgid ""
 "Some find it useful to get periodic reports on open bugs.  You can add a "
 "cron job such as the following if you want to get a weekly email outlining "
 "all the open bugs against your packages:"
 msgstr ""
 

-# type: Content of: <chapter><section><section><screen>
-#: pkgs.dbk:577
+#. type: Content of: <chapter><section><section><screen>
+#: pkgs.dbk:589

 #, no-wrap
 msgid ""
 "# ask for weekly reports of bugs in my packages\n"
 #, no-wrap
 msgid ""
 "# ask for weekly reports of bugs in my packages\n"

-"0 17 * * fri   echo index maint <replaceable>address</replaceable> | mail "
-"request@bugs.debian.org"
+"&cron-bug-report;\n"

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:581
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:593

 msgid ""
 "Replace <replaceable>address</replaceable> with your official Debian "
 "maintainer address."
 msgstr ""
 
 msgid ""
 "Replace <replaceable>address</replaceable> with your official Debian "
 "maintainer address."
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: pkgs.dbk:587
+#. type: Content of: <chapter><section><section><title>
+#: pkgs.dbk:599

 msgid "Responding to bugs"
 msgstr ""
 
 msgid "Responding to bugs"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:589
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:601

 msgid ""
 "When responding to bugs, make sure that any discussion you have about bugs "
 "is sent both to the original submitter of the bug, and to the bug itself "
 msgid ""
 "When responding to bugs, make sure that any discussion you have about bugs "
 "is sent both to the original submitter of the bug, and to the bug itself "

-"(e.g., <email>123@bugs.debian.org</email>).  If you're writing a new mail "
-"and you don't remember the submitter email address, you can use the "
-"<email>123-submitter@bugs.debian.org</email> email to contact the submitter "
-"<emphasis>and</emphasis> to record your mail within the bug log (that means "
-"you don't need to send a copy of the mail to "
-"<email>123@bugs.debian.org</email>)."
+"(e.g., <email><replaceable>123</replaceable>@&bugs-host;</email>).  If "
+"you're writing a new mail and you don't remember the submitter email "
+"address, you can use the "
+"<email><replaceable>123</replaceable>-submitter@&bugs-host;</email> email to "
+"contact the submitter <emphasis>and</emphasis> to record your mail within "
+"the bug log (that means you don't need to send a copy of the mail to "
+"<email><replaceable>123</replaceable>@&bugs-host;</email>)."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:598
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:610

 msgid ""
 "If you get a bug which mentions FTBFS, this means Fails to build from "
 "source.  Porters frequently use this acronym."
 msgstr ""
 
 msgid ""
 "If you get a bug which mentions FTBFS, this means Fails to build from "
 "source.  Porters frequently use this acronym."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:602
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:614

 msgid ""
 "Once you've dealt with a bug report (e.g.  fixed it), mark it as "
 msgid ""
 "Once you've dealt with a bug report (e.g.  fixed it), mark it as "

-"<emphasis>done</emphasis> (close it) by sending an explanation message to "
-"<email>123-done@bugs.debian.org</email>.  If you're fixing a bug by changing "
-"and uploading the package, you can automate bug closing as described in "
-"<xref linkend=\"upload-bugfix\"/> ."
+"<literal>done</literal> (close it) by sending an explanation message to "
+"<email><replaceable>123</replaceable>-done@&bugs-host;</email>.  If you're "
+"fixing a bug by changing and uploading the package, you can automate bug "
+"closing as described in <xref linkend=\"upload-bugfix\"/>."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:609
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:621

 msgid ""
 "You should <emphasis>never</emphasis> close bugs via the bug server "
 msgid ""
 "You should <emphasis>never</emphasis> close bugs via the bug server "

-"<literal>close</literal> command sent to "
-"<email>control@bugs.debian.org</email>.  If you do so, the original "
-"submitter will not receive any information about why the bug was closed."
+"<literal>close</literal> command sent to &email-bts-control;.  If you do so, "
+"the original submitter will not receive any information about why the bug "
+"was closed."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: pkgs.dbk:617
+#. type: Content of: <chapter><section><section><title>
+#: pkgs.dbk:629

 msgid "Bug housekeeping"
 msgstr ""
 
 msgid "Bug housekeeping"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:619
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:631

 msgid ""
 "As a package maintainer, you will often find bugs in other packages or have "
 "bugs reported against your packages which are actually bugs in other "
 "packages.  The bug tracking system's features are described in the <ulink "
 msgid ""
 "As a package maintainer, you will often find bugs in other packages or have "
 "bugs reported against your packages which are actually bugs in other "
 "packages.  The bug tracking system's features are described in the <ulink "

-"url=\"http://www.debian.org/Bugs/Developer\">BTS documentation for Debian "
-"developers</ulink>.  Operations such as reassigning, merging, and tagging "
-"bug reports are described in the <ulink "
-"url=\"http://www.debian.org/Bugs/server-control\">BTS control server "
+"url=\"&url-bts-devel;\">BTS documentation for Debian developers</ulink>.  "
+"Operations such as reassigning, merging, and tagging bug reports are "
+"described in the <ulink url=\"&url-bts-control;\">BTS control server "

 "documentation</ulink>.  This section contains some guidelines for managing "
 "your own bugs, based on the collective Debian developer experience."
 msgstr ""
 
 "documentation</ulink>.  This section contains some guidelines for managing "
 "your own bugs, based on the collective Debian developer experience."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:630
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:642

 msgid ""
 "Filing bugs for problems that you find in other packages is one of the civic "
 "obligations of maintainership, see <xref linkend=\"submit-bug\"/> for "
 msgid ""
 "Filing bugs for problems that you find in other packages is one of the civic "
 "obligations of maintainership, see <xref linkend=\"submit-bug\"/> for "


@@ -917,13 +905,13 @@ msgid ""
 "important."
 msgstr ""
 
 "important."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:635
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:647

 msgid "Here's a list of steps that you may follow to handle a bug report:"
 msgstr ""
 
 msgid "Here's a list of steps that you may follow to handle a bug report:"
 msgstr ""
 

-# type: Content of: <chapter><section><section><orderedlist><listitem><para>
-#: pkgs.dbk:640
+#. type: Content of: <chapter><section><section><orderedlist><listitem><para>
+#: pkgs.dbk:652

 msgid ""
 "Decide whether the report corresponds to a real bug or not.  Sometimes users "
 "are just calling a program in the wrong way because they haven't read the "
 msgid ""
 "Decide whether the report corresponds to a real bug or not.  Sometimes users "
 "are just calling a program in the wrong way because they haven't read the "


@@ -935,8 +923,8 @@ msgid ""
 "This is an issue that may need to be brought up with the upstream author."
 msgstr ""
 
 "This is an issue that may need to be brought up with the upstream author."
 msgstr ""
 

-# type: Content of: <chapter><section><section><orderedlist><listitem><para>
-#: pkgs.dbk:650
+#. type: Content of: <chapter><section><section><orderedlist><listitem><para>
+#: pkgs.dbk:662

 msgid ""
 "If the bug submitter disagrees with your decision to close the bug, they may "
 "reopen it until you find an agreement on how to handle it.  If you don't "
 msgid ""
 "If the bug submitter disagrees with your decision to close the bug, they may "
 "reopen it until you find an agreement on how to handle it.  If you don't "


@@ -946,24 +934,39 @@ msgid ""
 "decision of the technical committee by reassigning the bug to <systemitem "
 "role=\"package\">tech-ctte</systemitem> (you may use the clone command of "
 "the BTS if you wish to keep it reported against your package).  Before doing "
 "decision of the technical committee by reassigning the bug to <systemitem "
 "role=\"package\">tech-ctte</systemitem> (you may use the clone command of "
 "the BTS if you wish to keep it reported against your package).  Before doing "

-"so, please read the <ulink "
-"url=\"http://www.debian.org/devel/tech-ctte\">recommended procedure</ulink>."
+"so, please read the <ulink url=\"&url-tech-ctte;\">recommended "
+"procedure</ulink>."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><orderedlist><listitem><para>
-#: pkgs.dbk:664
+#. type: Content of: <chapter><section><section><orderedlist><listitem><para>
+#: pkgs.dbk:676

 msgid ""
 "If the bug is real but it's caused by another package, just reassign the bug "
 "to the right package.  If you don't know which package it should be "
 "reassigned to, you should ask for help on <link "
 msgid ""
 "If the bug is real but it's caused by another package, just reassign the bug "
 "to the right package.  If you don't know which package it should be "
 "reassigned to, you should ask for help on <link "

-"linkend=\"irc-channels\">IRC</link> or on "
-"<email>debian-devel@lists.debian.org</email>.  Please make sure that the "
-"maintainer(s) of the package the bug is reassigned to know why you "
-"reassigned it."
+"linkend=\"irc-channels\">IRC</link> or on &email-debian-devel;.  Please "
+"inform the maintainer(s) of the package you reassign the bug to, for example "
+"by Cc:ing the message that does the reassign to "
+"<email><replaceable>packagename</replaceable>@packages.debian.org</email> "
+"and explaining your reasons in that mail. Please note that a simple "
+"reassignment is <emphasis>not</emphasis> e-mailed to the maintainers of the "
+"package being reassigned to, so they won't know about it until they look at "
+"a bug overview for their packages."
+msgstr ""
+
+#. type: Content of: <chapter><section><section><orderedlist><listitem><para>
+#: pkgs.dbk:688
+msgid ""
+"If the bug affects the operation of your package, please consider cloning "
+"the bug and reassigning the clone to the package that really causes the "
+"behavior. Otherwise, the bug will not be shown in your package's bug list, "
+"possibly causing users to report the same bug over and over again. You "
+"should block \"your\" bug with the reassigned, cloned bug to document the "
+"relationship."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><orderedlist><listitem><para>
-#: pkgs.dbk:672
+#. type: Content of: <chapter><section><section><orderedlist><listitem><para>
+#: pkgs.dbk:698

 msgid ""
 "Sometimes you also have to adjust the severity of the bug so that it matches "
 "our definition of the severity.  That's because people tend to inflate the "
 msgid ""
 "Sometimes you also have to adjust the severity of the bug so that it matches "
 "our definition of the severity.  That's because people tend to inflate the "


@@ -972,8 +975,8 @@ msgid ""
 "cosmetic."
 msgstr ""
 
 "cosmetic."
 msgstr ""
 

-# type: Content of: <chapter><section><section><orderedlist><listitem><para>
-#: pkgs.dbk:680
+#. type: Content of: <chapter><section><section><orderedlist><listitem><para>
+#: pkgs.dbk:706

 msgid ""
 "If the bug is real but the same problem has already been reported by someone "
 "else, then the two relevant bug reports should be merged into one using the "
 msgid ""
 "If the bug is real but the same problem has already been reported by someone "
 "else, then the two relevant bug reports should be merged into one using the "


@@ -984,8 +987,8 @@ msgid ""
 "its relative, the unmerge command, see the BTS control server documentation."
 msgstr ""
 
 "its relative, the unmerge command, see the BTS control server documentation."
 msgstr ""
 

-# type: Content of: <chapter><section><section><orderedlist><listitem><para>
-#: pkgs.dbk:691
+#. type: Content of: <chapter><section><section><orderedlist><listitem><para>
+#: pkgs.dbk:717

 msgid ""
 "The bug submitter may have forgotten to provide some information, in which "
 "case you have to ask them for the required information.  You may use the "
 msgid ""
 "The bug submitter may have forgotten to provide some information, in which "
 "case you have to ask them for the required information.  You may use the "


@@ -996,47 +999,47 @@ msgid ""
 "been sent by someone, the bug may be closed."
 msgstr ""
 
 "been sent by someone, the bug may be closed."
 msgstr ""
 

-# type: Content of: <chapter><section><section><orderedlist><listitem><para>
-#: pkgs.dbk:702
+#. type: Content of: <chapter><section><section><orderedlist><listitem><para>
+#: pkgs.dbk:728

 msgid ""
 "If the bug is related to the packaging, you just fix it.  If you are not "
 "able to fix it yourself, then tag the bug as <literal>help</literal>.  You "
 msgid ""
 "If the bug is related to the packaging, you just fix it.  If you are not "
 "able to fix it yourself, then tag the bug as <literal>help</literal>.  You "

-"can also ask for help on <email>debian-devel@lists.debian.org</email> or "
-"<email>debian-qa@lists.debian.org</email>.  If it's an upstream problem, you "
-"have to forward it to the upstream author.  Forwarding a bug is not enough, "
-"you have to check at each release if the bug has been fixed or not.  If it "
-"has, you just close it, otherwise you have to remind the author about it.  "
-"If you have the required skills you can prepare a patch that fixes the bug "
-"and send it to the author at the same time.  Make sure to send the patch to "
-"the BTS and to tag the bug as <literal>patch</literal>."
+"can also ask for help on &email-debian-devel; or &email-debian-qa;.  If it's "
+"an upstream problem, you have to forward it to the upstream author.  "
+"Forwarding a bug is not enough, you have to check at each release if the bug "
+"has been fixed or not.  If it has, you just close it, otherwise you have to "
+"remind the author about it.  If you have the required skills you can prepare "
+"a patch that fixes the bug and send it to the author at the same time.  Make "
+"sure to send the patch to the BTS and to tag the bug as "
+"<literal>patch</literal>."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><orderedlist><listitem><para>
-#: pkgs.dbk:716
+#. type: Content of: <chapter><section><section><orderedlist><listitem><para>
+#: pkgs.dbk:742

 msgid ""
 "If you have fixed a bug in your local copy, or if a fix has been committed "
 msgid ""
 "If you have fixed a bug in your local copy, or if a fix has been committed "

-"to the CVS repository, you may tag the bug as <literal>pending</literal> to "
+"to the VCS repository, you may tag the bug as <literal>pending</literal> to "

 "let people know that the bug is corrected and that it will be closed with "
 "the next upload (add the <literal>closes:</literal> in the "
 "<filename>changelog</filename>).  This is particularly useful if you are "
 "several developers working on the same package."
 msgstr ""
 
 "let people know that the bug is corrected and that it will be closed with "
 "the next upload (add the <literal>closes:</literal> in the "
 "<filename>changelog</filename>).  This is particularly useful if you are "
 "several developers working on the same package."
 msgstr ""
 

-# type: Content of: <chapter><section><section><orderedlist><listitem><para>
-#: pkgs.dbk:726
+#. type: Content of: <chapter><section><section><orderedlist><listitem><para>
+#: pkgs.dbk:752

 msgid ""
 msgid ""

-"Once a corrected package is available in the <emphasis>unstable</emphasis> "
-"distribution, you can close the bug.  This can be done automatically, read "
-"<xref linkend=\"upload-bugfix\"/> ."
+"Once a corrected package is available in the archive, the bug should be "
+"closed indicating the version in which it was fixed. This can be done "
+"automatically, read <xref linkend=\"upload-bugfix\"/>."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: pkgs.dbk:735
+#. type: Content of: <chapter><section><section><title>
+#: pkgs.dbk:761

 msgid "When bugs are closed by new uploads"
 msgstr ""
 
 msgid "When bugs are closed by new uploads"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:737
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:763

 msgid ""
 "As bugs and problems are fixed in your packages, it is your responsibility "
 "as the package maintainer to close these bugs.  However, you should not "
 msgid ""
 "As bugs and problems are fixed in your packages, it is your responsibility "
 "as the package maintainer to close these bugs.  However, you should not "


@@ -1046,8 +1049,8 @@ msgid ""
 "bug in the BTS.  Also, the bug should be closed with the correct version."
 msgstr ""
 
 "bug in the BTS.  Also, the bug should be closed with the correct version."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:745
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:771

 msgid ""
 "However, it's possible to avoid having to manually close bugs after the "
 "upload — just list the fixed bugs in your "
 msgid ""
 "However, it's possible to avoid having to manually close bugs after the "
 "upload — just list the fixed bugs in your "


@@ -1055,156 +1058,189 @@ msgid ""
 "the archive maintenance software will close the bugs for you.  For example:"
 msgstr ""
 
 "the archive maintenance software will close the bugs for you.  For example:"
 msgstr ""
 

-# type: Content of: <chapter><section><section><screen>
-#: pkgs.dbk:751
+#. type: Content of: <chapter><section><section><screen>
+#: pkgs.dbk:777

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-"-cannon (3.1415) unstable; urgency=low\n"
+"acme-cannon (3.1415) unstable; urgency=low\n"

 "\n"
 "  * Frobbed with options (closes: Bug#98339)\n"
 "  * Added safety to prevent operator dismemberment, closes: bug#98765,\n"
 "    bug#98713, #98714.\n"
 "\n"
 "  * Frobbed with options (closes: Bug#98339)\n"
 "  * Added safety to prevent operator dismemberment, closes: bug#98765,\n"
 "    bug#98713, #98714.\n"

-"  * Added man page. Closes: #98725."
+"  * Added man page. Closes: #98725.\n"

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:759
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:785

 msgid ""
 "Technically speaking, the following Perl regular expression describes how "
 "bug closing changelogs are identified:"
 msgstr ""
 
 msgid ""
 "Technically speaking, the following Perl regular expression describes how "
 "bug closing changelogs are identified:"
 msgstr ""
 

-# type: Content of: <chapter><section><section><screen>
-#: pkgs.dbk:763
+#. type: Content of: <chapter><section><section><screen>
+#: pkgs.dbk:789

 #, no-wrap
 #, no-wrap

-msgid "/closes:\\s*(?:bug)?\\#\\s*\\d+(?:,\\s*(?:bug)?\\#\\s*\\d+)*/ig"
+msgid "  /closes:\\s*(?:bug)?\\#\\s*\\d+(?:,\\s*(?:bug)?\\#\\s*\\d+)*/ig\n"

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:766
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:792

 msgid ""
 "We prefer the <literal>closes: #<replaceable>XXX</replaceable></literal> "
 "syntax, as it is the most concise entry and the easiest to integrate with "
 "the text of the <filename>changelog</filename>.  Unless specified different "
 msgid ""
 "We prefer the <literal>closes: #<replaceable>XXX</replaceable></literal> "
 "syntax, as it is the most concise entry and the easiest to integrate with "
 "the text of the <filename>changelog</filename>.  Unless specified different "

-"by the <replaceable>-v</replaceable>-switch to "
-"<command>dpkg-buildpackage</command>, only the bugs closed in the most "
-"recent changelog entry are closed (basically, exactly the bugs mentioned in "
-"the changelog-part in the <filename>.changes</filename> file are closed)."
+"by the <literal>-v</literal>-switch to <command>dpkg-buildpackage</command>, "
+"only the bugs closed in the most recent changelog entry are closed "
+"(basically, exactly the bugs mentioned in the changelog-part in the "
+"<filename>.changes</filename> file are closed)."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:775
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:801

 msgid ""
 msgid ""

-"Historically, uploads identified as <link linkend=\"nmu\">Non-maintainer "
+"Historically, uploads identified as <link linkend=\"nmu\">non-maintainer "

 "upload (NMU)</link> were tagged <literal>fixed</literal> instead of being "
 "closed, but that practice was ceased with the advent of version-tracking.  "
 "The same applied to the tag <literal>fixed-in-experimental</literal>."
 msgstr ""
 
 "upload (NMU)</link> were tagged <literal>fixed</literal> instead of being "
 "closed, but that practice was ceased with the advent of version-tracking.  "
 "The same applied to the tag <literal>fixed-in-experimental</literal>."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:781
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:807

 msgid ""
 "If you happen to mistype a bug number or forget a bug in the changelog "
 "entries, don't hesitate to undo any damage the error caused.  To reopen "
 "wrongly closed bugs, send a <literal>reopen "
 "<replaceable>XXX</replaceable></literal> command to the bug tracking "
 msgid ""
 "If you happen to mistype a bug number or forget a bug in the changelog "
 "entries, don't hesitate to undo any damage the error caused.  To reopen "
 "wrongly closed bugs, send a <literal>reopen "
 "<replaceable>XXX</replaceable></literal> command to the bug tracking "

-"system's control address, <email>control@bugs.debian.org</email>.  To close "
-"any remaining bugs that were fixed by your upload, email the "
-"<filename>.changes</filename> file to "
-"<email>XXX-done@bugs.debian.org</email>, where "
-"<replaceable>XXX</replaceable> is the bug number, and put Version: YYY and "
-"an empty line as the first two lines of the body of the email, where "
-"<replaceable>YYY</replaceable> is the first version where the bug has been "
-"fixed."
+"system's control address, &email-bts-control;.  To close any remaining bugs "
+"that were fixed by your upload, email the <filename>.changes</filename> file "
+"to <email><replaceable>XXX</replaceable>-done@&bugs-host;</email>, where "
+"<replaceable>XXX</replaceable> is the bug number, and put Version: "
+"<replaceable>YYY</replaceable> and an empty line as the first two lines of "
+"the body of the email, where <replaceable>YYY</replaceable> is the first "
+"version where the bug has been fixed."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:793
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:819

 msgid ""
 "Bear in mind that it is not obligatory to close bugs using the changelog as "
 "described above.  If you simply want to close bugs that don't have anything "
 "to do with an upload you made, do it by emailing an explanation to "
 msgid ""
 "Bear in mind that it is not obligatory to close bugs using the changelog as "
 "described above.  If you simply want to close bugs that don't have anything "
 "to do with an upload you made, do it by emailing an explanation to "

-"<email>XXX-done@bugs.debian.org</email>.  Do <emphasis "
-"role=\"strong\">not</emphasis> close bugs in the changelog entry of a "
-"version if the changes in that version of the package don't have any bearing "
-"on the bug."
+"<email><replaceable>XXX</replaceable>-done@&bugs-host;</email>.  Do "
+"<emphasis role=\"strong\">not</emphasis> close bugs in the changelog entry "
+"of a version if the changes in that version of the package don't have any "
+"bearing on the bug."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:801
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:827

 msgid ""
 "For general information on how to write your changelog entries, see <xref "
 msgid ""
 "For general information on how to write your changelog entries, see <xref "

-"linkend=\"bpp-debian-changelog\"/> ."
+"linkend=\"bpp-debian-changelog\"/>."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: pkgs.dbk:807
+#. type: Content of: <chapter><section><section><title>
+#: pkgs.dbk:833

 msgid "Handling security-related bugs"
 msgstr ""
 
 msgid "Handling security-related bugs"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:809
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:835

 msgid ""
 "Due to their sensitive nature, security-related bugs must be handled "
 "carefully.  The Debian Security Team exists to coordinate this activity, "
 "keeping track of outstanding security problems, helping maintainers with "
 "security problems or fixing them themselves, sending security advisories, "
 msgid ""
 "Due to their sensitive nature, security-related bugs must be handled "
 "carefully.  The Debian Security Team exists to coordinate this activity, "
 "keeping track of outstanding security problems, helping maintainers with "
 "security problems or fixing them themselves, sending security advisories, "

-"and maintaining security.debian.org."
+"and maintaining <literal>security.debian.org</literal>."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:816
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:842

 msgid ""
 "When you become aware of a security-related bug in a Debian package, whether "
 "or not you are the maintainer, collect pertinent information about the "
 msgid ""
 "When you become aware of a security-related bug in a Debian package, whether "
 "or not you are the maintainer, collect pertinent information about the "

-"problem, and promptly contact the security team at "
-"<email>team@security.debian.org</email> as soon as possible.  <emphasis "
-"role=\"strong\">DO NOT UPLOAD</emphasis> any packages for stable; the "
-"security team will do that.  Useful information includes, for example:"
+"problem, and promptly contact the security team at &email-security-team; as "
+"soon as possible.  <emphasis role=\"strong\">DO NOT UPLOAD</emphasis> any "
+"packages for <literal>stable</literal> without contacting the team.  Useful "
+"information includes, for example:"

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:826
+#. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
+#: pkgs.dbk:852

 msgid ""
 "Which versions of the package are known to be affected by the bug.  Check "
 "each version that is present in a supported Debian release, as well as "
 msgid ""
 "Which versions of the package are known to be affected by the bug.  Check "
 "each version that is present in a supported Debian release, as well as "

-"testing and unstable."
+"<literal>testing</literal> and <literal>unstable</literal>."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:833
+#. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
+#: pkgs.dbk:859

 msgid "The nature of the fix, if any is available (patches are especially helpful)"
 msgstr ""
 
 msgid "The nature of the fix, if any is available (patches are especially helpful)"
 msgstr ""
 

-# type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:838
+#. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
+#: pkgs.dbk:864

 msgid ""
 "Any fixed packages that you have prepared yourself (send only the "
 "<literal>.diff.gz</literal> and <literal>.dsc</literal> files and read <xref "
 "linkend=\"bug-security-building\"/> first)"
 msgstr ""
 
 msgid ""
 "Any fixed packages that you have prepared yourself (send only the "
 "<literal>.diff.gz</literal> and <literal>.dsc</literal> files and read <xref "
 "linkend=\"bug-security-building\"/> first)"
 msgstr ""
 

-# type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:845
+#. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
+#: pkgs.dbk:871

 msgid ""
 "Any assistance you can provide to help with testing (exploits, regression "
 "testing, etc.)"
 msgstr ""
 
 msgid ""
 "Any assistance you can provide to help with testing (exploits, regression "
 "testing, etc.)"
 msgstr ""
 

-# type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:851
+#. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
+#: pkgs.dbk:877

 msgid ""
 "Any information needed for the advisory (see <xref "
 msgid ""
 "Any information needed for the advisory (see <xref "

-"linkend=\"bug-security-advisories\"/> )"
+"linkend=\"bug-security-advisories\"/>)"
+msgstr ""
+
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:882
+msgid ""
+"As the maintainer of the package, you have the responsibility to maintain "
+"it, even in the stable release. You are in the best position to evaluate "
+"patches and test updated packages, so please see the sections below on how "
+"to prepare packages for the Security Team to handle."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><title>
-#: pkgs.dbk:857
+#. type: Content of: <chapter><section><section><section><title>
+#: pkgs.dbk:888
+msgid "The Security Tracker"
+msgstr ""
+
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:890
+msgid ""
+"The security team maintains a central database, the <ulink "
+"url=\"http://security-tracker.debian.org/\">Debian Security "
+"Tracker</ulink>.  This contains all public information that is known about "
+"security issues: which packages and versions are affected or fixed, and thus "
+"whether stable, testing and/or unstable are vulnerable. Information that is "
+"still confidential is not added to the tracker."
+msgstr ""
+
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:898
+msgid ""
+"You can search it for a specific issue, but also on package name. Look for "
+"your package to see which issues are still open. If you can, please provide "
+"more information about those issues, or help to address them in your "
+"package.  Instructions are on the tracker web pages."
+msgstr ""
+
+#. type: Content of: <chapter><section><section><section><title>
+#: pkgs.dbk:906

 msgid "Confidentiality"
 msgstr ""
 
 msgid "Confidentiality"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:859
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:908

 msgid ""
 "Unlike most other activities within Debian, information about security "
 "issues must sometimes be kept private for a time.  This allows software "
 msgid ""
 "Unlike most other activities within Debian, information about security "
 "issues must sometimes be kept private for a time.  This allows software "


@@ -1214,28 +1250,28 @@ msgid ""
 "knowledge."
 msgstr ""
 
 "knowledge."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:866
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:915

 msgid "There are several ways developers can learn of a security problem:"
 msgstr ""
 
 msgid "There are several ways developers can learn of a security problem:"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:871
+#. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
+#: pkgs.dbk:920

 msgid "they notice it on a public forum (mailing list, web site, etc.)"
 msgstr ""
 
 msgid "they notice it on a public forum (mailing list, web site, etc.)"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:876
+#. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
+#: pkgs.dbk:925

 msgid "someone files a bug report"
 msgstr ""
 
 msgid "someone files a bug report"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:881
+#. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
+#: pkgs.dbk:930

 msgid "someone informs them via private email"
 msgstr ""
 
 msgid "someone informs them via private email"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:886
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:935

 msgid ""
 "In the first two cases, the information is public and it is important to "
 "have a fix as soon as possible.  In the last case, however, it might not be "
 msgid ""
 "In the first two cases, the information is public and it is important to "
 "have a fix as soon as possible.  In the last case, however, it might not be "


@@ -1243,23 +1279,23 @@ msgid ""
 "dealing with the problem:"
 msgstr ""
 
 "dealing with the problem:"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:894
+#. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
+#: pkgs.dbk:943

 msgid ""
 "If the security exposure is minor, there is sometimes no need to keep the "
 "problem a secret and a fix should be made and released."
 msgstr ""
 
 msgid ""
 "If the security exposure is minor, there is sometimes no need to keep the "
 "problem a secret and a fix should be made and released."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:900
+#. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
+#: pkgs.dbk:949

 msgid ""
 "If the problem is severe, it is preferable to share the information with "
 "other vendors and coordinate a release.  The security team keeps in contact "
 "with the various organizations and individuals and can take care of that."
 msgstr ""
 
 msgid ""
 "If the problem is severe, it is preferable to share the information with "
 "other vendors and coordinate a release.  The security team keeps in contact "
 "with the various organizations and individuals and can take care of that."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:907
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:956

 msgid ""
 "In all cases if the person who reports the problem asks that it not be "
 "disclosed, such requests should be honored, with the obvious exception of "
 msgid ""
 "In all cases if the person who reports the problem asks that it not be "
 "disclosed, such requests should be honored, with the obvious exception of "


@@ -1268,117 +1304,127 @@ msgid ""
 "team, be sure to mention this fact."
 msgstr ""
 
 "team, be sure to mention this fact."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:914
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:963

 msgid ""
 msgid ""

-"Please note that if secrecy is needed you may not upload a fix to unstable "
-"(or anywhere else, such as a public CVS repository).  It is not sufficient "
-"to obfuscate the details of the change, as the code itself is public, and "
-"can (and will) be examined by the general public."
+"Please note that if secrecy is needed you may not upload a fix to "
+"<literal>unstable</literal> (or anywhere else, such as a public VCS "
+"repository).  It is not sufficient to obfuscate the details of the change, "
+"as the code itself is public, and can (and will) be examined by the general "
+"public."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:920
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:970

 msgid ""
 "There are two reasons for releasing information even though secrecy is "
 "requested: the problem has been known for a while, or the problem or exploit "
 "has become public."
 msgstr ""
 
 msgid ""
 "There are two reasons for releasing information even though secrecy is "
 "requested: the problem has been known for a while, or the problem or exploit "
 "has become public."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><title>
-#: pkgs.dbk:927
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:975
+msgid ""
+"The Security Team has a PGP-key to enable encrypted communication about "
+"sensitive issues. See the <ulink "
+"url=\"http://www.debian.org/security/faq#contact\">Security Team FAQ</ulink> "
+"for details."
+msgstr ""
+
+#. type: Content of: <chapter><section><section><section><title>
+#: pkgs.dbk:981

 msgid "Security Advisories"
 msgstr ""
 
 msgid "Security Advisories"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:929
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:983

 msgid ""
 "Security advisories are only issued for the current, released stable "
 msgid ""
 "Security advisories are only issued for the current, released stable "

-"distribution, and <emphasis>not</emphasis> for testing or unstable.  When "
-"released, advisories are sent to the "
-"<email>debian-security-announce@lists.debian.org</email> mailing list and "
-"posted on <ulink url=\"http://www.debian.org/security/\">the security web "
-"page</ulink>.  Security advisories are written and posted by the security "
-"team.  However they certainly do not mind if a maintainer can supply some of "
-"the information for them, or write part of the text.  Information that "
-"should be in an advisory includes:"
-msgstr ""
-
-# type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:942
+"distribution, and <emphasis>not</emphasis> for <literal>testing</literal> or "
+"<literal>unstable</literal>.  When released, advisories are sent to the "
+"&email-debian-security-announce; mailing list and posted on <ulink "
+"url=\"&url-debian-security-advisories;\">the security web page</ulink>.  "
+"Security advisories are written and posted by the security team.  However "
+"they certainly do not mind if a maintainer can supply some of the "
+"information for them, or write part of the text.  Information that should be "
+"in an advisory includes:"
+msgstr ""
+
+#. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
+#: pkgs.dbk:996

 msgid "A description of the problem and its scope, including:"
 msgstr ""
 
 msgid "A description of the problem and its scope, including:"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: pkgs.dbk:947
+#. type: Content of: <chapter><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: pkgs.dbk:1001

 msgid "The type of problem (privilege escalation, denial of service, etc.)"
 msgstr ""
 
 msgid "The type of problem (privilege escalation, denial of service, etc.)"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: pkgs.dbk:952
+#. type: Content of: <chapter><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: pkgs.dbk:1006

 msgid "What privileges may be gained, and by whom (if any)"
 msgstr ""
 
 msgid "What privileges may be gained, and by whom (if any)"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: pkgs.dbk:957
+#. type: Content of: <chapter><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: pkgs.dbk:1011

 msgid "How it can be exploited"
 msgstr ""
 
 msgid "How it can be exploited"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: pkgs.dbk:962
+#. type: Content of: <chapter><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: pkgs.dbk:1016

 msgid "Whether it is remotely or locally exploitable"
 msgstr ""
 
 msgid "Whether it is remotely or locally exploitable"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: pkgs.dbk:967
+#. type: Content of: <chapter><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: pkgs.dbk:1021

 msgid "How the problem was fixed"
 msgstr ""
 
 msgid "How the problem was fixed"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:972
+#. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
+#: pkgs.dbk:1026

 msgid "This information allows users to assess the threat to their systems."
 msgstr ""
 
 msgid "This information allows users to assess the threat to their systems."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:977
+#. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
+#: pkgs.dbk:1031

 msgid "Version numbers of affected packages"
 msgstr ""
 
 msgid "Version numbers of affected packages"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:982
+#. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
+#: pkgs.dbk:1036

 msgid "Version numbers of fixed packages"
 msgstr ""
 
 msgid "Version numbers of fixed packages"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:987
+#. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
+#: pkgs.dbk:1041

 msgid ""
 "Information on where to obtain the updated packages (usually from the Debian "
 "security archive)"
 msgstr ""
 
 msgid ""
 "Information on where to obtain the updated packages (usually from the Debian "
 "security archive)"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:993
+#. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
+#: pkgs.dbk:1047

 msgid ""
 "References to upstream advisories, <ulink "
 "url=\"http://cve.mitre.org\">CVE</ulink> identifiers, and any other "
 "information useful in cross-referencing the vulnerability"
 msgstr ""
 
 msgid ""
 "References to upstream advisories, <ulink "
 "url=\"http://cve.mitre.org\">CVE</ulink> identifiers, and any other "
 "information useful in cross-referencing the vulnerability"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><title>
-#: pkgs.dbk:1002
+#. type: Content of: <chapter><section><section><section><title>
+#: pkgs.dbk:1056

 msgid "Preparing packages to address security issues"
 msgstr ""
 
 msgid "Preparing packages to address security issues"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:1004
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:1058

 msgid ""
 "One way that you can assist the security team in their duties is to provide "
 "them with fixed packages suitable for a security advisory for the stable "
 "Debian release."
 msgstr ""
 
 msgid ""
 "One way that you can assist the security team in their duties is to provide "
 "them with fixed packages suitable for a security advisory for the stable "
 "Debian release."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:1009
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:1063

 msgid ""
 "When an update is made to the stable release, care must be taken to avoid "
 "changing system behavior or introducing new bugs.  In order to do this, make "
 msgid ""
 "When an update is made to the stable release, care must be taken to avoid "
 "changing system behavior or introducing new bugs.  In order to do this, make "


@@ -1388,8 +1434,8 @@ msgid ""
 "sure you never change the API or ABI, no matter how small the change."
 msgstr ""
 
 "sure you never change the API or ABI, no matter how small the change."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:1017
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:1071

 msgid ""
 "This means that moving to a new upstream version is not a good solution.  "
 "Instead, the relevant changes should be back-ported to the version present "
 msgid ""
 "This means that moving to a new upstream version is not a good solution.  "
 "Instead, the relevant changes should be back-ported to the version present "


@@ -1398,8 +1444,8 @@ msgid ""
 "help."
 msgstr ""
 
 "help."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:1023
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:1077

 msgid ""
 "In some cases, it is not possible to back-port a security fix, for example "
 "when large amounts of source code need to be modified or rewritten.  If this "
 msgid ""
 "In some cases, it is not possible to back-port a security fix, for example "
 "when large amounts of source code need to be modified or rewritten.  If this "


@@ -1408,8 +1454,8 @@ msgid ""
 "with the security team beforehand."
 msgstr ""
 
 "with the security team beforehand."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:1030
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:1084

 msgid ""
 "Related to this is another important guideline: always test your changes.  "
 "If you have an exploit available, try it and see if it indeed succeeds on "
 msgid ""
 "Related to this is another important guideline: always test your changes.  "
 "If you have an exploit available, try it and see if it indeed succeeds on "


@@ -1418,8 +1464,8 @@ msgid ""
 "features in subtle ways."
 msgstr ""
 
 "features in subtle ways."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:1037
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:1091

 msgid ""
 "Do <emphasis role=\"strong\">NOT</emphasis> include any changes in your "
 "package which are not directly related to fixing the vulnerability.  These "
 msgid ""
 "Do <emphasis role=\"strong\">NOT</emphasis> include any changes in your "
 "package which are not directly related to fixing the vulnerability.  These "


@@ -1431,246 +1477,267 @@ msgid ""
 "do not attempt to do this."
 msgstr ""
 
 "do not attempt to do this."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:1047
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:1101

 msgid ""
 "Review and test your changes as much as possible.  Check the differences "
 "from the previous version repeatedly (<command>interdiff</command> from the "
 "<systemitem role=\"package\">patchutils</systemitem> package and "
 "<command>debdiff</command> from <systemitem "
 "role=\"package\">devscripts</systemitem> are useful tools for this, see "
 msgid ""
 "Review and test your changes as much as possible.  Check the differences "
 "from the previous version repeatedly (<command>interdiff</command> from the "
 "<systemitem role=\"package\">patchutils</systemitem> package and "
 "<command>debdiff</command> from <systemitem "
 "role=\"package\">devscripts</systemitem> are useful tools for this, see "

-"<xref linkend=\"debdiff\"/> )."
+"<xref linkend=\"debdiff\"/>)."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:1055
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:1109

 msgid "Be sure to verify the following items:"
 msgstr ""
 
 msgid "Be sure to verify the following items:"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:1060
+#. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
+#: pkgs.dbk:1114

 msgid ""
 msgid ""

-"Target the right distribution in your "
-"<filename>debian/changelog</filename>.  For stable this is "
-"<literal>stable-security</literal> and for testing this is "
-"<literal>testing-security</literal>, and for the previous stable release, "
-"this is <literal>oldstable-security</literal>.  Do not target "
-"<replaceable>distribution</replaceable>-proposed-updates or "
-"<literal>stable</literal>!"
+"<emphasis role=\"strong\">Target the right distribution</emphasis> in your "
+"<filename>debian/changelog</filename>.  For <literal>stable</literal> this "
+"is <literal>stable-security</literal> and for <literal>testing</literal> "
+"this is <literal>testing-security</literal>, and for the previous stable "
+"release, this is <literal>oldstable-security</literal>.  Do not target "
+"<replaceable>distribution</replaceable><literal>-proposed-updates</literal> "
+"or <literal>stable</literal>!"

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:1070
-msgid "The upload should have urgency=high."
+#. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
+#: pkgs.dbk:1125
+msgid "The upload should have <emphasis role=\"strong\">urgency=high</emphasis>."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:1075
+#. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
+#: pkgs.dbk:1130

 msgid ""
 "Make descriptive, meaningful changelog entries.  Others will rely on them to "
 msgid ""
 "Make descriptive, meaningful changelog entries.  Others will rely on them to "

-"determine whether a particular bug was fixed.  Always include an external "
-"reference, preferably a CVE identifier, so that it can be cross-referenced.  "
-"Include the same information in the changelog for unstable, so that it is "
-"clear that the same bug was fixed, as this is very helpful when verifying "
-"that the bug is fixed in the next stable release.  If a CVE identifier has "
-"not yet been assigned, the security team will request one so that it can be "
-"included in the package and in the advisory."
-msgstr ""
-
-# type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:1087
-msgid ""
-"Make sure the version number is proper.  It must be greater than the current "
-"package, but less than package versions in later distributions.  If in "
-"doubt, test it with <literal>dpkg --compare-versions</literal>.  Be careful "
-"not to re-use a version number that you have already used for a previous "
-"upload.  For <emphasis>testing</emphasis>, there must be a higher version in "
-"<emphasis>unstable</emphasis>.  If there is none yet (for example, if "
-"<emphasis>testing</emphasis> and <emphasis>unstable</emphasis> have the same "
-"version) you must upload a new version to unstable first."
-msgstr ""
-
-# type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:1099
-msgid ""
-"Do not make source-only uploads if your package has any binary-all packages "
-"(do not use the <literal>-S</literal> option to "
-"<command>dpkg-buildpackage</command>).  The <command>buildd</command> "
-"infrastructure will not build those.  This point applies to normal package "
-"uploads as well."
-msgstr ""
-
-# type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:1108
-msgid ""
-"Unless the upstream source has been uploaded to security.debian.org before "
-"(by a previous security update), build the upload with full upstream source "
+"determine whether a particular bug was fixed.  Add "
+"<literal>closes:</literal> statements for any <emphasis "
+"role=\"strong\">Debian bugs</emphasis> filed.  Always include an external "
+"reference, preferably a <emphasis role=\"strong\">CVE identifier</emphasis>, "
+"so that it can be cross-referenced. However, if a CVE identifier has not yet "
+"been assigned, do not wait for it but continue the process. The identifier "
+"can be cross-referenced later."
+msgstr ""
+
+#. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
+#: pkgs.dbk:1141
+msgid ""
+"Make sure the <emphasis role=\"strong\">version number</emphasis> is "
+"proper.  It must be greater than the current package, but less than package "
+"versions in later distributions.  If in doubt, test it with <literal>dpkg "
+"--compare-versions</literal>.  Be careful not to re-use a version number "
+"that you have already used for a previous upload, or one that conflicts with "
+"a binNMU. The convention is to append "
+"<literal>+</literal><replaceable>codename</replaceable><literal>1</literal>, "
+"e.g.  <literal>1:2.4.3-4+lenny1</literal>, of course increasing 1 for any "
+"subsequent uploads."
+msgstr ""
+
+#. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
+#: pkgs.dbk:1154
+msgid ""
+"Unless the upstream source has been uploaded to <literal>security.debian.org "
+"</literal> before (by a previous security update), build the upload "
+"<emphasis role=\"strong\">with full upstream source</emphasis> "

 "(<literal>dpkg-buildpackage -sa</literal>).  If there has been a previous "
 "(<literal>dpkg-buildpackage -sa</literal>).  If there has been a previous "

-"upload to security.debian.org with the same upstream version, you may upload "
-"without upstream source (<literal>dpkg-buildpackage -sd</literal>)."
+"upload to <literal>security.debian.org</literal> with the same upstream "
+"version, you may upload without upstream source (<literal>dpkg-buildpackage "
+"-sd</literal>)."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:1117
+#. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
+#: pkgs.dbk:1164

 msgid ""
 msgid ""

-"Be sure to use the exact same <filename>*.orig.tar.gz</filename> as used in "
-"the normal archive, otherwise it is not possible to move the security fix "
-"into the main archives later."
+"Be sure to use the <emphasis role=\"strong\">exact same "
+"<filename>*.orig.tar.{gz,bz2,lzma}</filename></emphasis> as used in the "
+"normal archive, otherwise it is not possible to move the security fix into "
+"the main archives later."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:1124
+#. type: Content of: <chapter><section><section><section><itemizedlist><listitem><para>
+#: pkgs.dbk:1172

 msgid ""
 msgid ""

-"Build the package on a clean system which only has packages installed from "
-"the distribution you are building for.  If you do not have such a system "
-"yourself, you can use a debian.org machine (see <xref "
-"linkend=\"server-machines\"/> ) or setup a chroot (see <xref "
-"linkend=\"pbuilder\"/> and <xref linkend=\"debootstrap\"/> )."
+"Build the package on a <emphasis role=\"strong\">clean system</emphasis> "
+"which only has packages installed from the distribution you are building "
+"for. If you do not have such a system yourself, you can use a debian.org "
+"machine (see <xref linkend=\"server-machines\"/>) or setup a chroot (see "
+"<xref linkend=\"pbuilder\"/> and <xref linkend=\"debootstrap\"/>)."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><title>
-#: pkgs.dbk:1135
+#. type: Content of: <chapter><section><section><section><title>
+#: pkgs.dbk:1183

 msgid "Uploading the fixed package"
 msgstr ""
 
 msgid "Uploading the fixed package"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:1137
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:1185

 msgid ""
 "Do <emphasis role=\"strong\">NOT</emphasis> upload a package to the security "
 msgid ""
 "Do <emphasis role=\"strong\">NOT</emphasis> upload a package to the security "

-"upload queue (oldstable-security, stable-security, etc.) without prior "
-"authorization from the security team.  If the package does not exactly meet "
-"the team's requirements, it will cause many problems and delays in dealing "
-"with the unwanted upload."
+"upload queue (<literal>oldstable-security</literal>, "
+"<literal>stable-security</literal>, etc.) without prior authorization from "
+"the security team.  If the package does not exactly meet the team's "
+"requirements, it will cause many problems and delays in dealing with the "
+"unwanted upload."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:1144
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:1192

 msgid ""
 "Do <emphasis role=\"strong\">NOT</emphasis> upload your fix to "
 msgid ""
 "Do <emphasis role=\"strong\">NOT</emphasis> upload your fix to "

-"proposed-updates without coordinating with the security team.  Packages from "
-"security.debian.org will be copied into the proposed-updates directory "
-"automatically.  If a package with the same or a higher version number is "
-"already installed into the archive, the security update will be rejected by "
-"the archive system.  That way, the stable distribution will end up without a "
-"security update for this package instead."
+"<literal>proposed-updates</literal> without coordinating with the security "
+"team.  Packages from <literal>security.debian.org</literal> will be copied "
+"into the <literal>proposed-updates</literal> directory automatically.  If a "
+"package with the same or a higher version number is already installed into "
+"the archive, the security update will be rejected by the archive system.  "
+"That way, the stable distribution will end up without a security update for "
+"this package instead."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:1153
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:1202

 msgid ""
 "Once you have created and tested the new package and it has been approved by "
 "the security team, it needs to be uploaded so that it can be installed in "
 "the archives.  For security uploads, the place to upload to is "
 msgid ""
 "Once you have created and tested the new package and it has been approved by "
 "the security team, it needs to be uploaded so that it can be installed in "
 "the archives.  For security uploads, the place to upload to is "

-"<literal>ftp://security-master.debian.org/pub/SecurityUploadQueue/</literal> "
-"."
+"<literal>ftp://security-master.debian.org/pub/SecurityUploadQueue/</literal>."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:1159
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:1208

 msgid ""
 "Once an upload to the security queue has been accepted, the package will "
 msgid ""
 "Once an upload to the security queue has been accepted, the package will "

-"automatically be rebuilt for all architectures and stored for verification "
-"by the security team."
+"automatically be built for all architectures and stored for verification by "
+"the security team."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:1164
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:1213

 msgid ""
 "Uploads which are waiting for acceptance or verification are only accessible "
 "by the security team.  This is necessary since there might be fixes for "
 "security problems that cannot be disclosed yet."
 msgstr ""
 
 msgid ""
 "Uploads which are waiting for acceptance or verification are only accessible "
 "by the security team.  This is necessary since there might be fixes for "
 "security problems that cannot be disclosed yet."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:1169
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:1218

 msgid ""
 "If a member of the security team accepts a package, it will be installed on "
 msgid ""
 "If a member of the security team accepts a package, it will be installed on "

-"security.debian.org as well as proposed for the proper "
-"<replaceable>distribution</replaceable>-proposed-updates on ftp-master."
+"<literal>security.debian.org</literal> as well as proposed for the proper "
+"<replaceable>distribution</replaceable><literal>-proposed-updates</literal> "
+"on <literal>&ftp-master-host;</literal>."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><title>
-#: pkgs.dbk:1180
+#. type: Content of: <chapter><section><title>
+#: pkgs.dbk:1230

 msgid "Moving, removing, renaming, adopting, and orphaning packages"
 msgstr ""
 
 msgid "Moving, removing, renaming, adopting, and orphaning packages"
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: pkgs.dbk:1182
+#. type: Content of: <chapter><section><para>
+#: pkgs.dbk:1232

 msgid ""
 "Some archive manipulation operations are not automated in the Debian upload "
 "process.  These procedures should be manually followed by maintainers.  This "
 "chapter gives guidelines on what to do in these cases."
 msgstr ""
 
 msgid ""
 "Some archive manipulation operations are not automated in the Debian upload "
 "process.  These procedures should be manually followed by maintainers.  This "
 "chapter gives guidelines on what to do in these cases."
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: pkgs.dbk:1187
+#. type: Content of: <chapter><section><section><title>
+#: pkgs.dbk:1237

 msgid "Moving packages"
 msgstr ""
 
 msgid "Moving packages"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para><footnote>
-#: pkgs.dbk:1189
+#. type: Content of: <chapter><section><section><para><footnote><para>
+#: pkgs.dbk:1241

 msgid ""
 msgid ""

-"Sometimes a package will change its section.  For instance, a package from "
-"the `non-free' section might be GPL'd in a later version, in which case the "
-"package should be moved to `main' or `contrib'.<footnote>"
+"See the <ulink url=\"&url-debian-policy;\">Debian Policy Manual</ulink> for "
+"guidelines on what section a package belongs in."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para><footnote><para>
-#: pkgs.dbk:1191
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:1239

 msgid ""
 msgid ""

-"See the <ulink url=\"http://www.debian.org/doc/debian-policy/\">Debian "
-"Policy Manual</ulink> for guidelines on what section a package belongs in."
+"Sometimes a package will change its section.  For instance, a package from "
+"the `non-free' section might be GPL'd in a later version, in which case the "
+"package should be moved to `main' or `contrib'.<placeholder "
+"type=\"footnote\" id=\"0\"/>"

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:1196
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:1246

 msgid ""
 "If you need to change the section for one of your packages, change the "
 "package control information to place the package in the desired section, and "
 msgid ""
 "If you need to change the section for one of your packages, change the "
 "package control information to place the package in the desired section, and "

-"re-upload the package (see the <ulink "
-"url=\"http://www.debian.org/doc/debian-policy/\">Debian Policy "
-"Manual</ulink> for details).  You must ensure that you include the "
-"<filename>.orig.tar.gz</filename> in your upload (even if you are not "
-"uploading a new upstream version), or it will not appear in the new section "
-"together with the rest of the package.  If your new section is valid, it "
-"will be moved automatically.  If it does not, then contact the ftpmasters in "
-"order to understand what happened."
+"re-upload the package (see the <ulink url=\"&url-debian-policy;\">Debian "
+"Policy Manual</ulink> for details).  You must ensure that you include the "
+"<filename>.orig.tar.{gz,bz2,lzma}</filename> in your upload (even if you are "
+"not uploading a new upstream version), or it will not appear in the new "
+"section together with the rest of the package.  If your new section is "
+"valid, it will be moved automatically.  If it does not, then contact the "
+"ftpmasters in order to understand what happened."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:1208
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:1258

 msgid ""
 msgid ""

-"If, on the other hand, you need to change the "
-"<emphasis>subsection</emphasis> of one of your packages (e.g., ``devel'', "
-"``admin''), the procedure is slightly different.  Correct the subsection as "
-"found in the control file of the package, and re-upload that.  Also, you'll "
-"need to get the override file updated, as described in <xref "
-"linkend=\"override-file\"/> ."
+"If, on the other hand, you need to change the <literal>subsection</literal> "
+"of one of your packages (e.g., ``devel'', ``admin''), the procedure is "
+"slightly different.  Correct the subsection as found in the control file of "
+"the package, and re-upload that.  Also, you'll need to get the override file "
+"updated, as described in <xref linkend=\"override-file\"/>."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: pkgs.dbk:1217
+#. type: Content of: <chapter><section><section><title>
+#: pkgs.dbk:1267

 msgid "Removing packages"
 msgstr ""
 
 msgid "Removing packages"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:1219
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:1269

 msgid ""
 "If for some reason you want to completely remove a package (say, if it is an "
 "old compatibility library which is no longer required), you need to file a "
 "bug against <literal>ftp.debian.org</literal> asking that the package be "
 msgid ""
 "If for some reason you want to completely remove a package (say, if it is an "
 "old compatibility library which is no longer required), you need to file a "
 "bug against <literal>ftp.debian.org</literal> asking that the package be "

-"removed; as all bugs, this bug should normally have normal severity.  Make "
-"sure you indicate which distribution the package should be removed from.  "
-"Normally, you can only have packages removed from "
-"<emphasis>unstable</emphasis> and <emphasis>experimental</emphasis>.  "
-"Packages are not removed from <emphasis>testing</emphasis> directly.  "
-"Rather, they will be removed automatically after the package has been "
-"removed from <emphasis>unstable</emphasis> and no package in "
-"<emphasis>testing</emphasis> depends on it."
-msgstr ""
-
-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:1232
+"removed; as all bugs, this bug should normally have normal severity.  The "
+"bug title should be in the form <literal>RM: "
+"<replaceable>package</replaceable> <replaceable>[architecture "
+"list]</replaceable> -- <replaceable>reason</replaceable></literal>, where "
+"<replaceable>package</replaceable> is the package to be removed and "
+"<replaceable>reason</replaceable> is a short summary of the reason for the "
+"removal request.  <replaceable>[architecture list]</replaceable> is optional "
+"and only needed if the removal request only applies to some architectures, "
+"not all. Note that the <command>reportbug</command> will create a title "
+"conforming to these rules when you use it to report a bug against the "
+"<literal>ftp.debian.org</literal> pseudo-package."
+msgstr ""
+
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:1286
+msgid ""
+"If you want to remove a package you maintain, you should note this in the "
+"bug title by prepending <literal>ROM</literal> (Request Of Maintainer).  "
+"There are several other standard acronyms used in the reasoning for a "
+"package removal, see <ulink "
+"url=\"http://&ftp-master-host;/removals.html\"></ulink> for a complete "
+"list. That page also provides a convenient overview of pending removal "
+"requests."
+msgstr ""
+
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:1295
+msgid ""
+"Note that removals can only be done for the <literal>unstable</literal>, "
+"<literal>experimental</literal> and <literal>stable</literal> distribution.  "
+"Packages are not removed from <literal>testing</literal> directly.  Rather, "
+"they will be removed automatically after the package has been removed from "
+"<literal>unstable</literal> and no package in <literal>testing</literal> "
+"depends on it."
+msgstr ""
+
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:1304

 msgid ""
 "There is one exception when an explicit removal request is not necessary: If "
 "a (source or binary) package is an orphan, it will be removed "
 msgid ""
 "There is one exception when an explicit removal request is not necessary: If "
 "a (source or binary) package is an orphan, it will be removed "


@@ -1681,8 +1748,8 @@ msgid ""
 "refers to have been taken over by another source package."
 msgstr ""
 
 "refers to have been taken over by another source package."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:1241
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:1313

 msgid ""
 "In your removal request, you have to detail the reasons justifying the "
 "request.  This is to avoid unwanted removals and to keep a trace of why a "
 msgid ""
 "In your removal request, you have to detail the reasons justifying the "
 "request.  This is to avoid unwanted removals and to keep a trace of why a "


@@ -1690,88 +1757,103 @@ msgid ""
 "package that supersedes the one to be removed."
 msgstr ""
 
 "package that supersedes the one to be removed."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:1247
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:1319

 msgid ""
 "Usually you only ask for the removal of a package maintained by yourself.  "
 "If you want to remove another package, you have to get the approval of its "
 msgid ""
 "Usually you only ask for the removal of a package maintained by yourself.  "
 "If you want to remove another package, you have to get the approval of its "

-"maintainer."
+"maintainer. Should the package be orphaned and thus have no maintainer, you "
+"should first discuss the removal request on &email-debian-qa;. If there is a "
+"consensus that the package should be removed, you should reassign and "
+"retitle the <literal>O:</literal> bug filed against the "
+"<literal>wnpp</literal> package instead of filing a new bug as removal "
+"request."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:1252
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:1329

 msgid ""
 "Further information relating to these and other package removal related "
 "topics may be found at <ulink "
 "url=\"http://wiki.debian.org/ftpmaster_Removals\"></ulink> and <ulink "
 msgid ""
 "Further information relating to these and other package removal related "
 "topics may be found at <ulink "
 "url=\"http://wiki.debian.org/ftpmaster_Removals\"></ulink> and <ulink "

-"url=\"http://qa.debian.org/howto-remove.html\"></ulink>."
+"url=\"&url-debian-qa;howto-remove.html\"></ulink>."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:1257
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:1334

 msgid ""
 "If in doubt concerning whether a package is disposable, email "
 msgid ""
 "If in doubt concerning whether a package is disposable, email "

-"<email>debian-devel@lists.debian.org</email> asking for opinions.  Also of "
-"interest is the <command>apt-cache</command> program from the <systemitem "
+"&email-debian-devel; asking for opinions.  Also of interest is the "
+"<command>apt-cache</command> program from the <systemitem "

 "role=\"package\">apt</systemitem> package.  When invoked as "
 "<literal>apt-cache showpkg <replaceable>package</replaceable></literal>, the "
 "program will show details for <replaceable>package</replaceable>, including "
 "role=\"package\">apt</systemitem> package.  When invoked as "
 "<literal>apt-cache showpkg <replaceable>package</replaceable></literal>, the "
 "program will show details for <replaceable>package</replaceable>, including "

-"reverse depends.  Other useful programs include <literal>apt-cache "
-"rdepends</literal>, <command>apt-rdepends</command> and "
+"reverse depends.  Other useful programs include <command>apt-cache "
+"rdepends</command>, <command>apt-rdepends</command>, "
+"<command>build-rdeps</command> (in the <systemitem "
+"role=\"package\">devscripts</systemitem> package) and "

 "<command>grep-dctrl</command>.  Removal of orphaned packages is discussed on "
 "<command>grep-dctrl</command>.  Removal of orphaned packages is discussed on "

-"<email>debian-qa@lists.debian.org</email>."
+"&email-debian-qa;."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:1268
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:1347

 msgid ""
 "Once the package has been removed, the package's bugs should be handled.  "
 "They should either be reassigned to another package in the case where the "
 "actual code has evolved into another package (e.g.  "
 "<literal>libfoo12</literal> was removed because <literal>libfoo13</literal> "
 msgid ""
 "Once the package has been removed, the package's bugs should be handled.  "
 "They should either be reassigned to another package in the case where the "
 "actual code has evolved into another package (e.g.  "
 "<literal>libfoo12</literal> was removed because <literal>libfoo13</literal> "

-"supersedes it) or closed if the software is simply no longer part of Debian."
+"supersedes it) or closed if the software is simply no longer part of "
+"Debian.  When closing the bugs, to avoid marking the bugs as fixed in "
+"versions of the packages in previous Debian releases, they should be marked "
+"as fixed in the version "
+"<literal>&lt;most-recent-version-ever-in-Debian&gt;+rm</literal>."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><title>
-#: pkgs.dbk:1275
+#. type: Content of: <chapter><section><section><section><title>
+#: pkgs.dbk:1358

 msgid "Removing packages from <filename>Incoming</filename>"
 msgstr ""
 
 msgid "Removing packages from <filename>Incoming</filename>"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:1277
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:1360

 msgid ""
 "In the past, it was possible to remove packages from "
 "<filename>incoming</filename>.  However, with the introduction of the new "
 "incoming system, this is no longer possible.  Instead, you have to upload a "
 "new revision of your package with a higher version than the package you want "
 "to replace.  Both versions will be installed in the archive but only the "
 msgid ""
 "In the past, it was possible to remove packages from "
 "<filename>incoming</filename>.  However, with the introduction of the new "
 "incoming system, this is no longer possible.  Instead, you have to upload a "
 "new revision of your package with a higher version than the package you want "
 "to replace.  Both versions will be installed in the archive but only the "

-"higher version will actually be available in <emphasis>unstable</emphasis> "
+"higher version will actually be available in <literal>unstable</literal> "

 "since the previous version will immediately be replaced by the higher.  "
 "However, if you do proper testing of your packages, the need to replace a "
 "package should not occur too often anyway."
 msgstr ""
 
 "since the previous version will immediately be replaced by the higher.  "
 "However, if you do proper testing of your packages, the need to replace a "
 "package should not occur too often anyway."
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: pkgs.dbk:1292
+#. type: Content of: <chapter><section><section><title>
+#: pkgs.dbk:1375

 msgid "Replacing or renaming packages"
 msgstr ""
 
 msgid "Replacing or renaming packages"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:1294
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:1377

 msgid ""
 msgid ""

-"When you make a mistake naming your package, you should follow a two-step "
-"process to rename it.  First, set your <filename>debian/control</filename> "
-"file to replace and conflict with the obsolete name of the package (see the "
-"<ulink url=\"http://www.debian.org/doc/debian-policy/\">Debian Policy "
-"Manual</ulink> for details).  Once you've uploaded the package and the "
-"package has moved into the archive, file a bug against "
-"<literal>ftp.debian.org</literal> asking to remove the package with the "
-"obsolete name.  Do not forget to properly reassign the package's bugs at the "
-"same time."
+"When the upstream maintainers for one of your packages chose to rename their "
+"software (or you made a mistake naming your package), you should follow a "
+"two-step process to rename it. In the first step, change the "
+"<filename>debian/control</filename> file to reflect the new name and to "
+"replace, provide and conflict with the obsolete package name (see the <ulink "
+"url=\"&url-debian-policy;\">Debian Policy Manual</ulink> for details).  "
+"Please note that you should only add a <literal>Provides</literal> relation "
+"if all packages depending on the obsolete package name continue to work "
+"after the renaming. Once you've uploaded the package and the package has "
+"moved into the archive, file a bug against <literal>ftp.debian.org</literal> "
+"asking to remove the package with the obsolete name (see <xref "
+"linkend=\"removing-pkgs\"/>).  Do not forget to properly reassign the "
+"package's bugs at the same time."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:1304
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:1393

 msgid ""
 "At other times, you may make a mistake in constructing your package and wish "
 "to replace it.  The only way to do this is to increase the version number "
 msgid ""
 "At other times, you may make a mistake in constructing your package and wish "
 "to replace it.  The only way to do this is to increase the version number "


@@ -1780,79 +1862,78 @@ msgid ""
 "sources: if you wish to replace the upstream source tarball of your package, "
 "you will need to upload it with a different version.  An easy possibility is "
 "to replace <filename>foo_1.00.orig.tar.gz</filename> with "
 "sources: if you wish to replace the upstream source tarball of your package, "
 "you will need to upload it with a different version.  An easy possibility is "
 "to replace <filename>foo_1.00.orig.tar.gz</filename> with "

-"<filename>foo_1.00+0.orig.tar.gz</filename>.  This restriction gives each "
+"<filename>foo_1.00+0.orig.tar.gz</filename> or "
+"<filename>foo_1.00.orig.tar.bz2</filename>.  This restriction gives each "

 "file on the ftp site a unique name, which helps to ensure consistency across "
 "the mirror network."
 msgstr ""
 
 "file on the ftp site a unique name, which helps to ensure consistency across "
 "the mirror network."
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: pkgs.dbk:1318
+#. type: Content of: <chapter><section><section><title>
+#: pkgs.dbk:1408

 msgid "Orphaning a package"
 msgstr ""
 
 msgid "Orphaning a package"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:1320
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:1410

 msgid ""
 "If you can no longer maintain a package, you need to inform others, and see "
 "that the package is marked as orphaned.  You should set the package "
 msgid ""
 "If you can no longer maintain a package, you need to inform others, and see "
 "that the package is marked as orphaned.  You should set the package "

-"maintainer to <literal>Debian QA Group "
-"&lt;packages@qa.debian.org&gt;</literal> and submit a bug report against the "
-"pseudo package <systemitem role=\"package\">wnpp</systemitem>.  The bug "
-"report should be titled <literal>O: <replaceable>package</replaceable> -- "
-"<replaceable>short description</replaceable></literal> indicating that the "
-"package is now orphaned.  The severity of the bug should be set to "
-"<emphasis>normal</emphasis>; if the package has a priority of standard or "
+"maintainer to <literal>Debian QA Group &orphan-address;</literal> and submit "
+"a bug report against the pseudo package <systemitem "
+"role=\"package\">wnpp</systemitem>.  The bug report should be titled "
+"<literal>O: <replaceable>package</replaceable> -- <replaceable>short "
+"description</replaceable></literal> indicating that the package is now "
+"orphaned.  The severity of the bug should be set to "
+"<literal>normal</literal>; if the package has a priority of standard or "

 "higher, it should be set to important.  If you feel it's necessary, send a "
 "higher, it should be set to important.  If you feel it's necessary, send a "

-"copy to <email>debian-devel@lists.debian.org</email> by putting the address "
-"in the X-Debbugs-CC: header of the message (no, don't use CC:, because that "
-"way the message's subject won't indicate the bug number)."
+"copy to &email-debian-devel; by putting the address in the X-Debbugs-CC: "
+"header of the message (no, don't use CC:, because that way the message's "
+"subject won't indicate the bug number)."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:1335
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:1425

 msgid ""
 "If you just intend to give the package away, but you can keep maintainership "
 "for the moment, then you should instead submit a bug against <systemitem "
 "role=\"package\">wnpp</systemitem> and title it <literal>RFA: "
 "<replaceable>package</replaceable> -- <replaceable>short "
 "description</replaceable></literal>.  <literal>RFA</literal> stands for "
 msgid ""
 "If you just intend to give the package away, but you can keep maintainership "
 "for the moment, then you should instead submit a bug against <systemitem "
 "role=\"package\">wnpp</systemitem> and title it <literal>RFA: "
 "<replaceable>package</replaceable> -- <replaceable>short "
 "description</replaceable></literal>.  <literal>RFA</literal> stands for "

-"<emphasis>Request For Adoption</emphasis>."
+"<literal>Request For Adoption</literal>."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:1343
-msgid ""
-"More information is on the <ulink "
-"url=\"http://www.debian.org/devel/wnpp/\">WNPP web pages</ulink>."
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:1433
+msgid "More information is on the <ulink url=\"&url-wnpp;\">WNPP web pages</ulink>."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: pkgs.dbk:1349
+#. type: Content of: <chapter><section><section><title>
+#: pkgs.dbk:1439

 msgid "Adopting a package"
 msgstr ""
 
 msgid "Adopting a package"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:1351
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:1441

 msgid ""
 "A list of packages in need of a new maintainer is available in the <ulink "
 msgid ""
 "A list of packages in need of a new maintainer is available in the <ulink "

-"url=\"http://www.debian.org/devel/wnpp/\">Work-Needing and Prospective "
-"Packages list (WNPP)</ulink>.  If you wish to take over maintenance of any "
-"of the packages listed in the WNPP, please take a look at the aforementioned "
-"page for information and procedures."
+"url=\"&url-wnpp;\">Work-Needing and Prospective Packages list "
+"(WNPP)</ulink>.  If you wish to take over maintenance of any of the packages "
+"listed in the WNPP, please take a look at the aforementioned page for "
+"information and procedures."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:1358
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:1448

 msgid ""
 "It is not OK to simply take over a package that you feel is neglected — that "
 "would be package hijacking.  You can, of course, contact the current "
 "maintainer and ask them if you may take over the package.  If you have "
 "reason to believe a maintainer has gone AWOL (absent without leave), see "
 msgid ""
 "It is not OK to simply take over a package that you feel is neglected — that "
 "would be package hijacking.  You can, of course, contact the current "
 "maintainer and ask them if you may take over the package.  If you have "
 "reason to believe a maintainer has gone AWOL (absent without leave), see "

-"<xref linkend=\"mia-qa\"/> ."
+"<xref linkend=\"mia-qa\"/>."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:1364
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:1454

 msgid ""
 "Generally, you may not take over the package without the assent of the "
 "current maintainer.  Even if they ignore you, that is still not grounds to "
 msgid ""
 "Generally, you may not take over the package without the assent of the "
 "current maintainer.  Even if they ignore you, that is still not grounds to "


@@ -1860,30 +1941,30 @@ msgid ""
 "the developers' mailing list.  If the discussion doesn't end with a positive "
 "conclusion, and the issue is of a technical nature, consider bringing it to "
 "the attention of the technical committee (see the <ulink "
 "the developers' mailing list.  If the discussion doesn't end with a positive "
 "conclusion, and the issue is of a technical nature, consider bringing it to "
 "the attention of the technical committee (see the <ulink "

-"url=\"http://www.debian.org/devel/tech-ctte\">technical committee web "
-"page</ulink> for more information)."
+"url=\"&url-tech-ctte;\">technical committee web page</ulink> for more "
+"information)."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:1374
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:1464

 msgid ""
 "If you take over an old package, you probably want to be listed as the "
 "package's official maintainer in the bug system.  This will happen "
 "automatically once you upload a new version with an updated "
 msgid ""
 "If you take over an old package, you probably want to be listed as the "
 "package's official maintainer in the bug system.  This will happen "
 "automatically once you upload a new version with an updated "

-"<literal>Maintainer:</literal> field, although it can take a few hours after "
+"<literal>Maintainer</literal> field, although it can take a few hours after "

 "the upload is done.  If you do not expect to upload a new version for a "
 "while, you can use <xref linkend=\"pkg-tracking-system\"/> to get the bug "
 "reports.  However, make sure that the old maintainer has no problem with the "
 "fact that they will continue to receive the bugs during that time."
 msgstr ""
 
 "the upload is done.  If you do not expect to upload a new version for a "
 "while, you can use <xref linkend=\"pkg-tracking-system\"/> to get the bug "
 "reports.  However, make sure that the old maintainer has no problem with the "
 "fact that they will continue to receive the bugs during that time."
 msgstr ""
 

-# type: Content of: <chapter><section><title>
-#: pkgs.dbk:1388
+#. type: Content of: <chapter><section><title>
+#: pkgs.dbk:1478

 msgid "Porting and being ported"
 msgstr ""
 
 msgid "Porting and being ported"
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: pkgs.dbk:1390
+#. type: Content of: <chapter><section><para>
+#: pkgs.dbk:1480

 msgid ""
 "Debian supports an ever-increasing number of architectures.  Even if you are "
 "not a porter, and you don't use any architecture but one, it is part of your "
 msgid ""
 "Debian supports an ever-increasing number of architectures.  Even if you are "
 "not a porter, and you don't use any architecture but one, it is part of your "


@@ -1891,24 +1972,25 @@ msgid ""
 "if you are not a porter, you should read most of this chapter."
 msgstr ""
 
 "if you are not a porter, you should read most of this chapter."
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: pkgs.dbk:1396
+#. type: Content of: <chapter><section><para>
+#: pkgs.dbk:1486

 msgid ""
 "Porting is the act of building Debian packages for architectures that are "
 "different from the original architecture of the package maintainer's binary "
 "package.  It is a unique and essential activity.  In fact, porters do most "
 msgid ""
 "Porting is the act of building Debian packages for architectures that are "
 "different from the original architecture of the package maintainer's binary "
 "package.  It is a unique and essential activity.  In fact, porters do most "

-"of the actual compiling of Debian packages.  For instance, for a single "
-"<emphasis>i386</emphasis> binary package, there must be a recompile for each "
-"architecture, which amounts to 12 more builds."
+"of the actual compiling of Debian packages.  For instance, when a maintainer "
+"uploads a (portable) source packages with binaries for the "
+"<literal>i386</literal> architecture, it will be built for each of the other "
+"architectures, amounting to &number-of-arches; more builds."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: pkgs.dbk:1404
+#. type: Content of: <chapter><section><section><title>
+#: pkgs.dbk:1495

 msgid "Being kind to porters"
 msgstr ""
 
 msgid "Being kind to porters"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:1406
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:1497

 msgid ""
 "Porters have a difficult and unique task, since they are required to deal "
 "with a large volume of packages.  Ideally, every source package should build "
 msgid ""
 "Porters have a difficult and unique task, since they are required to deal "
 "with a large volume of packages.  Ideally, every source package should build "


@@ -1918,8 +2000,8 @@ msgid ""
 "jobs unnecessarily difficult."
 msgstr ""
 
 "jobs unnecessarily difficult."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:1414
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:1505

 msgid ""
 "The first and most important thing is to respond quickly to bug or issues "
 "raised by porters.  Please treat porters with courtesy, as if they were in "
 msgid ""
 "The first and most important thing is to respond quickly to bug or issues "
 "raised by porters.  Please treat porters with courtesy, as if they were in "


@@ -1928,58 +2010,59 @@ msgid ""
 "whatever the problem is."
 msgstr ""
 
 "whatever the problem is."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:1421
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:1512

 msgid ""
 "By far, most of the problems encountered by porters are caused by "
 "<emphasis>packaging bugs</emphasis> in the source packages.  Here is a "
 "checklist of things you should check or be aware of."
 msgstr ""
 
 msgid ""
 "By far, most of the problems encountered by porters are caused by "
 "<emphasis>packaging bugs</emphasis> in the source packages.  Here is a "
 "checklist of things you should check or be aware of."
 msgstr ""
 

-# type: Content of: <chapter><section><section><orderedlist><listitem><para>
-#: pkgs.dbk:1428
+#. type: Content of: <chapter><section><section><orderedlist><listitem><para>
+#: pkgs.dbk:1519

 msgid ""
 "Make sure that your <literal>Build-Depends</literal> and "
 "<literal>Build-Depends-Indep</literal> settings in "
 "<filename>debian/control</filename> are set properly.  The best way to "
 "validate this is to use the <systemitem "
 msgid ""
 "Make sure that your <literal>Build-Depends</literal> and "
 "<literal>Build-Depends-Indep</literal> settings in "
 "<filename>debian/control</filename> are set properly.  The best way to "
 "validate this is to use the <systemitem "

-"role=\"package\">debootstrap</systemitem> package to create an unstable "
-"chroot environment (see <xref linkend=\"debootstrap\"/> ).  Within that "
-"chrooted environment, install the <systemitem "
-"role=\"package\">build-essential</systemitem> package and any package "
-"dependencies mentioned in <literal>Build-Depends</literal> and/or "
+"role=\"package\">debootstrap</systemitem> package to create an "
+"<literal>unstable</literal> chroot environment (see <xref "
+"linkend=\"debootstrap\"/>).  Within that chrooted environment, install the "
+"<systemitem role=\"package\">build-essential</systemitem> package and any "
+"package dependencies mentioned in <literal>Build-Depends</literal> and/or "

 "<literal>Build-Depends-Indep</literal>.  Finally, try building your package "
 "within that chrooted environment.  These steps can be automated by the use "
 "of the <command>pbuilder</command> program which is provided by the package "
 "<literal>Build-Depends-Indep</literal>.  Finally, try building your package "
 "within that chrooted environment.  These steps can be automated by the use "
 "of the <command>pbuilder</command> program which is provided by the package "

-"of the same name (see <xref linkend=\"pbuilder\"/> )."
+"of the same name (see <xref linkend=\"pbuilder\"/>)."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><orderedlist><listitem><para>
-#: pkgs.dbk:1442
+#. type: Content of: <chapter><section><section><orderedlist><listitem><para>
+#: pkgs.dbk:1534

 msgid ""
 "If you can't set up a proper chroot, <command>dpkg-depcheck</command> may be "
 msgid ""
 "If you can't set up a proper chroot, <command>dpkg-depcheck</command> may be "

-"of assistance (see <xref linkend=\"dpkg-depcheck\"/> )."
+"of assistance (see <xref linkend=\"dpkg-depcheck\"/>)."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><orderedlist><listitem><para>
-#: pkgs.dbk:1446
+#. type: Content of: <chapter><section><section><orderedlist><listitem><para>
+#: pkgs.dbk:1538

 msgid ""
 msgid ""

-"See the <ulink url=\"http://www.debian.org/doc/debian-policy/\">Debian "
-"Policy Manual</ulink> for instructions on setting build dependencies."
+"See the <ulink url=\"&url-debian-policy;\">Debian Policy Manual</ulink> for "
+"instructions on setting build dependencies."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><orderedlist><listitem><para>
-#: pkgs.dbk:1452
+#. type: Content of: <chapter><section><section><orderedlist><listitem><para>
+#: pkgs.dbk:1544

 msgid ""
 msgid ""

-"Don't set architecture to a value other than ``all'' or ``any'' unless you "
-"really mean it.  In too many cases, maintainers don't follow the "
-"instructions in the <ulink "
-"url=\"http://www.debian.org/doc/debian-policy/\">Debian Policy "
-"Manual</ulink>.  Setting your architecture to ``i386'' is usually incorrect."
+"Don't set architecture to a value other than <literal>all</literal> or "
+"<literal>any</literal> unless you really mean it.  In too many cases, "
+"maintainers don't follow the instructions in the <ulink "
+"url=\"&url-debian-policy;\">Debian Policy Manual</ulink>.  Setting your "
+"architecture to only one architecture (such as <literal>i386</literal> or "
+"<literal>amd64</literal>) is usually incorrect."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><orderedlist><listitem><para>
-#: pkgs.dbk:1460
+#. type: Content of: <chapter><section><section><orderedlist><listitem><para>
+#: pkgs.dbk:1554

 msgid ""
 "Make sure your source package is correct.  Do <literal>dpkg-source -x "
 "<replaceable>package</replaceable>.dsc</literal> to make sure your source "
 msgid ""
 "Make sure your source package is correct.  Do <literal>dpkg-source -x "
 "<replaceable>package</replaceable>.dsc</literal> to make sure your source "


@@ -1987,17 +2070,17 @@ msgid ""
 "scratch with <command>dpkg-buildpackage</command>."
 msgstr ""
 
 "scratch with <command>dpkg-buildpackage</command>."
 msgstr ""
 

-# type: Content of: <chapter><section><section><orderedlist><listitem><para>
-#: pkgs.dbk:1468
+#. type: Content of: <chapter><section><section><orderedlist><listitem><para>
+#: pkgs.dbk:1562

 msgid ""
 "Make sure you don't ship your source package with the "
 "<filename>debian/files</filename> or <filename>debian/substvars</filename> "
 msgid ""
 "Make sure you don't ship your source package with the "
 "<filename>debian/files</filename> or <filename>debian/substvars</filename> "

-"files.  They should be removed by the `clean' target of "
+"files.  They should be removed by the <literal>clean</literal> target of "

 "<filename>debian/rules</filename>."
 msgstr ""
 
 "<filename>debian/rules</filename>."
 msgstr ""
 

-# type: Content of: <chapter><section><section><orderedlist><listitem><para>
-#: pkgs.dbk:1476
+#. type: Content of: <chapter><section><section><orderedlist><listitem><para>
+#: pkgs.dbk:1570

 msgid ""
 "Make sure you don't rely on locally installed or hacked configurations or "
 "programs.  For instance, you should never be calling programs in "
 msgid ""
 "Make sure you don't rely on locally installed or hacked configurations or "
 "programs.  For instance, you should never be calling programs in "


@@ -2006,15 +2089,17 @@ msgid ""
 "machine, even if it's the same architecture."
 msgstr ""
 
 "machine, even if it's the same architecture."
 msgstr ""
 

-# type: Content of: <chapter><section><section><orderedlist><listitem><para>
-#: pkgs.dbk:1485
+#. type: Content of: <chapter><section><section><orderedlist><listitem><para>
+#: pkgs.dbk:1579

 msgid ""
 "Don't depend on the package you're building being installed already (a "
 msgid ""
 "Don't depend on the package you're building being installed already (a "

-"sub-case of the above issue)."
+"sub-case of the above issue). There are, of course, exceptions to this rule, "
+"but be aware that any case like this needs manual bootstrapping and cannot "
+"be done by automated package builders."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><orderedlist><listitem><para>
-#: pkgs.dbk:1491
+#. type: Content of: <chapter><section><section><orderedlist><listitem><para>
+#: pkgs.dbk:1587

 msgid ""
 "Don't rely on the compiler being a certain version, if possible.  If not, "
 "then make sure your build dependencies reflect the restrictions, although "
 msgid ""
 "Don't rely on the compiler being a certain version, if possible.  If not, "
 "then make sure your build dependencies reflect the restrictions, although "


@@ -2022,23 +2107,24 @@ msgid ""
 "standardize on different compilers."
 msgstr ""
 
 "standardize on different compilers."
 msgstr ""
 

-# type: Content of: <chapter><section><section><orderedlist><listitem><para>
-#: pkgs.dbk:1499
+#. type: Content of: <chapter><section><section><orderedlist><listitem><para>
+#: pkgs.dbk:1595

 msgid ""
 msgid ""

-"Make sure your debian/rules contains separate ``binary-arch'' and "
-"``binary-indep'' targets, as the Debian Policy Manual requires.  Make sure "
-"that both targets work independently, that is, that you can call the target "
-"without having called the other before.  To test this, try to run "
-"<literal>dpkg-buildpackage -B</literal>."
+"Make sure your <filename>debian/rules</filename> contains separate "
+"<literal>binary-arch</literal> and <literal>binary-indep</literal> targets, "
+"as the Debian Policy Manual requires.  Make sure that both targets work "
+"independently, that is, that you can call the target without having called "
+"the other before.  To test this, try to run <command>dpkg-buildpackage "
+"-B</command>."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: pkgs.dbk:1510
+#. type: Content of: <chapter><section><section><title>
+#: pkgs.dbk:1606

 msgid "Guidelines for porter uploads"
 msgstr ""
 
 msgid "Guidelines for porter uploads"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:1512
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:1608

 msgid ""
 "If the package builds out of the box for the architecture to be ported to, "
 "you are in luck and your job is easy.  This section applies to that case; it "
 msgid ""
 "If the package builds out of the box for the architecture to be ported to, "
 "you are in luck and your job is easy.  This section applies to that case; it "


@@ -2048,28 +2134,28 @@ msgid ""
 "source NMU, so consult <xref linkend=\"nmu-guidelines\"/> instead."
 msgstr ""
 
 "source NMU, so consult <xref linkend=\"nmu-guidelines\"/> instead."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:1520
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:1616

 msgid ""
 "For a porter upload, no changes are being made to the source.  You do not "
 "need to touch any of the files in the source package.  This includes "
 "<filename>debian/changelog</filename>."
 msgstr ""
 
 msgid ""
 "For a porter upload, no changes are being made to the source.  You do not "
 "need to touch any of the files in the source package.  This includes "
 "<filename>debian/changelog</filename>."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:1525
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:1621

 msgid ""
 "The way to invoke <command>dpkg-buildpackage</command> is as "
 "<literal>dpkg-buildpackage -B "
 "-m<replaceable>porter-email</replaceable></literal>.  Of course, set "
 "<replaceable>porter-email</replaceable> to your email address.  This will do "
 "a binary-only build of only the architecture-dependent portions of the "
 msgid ""
 "The way to invoke <command>dpkg-buildpackage</command> is as "
 "<literal>dpkg-buildpackage -B "
 "-m<replaceable>porter-email</replaceable></literal>.  Of course, set "
 "<replaceable>porter-email</replaceable> to your email address.  This will do "
 "a binary-only build of only the architecture-dependent portions of the "

-"package, using the `binary-arch' target in "
+"package, using the <literal>binary-arch</literal> target in "

 "<filename>debian/rules</filename>."
 msgstr ""
 
 "<filename>debian/rules</filename>."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:1533
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:1630

 msgid ""
 "If you are working on a Debian machine for your porting efforts and you need "
 "to sign your upload locally for its acceptance in the archive, you can run "
 msgid ""
 "If you are working on a Debian machine for your porting efforts and you need "
 "to sign your upload locally for its acceptance in the archive, you can run "


@@ -2078,42 +2164,43 @@ msgid ""
 "<command>dpkg-sig</command>."
 msgstr ""
 
 "<command>dpkg-sig</command>."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><title>
-#: pkgs.dbk:1540
+#. type: Content of: <chapter><section><section><section><title>
+#: pkgs.dbk:1637

 msgid "Recompilation or binary-only NMU"
 msgstr ""
 
 msgid "Recompilation or binary-only NMU"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:1542
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:1639

 msgid ""
 "Sometimes the initial porter upload is problematic because the environment "
 "in which the package was built was not good enough (outdated or obsolete "
 msgid ""
 "Sometimes the initial porter upload is problematic because the environment "
 "in which the package was built was not good enough (outdated or obsolete "

-"library, bad compiler, ...).  Then you may just need to recompile it in an "
+"library, bad compiler, etc.).  Then you may just need to recompile it in an "

 "updated environment.  However, you have to bump the version number in this "
 "case, so that the old bad package can be replaced in the Debian archive "
 "updated environment.  However, you have to bump the version number in this "
 "case, so that the old bad package can be replaced in the Debian archive "

-"(<command>katie</command> refuses to install new packages if they don't have "
-"a version number greater than the currently available one)."
+"(<command>dak</command> refuses to install new packages if they don't have a "
+"version number greater than the currently available one)."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:1551
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:1648

 msgid ""
 "You have to make sure that your binary-only NMU doesn't render the package "
 "uninstallable.  This could happen when a source package generates "
 msgid ""
 "You have to make sure that your binary-only NMU doesn't render the package "
 "uninstallable.  This could happen when a source package generates "

-"arch-dependent and arch-independent packages that depend on each other via "
-"$(Source-Version)."
+"arch-dependent and arch-independent packages that have inter-dependencies "
+"generated using dpkg's substitution variable "
+"<literal>$(Source-Version)</literal>."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:1557
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:1654

 msgid ""
 "Despite the required modification of the changelog, these are called "
 "binary-only NMUs — there is no need in this case to trigger all other "
 "architectures to consider themselves out of date or requiring recompilation."
 msgstr ""
 
 msgid ""
 "Despite the required modification of the changelog, these are called "
 "binary-only NMUs — there is no need in this case to trigger all other "
 "architectures to consider themselves out of date or requiring recompilation."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:1562
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:1659

 msgid ""
 "Such recompilations require special ``magic'' version numbering, so that the "
 "archive maintenance tools recognize that, even though there is a new Debian "
 msgid ""
 "Such recompilations require special ``magic'' version numbering, so that the "
 "archive maintenance tools recognize that, even though there is a new Debian "


@@ -2122,19 +2209,8 @@ msgid ""
 "corresponding source code)."
 msgstr ""
 
 "corresponding source code)."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para><footnote>
-#: pkgs.dbk:1569
-msgid ""
-"The ``magic'' for a recompilation-only NMU is triggered by using a suffix "
-"appended to the package version number, following the form b&lt;number&gt;.  "
-"For instance, if the latest version you are recompiling against was version "
-"``2.9-3'', your NMU should carry a version of ``2.9-3+b1''.  If the latest "
-"version was ``3.4+b1'' (i.e, a native package with a previous recompilation "
-"NMU), your NMU should have a version number of ``3.4+b2''.  <footnote>"
-msgstr ""
-
-# type: Content of: <chapter><section><section><section><para><footnote><para>
-#: pkgs.dbk:1574
+#. type: Content of: <chapter><section><section><section><para><footnote><para>
+#: pkgs.dbk:1674

 msgid ""
 "In the past, such NMUs used the third-level number on the Debian part of the "
 "revision to denote their recompilation-only status; however, this syntax was "
 msgid ""
 "In the past, such NMUs used the third-level number on the Debian part of the "
 "revision to denote their recompilation-only status; however, this syntax was "


@@ -2143,24 +2219,38 @@ msgid ""
 "has therefore been abandoned in favor of this new syntax."
 msgstr ""
 
 "has therefore been abandoned in favor of this new syntax."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:1582
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:1666
+msgid ""
+"The ``magic'' for a recompilation-only NMU is triggered by using a suffix "
+"appended to the package version number, following the form "
+"<literal>b<replaceable>number</replaceable></literal>.  For instance, if the "
+"latest version you are recompiling against was version "
+"<literal>2.9-3</literal>, your binary-only NMU should carry a version of "
+"<literal>2.9-3+b1</literal>.  If the latest version was "
+"<literal>3.4+b1</literal> (i.e, a native package with a previous "
+"recompilation NMU), your binary-only NMU should have a version number of "
+"<literal>3.4+b2</literal>.<placeholder type=\"footnote\" id=\"0\"/>"
+msgstr ""
+
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:1682

 msgid ""
 "Similar to initial porter uploads, the correct way of invoking "
 "<command>dpkg-buildpackage</command> is <literal>dpkg-buildpackage "
 "-B</literal> to only build the architecture-dependent parts of the package."
 msgstr ""
 
 msgid ""
 "Similar to initial porter uploads, the correct way of invoking "
 "<command>dpkg-buildpackage</command> is <literal>dpkg-buildpackage "
 "-B</literal> to only build the architecture-dependent parts of the package."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><title>
-#: pkgs.dbk:1589
+#. type: Content of: <chapter><section><section><section><title>
+#: pkgs.dbk:1689

 msgid "When to do a source NMU if you are a porter"
 msgstr ""
 
 msgid "When to do a source NMU if you are a porter"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:1591
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:1691

 msgid ""
 "Porters doing a source NMU generally follow the guidelines found in <xref "
 msgid ""
 "Porters doing a source NMU generally follow the guidelines found in <xref "

-"linkend=\"nmu\"/> , just like non-porters.  However, it is expected that the "
+"linkend=\"nmu\"/>, just like non-porters.  However, it is expected that the "

 "wait cycle for a porter's source NMU is smaller than for a non-porter, since "
 "porters have to cope with a large quantity of packages.  Again, the "
 "situation varies depending on the distribution they are uploading to.  It "
 "wait cycle for a porter's source NMU is smaller than for a non-porter, since "
 "porters have to cope with a large quantity of packages.  Again, the "
 "situation varies depending on the distribution they are uploading to.  It "


@@ -2169,33 +2259,34 @@ msgid ""
 "architectures are candidates."
 msgstr ""
 
 "architectures are candidates."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:1600
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:1700

 msgid ""
 msgid ""

-"If you are a porter doing an NMU for `unstable', the above guidelines for "
-"porting should be followed, with two variations.  Firstly, the acceptable "
-"waiting period — the time between when the bug is submitted to the BTS and "
-"when it is OK to do an NMU — is seven days for porters working on the "
-"unstable distribution.  This period can be shortened if the problem is "
-"critical and imposes hardship on the porting effort, at the discretion of "
-"the porter group.  (Remember, none of this is Policy, just mutually agreed "
-"upon guidelines.) For uploads to stable or testing, please coordinate with "
-"the appropriate release team first."
+"If you are a porter doing an NMU for <literal>unstable</literal>, the above "
+"guidelines for porting should be followed, with two variations.  Firstly, "
+"the acceptable waiting period — the time between when the bug is submitted "
+"to the BTS and when it is OK to do an NMU — is seven days for porters "
+"working on the <literal>unstable</literal> distribution.  This period can be "
+"shortened if the problem is critical and imposes hardship on the porting "
+"effort, at the discretion of the porter group.  (Remember, none of this is "
+"Policy, just mutually agreed upon guidelines.) For uploads to "
+"<literal>stable</literal> or <literal>testing</literal>, please coordinate "
+"with the appropriate release team first."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:1611
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:1712

 msgid ""
 "Secondly, porters doing source NMUs should make sure that the bug they "
 msgid ""
 "Secondly, porters doing source NMUs should make sure that the bug they "

-"submit to the BTS should be of severity `serious' or greater.  This ensures "
-"that a single source package can be used to compile every supported Debian "
-"architecture by release time.  It is very important that we have one version "
-"of the binary and source package for all architecture in order to comply "
-"with many licenses."
+"submit to the BTS should be of severity <literal>serious</literal> or "
+"greater.  This ensures that a single source package can be used to compile "
+"every supported Debian architecture by release time.  It is very important "
+"that we have one version of the binary and source package for all "
+"architectures in order to comply with many licenses."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:1619
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:1720

 msgid ""
 "Porters should try to avoid patches which simply kludge around bugs in the "
 "current version of the compile environment, kernel, or libc.  Sometimes such "
 msgid ""
 "Porters should try to avoid patches which simply kludge around bugs in the "
 "current version of the compile environment, kernel, or libc.  Sometimes such "


@@ -2205,8 +2296,8 @@ msgid ""
 "problems have been fixed."
 msgstr ""
 
 "problems have been fixed."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:1627
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:1728

 msgid ""
 "Porters may also have an unofficial location where they can put the results "
 "of their work during the waiting period.  This helps others running the port "
 msgid ""
 "Porters may also have an unofficial location where they can put the results "
 "of their work during the waiting period.  This helps others running the port "


@@ -2214,13 +2305,13 @@ msgid ""
 "course, such locations have no official blessing or status, so buyer beware."
 msgstr ""
 
 "course, such locations have no official blessing or status, so buyer beware."
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: pkgs.dbk:1637
+#. type: Content of: <chapter><section><section><title>
+#: pkgs.dbk:1738

 msgid "Porting infrastructure and automation"
 msgstr ""
 
 msgid "Porting infrastructure and automation"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:1639
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:1740

 msgid ""
 "There is infrastructure and several tools to help automate package porting.  "
 "This section contains a brief overview of this automation and porting to "
 msgid ""
 "There is infrastructure and several tools to help automate package porting.  "
 "This section contains a brief overview of this automation and porting to "


@@ -2228,78 +2319,80 @@ msgid ""
 "information."
 msgstr ""
 
 "information."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><title>
-#: pkgs.dbk:1644
+#. type: Content of: <chapter><section><section><section><title>
+#: pkgs.dbk:1745

 msgid "Mailing lists and web pages"
 msgstr ""
 
 msgid "Mailing lists and web pages"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:1646
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:1747

 msgid ""
 "Web pages containing the status of each port can be found at <ulink "
 msgid ""
 "Web pages containing the status of each port can be found at <ulink "

-"url=\"http://www.debian.org/ports/\"></ulink>."
+"url=\"&url-debian-ports;\"></ulink>."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:1650
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:1751

 msgid ""
 "Each port of Debian has a mailing list.  The list of porting mailing lists "
 msgid ""
 "Each port of Debian has a mailing list.  The list of porting mailing lists "

-"can be found at <ulink url=\"http://lists.debian.org/ports.html\"></ulink>.  "
-"These lists are used to coordinate porters, and to connect the users of a "
-"given port with the porters."
+"can be found at <ulink url=\"&url-debian-port-lists;\"></ulink>.  These "
+"lists are used to coordinate porters, and to connect the users of a given "
+"port with the porters."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><title>
-#: pkgs.dbk:1658
+#. type: Content of: <chapter><section><section><section><title>
+#: pkgs.dbk:1759

 msgid "Porter tools"
 msgstr ""
 
 msgid "Porter tools"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:1660
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:1761

 msgid ""
 "Descriptions of several porting tools can be found in <xref "
 msgid ""
 "Descriptions of several porting tools can be found in <xref "

-"linkend=\"tools-porting\"/> ."
+"linkend=\"tools-porting\"/>."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:1668
+#. type: Content of: <chapter><section><section><section><title>
+#: pkgs.dbk:1767
+msgid "<systemitem role=\"package\">wanna-build</systemitem>"
+msgstr ""
+
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:1769

 msgid ""
 msgid ""

-"The <systemitem role=\"package\">buildd</systemitem> system is used as a "
-"distributed, client-server build distribution system.  It is usually used in "
-"conjunction with <emphasis>auto-builders</emphasis>, which are ``slave'' "
-"hosts which simply check out and attempt to auto-build packages which need "
-"to be ported.  There is also an email interface to the system, which allows "
-"porters to ``check out'' a source package (usually one which cannot yet be "
-"auto-built)  and work on it."
+"The <systemitem role=\"package\">wanna-build</systemitem> system is used as "
+"a distributed, client-server build distribution system.  It is usually used "
+"in conjunction with build daemons running the <systemitem "
+"role=\"package\">buildd</systemitem> program. <literal>Build "
+"daemons</literal> are ``slave'' hosts which contact the central <systemitem "
+"role=\"package\">wanna-build</systemitem> system to receive a list of "
+"packages that need to be built."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:1677
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:1777

 msgid ""
 msgid ""

-"<systemitem role=\"package\">buildd</systemitem> is not yet available as a "
-"package; however, most porting efforts are either using it currently or "
-"planning to use it in the near future.  The actual automated builder is "
-"packaged as <systemitem role=\"package\">sbuild</systemitem>, see its "
-"description in <xref linkend=\"sbuild\"/> .  The complete <systemitem "
-"role=\"package\">buildd</systemitem> system also collects a number of as yet "
-"unpackaged components which are currently very useful and in use "
-"continually, such as <command>andrea</command> and "
-"<command>wanna-build</command>."
+"<systemitem role=\"package\">wanna-build</systemitem> is not yet available "
+"as a package; however, all Debian porting efforts are using it for automated "
+"package building.  The tool used to do the actual package builds, "
+"<systemitem role=\"package\">sbuild</systemitem> is available as a package, "
+"see its description in <xref linkend=\"sbuild\"/>.  Please note that the "
+"packaged version is not the same as the one used on build daemons, but it is "
+"close enough to reproduce problems."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:1687
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:1786

 msgid ""
 msgid ""

-"Some of the data produced by <systemitem "
-"role=\"package\">buildd</systemitem> which is generally useful to porters is "
-"available on the web at <ulink url=\"http://buildd.debian.org/\"></ulink>.  "
-"This data includes nightly updated information from "
-"<command>andrea</command> (source dependencies) and <systemitem "
-"role=\"package\">quinn-diff</systemitem> (packages needing recompilation)."
+"Most of the data produced by <systemitem "
+"role=\"package\">wanna-build</systemitem> which is generally useful to "
+"porters is available on the web at <ulink url=\"&url-buildd;\"></ulink>.  "
+"This data includes nightly updated statistics, queueing information and logs "
+"for build attempts."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:1695
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:1792

 msgid ""
 "We are quite proud of this system, since it has so many possible uses.  "
 "Independent development groups can use the system for different sub-flavors "
 msgid ""
 "We are quite proud of this system, since it has so many possible uses.  "
 "Independent development groups can use the system for different sub-flavors "


@@ -2308,37 +2401,47 @@ msgid ""
 "will also enable Debian to recompile entire distributions quickly."
 msgstr ""
 
 "will also enable Debian to recompile entire distributions quickly."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:1702
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:1799
+msgid ""
+"The wanna-build team, in charge of the buildds, can be reached at "
+"<literal>debian-wb-team@lists.debian.org</literal>.  To determine who "
+"(wanna-build team, release team) and how (mail, BTS)  to contact, refer to "
+"<ulink url=\"&url-wb-team;\"></ulink>."
+msgstr ""
+
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:1806

 msgid ""
 msgid ""

-"The buildds admins of each arch can be contacted at the mail address "
-"$arch@buildd.debian.org."
+"When requesting binNMUs or give-backs (retries after a failed build), please "
+"use the format described at <ulink url=\"&url-release-wb;\"/>."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: pkgs.dbk:1710
+#. type: Content of: <chapter><section><section><title>
+#: pkgs.dbk:1815

 msgid "When your package is <emphasis>not</emphasis> portable"
 msgstr ""
 
 msgid "When your package is <emphasis>not</emphasis> portable"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:1712
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:1817

 msgid ""
 "Some packages still have issues with building and/or working on some of the "
 "architectures supported by Debian, and cannot be ported at all, or not "
 "within a reasonable amount of time.  An example is a package that is "
 msgid ""
 "Some packages still have issues with building and/or working on some of the "
 "architectures supported by Debian, and cannot be ported at all, or not "
 "within a reasonable amount of time.  An example is a package that is "

-"SVGA-specific (only i386), or uses other hardware-specific features not "
+"SVGA-specific (only available for <literal>i386</literal> and "
+"<literal>amd64</literal>), or uses other hardware-specific features not "

 "supported on all architectures."
 msgstr ""
 
 "supported on all architectures."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:1719
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:1824

 msgid ""
 "In order to prevent broken packages from being uploaded to the archive, and "
 "wasting buildd time, you need to do a few things:"
 msgstr ""
 
 msgid ""
 "In order to prevent broken packages from being uploaded to the archive, and "
 "wasting buildd time, you need to do a few things:"
 msgstr ""
 

-# type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:1725
+#. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
+#: pkgs.dbk:1830

 msgid ""
 "First, make sure your package <emphasis>does</emphasis> fail to build on "
 "architectures that it cannot support.  There are a few ways to achieve "
 msgid ""
 "First, make sure your package <emphasis>does</emphasis> fail to build on "
 "architectures that it cannot support.  There are a few ways to achieve "


@@ -2349,943 +2452,936 @@ msgid ""
 "required functionality is available."
 msgstr ""
 
 "required functionality is available."
 msgstr ""
 

-# type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:1733
+#. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
+#: pkgs.dbk:1838

 msgid ""
 "Additionally, if you believe the list of supported architectures is pretty "
 msgid ""
 "Additionally, if you believe the list of supported architectures is pretty "

-"constant, you should change 'any' to a list of supported architectures in "
-"debian/control.  This way, the build will fail also, and indicate this to a "
-"human reader without actually trying."
+"constant, you should change <literal>any</literal> to a list of supported "
+"architectures in <filename>debian/control</filename>.  This way, the build "
+"will fail also, and indicate this to a human reader without actually trying."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:1741
+#. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
+#: pkgs.dbk:1846

 msgid ""
 "In order to prevent autobuilders from needlessly trying to build your "
 msgid ""
 "In order to prevent autobuilders from needlessly trying to build your "

-"package, it must be included in <filename>packages-arch-specific</filename>, "
+"package, it must be included in <filename>Packages-arch-specific</filename>, "

 "a list used by the <command>wanna-build</command> script.  The current "
 "a list used by the <command>wanna-build</command> script.  The current "

-"version is available as <ulink "
-"url=\"http://cvs.debian.org/srcdep/Packages-arch-specific?cvsroot=dak\"></ulink>; "
-"please see the top of the file for whom to contact for changes."
+"version is available as <ulink url=\"&url-buildd-p-a-s;\"/>; please see the "
+"top of the file for whom to contact for changes."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:1751
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:1855

 msgid ""
 "Please note that it is insufficient to only add your package to "
 msgid ""
 "Please note that it is insufficient to only add your package to "

-"Packages-arch-specific without making it fail to build on unsupported "
-"architectures: A porter or any other person trying to build your package "
-"might accidently upload it without noticing it doesn't work.  If in the past "
-"some binary packages were uploaded on unsupported architectures, request "
-"their removal by filing a bug against <systemitem "
-"role=\"package\">ftp.debian.org</systemitem>"
+"<filename>Packages-arch-specific</filename> without making it fail to build "
+"on unsupported architectures: A porter or any other person trying to build "
+"your package might accidently upload it without noticing it doesn't work.  "
+"If in the past some binary packages were uploaded on unsupported "
+"architectures, request their removal by filing a bug against <systemitem "
+"role=\"package\">ftp.debian.org</systemitem>."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><title>
-#: pkgs.dbk:1764
+#. type: Content of: <chapter><section><title>
+#: pkgs.dbk:1868

 msgid "Non-Maintainer Uploads (NMUs)"
 msgstr ""
 
 msgid "Non-Maintainer Uploads (NMUs)"
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: pkgs.dbk:1766
+#. type: Content of: <chapter><section><para>
+#: pkgs.dbk:1870

 msgid ""
 msgid ""

-"Under certain circumstances it is necessary for someone other than the "
-"official package maintainer to make a release of a package.  This is called "
-"a non-maintainer upload, or NMU."
+"Every package has one or more maintainers. Normally, these are the people "
+"who work on and upload new versions of the package. In some situations, it "
+"is useful that other developers can upload a new version as well, for "
+"example if they want to fix a bug in a package they don't maintain, when the "
+"maintainer needs help to respond to issues.  Such uploads are called "
+"<emphasis>Non-Maintainer Uploads (NMU)</emphasis>."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: pkgs.dbk:1771
-msgid ""
-"This section handles only source NMUs, i.e.  NMUs which upload a new version "
-"of the package.  For binary-only NMUs by porters or QA members, please see "
-"<xref linkend=\"binary-only-nmu\"/> .  If a buildd builds and uploads a "
-"package, that too is strictly speaking a binary NMU.  See <xref "
-"linkend=\"buildd\"/> for some more information."
+#. type: Content of: <chapter><section><section><title>
+#: pkgs.dbk:1879
+msgid "When and how to do an NMU"

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: pkgs.dbk:1778
-msgid ""
-"The main reason why NMUs are done is when a developer needs to fix another "
-"developer's package in order to address serious problems or crippling bugs "
-"or when the package maintainer is unable to release a fix in a timely "
-"fashion."
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:1882
+msgid "Before doing an NMU, consider the following questions:"

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: pkgs.dbk:1783
+#. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
+#: pkgs.dbk:1887

 msgid ""
 msgid ""

-"First and foremost, it is critical that NMU patches to source should be as "
-"non-disruptive as possible.  Do not do housekeeping tasks, do not change the "
-"name of modules or files, do not move directories; in general, do not fix "
-"things which are not broken.  Keep the patch as small as possible.  If "
-"things bother you aesthetically, talk to the Debian maintainer, talk to the "
-"upstream maintainer, or submit a bug.  However, aesthetic changes must "
-"<emphasis>not</emphasis> be made in a non-maintainer upload."
+"Does your NMU really fix bugs? Fixing cosmetic issues or changing the "
+"packaging style in NMUs is discouraged."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: pkgs.dbk:1792
+#. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
+#: pkgs.dbk:1893

 msgid ""
 msgid ""

-"And please remember the Hippocratic Oath: Above all, do no harm.  It is "
-"better to leave a package with an open grave bug than applying a "
-"non-functional patch, or one that hides the bug instead of resolving it."
+"Did you give enough time to the maintainer? When was the bug reported to the "
+"BTS? Being busy for a week or two isn't unusual.  Is the bug so severe that "
+"it needs to be fixed right now, or can it wait a few more days?"

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: pkgs.dbk:1797
-msgid "How to do a NMU"
+#. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
+#: pkgs.dbk:1900
+msgid ""
+"How confident are you about your changes? Please remember the Hippocratic "
+"Oath: \"Above all, do no harm.\" It is better to leave a package with an "
+"open grave bug than applying a non-functional patch, or one that hides the "
+"bug instead of resolving it. If you are not 100% sure of what you did, it "
+"might be a good idea to seek advice from others. Remember that if you break "
+"something in your NMU, many people will be very unhappy about it."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:1799
+#. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
+#: pkgs.dbk:1910

 msgid ""
 msgid ""

-"NMUs which fix important, serious or higher severity bugs are encouraged and "
-"accepted.  You should endeavor to reach the current maintainer of the "
-"package; they might be just about to upload a fix for the problem, or have a "
-"better solution."
+"Have you clearly expressed your intention to NMU, at least in the BTS? It is "
+"also a good idea to try to contact the maintainer by other means (private "
+"email, IRC)."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:1805
+#. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
+#: pkgs.dbk:1917

 msgid ""
 msgid ""

-"NMUs should be made to assist a package's maintainer in resolving bugs.  "
-"Maintainers should be thankful for that help, and NMUers should respect the "
-"decisions of maintainers, and try to personally help the maintainer by their "
-"work."
+"If the maintainer is usually active and responsive, have you tried to "
+"contact him? In general it should be considered preferable that a maintainer "
+"takes care of an issue himself and that he is given the chance to review and "
+"correct your patch, because he can be expected to be more aware of potential "
+"issues which an NMUer might miss. It is often a better use of everyone's "
+"time if the maintainer is given an opportunity to upload a fix on their own."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:1811
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:1927

 msgid ""
 msgid ""

-"A NMU should follow all conventions, written down in this section.  For an "
-"upload to testing or unstable, this order of steps is recommended:"
+"When doing an NMU, you must first make sure that your intention to NMU is "
+"clear.  Then, you must send a patch with the differences between the current "
+"package and your proposed NMU to the BTS. The <command>nmudiff</command> "
+"script in the <systemitem role=\"package\">devscripts</systemitem> package "
+"might be helpful."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:1817
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:1934

 msgid ""
 msgid ""

-"Make sure that the package's bugs that the NMU is meant to address are all "
-"filed in the Debian Bug Tracking System (BTS).  If they are not, submit them "
-"immediately."
+"While preparing the patch, you should better be aware of any "
+"package-specific practices that the maintainer might be using. Taking them "
+"into account reduces the burden of getting your changes integrated back in "
+"the normal package workflow and thus increases the possibilities that that "
+"will happen. A good place where to look for for possible package-specific "
+"practices is <ulink "
+"url=\"&url-debian-policy;ch-source.html#s-readmesource\"><filename>debian/README.source</filename></ulink>."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:1824
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:1942

 msgid ""
 msgid ""

-"Wait a few days for the response from the maintainer.  If you don't get any "
-"response, you may want to help them by sending the patch that fixes the "
-"bug.  Don't forget to tag the bug with the patch keyword."
+"Unless you have an excellent reason not to do so, you must then give some "
+"time to the maintainer to react (for example, by uploading to the "
+"<literal>DELAYED</literal> queue).  Here are some recommended values to use "
+"for delays:"

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:1831
-msgid ""
-"Wait a few more days.  If you still haven't got an answer from the "
-"maintainer, send them a mail announcing your intent to NMU the package.  "
-"Prepare an NMU as described in this section, and test it carefully on your "
-"machine (cf.  <xref linkend=\"sanitycheck\"/> ).  Double check that your "
-"patch doesn't have any unexpected side effects.  Make sure your patch is as "
-"small and as non-disruptive as it can be."
+#. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
+#: pkgs.dbk:1949
+msgid "Upload fixing only release-critical bugs older than 7 days: 2 days"

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:1841
-msgid ""
-"Upload your package to incoming in <filename>DELAYED/7-day</filename> (cf.  "
-"<xref linkend=\"delayed-incoming\"/> ), send the final patch to the "
-"maintainer via the BTS, and explain to them that they have 7 days to react "
-"if they want to cancel the NMU."
+#. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
+#: pkgs.dbk:1954
+msgid "Upload fixing only release-critical and important bugs: 5 days"

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:1849
-msgid ""
-"Follow what happens, you're responsible for any bug that you introduced with "
-"your NMU.  You should probably use <xref linkend=\"pkg-tracking-system\"/> "
-"(PTS)  to stay informed of the state of the package after your NMU."
+#. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
+#: pkgs.dbk:1959
+msgid "Other NMUs: 10 days"

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:1856
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:1965

 msgid ""
 msgid ""

-"At times, the release manager or an organized group of developers can "
-"announce a certain period of time in which the NMU rules are relaxed.  This "
-"usually involves shortening the period during which one is to wait before "
-"uploading the fixes, and shortening the DELAYED period.  It is important to "
-"notice that even in these so-called bug squashing party times, the NMU'er "
-"has to file bugs and contact the developer first, and act later.  Please see "
-"<xref linkend=\"qa-bsp\"/> for details."
+"Those delays are only examples. In some cases, such as uploads fixing "
+"security issues, or fixes for trivial bugs that blocking a transition, it is "
+"desirable that the fixed package reaches <literal>unstable</literal> sooner."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:1865
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:1971

 msgid ""
 msgid ""

-"For the testing distribution, the rules may be changed by the release "
-"managers.  Please take additional care, and acknowledge that the usual way "
-"for a package to enter testing is through unstable."
+"Sometimes, release managers decide to allow NMUs with shorter delays for a "
+"subset of bugs (e.g release-critical bugs older than 7 days). Also, some "
+"maintainers list themselves in the <ulink "
+"url=\"&url-low-threshold-nmu;\">Low Threshold NMU list</ulink>, and accept "
+"that NMUs are uploaded without delay. But even in those cases, it's still a "
+"good idea to give the maintainer a few days to react before you upload, "
+"especially if the patch wasn't available in the BTS before, or if you know "
+"that the maintainer is generally active."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:1870
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:1981

 msgid ""
 msgid ""

-"For the stable distribution, please take extra care.  Of course, the release "
-"managers may also change the rules here.  Please verify before you upload "
-"that all your changes are OK for inclusion into the next stable release by "
-"the release manager."
+"After you upload an NMU, you are responsible for the possible problems that "
+"you might have introduced. You must keep an eye on the package (subscribing "
+"to the package on the PTS is a good way to achieve this)."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:1876
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:1987

 msgid ""
 msgid ""

-"When a security bug is detected, the security team may do an NMU, using "
-"their own rules.  Please refer to <xref linkend=\"bug-security\"/> for more "
-"information."
+"This is not a license to perform NMUs thoughtlessly.  If you NMU when it is "
+"clear that the maintainers are active and would have acknowledged a patch in "
+"a timely manner, or if you ignore the recommendations of this document, your "
+"upload might be a cause of conflict with the maintainer.  You should always "
+"be prepared to defend the wisdom of any NMU you perform on its own merits."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:1881
-msgid ""
-"For the differences for Porters NMUs, please see <xref "
-"linkend=\"source-nmu-when-porter\"/> ."
+#. type: Content of: <chapter><section><section><title>
+#: pkgs.dbk:1997
+msgid "NMUs and <filename>debian/changelog</filename>"

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:1885
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:1999

 msgid ""
 msgid ""

-"Of course, it is always possible to agree on special rules with a maintainer "
-"(like the maintainer asking please upload this fix directly for me, and no "
-"diff required)."
+"Just like any other (source) upload, NMUs must add an entry to "
+"<filename>debian/changelog</filename>, telling what has changed with this "
+"upload.  The first line of this entry must explicitely mention that this "
+"upload is an NMU, e.g.:"

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: pkgs.dbk:1892
-msgid "NMU version numbering"
+#. type: Content of: <chapter><section><section><screen>
+#: pkgs.dbk:2004
+#, no-wrap
+msgid "  * Non-maintainer upload.\n"

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:1894
-msgid ""
-"Whenever you have made a change to a package, no matter how trivial, the "
-"version number needs to change.  This enables our packing system to "
-"function."
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:2008
+msgid "The way to version NMUs differs for native and non-native packages."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:1898
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:2011

 msgid ""
 msgid ""

-"If you are doing a non-maintainer upload (NMU), you should add a new minor "
-"version number to the <replaceable>debian-revision</replaceable> part of the "
-"version number (the portion after the last hyphen).  This extra minor number "
-"will start at `1'.  For example, consider the package `foo', which is at "
-"version 1.1-3.  In the archive, the source package control file would be "
-"<filename>foo_1.1-3.dsc</filename>.  The upstream version is `1.1' and the "
-"Debian revision is `3'.  The next NMU would add a new minor number `.1' to "
-"the Debian revision; the new source control file would be "
-"<filename>foo_1.1-3.1.dsc</filename>."
+"If the package is a native package (without a Debian revision in the version "
+"number), the version must be the version of the last maintainer upload, plus "
+"<literal>+nmu<replaceable>X</replaceable></literal>, where "
+"<replaceable>X</replaceable> is a counter starting at <literal>1</literal>.  "
+"If the last upload was also an NMU, the counter should be increased.  For "
+"example, if the current version is <literal>1.5</literal>, then an NMU would "
+"get version <literal>1.5+nmu1</literal>."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:1909
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:2021

 msgid ""
 msgid ""

-"The Debian revision minor number is needed to avoid stealing one of the "
-"package maintainer's version numbers, which might disrupt their work.  It "
-"also has the benefit of making it visually clear that a package in the "
-"archive was not made by the official maintainer."
+"If the package is a not a native package, you should add a minor version "
+"number to the Debian revision part of the version number (the portion after "
+"the last hyphen). This extra number must start at <literal>1</literal>.  For "
+"example, if the current version is <literal>1.5-2</literal>, then an NMU "
+"would get version <literal>1.5-2.1</literal>. If a new upstream version is "
+"packaged in the NMU, the Debian revision is set to <literal>0</literal>, for "
+"example <literal>1.6-0.1</literal>."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:1915
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:2030

 msgid ""
 msgid ""

-"If there is no <replaceable>debian-revision</replaceable> component in the "
-"version number then one should be created, starting at `0.1' (but in case of "
-"a debian native package still upload it as native package).  If it is "
-"absolutely necessary for someone other than the usual maintainer to make a "
-"release based on a new upstream version then the person making the release "
-"should start with the <replaceable>debian-revision</replaceable> value "
-"`0.1'.  The usual maintainer of a package should start their "
-"<replaceable>debian-revision</replaceable> numbering at `1'."
+"In both cases, if the last upload was also an NMU, the counter should be "
+"increased. For example, if the current version is "
+"<literal>1.5+nmu3</literal> (a native package which has already been NMUed), "
+"the NMU would get version <literal>1.5+nmu4</literal>."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:1925
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:2036

 msgid ""
 msgid ""

-"If you upload a package to testing or stable, sometimes, you need to fork "
-"the version number tree.  For this, version numbers like 1.1-3sarge0.1 could "
-"be used."
-msgstr ""
-
-# type: Content of: <chapter><section><section><title>
-#: pkgs.dbk:1932
-msgid "Source NMUs must have a new changelog entry"
+"A special versioning scheme is needed to avoid disrupting the maintainer's "
+"work, since using an integer for the Debian revision will potentially "
+"conflict with a maintainer upload already in preparation at the time of an "
+"NMU, or even one sitting in the ftp NEW queue.  It also has the benefit of "
+"making it visually clear that a package in the archive was not made by the "
+"official maintainer."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:1934
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:2046

 msgid ""
 msgid ""

-"Anyone who is doing a source NMU must create a changelog entry, describing "
-"which bugs are fixed by the NMU, and generally why the NMU was required and "
-"what it fixed.  The changelog entry will have the email address of the "
-"person who uploaded it in the log entry and the NMU version number in it."
-msgstr ""
-
-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:1940
-msgid "By convention, source NMU changelog entries start with the line"
+"If you upload a package to testing or stable, you sometimes need to \"fork\" "
+"the version number tree. This is the case for security uploads, for "
+"example.  For this, a version of the form "
+"<literal>+deb<replaceable>XY</replaceable>u<replaceable>Z</replaceable></literal> "
+"should be used, where <replaceable>X</replaceable> and "
+"<replaceable>Y</replaceable> are the major and minor release numbers, and "
+"<replaceable>Z</replaceable> is a counter starting at <literal>1</literal>.  "
+"When the release number is not yet known (often the case for "
+"<literal>testing</literal>, at the beginning of release cycles), the lowest "
+"release number higher than the last stable release number must be used.  For "
+"example, while Lenny (Debian 5.0) is stable, a security NMU to stable for a "
+"package at version <literal>1.5-3</literal> would have version "
+"<literal>1.5-3+deb50u1</literal>, whereas a security NMU to Squeeze would "
+"get version <literal>1.5-3+deb60u1</literal>. After the release of Squeeze, "
+"security uploads to the <literal>testing</literal> distribution will be "
+"versioned <literal>+deb61uZ</literal>, until it is known whether that "
+"release will be Debian 6.1 or Debian 7.0 (if that becomes the case, uploads "
+"will be versioned as <literal>+deb70uZ</literal>)."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><screen>
-#: pkgs.dbk:1943
-#, no-wrap
-msgid "* Non-maintainer upload"
+#. type: Content of: <chapter><section><section><title>
+#: pkgs.dbk:2068
+msgid "Using the <literal>DELAYED/</literal> queue"

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: pkgs.dbk:1948
-msgid "Source NMUs and the Bug Tracking System"
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:2071
+msgid ""
+"Having to wait for a response after you request permission to NMU is "
+"inefficient, because it costs the NMUer a context switch to come back to the "
+"issue.  The <literal>DELAYED</literal> queue (see <xref "
+"linkend=\"delayed-incoming\"/>)  allows the developer doing the NMU to "
+"perform all the necessary tasks at the same time. For instance, instead of "
+"telling the maintainer that you will upload the updated package in 7 days, "
+"you should upload the package to <literal>DELAYED/7</literal> and tell the "
+"maintainer that he has 7 days to react.  During this time, the maintainer "
+"can ask you to delay the upload some more, or cancel your upload."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:1950
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:2085

 msgid ""
 msgid ""

-"Maintainers other than the official package maintainer should make as few "
-"changes to the package as possible, and they should always send a patch as a "
-"unified context diff (<literal>diff -u</literal>) detailing their changes to "
-"the Bug Tracking System."
+"The <literal>DELAYED</literal> queue should not be used to put additional "
+"pressure on the maintainer. In particular, it's important that you are "
+"available to cancel or delay the upload before the delay expires since the "
+"maintainer cannot cancel the upload himself."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:1956
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:2092

 msgid ""
 msgid ""

-"What if you are simply recompiling the package? If you just need to "
-"recompile it for a single architecture, then you may do a binary-only NMU as "
-"described in <xref linkend=\"binary-only-nmu\"/> which doesn't require any "
-"patch to be sent.  If you want the package to be recompiled for all "
-"architectures, then you do a source NMU as usual and you will have to send a "
-"patch."
+"If you make an NMU to <literal>DELAYED</literal> and the maintainer updates "
+"his package before the delay expires, your upload will be rejected because a "
+"newer version is already available in the archive.  Ideally, the maintainer "
+"will take care to include your proposed changes (or at least a solution for "
+"the problems they address) in that upload."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:1963
-msgid ""
-"Bugs fixed by source NMUs used to be tagged fixed instead of closed, but "
-"since version tracking is in place, such bugs are now also closed with the "
-"NMU version."
+#. type: Content of: <chapter><section><section><title>
+#: pkgs.dbk:2102
+msgid "NMUs from the maintainer's point of view"

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:1968
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:2105

 msgid ""
 msgid ""

-"Also, after doing an NMU, you have to send the information to the existing "
-"bugs that are fixed by your NMU, including the unified diff.  Historically, "
-"it was custom to open a new bug and include a patch showing all the changes "
-"you have made.  The normal maintainer will either apply the patch or employ "
-"an alternate method of fixing the problem.  Sometimes bugs are fixed "
-"independently upstream, which is another good reason to back out an NMU's "
-"patch.  If the maintainer decides not to apply the NMU's patch but to "
-"release a new version, the maintainer needs to ensure that the new upstream "
-"version really fixes each problem that was fixed in the non-maintainer "
-"release."
+"When someone NMUs your package, this means they want to help you to keep it "
+"in good shape.  This gives users fixed packages faster.  You can consider "
+"asking the NMUer to become a co-maintainer of the package.  Receiving an NMU "
+"on a package is not a bad thing; it just means that the package is "
+"interesting enough for other people to work on it."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:1979
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:2114

 msgid ""
 msgid ""

-"In addition, the normal maintainer should <emphasis>always</emphasis> retain "
-"the entry in the changelog file documenting the non-maintainer upload -- and "
-"of course, also keep the changes.  If you revert some of the changes, please "
-"reopen the relevant bug reports."
+"To acknowledge an NMU, include its changes and changelog entry in your next "
+"maintainer upload.  If you do not acknowledge the NMU by including the NMU "
+"changelog entry in your changelog, the bugs will remain closed in the BTS "
+"but will be listed as affecting your maintainer version of the package."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: pkgs.dbk:1987
-msgid "Building source NMUs"
+#. type: Content of: <chapter><section><section><title>
+#: pkgs.dbk:2123
+msgid "Source NMUs vs Binary-only NMUs (binNMUs)"

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:1989
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:2126

 msgid ""
 msgid ""

-"Source NMU packages are built normally.  Pick a distribution using the same "
-"rules as found in <xref linkend=\"distribution\"/> , follow the other "
-"instructions in <xref linkend=\"upload\"/> ."
+"The full name of an NMU is <emphasis>source NMU</emphasis>.  There is also "
+"another type, namely the <emphasis>binary-only NMU</emphasis>, or "
+"<emphasis>binNMU</emphasis>.  A binNMU is also a package upload by someone "
+"other than the package's maintainer.  However, it is a binary-only upload."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:1994
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:2133

 msgid ""
 msgid ""

-"Make sure you do <emphasis>not</emphasis> change the value of the maintainer "
-"in the <filename>debian/control</filename> file.  Your name as given in the "
-"NMU entry of the <filename>debian/changelog</filename> file will be used for "
-"signing the changes file."
-msgstr ""
-
-# type: Content of: <chapter><section><section><title>
-#: pkgs.dbk:2002
-msgid "Acknowledging an NMU"
+"When a library (or other dependency) is updated, the packages using it may "
+"need to be rebuilt.  Since no changes to the source are needed, the same "
+"source package is used."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:2004
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:2139

 msgid ""
 msgid ""

-"If one of your packages has been NMU'ed, you have to incorporate the changes "
-"in your copy of the sources.  This is easy, you just have to apply the patch "
-"that has been sent to you.  Once this is done, you have to close the bugs "
-"that have been tagged fixed by the NMU.  The easiest way is to use the "
-"<literal>-v</literal> option of <command>dpkg-buildpackage</command>, as "
-"this allows you to include just all changes since your last maintainer "
-"upload.  Alternatively, you can close them manually by sending the required "
-"mails to the BTS or by adding the required <literal>closes: #nnnn</literal> "
-"in the changelog entry of your next upload."
+"BinNMUs are usually triggered on the buildds by wanna-build.  An entry is "
+"added to <filename>debian/changelog</filename>, explaining why the upload "
+"was needed and increasing the version number as described in <xref "
+"linkend=\"binary-only-nmu\"/>.  This entry should not be included in the "
+"next upload."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:2015
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:2147

 msgid ""
 msgid ""

-"In any case, you should not be upset by the NMU.  An NMU is not a personal "
-"attack against the maintainer.  It is a proof that someone cares enough "
-"about the package that they were willing to help you in your work, so you "
-"should be thankful.  You may also want to ask them if they would be "
-"interested in helping you on a more frequent basis as co-maintainer or "
-"backup maintainer (see <xref linkend=\"collaborative-maint\"/> )."
+"Buildds upload packages for their architecture to the archive as binary-only "
+"uploads.  Strictly speaking, these are binNMUs.  However, they are not "
+"normally called NMU, and they don't add an entry to "
+"<filename>debian/changelog</filename>."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: pkgs.dbk:2025
-msgid "NMU vs QA uploads"
+#. type: Content of: <chapter><section><section><title>
+#: pkgs.dbk:2155
+msgid "NMUs vs QA uploads"

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:2027
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:2158

 msgid ""
 msgid ""

-"Unless you know the maintainer is still active, it is wise to check the "
-"package to see if it has been orphaned.  The current list of orphaned "
-"packages which haven't had their maintainer set correctly is available at "
-"<ulink url=\"http://qa.debian.org/orphaned.html\"></ulink>.  If you perform "
-"an NMU on an improperly orphaned package, please set the maintainer to "
-"``Debian QA Group &lt;packages@qa.debian.org&gt;''."
+"NMUs are uploads of packages by somebody else than their assigned "
+"maintainer.  There is another type of upload where the uploaded package is "
+"not yours: QA uploads. QA uploads are uploads of orphaned packages."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: pkgs.dbk:2037
-msgid "Who can do an NMU"
-msgstr ""
-
-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:2039
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:2165

 msgid ""
 msgid ""

-"Only official, registered Debian Developers can do binary or source NMUs.  A "
-"Debian Developer is someone who has their key in the Debian key ring.  "
-"Non-developers, however, are encouraged to download the source package and "
-"start hacking on it to fix problems; however, rather than doing an NMU, they "
-"should just submit worthwhile patches to the Bug Tracking System.  "
-"Maintainers almost always appreciate quality patches and bug reports."
+"QA uploads are very much like normal maintainer uploads: they may fix "
+"anything, even minor issues; the version numbering is normal, and there is "
+"no need to use a delayed upload.  The difference is that you are not listed "
+"as the <literal>Maintainer</literal> or <literal>Uploader</literal> for the "
+"package.  Also, the changelog entry of a QA upload has a special first line:"

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: pkgs.dbk:2049
-msgid "Terminology"
+#. type: Content of: <chapter><section><section><screen>
+#: pkgs.dbk:2173
+#, no-wrap
+msgid " * QA upload.\n"

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:2051
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:2177

 msgid ""
 msgid ""

-"There are two new terms used throughout this section: ``binary-only NMU'' "
-"and ``source NMU''.  These terms are used with specific technical meaning "
-"throughout this document.  Both binary-only and source NMUs are similar, "
-"since they involve an upload of a package by a developer who is not the "
-"official maintainer of that package.  That is why it's a "
-"<emphasis>non-maintainer</emphasis> upload."
+"If you want to do an NMU, and it seems that the maintainer is not active, it "
+"is wise to check if the package is orphaned (this information is displayed "
+"on the package's Package Tracking System page).  When doing the first QA "
+"upload to an orphaned package, the maintainer should be set to "
+"<literal>Debian QA Group &lt;packages@qa.debian.org&gt;</literal>.  Orphaned "
+"packages which did not yet have a QA upload still have their old maintainer "
+"set.  There is a list of them at <ulink url=\"&url-orphaned-not-qa;\"/>."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:2059
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:2188

 msgid ""
 msgid ""

-"A source NMU is an upload of a package by a developer who is not the "
-"official maintainer, for the purposes of fixing a bug in the package.  "
-"Source NMUs always involves changes to the source (even if it is just a "
-"change to <filename>debian/changelog</filename>).  This can be either a "
-"change to the upstream source, or a change to the Debian bits of the "
-"source.  Note, however, that source NMUs may also include "
-"architecture-dependent packages, as well as an updated Debian diff."
+"Instead of doing a QA upload, you can also consider adopting the package by "
+"making yourself the maintainer.  You don't need permission from anybody to "
+"adopt an orphaned package, you can just set yourself as maintainer and "
+"upload the new version (see <xref linkend=\"adopting\"/>)."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:2068
-msgid ""
-"A binary-only NMU is a recompilation and upload of a binary package for a "
-"given architecture.  As such, it is usually part of a porting effort.  A "
-"binary-only NMU is a non-maintainer uploaded binary version of a package, "
-"with no source changes required.  There are many cases where porters must "
-"fix problems in the source in order to get them to compile for their target "
-"architecture; that would be considered a source NMU rather than a "
-"binary-only NMU.  As you can see, we don't distinguish in terminology "
-"between porter NMUs and non-porter NMUs."
+#. type: Content of: <chapter><section><section><title>
+#: pkgs.dbk:2197
+msgid "NMUs vs team uploads"

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:2078
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:2200

 msgid ""
 msgid ""

-"Both classes of NMUs, source and binary-only, can be lumped under the term "
-"``NMU''.  However, this often leads to confusion, since most people think "
-"``source NMU'' when they think ``NMU''.  So it's best to be careful: always "
-"use ``binary NMU'' or ``binNMU'' for binary-only NMUs."
+"Sometimes you are fixing and/or updating a package because you are member of "
+"a packaging team (which uses a mailing list as <literal>Maintainer</literal> "
+"or <literal>Uploader</literal>, see <xref linkend=\"collaborative-maint\"/>) "
+"but you don't want to add yourself to <literal>Uploaders</literal> because "
+"you do not plan to contribute regularly to this specific package. If it "
+"conforms with your team's policy, you can perform a normal upload without "
+"being listed directly as <literal>Maintainer</literal> or "
+"<literal>Uploader</literal>. In that case, you should start your changelog "
+"entry with the following line:"

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><title>
-#: pkgs.dbk:2088
+#. type: Content of: <chapter><section><section><screen>
+#: pkgs.dbk:2210
+#, no-wrap
+msgid " * Team upload.\n"
+msgstr ""
+
+#. type: Content of: <chapter><section><title>
+#: pkgs.dbk:2218

 msgid "Collaborative maintenance"
 msgstr ""
 
 msgid "Collaborative maintenance"
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: pkgs.dbk:2090
+#. type: Content of: <chapter><section><para>
+#: pkgs.dbk:2220

 msgid ""
 "Collaborative maintenance is a term describing the sharing of Debian package "
 "maintenance duties by several people.  This collaboration is almost always a "
 "good idea, since it generally results in higher quality and faster bug fix "
 "turnaround times.  It is strongly recommended that packages with a priority "
 msgid ""
 "Collaborative maintenance is a term describing the sharing of Debian package "
 "maintenance duties by several people.  This collaboration is almost always a "
 "good idea, since it generally results in higher quality and faster bug fix "
 "turnaround times.  It is strongly recommended that packages with a priority "

-"of <literal>Standard</literal> or which are part of the base set have "
+"of <literal>standard</literal> or which are part of the base set have "

 "co-maintainers."
 msgstr ""
 
 "co-maintainers."
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: pkgs.dbk:2098
+#. type: Content of: <chapter><section><para>
+#: pkgs.dbk:2228

 msgid ""
 "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 "
 msgid ""
 "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."
+"maintainers, usually listed in the <literal>Uploaders</literal> field of the "
+"<filename>debian/control</filename> file."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: pkgs.dbk:2104
+#. type: Content of: <chapter><section><para>
+#: pkgs.dbk:2236

 msgid ""
 "In its most basic form, the process of adding a new co-maintainer is quite "
 "easy:"
 msgstr ""
 
 msgid ""
 "In its most basic form, the process of adding a new co-maintainer is quite "
 "easy:"
 msgstr ""
 

-# type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: pkgs.dbk:2110
+#. type: Content of: <chapter><section><itemizedlist><listitem><para>
+#: pkgs.dbk:2242

 msgid ""
 "Setup the co-maintainer with access to the sources you build the package "
 "from.  Generally this implies you are using a network-capable version "
 msgid ""
 "Setup the co-maintainer with access to the sources you build the package "
 "from.  Generally this implies you are using a network-capable version "

-"control system, such as <command>CVS</command> or "
-"<command>Subversion</command>.  Alioth (see <xref linkend=\"alioth\"/> ) "
+"control system, such as <literal>CVS</literal> or "
+"<literal>Subversion</literal>.  Alioth (see <xref linkend=\"alioth\"/>) "

 "provides such tools, amongst others."
 msgstr ""
 
 "provides such tools, amongst others."
 msgstr ""
 

-# type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: pkgs.dbk:2118
+#. type: Content of: <chapter><section><itemizedlist><listitem><para>
+#: pkgs.dbk:2250

 msgid ""
 "Add the co-maintainer's correct maintainer name and address to the "
 msgid ""
 "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."
 msgstr ""
 
 "<filename>debian/control</filename> file."
 msgstr ""
 

-# type: Content of: <chapter><section><itemizedlist><listitem><screen>
-#: pkgs.dbk:2123
+#. type: Content of: <chapter><section><itemizedlist><listitem><screen>
+#: pkgs.dbk:2255

 #, no-wrap
 #, no-wrap

-msgid ": John Buzz &lt;jbuzz@debian.org&gt;, Adam Rex &lt;arex@debian.org&gt;"
+msgid ""
+"Uploaders: John Buzz &lt;jbuzz@debian.org&gt;, Adam Rex "
+"&lt;arex@debian.org&gt;\n"

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: pkgs.dbk:2128
+#. type: Content of: <chapter><section><itemizedlist><listitem><para>
+#: pkgs.dbk:2260

 msgid ""
 msgid ""

-"Using the PTS (<xref linkend=\"pkg-tracking-system\"/> ), the co-maintainers "
+"Using the PTS (<xref linkend=\"pkg-tracking-system\"/>), the co-maintainers "

 "should subscribe themselves to the appropriate source package."
 msgstr ""
 
 "should subscribe themselves to the appropriate source package."
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: pkgs.dbk:2134
+#. type: Content of: <chapter><section><para>
+#: pkgs.dbk:2266

 msgid ""
 "Another form of collaborative maintenance is team maintenance, which is "
 "recommended if you maintain several packages with the same group of "
 msgid ""
 "Another form of collaborative maintenance is team maintenance, which is "
 "recommended if you maintain several packages with the same group of "

-"developers.  In that case, the Maintainer and Uploaders field of each "
-"package must be managed with care.  It is recommended to choose between one "
-"of the two following schemes:"
+"developers.  In that case, the <literal>Maintainer</literal> and "
+"<literal>Uploaders</literal> field of each package must be managed with "
+"care.  It is recommended to choose between one of the two following schemes:"

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><orderedlist><listitem><para>
-#: pkgs.dbk:2143
+#. type: Content of: <chapter><section><orderedlist><listitem><para>
+#: pkgs.dbk:2275

 msgid ""
 msgid ""

-"Put the team member mainly responsible for the package in the Maintainer "
-"field.  In the Uploaders, put the mailing list address, and the team members "
-"who care for the package."
+"Put the team member mainly responsible for the package in the "
+"<literal>Maintainer</literal> field.  In the <literal>Uploaders</literal>, "
+"put the mailing list address, and the team members who care for the package."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><orderedlist><listitem><para>
-#: pkgs.dbk:2150
+#. type: Content of: <chapter><section><orderedlist><listitem><para>
+#: pkgs.dbk:2282

 msgid ""
 msgid ""

-"Put the mailing list address in the Maintainer field.  In the Uploaders "
-"field, put the team members who care for the package.  In this case, you "
-"must make sure the mailing list accept bug reports without any human "
-"interaction (like moderation for non-subscribers)."
+"Put the mailing list address in the <literal>Maintainer</literal> field.  In "
+"the <literal>Uploaders</literal> field, put the team members who care for "
+"the package.  In this case, you must make sure the mailing list accept bug "
+"reports without any human interaction (like moderation for non-subscribers)."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><para>
-#: pkgs.dbk:2158
+#. type: Content of: <chapter><section><para>
+#: pkgs.dbk:2291

 msgid ""
 "In any case, it is a bad idea to automatically put all team members in the "
 msgid ""
 "In any case, it is a bad idea to automatically put all team members in the "

-"Uploaders field.  It clutters the Developer's Package Overview listing (see "
-"<xref linkend=\"ddpo\"/> ) with packages one doesn't really care for, and "
-"creates a false sense of good maintenance."
-msgstr ""
-
-# type: Content of: <chapter><section><title>
-#: pkgs.dbk:2166
+"<literal>Uploaders</literal> field. It clutters the Developer's Package "
+"Overview listing (see <xref linkend=\"ddpo\"/>) with packages one doesn't "
+"really care for, and creates a false sense of good maintenance. For the same "
+"reason, team members do not need to add themselves to the "
+"<literal>Uploaders</literal> field just because they are uploading the "
+"package once, they can do a “Team upload” (see <xref "
+"linkend=\"nmu-team-upload\"/>). Conversely, it it a bad idea to keep a "
+"package with only the mailing list address as a "
+"<literal>Maintainer</literal> and no <literal>Uploaders</literal>."
+msgstr ""
+
+#. type: Content of: <chapter><section><title>
+#: pkgs.dbk:2304

 msgid "The testing distribution"
 msgstr ""
 
 msgid "The testing distribution"
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: pkgs.dbk:2168
+#. type: Content of: <chapter><section><section><title>
+#: pkgs.dbk:2306

 msgid "Basics"
 msgstr ""
 
 msgid "Basics"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:2170
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:2308

 msgid ""
 msgid ""

-"Packages are usually installed into the `testing' distribution after they "
-"have undergone some degree of testing in unstable."
+"Packages are usually installed into the <literal>testing</literal> "
+"distribution after they have undergone some degree of "
+"<literal>testing</literal> in <literal>unstable</literal>."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:2174
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:2313

 msgid ""
 "They must be in sync on all architectures and mustn't have dependencies that "
 "make them uninstallable; they also have to have generally no known "
 msgid ""
 "They must be in sync on all architectures and mustn't have dependencies that "
 "make them uninstallable; they also have to have generally no known "

-"release-critical bugs at the time they're installed into testing.  This way, "
-"`testing' should always be close to being a release candidate.  Please see "
-"below for details."
+"release-critical bugs at the time they're installed into "
+"<literal>testing</literal>.  This way, <literal>testing</literal> should "
+"always be close to being a release candidate.  Please see below for details."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: pkgs.dbk:2183
+#. type: Content of: <chapter><section><section><title>
+#: pkgs.dbk:2322

 msgid "Updates from unstable"
 msgstr ""
 
 msgid "Updates from unstable"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:2185
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:2324

 msgid ""
 msgid ""

-"The scripts that update the <emphasis>testing</emphasis> distribution are "
-"run each day after the installation of the updated packages; these scripts "
-"are called <emphasis>britney</emphasis>.  They generate the "
-"<filename>Packages</filename> files for the <emphasis>testing</emphasis> "
+"The scripts that update the <literal>testing</literal> distribution are run "
+"twice each day, right after the installation of the updated packages; these "
+"scripts are called <literal>britney</literal>.  They generate the "
+"<filename>Packages</filename> files for the <literal>testing</literal> "

 "distribution, but they do so in an intelligent manner; they try to avoid any "
 "inconsistency and to use only non-buggy packages."
 msgstr ""
 
 "distribution, but they do so in an intelligent manner; they try to avoid any "
 "inconsistency and to use only non-buggy packages."
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:2193
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:2332

 msgid ""
 msgid ""

-"The inclusion of a package from <emphasis>unstable</emphasis> is conditional "
+"The inclusion of a package from <literal>unstable</literal> is conditional "

 "on the following:"
 msgstr ""
 
 "on the following:"
 msgstr ""
 

-# type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:2199
+#. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
+#: pkgs.dbk:2338

 msgid ""
 msgid ""

-"The package must have been available in <emphasis>unstable</emphasis> for 2, "
-"5 or 10 days, depending on the urgency (high, medium or low).  Please note "
+"The package must have been available in <literal>unstable</literal> for 2, 5 "
+"or 10 days, depending on the urgency (high, medium or low).  Please note "

 "that the urgency is sticky, meaning that the highest urgency uploaded since "
 "that the urgency is sticky, meaning that the highest urgency uploaded since "

-"the previous testing transition is taken into account.  Those delays may be "
-"doubled during a freeze, or testing transitions may be switched off "
-"altogether;"
+"the previous <literal>testing</literal> transition is taken into account.  "
+"Those delays may be doubled during a freeze, or <literal>testing</literal> "
+"transitions may be switched off altogether;"

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:2208
+#. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
+#: pkgs.dbk:2348

 msgid ""
 msgid ""

-"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 <literal>unstable</literal>, but not affecting the version in "
+"<literal>testing</literal>);"

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:2214
+#. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
+#: pkgs.dbk:2355

 msgid ""
 "It must be available on all architectures on which it has previously been "
 msgid ""
 "It must be available on all architectures on which it has previously been "

-"built in unstable.  <xref linkend=\"madison\"/> may be of interest to check "
-"that information;"
+"built in <literal>unstable</literal>. <link linkend=\"dak-ls\">dak ls</link> "
+"may be of interest to check that information;"

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:2221
+#. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
+#: pkgs.dbk:2362

 msgid ""
 "It must not break any dependency of a package which is already available in "
 msgid ""
 "It must not break any dependency of a package which is already available in "

-"<emphasis>testing</emphasis>;"
+"<literal>testing</literal>;"

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:2227
+#. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
+#: pkgs.dbk:2368

 msgid ""
 "The packages on which it depends must either be available in "
 msgid ""
 "The packages on which it depends must either be available in "

-"<emphasis>testing</emphasis> or they must be accepted into "
-"<emphasis>testing</emphasis> at the same time (and they will be if they "
-"fulfill all the necessary criteria);"
+"<literal>testing</literal> or they must be accepted into "
+"<literal>testing</literal> at the same time (and they will be if they "
+"fulfill all the necessary criteria)."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:2235
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:2376

 msgid ""
 msgid ""

-"To find out whether a package is progressing into testing or not, see the "
-"testing script output on the <ulink "
-"url=\"http://www.debian.org/devel/testing\">web page of the testing "
-"distribution</ulink>, or use the program <command>grep-excuses</command> "
-"which is in the <systemitem role=\"package\">devscripts</systemitem> "
-"package.  This utility can easily be used in a <citerefentry> "
-"<refentrytitle>crontab</refentrytitle> <manvolnum>5</manvolnum> "
-"</citerefentry> to keep yourself informed of the progression of your "
-"packages into <emphasis>testing</emphasis>."
+"To find out whether a package is progressing into <literal>testing</literal> "
+"or not, see the <literal>testing</literal> script output on the <ulink "
+"url=\"&url-testing-maint;\">web page of the testing distribution</ulink>, or "
+"use the program <command>grep-excuses</command> which is in the <systemitem "
+"role=\"package\">devscripts</systemitem> package.  This utility can easily "
+"be used in a <citerefentry> <refentrytitle>crontab</refentrytitle> "
+"<manvolnum>5</manvolnum> </citerefentry> to keep yourself informed of the "
+"progression of your packages into <literal>testing</literal>."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:2246
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:2387

 msgid ""
 "The <filename>update_excuses</filename> file does not always give the "
 "precise reason why the package is refused; you may have to find it on your "
 "own by looking for what would break with the inclusion of the package.  The "
 msgid ""
 "The <filename>update_excuses</filename> file does not always give the "
 "precise reason why the package is refused; you may have to find it on your "
 "own by looking for what would break with the inclusion of the package.  The "

-"<ulink url=\"http://www.debian.org/devel/testing\">testing web page</ulink> "
-"gives some more information about the usual problems which may be causing "
-"such troubles."
+"<ulink url=\"&url-testing-maint;\">testing web page</ulink> gives some more "
+"information about the usual problems which may be causing such troubles."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:2253
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:2394

 msgid ""
 msgid ""

-"Sometimes, some packages never enter <emphasis>testing</emphasis> because "
-"the set of inter-relationship is too complicated and cannot be sorted out by "
-"the scripts.  See below for details."
+"Sometimes, some packages never enter <literal>testing</literal> because the "
+"set of inter-relationship is too complicated and cannot be sorted out by the "
+"scripts.  See below for details."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:2258
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:2399

 msgid ""
 "Some further dependency analysis is shown on <ulink "
 msgid ""
 "Some further dependency analysis is shown on <ulink "

-"url=\"http://bjorn.haxx.se/debian/\"></ulink> — but be warned, this page "
-"also shows build dependencies which are not considered by britney."
+"url=\"http://release.debian.org/migration/\"></ulink> — but be warned, this "
+"page also shows build dependencies which are not considered by britney."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><title>
-#: pkgs.dbk:2263
-msgid "out-of-date"
+#. type: Content of: <chapter><section><section><section><title>
+#: pkgs.dbk:2404
+msgid "Out-of-date"

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:2265
+#.  FIXME: better rename this file than document rampant professionalism? 
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:2407

 msgid ""
 msgid ""

-"For the testing migration script, outdated means: There are different "
-"versions in unstable for the release architectures (except for the "
-"architectures in fuckedarches; fuckedarches is a list of architectures that "
-"don't keep up (in update_out.py), but currently, it's empty).  outdated has "
-"nothing whatsoever to do with the architectures this package has in testing."
+"For the <literal>testing</literal> migration script, outdated means: There "
+"are different versions in <literal>unstable</literal> for the release "
+"architectures (except for the architectures in fuckedarches; fuckedarches is "
+"a list of architectures that don't keep up (in "
+"<filename>update_out.py</filename>), but currently, it's empty).  outdated "
+"has nothing whatsoever to do with the architectures this package has in "
+"<literal>testing</literal>."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:2272
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:2415

 msgid "Consider this example:"
 msgstr ""
 
 msgid "Consider this example:"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><informaltable><tgroup><thead><row><entry>
-#: pkgs.dbk:2279 pkgs.dbk:2310
+#. type: Content of: <chapter><section><section><section><informaltable><tgroup><thead><row><entry>
+#: pkgs.dbk:2422 pkgs.dbk:2455

 msgid "alpha"
 msgstr ""
 
 msgid "alpha"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><informaltable><tgroup><thead><row><entry>
-#: pkgs.dbk:2280 pkgs.dbk:2311
+#. type: Content of: <chapter><section><section><section><informaltable><tgroup><thead><row><entry>
+#: pkgs.dbk:2423 pkgs.dbk:2456

 msgid "arm"
 msgstr ""
 
 msgid "arm"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><informaltable><tgroup><thead><row><entry>
-#: pkgs.dbk:2285 pkgs.dbk:2317 pkgs.dbk:2377
+#. type: Content of: <chapter><section><section><section><informaltable><tgroup><thead><row><entry>
+#: pkgs.dbk:2428 pkgs.dbk:2462 pkgs.dbk:2524

 msgid "testing"
 msgstr ""
 
 msgid "testing"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>
-#: pkgs.dbk:2286 pkgs.dbk:2291 pkgs.dbk:2318 pkgs.dbk:2319 pkgs.dbk:2326
+#. type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>
+#: pkgs.dbk:2429 pkgs.dbk:2434 pkgs.dbk:2463 pkgs.dbk:2464 pkgs.dbk:2471

 msgid "1"
 msgstr ""
 
 msgid "1"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>
-#: pkgs.dbk:2287 pkgs.dbk:2320 pkgs.dbk:2325
+#. type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>
+#: pkgs.dbk:2430 pkgs.dbk:2465 pkgs.dbk:2470

 msgid "-"
 msgstr ""
 
 msgid "-"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><informaltable><tgroup><thead><row><entry>
-#: pkgs.dbk:2290 pkgs.dbk:2323 pkgs.dbk:2378
+#. type: Content of: <chapter><section><section><section><informaltable><tgroup><thead><row><entry>
+#: pkgs.dbk:2433 pkgs.dbk:2468 pkgs.dbk:2525

 msgid "unstable"
 msgstr ""
 
 msgid "unstable"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>
-#: pkgs.dbk:2292 pkgs.dbk:2324
+#. type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>
+#: pkgs.dbk:2435 pkgs.dbk:2469

 msgid "2"
 msgstr ""
 
 msgid "2"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:2298
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:2441

 msgid ""
 msgid ""

-"The package is out of date on alpha in unstable, and will not go to "
-"testing.  And removing foo from testing would not help at all, the package "
-"is still out of date on alpha, and will not propagate to testing."
+"The package is out of date on <literal>alpha</literal> in "
+"<literal>unstable</literal>, and will not go to "
+"<literal>testing</literal>. Removing the package would not help at all, the "
+"package is still out of date on <literal>alpha</literal>, and will not "
+"propagate to <literal>testing</literal>."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:2303
-msgid "However, if ftp-master removes a package in unstable (here on arm):"
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:2447
+msgid ""
+"However, if ftp-master removes a package in <literal>unstable</literal> "
+"(here on <literal>arm</literal>):"

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><informaltable><tgroup><thead><row><entry>
-#: pkgs.dbk:2312
+#. type: Content of: <chapter><section><section><section><informaltable><tgroup><thead><row><entry>
+#: pkgs.dbk:2457

 msgid "hurd-i386"
 msgstr ""
 
 msgid "hurd-i386"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:2332
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:2477

 msgid ""
 "In this case, the package is up to date on all release architectures in "
 msgid ""
 "In this case, the package is up to date on all release architectures in "

-"unstable (and the extra hurd-i386 doesn't matter, as it's not a release "
-"architecture)."
+"<literal>unstable</literal> (and the extra <literal>hurd-i386</literal> "
+"doesn't matter, as it's not a release architecture)."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:2337
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:2482

 msgid ""
 "Sometimes, the question is raised if it is possible to allow packages in "
 "that are not yet built on all architectures: No.  Just plainly no.  (Except "
 "if you maintain glibc or so.)"
 msgstr ""
 
 msgid ""
 "Sometimes, the question is raised if it is possible to allow packages in "
 "that are not yet built on all architectures: No.  Just plainly no.  (Except "
 "if you maintain glibc or so.)"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><title>
-#: pkgs.dbk:2344
+#. type: Content of: <chapter><section><section><section><title>
+#: pkgs.dbk:2489

 msgid "Removals from testing"
 msgstr ""
 
 msgid "Removals from testing"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:2346
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:2491

 msgid ""
 "Sometimes, a package is removed to allow another package in: This happens "
 "only to allow <emphasis>another</emphasis> package to go in if it's ready in "
 msgid ""
 "Sometimes, a package is removed to allow another package in: This happens "
 "only to allow <emphasis>another</emphasis> package to go in if it's ready in "

-"every other sense.  Suppose e.g.  that <emphasis>a</emphasis> cannot be "
-"installed with the new version of <emphasis>b</emphasis>; then "
-"<emphasis>a</emphasis> may be removed to allow <emphasis>b</emphasis> in."
+"every other sense.  Suppose e.g.  that <literal>a</literal> cannot be "
+"installed with the new version of <literal>b</literal>; then "
+"<literal>a</literal> may be removed to allow <literal>b</literal> in."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:2353
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:2498

 msgid ""
 msgid ""

-"Of course, there is another reason to remove a package from testing: It's "
-"just too buggy (and having a single RC-bug is enough to be in this state)."
+"Of course, there is another reason to remove a package from "
+"<literal>testing</literal>: It's just too buggy (and having a single RC-bug "
+"is enough to be in this state)."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:2357
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:2503

 msgid ""
 msgid ""

-"Furthermore, if a package has been removed from unstable, and no package in "
-"testing depends on it any more, then it will automatically be removed."
+"Furthermore, if a package has been removed from <literal>unstable</literal>, "
+"and no package in <literal>testing</literal> depends on it any more, then it "
+"will automatically be removed."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><title>
-#: pkgs.dbk:2363
-msgid "circular dependencies"
+#. type: Content of: <chapter><section><section><section><title>
+#: pkgs.dbk:2510
+msgid "Circular dependencies"

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:2365
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:2512

 msgid ""
 "A situation which is not handled very well by britney is if package "
 msgid ""
 "A situation which is not handled very well by britney is if package "

-"<emphasis>a</emphasis> depends on the new version of package "
-"<emphasis>b</emphasis>, and vice versa."
+"<literal>a</literal> depends on the new version of package "
+"<literal>b</literal>, and vice versa."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:2370
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:2517

 msgid "An example of this is:"
 msgstr ""
 
 msgid "An example of this is:"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>
-#: pkgs.dbk:2383
+#. type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>
+#: pkgs.dbk:2530

 msgid "a"
 msgstr ""
 
 msgid "a"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>
-#: pkgs.dbk:2384
+#. type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>
+#: pkgs.dbk:2531

 msgid "1; depends: b=1"
 msgstr ""
 
 msgid "1; depends: b=1"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>
-#: pkgs.dbk:2385
+#. type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>
+#: pkgs.dbk:2532

 msgid "2; depends: b=2"
 msgstr ""
 
 msgid "2; depends: b=2"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>
-#: pkgs.dbk:2388
+#. type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>
+#: pkgs.dbk:2535

 msgid "b"
 msgstr ""
 
 msgid "b"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>
-#: pkgs.dbk:2389
+#. type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>
+#: pkgs.dbk:2536

 msgid "1; depends: a=1"
 msgstr ""
 
 msgid "1; depends: a=1"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>
-#: pkgs.dbk:2390
+#. type: Content of: <chapter><section><section><section><informaltable><tgroup><tbody><row><entry>
+#: pkgs.dbk:2537

 msgid "2; depends: a=2"
 msgstr ""
 
 msgid "2; depends: a=2"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:2396
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:2543

 msgid ""
 msgid ""

-"Neither package <emphasis>a</emphasis> nor package <emphasis>b</emphasis> is "
+"Neither package <literal>a</literal> nor package <literal>b</literal> is "

 "considered for update."
 msgstr ""
 
 "considered for update."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:2400
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:2547

 msgid ""
 "Currently, this requires some manual hinting from the release team.  Please "
 msgid ""
 "Currently, this requires some manual hinting from the release team.  Please "

-"contact them by sending mail to "
-"<email>debian-release@lists.debian.org</email> if this happens to one of "
-"your packages."
+"contact them by sending mail to &email-debian-release; if this happens to "
+"one of your packages."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><title>
-#: pkgs.dbk:2407
-msgid "influence of package in testing"
+#. type: Content of: <chapter><section><section><section><title>
+#: pkgs.dbk:2554
+msgid "Influence of package in testing"

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:2409
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:2556

 msgid ""
 msgid ""

-"Generally, there is nothing that the status of a package in testing means "
-"for transition of the next version from unstable to testing, with two "
+"Generally, there is nothing that the status of a package in "
+"<literal>testing</literal> means for transition of the next version from "
+"<literal>unstable</literal> to <literal>testing</literal>, with two "

 "exceptions: If the RC-bugginess of the package goes down, it may go in even "
 "if it is still RC-buggy.  The second exception is if the version of the "
 "exceptions: If the RC-bugginess of the package goes down, it may go in even "
 "if it is still RC-buggy.  The second exception is if the version of the "

-"package in testing is out of sync on the different arches: Then any arch "
-"might just upgrade to the version of the source package; however, this can "
-"happen only if the package was previously forced through, the arch is in "
-"fuckedarches, or there was no binary package of that arch present in "
-"unstable at all during the testing migration."
+"package in <literal>testing</literal> is out of sync on the different "
+"arches: Then any arch might just upgrade to the version of the source "
+"package; however, this can happen only if the package was previously forced "
+"through, the arch is in fuckedarches, or there was no binary package of that "
+"arch present in <literal>unstable</literal> at all during the "
+"<literal>testing</literal> migration."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:2419
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:2568

 msgid ""
 msgid ""

-"In summary this means: The only influence that a package being in testing "
-"has on a new version of the same package is that the new version might go in "
-"easier."
+"In summary this means: The only influence that a package being in "
+"<literal>testing</literal> has on a new version of the same package is that "
+"the new version might go in easier."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><title>
-#: pkgs.dbk:2426
-msgid "details"
+#. type: Content of: <chapter><section><section><section><title>
+#: pkgs.dbk:2575
+msgid "Details"

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:2428
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:2577

 msgid "If you are interested in details, this is how britney works:"
 msgstr ""
 
 msgid "If you are interested in details, this is how britney works:"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:2431
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:2580

 msgid ""
 "The packages are looked at to determine whether they are valid candidates.  "
 "This gives the update excuses.  The most common reasons why a package is not "
 msgid ""
 "The packages are looked at to determine whether they are valid candidates.  "
 "This gives the update excuses.  The most common reasons why a package is not "


@@ -3297,200 +3393,205 @@ msgid ""
 "the code.)"
 msgstr ""
 
 "the code.)"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:2440
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:2589

 msgid ""
 msgid ""

-"Now, the more complex part happens: Britney tries to update testing with the "
-"valid candidates; first, each package alone, and then larger and even larger "
-"sets of packages together.  Each try is accepted if testing is not more "
-"uninstallable after the update than before.  (Before and after this part, "
-"some hints are processed; but as only release masters can hint, this is "
-"probably not so important for you.)"
+"Now, the more complex part happens: Britney tries to update "
+"<literal>testing</literal> with the valid candidates. For that, britney "
+"tries to add each valid candidate to the testing distribution. If the number "
+"of uninstallable packages in <literal>testing</literal> doesn't increase, "
+"the package is accepted. From that point on, the accepted package is "
+"considered to be part of <literal>testing</literal>, such that all "
+"subsequent installability tests include this package.  Hints from the "
+"release team are processed before or after this main run, depending on the "
+"exact type."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:2448
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:2599

 msgid ""
 "If you want to see more details, you can look it up on "
 msgid ""
 "If you want to see more details, you can look it up on "

-"merkel:/org/ftp.debian.org/testing/update_out/ (or there in "
-"~aba/testing/update_out to see a setup with a smaller packages file).  Via "
-"web, it's at <ulink "
-"url=\"http://ftp-master.debian.org/testing/update_out_code/\"></ulink>"
+"<filename>merkel:/org/&ftp-debian-org;/testing/update_out/</filename> (or in "
+"<filename>merkel:~aba/testing/update_out</filename> to see a setup with a "
+"smaller packages file).  Via web, it's at <ulink "
+"url=\"http://&ftp-master-host;/testing/update_out_code/\"></ulink>."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:2455
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:2606

 msgid ""
 "The hints are available via <ulink "
 msgid ""
 "The hints are available via <ulink "

-"url=\"http://ftp-master.debian.org/testing/hints/\"></ulink>."
+"url=\"http://&ftp-master-host;/testing/hints/\"></ulink>."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: pkgs.dbk:2463
+#. type: Content of: <chapter><section><section><title>
+#: pkgs.dbk:2614

 msgid "Direct updates to testing"
 msgstr ""
 
 msgid "Direct updates to testing"
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:2465
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:2616

 msgid ""
 msgid ""

-"The testing distribution is fed with packages from unstable according to the "
-"rules explained above.  However, in some cases, it is necessary to upload "
-"packages built only for testing.  For that, you may want to upload to "
-"<emphasis>testing-proposed-updates</emphasis>."
+"The <literal>testing</literal> distribution is fed with packages from "
+"<literal>unstable</literal> according to the rules explained above.  "
+"However, in some cases, it is necessary to upload packages built only for "
+"<literal>testing</literal>.  For that, you may want to upload to "
+"<literal>testing-proposed-updates</literal>."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:2471
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:2623

 msgid ""
 "Keep in mind that packages uploaded there are not automatically processed, "
 "they have to go through the hands of the release manager.  So you'd better "
 "have a good reason to upload there.  In order to know what a good reason is "
 "in the release managers' eyes, you should read the instructions that they "
 msgid ""
 "Keep in mind that packages uploaded there are not automatically processed, "
 "they have to go through the hands of the release manager.  So you'd better "
 "have a good reason to upload there.  In order to know what a good reason is "
 "in the release managers' eyes, you should read the instructions that they "

-"regularly give on <email>debian-devel-announce@lists.debian.org</email>."
+"regularly give on &email-debian-devel-announce;."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:2478
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:2630

 msgid ""
 msgid ""

-"You should not upload to <emphasis>testing-proposed-updates</emphasis> when "
-"you can update your packages through <emphasis>unstable</emphasis>.  If you "
+"You should not upload to <literal>testing-proposed-updates</literal> when "
+"you can update your packages through <literal>unstable</literal>.  If you "

 "can't (for example because you have a newer development version in "
 "can't (for example because you have a newer development version in "

-"unstable), you may use this facility, but it is recommended that you ask for "
-"authorization from the release manager first.  Even if a package is frozen, "
-"updates through unstable are possible, if the upload via unstable does not "
-"pull in any new dependencies."
+"<literal>unstable</literal>), you may use this facility, but it is "
+"recommended that you ask for authorization from the release manager first.  "
+"Even if a package is frozen, updates through <literal>unstable</literal> are "
+"possible, if the upload via <literal>unstable</literal> does not pull in any "
+"new dependencies."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:2487
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:2639

 msgid ""
 msgid ""

-"Version numbers are usually selected by adding the codename of the testing "
-"distribution and a running number, like 1.2sarge1 for the first upload "
-"through testing-proposed-updates of package version 1.2."
+"Version numbers are usually selected by adding the codename of the "
+"<literal>testing</literal> distribution and a running number, like "
+"<literal>1.2squeeze1</literal> for the first upload through "
+"<literal>testing-proposed-updates</literal> of package version "
+"<literal>1.2</literal>."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><para>
-#: pkgs.dbk:2492
+#. type: Content of: <chapter><section><section><para>
+#: pkgs.dbk:2646

 msgid "Please make sure you didn't miss any of these items in your upload:"
 msgstr ""
 
 msgid "Please make sure you didn't miss any of these items in your upload:"
 msgstr ""
 

-# type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:2497
+#. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
+#: pkgs.dbk:2651

 msgid ""
 "Make sure that your package really needs to go through "
 msgid ""
 "Make sure that your package really needs to go through "

-"<emphasis>testing-proposed-updates</emphasis>, and can't go through "
-"unstable;"
+"<literal>testing-proposed-updates</literal>, and can't go through "
+"<literal>unstable</literal>;"

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:2503
+#. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
+#: pkgs.dbk:2658

 msgid "Make sure that you included only the minimal amount of changes;"
 msgstr ""
 
 msgid "Make sure that you included only the minimal amount of changes;"
 msgstr ""
 

-# type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:2508
+#. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
+#: pkgs.dbk:2663

 msgid "Make sure that you included an appropriate explanation in the changelog;"
 msgstr ""
 
 msgid "Make sure that you included an appropriate explanation in the changelog;"
 msgstr ""
 

-# type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:2513
+#. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
+#: pkgs.dbk:2668

 msgid ""
 msgid ""

-"Make sure that you've written <emphasis>testing</emphasis> or "
-"<emphasis>testing-proposed-updates</emphasis> into your target distribution;"
+"Make sure that you've written <literal>testing</literal> or "
+"<literal>testing-proposed-updates</literal> into your target distribution;"

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:2519
+#. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
+#: pkgs.dbk:2674

 msgid ""
 "Make sure that you've built and tested your package in "
 msgid ""
 "Make sure that you've built and tested your package in "

-"<emphasis>testing</emphasis>, not in <emphasis>unstable</emphasis>;"
+"<literal>testing</literal>, not in <literal>unstable</literal>;"

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:2525
+#. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
+#: pkgs.dbk:2680

 msgid ""
 "Make sure that your version number is higher than the version in "
 msgid ""
 "Make sure that your version number is higher than the version in "

-"<emphasis>testing</emphasis> and "
-"<emphasis>testing-proposed-updates</emphasis>, and lower than in "
-"<emphasis>unstable</emphasis>;"
+"<literal>testing</literal> and <literal>testing-proposed-updates</literal>, "
+"and lower than in <literal>unstable</literal>;"

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: pkgs.dbk:2532
+#. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
+#: pkgs.dbk:2687

 msgid ""
 "After uploading and successful build on all platforms, contact the release "
 msgid ""
 "After uploading and successful build on all platforms, contact the release "

-"team at <email>debian-release@lists.debian.org</email> and ask them to "
-"approve your upload."
+"team at &email-debian-release; and ask them to approve your upload."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><title>
-#: pkgs.dbk:2541
+#. type: Content of: <chapter><section><section><title>
+#: pkgs.dbk:2695

 msgid "Frequently asked questions"
 msgstr ""
 
 msgid "Frequently asked questions"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><title>
-#: pkgs.dbk:2543
+#. type: Content of: <chapter><section><section><section><title>
+#: pkgs.dbk:2697

 msgid "What are release-critical bugs, and how do they get counted?"
 msgstr ""
 
 msgid "What are release-critical bugs, and how do they get counted?"
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:2545
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:2699

 msgid ""
 "All bugs of some higher severities are by default considered "
 msgid ""
 "All bugs of some higher severities are by default considered "

-"release-critical; currently, these are critical, grave, and serious bugs."
+"release-critical; currently, these are <literal>critical</literal>, "
+"<literal>grave</literal> and <literal>serious</literal> bugs."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:2549
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:2704

 msgid ""
 "Such bugs are presumed to have an impact on the chances that the package "
 msgid ""
 "Such bugs are presumed to have an impact on the chances that the package "

-"will be released with the stable release of Debian: in general, if a package "
-"has open release-critical bugs filed on it, it won't get into testing, and "
-"consequently won't be released in stable."
+"will be released with the <literal>stable</literal> release of Debian: in "
+"general, if a package has open release-critical bugs filed on it, it won't "
+"get into <literal>testing</literal>, and consequently won't be released in "
+"<literal>stable</literal>."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:2555
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:2711

 msgid ""
 msgid ""

-"The unstable bug count are all release-critical bugs without either any "
-"release-tag (such as potato, woody) or with release-tag sid; also, only if "
-"they are neither fixed nor set to sarge-ignore.  The testing bug count for a "
-"package is considered to be roughly the bug count of unstable count at the "
-"last point when the testing version equalled the unstable version."
+"The <literal>unstable</literal> bug count are all release-critical bugs "
+"which are marked to apply to "
+"<replaceable>package</replaceable>/<replaceable>version</replaceable> "
+"combinations that are available in unstable for a release architecture. The "
+"<literal>testing</literal> bug count is defined analogously."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:2562
+#. type: Content of: <chapter><section><section><section><title>
+#: pkgs.dbk:2719

 msgid ""
 msgid ""

-"This will change post-sarge, as soon as we have versions in the bug tracking "
-"system."
+"How could installing a package into <literal>testing</literal> possibly "
+"break other packages?"

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><title>
-#: pkgs.dbk:2568
-msgid "How could installing a package into testing possibly break other packages?"
-msgstr ""
-
-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:2570
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:2722

 msgid ""
 "The structure of the distribution archives is such that they can only "
 "contain one version of a package; a package is defined by its name.  So when "
 msgid ""
 "The structure of the distribution archives is such that they can only "
 "contain one version of a package; a package is defined by its name.  So when "

-"the source package acmefoo is installed into testing, along with its binary "
-"packages acme-foo-bin, acme-bar-bin, libacme-foo1 and libacme-foo-dev, the "
+"the source package <literal>acmefoo</literal> is installed into "
+"<literal>testing</literal>, along with its binary packages "
+"<literal>acme-foo-bin</literal>, <literal>acme-bar-bin</literal>, "
+"<literal>libacme-foo1</literal> and <literal>libacme-foo-dev</literal>, the "

 "old version is removed."
 msgstr ""
 
 "old version is removed."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:2577
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:2730

 msgid ""
 "However, the old version may have provided a binary package with an old "
 msgid ""
 "However, the old version may have provided a binary package with an old "

-"soname of a library, such as libacme-foo0.  Removing the old acmefoo will "
-"remove libacme-foo0, which will break any packages which depend on it."
+"soname of a library, such as <literal>libacme-foo0</literal>.  Removing the "
+"old <literal>acmefoo</literal> will remove <literal>libacme-foo0</literal>, "
+"which will break any packages which depend on it."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:2582
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:2736

 msgid ""
 "Evidently, this mainly affects packages which provide changing sets of "
 "binary packages in different versions (in turn, mainly libraries).  However, "
 msgid ""
 "Evidently, this mainly affects packages which provide changing sets of "
 "binary packages in different versions (in turn, mainly libraries).  However, "


@@ -3498,22 +3599,23 @@ msgid ""
 "declared of the ==, &lt;=, or &lt;&lt; varieties."
 msgstr ""
 
 "declared of the ==, &lt;=, or &lt;&lt; varieties."
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:2588
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:2742

 msgid ""
 "When the set of binary packages provided by a source package change in this "
 "way, all the packages that depended on the old binaries will have to be "
 "updated to depend on the new binaries instead.  Because installing such a "
 msgid ""
 "When the set of binary packages provided by a source package change in this "
 "way, all the packages that depended on the old binaries will have to be "
 "updated to depend on the new binaries instead.  Because installing such a "

-"source package into testing breaks all the packages that depended on it in "
-"testing, some care has to be taken now: all the depending packages must be "
-"updated and ready to be installed themselves so that they won't be broken, "
-"and, once everything is ready, manual intervention by the release manager or "
-"an assistant is normally required."
+"source package into <literal>testing</literal> breaks all the packages that "
+"depended on it in <literal>testing</literal>, some care has to be taken now: "
+"all the depending packages must be updated and ready to be installed "
+"themselves so that they won't be broken, and, once everything is ready, "
+"manual intervention by the release manager or an assistant is normally "
+"required."

 msgstr ""
 
 msgstr ""
 

-# type: Content of: <chapter><section><section><section><para>
-#: pkgs.dbk:2598
+#. type: Content of: <chapter><section><section><section><para>
+#: pkgs.dbk:2753

 msgid ""
 "If you are having problems with complicated groups of packages like this, "
 msgid ""
 "If you are having problems with complicated groups of packages like this, "

-"contact debian-devel or debian-release for help."
+"contact &email-debian-devel; or &email-debian-release; for help."

 msgstr ""
 msgstr ""