From 5cc1785dd231e253284188df7764ac6e1199d49f Mon Sep 17 00:00:00 2001
From: hertzog <hertzog@313b444b-1b9f-4f58-a734-7bb04f332e8d>
Date: Sun, 3 Jan 2010 23:28:39 +0000
Subject: [PATCH] Mention ftp.upload.debian.org instead of ftp-master directly

Thanks to Simon McVittie <smcv@debian.org> for the patch.
Closes: #554054

git-svn-id: svn://anonscm.debian.org/ddp/manuals/trunk/developers-reference@7028 313b444b-1b9f-4f58-a734-7bb04f332e8d
---
 common.ent    | 2 ++
 pkgs.dbk      | 8 ++++----
 resources.dbk | 6 +++---
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/common.ent b/common.ent
index aa475d5..8008efc 100644
--- a/common.ent
+++ b/common.ent
@@ -34,6 +34,8 @@
 <!ENTITY bugs-host "bugs.debian.org">
 <!ENTITY pts-host "packages.qa.debian.org">
 <!ENTITY ftp-master-host "ftp-master.debian.org">
+<!ENTITY ftp-upload-host "ftp.upload.debian.org">
+<!ENTITY ssh-upload-host "ssh.upload.debian.org">
 <!ENTITY ftp-master-mirror "merkel.debian.org">
 <!ENTITY upload-queue "/pub/UploadQueue/">
 
diff --git a/pkgs.dbk b/pkgs.dbk
index c477164..4de435e 100644
--- 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>).
@@ -423,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>
diff --git a/resources.dbk b/resources.dbk
index df574ae..936bef2 100644
--- a/resources.dbk
+++ b/resources.dbk
@@ -273,8 +273,8 @@ reduce unnecessary duplication of effort or wasted processing time.
 <title>The ftp-master server</title>
 <para>
 The <literal>&ftp-master-host;</literal> server holds the canonical copy of
-the Debian archive.  Generally, package uploads go to this server; see
-<xref linkend="upload"/>.
+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>.
@@ -937,7 +937,7 @@ snippet to your configuration file:
 <programlisting>
 $delay = ($ENV{DELAY} || 7);
 $cfg{'delayed'} = {
-         fqdn => "&ftp-master-host;",
+         fqdn => "&ftp-upload-host;",
          login => "yourdebianlogin",
          incoming => "/org/&ftp-debian-org;/incoming/DELAYED/$delay-day/",
          dinstall_runs => 1,
-- 
2.30.2