make updatepo, tidypo, and trivial unfuzzy

[developers-reference.git] / resources.dbk

diff --git a/resources.dbk b/resources.dbk
index 10655c94fa92738fb4ab78db5548b750e79ad83a..a49dbc276e9c3d09aa7685d220ce69db83144926 100644 (file)
--- a/resources.dbk
+++ b/resources.dbk
@@ -260,9 +260,6 @@ mirrored to another server.
 the Bug Tracking System (BTS).
 </para>
 <para>
-It is restricted; a mirror is available on <literal>merkel</literal>.
-</para>
-<para>
 If you plan on doing some statistical analysis or processing of Debian bugs,
 this would be the place to do it.  Please describe your plans on
 &email-debian-devel; before implementing anything, however, to
@@ -278,7 +275,7 @@ the Debian archive.  Generally, package uploaded to &ftp-upload-host;
 end up on this server, see <xref linkend="upload"/>.
 </para>
 <para>
-It is restricted; a mirror is available on <literal>merkel</literal>.
+It is restricted; a mirror is available on <literal>&ftp-master-mirror;</literal>.
 </para>
 <para>
 Problems with the Debian FTP archive generally need to be reported as bugs
@@ -753,12 +750,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 +864,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 +874,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>
@@ -1244,6 +1235,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>
@@ -1481,7 +1478,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>