Mention ftp.upload.debian.org instead of ftp-master directly

[developers-reference.git] / pkgs.dbk

diff --git a/pkgs.dbk b/pkgs.dbk
index b3e11411b37f6c2b25ade002b2cc1a589e33de5c..4de435e96f55071a8126b0e83b66b2468893ee5e 100644 (file)
--- a/pkgs.dbk
+++ b/pkgs.dbk
@@ -382,9 +382,9 @@ section</link> for details.
 <title>Uploading to <literal>ftp-master</literal></title>
 <para>
 To upload a package, you should upload the files (including the signed changes
-and dsc-file) with anonymous ftp to <literal>&ftp-master-host;</literal> in
+and dsc-file) with anonymous ftp to <literal>&ftp-upload-host;</literal> in
 the directory <ulink
-url="ftp://&ftp-master-host;&upload-queue;">&upload-queue;</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>).
@@ -400,7 +400,8 @@ linkend="dput"/> useful when uploading packages.  These handy programs help
 automate the process of uploading packages into Debian.
 </para>
 <para>
-For removing packages, please see the README file in that ftp directory, and
+For removing packages, please see
+<ulink url="ftp://&ftp-upload-host;&upload-queue;/README"/> and
 the Debian package <xref linkend="dcut"/> .
 </para>
 </section>
@@ -422,9 +423,9 @@ 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-master-host;</literal> in upload-directory
+<literal>&ftp-upload-host;</literal> in upload-directory
 <literal>DELAYED/[012345678]-day</literal>. 0-day is uploaded
-multiple times per day to <literal>&ftp-master-host;</literal>.
+multiple times per day to <literal>&ftp-upload-host;</literal>.
 </para>
 <para>
 With dput, you can use the <literal>--delayed <replaceable>DELAY</replaceable></literal>
@@ -515,10 +516,13 @@ file</literal>.
 <para>
 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; or submit a
+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 new one.  Be sure to explain your reasoning.
+or priority to the 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.
 </para>
 <para>
 For more information about <literal>override files</literal>, see