Release 1.9.5

author: Julian Andres Klode <julian.klode@canonical.com> 2019-12-02 18:18:57 +0100
committer: Julian Andres Klode <julian.klode@canonical.com> 2019-12-02 18:18:57 +0100
commit: 5a98b531f7afcd34367b46ac9e0c7bfe151d6999 (patch)
tree: efe8c1c97a4e992b6df4f22ba33120ffc46d4aa8 /doc
parent: 878861d35c8a97823b7cecc7e47d6850a5394d8b (diff)
13 files changed, 1668 insertions, 79 deletions
diff --git a/doc/apt-patterns.7.xml b/doc/apt-patterns.7.xml
index 219d2c209..b94a9b226 100644
--- a/doc/apt-patterns.7.xml
+++ b/doc/apt-patterns.7.xml
@@ -13,7 +13,7 @@
    &apt-email;
    &apt-product;
    <!-- The last update date -->
-   <date>2019-08-15T00:00:00Z</date>
+   <date>2019-11-26T00:00:00Z</date>
  </refentryinfo>
 
  <refmeta>
diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index 790890ce3..6fce0d257 100644
--- a/doc/apt-verbatim.ent
+++ b/doc/apt-verbatim.ent
@@ -268,7 +268,7 @@
 ">
 
 <!-- this will be updated by 'prepare-release' -->
-<!ENTITY apt-product-version "1.9.4">
+<!ENTITY apt-product-version "1.9.5">
 
 <!-- (Code)names for various things used all over the place -->
 <!ENTITY debian-oldstable-codename "stretch">
diff --git a/doc/apt_auth.conf.5.xml b/doc/apt_auth.conf.5.xml
index 99394be00..5eee43ef4 100644
--- a/doc/apt_auth.conf.5.xml
+++ b/doc/apt_auth.conf.5.xml
@@ -13,7 +13,7 @@
    &apt-email;
    &apt-product;
    <!-- The last update date -->
-   <date>2018-12-03T00:00:00Z</date>
+   <date>2019-12-02T00:00:00Z</date>
  </refentryinfo>
 
  <refmeta>
diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index b73458633..9cf6d5b19 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 1.9.4\n"
+"Project-Id-Version: apt-doc 1.9.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2019-09-19 11:14+0200\n"
+"POT-Creation-Date: 2019-12-02 18:18+0100\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"
@@ -6976,7 +6976,7 @@ msgstr ""
 #: apt_auth.conf.5.xml
 msgid ""
 "<literal>machine</literal> "
-"<replaceable>hostname</replaceable>[:<replaceable>port</replaceable>][/<replaceable>path</replaceable>]"
+"<replaceable>[protocol://]</replaceable><replaceable>hostname</replaceable>[:<replaceable>port</replaceable>][/<replaceable>path</replaceable>]"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -6994,6 +6994,11 @@ msgid ""
 "<emphasis><literal>machine</literal></emphasis> token is encountered."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt_auth.conf.5.xml
+msgid "If protocol is not specified, the entry only matches https and tor+https."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt_auth.conf.5.xml
 msgid "<literal>login</literal> <replaceable>name</replaceable>"
@@ -7022,13 +7027,13 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para><literallayout>
 #: apt_auth.conf.5.xml
 #, no-wrap
-msgid "deb http://example.org/debian &debian-stable-codename; main"
+msgid "deb https://example.org/debian &debian-stable-codename; main"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
 #: apt_auth.conf.5.xml
 #, no-wrap
-msgid "deb http://apt:debian@example.org/debian &debian-stable-codename; main"
+msgid "deb https://apt:debian@example.org/debian &debian-stable-codename; main"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
@@ -7059,7 +7064,7 @@ msgstr ""
 #: apt_auth.conf.5.xml
 #, no-wrap
 msgid ""
-"machine example.org:80 login apt password debian\n"
+"machine example.org:443 login apt password debian\n"
 "machine example.org/deb/ login apt password debian\n"
 "machine example.org/ubuntu login apt password debian\n"
 "machine example.orga login apt password debian\n"
@@ -7097,6 +7102,15 @@ msgid ""
 "the <literal>machine</literal> token."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><para>
+#: apt_auth.conf.5.xml
+msgid ""
+"Login information in auth.conf are more flexible than those in "
+"sources.list. For example, login information can be specified for parts of a "
+"repository only, or if the sources.list entry redirects elsewhere, login "
+"information for the redirect destination can be supplied."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt_auth.conf.5.xml
 msgid "<filename>/etc/apt/auth.conf</filename>"
@@ -7804,6 +7818,54 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-patterns.7.xml
+msgid "Narrowing patterns"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-patterns.7.xml
+msgid "<code>?all-versions(PATTERN)</code>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-patterns.7.xml
+msgid ""
+"Selects packages where all versions match PATTERN. When matching versions "
+"instead, same as PATTERN."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-patterns.7.xml
+msgid "<code>?any-version(PATTERN)</code>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-patterns.7.xml
+msgid "Selects any version where the pattern matches on the version."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-patterns.7.xml
+msgid ""
+"For example, while <code>?and(?version(1),?version(2))</code> matches a "
+"package which has one version containing 1 and one version containing 2, "
+"<code>?any-version(?and(?version(1),?version(2)))</code> restricts the "
+"<code>?and</code> to act on the same version."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-patterns.7.xml
+msgid "<code>?narrow(PATTERN...)</code>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-patterns.7.xml
+msgid ""
+"Selects any version matching all PATTERNs, short "
+"for<code>?any-version(?and(PATTERN...))</code>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt-patterns.7.xml
 msgid "Package patterns"
 msgstr ""
 
@@ -7939,6 +8001,88 @@ msgid ""
 "something depends on that name."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><title>
+#: apt-patterns.7.xml
+msgid "Version patterns"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-patterns.7.xml
+msgid "These patterns select specific versions of a package."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-patterns.7.xml
+msgid "<code>?archive(REGEX)</code>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-patterns.7.xml
+msgid ""
+"Selects versions that come from the archive that matches the specified "
+"regular expression. Archive, here, means the values after <code>a=</code> in "
+"<command>apt-cache policy</command>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-patterns.7.xml
+msgid "<code>?origin(REGEX)</code>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-patterns.7.xml
+msgid ""
+"Selects versions that come from the origin that matches the specified "
+"regular expression. Origin, here, means the values after <code>o=</code> in "
+"<command>apt-cache policy</command>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-patterns.7.xml
+msgid "<code>?section(REGEX)</code>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-patterns.7.xml
+msgid "Selects versions where the section matches the specified regular expression."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-patterns.7.xml
+msgid "<code>?source-package(REGEX)</code>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-patterns.7.xml
+msgid ""
+"Selects versions where the source package name matches the specified regular "
+"expression."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-patterns.7.xml
+msgid "<code>?source-version(REGEX)</code>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-patterns.7.xml
+msgid ""
+"Selects versions where the source package version matches the specified "
+"regular expression."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-patterns.7.xml
+msgid "<code>?version(REGEX)</code>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-patterns.7.xml
+msgid ""
+"Selects versions where the version string matching the specified regular "
+"expression."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-patterns.7.xml
 msgid "<code>apt remove ?garbage</code>"
@@ -8015,6 +8159,11 @@ msgstr ""
 msgid "A trailing comma is allowed in argument lists"
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
+#: apt-patterns.7.xml
+msgid "?narrow accepts infinite arguments"
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><para>
 #: apt-patterns.7.xml
 msgid "&apt-get;, &apt;"
diff --git a/doc/po/de.po b/doc/po/de.po
index 1c4ccbaa1..948748b02 100644
--- a/doc/po/de.po
+++ b/doc/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 1.9.2\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2019-09-13 10:38+0200\n"
+"POT-Creation-Date: 2019-12-02 18:18+0100\n"
 "PO-Revision-Date: 2019-08-15 10:22+0200\n"
 "Last-Translator: Chris Leick <c.leick@vollbio.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -9992,9 +9992,14 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt_auth.conf.5.xml
+#, fuzzy
+#| msgid ""
+#| "<literal>machine</literal> <replaceable>hostname</replaceable>[:"
+#| "<replaceable>port</replaceable>][/<replaceable>path</replaceable>]"
 msgid ""
