Merge branch 'pu/obsolete-ftp' into 'main'

Cleanup non-US and ftp references from code and documentation

See merge request apt-team/apt!231

5 files changed, 19 insertions, 22 deletions

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/examples/ftp-archive.conf b/doc/examples/ftp-archive.conf
index 31ffb24c6..0908388ba 100644
--- a/doc/examples/ftp-archive.conf
+++ b/doc/examples/ftp-archive.conf
@@ -3,9 +3,9 @@
    
 Dir 
 {
-   ArchiveDir "/srv/ftp.debian.org/ftp/";
-   OverrideDir "/srv/ftp.debian.org/scripts/override/";
-   CacheDir "/srv/ftp.debian.org/scripts/cache/";
+   ArchiveDir "/srv/deb.debian.org/ftp/";
+   OverrideDir "/srv/deb.debian.org/scripts/override/";
+   CacheDir "/srv/deb.debian.org/scripts/cache/";
 };
 
 Default
@@ -19,7 +19,7 @@ Default
 
 TreeDefault
 {
-   Contents::Header "/srv/ftp.debian.org/scripts/masterfiles/Contents.top";
+   Contents::Header "/srv/deb.debian.org/scripts/masterfiles/Contents.top";
    BinCacheDB "packages-$(ARCH).db";
    
    // These are all defaults and are provided for completeness
diff --git a/doc/guide.dbk b/doc/guide.dbk
index d2f650a20..c5e6df257 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
@@ -223,8 +223,8 @@ use packages on your CD-ROM before downloading from the Internet.
 
  For example:
       file:/mnt/debian,
-      ftp://ftp.debian.org/debian,
-      http://ftp.de.debian.org/debian,
+      ftp://ftp.example.org/debian,
+      http://deb.debian.org/debian,
 
 
  URL [http://llug.sep.bnl.gov/debian]:
@@ -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>
diff --git a/doc/method.dbk b/doc/method.dbk
index ea49c5b54..2ec1f3e3e 100644
--- a/doc/method.dbk
+++ b/doc/method.dbk
@@ -158,7 +158,7 @@ Some examples:
 </para>
 <screen>
 file:/var/mirrors/debian/
-ftp://ftp.debian.org/debian
+ftp://ftp.example.org/debian
 ftp://jgg:MooCow@localhost:21/debian
 nfs://bigred/var/mirrors/debian
 rsync://debian.midco.net/debian
diff --git a/doc/sources.list.5.xml b/doc/sources.list.5.xml
index 454f00871..f221cb20e 100644
--- a/doc/sources.list.5.xml
+++ b/doc/sources.list.5.xml
@@ -577,21 +577,21 @@ URIs: http://archive.debian.org/debian-archive
 Suites: hamm
 Components: main</literallayout>
 
-   <para>Uses FTP to access the archive at ftp.debian.org, under the debian
+   <para>Uses FTP to access the archive at ftp.example.org, under the debian
    directory, and uses only the &debian-stable-codename;/contrib area.</para>
-   <literallayout>deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib</literallayout>
+   <literallayout>deb ftp://ftp.example.org/debian &debian-stable-codename; contrib</literallayout>
    <literallayout>Types: deb
-URIs: ftp://ftp.debian.org/debian
+URIs: ftp://ftp.example.org/debian
 Suites: &debian-stable-codename;
 Components: contrib</literallayout>
 
-   <para>Uses FTP to access the archive at ftp.debian.org, under the debian
+   <para>Uses FTP to access the archive at ftp.example.org, under the debian
    directory, and uses only the unstable/contrib area. If this line appears as
    well as the one in the previous example in <filename>sources.list</filename>
    a single FTP session will be used for both resource lines.</para>
-   <literallayout>deb ftp://ftp.debian.org/debian unstable contrib</literallayout>
+   <literallayout>deb ftp://ftp.example.org/debian unstable contrib</literallayout>
    <literallayout>Types: deb
-URIs: ftp://ftp.debian.org/debian
+URIs: ftp://ftp.example.org/debian
 Suites: unstable
 Components: contrib</literallayout>