* Remove all stuff concerning non-US.

git-svn-id: svn://anonscm.debian.org/ddp/developers-reference/trunk@4938 313b444b-1b9f-4f58-a734-7bb04f332e8d

diff --git a/common.ent b/common.ent
index e9b3b5014f0755327c9c0f522bfea7a27df3d00b..6b3da21d52045b92e38a23aa080d004ae096474c 100644 (file)
--- a/common.ent
+++ b/common.ent
@@ -34,7 +34,6 @@
 <!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/">

diff --git a/debian/changelog b/debian/changelog
index 05bdb6cbeea185576c6ec2770fba53ce598d90bb..92fff580ba7e42db8c59c892a077e3a1ae8d0596 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -35,6 +35,7 @@ developers-reference (3.3.9) unstable; urgency=low
   * 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
 

diff --git a/pkgs.dbk b/pkgs.dbk
index f63c3442b6e35351803edba175ffeb1b24436cf0..0f0954211b1809a4707eaea7b0bd6decc9faa63c 100644 (file)
--- a/pkgs.dbk
+++ b/pkgs.dbk
@@ -391,13 +391,6 @@ the Debian package <xref linkend="dcut"/> .
 </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>

diff --git a/resources.dbk b/resources.dbk
index a31ad10872a350aa24cb870605d366b8584c913b..3f95717cdd0e6e4539853f07a8da512945e00fd1 100644 (file)
--- a/resources.dbk
+++ b/resources.dbk
@@ -275,8 +275,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 (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>.
@@ -289,15 +289,6 @@ the procedures in <xref linkend="archive-manip"/> .
 </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>