-"<literal>machine</literal> <replaceable>hostname</replaceable>[:"
-"<replaceable>port</replaceable>][/<replaceable>path</replaceable>]"
+"<literal>machine</literal> <replaceable>[protocol://]</"
+"replaceable><replaceable>hostname</replaceable>[:<replaceable>port</"
+"replaceable>][/<replaceable>path</replaceable>]"
 msgstr ""
 "<literal>machine</literal> <replaceable>Rechnername</replaceable>[:"
 "<replaceable>Port</replaceable>][/<replaceable>Pfad</replaceable>]"
@@ -10025,6 +10030,12 @@ msgstr ""
 "Kürzel verarbeitet. Dies endet, wenn das Dateiende erreicht wurde oder ein "
 "anderes <emphasis><literal>machine</literal></emphasis>-Kürzel auftritt."
 
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt_auth.conf.5.xml
+msgid ""
+"If protocol is not specified, the entry only matches https and tor+https."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt_auth.conf.5.xml
 msgid "<literal>login</literal> <replaceable>name</replaceable>"
@@ -10052,14 +10063,16 @@ msgstr "Beispiel"
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
 #: apt_auth.conf.5.xml
-#, no-wrap
-msgid "deb http://example.org/debian &debian-stable-codename; main"
+#, fuzzy, no-wrap
+#| msgid "deb http://example.org/debian &debian-stable-codename; main"
+msgid "deb https://example.org/debian &debian-stable-codename; main"
 msgstr "deb http://example.org/debian &debian-stable-codename; main"
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
 #: apt_auth.conf.5.xml
-#, no-wrap
-msgid "deb http://apt:debian@example.org/debian &debian-stable-codename; main"
+#, fuzzy, no-wrap
+#| msgid "deb http://apt:debian@example.org/debian &debian-stable-codename; main"
+msgid "deb https://apt:debian@example.org/debian &debian-stable-codename; main"
 msgstr "deb http://apt:debian@example.org/debian &debian-stable-codename; main"
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
@@ -10094,9 +10107,15 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
 #: apt_auth.conf.5.xml
-#, no-wrap
-msgid ""
-"machine example.org:80 login apt password debian\n"
+#, fuzzy, no-wrap
+#| msgid ""
+#| "machine example.org:80 login apt password debian\n"
+#| "machine example.org/deb/ login apt password debian\n"
+#| "machine example.org/ubuntu login apt password debian\n"
+#| "machine example.orga login apt password debian\n"
+#| "machine example.net login apt password debian\n"
+msgid ""
+"machine example.org:443 login apt password debian\n"
 "machine example.org/deb/ login apt password debian\n"
 "machine example.org/ubuntu login apt password debian\n"
 "machine example.orga login apt password debian\n"
@@ -10158,6 +10177,15 @@ msgstr ""
 "falls Sie aber mehrere benötigen, sollte für alle ein Pfad im "
 "<literal>machine</literal>-Kürzel angegeben werden."
 
+#. type: Content of: <refentry><refsect1><para>
+#: apt_auth.conf.5.xml
+msgid ""
+"Login information in auth.conf are more flexible than those in sources.list. "
+"For example, login information can be specified for parts of a repository "
+"only, or if the sources.list entry redirects elsewhere, login information "
+"for the redirect destination can be supplied."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt_auth.conf.5.xml
 msgid "<filename>/etc/apt/auth.conf</filename>"
@@ -11187,6 +11215,54 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-patterns.7.xml
+msgid "Narrowing patterns"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-patterns.7.xml
+msgid "<code>?all-versions(PATTERN)</code>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-patterns.7.xml
+msgid ""
+"Selects packages where all versions match PATTERN. When matching versions "
+"instead, same as PATTERN."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-patterns.7.xml
+msgid "<code>?any-version(PATTERN)</code>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-patterns.7.xml
+msgid "Selects any version where the pattern matches on the version."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-patterns.7.xml
+msgid ""
+"For example, while <code>?and(?version(1),?version(2))</code> matches a "
+"package which has one version containing 1 and one version containing 2, "
+"<code>?any-version(?and(?version(1),?version(2)))</code> restricts the "
+"<code>?and</code> to act on the same version."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-patterns.7.xml
+msgid "<code>?narrow(PATTERN...)</code>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-patterns.7.xml
+msgid ""
+"Selects any version matching all PATTERNs, short for<code>?any-version(?"
+"and(PATTERN...))</code>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt-patterns.7.xml
 msgid "Package patterns"
 msgstr ""
 
@@ -11322,6 +11398,91 @@ msgid ""
 "something depends on that name."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><title>
+#: apt-patterns.7.xml
+#, fuzzy
+#| msgid "Version &apt-product-version;"
+msgid "Version patterns"
+msgstr "Version &apt-product-version;"
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-patterns.7.xml
+msgid "These patterns select specific versions of a package."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-patterns.7.xml
+msgid "<code>?archive(REGEX)</code>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-patterns.7.xml
+msgid ""
+"Selects versions that come from the archive that matches the specified "
+"regular expression. Archive, here, means the values after <code>a=</code> in "
+"<command>apt-cache policy</command>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-patterns.7.xml
+msgid "<code>?origin(REGEX)</code>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-patterns.7.xml
+msgid ""
+"Selects versions that come from the origin that matches the specified "
+"regular expression. Origin, here, means the values after <code>o=</code> in "
+"<command>apt-cache policy</command>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-patterns.7.xml
+msgid "<code>?section(REGEX)</code>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-patterns.7.xml
+msgid ""
+"Selects versions where the section matches the specified regular expression."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-patterns.7.xml
+msgid "<code>?source-package(REGEX)</code>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-patterns.7.xml
+msgid ""
+"Selects versions where the source package name matches the specified regular "
+"expression."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-patterns.7.xml
+msgid "<code>?source-version(REGEX)</code>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-patterns.7.xml
+msgid ""
+"Selects versions where the source package version matches the specified "
+"regular expression."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-patterns.7.xml
+msgid "<code>?version(REGEX)</code>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-patterns.7.xml
+msgid ""
+"Selects versions where the version string matching the specified regular "
+"expression."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-patterns.7.xml
 msgid "<code>apt remove ?garbage</code>"
@@ -11398,6 +11559,11 @@ msgstr ""
 msgid "A trailing comma is allowed in argument lists"
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
+#: apt-patterns.7.xml
+msgid "?narrow accepts infinite arguments"
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><para>
 #: apt-patterns.7.xml
 #, fuzzy
diff --git a/doc/po/es.po b/doc/po/es.po
index 6ed290322..669ca01fb 100644
--- a/doc/po/es.po
+++ b/doc/po/es.po
@@ -38,7 +38,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2019-08-19 16:22+0200\n"
+"POT-Creation-Date: 2019-12-02 18:18+0100\n"
 "PO-Revision-Date: 2014-07-04 01:31+0200\n"
 "Last-Translator: Omar Campagne <ocampagne@gmail.com>\n"
 "Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -9761,8 +9761,9 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt_auth.conf.5.xml
 msgid ""
-"<literal>machine</literal> <replaceable>hostname</replaceable>[:"
-"<replaceable>port</replaceable>][/<replaceable>path</replaceable>]"
+"<literal>machine</literal> <replaceable>[protocol://]</"
+"replaceable><replaceable>hostname</replaceable>[:<replaceable>port</"
+"replaceable>][/<replaceable>path</replaceable>]"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -9780,6 +9781,12 @@ msgid ""
 "emphasis> token is encountered."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt_auth.conf.5.xml
+msgid ""
+"If protocol is not specified, the entry only matches https and tor+https."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt_auth.conf.5.xml
 #, fuzzy
@@ -9815,14 +9822,14 @@ msgstr "Ejemplos"
 #: apt_auth.conf.5.xml
 #, fuzzy, no-wrap
 #| msgid "deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib"
-msgid "deb http://example.org/debian &debian-stable-codename; main"
+msgid "deb https://example.org/debian &debian-stable-codename; main"
 msgstr "deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib"
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
 #: apt_auth.conf.5.xml
 #, fuzzy, no-wrap
 #| msgid "deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib"
-msgid "deb http://apt:debian@example.org/debian &debian-stable-codename; main"
+msgid "deb https://apt:debian@example.org/debian &debian-stable-codename; main"
 msgstr "deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib"
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
@@ -9853,7 +9860,7 @@ msgstr ""
 #: apt_auth.conf.5.xml
 #, no-wrap
 msgid ""
