diff options
author | Michael Vogt <mvo@debian.org> | 2013-07-02 08:32:34 +0200 |
---|---|---|
committer | Michael Vogt <mvo@debian.org> | 2013-07-02 08:32:34 +0200 |
commit | 8e4c3f0a42664b8c37cc2e0de285849fbf118e11 (patch) | |
tree | 059b76fef1c1636a7e1ad16e5a4ce06304271718 /doc/apt.conf.5.xml | |
parent | 25a4d2049fb79bc2c86cd45e977b4a071e5300ac (diff) | |
parent | e3c62328abbd548bb0da42fdbad954b3ce4f7102 (diff) |
Merge remote-tracking branch 'donkult/debian/sid' into debian/sid
Conflicts:
debian/changelog
Diffstat (limited to 'doc/apt.conf.5.xml')
-rw-r--r-- | doc/apt.conf.5.xml | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index be1d7ade8..3cf3136d3 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -98,8 +98,7 @@ APT { DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; </programlisting></informalexample> - <para>In general the sample configuration file in - <filename>&docdir;examples/apt.conf</filename> &configureindex; + <para>In general the sample configuration file &configureindex; is a good guide for how it should look.</para> <para>Case is not significant in names of configuration items, so in the |