* merge the remaining Ubuntu change:

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

diff --git a/doc/sources.list.5.xml b/doc/sources.list.5.xml
index 0f788aca164aa77d040d7e3772183ce3321acbfd..b0ff42b596e64153b27b6b532517f259d3e4503b 100644 (file)
--- 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>
@@ -175,12 +175,12 @@ deb http://http.us.debian.org/debian dists/stable-updates/
     commands to perform the file transfers from the remote.</para></listitem>
     </varlistentry>
 
-    <varlistentry><term>more recongnizable URI types</term>
+    <varlistentry><term>more recognizable URI types</term>
     <listitem><para>
     APT can be extended with more methods shipped in other optional packages which should
     follow the nameing scheme <literal>apt-transport-<replaceable>method</replaceable></literal>.
-    The APT team e.g. maintain also the <literal>apt-transport-https</literal> package which
-    provides access methods for https-URIs with features similiar to the http method, but other
+    The APT team e.g. maintains also the <literal>apt-transport-https</literal> package which
+    provides access methods for https-URIs with features similar to the http method, but other
     methods for using e.g. debtorrent are also available, see <citerefentry>
     <refentrytitle><filename>apt-transport-debtorrent</filename></refentrytitle>
     <manvolnum>1</manvolnum></citerefentry>.
@@ -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