From 25838be607c1a61783060c352d1842cd23b2677f Mon Sep 17 00:00:00 2001 From: Justin B Rye Date: Fri, 25 May 2012 09:45:59 +0200 Subject: * doc/apt-cdrom.8.xml: - replace CDROM with the proper CD-ROM in text --- doc/examples/configure-index | 2 +- doc/examples/sources.list | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'doc/examples') 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 index ef729e203..1aa3d6865 100644 --- a/doc/examples/sources.list +++ b/doc/examples/sources.list @@ -1,6 +1,6 @@ # 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. +# CD-ROMs 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 -- cgit v1.2.3 From 04e9cc0814dd0a77fcae4847d5d0d9002fa54a8f Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 26 May 2012 15:51:15 +0200 Subject: * doc/examples/sources.list: - use the codename instead of 'stable' in the examples sources.list as we do in the manpage and as the debian-installer does --- doc/examples/sources.list | 9 --------- doc/examples/sources.list.in | 8 ++++++++ 2 files changed, 8 insertions(+), 9 deletions(-) delete mode 100644 doc/examples/sources.list create mode 100644 doc/examples/sources.list.in (limited to 'doc/examples') diff --git a/doc/examples/sources.list b/doc/examples/sources.list deleted file mode 100644 index 1aa3d6865..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 -# CD-ROMs 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 -- cgit v1.2.3 From 3adddfa810c916132b59b11c736e8747581662bc Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 9 Jun 2012 23:08:19 +0200 Subject: =?UTF-8?q?*=20ftparchive/apt-ftparchive.cc:=20=20=20-=20default?= =?UTF-8?q?=20to=20putting=20the=20Contents-*=20files=20below=20$(SECTION)?= =?UTF-8?q?=20as=20apt-file=20=20=20=20=20expects=20them=20there=20-=20tha?= =?UTF-8?q?nks=20Martin-=C3=89ric=20Racine!=20(Closes:=20#675827)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/examples/apt-ftparchive.conf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'doc/examples') 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" -- cgit v1.2.3