Bug fixes

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

diff --git a/doc/apt.conf.5.yo b/doc/apt.conf.5.yo
index 212ac05ec4a27bed566f52b622ddc8c4661da51c..6b5ba857530a832d6e255ff8e3fc69c94b2cc24f 100644 (file)
--- a/doc/apt.conf.5.yo
+++ b/doc/apt.conf.5.yo
@@ -33,7 +33,9 @@ with newlines placed to make
 it more readable. Lists can be created by opening a scope an including a 
 single word enclosed in quotes followed by a semicolon. 
 In general the sample configuration file in
 it more readable. Lists can be created by opening a scope an including a 
 single word enclosed in quotes followed by a semicolon. 
 In general the sample configuration file in

-em(/usr/doc/apt/examples/apt.conf) is a good guide for how it should look.
+em(/usr/doc/apt/examples/apt.conf) and
+em(/usr/doc/apt/examples/configure-index) 
+is a good guide for how it should look.

 
 All of the APT tools take a -o option which allows an arbitary configuration 
 directive to be specified on the command line. The syntax is a full option
 
 All of the APT tools take a -o option which allows an arbitary configuration 
 directive to be specified on the command line. The syntax is a full option


@@ -109,7 +111,7 @@ dit(bf(Retries))
 Number of retries to perform. If this is non-zero apt will retry failed 
 files the given number of times.
 
 Number of retries to perform. If this is non-zero apt will retry failed 
 files the given number of times.
 

-dit(bf(Acquire::Source-Symlinks))
+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
 
 Use symlinks for source archives. If set to true then source archives will
 be symlinked when possible instead of copying. True is the default
 


@@ -137,11 +139,11 @@ outstanding requests APT should send.
 
 dit(bf(ftp))
 FTP URis; ftp::Proxy is the default proxy server to use. It is in the 
 
 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
 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

-to. Please see em(/usr/doc/apt/examples/apt.conf) for an example of how 
+to. Please see em(/usr/doc/apt/examples/configure-index) for an example of how 

 to do this. The subsitution variables available are $(PROXY_USER),
 $(PROXY_PASS), $(SITE_USER), $(SITE_PASS), $(SITE), and $(SITE_PORT). 
 Each is taken from it's respective URI component.
 to do this. The subsitution variables available are $(PROXY_USER),
 $(PROXY_PASS), $(SITE_USER), $(SITE_PASS), $(SITE), and $(SITE_PORT). 
 Each is taken from it's respective URI component.


@@ -152,6 +154,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)
 
 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.
 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.


@@ -249,8 +256,8 @@ invokation. bf(Debug::IdentCdrom) will disable the inclusion of statfs
 data in CDROM IDs.
 
 manpagesection(EXAMPLES)
 data in CDROM IDs.
 
 manpagesection(EXAMPLES)

-bf(/usr/doc/apt/examples/apt.conf) contains a sample configuration file
-showing the default values for all possible options.
+bf(/usr/doc/apt/examples/configure-index.gz) contains a sample configuration 
+file showing the default values for all possible options.

 
 manpagesection(FILES)
 /etc/apt/apt.conf
 
 manpagesection(FILES)
 /etc/apt/apt.conf