fix Alt-Filename handling of file method

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

diff --git a/doc/sources.list.5.xml b/doc/sources.list.5.xml
index bca4740fda5da3f839aff492d00b8e0df6fe4a68..dcf33a9bac40b5a17ab599282aee6d1cd430beca 100644 (file)
--- a/doc/sources.list.5.xml
+++ b/doc/sources.list.5.xml
@@ -14,7 +14,7 @@
    &apt-email;
    &apt-product;
    <!-- The last update date -->
    &apt-email;
    &apt-product;
    <!-- The last update date -->

-   <date>2015-09-14T00:00:00Z</date>
+   <date>2015-11-26T00:00:00Z</date>

  </refentryinfo>
  
  <refmeta>
  </refentryinfo>
  
  <refmeta>


@@ -126,7 +126,7 @@
    archive, <filename>distribution/component</filename>. The
    <literal>distribution</literal> is generally a suite name like
    <literal>stable</literal> or <literal>testing</literal> or a codename like
    archive, <filename>distribution/component</filename>. The
    <literal>distribution</literal> is generally a suite name like
    <literal>stable</literal> or <literal>testing</literal> or a codename like

-   <literal>&stable-codename;</literal> or <literal>&testing-codename;</literal>
+   <literal>&debian-stable-codename;</literal> or <literal>&debian-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 references a Debian distribution's source
    while component is one of <literal>main</literal>, <literal>contrib</literal> or
    <literal>non-free</literal>. The
    <literal>deb-src</literal> type references a Debian distribution's source


@@ -275,7 +275,7 @@ deb-src [ option1=value1 option2=value2 ] uri suite [component1] [component2] [.
                always to consider this source as trusted, even if it doesn't pass
                authentication checks. It disables parts of &apt-secure;, and should
                therefore only be used in a local and trusted context (if at all) as
                always to consider this source as trusted, even if it doesn't pass
                authentication checks. It disables parts of &apt-secure;, and should
                therefore only be used in a local and trusted context (if at all) as

-               otherwise security is breached. The value <literal>no<literal> does
+               otherwise security is breached. The value <literal>no</literal> does

                the opposite, causing the source to be handled as untrusted even if
                the authentication checks passed successfully. The default value can't
                be set explicitly.
                the opposite, causing the source to be handled as untrusted even if
                the authentication checks passed successfully. The default value can't
                be set explicitly.


@@ -429,16 +429,16 @@ Components: main contrib non-free</literallayout>
 
    <para>The first line gets package information for the architectures in <literal>APT::Architectures</literal>
    while the second always retrieves <literal>amd64</literal> and <literal>armel</literal>.</para>
 
    <para>The first line gets package information for the architectures in <literal>APT::Architectures</literal>
    while the second always retrieves <literal>amd64</literal> and <literal>armel</literal>.</para>

-   <literallayout>deb http://httpredir.debian.org/debian &stable-codename; main
-deb [ arch=amd64,armel ] http://httpredir.debian.org/debian &stable-codename; main</literallayout>
+   <literallayout>deb http://httpredir.debian.org/debian &debian-stable-codename; main
+deb [ arch=amd64,armel ] http://httpredir.debian.org/debian &debian-stable-codename; main</literallayout>

    <literallayout>Types: deb
 URIs: http://httpredir.debian.org/debian
    <literallayout>Types: deb
 URIs: http://httpredir.debian.org/debian

-Suites: &stable-codename;
+Suites: &debian-stable-codename;

 Components: main
 
 Types: deb
 URIs: http://httpredir.debian.org/debian
 Components: main
 
 Types: deb
 URIs: http://httpredir.debian.org/debian

-Suites: &stable-codename;
+Suites: &debian-stable-codename;

 Components: main
 Architectures: amd64 armel
 </literallayout>
 Components: main
 Architectures: amd64 armel
 </literallayout>


@@ -452,11 +452,11 @@ Suites: hamm
 Components: main</literallayout>
 
    <para>Uses FTP to access the archive at ftp.debian.org, under the debian
 Components: main</literallayout>
 
    <para>Uses FTP to access the archive at ftp.debian.org, under the debian

-   directory, and uses only the &stable-codename;/contrib area.</para>
-   <literallayout>deb ftp://ftp.debian.org/debian &stable-codename; contrib</literallayout>
+   directory, and uses only the &debian-stable-codename;/contrib area.</para>
+   <literallayout>deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib</literallayout>

    <literallayout>Types: deb
 URIs: ftp://ftp.debian.org/debian
    <literallayout>Types: deb
 URIs: ftp://ftp.debian.org/debian

-Suites: &stable-codename;
+Suites: &debian-stable-codename;

 Components: contrib</literallayout>
 
    <para>Uses FTP to access the archive at ftp.debian.org, under the debian
 Components: contrib</literallayout>
 
    <para>Uses FTP to access the archive at ftp.debian.org, under the debian