summaryrefslogtreecommitdiff
path: root/doc/apt.conf.5.xml
diff options
context:
space:
mode:
authorDavid Kalnischkies <kalnischkies@gmail.com>2009-11-25 23:29:57 +0100
committerDavid Kalnischkies <kalnischkies@gmail.com>2009-11-25 23:29:57 +0100
commitc0d438474bac961897f9e9472356222f79350c39 (patch)
tree6e8f83d52d01983d0e43dd8797e71ca13dc6b1d1 /doc/apt.conf.5.xml
parentce857f32cf3c73ee67147ea0eafadb5a1c5da952 (diff)
downloadapt-c0d438474bac961897f9e9472356222f79350c39.tar.gz
add https options which default to the ones from http for the https
method as this is more sane than using only the http options without a possibility to override these for https.
Diffstat (limited to 'doc/apt.conf.5.xml')
-rw-r--r--doc/apt.conf.5.xml8
1 files changed, 5 insertions, 3 deletions
diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml
index 726bca2cc..d7ad51cfb 100644
--- a/doc/apt.conf.5.xml
+++ b/doc/apt.conf.5.xml
@@ -284,9 +284,11 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
</varlistentry>
<varlistentry><term>https</term>
- <listitem><para>HTTPS URIs. Cache-control and proxy options are the same as for
- <literal>http</literal> method.
- <literal>Pipeline-Depth</literal> option is not supported yet.</para>
+ <listitem><para>HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and
+ proxy options are the same as for <literal>http</literal> method and will also
+ default to the options from the <literal>http</literal> method if they are not
+ explicitly set for https. <literal>Pipeline-Depth</literal> option is not
+ supported yet.</para>
<para><literal>CaInfo</literal> suboption specifies place of file that
holds info about trusted certificates.