summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-13 10:16:21 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-13 10:16:21 +0000
commitfedf85d612de15c1c1390ea36a1f5f72f142f166 (patch)
tree7981da5c0ddde0ba7f618c177726752a4c597067 /doc
parentReleasing progress-linux version 2.7.12-0.0~progress7.99u1. (diff)
downloadapt-fedf85d612de15c1c1390ea36a1f5f72f142f166.tar.xz
apt-fedf85d612de15c1c1390ea36a1f5f72f142f166.zip
Merging upstream version 2.7.13.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'doc')
-rw-r--r--doc/apt-verbatim.ent4
-rw-r--r--doc/examples/configure-index1
-rw-r--r--doc/po/apt-doc.pot4
3 files changed, 5 insertions, 4 deletions
diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index e2be283..1dabbe7 100644
--- a/doc/apt-verbatim.ent
+++ b/doc/apt-verbatim.ent
@@ -3,7 +3,7 @@
<!-- Some common paths.. -->
<!ENTITY docdir "/usr/share/doc/apt/">
<!ENTITY guidesdir "/usr/share/doc/apt-doc/">
-<!ENTITY configureindex "<filename>&docdir;examples/configure-index.gz</filename>">
+<!ENTITY configureindex "<filename>&docdir;examples/configure-index</filename>">
<!ENTITY aptconfdir "<filename>/etc/apt.conf</filename>">
<!ENTITY statedir "/var/lib/apt">
<!ENTITY cachedir "/var/cache/apt">
@@ -274,7 +274,7 @@
">
<!-- this will be updated by 'prepare-release' -->
-<!ENTITY apt-product-version "2.7.12">
+<!ENTITY apt-product-version "2.7.13">
<!-- (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 f37b769..da4998b 100644
--- a/doc/examples/configure-index
+++ b/doc/examples/configure-index
@@ -762,6 +762,7 @@ apt::key::gpgcommand "<STRING>";
apt::key::masterkeyring "<STRING>";
apt::key::archivekeyringuri "<STRING>";
apt::key::net-update-enabled "<STRING>";
+apt::key::assert-pubkey-algo "<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 17d7e4b..68bb766 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.7.12\n"
+"Project-Id-Version: apt-doc 2.7.13\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2024-02-20 18:39+0000\n"
+"POT-Creation-Date: 2024-02-28 18:50+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"