summaryrefslogtreecommitdiff
path: root/doc/examples
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2009-12-10 16:07:43 +0100
committerMichael Vogt <michael.vogt@ubuntu.com>2009-12-10 16:07:43 +0100
commit9307ef07498d37c0b5e05b036195abaf7ad0105c (patch)
treecf85e1f46b31161dc4c601fa79fc76a85154d696 /doc/examples
parent1eb5622017241e874016b759625b2b706ed9a74c (diff)
parente4b16ac68196eab5e58abf715459fe70c199cff3 (diff)
* merge lp:~mvo/apt/netrc branch, this adds support for a
/etc/apt/auth.conf that can be used to store username/passwords in a "netrc" style file (with the extension that it supports "/" in a machine definition). Based on the maemo git branch. * apt-pkg/deb/dpkgpm.cc: - add "purge" to list of known actions
Diffstat (limited to 'doc/examples')
-rw-r--r--doc/examples/configure-index2
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/examples/configure-index b/doc/examples/configure-index
index 27118fb7e..f5f996460 100644
--- a/doc/examples/configure-index
+++ b/doc/examples/configure-index
@@ -282,6 +282,7 @@ Dir "/"
// Config files
Etc "etc/apt/" {
Main "apt.conf";
+ Netrc "auth.conf";
Parts "apt.conf.d/";
Preferences "preferences";
PreferencesParts "preferences.d";
@@ -380,6 +381,7 @@ Debug
Acquire::gpgv "false"; // Show the gpgv traffic
aptcdrom "false"; // Show found package files
IdentCdrom "false";
+ acquire::netrc "false"; // netrc parser
}