edsp: support generic and solver-specific configs

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

diff --git a/doc/sources.list.5.xml b/doc/sources.list.5.xml
index 297939a1cc5e9f1d12eaba60e2a6e43ecb379331..f327e365b54be625b64e2d985f93b8aa3ae2729c 100644 (file)
--- a/doc/sources.list.5.xml
+++ b/doc/sources.list.5.xml
@@ -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
-   <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
@@ -222,10 +222,12 @@ deb-src [ option1=value1 option2=value2 ] uri suite [component1] [component2] [.
                (<option>target</option>) is a multivalue option defining
                which download targets apt will try to acquire from this
                source. If not specified, the default set is defined by the
-               <option>Acquire::IndexTargets</option> configuration scope.
-               Additionally, specific targets can be enabled or disabled by
-               using the identifier as field name instead of using this
-               multivalue option.
+               <option>Acquire::IndexTargets</option> configuration scope
+               (targets are specified by their name in the
+               <literal>Created-By</literal> field).
+               Additionally, targets can be enabled or disabled by using the
+               <literal>Identifier</literal> field as an option with a boolean
+               value instead of using this multivalue option.
          </para></listitem>
 
          <listitem><para><option>PDiffs</option> (<option>pdiffs</option>)
@@ -284,15 +286,17 @@ deb-src [ option1=value1 option2=value2 ] uri suite [component1] [component2] [.
          <listitem><para><option>Signed-By</option> (<option>signed-by</option>)
                is either an absolute path to a keyring file (has to be
                accessible and readable for the <literal>_apt</literal> user,
-               so ensure everyone has read-permissions on the file) or a
-               fingerprint of a key either in the
-               <filename>trusted.gpg</filename> keyring or in one of the
+               so ensure everyone has read-permissions on the file) or one or
+               more fingerprints of keys either in the
+               <filename>trusted.gpg</filename> keyring or in the
                keyrings in the <filename>trusted.gpg.d/</filename> directory
                (see <command>apt-key fingerprint</command>). If the option is
-               set, only the key(s) in this keyring or only the key with this
-               fingerprint is used for the &apt-secure; verification of this
-               repository. Otherwise all keys in the trusted keyrings are
-               considered valid signers for this repository.
+               set, only the key(s) in this keyring or only the keys with these
+               fingerprints are used for the &apt-secure; verification of this
+               repository. Defaults to the value of the option with the same name
+               if set in the previously acquired <filename>Release</filename> file.
+               Otherwise all keys in the trusted keyrings are considered valid
+               signers for this repository.
          </para></listitem>
 
          <listitem><para><option>Check-Valid-Until</option> (<option>check-valid-until</option>)
@@ -429,16 +433,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>
-   <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
-Suites: &stable-codename;
+Suites: &debian-stable-codename;
 Components: main
 
 Types: deb
 URIs: http://httpredir.debian.org/debian
-Suites: &stable-codename;
+Suites: &debian-stable-codename;
 Components: main
 Architectures: amd64 armel
 </literallayout>
@@ -452,11 +456,11 @@ Suites: hamm
 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
-Suites: &stable-codename;
+Suites: &debian-stable-codename;
 Components: contrib</literallayout>
 
    <para>Uses FTP to access the archive at ftp.debian.org, under the debian
@@ -499,8 +503,7 @@ Components: main contrib
  </refsect1>
 
  <refsect1><title>See Also</title>
-   <para>&apt-get;, &apt-conf;
-   </para>
+   <para>&apt-get;, &apt-conf;, &apt-acquire-additional-files;</para>
  </refsect1>
 
  &manbugs;