summaryrefslogtreecommitdiff
path: root/doc/examples
diff options
context:
space:
mode:
authorMichael Vogt <egon@debian-devbox>2012-06-11 14:56:11 +0200
committerMichael Vogt <egon@debian-devbox>2012-06-11 14:56:11 +0200
commitcb6a5776bfb5f74d94f32db55f2de148c27a5d10 (patch)
tree3c8f8bcaeefb9e51bff8476b262de18b4b39b11b /doc/examples
parent563fd891d80feedefd812aad83844e2189870e2c (diff)
parent249a02f55a2b311fc130efe3b3a99995b6a71360 (diff)
merged from donkult
Diffstat (limited to 'doc/examples')
-rw-r--r--doc/examples/apt-ftparchive.conf6
-rw-r--r--doc/examples/configure-index2
-rw-r--r--doc/examples/sources.list9
-rw-r--r--doc/examples/sources.list.in8
4 files changed, 12 insertions, 13 deletions
diff --git a/doc/examples/apt-ftparchive.conf b/doc/examples/apt-ftparchive.conf
index c9d352ab6..0d245c0af 100644
--- a/doc/examples/apt-ftparchive.conf
+++ b/doc/examples/apt-ftparchive.conf
@@ -21,21 +21,21 @@ Default {
BinDirectory "pool/main" {
Packages "dists/sid/main/binary-i386/Packages";
Sources "dists/sid/main/source/Sources";
- Contents "dists/sid/Contents-i386";
+ Contents "dists/sid/main/Contents-i386";
}
// This is the same for the contrib section
BinDirectory "pool/contrib" {
Packages "dists/sid/contrib/binary-i386/Packages";
Sources "dists/sid/contrib/source/Sources";
- Contents "dists/sid/Contents-i386";
+ Contents "dists/sid/contrib/Contents-i386";
}
// This is the same for the non-free section
BinDirectory "pool/non-free" {
Packages "dists/sid/non-free/binary-i386/Packages";
Sources "dists/sid/non-free/source/Sources";
- Contents "dists/sid/Contents-i386";
+ Contents "dists/sid/non-free/Contents-i386";
};
// By default all Packages should have the extension ".deb"
diff --git a/doc/examples/configure-index b/doc/examples/configure-index
index 49e803f91..f75b5738a 100644
--- a/doc/examples/configure-index
+++ b/doc/examples/configure-index
@@ -90,7 +90,7 @@ APT
Authentication
{
- TrustCDROM "false"; // consider the CDROM always trusted
+ TrustCDROM "false"; // consider the CD-ROM always trusted
};
// Some general options
diff --git a/doc/examples/sources.list b/doc/examples/sources.list
deleted file mode 100644
index ef729e203..000000000
--- a/doc/examples/sources.list
+++ /dev/null
@@ -1,9 +0,0 @@
-# See sources.list(5) for more information, especialy
-# Remember that you can only use http, ftp or file URIs
-# CDROMs are managed through the apt-cdrom tool.
-deb http://http.us.debian.org/debian stable main contrib non-free
-deb http://security.debian.org stable/updates main contrib non-free
-
-# Uncomment if you want the apt-get source function to work
-#deb-src http://http.us.debian.org/debian stable main contrib non-free
-#deb-src http://security.debian.org stable/updates main contrib non-free
diff --git a/doc/examples/sources.list.in b/doc/examples/sources.list.in
new file mode 100644
index 000000000..745e32cbe
--- /dev/null
+++ b/doc/examples/sources.list.in
@@ -0,0 +1,8 @@
+# See sources.list(5) manpage for more information
+# Remember that CD-ROMs, DVDs and such are managed through the apt-cdrom tool.
+deb http://ftp.us.debian.org/debian &stable-codename; main contrib non-free
+deb http://security.debian.org &stable-codename;/updates main contrib non-free
+
+# Uncomment if you want the apt-get source function to work
+#deb-src http://ftp.us.debian.org/debian &stable-codename; main contrib non-free
+#deb-src http://security.debian.org &stable-codename;/updates main contrib non-free