summaryrefslogtreecommitdiff
path: root/doc/sources.list.5.xml
diff options
context:
space:
mode:
authorMichael Vogt <mvo@debian.org>2011-02-08 10:27:51 +0100
committerMichael Vogt <mvo@debian.org>2011-02-08 10:27:51 +0100
commit09b8bd3226a68272f98e4020d10348ff26642500 (patch)
tree1394a74a187ce61982c6c8649721de2f543459a1 /doc/sources.list.5.xml
parent7c748f4aa1bd47089672353fd1a401d1c5c94723 (diff)
parent4c6cf49317769725fee34a132c52ec1fe076b8b5 (diff)
merged from lp:~mvo/apt/mvo (which is really lp:~donkult/apt/sid with some updated comments ;)
Diffstat (limited to 'doc/sources.list.5.xml')
-rw-r--r--doc/sources.list.5.xml30
1 files changed, 13 insertions, 17 deletions
diff --git a/doc/sources.list.5.xml b/doc/sources.list.5.xml
index 6029a7457..212ed6d98 100644
--- a/doc/sources.list.5.xml
+++ b/doc/sources.list.5.xml
@@ -63,11 +63,11 @@
<refsect1><title>The deb and deb-src types</title>
<para>The <literal>deb</literal> type describes a typical two-level Debian
archive, <filename>distribution/component</filename>. Typically,
- <literal>distribution</literal> is generally one of
- <literal>stable</literal> <literal>unstable</literal> or
- <literal>testing</literal> while component is one of <literal>main</literal>
- <literal>contrib</literal> <literal>non-free</literal> or
- <literal>non-us</literal>. The
+ <literal>distribution</literal> is generally an archivename like
+ <literal>stable</literal> or <literal>testing</literal> or a codename like
+ <literal>&stable-codename;</literal> or <literal>&testing-codename;</literal>
+ while component is one of <literal>main</literal> <literal>contrib</literal> or
+ <literal>non-free</literal>. The
<literal>deb-src</literal> type describes a debian distribution's source
code in the same form as the <literal>deb</literal> type.
A <literal>deb-src</literal> line is required to fetch source indexes.</para>
@@ -218,18 +218,14 @@ deb http://security.debian.org/ &stable-codename;/updates main contrib non-free
a single FTP session will be used for both resource lines.</para>
<literallayout>deb ftp://ftp.debian.org/debian unstable contrib</literallayout>
- <para>Uses HTTP to access the archive at nonus.debian.org, under the
- debian-non-US directory.</para>
- <literallayout>deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-free</literallayout>
-
- <para>Uses HTTP to access the archive at nonus.debian.org, under the
- debian-non-US directory, and uses only files found under
- <filename>unstable/binary-i386</filename> on i386 machines,
- <filename>unstable/binary-m68k</filename> on m68k, and so
- forth for other supported architectures. [Note this example only
- illustrates how to use the substitution variable; non-us is no longer
- structured like this]
- <literallayout>deb http://ftp.de.debian.org/debian-non-US unstable/binary-$(ARCH)/</literallayout>
+ <para>Uses HTTP to access the archive at ftp.tlh.debian.org, under the
+ universe directory, and uses only files found under
+ <filename>unstable/binary-i386</filename> on i386 machines,
+ <filename>unstable/binary-amd64</filename> on amd64, and so
+ forth for other supported architectures. [Note this example only
+ illustrates how to use the substitution variable; official debian
+ archives are not structured like this]
+ <literallayout>deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/</literallayout>
</para>
</refsect1>