X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=developers-reference.git;a=blobdiff_plain;f=resources.dbk;h=72740732edf9d0757870041403f9c3ad3a1c52a5;hp=d22cbaa572f94a3ddd873cf63f5401825c0d695f;hb=6aed2d786a9f347b606a892c201a04812b9d1caf;hpb=02e06b1f54f23749a279f26a0fd9b612423107e0

diff --git a/resources.dbk b/resources.dbk
index d22cbaa..7274073 100644
--- a/resources.dbk
+++ b/resources.dbk
@@ -753,12 +753,6 @@ New software which isn't likely to damage your system can go directly into
 An alternative to <literal>experimental</literal> is to use your personal web
 space on <literal>people.debian.org</literal>.
 </para>
-<para>
-When uploading to <literal>unstable</literal> a package which had bugs fixed
-in <literal>experimental</literal>, please consider using the option
-<literal>-v</literal> to <command>dpkg-buildpackage</command> to finally get
-them closed.
-</para>
 </section>
 
 </section>
@@ -873,7 +867,7 @@ Once the package is accepted, the system sends a confirmation mail to the
 maintainer and closes all the bugs marked as fixed by the upload, and the
 auto-builders may start recompiling it.  The package is now publicly accessible
 at <ulink url="&url-incoming;"></ulink> until it is really
-installed in the Debian archive.  This happens only once a day (and is also
+installed in the Debian archive.  This happens four times a day (and is also
 called the `dinstall run' for historical reasons); the package is then removed
 from incoming and installed in the pool along with all the other packages.
 Once all the other updates (generating new <filename>Packages</filename> and
@@ -883,10 +877,10 @@ script is called to ask all the primary mirrors to update themselves.
 <para>
 The archive maintenance software will also send the OpenPGP/GnuPG signed
 <filename>.changes</filename> file that you uploaded to the appropriate mailing
-lists.  If a package is released with the <literal>Distribution:</literal> set
+lists.  If a package is released with the <literal>Distribution</literal> set
 to <literal>stable</literal>, the announcement is sent to
 &email-debian-changes;.  If a package is released with
-<literal>Distribution:</literal> set to <literal>unstable</literal> or
+<literal>Distribution</literal> set to <literal>unstable</literal> or
 <literal>experimental</literal>, the announcement will be posted to
 &email-debian-devel-changes; instead.
 </para>
@@ -1137,6 +1131,14 @@ example Ubuntu).
 </para>
 </listitem>
 </varlistentry>
+<varlistentry>
+<term><literal>derivatives-bugs</literal></term>
+<listitem>
+<para>
+Bugs reports and comments from derivative distributions (for example Ubuntu).
+</para>
+</listitem>
+</varlistentry>
 </variablelist>
 <section id="pts-commands">
 <title>The PTS email interface</title>
@@ -1236,6 +1238,12 @@ distributions
 </listitem>
 <listitem>
 <para>
+<literal>derivatives-bugs</literal>: bugs reports and comments from derivative
+distributions
+</para>
+</listitem>
+<listitem>
+<para>
 <literal>upload-source</literal>: announce of a new source upload that has been
 accepted
 </para>
@@ -1473,7 +1481,7 @@ item.
 </para>
 <para>
 Here are a few examples of valid mails used to generate news items in the PTS.
-The first one adds a link to the cvsweb interface of debian-cd in the Static
+The first one adds a link to the viewsvn interface of debian-cd in the Static
 information section:
 </para>
 <screen>