diff options
Diffstat (limited to 'doc/examples')
-rw-r--r-- | doc/examples/apt-ftparchive.conf | 6 | ||||
-rw-r--r-- | doc/examples/configure-index | 2 | ||||
-rw-r--r-- | doc/examples/sources.list | 11 | ||||
-rw-r--r-- | doc/examples/sources.list.in | 10 |
4 files changed, 14 insertions, 15 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 cc0fd2b8d..000000000 --- a/doc/examples/sources.list +++ /dev/null @@ -1,11 +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://us.archive.ubuntu.com/ubuntu hardy main restricted -deb-src http://us.archive.ubuntu.com/ubuntu hardy main restricted - -deb http://security.ubuntu.com/ubuntu hardy-security main restricted -deb-src http://security.ubuntu.com/ubuntu hardy-security main restricted - -deb http://us.archive.ubuntu.com/ubuntu hardy-updates main restricted -deb-src http://us.archive.ubuntu.com/ubuntu hardy-updates main restricted diff --git a/doc/examples/sources.list.in b/doc/examples/sources.list.in new file mode 100644 index 000000000..00db2f8cd --- /dev/null +++ b/doc/examples/sources.list.in @@ -0,0 +1,10 @@ +# See sources.list(5) manpage for more information +# Remember that CD-ROMs, DVDs and such are managed through the apt-cdrom tool. +deb http://us.archive.ubuntu.com/ubuntu &ubuntu-codename; main restricted +deb-src http://us.archive.ubuntu.com/ubuntu &ubuntu-codename; main restricted + +deb http://security.ubuntu.com/ubuntu &ubuntu-codename;-security main restricted +deb-src http://security.ubuntu.com/ubuntu &ubuntu-codename;-security main restricted + +deb http://us.archive.ubuntu.com/ubuntu &ubuntu-codename;-updates main restricted +deb-src http://us.archive.ubuntu.com/ubuntu &ubuntu-codename;-updates main restricted |