summaryrefslogtreecommitdiff
path: root/doc/sources.list.5.xml
diff options
context:
space:
mode:
authorDavid Kalnischkies <david@kalnischkies.de>2017-11-22 19:39:31 +0100
committerDavid Kalnischkies <david@kalnischkies.de>2018-01-03 18:55:41 +0100
commit956145444e1a3b7f5e660f71904711f4ea5bd262 (patch)
tree7ba59fc2f9d1d0f1110a37f00e596b91be91d559 /doc/sources.list.5.xml
parent5b197e9de5376e191018562309e2d42123c27a1d (diff)
document http options in new apt-transport-http manpage
We had documentation for the http transport in our "catch-all" apt.conf manpage, but it seems benefitial to document transports in their own manpage instead of pushing them all into one.
Diffstat (limited to 'doc/sources.list.5.xml')
-rw-r--r--doc/sources.list.5.xml16
1 files changed, 7 insertions, 9 deletions
diff --git a/doc/sources.list.5.xml b/doc/sources.list.5.xml
index 694082bea..3f81dd515 100644
--- a/doc/sources.list.5.xml
+++ b/doc/sources.list.5.xml
@@ -352,17 +352,15 @@ deb-src [ option1=value1 option2=value2 ] uri suite [component1] [component2] [.
<para>The currently recognized URI types are:
<variablelist>
- <varlistentry><term><command>http</command></term>
+ <varlistentry><term><command>http</command> (&apt-transport-http;)</term>
<listitem><para>
The http scheme specifies an HTTP server for an archive and is the most
- commonly used method, with many options in the
- <literal>Acquire::http</literal> scope detailed in &apt-conf;. The URI can
- directly include login information if the archive requires it, but the use
- of &apt-authconf; should be preferred. The method also supports SOCKS5 and
- HTTP(S) proxies either configured via apt-specific configuration or
- specified by the environment variable <envar>http_proxy</envar> in the
- format (assuming an HTTP proxy requiring authentication)
- <replaceable>http://user:pass@server:port/</replaceable>.
+ commonly used method. The URI can directly include login information if the
+ archive requires it, but the use of &apt-authconf; should be preferred.
+ The method also supports SOCKS5 and HTTP(S) proxies either configured via
+ apt-specific configuration or specified by the environment variable
+ <envar>http_proxy</envar> in the format (assuming an HTTP proxy requiring
+ authentication) <replaceable>http://user:pass@server:port/</replaceable>.
The authentication details for proxies can also be supplied via
&apt-authconf;.</para>
<para>Note that these forms of authentication are insecure as the whole