More usr doc fixes

[apt.git] / doc / apt.conf.5.yo

diff --git a/doc/apt.conf.5.yo b/doc/apt.conf.5.yo
index 9c4c0e4f141a40f1e8665d54298b2d3a071a7a00..c9a116d45f87ec548abd0ecf0035a7e42927b49e 100644 (file)
--- a/doc/apt.conf.5.yo
+++ b/doc/apt.conf.5.yo
@@ -55,6 +55,12 @@ dit(bf(Ignore-Hold))
 Ignore Held packages; This global options causes the problem resolver to
 ignore held packages in its decision making. 
 
+dit(bf(Clean-Installed))
+Defaults to on. When turned on the autoclean feature will remove any pacakge
+which can no longer be downloaded from the cache. If turned off then
+packages that are locally installed are also excluded from cleaning - but
+note that APT provides no direct means to reinstall them.
+
 dit(bf(Immediate-Configure))
 Disable Immedate Configuration; This dangerous option disables some
 of APT's ordering code to cause it to make fewer dpkg calls. Doing
@@ -70,6 +76,10 @@ packages. SUCH A LOOP SHOULD NEVER EXIST AND IS A GRAVE BUG. This option will
 work if the essential packages are not tar, gzip, libc, dpkg, bash or 
 anything that those packages depend on.
 
+dit(bf(Cache-Limit))
+APT uses a fixed size memory mapped cache file to store the 'available'
+information. This sets the size of that cache.
+
 dit(bf(Get))
 The Get subsection controls the bf(apt-get(8)) tool, please see its
 documentation for more information about the options here.
@@ -127,7 +137,7 @@ outstanding requests APT should send.
 
 dit(bf(ftp))
 FTP URis; ftp::Proxy is the default proxy server to use. It is in the 
-standard form of em(http://[[user][:pass]@]host[:port]/) and is overriden
+standard form of em(ftp://[[user][:pass]@]host[:port]/) and is overriden
 by the ftp_proxy environment variable. To use a ftp proxy you will have to
 set the ftp::ProxyLogin script in the configuration file. This entry 
 specifies the commands to send to tell the proxy server what to connect
@@ -142,6 +152,11 @@ situations require that passive mode be disabled and port mode ftp used
 instead. This can be done globally, for connections that go through a proxy
 or for a specific host (See the sample config file for examples)
 
+It is possible to proxy FTP over HTTP by setting the em(ftp_proxy)
+environment variable to a http url - see the discussion of the http method
+above for syntax. You cannot set this in the configuration file and it is
+not recommended to use FTP over HTTP due to its low efficiency.
+
 dit(bf(cdrom))
 CDROM URIs; the only setting for CDROM URIs is the mount point, cdrom::Mount
 which must be the mount point for the CDROM drive as specified in /etc/fstab.