Merge branch 'feature/non-free-firmware' into 'main'

Support transition to new non-free-firmware component

See merge request apt-team/apt!282

2 files changed, 12 insertions, 1 deletions

diff --git a/doc/examples/apt-ftparchive.conf b/doc/examples/apt-ftparchive.conf
index 0e8bcb2ce..f3897ed40 100644
--- a/doc/examples/apt-ftparchive.conf
+++ b/doc/examples/apt-ftparchive.conf
@@ -38,6 +38,13 @@ BinDirectory "pool/non-free" {
 	Contents "dists/sid/non-free/Contents-i386";
 };
 
+// And this is (you guessed it) the same for the non-free-firmware section
+BinDirectory "pool/non-free-firmware" {
+	Packages "dists/sid/non-free-firmware/binary-i386/Packages";
+	Sources "dists/sid/non-free-firmware/source/Sources";
+	Contents "dists/sid/non-free-firmware/Contents-i386";
+};
+
 // By default all Packages should have the extension ".deb"
 Default {
 	Packages {
diff --git a/doc/examples/configure-index b/doc/examples/configure-index
index b3deccaaf..beafbbcd4 100644
--- a/doc/examples/configure-index
+++ b/doc/examples/configure-index
@@ -123,7 +123,11 @@ APT
      Update
      {
         InteractiveReleaseInfoChanges "<BOOL>";
-        SourceListWarnings "<BOOL>";
+        SourceListWarnings "<BOOL>"
+        {
+           APTAuth "<BOOL>";
+           NonFreeFirmware "<BOOL>";
+        };
      };
   };