Remove non-US leftovers in code and documentation

This has long been obsoleted, and there have been previous patches
cleaning them up, but some left overs remained.

4 files changed, 7 insertions, 12 deletions

diff --git a/apt-pkg/cdrom.cc b/apt-pkg/cdrom.cc
index 70192a044..84ddae40c 100644
--- a/apt-pkg/cdrom.cc
+++ b/apt-pkg/cdrom.cc
@@ -223,8 +223,6 @@ int pkgCdrom::Score(string Path)
       Res += 20;
    if (Path.find("/non-free-firmware/") != string::npos)
       Res += 20;
-   if (Path.find("/non-US/") != string::npos)
-      Res += 20;
    if (Path.find("/source/") != string::npos)
       Res += 10;
    if (Path.find("/debian/") != string::npos)
diff --git a/apt-pkg/indexcopy.cc b/apt-pkg/indexcopy.cc
index e635b9042..139b10316 100644
--- a/apt-pkg/indexcopy.cc
+++ b/apt-pkg/indexcopy.cc
@@ -335,7 +335,7 @@ bool IndexCopy::ReconstructChop(unsigned long &Chop,string Dir,string File)
      |------------------- Path
 
    It was deciced to use only a single word for dist (rather than say
-   unstable/non-us) to increase the chance that each CD gets a single
+   unstable/some-component) to increase the chance that each CD gets a single
    line in sources.list.
  */
 void IndexCopy::ConvertToSourceList(string CD,string &Path)
diff --git a/doc/design.dbk b/doc/design.dbk
index fabc915e5..ab49d9790 100644
--- a/doc/design.dbk
+++ b/doc/design.dbk
@@ -144,7 +144,7 @@ Handle source lists for updates from multiple sources. APT should also be able
 to handle diverse methods of acquiring new packages; local filesystem,
 mountable CD-ROM drives, FTP accessible repositories are some of the methods
 that come to mind. Also, the source lists can be separated into categories,
-such as main, contrib, non-us, non-local, non-free, my-very-own, etc. APT
+such as main, contrib, non-local, non-free, my-very-own, etc. APT
 should be set up to retrieve the Packages files from these multiple source
 lists, as well as retrieving the packages themselves.
 </para>
diff --git a/doc/guide.dbk b/doc/guide.dbk
index d2f650a20..477d300a7 100644
--- a/doc/guide.dbk
+++ b/doc/guide.dbk
@@ -126,7 +126,7 @@ update</literal>. For instance,
 </para>
 <screen>
 # apt-get update
-Get http://ftp.de.debian.org/debian-non-US/ stable/binary-i386/ Packages
+Get http://ftp.de.debian.org/debian/ stable/binary-i386/ Packages
 Get http://llug.sep.bnl.gov/debian/ testing/contrib Packages
 Reading Package Lists... Done
 Building Dependency Tree... Done
@@ -237,7 +237,7 @@ to get.
 <screen>
  Please give the distribution tag to get or a path to the
  package file ending in a /. The distribution
- tags are typically something like: stable unstable testing non-US
+ tags are typically something like: stable unstable testing
 
  Distribution [stable]:
 </screen>
@@ -245,10 +245,7 @@ to get.
 The distribution refers to the Debian version in the archive,
 <emphasis>stable</emphasis> refers to the latest released version
 and <emphasis>unstable</emphasis> refers to the developmental
-version. <emphasis>non-US</emphasis> is only available on some mirrors
-and refers to packages that contain encryption technology or other
-things that cannot be exported from the United States. Importing these
-packages into the US is legal however.
+version.
 </para>
 <screen>
  Please give the components to get
@@ -496,10 +493,10 @@ status messages.
 </para>
 <screen>
 # apt-get update
-Get:1 http://ftp.de.debian.org/debian-non-US/ stable/non-US/ Packages
+Get:1 http://ftp.de.debian.org/debian/ stable/main Packages
 Get:2 http://llug.sep.bnl.gov/debian/ testing/contrib Packages
 Hit http://llug.sep.bnl.gov/debian/ testing/main Packages
-Get:4 http://ftp.de.debian.org/debian-non-US/ unstable/binary-i386/ Packages
+Get:4 http://ftp.de.debian.org/debian/ unstable/binary-i386/ Packages
 Get:5 http://llug.sep.bnl.gov/debian/ testing/non-free Packages
 11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s
 </screen>