Fixed or handling bug

[apt.git] / doc / sources.list.5.yo

diff --git a/doc/sources.list.5.yo b/doc/sources.list.5.yo
index b8c9bb0818293b116831f97766852b5ee7ce254d..2a501f776f677029b682c885bf523404fe96ed55 100644 (file)
--- a/doc/sources.list.5.yo
+++ b/doc/sources.list.5.yo
@@ -15,13 +15,15 @@ em(args). em(uri) is a Universal Resource Identifier (URI), which is a
 superset of the more specific and well-known Universal Resource Locator, or 
 URL.
 
-manpagesection(The deb type)
+manpagesection(The deb and deb-src types)
 The bf(deb) type describes a typical two-level Debian archive,
 em(distribution/component). Typically, em(distribution) is one of
 em(stable), em(unstable), or em(frozen), while component is one of
-em(main), em(contrib), em(non-free), or em(non-us).
-The format for a bf(sources.list) entry using the em(deb)
-type is:
+em(main), em(contrib), em(non-free), or em(non-us). The bf(deb-src) type
+describes a debian distribution's source code in the same form as the bf(deb)
+type. A bf(deb-src) line is required to fetch source indexes.
+The format for a bf(sources.list) entry using the em(deb) and em(deb-src)
+types are:
 verb(deb uri distribution [component1] [componenent2] [...])
 The URI for the em(deb) type must specify the base of the Debian distribution, 
 from which bf(APT) will find the information it needs. em(distribution)
@@ -55,6 +57,10 @@ preferred source listed first. Typically this will result in sorting
 by speed from fastest to slowest (CD-ROM followed by hosts on a local
 network, followed by distant Internet hosts, for example).
 
+Some examples:
+verb(deb http://http.us.debian.org/debian stable main contrib non-free)
+verb(deb http://http.us.debian.org/debian dists/stable-updates)
+
 manpagesection(URI specification)
 The currently recognized URI types are cdrom, file, http, and ftp.
 
@@ -80,7 +86,17 @@ Note that this is an insecure method of authentication.
 dit(bf(ftp))
 The ftp scheme specifies an FTP server for the archive. APT's FTP behavior
 is highly configurable; for more information see the
-bf(apt.conf(5)) manual page.
+bf(apt.conf(5)) manual page. Please note that a ftp proxy can be specified
+by using the ftp_proxy environment variable. It is possible to specify a http
+proxy (http proxy servers often understand ftp urls) using this method and 
+ONLY this method. ftp proxies using http specified in the configuration 
+file will be ignored.
+
+dit(bf(copy))
+The copy scheme is identical to the file scheme except that packages are
+copied into the cache directory instead of used directly at their location.
+This is usefull for people using a zip disk to copy files around with APT.
+
 enddit()
 
 manpagesection(EXAMPLES)
@@ -91,9 +107,12 @@ quote("deb file:/home/jason/debian stable main contrib non-free")
 As above, except this uses the unstable (development) distribution.
 quote("deb file:/home/jason/debian unstable main contrib non-free")
 
-Uses HTTP to access the archive at www.debian.org, and uses only the
-stable/main area.
-quote("deb http://www.debian.org/archive stable main")
+Source line for the above
+quote("deb-src file:/home/jason/debian unstable main contrib non-free")
+
+Uses HTTP to access the archive at archive.debian.org, and uses only the
+hamm/main area.
+quote("deb http://archive.debian.org/debian-archive hamm main")
 
 Uses FTP to access the archive at ftp.debian.org, under the debian
 directory, and uses only the stable/contrib area.
@@ -105,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()