-"machine example.org:80 login apt password debian\n"
+"machine example.org:443 login apt password debian\n"
 "machine example.org/deb/ login apt password debian\n"
 "machine example.org/ubuntu login apt password debian\n"
 "machine example.orga login apt password debian\n"
@@ -9891,6 +9898,15 @@ msgid ""
 "the <literal>machine</literal> token."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><para>
+#: apt_auth.conf.5.xml
+msgid ""
+"Login information in auth.conf are more flexible than those in sources.list. "
+"For example, login information can be specified for parts of a repository "
+"only, or if the sources.list entry redirects elsewhere, login information "
+"for the redirect destination can be supplied."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt_auth.conf.5.xml
 #, fuzzy
@@ -10683,6 +10699,54 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-patterns.7.xml
+msgid "Narrowing patterns"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-patterns.7.xml
+msgid "<code>?all-versions(PATTERN)</code>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-patterns.7.xml
+msgid ""
+"Selects packages where all versions match PATTERN. When matching versions "
+"instead, same as PATTERN."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-patterns.7.xml
+msgid "<code>?any-version(PATTERN)</code>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-patterns.7.xml
+msgid "Selects any version where the pattern matches on the version."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-patterns.7.xml
+msgid ""
+"For example, while <code>?and(?version(1),?version(2))</code> matches a "
+"package which has one version containing 1 and one version containing 2, "
+"<code>?any-version(?and(?version(1),?version(2)))</code> restricts the "
+"<code>?and</code> to act on the same version."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-patterns.7.xml
+msgid "<code>?narrow(PATTERN...)</code>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-patterns.7.xml
+msgid ""
+"Selects any version matching all PATTERNs, short for<code>?any-version(?"
+"and(PATTERN...))</code>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt-patterns.7.xml
 msgid "Package patterns"
 msgstr ""
 
@@ -10818,6 +10882,89 @@ msgid ""
 "something depends on that name."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><title>
+#: apt-patterns.7.xml
+msgid "Version patterns"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-patterns.7.xml
+msgid "These patterns select specific versions of a package."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-patterns.7.xml
+msgid "<code>?archive(REGEX)</code>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-patterns.7.xml
+msgid ""
+"Selects versions that come from the archive that matches the specified "
+"regular expression. Archive, here, means the values after <code>a=</code> in "
+"<command>apt-cache policy</command>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-patterns.7.xml
+msgid "<code>?origin(REGEX)</code>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-patterns.7.xml
+msgid ""
+"Selects versions that come from the origin that matches the specified "
+"regular expression. Origin, here, means the values after <code>o=</code> in "
+"<command>apt-cache policy</command>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-patterns.7.xml
+msgid "<code>?section(REGEX)</code>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-patterns.7.xml
+msgid ""
+"Selects versions where the section matches the specified regular expression."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-patterns.7.xml
+msgid "<code>?source-package(REGEX)</code>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-patterns.7.xml
+msgid ""
+"Selects versions where the source package name matches the specified regular "
+"expression."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-patterns.7.xml
+msgid "<code>?source-version(REGEX)</code>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-patterns.7.xml
+msgid ""
+"Selects versions where the source package version matches the specified "
+"regular expression."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-patterns.7.xml
+msgid "<code>?version(REGEX)</code>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-patterns.7.xml
+msgid ""
+"Selects versions where the version string matching the specified regular "
+"expression."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-patterns.7.xml
 msgid "<code>apt remove ?garbage</code>"
@@ -10894,6 +11041,11 @@ msgstr ""
 msgid "A trailing comma is allowed in argument lists"
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
+#: apt-patterns.7.xml
+msgid "?narrow accepts infinite arguments"
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><para>
 #: apt-patterns.7.xml
 #, fuzzy
diff --git a/doc/po/fr.po b/doc/po/fr.po
index 3ba1b5c34..38b68a71e 100644
--- a/doc/po/fr.po
+++ b/doc/po/fr.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 1.8.0\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2019-08-19 16:22+0200\n"
+"POT-Creation-Date: 2019-12-02 18:18+0100\n"
 "PO-Revision-Date: 2019-05-01 17:00+0100\n"
 "Last-Translator: Jean-Pierre Giraud <jean-pierregiraud@neuf.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -9941,9 +9941,14 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt_auth.conf.5.xml
+#, fuzzy
+#| msgid ""
+#| "<literal>machine</literal> <replaceable>hostname</replaceable>[:"
+#| "<replaceable>port</replaceable>][/<replaceable>path</replaceable>]"
 msgid ""
-"<literal>machine</literal> <replaceable>hostname</replaceable>[:"
-"<replaceable>port</replaceable>][/<replaceable>path</replaceable>]"
+"<literal>machine</literal> <replaceable>[protocol://]</"
+"replaceable><replaceable>hostname</replaceable>[:<replaceable>port</"
+"replaceable>][/<replaceable>path</replaceable>]"
 msgstr ""
 "<literal>machine</literal> <replaceable>nom d'hôte</replaceable>[:"
 "<replaceable>port</replaceable>][/<replaceable>chemin</replaceable>]"
@@ -9975,6 +9980,12 @@ msgstr ""
 "lorsque la fin du fichier est atteinte ou qu'un autre jeton de "
 "<emphasis><literal>machine</literal></emphasis> est rencontré."
 
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt_auth.conf.5.xml
+msgid ""
+"If protocol is not specified, the entry only matches https and tor+https."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt_auth.conf.5.xml
 msgid "<literal>login</literal> <replaceable>name</replaceable>"
@@ -10002,14 +10013,16 @@ msgstr "Exemple"
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
 #: apt_auth.conf.5.xml
-#, no-wrap
-msgid "deb http://example.org/debian &debian-stable-codename; main"
+#, fuzzy, no-wrap
+#| msgid "deb http://example.org/debian &debian-stable-codename; main"
+msgid "deb https://example.org/debian &debian-stable-codename; main"
 msgstr "deb http://example.org/debian &debian-stable-codename; main"
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
 #: apt_auth.conf.5.xml
-#, no-wrap
-msgid "deb http://apt:debian@example.org/debian &debian-stable-codename; main"
+#, fuzzy, no-wrap
+#| msgid "deb http://apt:debian@example.org/debian &debian-stable-codename; main"
+msgid "deb https://apt:debian@example.org/debian &debian-stable-codename; main"
 msgstr "deb http://apt:debian@example.org/debian &debian-stable-codename; main"
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
@@ -10044,9 +10057,15 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
 #: apt_auth.conf.5.xml
-#, no-wrap
-msgid ""
-"machine example.org:80 login apt password debian\n"
+#, fuzzy, no-wrap
+#| msgid ""
+#| "machine example.org:80 login apt password debian\n"
+#| "machine example.org/deb/ login apt password debian\n"
+#| "machine example.org/ubuntu login apt password debian\n"
+#| "machine example.orga login apt password debian\n"
+#| "machine example.net login apt password debian\n"
+msgid ""
+"machine example.org:443 login apt password debian\n"
 "machine example.org/deb/ login apt password debian\n"
 "machine example.org/ubuntu login apt password debian\n"
 "machine example.orga login apt password debian\n"
@@ -10107,6 +10126,15 @@ msgstr ""
 "nom d'hôte, mais si vous devez en avoir plusieurs, il faudrait qu'un chemin "
 "soit précisé dans le jeton de <literal>machine</literal>."
 
+#. type: Content of: <refentry><refsect1><para>
+#: apt_auth.conf.5.xml
+msgid ""
+"Login information in auth.conf are more flexible than those in sources.list. "
+"For example, login information can be specified for parts of a repository "
+"only, or if the sources.list entry redirects elsewhere, login information "
+"for the redirect destination can be supplied."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt_auth.conf.5.xml
 msgid "<filename>/etc/apt/auth.conf</filename>"
