diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2008-12-09 17:49:46 -0800 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2008-12-09 17:49:46 -0800 |
| commit | de4e6f6b78154cf2c4afea4aea74b5bca3fba96f (patch) | |
| tree | 2759f5959ce15112935a2e9d22e6395e8b0ddd71 /doc/examples | |
| parent | f23153d046f014f96d442fca5b9ef6ede7fcf546 (diff) | |
| parent | 3205e1f3b0dc9310fe767aef23824d0deb7a26bf (diff) | |
merged from the debian-sid branch
Diffstat (limited to 'doc/examples')
| -rw-r--r-- | doc/examples/configure-index | 6 | ||||
| -rw-r--r-- | doc/examples/sources.list | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/doc/examples/configure-index b/doc/examples/configure-index index 0bab8e0f8..84b1d8829 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -1,4 +1,3 @@ -// $Id: configure-index,v 1.10 2004/07/17 19:37:16 mdz Exp $ /* This file is an index of all APT configuration directives. It should NOT actually be used as a real config file, though it is (except for the last line) a completely valid file. Most of the options have sane default @@ -25,13 +24,14 @@ APT Architecture "i386"; Build-Essential "build-essential"; - NeverAutoRemove { "linux-kernel.*"; }; // packages that should never + NeverAutoRemove { "linux-image.*"; }; // packages that should never // considered for autoRemove // Options for apt-get Get { Arch-Only "false"; + AllowUnauthenticated "false"; AutomaticRemove "false"; HideAutoRemove "false"; Download-Only "false"; @@ -104,7 +104,7 @@ APT // consider Recommends, Suggests as important dependencies that should // be installed by default - Install-Recommends "false"; + Install-Recommends "true"; Install-Suggests "false"; // consider dependencies of packages in this section manual diff --git a/doc/examples/sources.list b/doc/examples/sources.list index 9af1c3c4c..ef729e203 100644 --- a/doc/examples/sources.list +++ b/doc/examples/sources.list @@ -6,4 +6,4 @@ 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://non-us.debian.org/debian-non-US stable/non-US main contrib non-free +#deb-src http://security.debian.org stable/updates main contrib non-free |