<!ENTITY pts-host "packages.qa.debian.org">
<!ENTITY ftp-master-host "ftp-master.debian.org">
<!ENTITY ftp-master-mirror "merkel.debian.org">
-<!ENTITY non-us-host "non-us.debian.org">
<!ENTITY upload-queue "/pub/UploadQueue/">
<!ENTITY url-debian-policy "http://&www-debian-org;/doc/debian-policy/">
* Recommend the use of DSA's request tracker instead of mailing them.
* Remove reference to #debian-sf, #debian-bsd which don't exist anymore. Put
a reference to #debian-dpkg instead.
+ * Remove all stuff concerning non-US.
-- Andreas Barth <aba@not.so.argh.org> Sat, 16 Jun 2007 11:41:41 -0600
</para>
</section>
-<section id="upload-non-us">
-<title>Uploading to <literal>non-US</literal></title>
-<para>
-<emphasis>Note:</emphasis> non-us was discontinued with the release of sarge.
-</para>
-</section>
-
<section id="delayed-incoming">
<title>Delayed uploads</title>
<para>
<title>The ftp-master server</title>
<para>
The <literal>&ftp-master-host;</literal> server holds the canonical copy of
-the Debian archive (excluding the non-US packages). Generally, package uploads
-go to this server; see <xref linkend="upload"/> .
+the Debian archive. Generally, package uploads go to this server; see
+<xref linkend="upload"/>.
</para>
<para>
It is restricted; a mirror is available on <literal>merkel</literal>.
</para>
</section>
-<section id="servers-non-us">
-<title>The non-US server</title>
-<para>
-The non-US server <literal>&non-us-host;</literal> was discontinued with
-the release of sarge. The pseudo-package <systemitem
-role="package">nonus.debian.org</systemitem> still exists for now.
-</para>
-</section>
-
<section id="servers-www">
<title>The www-master server</title>
<para>