@@ -11121,6 +11149,54 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-patterns.7.xml
+msgid "Narrowing patterns"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-patterns.7.xml
+msgid "<code>?all-versions(PATTERN)</code>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-patterns.7.xml
+msgid ""
+"Selects packages where all versions match PATTERN. When matching versions "
+"instead, same as PATTERN."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-patterns.7.xml
+msgid "<code>?any-version(PATTERN)</code>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-patterns.7.xml
+msgid "Selects any version where the pattern matches on the version."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-patterns.7.xml
+msgid ""
+"For example, while <code>?and(?version(1),?version(2))</code> matches a "
+"package which has one version containing 1 and one version containing 2, "
+"<code>?any-version(?and(?version(1),?version(2)))</code> restricts the "
+"<code>?and</code> to act on the same version."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-patterns.7.xml
+msgid "<code>?narrow(PATTERN...)</code>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-patterns.7.xml
+msgid ""
+"Selects any version matching all PATTERNs, short for<code>?any-version(?"
+"and(PATTERN...))</code>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt-patterns.7.xml
 msgid "Package patterns"
 msgstr ""
 
@@ -11256,6 +11332,91 @@ msgid ""
 "something depends on that name."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><title>
+#: apt-patterns.7.xml
+#, fuzzy
+#| msgid "Version &apt-product-version;"
+msgid "Version patterns"
+msgstr "Version &apt-product-version;"
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-patterns.7.xml
+msgid "These patterns select specific versions of a package."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-patterns.7.xml
+msgid "<code>?archive(REGEX)</code>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-patterns.7.xml
+msgid ""
+"Selects versions that come from the archive that matches the specified "
+"regular expression. Archive, here, means the values after <code>a=</code> in "
+"<command>apt-cache policy</command>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-patterns.7.xml
+msgid "<code>?origin(REGEX)</code>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-patterns.7.xml
+msgid ""
+"Selects versions that come from the origin that matches the specified "
+"regular expression. Origin, here, means the values after <code>o=</code> in "
+"<command>apt-cache policy</command>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-patterns.7.xml
+msgid "<code>?section(REGEX)</code>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-patterns.7.xml
+msgid ""
+"Selects versions where the section matches the specified regular expression."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-patterns.7.xml
+msgid "<code>?source-package(REGEX)</code>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-patterns.7.xml
+msgid ""
+"Selects versions where the source package name matches the specified regular "
+"expression."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-patterns.7.xml
+msgid "<code>?source-version(REGEX)</code>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-patterns.7.xml
+msgid ""
+"Selects versions where the source package version matches the specified "
+"regular expression."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-patterns.7.xml
+msgid "<code>?version(REGEX)</code>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-patterns.7.xml
+msgid ""
+"Selects versions where the version string matching the specified regular "
+"expression."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-patterns.7.xml
 msgid "<code>apt remove ?garbage</code>"
@@ -11332,6 +11493,11 @@ msgstr ""
 msgid "A trailing comma is allowed in argument lists"
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
+#: apt-patterns.7.xml
+msgid "?narrow accepts infinite arguments"
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><para>
 #: apt-patterns.7.xml
 #, fuzzy
diff --git a/doc/po/it.po b/doc/po/it.po
index 6cb1358be..daff003ef 100644
--- a/doc/po/it.po
+++ b/doc/po/it.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2019-08-19 16:22+0200\n"
+"POT-Creation-Date: 2019-12-02 18:18+0100\n"
 "PO-Revision-Date: 2017-03-27 19:05+0200\n"
 "Last-Translator: Beatrice Torracca <beatricet@libero.it>\n"
 "Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n"
@@ -9905,8 +9905,9 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt_auth.conf.5.xml
 msgid ""
-"<literal>machine</literal> <replaceable>hostname</replaceable>[:"
-"<replaceable>port</replaceable>][/<replaceable>path</replaceable>]"
+"<literal>machine</literal> <replaceable>[protocol://]</"
+"replaceable><replaceable>hostname</replaceable>[:<replaceable>port</"
+"replaceable>][/<replaceable>path</replaceable>]"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -9924,6 +9925,12 @@ msgid ""
 "emphasis> token is encountered."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt_auth.conf.5.xml
+msgid ""
+"If protocol is not specified, the entry only matches https and tor+https."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt_auth.conf.5.xml
 #, fuzzy
@@ -9959,14 +9966,14 @@ msgstr "Esempi"
 #: apt_auth.conf.5.xml
 #, fuzzy, no-wrap
 #| msgid "deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib"
-msgid "deb http://example.org/debian &debian-stable-codename; main"
+msgid "deb https://example.org/debian &debian-stable-codename; main"
 msgstr "deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib"
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
 #: apt_auth.conf.5.xml
 #, fuzzy, no-wrap
 #| msgid "deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib"
-msgid "deb http://apt:debian@example.org/debian &debian-stable-codename; main"
+msgid "deb https://apt:debian@example.org/debian &debian-stable-codename; main"
 msgstr "deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib"
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
@@ -9997,7 +10004,7 @@ msgstr ""
 #: apt_auth.conf.5.xml
 #, no-wrap
 msgid ""
-"machine example.org:80 login apt password debian\n"
+"machine example.org:443 login apt password debian\n"
 "machine example.org/deb/ login apt password debian\n"
 "machine example.org/ubuntu login apt password debian\n"
 "machine example.orga login apt password debian\n"
@@ -10035,6 +10042,15 @@ msgid ""
 "the <literal>machine</literal> token."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><para>
+#: apt_auth.conf.5.xml
+msgid ""
+"Login information in auth.conf are more flexible than those in sources.list. "
+"For example, login information can be specified for parts of a repository "
+"only, or if the sources.list entry redirects elsewhere, login information "
+"for the redirect destination can be supplied."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt_auth.conf.5.xml
 #, fuzzy
@@ -10861,6 +10877,58 @@ msgstr ""
 #: apt-patterns.7.xml
 #, fuzzy
 #| msgid "Packages"
+msgid "Narrowing patterns"
+msgstr "Packages"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-patterns.7.xml
+#, fuzzy
+#| msgid "<option>--installed</option>"
+msgid "<code>?all-versions(PATTERN)</code>"
+msgstr "<option>--installed</option>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-patterns.7.xml
+msgid ""
+"Selects packages where all versions match PATTERN. When matching versions "
+"instead, same as PATTERN."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-patterns.7.xml
+msgid "<code>?any-version(PATTERN)</code>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-patterns.7.xml
+msgid "Selects any version where the pattern matches on the version."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-patterns.7.xml
+msgid ""
+"For example, while <code>?and(?version(1),?version(2))</code> matches a "
+"package which has one version containing 1 and one version containing 2, "
+"<code>?any-version(?and(?version(1),?version(2)))</code> restricts the "
+"<code>?and</code> to act on the same version."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-patterns.7.xml
+msgid "<code>?narrow(PATTERN...)</code>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-patterns.7.xml
+msgid ""
+"Selects any version matching all PATTERNs, short for<code>?any-version(?"
+"and(PATTERN...))</code>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt-patterns.7.xml
+#, fuzzy
+#| msgid "Packages"
 msgid "Package patterns"
 msgstr "Packages"
 
@@ -10998,6 +11066,99 @@ msgid ""
 "something depends on that name."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><title>
+#: apt-patterns.7.xml
+#, fuzzy
+#| msgid "Packages"
+msgid "Version patterns"
+msgstr "Packages"
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-patterns.7.xml
+msgid "These patterns select specific versions of a package."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-patterns.7.xml
+#, fuzzy
+#| msgid "<option>--installed</option>"
+msgid "<code>?archive(REGEX)</code>"
+msgstr "<option>--installed</option>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-patterns.7.xml
+msgid ""
+"Selects versions that come from the archive that matches the specified "
+"regular expression. Archive, here, means the values after <code>a=</code> in "
+"<command>apt-cache policy</command>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-patterns.7.xml
+#, fuzzy
+#| msgid "<option>--installed</option>"
+msgid "<code>?origin(REGEX)</code>"
+msgstr "<option>--installed</option>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-patterns.7.xml
+msgid ""
+"Selects versions that come from the origin that matches the specified "
+"regular expression. Origin, here, means the values after <code>o=</code> in "
+"<command>apt-cache policy</command>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-patterns.7.xml
+#, fuzzy
+#| msgid "<option>--installed</option>"
+msgid "<code>?section(REGEX)</code>"
+msgstr "<option>--installed</option>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-patterns.7.xml
+msgid ""
+"Selects versions where the section matches the specified regular expression."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-patterns.7.xml
+msgid "<code>?source-package(REGEX)</code>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-patterns.7.xml
+msgid ""
+"Selects versions where the source package name matches the specified regular "
+"expression."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-patterns.7.xml
+msgid "<code>?source-version(REGEX)</code>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-patterns.7.xml
+msgid ""
+"Selects versions where the source package version matches the specified "
+"regular expression."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-patterns.7.xml
+#, fuzzy
+#| msgid "<option>--installed</option>"
+msgid "<code>?version(REGEX)</code>"
+msgstr "<option>--installed</option>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-patterns.7.xml
+msgid ""
+"Selects versions where the version string matching the specified regular "
+"expression."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-patterns.7.xml
 msgid "<code>apt remove ?garbage</code>"
