X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/b6f4e35ace11971d53179c111ec9de192523b090..ae2a6be8a2155c136f9535abfbcc750c8c395cd2:/doc/sources.list.5.xml?ds=sidebyside

diff --git a/doc/sources.list.5.xml b/doc/sources.list.5.xml
index bca4740fd..e6d82b1e7 100644
--- a/doc/sources.list.5.xml
+++ b/doc/sources.list.5.xml
@@ -14,7 +14,7 @@
    &apt-email;
    &apt-product;
    <!-- The last update date -->
-   <date>2015-09-14T00:00:00Z</date>
+   <date>2016-06-20T00:00:00Z</date>
  </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
-   <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>)
@@ -267,6 +269,14 @@ deb-src [ option1=value1 option2=value2 ] uri suite [component1] [component2] [.
        anomalies.
 
        <itemizedlist>
+	  <listitem><para><option>Allow-Insecure</option> (<option>allow-insecure</option>),
+		<option>Allow-Weak</option> (<option>allow-weak</option>) and
+		<option>Allow-Downgrade-To-Insecure</option> (<option>allow-downgrade-to-insecure</option>)
+		are boolean values which all default to <literal>no</literal>.
+		If set to <literal>yes</literal> they circumvent parts of &apt-secure;
+		and should therefore not be used lightly!
+	  </para></listitem>
+
 	  <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.
@@ -275,7 +285,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
-		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.
@@ -284,15 +294,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 +441,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 +464,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 +511,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;