Adding upstream version 2.9.7.upstream/2.9.7

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

4 files changed, 9 insertions, 24 deletions

diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index b2b38f9..f415a0e 100644
--- a/doc/apt-verbatim.ent
+++ b/doc/apt-verbatim.ent
@@ -274,7 +274,7 @@
 ">
 
 <!-- this will be updated by 'prepare-release' -->
-<!ENTITY apt-product-version "2.9.6">
+<!ENTITY apt-product-version "2.9.7">
 
 <!-- (Code)names for various things used all over the place -->
 <!ENTITY debian-oldstable-codename "bullseye">
diff --git a/doc/examples/configure-index b/doc/examples/configure-index
index 6bcf8e3..72ce1fe 100644
--- a/doc/examples/configure-index
+++ b/doc/examples/configure-index
@@ -776,6 +776,8 @@ apt::key::masterkeyring "<STRING>";
 apt::key::archivekeyringuri "<STRING>";
 apt::key::net-update-enabled "<STRING>";
 apt::key::assert-pubkey-algo "<STRING>";
+apt::key::assert-pubkey-algo::next "<STRING>";
+apt::key::assert-pubkey-algo::future "<STRING>";
 
 apt::ftparchive::release::patterns "<LIST>";
 apt::ftparchive::release::validtime "<INT>";
diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index 84ac0e8..4779a0d 100644
--- a/doc/po/apt-doc.pot
+++ b/doc/po/apt-doc.pot
@@ -5,9 +5,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: apt-doc 2.9.6\n"
+"Project-Id-Version: apt-doc 2.9.7\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2024-07-02 20:27+0000\n"
+"POT-Creation-Date: 2024-07-30 04:29+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/doc/po/nl.po b/doc/po/nl.po
index f31bbcc..b9ecdb9 100644
--- a/doc/po/nl.po
+++ b/doc/po/nl.po
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: apt-doc 2.9.3\n"
+"Project-Id-Version: apt-doc 2.9.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2024-06-13 19:06+0000\n"
-"PO-Revision-Date: 2024-05-21 23:41+0200\n"
+"POT-Creation-Date: 2024-07-08 13:09+0000\n"
+"PO-Revision-Date: 2024-06-22 20:18+0200\n"
 "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n"
 "Language-Team: Debian Dutch l10n Team <debian-l10n-dutch@lists.debian.org>\n"
 "Language: nl\n"
@@ -5864,23 +5864,6 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
-#, fuzzy
-#| msgid ""
-#| "Like changelogs, snapshots can only be acquired if an URI is known from "
-#| "where to get them.  Preferable the Release file indicates this in a "
-#| "'Snapshots' field. If this isn't available the Label/Origin field of the "
-#| "Release file is used to check if a <literal>Acquire::Snapshots::URI::"
-#| "Label::<replaceable>LABEL</replaceable></literal> or <literal>Acquire::"
-#| "Snapshots::URI::Origin::<replaceable>ORIGIN</replaceable></literal> "
-#| "option exists and if so this value is taken. The value in the Release "
-#| "file can be overridden with <literal>Acquire::Snapshots::URI::Override::"
-#| "Label::<replaceable>LABEL</replaceable></literal> or <literal>Acquire::"
-#| "Snapshots::URI::Override::Origin::<replaceable>ORIGIN</replaceable></"
-#| "literal>.  The value should be a normal URI to a directory, except that "
-#| "the snapshot ID replaced with the placeholder <literal>@SNAPSHOTID</"
-#| "literal>.  The special value '<literal>no</literal>' is available for "
-#| "this option indicating that this source cannot be used to acquire "
-#| "snapshots from. Another source will be tried if available in this case."
 msgid ""
 "Like changelogs, snapshots can only be acquired if an URI is known from "
 "where to get them.  Preferable the Release file indicates this in a "
@@ -5911,7 +5894,7 @@ msgstr ""
 "replaceable></literal> of <literal>Acquire::Snapshots::URI::Override::"
 "Origin::<replaceable>ORIGINE</replaceable></literal>. De waarde ervan zou "
 "een normale URI naar een map moeten zijn, behalve dat het momentopname-ID "
-"vervangen wordt door de plaatshouder <literal>@SNAPSHOTID</literal>. De "
+"vervangen wordt door de plaatshouder <literal>@SNAPSHOTID@</literal>. De "
 "speciale waarde '<literal>no</literal>' kan gebruikt worden voor deze optie "
 "om aan te geven dat deze bron niet gebruikt kan worden om er momentopnames "
 "van op te halen. In dat geval zal een andere bron geprobeerd worden als die "