diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2013-03-25 13:55:07 +0100 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2013-03-25 13:55:07 +0100 |
| commit | 6db4e5c69fcf4ec5f5574b8465e9e0f20fc22e12 (patch) | |
| tree | 626266c3cb4332fb885963b3564aa1e790d2f270 | |
| parent | 5cf466f44ef3eeefbdabc95e1b369bad8889f899 (diff) | |
| download | apt-6db4e5c69fcf4ec5f5574b8465e9e0f20fc22e12.tar.gz | |
* doc/apt.conf.5.xml:
- document Acquire::ForceIPv{4,6}
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | doc/apt.conf.5.xml | 12 |
2 files changed, 14 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 840fd697c..21e76c818 100644 --- 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 6a61acd2d..be1d7ade8 100644 --- 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> |