15 files changed, 42 insertions, 24 deletions
diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml
index 520cfc126..3c1e90744 100644
--- a/doc/apt-get.8.xml
+++ b/doc/apt-get.8.xml
@@ -593,7 +593,7 @@
      <literal>label</literal>, <literal>codename</literal>, <literal>suite</literal>,
      <literal>version</literal> and <literal>defaultpin</literal>. See also &apt-preferences;.
 
-     Configuration Item: <literal>Acquire::AllowReleaseInfoChanges</literal>.</para></listitem>
+     Configuration Item: <literal>Acquire::AllowReleaseInfoChange</literal>.</para></listitem>
      </varlistentry>
 
      <varlistentry><term><option>--show-progress</option></term>
diff --git a/doc/apt-transport-https.1.xml b/doc/apt-transport-https.1.xml
index 1bad8578b..1327b0a16 100644
--- a/doc/apt-transport-https.1.xml
+++ b/doc/apt-transport-https.1.xml
@@ -38,7 +38,7 @@ a user but used by APT tools based on user configuration.</para>
 which, as indicated by the appended S, is wrapped in an encrypted layer known as
 Transport Layer Security (TLS) to provide end-to-end encryption.
 A sufficiently capable attacker can still observe the communication partners
-and deeper analyse of the encrypted communcation might still reveal important details.
+and deeper analyse of the encrypted communication might still reveal important details.
 An overview over available alternative transport methods is given in &sources-list;.</para>
 </refsect1>
 
diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index d7817cb79..a8aa0bf5e 100644
--- a/doc/apt-verbatim.ent
+++ b/doc/apt-verbatim.ent
@@ -93,6 +93,12 @@
   </citerefentry>"
 >
 
+<!ENTITY apt-transport-mirror "<citerefentry>
+    <refentrytitle><command>apt-transport-mirror</command></refentrytitle>
+    <manvolnum>1</manvolnum>
+  </citerefentry>"
+>
+
 <!ENTITY sources-list "<citerefentry>
     <refentrytitle><filename>sources.list</filename></refentrytitle>
     <manvolnum>5</manvolnum>
diff --git a/doc/examples/configure-index b/doc/examples/configure-index
index 3763aa900..4612f362e 100644
--- a/doc/examples/configure-index
+++ b/doc/examples/configure-index
@@ -416,6 +416,7 @@ Dir "<DIR>"
      dpkg-source "<PROGRAM_PATH>";
      dpkg-buildpackage "/usr/bin/dpkg-buildpackage";
      lz4 "<PROGRAM_PATH>";
+     zstd "<PROGRAM_PATH>";
      gzip "<PROGRAM_PATH>";
      xz "<PROGRAM_PATH>";
      bzip2 "<PROGRAM_PATH>";
diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index 036766a8c..2a9af09f4 100644
--- a/doc/po/apt-doc.pot
+++ b/doc/po/apt-doc.pot
@@ -1438,7 +1438,7 @@ msgid ""
 "<literal>codename</literal>, <literal>suite</literal>, "
 "<literal>version</literal> and <literal>defaultpin</literal>. See also "
 "&apt-preferences;.  Configuration Item: "
-"<literal>Acquire::AllowReleaseInfoChanges</literal>."
+"<literal>Acquire::AllowReleaseInfoChange</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -7235,7 +7235,7 @@ msgid ""
 "&apt-transport-http;), which, as indicated by the appended S, is wrapped in "
 "an encrypted layer known as Transport Layer Security (TLS) to provide "
 "end-to-end encryption.  A sufficiently capable attacker can still observe "
-"the communication partners and deeper analyse of the encrypted communcation "
+"the communication partners and deeper analyse of the encrypted communication "
 "might still reveal important details.  An overview over available "
 "alternative transport methods is given in &sources-list;."
 msgstr ""
diff --git a/doc/po/de.po b/doc/po/de.po
index 35e1a6de1..ce9664693 100644
--- a/doc/po/de.po
+++ b/doc/po/de.po
@@ -2010,7 +2010,7 @@ msgid ""
 "certain fields like <literal>origin</literal>, <literal>label</literal>, "
 "<literal>codename</literal>, <literal>suite</literal>, <literal>version</"
 "literal> and <literal>defaultpin</literal>. See also &apt-preferences;.  "
