* doc/apt.conf.5.xml:

  - document Acquire::ForceIPv{4,6}

diff --git a/debian/changelog b/debian/changelog
index 840fd697c16630af5b26d74c96c913e3241448ab..21e76c818783093ad70d0636db42b4263314eb06 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,8 @@ apt (0.9.7.9~exp2) UNRELEASED; urgency=low
   [ Michael Vogt ]
   * methods/connect.cc:
     - use Errno() instead of strerror(), thanks to David Kalnischk
+  * doc/apt.conf.5.xml:
+    - document Acquire::ForceIPv{4,6}
 
  -- Christian Perrier <bubulle@debian.org>  Sun, 24 Mar 2013 08:57:45 +0100
 

diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml
index 6a61acd2d4728948fbbc5f9759941771e0e71af4..be1d7ade8b411fab0b021ca2590a46cbc5dcb895 100644 (file)
--- a/doc/apt.conf.5.xml
+++ b/doc/apt.conf.5.xml
@@ -554,6 +554,18 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
      </listitem>
      </varlistentry>
 
+     <varlistentry><term><option>ForceIPv4</option></term>
+        <listitem><para>
+         When downloading, force to use only the IPv4 protocol.
+        </para></listitem>
+     </varlistentry>
+
+     <varlistentry><term><option>ForceIPv6</option></term>
+        <listitem><para>
+         When downloading, force to use only the IPv6 protocol.
+        </para></listitem>
+     </varlistentry>
+
    </variablelist>
  </refsect1>