diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2009-08-19 11:28:34 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2009-08-19 11:28:34 +0200 |
| commit | f30eb61fde728f125bf7c673cadc17f43d82a2d0 (patch) | |
| tree | c8ae7fbad1d15c3611104848c1d52abccd9904c9 /doc/apt.conf.5.xml | |
| parent | 9a64707c285290c4e191e04d92c0fab9f6f118f5 (diff) | |
| parent | 889053489a8b9b91feeb698fc164446e9b5f9c67 (diff) | |
merged from the mvo branch
Diffstat (limited to 'doc/apt.conf.5.xml')
| -rw-r--r-- | doc/apt.conf.5.xml | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index 2b2430c83..1fe980d28 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -203,8 +203,9 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. Per host proxies can also be specified by using the form <literal>http::Proxy::<host></literal> with the special keyword <literal>DIRECT</literal> - meaning to use no proxies. The <envar>http_proxy</envar> environment variable - will override all settings.</para> + meaning to use no proxies. If no one of the above settings is specified, + <envar>http_proxy</envar> environment variable + will be used.</para> <para>Three settings are provided for cache control with HTTP/1.1 compliant proxy caches. <literal>No-Cache</literal> tells the proxy to not use its cached @@ -252,9 +253,13 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; </para></listitem></varlistentry> <varlistentry><term>ftp</term> - <listitem><para>FTP URIs; ftp::Proxy is the default proxy server to use. It is in the - standard form of <literal>ftp://[[user][:pass]@]host[:port]/</literal> and is - overridden by the <envar>ftp_proxy</envar> environment variable. To use a ftp + <listitem><para>FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the + standard form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. Per + host proxies can also be specified by using the form + <literal>ftp::Proxy::<host></literal> with the special keyword <literal>DIRECT</literal> + meaning to use no proxies. If no one of the above settings is specified, + <envar>ftp_proxy</envar> environment variable + will be used. To use a ftp proxy you will have to set the <literal>ftp::ProxyLogin</literal> script in the configuration file. This entry specifies the commands to send to tell the proxy server what to connect to. Please see |