-"Configuration Item: <literal>Acquire::AllowReleaseInfoChanges</literal>."
+"Configuration Item: <literal>Acquire::AllowReleaseInfoChange</literal>."
 msgstr ""
 "Es existieren Spezialoptionen (<literal>--allow-releaseinfo-change-</"
 "literal><replaceable>Feld</replaceable>), um Änderungen nur für bestimmte "
@@ -2018,7 +2018,7 @@ msgstr ""
 "<literal>codename</literal>, <literal>suite</literal>, <literal>version</"
 "literal> und <literal>defaultpin</literal> zu erlauben. Siehe auch &apt-"
 "preferences;. Konfigurationselement: <literal>Acquire::"
-"AllowReleaseInfoChanges</literal>."
+"AllowReleaseInfoChange</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
@@ -10349,7 +10349,7 @@ msgid ""
 "http;), which, as indicated by the appended S, is wrapped in an encrypted "
 "layer known as Transport Layer Security (TLS) to provide end-to-end "
 "encryption.  A sufficiently capable attacker can still observe the "
-"communication partners and deeper analyse of the encrypted communcation "
+"communication partners and deeper analyse of the encrypted communication "
 "might still reveal important details.  An overview over available "
 "alternative transport methods is given in &sources-list;."
 msgstr ""
diff --git a/doc/po/es.po b/doc/po/es.po
index 1ade7d522..73028c8cf 100644
--- a/doc/po/es.po
+++ b/doc/po/es.po
@@ -2075,7 +2075,7 @@ msgid ""
 "certain fields like <literal>origin</literal>, <literal>label</literal>, "
 "<literal>codename</literal>, <literal>suite</literal>, <literal>version</"
 "literal> and <literal>defaultpin</literal>. See also &apt-preferences;.  "
-"Configuration Item: <literal>Acquire::AllowReleaseInfoChanges</literal>."
+"Configuration Item: <literal>Acquire::AllowReleaseInfoChange</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -10082,7 +10082,7 @@ msgid ""
 "http;), which, as indicated by the appended S, is wrapped in an encrypted "
 "layer known as Transport Layer Security (TLS) to provide end-to-end "
 "encryption.  A sufficiently capable attacker can still observe the "
-"communication partners and deeper analyse of the encrypted communcation "
+"communication partners and deeper analyse of the encrypted communication "
 "might still reveal important details.  An overview over available "
 "alternative transport methods is given in &sources-list;."
 msgstr ""
diff --git a/doc/po/fr.po b/doc/po/fr.po
index b7703c807..867391b53 100644
--- a/doc/po/fr.po
+++ b/doc/po/fr.po
@@ -2006,7 +2006,7 @@ msgid ""
 "certain fields like <literal>origin</literal>, <literal>label</literal>, "
 "<literal>codename</literal>, <literal>suite</literal>, <literal>version</"
 "literal> and <literal>defaultpin</literal>. See also &apt-preferences;.  "
-"Configuration Item: <literal>Acquire::AllowReleaseInfoChanges</literal>."
+"Configuration Item: <literal>Acquire::AllowReleaseInfoChange</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -10254,7 +10254,7 @@ msgid ""
 "http;), which, as indicated by the appended S, is wrapped in an encrypted "
 "layer known as Transport Layer Security (TLS) to provide end-to-end "
 "encryption.  A sufficiently capable attacker can still observe the "
-"communication partners and deeper analyse of the encrypted communcation "
+"communication partners and deeper analyse of the encrypted communication "
 "might still reveal important details.  An overview over available "
 "alternative transport methods is given in &sources-list;."
 msgstr ""
diff --git a/doc/po/it.po b/doc/po/it.po
index 42c9ab3f4..3ba6c6756 100644
--- a/doc/po/it.po
+++ b/doc/po/it.po
@@ -2044,7 +2044,7 @@ msgid ""
 "certain fields like <literal>origin</literal>, <literal>label</literal>, "
 "<literal>codename</literal>, <literal>suite</literal>, <literal>version</"
 "literal> and <literal>defaultpin</literal>. See also &apt-preferences;.  "
