diff options
| author | Julian Andres Klode <jak@debian.org> | 2017-06-28 19:15:41 +0200 |
|---|---|---|
| committer | Julian Andres Klode <jak@debian.org> | 2017-06-28 19:15:41 +0200 |
| commit | 11c3624ce3575076ca52350f66d4bd2e63db5d73 (patch) | |
| tree | 5bdd7020c8d42e9bb502fb0bbb4c3dc85450d446 /doc | |
| parent | 930e2df52dc637039c1845905d79ce525faeb8ca (diff) | |
| parent | 147ac0fc90d972a11f5e91521ba3d385015b5945 (diff) | |
Merge branch 'feature/http-https'
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/apt.conf.5.xml | 9 | ||||
| -rw-r--r-- | doc/examples/configure-index | 2 |
2 files changed, 11 insertions, 0 deletions
diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index 260c66c46..54ed78c95 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -357,6 +357,15 @@ APT::Compressor::rev { </para></listitem> </varlistentry> + <varlistentry><term><option>AllowTLS</option></term> + <listitem><para> + Allow use of the internal TLS support in the http method. If set to false, + this completely disables support for TLS in apt's own methods (excluding + the curl-based https method). No TLS-related functions will be called + anymore. + </para></listitem> + </varlistentry> + <varlistentry><term><option>PDiffs</option></term> <listitem><para>Try to download deltas called <literal>PDiffs</literal> for indexes (like <filename>Packages</filename> files) instead of diff --git a/doc/examples/configure-index b/doc/examples/configure-index index aada67bf5..a48d4cb99 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -206,6 +206,8 @@ Acquire Source-Symlinks "<BOOL>"; ForceHash "<STRING>"; // hashmethod used for expected hash: sha256, sha1 or md5sum + AllowTLS "<BOOL>"; // whether support for tls is enabled + PDiffs "<BOOL>"; // try to get the IndexFile diffs PDiffs::FileLimit "<INT>"; // don't use diffs if we would need more than 4 diffs PDiffs::SizeLimit "<INT>"; // don't use diffs if size of all patches excess X% of the size of the original file |