From 7f9ceaec776a597e9ff8451038d57dd75e1e6d18 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Thu, 30 May 2024 04:48:10 +0200
Subject: Merging upstream version 2.9.4.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 doc/apt-verbatim.ent         | 2 +-
 doc/examples/configure-index | 1 +
 doc/po/apt-doc.pot           | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'doc')

diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index aef0c3e..c462ecd 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.3">
+<!ENTITY apt-product-version "2.9.4">
 
 <!-- (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 c27a8f8..6bcf8e3 100644
--- a/doc/examples/configure-index
+++ b/doc/examples/configure-index
@@ -724,6 +724,7 @@ apt::solver::strict-pinning "<BOOL>";
 apt::solver::enqueue-common-dependencies "<BOOL>";
 apt::solver::upgrade "<BOOL>";
 apt::solver::remove "<BOOL>";
+apt::solver::removemanual "<BOOL>";
 apt::solver::install "<BOOL>";
 apt::keep-downloaded-packages "<BOOL>";
 apt::solver "<STRING>";
diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index 2578224..aab31f7 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.3\n"
+"Project-Id-Version: apt-doc 2.9.4\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2024-05-14 11:16+0000\n"
+"POT-Creation-Date: 2024-05-25 09:01+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"
-- 
cgit v1.2.3