@@ -11074,6 +11235,11 @@ msgstr ""
 msgid "A trailing comma is allowed in argument lists"
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
+#: apt-patterns.7.xml
+msgid "?narrow accepts infinite arguments"
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><para>
 #: apt-patterns.7.xml
 #, fuzzy
diff --git a/doc/po/ja.po b/doc/po/ja.po
index 6c2cbf2ba..53644d8ea 100644
--- a/doc/po/ja.po
+++ b/doc/po/ja.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 1.4\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2019-08-19 16:22+0200\n"
+"POT-Creation-Date: 2019-12-02 18:18+0100\n"
 "PO-Revision-Date: 2017-01-06 04:50+0900\n"
 "Last-Translator: Takuma Yamada <tyamada@takumayamada.com>\n"
 "Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
@@ -9523,8 +9523,9 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt_auth.conf.5.xml
 msgid ""
-"<literal>machine</literal> <replaceable>hostname</replaceable>[:"
-"<replaceable>port</replaceable>][/<replaceable>path</replaceable>]"
+"<literal>machine</literal> <replaceable>[protocol://]</"
+"replaceable><replaceable>hostname</replaceable>[:<replaceable>port</"
+"replaceable>][/<replaceable>path</replaceable>]"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -9542,6 +9543,12 @@ msgid ""
 "emphasis> token is encountered."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt_auth.conf.5.xml
+msgid ""
+"If protocol is not specified, the entry only matches https and tor+https."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt_auth.conf.5.xml
 #, fuzzy
@@ -9577,14 +9584,14 @@ msgstr "サンプル"
 #: apt_auth.conf.5.xml
 #, fuzzy, no-wrap
 #| msgid "deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib"
-msgid "deb http://example.org/debian &debian-stable-codename; main"
+msgid "deb https://example.org/debian &debian-stable-codename; main"
 msgstr "deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib"
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
 #: apt_auth.conf.5.xml
 #, fuzzy, no-wrap
 #| msgid "deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib"
-msgid "deb http://apt:debian@example.org/debian &debian-stable-codename; main"
+msgid "deb https://apt:debian@example.org/debian &debian-stable-codename; main"
 msgstr "deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib"
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
@@ -9615,7 +9622,7 @@ msgstr ""
 #: apt_auth.conf.5.xml
 #, no-wrap
 msgid ""
-"machine example.org:80 login apt password debian\n"
+"machine example.org:443 login apt password debian\n"
 "machine example.org/deb/ login apt password debian\n"
 "machine example.org/ubuntu login apt password debian\n"
 "machine example.orga login apt password debian\n"
@@ -9653,6 +9660,15 @@ msgid ""
 "the <literal>machine</literal> token."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><para>
+#: apt_auth.conf.5.xml
+msgid ""
+"Login information in auth.conf are more flexible than those in sources.list. "
+"For example, login information can be specified for parts of a repository "
+"only, or if the sources.list entry redirects elsewhere, login information "
+"for the redirect destination can be supplied."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt_auth.conf.5.xml
 msgid "<filename>/etc/apt/auth.conf</filename>"
@@ -10464,6 +10480,54 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-patterns.7.xml
+msgid "Narrowing patterns"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-patterns.7.xml
+msgid "<code>?all-versions(PATTERN)</code>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-patterns.7.xml
+msgid ""
+"Selects packages where all versions match PATTERN. When matching versions "
+"instead, same as PATTERN."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-patterns.7.xml
+msgid "<code>?any-version(PATTERN)</code>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-patterns.7.xml
+msgid "Selects any version where the pattern matches on the version."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-patterns.7.xml
+msgid ""
+"For example, while <code>?and(?version(1),?version(2))</code> matches a "
+"package which has one version containing 1 and one version containing 2, "
+"<code>?any-version(?and(?version(1),?version(2)))</code> restricts the "
+"<code>?and</code> to act on the same version."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-patterns.7.xml
+msgid "<code>?narrow(PATTERN...)</code>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-patterns.7.xml
+msgid ""
+"Selects any version matching all PATTERNs, short for<code>?any-version(?"
+"and(PATTERN...))</code>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt-patterns.7.xml
 msgid "Package patterns"
 msgstr ""
 
@@ -10599,6 +10663,91 @@ msgid ""
 "something depends on that name."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><title>
+#: apt-patterns.7.xml
+#, fuzzy
+#| msgid "Version &apt-product-version;"
+msgid "Version patterns"
+msgstr "バージョン &apt-product-version;"
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-patterns.7.xml
+msgid "These patterns select specific versions of a package."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-patterns.7.xml
+msgid "<code>?archive(REGEX)</code>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-patterns.7.xml
+msgid ""
+"Selects versions that come from the archive that matches the specified "
+"regular expression. Archive, here, means the values after <code>a=</code> in "
+"<command>apt-cache policy</command>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-patterns.7.xml
+msgid "<code>?origin(REGEX)</code>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-patterns.7.xml
+msgid ""
+"Selects versions that come from the origin that matches the specified "
+"regular expression. Origin, here, means the values after <code>o=</code> in "
+"<command>apt-cache policy</command>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-patterns.7.xml
+msgid "<code>?section(REGEX)</code>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-patterns.7.xml
+msgid ""
+"Selects versions where the section matches the specified regular expression."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-patterns.7.xml
+msgid "<code>?source-package(REGEX)</code>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-patterns.7.xml
+msgid ""
+"Selects versions where the source package name matches the specified regular "
+"expression."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-patterns.7.xml
+msgid "<code>?source-version(REGEX)</code>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-patterns.7.xml
+msgid ""
+"Selects versions where the source package version matches the specified "
+"regular expression."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-patterns.7.xml
+msgid "<code>?version(REGEX)</code>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-patterns.7.xml
+msgid ""
+"Selects versions where the version string matching the specified regular "
+"expression."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-patterns.7.xml
 msgid "<code>apt remove ?garbage</code>"
@@ -10675,6 +10824,11 @@ msgstr ""
 msgid "A trailing comma is allowed in argument lists"
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
+#: apt-patterns.7.xml
+msgid "?narrow accepts infinite arguments"
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><para>
 #: apt-patterns.7.xml
 #, fuzzy
diff --git a/doc/po/nl.po b/doc/po/nl.po
index 55ec72034..1141cf2fe 100644
--- a/doc/po/nl.po
+++ b/doc/po/nl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 1.8.0~rc3\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2019-08-19 16:22+0200\n"
+"POT-Creation-Date: 2019-12-02 18:18+0100\n"
 "PO-Revision-Date: 2019-02-16 20:46+0100\n"
 "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n"
 "Language-Team: Debian Dutch l10n Team <debian-l10n-dutch@lists.debian.org>\n"
@@ -10120,9 +10120,14 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt_auth.conf.5.xml
+#, fuzzy
+#| msgid ""
+#| "<literal>machine</literal> <replaceable>hostname</replaceable>[:"
+#| "<replaceable>port</replaceable>][/<replaceable>path</replaceable>]"
 msgid ""
-"<literal>machine</literal> <replaceable>hostname</replaceable>[:"
-"<replaceable>port</replaceable>][/<replaceable>path</replaceable>]"
+"<literal>machine</literal> <replaceable>[protocol://]</"
+"replaceable><replaceable>hostname</replaceable>[:<replaceable>port</"
+"replaceable>][/<replaceable>path</replaceable>]"
 msgstr ""
 "<literal>machine</literal> <replaceable>computernaam</replaceable>[:"
 "<replaceable>poort</replaceable>][/<replaceable>pad</replaceable>]"
