From 1fa64892e4d54cd52fac731e646cc3d13382fb5a Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Sun, 20 Mar 2022 11:15:33 +0100 Subject: 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. --- doc/design.dbk | 2 +- doc/guide.dbk | 13 +++++-------- 2 files changed, 6 insertions(+), 9 deletions(-) (limited to 'doc') 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. 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. For instance, # 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. 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]: @@ -245,10 +245,7 @@ to get. The distribution refers to the Debian version in the archive, stable refers to the latest released version and unstable refers to the developmental -version. non-US 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. Please give the components to get @@ -496,10 +493,10 @@ status messages. # 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 -- cgit v1.2.3-70-g09d2 From 54cb371c19c71cb4ac319fe7566924303379ce63 Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Sun, 20 Mar 2022 11:34:45 +0100 Subject: Remove obsolete references to ftp://ftp.debian.org Although Debian does not support FTP, this might still be used by other organizations, or local users, so replaced these instances with an example.org URL. Ref: https://lists.debian.org/debian-announce/2017/msg00001.html --- doc/guide.dbk | 2 +- doc/method.dbk | 2 +- doc/sources.list.5.xml | 12 ++++++------ dselect/setup | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) (limited to 'doc') diff --git a/doc/guide.dbk b/doc/guide.dbk index 477d300a7..f65771def 100644 --- a/doc/guide.dbk +++ b/doc/guide.dbk @@ -223,7 +223,7 @@ use packages on your CD-ROM before downloading from the Internet. For example: file:/mnt/debian, - ftp://ftp.debian.org/debian, + ftp://ftp.example.org/debian, http://ftp.de.debian.org/debian, 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: 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 - Uses FTP to access the archive at ftp.debian.org, under the debian + Uses FTP to access the archive at ftp.example.org, under the debian directory, and uses only the &debian-stable-codename;/contrib area. - deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib + deb ftp://ftp.example.org/debian &debian-stable-codename; contrib Types: deb -URIs: ftp://ftp.debian.org/debian +URIs: ftp://ftp.example.org/debian Suites: &debian-stable-codename; Components: contrib - Uses FTP to access the archive at ftp.debian.org, under the debian + 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 sources.list a single FTP session will be used for both resource lines. - deb ftp://ftp.debian.org/debian unstable contrib + deb ftp://ftp.example.org/debian unstable contrib Types: deb -URIs: ftp://ftp.debian.org/debian +URIs: ftp://ftp.example.org/debian Suites: unstable Components: contrib diff --git a/dselect/setup b/dselect/setup index 58eecfcdc..c8cb93378 100755 --- a/dselect/setup +++ b/dselect/setup @@ -231,7 +231,7 @@ sub get_sources { print "\n"; print " For example:\n"; print " file:/mnt/debian,\n"; - print " ftp://ftp.debian.org/debian,\n"; + print " ftp://ftp.example.org/debian,\n"; print " http://ftp.de.debian.org/debian,\n"; # print " and the special mirror scheme,\n"; # print " mirror:http://www.debian.org/archivemirrors \n"; -- cgit v1.2.3-70-g09d2 From bb67ff79e03eec05429fa4d7562813d18080e829 Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Sun, 20 Mar 2022 11:42:36 +0100 Subject: Use deb.debian.org instead of ftp.debian.org URLs While the ftp.debian.org URLs are still functional in Debian, they can confuse people as the protocol is mismatched. Using the deb.debian.org frontend should also generally give generally good performance regardless of the client location. --- apt-pkg/versionmatch.h | 2 +- doc/examples/ftp-archive.conf | 8 ++++---- doc/guide.dbk | 2 +- dselect/setup | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) (limited to 'doc') diff --git a/apt-pkg/versionmatch.h b/apt-pkg/versionmatch.h index abaec08d6..283df6128 100644 --- a/apt-pkg/versionmatch.h +++ b/apt-pkg/versionmatch.h @@ -13,7 +13,7 @@ Release: a=testing Release: n=squeeze Release: * - Origin: ftp.debian.org + Origin: deb.debian.org Release may be a complex type that can specify matches for any of: Version (v= with prefix) 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 f65771def..c5e6df257 100644 --- a/doc/guide.dbk +++ b/doc/guide.dbk @@ -224,7 +224,7 @@ use packages on your CD-ROM before downloading from the Internet. For example: file:/mnt/debian, ftp://ftp.example.org/debian, - http://ftp.de.debian.org/debian, + http://deb.debian.org/debian, URL [http://llug.sep.bnl.gov/debian]: diff --git a/dselect/setup b/dselect/setup index c8cb93378..522362e68 100755 --- a/dselect/setup +++ b/dselect/setup @@ -232,7 +232,7 @@ sub get_sources { print " For example:\n"; print " file:/mnt/debian,\n"; print " ftp://ftp.example.org/debian,\n"; - print " http://ftp.de.debian.org/debian,\n"; + print " http://deb.debian.org/debian,\n"; # print " and the special mirror scheme,\n"; # print " mirror:http://www.debian.org/archivemirrors \n"; print "\n"; -- cgit v1.2.3-70-g09d2