summaryrefslogtreecommitdiff
path: root/doc/sources.list.5.xml
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2010-07-29 16:18:10 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2010-07-29 16:18:10 +0200
commit15240f4b681ca35c669d2b2e6e34f8ee3f6c06d9 (patch)
tree4139050e3c2f00650a0d316c971c4e7b8aba3e58 /doc/sources.list.5.xml
parent34904390bd6901f3de90249938baa0b875873534 (diff)
parent1b8ba3ba050f01db27f1ddc0e5b280b2fccd9fb9 (diff)
merged with the debian-experimental-ma branch
Diffstat (limited to 'doc/sources.list.5.xml')
-rw-r--r--doc/sources.list.5.xml8
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/sources.list.5.xml b/doc/sources.list.5.xml
index c71ae6bdd..b0ff42b59 100644
--- a/doc/sources.list.5.xml
+++ b/doc/sources.list.5.xml
@@ -111,8 +111,8 @@
<para>Some examples:</para>
<literallayout>
-deb http://http.us.debian.org/debian stable main contrib non-free
-deb http://http.us.debian.org/debian dists/stable-updates/
+deb http://ftp.debian.org/debian &stable-codename; main contrib non-free
+deb http://security.debian.org/ &stable-codename;/updates main contrib non-free
</literallayout>
</refsect1>
@@ -206,8 +206,8 @@ deb http://http.us.debian.org/debian dists/stable-updates/
<literallayout>deb http://archive.debian.org/debian-archive hamm main</literallayout>
<para>Uses FTP to access the archive at ftp.debian.org, under the debian
- directory, and uses only the stable/contrib area.</para>
- <literallayout>deb ftp://ftp.debian.org/debian stable contrib</literallayout>
+ directory, and uses only the &stable-codename;/contrib area.</para>
+ <literallayout>deb ftp://ftp.debian.org/debian &stable-codename; contrib</literallayout>
<para>Uses FTP to access the archive at ftp.debian.org, under the debian
directory, and uses only the unstable/contrib area. If this line appears as