@@ -10155,6 +10160,12 @@ msgstr ""
 "wordt of tot een ander trefwoord <emphasis><literal>machine</literal></"
 "emphasis> gevonden wordt."
 
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt_auth.conf.5.xml
+msgid ""
+"If protocol is not specified, the entry only matches https and tor+https."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt_auth.conf.5.xml
 msgid "<literal>login</literal> <replaceable>name</replaceable>"
@@ -10182,14 +10193,16 @@ msgstr "Voorbeeld"
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
 #: apt_auth.conf.5.xml
-#, no-wrap
-msgid "deb http://example.org/debian &debian-stable-codename; main"
+#, fuzzy, no-wrap
+#| msgid "deb http://example.org/debian &debian-stable-codename; main"
+msgid "deb https://example.org/debian &debian-stable-codename; main"
 msgstr "deb http://example.org/debian &debian-stable-codename; main"
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
 #: apt_auth.conf.5.xml
-#, no-wrap
-msgid "deb http://apt:debian@example.org/debian &debian-stable-codename; main"
+#, fuzzy, no-wrap
+#| msgid "deb http://apt:debian@example.org/debian &debian-stable-codename; main"
+msgid "deb https://apt:debian@example.org/debian &debian-stable-codename; main"
 msgstr "deb http://apt:debian@example.org/debian &debian-stable-codename; main"
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
@@ -10224,9 +10237,15 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
 #: apt_auth.conf.5.xml
-#, no-wrap
-msgid ""
-"machine example.org:80 login apt password debian\n"
+#, fuzzy, no-wrap
+#| msgid ""
+#| "machine example.org:80 login apt password debian\n"
+#| "machine example.org/deb/ login apt password debian\n"
+#| "machine example.org/ubuntu login apt password debian\n"
+#| "machine example.orga login apt password debian\n"
+#| "machine example.net login apt password debian\n"
+msgid ""
+"machine example.org:443 login apt password debian\n"
 "machine example.org/deb/ login apt password debian\n"
 "machine example.org/ubuntu login apt password debian\n"
 "machine example.orga login apt password debian\n"
@@ -10287,6 +10306,15 @@ msgstr ""
 "meerdere nodig heeft, moet er bij alle in het trefwoord <literal>machine</"
 "literal> een pad opgegeven worden."
 
+#. type: Content of: <refentry><refsect1><para>
+#: apt_auth.conf.5.xml
+msgid ""
+"Login information in auth.conf are more flexible than those in sources.list. "
+"For example, login information can be specified for parts of a repository "
+"only, or if the sources.list entry redirects elsewhere, login information "
+"for the redirect destination can be supplied."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt_auth.conf.5.xml
 msgid "<filename>/etc/apt/auth.conf</filename>"
@@ -11318,6 +11346,54 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-patterns.7.xml
+msgid "Narrowing patterns"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-patterns.7.xml
+msgid "<code>?all-versions(PATTERN)</code>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-patterns.7.xml
+msgid ""
+"Selects packages where all versions match PATTERN. When matching versions "
+"instead, same as PATTERN."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-patterns.7.xml
+msgid "<code>?any-version(PATTERN)</code>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-patterns.7.xml
+msgid "Selects any version where the pattern matches on the version."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-patterns.7.xml
+msgid ""
+"For example, while <code>?and(?version(1),?version(2))</code> matches a "
+"package which has one version containing 1 and one version containing 2, "
+"<code>?any-version(?and(?version(1),?version(2)))</code> restricts the "
+"<code>?and</code> to act on the same version."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-patterns.7.xml
+msgid "<code>?narrow(PATTERN...)</code>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-patterns.7.xml
+msgid ""
+"Selects any version matching all PATTERNs, short for<code>?any-version(?"
+"and(PATTERN...))</code>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt-patterns.7.xml
 msgid "Package patterns"
 msgstr ""
 
@@ -11453,6 +11529,91 @@ msgid ""
 "something depends on that name."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><title>
+#: apt-patterns.7.xml
+#, fuzzy
+#| msgid "Version &apt-product-version;"
+msgid "Version patterns"
+msgstr "Versie &apt-product-version;"
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-patterns.7.xml
+msgid "These patterns select specific versions of a package."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-patterns.7.xml
+msgid "<code>?archive(REGEX)</code>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-patterns.7.xml
+msgid ""
+"Selects versions that come from the archive that matches the specified "
+"regular expression. Archive, here, means the values after <code>a=</code> in "
+"<command>apt-cache policy</command>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-patterns.7.xml
+msgid "<code>?origin(REGEX)</code>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-patterns.7.xml
+msgid ""
+"Selects versions that come from the origin that matches the specified "
+"regular expression. Origin, here, means the values after <code>o=</code> in "
+"<command>apt-cache policy</command>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-patterns.7.xml
+msgid "<code>?section(REGEX)</code>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-patterns.7.xml
+msgid ""
+"Selects versions where the section matches the specified regular expression."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-patterns.7.xml
+msgid "<code>?source-package(REGEX)</code>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-patterns.7.xml
+msgid ""
+"Selects versions where the source package name matches the specified regular "
+"expression."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-patterns.7.xml
+msgid "<code>?source-version(REGEX)</code>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-patterns.7.xml
+msgid ""
+"Selects versions where the source package version matches the specified "
+"regular expression."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-patterns.7.xml
+msgid "<code>?version(REGEX)</code>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-patterns.7.xml
+msgid ""
+"Selects versions where the version string matching the specified regular "
+"expression."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-patterns.7.xml
 msgid "<code>apt remove ?garbage</code>"
@@ -11529,6 +11690,11 @@ msgstr ""
 msgid "A trailing comma is allowed in argument lists"
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
+#: apt-patterns.7.xml
+msgid "?narrow accepts infinite arguments"
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><para>
 #: apt-patterns.7.xml
 #, fuzzy
diff --git a/doc/po/pl.po b/doc/po/pl.po
index 6f7847882..712c0c967 100644
--- a/doc/po/pl.po
+++ b/doc/po/pl.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2019-08-19 16:22+0200\n"
+"POT-Creation-Date: 2019-12-02 18:18+0100\n"
 "PO-Revision-Date: 2014-07-04 02:13+0200\n"
 "Last-Translator: Robert Luberda <robert@debian.org>\n"
 "Language-Team: Polish <manpages-pl-list@lists.sourceforge.net>\n"
@@ -8971,8 +8971,9 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt_auth.conf.5.xml
 msgid ""
-"<literal>machine</literal> <replaceable>hostname</replaceable>[:"
-"<replaceable>port</replaceable>][/<replaceable>path</replaceable>]"
+"<literal>machine</literal> <replaceable>[protocol://]</"
+"replaceable><replaceable>hostname</replaceable>[:<replaceable>port</"
+"replaceable>][/<replaceable>path</replaceable>]"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -8990,6 +8991,12 @@ msgid ""
 "emphasis> token is encountered."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt_auth.conf.5.xml
+msgid ""
+"If protocol is not specified, the entry only matches https and tor+https."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt_auth.conf.5.xml
 #, fuzzy
@@ -9025,14 +9032,14 @@ msgstr "Przykłady"
 #: apt_auth.conf.5.xml
 #, fuzzy, no-wrap
 #| msgid "deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib"
-msgid "deb http://example.org/debian &debian-stable-codename; main"
+msgid "deb https://example.org/debian &debian-stable-codename; main"
 msgstr "deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib"
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
 #: apt_auth.conf.5.xml
 #, fuzzy, no-wrap
 #| msgid "deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib"
-msgid "deb http://apt:debian@example.org/debian &debian-stable-codename; main"
+msgid "deb https://apt:debian@example.org/debian &debian-stable-codename; main"
 msgstr "deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib"
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
@@ -9063,7 +9070,7 @@ msgstr ""
 #: apt_auth.conf.5.xml
 #, no-wrap
 msgid ""
-"machine example.org:80 login apt password debian\n"
+"machine example.org:443 login apt password debian\n"
 "machine example.org/deb/ login apt password debian\n"
 "machine example.org/ubuntu login apt password debian\n"
 "machine example.orga login apt password debian\n"
@@ -9101,6 +9108,15 @@ msgid ""
 "the <literal>machine</literal> token."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><para>
