summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Kalnischkies <kalnischkies@gmail.com>2010-04-24 09:39:46 +0200
committerDavid Kalnischkies <kalnischkies@gmail.com>2010-04-24 09:39:46 +0200
commit75a53a7c29bf3b2dd8d898ed650b1fe937119080 (patch)
tree1aa5d1e5aaa45e8987308afbce7b04614718515b
parentca964703dd3442724c0ccac0ade717042ca8fce5 (diff)
* doc/apt.ent:
- Add a note about APT_CONFIG in the -c description (Closes: #578267)
-rw-r--r--debian/changelog2
-rw-r--r--doc/apt.ent4
2 files changed, 5 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 7ef1fb2a7..2e786c68f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -27,6 +27,8 @@ apt (0.7.26~exp4) experimental; urgency=low
* cmdline/apt-cache.cc:
- align Installed and Candidate Version in policy so they can be compared
easier, thanks Ralf Gesellensetter for the pointer! (Closes: #578657)
+ * doc/apt.ent:
+ - Add a note about APT_CONFIG in the -c description (Closes: #578267)
[ Jari Aalto ]
* cmdline/apt-get.cc:
diff --git a/doc/apt.ent b/doc/apt.ent
index 19da4429e..c463f7811 100644
--- a/doc/apt.ent
+++ b/doc/apt.ent
@@ -261,7 +261,9 @@
<term><option>--config-file</option></term>
<listitem><para>Configuration File; Specify a configuration file to use.
The program will read the default configuration file and then this
- configuration file. See &apt-conf; for syntax information.
+ configuration file. If configuration settings need to be set before the
+ default configuration files are parsed specify a file with the <envar>APT_CONFIG</envar>
+ environment variable. See &apt-conf; for syntax information.
</para>
</listitem>
</varlistentry>