-"Configuration Item: <literal>Acquire::AllowReleaseInfoChanges</literal>."
+"Configuration Item: <literal>Acquire::AllowReleaseInfoChange</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -10239,7 +10239,7 @@ msgid ""
 "http;), which, as indicated by the appended S, is wrapped in an encrypted "
 "layer known as Transport Layer Security (TLS) to provide end-to-end "
 "encryption.  A sufficiently capable attacker can still observe the "
-"communication partners and deeper analyse of the encrypted communcation "
+"communication partners and deeper analyse of the encrypted communication "
 "might still reveal important details.  An overview over available "
 "alternative transport methods is given in &sources-list;."
 msgstr ""
diff --git a/doc/po/ja.po b/doc/po/ja.po
index 3666e8677..70ab3f40d 100644
--- a/doc/po/ja.po
+++ b/doc/po/ja.po
@@ -1979,7 +1979,7 @@ msgid ""
 "certain fields like <literal>origin</literal>, <literal>label</literal>, "
 "<literal>codename</literal>, <literal>suite</literal>, <literal>version</"
 "literal> and <literal>defaultpin</literal>. See also &apt-preferences;.  "
-"Configuration Item: <literal>Acquire::AllowReleaseInfoChanges</literal>."
+"Configuration Item: <literal>Acquire::AllowReleaseInfoChange</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -9852,7 +9852,7 @@ msgid ""
 "http;), which, as indicated by the appended S, is wrapped in an encrypted "
 "layer known as Transport Layer Security (TLS) to provide end-to-end "
 "encryption.  A sufficiently capable attacker can still observe the "
-"communication partners and deeper analyse of the encrypted communcation "
+"communication partners and deeper analyse of the encrypted communication "
 "might still reveal important details.  An overview over available "
 "alternative transport methods is given in &sources-list;."
 msgstr ""
diff --git a/doc/po/nl.po b/doc/po/nl.po
index 4e869a3d5..cd27f3446 100644
--- a/doc/po/nl.po
+++ b/doc/po/nl.po
@@ -2077,14 +2077,14 @@ msgid ""
 "certain fields like <literal>origin</literal>, <literal>label</literal>, "
 "<literal>codename</literal>, <literal>suite</literal>, <literal>version</"
 "literal> and <literal>defaultpin</literal>. See also &apt-preferences;.  "
-"Configuration Item: <literal>Acquire::AllowReleaseInfoChanges</literal>."
+"Configuration Item: <literal>Acquire::AllowReleaseInfoChange</literal>."
 msgstr ""
 "Er bestaan specialistische opties (<literal>--allow-releaseinfo-change-</"
 "literal><replaceable>veld</replaceable>) om enkel veranderingen toe te staan "
 "voor bepaalde velden, zoals <literal>origin</literal>, <literal>label</"
 "literal>, <literal>codename</literal>, <literal>suite</literal>, "
 "<literal>version</literal> en <literal>defaultpin</literal>. Zie ook &apt-"
-"preferences;. Configuratie-item: <literal>Acquire::AllowReleaseInfoChanges</"
+"preferences;. Configuratie-item: <literal>Acquire::AllowReleaseInfoChange</"
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -10475,7 +10475,7 @@ msgid ""
 "http;), which, as indicated by the appended S, is wrapped in an encrypted "
 "layer known as Transport Layer Security (TLS) to provide end-to-end "
 "encryption.  A sufficiently capable attacker can still observe the "
-"communication partners and deeper analyse of the encrypted communcation "
+"communication partners and deeper analyse of the encrypted communication "
 "might still reveal important details.  An overview over available "
 "alternative transport methods is given in &sources-list;."
 msgstr ""
diff --git a/doc/po/pl.po b/doc/po/pl.po
index 46513d19d..2f111b3e2 100644
--- a/doc/po/pl.po
+++ b/doc/po/pl.po
@@ -2084,7 +2084,7 @@ msgid ""
 "certain fields like <literal>origin</literal>, <literal>label</literal>, "
 "<literal>codename</literal>, <literal>suite</literal>, <literal>version</"
 "literal> and <literal>defaultpin</literal>. See also &apt-preferences;.  "