+#: apt_auth.conf.5.xml
+msgid ""
+"Login information in auth.conf are more flexible than those in sources.list. "
+"For example, login information can be specified for parts of a repository "
+"only, or if the sources.list entry redirects elsewhere, login information "
+"for the redirect destination can be supplied."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt_auth.conf.5.xml
 #, fuzzy
@@ -9840,6 +9856,54 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-patterns.7.xml
+msgid "Narrowing patterns"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-patterns.7.xml
+msgid "<code>?all-versions(PATTERN)</code>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-patterns.7.xml
+msgid ""
+"Selects packages where all versions match PATTERN. When matching versions "
+"instead, same as PATTERN."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-patterns.7.xml
+msgid "<code>?any-version(PATTERN)</code>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-patterns.7.xml
+msgid "Selects any version where the pattern matches on the version."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-patterns.7.xml
+msgid ""
+"For example, while <code>?and(?version(1),?version(2))</code> matches a "
+"package which has one version containing 1 and one version containing 2, "
+"<code>?any-version(?and(?version(1),?version(2)))</code> restricts the "
+"<code>?and</code> to act on the same version."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-patterns.7.xml
+msgid "<code>?narrow(PATTERN...)</code>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-patterns.7.xml
+msgid ""
+"Selects any version matching all PATTERNs, short for<code>?any-version(?"
+"and(PATTERN...))</code>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt-patterns.7.xml
 msgid "Package patterns"
 msgstr ""
 
@@ -9975,6 +10039,89 @@ msgid ""
 "something depends on that name."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><title>
+#: apt-patterns.7.xml
+msgid "Version patterns"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-patterns.7.xml
+msgid "These patterns select specific versions of a package."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-patterns.7.xml
+msgid "<code>?archive(REGEX)</code>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-patterns.7.xml
+msgid ""
+"Selects versions that come from the archive that matches the specified "
+"regular expression. Archive, here, means the values after <code>a=</code> in "
+"<command>apt-cache policy</command>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-patterns.7.xml
+msgid "<code>?origin(REGEX)</code>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-patterns.7.xml
+msgid ""
+"Selects versions that come from the origin that matches the specified "
+"regular expression. Origin, here, means the values after <code>o=</code> in "
+"<command>apt-cache policy</command>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-patterns.7.xml
+msgid "<code>?section(REGEX)</code>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-patterns.7.xml
+msgid ""
+"Selects versions where the section matches the specified regular expression."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-patterns.7.xml
+msgid "<code>?source-package(REGEX)</code>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-patterns.7.xml
+msgid ""
+"Selects versions where the source package name matches the specified regular "
+"expression."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-patterns.7.xml
+msgid "<code>?source-version(REGEX)</code>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-patterns.7.xml
+msgid ""
+"Selects versions where the source package version matches the specified "
+"regular expression."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-patterns.7.xml
+msgid "<code>?version(REGEX)</code>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-patterns.7.xml
+msgid ""
+"Selects versions where the version string matching the specified regular "
+"expression."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-patterns.7.xml
 msgid "<code>apt remove ?garbage</code>"
@@ -10051,6 +10198,11 @@ msgstr ""
 msgid "A trailing comma is allowed in argument lists"
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
+#: apt-patterns.7.xml
+msgid "?narrow accepts infinite arguments"
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><para>
 #: apt-patterns.7.xml
 #, fuzzy
diff --git a/doc/po/pt.po b/doc/po/pt.po
index 68bf10c0d..0893cf91f 100644
--- a/doc/po/pt.po
+++ b/doc/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 1.8.0\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2019-08-19 16:22+0200\n"
+"POT-Creation-Date: 2019-12-02 18:18+0100\n"
 "PO-Revision-Date: 2019-04-07 22:02+0000\n"
 "Last-Translator: Américo Monteiro <a_monteiro@gmx.com>\n"
 "Language-Team: Portuguese <>\n"
@@ -9852,9 +9852,14 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt_auth.conf.5.xml
+#, fuzzy
+#| msgid ""
+#| "<literal>machine</literal> <replaceable>hostname</replaceable>[:"
+#| "<replaceable>port</replaceable>][/<replaceable>path</replaceable>]"
 msgid ""
-"<literal>machine</literal> <replaceable>hostname</replaceable>[:"
-"<replaceable>port</replaceable>][/<replaceable>path</replaceable>]"
+"<literal>machine</literal> <replaceable>[protocol://]</"
+"replaceable><replaceable>hostname</replaceable>[:<replaceable>port</"
+"replaceable>][/<replaceable>path</replaceable>]"
 msgstr ""
 "<literal>machine</literal> <replaceable>nome-de-máquina</replaceable>[:"
 "<replaceable>porto</replaceable>][/<replaceable>caminho</replaceable>]"
@@ -9885,6 +9890,12 @@ msgstr ""
 "subsequentes são processados, parando quando é alcançado o final do ficheiro "
 "ou é encontrado outro token <emphasis><literal>machine</literal></emphasis>."
 
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt_auth.conf.5.xml
+msgid ""
+"If protocol is not specified, the entry only matches https and tor+https."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt_auth.conf.5.xml
 msgid "<literal>login</literal> <replaceable>name</replaceable>"
@@ -9912,14 +9923,16 @@ msgstr "Exemplo"
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
 #: apt_auth.conf.5.xml
-#, no-wrap
-msgid "deb http://example.org/debian &debian-stable-codename; main"
+#, fuzzy, no-wrap
+#| msgid "deb http://example.org/debian &debian-stable-codename; main"
+msgid "deb https://example.org/debian &debian-stable-codename; main"
 msgstr "deb http://example.org/debian &debian-stable-codename; main"
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
 #: apt_auth.conf.5.xml
-#, no-wrap
-msgid "deb http://apt:debian@example.org/debian &debian-stable-codename; main"
+#, fuzzy, no-wrap
+#| msgid "deb http://apt:debian@example.org/debian &debian-stable-codename; main"
+msgid "deb https://apt:debian@example.org/debian &debian-stable-codename; main"
 msgstr "deb http://apt:debian@example.org/debian &debian-stable-codename; main"
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
@@ -9954,9 +9967,15 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
 #: apt_auth.conf.5.xml
-#, no-wrap
-msgid ""
-"machine example.org:80 login apt password debian\n"
+#, fuzzy, no-wrap
+#| msgid ""
+#| "machine example.org:80 login apt password debian\n"
+#| "machine example.org/deb/ login apt password debian\n"
+#| "machine example.org/ubuntu login apt password debian\n"
+#| "machine example.orga login apt password debian\n"
+#| "machine example.net login apt password debian\n"
+msgid ""
+"machine example.org:443 login apt password debian\n"
 "machine example.org/deb/ login apt password debian\n"
 "machine example.org/ubuntu login apt password debian\n"
 "machine example.orga login apt password debian\n"
@@ -10017,6 +10036,15 @@ msgstr ""
 "múltiplos eles deves todos ter um caminha especificado no token "
 "<literal>machine</literal>."
 
+#. type: Content of: <refentry><refsect1><para>
+#: apt_auth.conf.5.xml
+msgid ""
+"Login information in auth.conf are more flexible than those in sources.list. "
+"For example, login information can be specified for parts of a repository "
+"only, or if the sources.list entry redirects elsewhere, login information "
+"for the redirect destination can be supplied."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt_auth.conf.5.xml
 msgid "<filename>/etc/apt/auth.conf</filename>"
@@ -11014,6 +11042,54 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-patterns.7.xml
+msgid "Narrowing patterns"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-patterns.7.xml
+msgid "<code>?all-versions(PATTERN)</code>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-patterns.7.xml
+msgid ""
+"Selects packages where all versions match PATTERN. When matching versions "
+"instead, same as PATTERN."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-patterns.7.xml
+msgid "<code>?any-version(PATTERN)</code>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-patterns.7.xml
+msgid "Selects any version where the pattern matches on the version."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-patterns.7.xml
+msgid ""
+"For example, while <code>?and(?version(1),?version(2))</code> matches a "
+"package which has one version containing 1 and one version containing 2, "
+"<code>?any-version(?and(?version(1),?version(2)))</code> restricts the "
+"<code>?and</code> to act on the same version."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-patterns.7.xml
+msgid "<code>?narrow(PATTERN...)</code>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-patterns.7.xml
+msgid ""
+"Selects any version matching all PATTERNs, short for<code>?any-version(?"
+"and(PATTERN...))</code>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt-patterns.7.xml
 msgid "Package patterns"
 msgstr ""
 
