15 files changed, 60 insertions, 50 deletions
diff --git a/doc/apt-ftparchive.1.xml b/doc/apt-ftparchive.1.xml
index 32b01aa82..607c5b821 100644
--- a/doc/apt-ftparchive.1.xml
+++ b/doc/apt-ftparchive.1.xml
@@ -584,7 +584,7 @@ for i in Sections do
      as the now outdated cached metadata like size and checksums will be used. With this option
      enabled this will no longer happen as it will be checked if the file was changed.
      Note that this option is set to "<literal>false</literal>" by default as it is not recommend
-     to upload multiply versions/builds of a package with the same version number, so in theory
+     to upload multiple versions/builds of a package with the same version number, so in theory
      nobody will have these problems and therefore all these extra checks are useless.
      </para></listitem>
      </varlistentry>
diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml
index b757c3d30..fca682015 100644
--- a/doc/apt-get.8.xml
+++ b/doc/apt-get.8.xml
@@ -205,6 +205,19 @@
      option if you want to change that.</para></listitem>
      </varlistentry>
 
+     <varlistentry><term><option>satisfy</option></term>
+     <listitem><para><literal>satisfy</literal> causes apt-get to satisfy the given dependency string.s The
+     dependency strings may have build profiles and architecture restriction list as in build dependencies. They
+     may optionally be prefixed with <literal>"Conflicts: "</literal> to unsatisfy the dependency string. Multiple strings of the same type can be specified.</para>
+
+     <para>Example: <literal>apt-get satisfy "foo" "Conflicts: bar" "baz (&gt;&gt; 1.0) | bar (= 2.0), moo"</literal></para>
+
+     <para>The legacy operator '&lt;/&gt;' is not supported, use '&lt;=/&gt;=' instead.</para>
+
+
+     </listitem>
+     </varlistentry>
+
      <varlistentry><term><option>check</option></term>
      <listitem><para><literal>check</literal> is a diagnostic tool; it updates the package cache and checks 
      for broken dependencies.</para></listitem>
diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index c2227ad04..11e6c7f15 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.8.0">
+<!ENTITY apt-product-version "1.8.2">
 
 <!-- (Code)names for various things used all over the place -->
 <!ENTITY debian-oldstable-codename "stretch">
diff --git a/doc/apt.8.xml b/doc/apt.8.xml
index e43ad9e9e..0c822b4ef 100644
--- a/doc/apt.8.xml
+++ b/doc/apt.8.xml
@@ -109,6 +109,15 @@
      </para></listitem>
      </varlistentry>
 
+     <varlistentry><term><option>satisfy</option> (&apt-get;)</term>
+     <listitem><para><option>satisfy</option> satisfies dependency strings, as
+	  used in Build-Depends. It also handles conflicts, by prefixing an argument
+	  with <literal>"Conflicts: "</literal>.
+     </para><para>Example: <literal>apt satisfy "foo, bar (>= 1.0)" "Conflicts: baz, fuzz"</literal>
+     </para></listitem>
+     </varlistentry>
+
+
      <varlistentry><term><option>search</option> (&apt-cache;)</term>
      <listitem><para><option>search</option> can be used to search for the given
 	   &regex; term(s) in the list of available packages and display
diff --git a/doc/examples/configure-index b/doc/examples/configure-index
index 5e317d7e0..25378a809 100644
--- a/doc/examples/configure-index
+++ b/doc/examples/configure-index
@@ -63,6 +63,7 @@ APT
      Arch-Only "<BOOL>";
      Indep-Only "<BOOL>";
      Build-Dep-Automatic "<BOOL>";
+     Satisfy-Automatic "<BOOL>";
 
      // (non-)confirming options
      Force-Yes "<BOOL>"; // allows downgrades, essential removal and eats children
diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index 4dae329e4..017ad0fb9 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.8.0\n"
+"Project-Id-Version: apt-doc 1.8.2\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2019-03-08 09:41+0100\n"
+"POT-Creation-Date: 2019-05-28 16:41+0200\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"
@@ -6856,7 +6856,7 @@ msgid ""
 "checksums will be used. With this option enabled this will no longer happen "
 "as it will be checked if the file was changed.  Note that this option is set "
 "to \"<literal>false</literal>\" by default as it is not recommend to upload "
-"multiply versions/builds of a package with the same version number, so in "
+"multiple versions/builds of a package with the same version number, so in "
 "theory nobody will have these problems and therefore all these extra checks "
 "are useless."
 msgstr ""
diff --git a/doc/po/de.po b/doc/po/de.po
index f75c94a73..718163d78 100644
--- a/doc/po/de.po
+++ b/doc/po/de.po
@@ -9822,7 +9822,7 @@ msgid ""
 "checksums will be used. With this option enabled this will no longer happen "
 "as it will be checked if the file was changed.  Note that this option is set "
 "to \"<literal>false</literal>\" by default as it is not recommend to upload "
-"multiply versions/builds of a package with the same version number, so in "
+"multiple versions/builds of a package with the same version number, so in "
 "theory nobody will have these problems and therefore all these extra checks "
 "are useless."
 msgstr ""
diff --git a/doc/po/es.po b/doc/po/es.po
index 2b9183d52..9829f0b27 100644
--- a/doc/po/es.po
+++ b/doc/po/es.po
@@ -9612,7 +9612,7 @@ msgid ""
 "checksums will be used. With this option enabled this will no longer happen "
 "as it will be checked if the file was changed.  Note that this option is set "
 "to \"<literal>false</literal>\" by default as it is not recommend to upload "
-"multiply versions/builds of a package with the same version number, so in "
+"multiple versions/builds of a package with the same version number, so in "
 "theory nobody will have these problems and therefore all these extra checks "
 "are useless."
 msgstr ""
diff --git a/doc/po/fr.po b/doc/po/fr.po
index 1a9278738..74a7cd613 100644
--- a/doc/po/fr.po
+++ b/doc/po/fr.po
@@ -7,13 +7,13 @@
 # Jérôme Marant, 2000.
 # Philippe Batailler, 2005.
 # Christian Perrier <bubulle@debian.org>, 2009, 2010, 2011, 2012, 2013.
-# Jean-Pierre Giraud <jean-pierregiraud@neuf.fr>, 2014, 2017, 2018.
+# Jean-Pierre Giraud <jean-pierregiraud@neuf.fr>, 2014, 2017-2019.
 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-02-04 15:34+0100\n"
-"PO-Revision-Date: 2018-11-26 17:47+0100\n"
+"POT-Creation-Date: 2019-05-21 14:38+0200\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"
 "Language: fr\n"
@@ -1174,16 +1174,12 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
-#, fuzzy
-#| msgid ""
-#| "A new <literal>list</literal> command is available similar to "
-#| "<literal>dpkg --list</literal>."
 msgid ""
 "<literal>reinstall</literal> is an alias for <literal>install --reinstall</"
 "literal>."
 msgstr ""
-"Une nouvelle commande <literal>list</literal> est disponible, semblable à la "
-"commande <literal>dpkg --list</literal>."
+"<literal>reinstall</literal> est un alias de la commande <literal>install --"
+"reinstall</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
@@ -3093,11 +3089,6 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml
-#, fuzzy
-#| msgid ""
-#| "<literal>auto</literal> is used to mark a package as being automatically "
-#| "installed, which will cause the package to be removed when no more "
-#| "manually installed packages depend on this package."
 msgid ""
 "<literal>minimize-manual</literal> is used to mark (transitive) dependencies "
 "of metapackages as automatically installed.  This can be used after an "
@@ -3105,9 +3096,11 @@ msgid ""
 "packages; or continuously on systems managed by system configuration "
 "metapackages."
 msgstr ""
