diff options
author | Michael Vogt <michael.vogt@ubuntu.com> | 2013-04-23 08:08:54 +0200 |
---|---|---|
committer | Michael Vogt <michael.vogt@ubuntu.com> | 2013-04-23 08:08:54 +0200 |
commit | 3444603f5ff2b4c4816e45e686e06e01df31cdc4 (patch) | |
tree | b0e63e9bc86ca6d39f6987381ca7bfa64e186048 /doc/apt.conf.5.xml | |
parent | 52d5690b47bd4efe425fa23d9f6559bb44324cd1 (diff) | |
parent | 3278fe66567d149ea92c1afa78941f2bc3c71c85 (diff) |
merged debian-sid branch and resolved conflicts
Diffstat (limited to 'doc/apt.conf.5.xml')
-rw-r--r-- | doc/apt.conf.5.xml | 12 |
1 files changed, 12 insertions, 0 deletions
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> |