do not sent Last-Modified if we expect a changed file

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

diff --git a/doc/sources.list.5.xml b/doc/sources.list.5.xml
index cfd98e545fa22d0fac271a41693272259a2e922c..8a8dc04b7ecc443f39793e24d74e52cb6fbd563f 100644 (file)
--- a/doc/sources.list.5.xml
+++ b/doc/sources.list.5.xml
@@ -239,6 +239,22 @@ deb-src [ option1=value1 option2=value2 ] uri suite [component1] [component2] [.
                <literal>yes</literal>.
          </para></listitem>
 
+         <listitem><para><option>By-Hash</option> (<option>by-hash</option>)
+               can have the value "yes", "no" or "force" and controls if APT
+               should try to acquire indexes via an URI constructed from a
+               hashsum of the expected file instead of using the well-known
+               stable filename of the index. Using this can avoid hashsum
+               mismatches, but requires a supporting mirror. The value
+               "yes"/"no" activates/disables the use of this feature if this
+               source indicates support for it, while "force" will enable the
+               feature regardless of what the source indicates.
+               Defaults to the value of the option of the same name for a
+               specific index file defined in the
+               <option>Acquire::IndexTargets</option> scope, which itself
+               defaults to the value of configuration option
+               <option>Acquire::By-Hash</option> which defaults to
+               <literal>yes</literal>.
+         </para></listitem>
 
        </itemizedlist>
 
@@ -249,6 +265,20 @@ deb-src [ option1=value1 option2=value2 ] uri suite [component1] [component2] [.
        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.
+         </para></listitem>
+
          <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,
@@ -281,7 +311,7 @@ deb-src [ option1=value1 option2=value2 ] uri suite [component1] [component2] [.
          </para></listitem>
 
          <listitem><para><option>Valid-Until-Min</option>
-               (<option>check-valid-min</option>) and
+               (<option>valid-until-min</option>) and
                <option>Valid-Until-Max</option>
                (<option>valid-until-max</option>) can be used to raise or
                lower the time period in seconds in which the data from this