Fixed or handling bug

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

diff --git a/doc/apt.conf.5.yo b/doc/apt.conf.5.yo
index 996de3a4246dad9ebcee3bcac0b405a2d3e5cd7b..d0759802f66d5154ba66fd71f8d1eb6542c9820e 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


@@ -130,6 +132,9 @@ set for archive files. This may be usefull to prevent polluting a proxy cache
 with very large .deb files. Note: Squid 2.0.2 does not support any of
 these options. 
 
 with very large .deb files. Note: Squid 2.0.2 does not support any of
 these options. 
 

+The option bf(timeout) sets the timeout timer used by the method, this
+applies to all things including connection timeout and data timeout.
+

 One setting is provided to control the pipeline depth in cases where the
 remote server is not RFC conforming or buggy (such as Squid 2.0.2)
 Acquire::http::Pipeline-Depth can be a value from 0 to 5 indicating how many
 One setting is provided to control the pipeline depth in cases where the
 remote server is not RFC conforming or buggy (such as Squid 2.0.2)
 Acquire::http::Pipeline-Depth can be a value from 0 to 5 indicating how many


@@ -141,17 +146,21 @@ 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.
 

+The option bf(timeout) sets the timeout timer used by the method, this
+applies to all things including connection timeout and data timeout.
+

 Several settings are provided to control passive mode. Generally it is safe
 to leave passive mode on, it works in nearly every environment. However some
 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)
 
 Several settings are provided to control passive mode. Generally it is safe
 to leave passive mode on, it works in nearly every environment. However some
 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
 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


@@ -228,7 +237,7 @@ 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.
 
 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))
+dit(bf(Pre-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.
 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.


@@ -254,8 +263,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