Fixed ftp resume

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

diff --git a/doc/apt.conf.5.yo b/doc/apt.conf.5.yo
index 4eee5d0ea6dd426d2d47cacea23119ea9d1d309c..996de3a4246dad9ebcee3bcac0b405a2d3e5cd7b 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
@@ -62,6 +68,18 @@ so may be necessary on some extremely slow single user systems but
 is very dangerous and may cause package install scripts to fail or worse.
 Use at your own risk.
 
+dit(bf(Force-LoopBreak))
+Never Enable this option unless you -really- know what you are doing. It
+permits APT to temporarily remove an essential package to break a
+Conflicts/Conflicts or Conflicts/Pre-Depend loop between two essential
+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.
@@ -91,6 +109,10 @@ dit(bf(Retries))
 Number of retries to perform. If this is non-zero apt will retry failed 
 files the given number of times.
 
+dit(bf(Source-Symlinks))
+Use symlinks for source archives. If set to true then source archives will
+be symlinked when possible instead of copying. True is the default
+
 dit(bf(http))
 HTTP URIs; http::Proxy is the default http proxy to use. It is in the standard
 form of em(http://[[user][:pass]@]host[:port]/). Per host proxies can also
@@ -115,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
@@ -130,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.
@@ -153,7 +180,7 @@ as the two package caches bf(srcpkgcache) and bf(pkgcache) as well as the
 location to place downloaded archives, bf(Dir::Cache::archives). Like 
 bf(Dir::State) the default directory is contained in bf(Dir::Cache)
 
-bf(Dir::Etc) contains the location of configuration files, bd(sourcelist)
+bf(Dir::Etc) contains the location of configuration files, bf(sourcelist)
 gives the location of the sourcelist and bf(main) is the default configuration
 file (setting has no effect)
 
@@ -201,6 +228,13 @@ This is a list of shell commands to run before/after invoking dpkg. Like
 bf(Options) this must be specified in list notation. The commands
 are invoked in order using /bin/sh, should any fail APT will abort.
 
+dit(bf(BPre-Install-Pkgs))
+This is a list of shell commands to run before invoking dpkg. Like
+bf(Options) this must be specified in list notation. The commands
+are invoked in order using /bin/sh, should any fail APT will abort.
+Apt will pass to the commands on standard input the filenames of all
+.deb files it is going to install, one per line.
+
 dit(bf(Run-Directory))
 APT chdirs to this directory before invoking dpkg, the default is /.
 
@@ -216,7 +250,8 @@ normal user, however bf(Debug::pkgProblemResolver) shows interesting
 output about the decisions dist-upgrade makes. bf(Debug::NoLocking)
 disables file locking so apt can do some operations as non-root and
 bf(Debug::pkgDPkgPM) will print out the command line for each dpkg 
-invokation.
+invokation. bf(Debug::IdentCdrom) will disable the inclusion of statfs 
+data in CDROM IDs.
 
 manpagesection(EXAMPLES)
 bf(/usr/doc/apt/examples/apt.conf) contains a sample configuration file
@@ -227,7 +262,7 @@ manpagesection(FILES)
 
 manpageseealso()
 apt-cache (8),
-apt.conf (5)
+apt-get (8)
 
 manpagebugs()
 See http://bugs.debian.org/apt.  If you wish to report a