-"Configuration Item: <literal>Acquire::AllowReleaseInfoChanges</literal>."
+"Configuration Item: <literal>Acquire::AllowReleaseInfoChange</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -9239,7 +9239,7 @@ msgid ""
 "http;), which, as indicated by the appended S, is wrapped in an encrypted "
 "layer known as Transport Layer Security (TLS) to provide end-to-end "
 "encryption.  A sufficiently capable attacker can still observe the "
-"communication partners and deeper analyse of the encrypted communcation "
+"communication partners and deeper analyse of the encrypted communication "
 "might still reveal important details.  An overview over available "
 "alternative transport methods is given in &sources-list;."
 msgstr ""
diff --git a/doc/po/pt.po b/doc/po/pt.po
index d8d4c4b7a..af4c0b6f9 100644
--- a/doc/po/pt.po
+++ b/doc/po/pt.po
@@ -2018,7 +2018,7 @@ msgid ""
 "certain fields like <literal>origin</literal>, <literal>label</literal>, "
 "<literal>codename</literal>, <literal>suite</literal>, <literal>version</"
 "literal> and <literal>defaultpin</literal>. See also &apt-preferences;.  "
-"Configuration Item: <literal>Acquire::AllowReleaseInfoChanges</literal>."
+"Configuration Item: <literal>Acquire::AllowReleaseInfoChange</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -10018,7 +10018,7 @@ msgid ""
 "http;), which, as indicated by the appended S, is wrapped in an encrypted "
 "layer known as Transport Layer Security (TLS) to provide end-to-end "
 "encryption.  A sufficiently capable attacker can still observe the "
-"communication partners and deeper analyse of the encrypted communcation "
+"communication partners and deeper analyse of the encrypted communication "
 "might still reveal important details.  An overview over available "
 "alternative transport methods is given in &sources-list;."
 msgstr ""
diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po
index 56bab5079..3401ed857 100644
--- a/doc/po/pt_BR.po
+++ b/doc/po/pt_BR.po
@@ -1410,7 +1410,7 @@ msgid ""
 "certain fields like <literal>origin</literal>, <literal>label</literal>, "
 "<literal>codename</literal>, <literal>suite</literal>, <literal>version</"
 "literal> and <literal>defaultpin</literal>. See also &apt-preferences;.  "
-"Configuration Item: <literal>Acquire::AllowReleaseInfoChanges</literal>."
+"Configuration Item: <literal>Acquire::AllowReleaseInfoChange</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -7560,7 +7560,7 @@ msgid ""
 "http;), which, as indicated by the appended S, is wrapped in an encrypted "
 "layer known as Transport Layer Security (TLS) to provide end-to-end "
 "encryption.  A sufficiently capable attacker can still observe the "
-"communication partners and deeper analyse of the encrypted communcation "
+"communication partners and deeper analyse of the encrypted communication "
 "might still reveal important details.  An overview over available "
 "alternative transport methods is given in &sources-list;."
 msgstr ""
diff --git a/doc/sources.list.5.xml b/doc/sources.list.5.xml
index 75b5d94b9..e55c5b31e 100644
--- a/doc/sources.list.5.xml
+++ b/doc/sources.list.5.xml
@@ -409,6 +409,17 @@ deb-src [ option1=value1 option2=value2 ] uri suite [component1] [component2] [.
     alternative.</para></listitem>
     </varlistentry>
 
+    <varlistentry><term><command>mirror</command>, <command>mirror+<replaceable>scheme</replaceable></command> (&apt-transport-mirror;)</term>
+    <listitem><para>
+    The mirror scheme specifies the location of a mirrorlist. By default the
+    scheme used for the location is <literal>http</literal>, but any other
+    scheme can be used via <command>mirror+<replaceable>scheme</replaceable></command>.
+    The mirrorlist itself can contain many different URIs for mirrors the APT client
+    can transparently pick, choose and fallback between intended to help both
+    with distributing the load over the available mirrors and ensuring that
+    clients can acquire data even if some configured mirrors are not available.
+    </para></listitem>
+    </varlistentry>
 
     <varlistentry><term><command>file</command></term>
     <listitem><para>