diff options
author | Michael Vogt <mvo@debian.org> | 2014-05-07 17:55:10 +0200 |
---|---|---|
committer | Michael Vogt <mvo@debian.org> | 2014-05-07 17:55:10 +0200 |
commit | 38d2959ffb8c6f5f291b2910014a67b1b352ab4c (patch) | |
tree | c5977b8f34aaf973ed3956952ec3ff43ac59f143 /doc/examples | |
parent | fce69e7a0f38299c57ef96ae1c1dd9a5379bfd5a (diff) | |
parent | 3fa4e98f62e469f4292d2811b4e15f4afb678fbd (diff) |
Merge branch 'debian/sid' into debian/experimental
Conflicts:
apt-pkg/cachefilter.h
apt-pkg/contrib/fileutl.cc
apt-pkg/contrib/netrc.h
apt-pkg/deb/debsrcrecords.cc
apt-pkg/init.h
apt-pkg/pkgcache.cc
debian/apt.install.in
debian/changelog
Diffstat (limited to 'doc/examples')
-rw-r--r-- | doc/examples/configure-index | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/examples/configure-index b/doc/examples/configure-index index 93e96cf16..2d9f829ba 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -149,7 +149,7 @@ APT MaxSize "0"; // (new) // - Set maximum size of the cache in MB (0=disable). If the cache // is bigger, cached package files are deleted until the size - // requirement is met (the biggest packages will be deleted + // requirement is met (the oldest packages will be deleted // first). Update-Package-Lists "0"; @@ -450,7 +450,7 @@ Debug aptcdrom "false"; // Show found package files IdentCdrom "false"; acquire::netrc "false"; // netrc parser - + RunScripts "false"; // debug invocation of external scripts } pkgCacheGen::Essential "native"; // other modes: all, none, installed |