Record varying defaults based on cli-version, rather than binary

The --cli-version argument can be used to request a specific
CLI version. The default CLI version is the APT version for apt(8)
and 0 for the other apt-get tools.

2 files changed, 33 insertions, 0 deletions

diff --git a/doc/apt.ent b/doc/apt.ent
index 9034d2e66..9ac40e52a 100644
--- a/doc/apt.ent
+++ b/doc/apt.ent
@@ -79,6 +79,35 @@
      </varlistentry>
 
      <varlistentry>
+      <term><option>--cli-version</option></term>
+     <listitem><para>Requests a specific CLI version. This is a pattern that takes
+    a MAJOR.MINOR version. You may omit the MINOR version, in which case the latest
+    supported minor level will be used.
+     </para>
+     <para>
+     Version tracks are presented as follows: The version 3.2 has equivalent versions
+     0.32, 1.22, and 2.12, implementing new features for their specified major versions.
+     </para>
+     <para>
+     A special case is the X.9 version pattern: A version like 2.9 is followed by 3.0,
+     but 2.10 follows directly on 2.8; given that we use odd version numbers as development
+     series (2.9 is the 3.0 development series).
+     </para>
+     <para>
+     This feature has been introduced in APT 3.1.10, and replaces the binary-specific
+configuration. You may use the <option>APT::Version</option> to similar effect on older
+binaries, for example, use <option>-o APT::Version=2</option> to make &apt; behave like
+the 2.x series.
+     </para>
+     <para>
+     The default value is the current APT version for &apt; and <literal>0.(10 * major + minor)</literal>
+     for the classic commands. The 0.X series is soft-deprecated and the other commands will
+     roll over to the 2.x series in the future.
+     </para>
+     </listitem>
+     </varlistentry>
+
+     <varlistentry>
       <term><option>--no-color</option></term>
       <term><option>--color</option></term>
 <listitem><para>Turn colors on or off. Colors are on by default on supported terminals for &apt; and
diff --git a/doc/examples/configure-index b/doc/examples/configure-index
index 65b5032bc..1b050d0b9 100644
--- a/doc/examples/configure-index
+++ b/doc/examples/configure-index
@@ -237,6 +237,8 @@ APT
   Periodic {};
 
   Machine-ID "<STRING>"; // Value of /etc/machine-id
+
+  Version "<STRING>"; // Version of behavior requested
 };
 
 // Options for the downloading routines
@@ -913,3 +915,5 @@ update-manager::always-include-phased-updates "<BOOL>";
 update-manager::never-include-phased-updates "<BOOL>";
 
 apt::history::comment "<STRING>";
+
+interactive "<BOOL>";