* Better documentation for apt-get --option

diff --git a/debian/changelog b/debian/changelog
index 7dbd344a87b7d72cfab516c26d340b36fcfa93bc..7aec1f39f25695361d52831536f8ed0378b69b2c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ apt (0.7.15~exp4) UNRELEASED; urgency=low
     closes: #368665, #298821, #411532, #431636, #461458)
   * Document apt-key finger and adv commands
     (thanks to Stefan Schmidt, closes: #350575)
     closes: #368665, #298821, #411532, #431636, #461458)
   * Document apt-key finger and adv commands
     (thanks to Stefan Schmidt, closes: #350575)

+  * Better documentation for apt-get --option
+    (thanks to Tomas Pospisek, closes: #386579)

   * Retitle the apt-mark.8 manpage (thanks to Justin Pryzby, closes: 471276)
   * Better documentation on using both APT::Default-Release and
     /etc/apt/preferences (thanks to Ingo Saitz, closes: #145575)
   * Retitle the apt-mark.8 manpage (thanks to Justin Pryzby, closes: 471276)
   * Better documentation on using both APT::Default-Release and
     /etc/apt/preferences (thanks to Ingo Saitz, closes: #145575)

diff --git a/doc/apt.ent b/doc/apt.ent
index 44e303495f7a0a9d09eda5d25ed2ce01b74822b8..b7d03b58521a562bf54fc420f0015ca1a58935b8 100644 (file)
--- a/doc/apt.ent
+++ b/doc/apt.ent
@@ -259,6 +259,8 @@
       <term><option>--option</option></term>
      <listitem><para>Set a Configuration Option; This will set an arbitrary
       configuration option. The syntax is <option>-o Foo::Bar=bar</option>.
       <term><option>--option</option></term>
      <listitem><para>Set a Configuration Option; This will set an arbitrary
       configuration option. The syntax is <option>-o Foo::Bar=bar</option>.

+      <option>-o</option> and <option>--option</option> can be used multiple
+      times to set different options.

      </para>
      </listitem>
      </varlistentry>
      </para>
      </listitem>
      </varlistentry>