@@ -11149,6 +11225,91 @@ msgid ""
 "something depends on that name."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><title>
+#: apt-patterns.7.xml
+#, fuzzy
+#| msgid "Version &apt-product-version;"
+msgid "Version patterns"
+msgstr "Versão &apt-product-version;"
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-patterns.7.xml
+msgid "These patterns select specific versions of a package."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-patterns.7.xml
+msgid "<code>?archive(REGEX)</code>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-patterns.7.xml
+msgid ""
+"Selects versions that come from the archive that matches the specified "
+"regular expression. Archive, here, means the values after <code>a=</code> in "
+"<command>apt-cache policy</command>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-patterns.7.xml
+msgid "<code>?origin(REGEX)</code>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-patterns.7.xml
+msgid ""
+"Selects versions that come from the origin that matches the specified "
+"regular expression. Origin, here, means the values after <code>o=</code> in "
+"<command>apt-cache policy</command>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-patterns.7.xml
+msgid "<code>?section(REGEX)</code>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-patterns.7.xml
+msgid ""
+"Selects versions where the section matches the specified regular expression."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-patterns.7.xml
+msgid "<code>?source-package(REGEX)</code>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-patterns.7.xml
+msgid ""
+"Selects versions where the source package name matches the specified regular "
+"expression."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-patterns.7.xml
+msgid "<code>?source-version(REGEX)</code>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-patterns.7.xml
+msgid ""
+"Selects versions where the source package version matches the specified "
+"regular expression."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-patterns.7.xml
+msgid "<code>?version(REGEX)</code>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-patterns.7.xml
+msgid ""
+"Selects versions where the version string matching the specified regular "
+"expression."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-patterns.7.xml
 msgid "<code>apt remove ?garbage</code>"
@@ -11225,6 +11386,11 @@ msgstr ""
 msgid "A trailing comma is allowed in argument lists"
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
+#: apt-patterns.7.xml
+msgid "?narrow accepts infinite arguments"
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><para>
 #: apt-patterns.7.xml
 #, fuzzy
diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po
index ac57cc791..9b00067ca 100644
--- a/doc/po/pt_BR.po
+++ b/doc/po/pt_BR.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2019-08-19 16:22+0200\n"
+"POT-Creation-Date: 2019-12-02 18:18+0100\n"
 "PO-Revision-Date: 2004-09-20 17:02+0000\n"
 "Last-Translator: André Luís Lopes <andrelop@debian.org>\n"
 "Language-Team: <debian-l10n-portuguese@lists.debian.org>\n"
@@ -7295,8 +7295,9 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt_auth.conf.5.xml
 msgid ""
-"<literal>machine</literal> <replaceable>hostname</replaceable>[:"
-"<replaceable>port</replaceable>][/<replaceable>path</replaceable>]"
+"<literal>machine</literal> <replaceable>[protocol://]</"
+"replaceable><replaceable>hostname</replaceable>[:<replaceable>port</"
+"replaceable>][/<replaceable>path</replaceable>]"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -7314,6 +7315,12 @@ msgid ""
 "emphasis> token is encountered."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt_auth.conf.5.xml
+msgid ""
+"If protocol is not specified, the entry only matches https and tor+https."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt_auth.conf.5.xml
 #, fuzzy
@@ -7348,13 +7355,13 @@ msgstr "Exemplos"
 #. type: Content of: <refentry><refsect1><para><literallayout>
 #: apt_auth.conf.5.xml
 #, no-wrap
-msgid "deb http://example.org/debian &debian-stable-codename; main"
+msgid "deb https://example.org/debian &debian-stable-codename; main"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
 #: apt_auth.conf.5.xml
 #, no-wrap
-msgid "deb http://apt:debian@example.org/debian &debian-stable-codename; main"
+msgid "deb https://apt:debian@example.org/debian &debian-stable-codename; main"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
@@ -7385,7 +7392,7 @@ msgstr ""
 #: apt_auth.conf.5.xml
 #, no-wrap
 msgid ""
-"machine example.org:80 login apt password debian\n"
+"machine example.org:443 login apt password debian\n"
 "machine example.org/deb/ login apt password debian\n"
 "machine example.org/ubuntu login apt password debian\n"
 "machine example.orga login apt password debian\n"
@@ -7423,6 +7430,15 @@ msgid ""
 "the <literal>machine</literal> token."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><para>
+#: apt_auth.conf.5.xml
+msgid ""
+"Login information in auth.conf are more flexible than those in sources.list. "
+"For example, login information can be specified for parts of a repository "
+"only, or if the sources.list entry redirects elsewhere, login information "
+"for the redirect destination can be supplied."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt_auth.conf.5.xml
 #, fuzzy
@@ -8137,6 +8153,54 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-patterns.7.xml
+msgid "Narrowing patterns"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-patterns.7.xml
+msgid "<code>?all-versions(PATTERN)</code>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-patterns.7.xml
+msgid ""
+"Selects packages where all versions match PATTERN. When matching versions "
+"instead, same as PATTERN."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-patterns.7.xml
+msgid "<code>?any-version(PATTERN)</code>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-patterns.7.xml
+msgid "Selects any version where the pattern matches on the version."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-patterns.7.xml
+msgid ""
+"For example, while <code>?and(?version(1),?version(2))</code> matches a "
+"package which has one version containing 1 and one version containing 2, "
+"<code>?any-version(?and(?version(1),?version(2)))</code> restricts the "
+"<code>?and</code> to act on the same version."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-patterns.7.xml
+msgid "<code>?narrow(PATTERN...)</code>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-patterns.7.xml
+msgid ""
+"Selects any version matching all PATTERNs, short for<code>?any-version(?"
+"and(PATTERN...))</code>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt-patterns.7.xml
 msgid "Package patterns"
 msgstr ""
 
@@ -8272,6 +8336,89 @@ msgid ""
 "something depends on that name."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><title>
+#: apt-patterns.7.xml
+msgid "Version patterns"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-patterns.7.xml
+msgid "These patterns select specific versions of a package."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-patterns.7.xml
+msgid "<code>?archive(REGEX)</code>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-patterns.7.xml
+msgid ""
+"Selects versions that come from the archive that matches the specified "
+"regular expression. Archive, here, means the values after <code>a=</code> in "
+"<command>apt-cache policy</command>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-patterns.7.xml
+msgid "<code>?origin(REGEX)</code>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-patterns.7.xml
+msgid ""
+"Selects versions that come from the origin that matches the specified "
+"regular expression. Origin, here, means the values after <code>o=</code> in "
+"<command>apt-cache policy</command>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-patterns.7.xml
+msgid "<code>?section(REGEX)</code>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-patterns.7.xml
+msgid ""
+"Selects versions where the section matches the specified regular expression."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-patterns.7.xml
+msgid "<code>?source-package(REGEX)</code>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-patterns.7.xml
+msgid ""
+"Selects versions where the source package name matches the specified regular "
+"expression."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-patterns.7.xml
+msgid "<code>?source-version(REGEX)</code>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-patterns.7.xml
+msgid ""
+"Selects versions where the source package version matches the specified "
+"regular expression."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-patterns.7.xml
+msgid "<code>?version(REGEX)</code>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-patterns.7.xml
+msgid ""
+"Selects versions where the version string matching the specified regular "
+"expression."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-patterns.7.xml
 msgid "<code>apt remove ?garbage</code>"
@@ -8348,6 +8495,11 @@ msgstr ""
 msgid "A trailing comma is allowed in argument lists"
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
+#: apt-patterns.7.xml
+msgid "?narrow accepts infinite arguments"
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><para>
 #: apt-patterns.7.xml
 #, fuzzy
author	Julian Andres Klode <julian.klode@canonical.com>	2019-12-02 18:18:57 +0100
committer	Julian Andres Klode <julian.klode@canonical.com>	2019-12-02 18:18:57 +0100
commit	5a98b531f7afcd34367b46ac9e0c7bfe151d6999 (patch)
tree	efe8c1c97a4e992b6df4f22ba33120ffc46d4aa8 /doc
parent	878861d35c8a97823b7cecc7e47d6850a5394d8b (diff)