summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--apt-pkg/versionmatch.h2
-rw-r--r--doc/examples/ftp-archive.conf8
-rw-r--r--doc/guide.dbk2
-rwxr-xr-xdselect/setup2
4 files changed, 7 insertions, 7 deletions
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";