-"<literal>auto</literal> permet de marquer un paquet comme ayant été installé "
-"automatiquement. Un tel paquet sera supprimé automatiquement dès que plus "
-"aucun paquet installé manuellement ne dépend de lui."
+"<literal>minimize-manual</literal> permet de marquer les dépendances "
+"(transitives) de métapaquets comme ayant été installées automatiquement. "
+"Cela peut être utilisé par exemple après une installation pour réduire le "
+"nombre de paquets installés manuellement, ou de façon permanente sur des "
+"systèmes gérés par des métapaquets de configuration système."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml
@@ -5570,6 +5563,10 @@ msgid ""
 "used when running dpkg. It may be set to any valid value of that environment "
 "variable; or the empty string, in which case the variable is not changed."
 msgstr ""
+"Il s'agit d'une chaîne qui définit la variable d'environnement <envar>PATH</"
+"envar> utilisée lors de l'exécution de dpkg. Elle peut être définie à "
+"n'importe quelle valeur valable pour cette variable d'environnement ou être "
+"une chaîne vide, dans ce cas la variable n'est pas modifiée."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
@@ -9788,7 +9785,7 @@ msgid ""
 "checksums will be used. With this option enabled this will no longer happen "
 "as it will be checked if the file was changed.  Note that this option is set "
 "to \"<literal>false</literal>\" by default as it is not recommend to upload "
-"multiply versions/builds of a package with the same version number, so in "
+"multiple versions/builds of a package with the same version number, so in "
 "theory nobody will have these problems and therefore all these extra checks "
 "are useless."
 msgstr ""
@@ -9870,19 +9867,15 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt_auth.conf.5.xml
-#, fuzzy
-#| msgid ""
-#| "The APT auth.conf file <filename>/etc/apt/auth.conf</filename> can be "
-#| "used to store login information in a netrc-like format with restrictive "
-#| "file permissions."
 msgid ""
 "The APT auth.conf file <filename>/etc/apt/auth.conf</filename>, and .conf "
 "files inside <filename>/etc/apt/auth.conf.d</filename> can be used to store "
 "login information in a netrc-like format with restrictive file permissions."
 msgstr ""
-"Le fichier auth.conf d'APT <filename>/etc/apt/auth.conf</filename> peut être "
-"utilisé pour stocker les informations de connexion dans un format detype "
-"netrc avec des droits d'accès restreints"
+"Le fichier auth.conf d'APT <filename>/etc/apt/auth.conf</filename> ainsi que "
+"les fichiers .conf dans <filename>/etc/apt/auth.conf.d</filename> peuvent "
+"être utilisés pour stocker les informations de connexion dans un format de "
+"type netrc avec des droits d'accès restreints."
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt_auth.conf.5.xml
@@ -10092,24 +10085,18 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt_auth.conf.5.xml
-#, fuzzy
-#| msgid "<filename>/etc/apt/auth.conf</filename>"
 msgid "<filename>/etc/apt/auth.conf.d/*.conf</filename>"
-msgstr "<filename>/etc/apt/auth.conf</filename>"
+msgstr "<filename>/etc/apt/auth.conf.d/*.conf</filename>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt_auth.conf.5.xml
-#, fuzzy
-#| msgid ""
-#| "Login information for APT sources and proxies in a netrc-like format.  "
-#| "Configuration Item: <literal>Dir::Etc::netrc</literal>."
 msgid ""
 "Login information for APT sources and proxies in a netrc-like format.  "
 "Configuration Item: <literal>Dir::Etc::netrcparts</literal>."
 msgstr ""
 "Informations de connexion pour les sources et les mandataires d'APT dans un "
-"format de type netrc. Élément de configuration : <literal>Dir::Etc::netrc</"
-"literal>."
+"format de type netrc. Élément de configuration : <literal>Dir::Etc::"
+"netrcparts</literal>."
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt_auth.conf.5.xml
diff --git a/doc/po/it.po b/doc/po/it.po
index 01f3d0d14..f2e2dda0e 100644
--- a/doc/po/it.po
+++ b/doc/po/it.po
@@ -9757,7 +9757,7 @@ msgid ""
 "checksums will be used. With this option enabled this will no longer happen "
 "as it will be checked if the file was changed.  Note that this option is set "
 "to \"<literal>false</literal>\" by default as it is not recommend to upload "
