Fix test-security-no-remote-status

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

diff --git a/doc/sources.list.5.xml b/doc/sources.list.5.xml
index aded8ecefcf7adefbf1743a1abd5c452dc4e78c3..4eb3c0ba0c9cb528d6b98ae3552602cf831f1625 100644 (file)
--- a/doc/sources.list.5.xml
+++ b/doc/sources.list.5.xml
@@ -36,7 +36,7 @@
       designed to support any number of active sources and a variety of source
       media. The files list one source per line (one line style) or contain multiline
       stanzas defining one or more sources per stanza (deb822 style), with the
       designed to support any number of active sources and a variety of source
       media. The files list one source per line (one line style) or contain multiline
       stanzas defining one or more sources per stanza (deb822 style), with the

-      most preferred source listed first. The information available from the
+      most preferred source listed first (in case a single version is available from more than one source). The information available from the

       configured sources is acquired by <command>apt-get update</command> (or
       by an equivalent command from another APT front-end).
    </para>
       configured sources is acquired by <command>apt-get update</command> (or
       by an equivalent command from another APT front-end).
    </para>


@@ -221,7 +221,10 @@ 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>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>APT::Acquire::Targets</option> configuration scope.
+               <option>Acquire::IndexTargets</option> configuration scope.
+               Aditionally, specific targets can be enabled or disabled by
+               using the identifier as field name instead of using this
+               multivalue option.

          </para></listitem>
        </itemizedlist>
 
          </para></listitem>
        </itemizedlist>
 


@@ -232,18 +235,18 @@ deb-src [ option1=value1 option2=value2 ] uri suite [component1] [component2] [.
        anomalies.
 
        <itemizedlist>
        anomalies.
 
        <itemizedlist>

-         <listitem><para><option>Trusted</option> (<option>trusted</option>)
-               is a tri-state value which defaults to APT deciding if a source
-               is considered trusted or if warnings should be raised before e.g.
-               packages are installed from this source. This option can be used
-               to override this decision either with the value <literal>yes</literal>,
-               which lets APT consider this source always as a trusted source
-               even if it has no or fails authentication checks by disabling 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 opposite
-               can be achieved with the value no, which causes the source to be handled
-               as untrusted even if the authentication checks passed successfully.
-               The default value can't be set explicitly.
+         <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 in either the
+               <filename>trusted.gpg</filename> keyring or in one of 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.

          </para></listitem>
 
          <listitem><para><option>Check-Valid-Until</option> (<option>check-valid-until</option>)
          </para></listitem>
 
          <listitem><para><option>Check-Valid-Until</option> (<option>check-valid-until</option>)


@@ -271,7 +274,7 @@ deb-src [ option1=value1 option2=value2 ] uri suite [component1] [component2] [.
                repository is considered valid. -Max can be especially useful
                if the repository provides no Valid-Until field on its Release
                file to set your own value, while -Min can be used to increase
                repository is considered valid. -Max can be especially useful
                if the repository provides no Valid-Until field on its Release
                file to set your own value, while -Min can be used to increase

-               the valid time on seldomly updated (local) mirrors of a more
+               the valid time on seldom updated (local) mirrors of a more

                frequently updated but less accessible archive (which is in the
                sources.list as well) instead of disabling the check entirely.
                Default to the value of the configuration options
                frequently updated but less accessible archive (which is in the
                sources.list as well) instead of disabling the check entirely.
                Default to the value of the configuration options