Clarified the documenation examples for non-us. Closes:...

Author: jgg
Date: 2000-05-10 05:55:31 GMT
Clarified the documenation examples for non-us. Closes: #58646
Man Page typo. Closes: #60347
Added blurb about the timeout option

diff --git a/doc/apt.conf.5.yo b/doc/apt.conf.5.yo
index 6b5ba85..d075980 100644 (file)
--- a/doc/apt.conf.5.yo
+++ b/doc/apt.conf.5.yo
@@ -132,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. 
 
+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
@@ -148,12 +151,16 @@ 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)
 
+
 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
@@ -230,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.
 
-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.

diff --git a/doc/sources.list.5.yo b/doc/sources.list.5.yo
index 6840793..2a501f7 100644 (file)
--- a/doc/sources.list.5.yo
+++ b/doc/sources.list.5.yo
@@ -124,14 +124,15 @@ well as the one in the previous example in bf(sources.list),
 a single FTP session will be used for both resource lines.
 quote("deb ftp://ftp.debian.org/debian unstable contrib")
 
-Uses FTP to access the archive at nonus.debian.org, under the debian-non-US
-directory, and uses only files found under unstable/binary-i386.
-quote("deb ftp://nonus.debian.org/debian-non-US unstable/binary-i386/")
+Uses HTTP to access the archive at nonus.debian.org, under the debian-non-US
+directory.
+quote("deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-free")
 
 Uses HTTP to access the archive at nonus.debian.org, under the
 debian-non-US directory, and uses only files found under
 unstable/binary-i386 on i386 machines, unstable/binary-m68k on m68k, and so
-forth for other supported architectures.
+forth for other supported architectures. [Note this example only illistrates
+how to use the substitation variable non-us is no longer structured like this]
 quote("deb http://ftp.de.debian.org/debian-non-US unstable/binary-$(ARCH)/")
 
 manpageseealso()