-"multiply versions/builds of a package with the same version number, so in "
+"multiple versions/builds of a package with the same version number, so in "
 "theory nobody will have these problems and therefore all these extra checks "
 "are useless."
 msgstr ""
diff --git a/doc/po/ja.po b/doc/po/ja.po
index 00bbad7f3..e50c5c42e 100644
--- a/doc/po/ja.po
+++ b/doc/po/ja.po
@@ -9377,7 +9377,7 @@ msgid ""
 "checksums will be used. With this option enabled this will no longer happen "
 "as it will be checked if the file was changed.  Note that this option is set "
 "to \"<literal>false</literal>\" by default as it is not recommend to upload "
-"multiply versions/builds of a package with the same version number, so in "
+"multiple versions/builds of a package with the same version number, so in "
 "theory nobody will have these problems and therefore all these extra checks "
 "are useless."
 msgstr ""
diff --git a/doc/po/nl.po b/doc/po/nl.po
index 841fed8a0..4a27d9120 100644
--- a/doc/po/nl.po
+++ b/doc/po/nl.po
@@ -9963,7 +9963,7 @@ msgid ""
 "checksums will be used. With this option enabled this will no longer happen "
 "as it will be checked if the file was changed.  Note that this option is set "
 "to \"<literal>false</literal>\" by default as it is not recommend to upload "
-"multiply versions/builds of a package with the same version number, so in "
+"multiple versions/builds of a package with the same version number, so in "
 "theory nobody will have these problems and therefore all these extra checks "
 "are useless."
 msgstr ""
diff --git a/doc/po/pl.po b/doc/po/pl.po
index 8b65b72aa..d9ff49c2a 100644
--- a/doc/po/pl.po
+++ b/doc/po/pl.po
@@ -8840,7 +8840,7 @@ msgid ""
 "checksums will be used. With this option enabled this will no longer happen "
 "as it will be checked if the file was changed.  Note that this option is set "
 "to \"<literal>false</literal>\" by default as it is not recommend to upload "
-"multiply versions/builds of a package with the same version number, so in "
+"multiple versions/builds of a package with the same version number, so in "
 "theory nobody will have these problems and therefore all these extra checks "
 "are useless."
 msgstr ""
diff --git a/doc/po/pt.po b/doc/po/pt.po
index 0daf70522..1f3dae7fe 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-04-08 13:05+0200\n"
+"POT-Creation-Date: 2019-05-21 14:35+0200\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"
@@ -721,7 +721,7 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt.8.xml
 msgid "(&apt-get;)"
-msgstr "(&apt-get;)"
+msgstr "apt-get"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.8.xml
@@ -9700,7 +9700,7 @@ msgid ""
 "checksums will be used. With this option enabled this will no longer happen "
 "as it will be checked if the file was changed.  Note that this option is set "
 "to \"<literal>false</literal>\" by default as it is not recommend to upload "
-"multiply versions/builds of a package with the same version number, so in "
+"multiple versions/builds of a package with the same version number, so in "
 "theory nobody will have these problems and therefore all these extra checks "
 "are useless."
 msgstr ""
diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po
index 18ca7399b..a20f6a6dc 100644
--- a/doc/po/pt_BR.po
+++ b/doc/po/pt_BR.po
@@ -7174,7 +7174,7 @@ msgid ""
 "checksums will be used. With this option enabled this will no longer happen "
 "as it will be checked if the file was changed.  Note that this option is set "
 "to \"<literal>false</literal>\" by default as it is not recommend to upload "
-"multiply versions/builds of a package with the same version number, so in "
+"multiple versions/builds of a package with the same version number, so in "
 "theory nobody will have these problems and therefore all these extra checks "
 "are useless."
 msgstr ""