Update the NMU rules with the 0-day NMU rule created by release managers

[developers-reference.git] / resources.dbk

diff --git a/resources.dbk b/resources.dbk
index 8b7dbed4d37aa5458ace161631ed8e2ab83bf0cd..e577d6796a6b7992ee3ef87afd46123297897972 100644 (file)
--- a/resources.dbk
+++ b/resources.dbk
@@ -260,9 +260,6 @@ mirrored to another server.
 the Bug Tracking System (BTS).
 </para>
 <para>
 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
 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>
 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
 </para>
 <para>
 Problems with the Debian FTP archive generally need to be reported as bugs


@@ -334,7 +331,7 @@ Send mail to &email-debian-devel; if you have any questions.
 <title>The VCS servers</title>
 <para>
 If you need to use a Version Control System for any of your Debian work,
 <title>The VCS servers</title>
 <para>
 If you need to use a Version Control System for any of your Debian work,

-you can use one the existing repositories hosted on Alioth or you can
+you can use one of the existing repositories hosted on Alioth or you can

 request a new project and ask for the VCS repository of your choice.
 Alioth supports CVS (cvs.alioth.debian.org/cvs.debian.org), Subversion
 (svn.debian.org), Arch (tla/baz, both on arch.debian.org), Bazaar
 request a new project and ask for the VCS repository of your choice.
 Alioth supports CVS (cvs.alioth.debian.org/cvs.debian.org), Subversion
 (svn.debian.org), Arch (tla/baz, both on arch.debian.org), Bazaar


@@ -639,9 +636,9 @@ literally unstable.
 The <link linkend="testing">testing</link> distribution is generated
 automatically by taking packages from <literal>unstable</literal> if they
 satisfy certain criteria.  Those criteria should ensure a good quality for
 The <link linkend="testing">testing</link> distribution is generated
 automatically by taking packages from <literal>unstable</literal> if they
 satisfy certain criteria.  Those criteria should ensure a good quality for

-packages within <literal>testing</literal>.  The update to <literal>testing
-</literal> is launched twice each day, right  after the new packages
-have been installed.  See <xref linkend="testing"/>.
+packages within <literal>testing</literal>.  The update to
+<literal>testing</literal> is launched twice each day, right  after the new
+packages have been installed.  See <xref linkend="testing"/>.

 </para>
 <para>
 After a period of development, once the release manager deems fit, the
 </para>
 <para>
 After a period of development, once the release manager deems fit, the


@@ -658,7 +655,7 @@ the Release Team, the distribution is released.  Releasing means that
 new copy is created for the new <literal>testing</literal>, and the previous
 <literal>stable</literal> is renamed to <literal>oldstable</literal> and
 stays there until it is finally archived.  On archiving, the contents are moved
 new copy is created for the new <literal>testing</literal>, and the previous
 <literal>stable</literal> is renamed to <literal>oldstable</literal> and
 stays there until it is finally archived.  On archiving, the contents are moved

-to <literal>&archive-host;</literal>).
+to <literal>&archive-host;</literal>.

 </para>
 <para>
 This development cycle is based on the assumption that the
 </para>
 <para>
 This development cycle is based on the assumption that the


@@ -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>
 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>
 </section>
 
 </section>


@@ -976,10 +967,10 @@ a given package at the URL
 <para>
 <command>dak ls</command> is part of the dak suite of tools, listing
 available package versions for all known distributions and architectures.
 <para>
 <command>dak ls</command> is part of the dak suite of tools, listing
 available package versions for all known distributions and architectures.

-The <command>dak</command> tool is available on <literal>&ftp-master-host;
-</literal>, and on the mirror on <literal>&ftp-master-mirror;</literal>.
-It uses a single argument corresponding to a package name. An example will
-explain it better:
+The <command>dak</command> tool is available on
+<literal>&ftp-master-host;</literal>, and on the mirror on
+<literal>&ftp-master-mirror;</literal>.  It uses a single argument
+corresponding to a package name. An example will explain it better:

 </para>
 <screen>
 $ dak ls evince
 </para>
 <screen>
 $ dak ls evince