* doc/apt.ent:

  - Add a note about APT_CONFIG in the -c description (Closes: #578267)

diff --git a/debian/changelog b/debian/changelog
index 7ef1fb2a7d5d5e8a0a9c4f8710371bcf3933a8ff..2e786c68f7a7f269f5754154b7e5d21a3079abf7 100644 (file)
--- 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)
   * 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:
 
   [ Jari Aalto ]
   * cmdline/apt-get.cc:

diff --git a/doc/apt.ent b/doc/apt.ent
index 19da4429eb2e93826d1d7cc7f0f0e2829f163473..c463f78119f2ce5ac926d425cc75d352099b0800 100644 (file)
--- 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 
       <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>
      </para>
      </listitem>
      </varlistentry>