summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorChristian PERRIER <bubulle@debian.org>2012-01-08 18:54:39 +0100
committerDaniel Hartwig <mandyke@gmail.com>2012-01-15 22:17:37 +0800
commita0ba988f2a8fa4f7f5b43a0212ebfe222e2ba27a (patch)
treeb89558ce5c7e347b91179e2b486728f3b3d03b1d /doc
parent117466dc52fbb55969f94b5ea055bcc6597910e6 (diff)
downloadaptitude-a0ba988f2a8fa4f7f5b43a0212ebfe222e2ba27a.tar.gz
Mention /etc/apt/apt.conf.d/* in Configuration file. Closes: #497138
Diffstat (limited to 'doc')
-rw-r--r--doc/en/aptitude.xml20
1 files changed, 20 insertions, 0 deletions
diff --git a/doc/en/aptitude.xml b/doc/en/aptitude.xml
index 9ecd899c..fd6365dc 100644
--- a/doc/en/aptitude.xml
+++ b/doc/en/aptitude.xml
@@ -10426,6 +10426,12 @@ e: Examine !: Apply .: Next ,: Previous</screen>
</para>
<orderedlist>
+ <listitem>
+ <para>
+ Configuration file options specified on the command-line.
+ </para>
+ </listitem>
+
<listitem>
<para>
The user's configuration file,
@@ -10442,6 +10448,20 @@ e: Examine !: Apply .: Next ,: Previous</screen>
</para>
</listitem>
+ <listitem>
+ <para>
+ The system configuration fragment files,
+ <filename>/etc/apt/apt.conf.d/*</filename>.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ The file specified by the <literal>APT_CONFIG</literal>
+ environment variable (if any).
+ </para>
+ </listitem>
+
<listitem>
<para>
Default values stored in