Release 1.5~beta21.5_beta2

10 files changed, 885 insertions, 221 deletions

diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index 0412fcbab..f5f413f1d 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.5~alpha4\n"
+"Project-Id-Version: apt-doc 1.5~beta2\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-07-03 16:55+0200\n"
+"POT-Creation-Date: 2017-08-17 19:28+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"
@@ -1268,8 +1268,9 @@ msgid ""
 "not be used except in very special situations. Using "
 "<literal>force-yes</literal> can potentially destroy your system! "
 "Configuration Item: <literal>APT::Get::force-yes</literal>. This is "
-"deprecated and replaced by <option>--allow-downgrades</option>, "
-"<option>--allow-remove-essential</option>, "
+"deprecated and replaced by <option>--allow-unauthenticated</option> , "
+"<option>--allow-downgrades</option> , "
+"<option>--allow-remove-essential</option> , "
 "<option>--allow-change-held-packages</option> in 1.1."
 msgstr ""
 
@@ -5721,6 +5722,45 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml:1
 msgid ""
+"The http scheme specifies an HTTP server for an archive and is the most "
+"commonly used method, with many options in the "
+"<literal>Acquire::http</literal> scope detailed in &apt-conf;. The URI can "
+"directly include login information if the archive requires it, but the use "
+"of &apt-authconf; should be preferred. The method also supports SOCKS5 and "
+"HTTP(S) proxies either configured via apt-specific configuration or "
+"specified by the environment variable <envar>http_proxy</envar> in the "
+"format (assuming an HTTP proxy requiring authentication)  "
+"<replaceable>http://user:pass@server:port/</replaceable>.  The "
+"authentication details for proxies can also be supplied via &apt-authconf;."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: sources.list.5.xml:1
+msgid ""
+"Note that these forms of authentication are insecure as the whole "
+"communication with the remote server (or proxy) is not encrypted so a "
+"sufficiently capable attacker can observe and record login as well as all "
+"other interactions. The attacker can <emphasis>not</emphasis> modify the "
+"communication through as APTs data security model is independent of the "
+"chosen transport method. See &apt-secure; for details."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: sources.list.5.xml:1
+msgid ""
+"The https scheme specifies an HTTPS server for an archive and is very "
+"similar in use and available options to the http scheme. The main difference "
+"is that the communication between apt and server (or proxy) is "
+"encrypted. Note that the encryption does not prevent an attacker from "
+"knowing which server (or proxy) apt is communicating with and deeper "
+"analyses can potentially still reveal which data was downloaded. If this is "
+"a concern the Tor-based schemes mentioned further below might be a suitable "
+"alternative."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: sources.list.5.xml:1
+msgid ""
 "The file scheme allows an arbitrary directory in the file system to be "
 "considered an archive. This is useful for NFS mounts and local mirrors or "
 "archives."
@@ -5729,28 +5769,25 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml:1
 msgid ""
-"The cdrom scheme allows APT to use a local CD-ROM drive with media "
-"swapping. Use the &apt-cdrom; program to create cdrom entries in the source "
-"list."
+"The cdrom scheme allows APT to use a local CD-ROM, DVD or USB drive with "
+"media swapping. Use the &apt-cdrom; program to create cdrom entries in the "
+"source list."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml:1
 msgid ""
-"The http scheme specifies an HTTP server for the archive. If an environment "
-"variable <envar>http_proxy</envar> is set with the format "
-"http://server:port/, the proxy server specified in <envar>http_proxy</envar> "
-"will be used. Users of authenticated HTTP/1.1 proxies may use a string of "
-"the format http://user:pass@server:port/.  Note that this is an insecure "
-"method of authentication."
+"The ftp scheme specifies an FTP server for an archive. Use of FTP is on the "
+"decline in favour of <literal>http</literal> and <literal>https</literal> "
+"and many archives either never offered or are retiring FTP access. If you "
+"still need this method many configuration options for it are available in "
+"the <literal>Acquire::ftp</literal> scope and detailed in &apt-conf;."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml:1
 msgid ""
-"The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
-"is highly configurable; for more information see the &apt-conf; manual "
-"page. Please note that an FTP proxy can be specified by using the "
+"Please note that an FTP proxy can be specified by using the "
 "<envar>ftp_proxy</envar> environment variable. It is possible to specify an "
 "HTTP proxy (HTTP proxy servers often understand FTP URLs)  using this "
 "environment variable and <emphasis>only</emphasis> this environment "
@@ -5788,9 +5825,8 @@ msgid ""
 "which should follow the naming scheme "
 "<package>apt-transport-<replaceable>method</replaceable></package>.  For "
 "instance, the APT team also maintains the package "
-"<package>apt-transport-https</package>, which provides access methods for "
-"HTTPS URIs with features similar to the http method.  Methods for using "
-"e.g. debtorrent are also available - see &apt-transport-debtorrent;."
+"<package>apt-transport-tor</package>, which provides access methods for HTTP "
+"and HTTPS URIs routed via the Tor network."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
diff --git a/doc/po/de.po b/doc/po/de.po
index b53e5010d..672fe14cc 100644
--- a/doc/po/de.po
+++ b/doc/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 1.3\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-07-03 16:55+0200\n"
+"POT-Creation-Date: 2017-08-17 19:28+0200\n"
 "PO-Revision-Date: 2016-11-15 21:51+0200\n"
 "Last-Translator: Chris Leick <c.leick@vollbio.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -1749,14 +1749,24 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
+#, fuzzy
+#| msgid ""
+#| "Force yes; this is a dangerous option that will cause apt to continue "
+#| "without prompting if it is doing something potentially harmful. It should "
+#| "not be used except in very special situations. Using <literal>force-yes</"
+#| "literal> can potentially destroy your system! Configuration Item: "
+#| "<literal>APT::Get::force-yes</literal>. This is deprecated and replaced "
+#| "by <option>--allow-downgrades</option>, <option>--allow-remove-essential</"
+#| "option>, <option>--allow-change-held-packages</option> in 1.1."
 msgid ""
 "Force yes; this is a dangerous option that will cause apt to continue "
 "without prompting if it is doing something potentially harmful. It should "
 "not be used except in very special situations. Using <literal>force-yes</"
 "literal> can potentially destroy your system! Configuration Item: "
 "<literal>APT::Get::force-yes</literal>. This is deprecated and replaced by "
-"<option>--allow-downgrades</option>, <option>--allow-remove-essential</"
-"option>, <option>--allow-change-held-packages</option> in 1.1."
+"<option>--allow-unauthenticated</option> , <option>--allow-downgrades</"
+"option> , <option>--allow-remove-essential</option> , <option>--allow-change-"
+"held-packages</option> in 1.1."
 msgstr ""
 "erzwingt »Ja«; Dies ist eine gefährliche Option, die APT veranlasst, ohne "
 "Nachfrage fortzufahren, wenn es etwas möglicherweise schädliches tut. Es "
@@ -8244,6 +8254,44 @@ msgstr "Die derzeit zulässigen URI-Typen sind:"
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml
 msgid ""
+"The http scheme specifies an HTTP server for an archive and is the most "
+"commonly used method, with many options in the <literal>Acquire::http</"
+"literal> scope detailed in &apt-conf;. The URI can directly include login "
+"information if the archive requires it, but the use of &apt-authconf; should "
+"be preferred. The method also supports SOCKS5 and HTTP(S) proxies either "
+"configured via apt-specific configuration or specified by the environment "
+"variable <envar>http_proxy</envar> in the format (assuming an HTTP proxy "
+"requiring authentication)  <replaceable>http://user:pass@server:port/</"
+"replaceable>.  The authentication details for proxies can also be supplied "
+"via &apt-authconf;."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: sources.list.5.xml
+msgid ""
+"Note that these forms of authentication are insecure as the whole "
+"communication with the remote server (or proxy) is not encrypted so a "
+"sufficiently capable attacker can observe and record login as well as all "
+"other interactions. The attacker can <emphasis>not</emphasis> modify the "
+"communication through as APTs data security model is independent of the "
+"chosen transport method. See &apt-secure; for details."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: sources.list.5.xml
+msgid ""
+"The https scheme specifies an HTTPS server for an archive and is very "
+"similar in use and available options to the http scheme. The main difference "
+"is that the communication between apt and server (or proxy) is encrypted. "
+"Note that the encryption does not prevent an attacker from knowing which "
+"server (or proxy) apt is communicating with and deeper analyses can "
+"potentially still reveal which data was downloaded. If this is a concern the "
+"Tor-based schemes mentioned further below might be a suitable alternative."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: sources.list.5.xml
+msgid ""
 "The file scheme allows an arbitrary directory in the file system to be "
 "considered an archive. This is useful for NFS mounts and local mirrors or "
 "archives."
@@ -8254,9 +8302,15 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml
+#, fuzzy
+#| msgid ""
+#| "The cdrom scheme allows APT to use a local CD-ROM drive with media "
+#| "swapping. Use the &apt-cdrom; program to create cdrom entries in the "
+#| "source list."
 msgid ""
-"The cdrom scheme allows APT to use a local CD-ROM drive with media swapping. "
-"Use the &apt-cdrom; program to create cdrom entries in the source list."
+"The cdrom scheme allows APT to use a local CD-ROM, DVD or USB drive with "
+"media swapping. Use the &apt-cdrom; program to create cdrom entries in the "
+"source list."
 msgstr ""
 "Das cdrom-Schema erlaubt APT ein lokales CD-ROM-Laufwerk mit Medienwechsel "
 "zu benutzen. Benutzen Sie das Programm &apt-cdrom;, um CD-ROM-Einträge in "
@@ -8265,25 +8319,26 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml
 msgid ""
-"The http scheme specifies an HTTP server for the archive. If an environment "
-"variable <envar>http_proxy</envar> is set with the format http://server:"
-"port/, the proxy server specified in <envar>http_proxy</envar> will be used. "
-"Users of authenticated HTTP/1.1 proxies may use a string of the format "
-"http://user:pass@server:port/.  Note that this is an insecure method of "
-"authentication."
+"The ftp scheme specifies an FTP server for an archive. Use of FTP is on the "
+"decline in favour of <literal>http</literal> and <literal>https</literal> "
+"and many archives either never offered or are retiring FTP access. If you "
+"still need this method many configuration options for it are available in "
+"the <literal>Acquire::ftp</literal> scope and detailed in &apt-conf;."
 msgstr ""
-"Das http-Schema gibt einen HTTP-Server für das Archiv an. Wenn eine "
-"Umgebungsvariable <envar>http_proxy</envar> mit dem Format http://Server:"
-"Port/ gesetzt ist, wird der in <envar>http_proxy</envar> angegebene Proxy-"
-"Server benutzt. Anwender eines HTTP/1.1-authentifizierten Proxys können eine "
-"Zeichenkette mit dem Format http://Anwender:Passwort@Server:Port/ benutzt. "
-"Beachten Sie, dass dies eine unsichere Authentifizierungsmethode ist."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml
+#, fuzzy
+#| msgid ""
+#| "The ftp scheme specifies an FTP server for the archive. APT's FTP "
+#| "behavior is highly configurable; for more information see the &apt-conf; "
+#| "manual page. Please note that an FTP proxy can be specified by using the "
+#| "<envar>ftp_proxy</envar> environment variable. It is possible to specify "
+#| "an HTTP proxy (HTTP proxy servers often understand FTP URLs)  using this "
+#| "environment variable and <emphasis>only</emphasis> this environment "
+#| "variable. Proxies using HTTP specified in the configuration file will be "
+#| "ignored."
 msgid ""
-"The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
-"is highly configurable; for more information see the &apt-conf; manual page. "
 "Please note that an FTP proxy can be specified by using the "
 "<envar>ftp_proxy</envar> environment variable. It is possible to specify an "
 "HTTP proxy (HTTP proxy servers often understand FTP URLs)  using this "
@@ -8335,14 +8390,21 @@ msgstr "weitere zulässige URI-Typen hinzufügen"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml
+#, fuzzy
+#| msgid ""
+#| "APT can be extended with more methods shipped in other optional packages, "
+#| "which should follow the naming scheme <package>apt-transport-"
+#| "<replaceable>method</replaceable></package>.  For instance, the APT team "
+#| "also maintains the package <package>apt-transport-https</package>, which "
+#| "provides access methods for HTTPS URIs with features similar to the http "
+#| "method.  Methods for using e.g. debtorrent are also available - see &apt-"
+#| "transport-debtorrent;."
 msgid ""
 "APT can be extended with more methods shipped in other optional packages, "
 "which should follow the naming scheme <package>apt-transport-"
 "<replaceable>method</replaceable></package>.  For instance, the APT team "
-"also maintains the package <package>apt-transport-https</package>, which "
-"provides access methods for HTTPS URIs with features similar to the http "
-"method.  Methods for using e.g. debtorrent are also available - see &apt-"
-"transport-debtorrent;."
+"also maintains the package <package>apt-transport-tor</package>, which "
+"provides access methods for HTTP and HTTPS URIs routed via the Tor network."
 msgstr ""
 "APT kann mit weiteren Methoden, die in anderen optionalen Paketen geliefert "
 "werden, die dem Namensschema <literal>apt-transport-<replaceable>Methode</"
@@ -11391,6 +11453,22 @@ msgid "Which will use the already fetched archives on the disc."
 msgstr "Es wird die bereits auf die Platte heruntergeladenen Archive benutzen."
 
 #~ msgid ""
+#~ "The http scheme specifies an HTTP server for the archive. If an "
+#~ "environment variable <envar>http_proxy</envar> is set with the format "
+#~ "http://server:port/, the proxy server specified in <envar>http_proxy</"
+#~ "envar> will be used. Users of authenticated HTTP/1.1 proxies may use a "
+#~ "string of the format http://user:pass@server:port/.  Note that this is an "
+#~ "insecure method of authentication."
+#~ msgstr ""
+#~ "Das http-Schema gibt einen HTTP-Server für das Archiv an. Wenn eine "
+#~ "Umgebungsvariable <envar>http_proxy</envar> mit dem Format http://Server:"
+#~ "Port/ gesetzt ist, wird der in <envar>http_proxy</envar> angegebene Proxy-"
+#~ "Server benutzt. Anwender eines HTTP/1.1-authentifizierten Proxys können "
+#~ "eine Zeichenkette mit dem Format http://Anwender:Passwort@Server:Port/ "
+#~ "benutzt. Beachten Sie, dass dies eine unsichere Authentifizierungsmethode "
+#~ "ist."
+
+#~ msgid ""
 #~ "As a temporary exception &apt-get; (not &apt;!) raises warnings only if "
 #~ "it encounters unauthenticated archives to give a slightly longer grace "
 #~ "period on this backward compatibility effecting change. This exception "
diff --git a/doc/po/es.po b/doc/po/es.po
index 3323b8bb1..9d4233058 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: 2017-07-03 16:55+0200\n"
+"POT-Creation-Date: 2017-08-17 19:28+0200\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"
@@ -1842,8 +1842,9 @@ msgid ""
 "not be used except in very special situations. Using <literal>force-yes</"
 "literal> can potentially destroy your system! Configuration Item: "
 "<literal>APT::Get::force-yes</literal>. This is deprecated and replaced by "
-"<option>--allow-downgrades</option>, <option>--allow-remove-essential</"
-"option>, <option>--allow-change-held-packages</option> in 1.1."
+"<option>--allow-unauthenticated</option> , <option>--allow-downgrades</"
+"option> , <option>--allow-remove-essential</option> , <option>--allow-change-"
+"held-packages</option> in 1.1."
 msgstr ""
 "Supone una respuesta afirmativa a todas las preguntas. Ésta es una opción "
 "peligrosa que hará que apt continúe sin preguntar incluso si se va a "
@@ -8105,6 +8106,44 @@ msgstr "Los tipos de URI permitidos actualmente son:"
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml
 msgid ""
+"The http scheme specifies an HTTP server for an archive and is the most "
+"commonly used method, with many options in the <literal>Acquire::http</"
+"literal> scope detailed in &apt-conf;. The URI can directly include login "
+"information if the archive requires it, but the use of &apt-authconf; should "
+"be preferred. The method also supports SOCKS5 and HTTP(S) proxies either "
+"configured via apt-specific configuration or specified by the environment "
+"variable <envar>http_proxy</envar> in the format (assuming an HTTP proxy "
+"requiring authentication)  <replaceable>http://user:pass@server:port/</"
+"replaceable>.  The authentication details for proxies can also be supplied "
+"via &apt-authconf;."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: sources.list.5.xml
+msgid ""
+"Note that these forms of authentication are insecure as the whole "
+"communication with the remote server (or proxy) is not encrypted so a "
+"sufficiently capable attacker can observe and record login as well as all "
+"other interactions. The attacker can <emphasis>not</emphasis> modify the "
+"communication through as APTs data security model is independent of the "
+"chosen transport method. See &apt-secure; for details."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: sources.list.5.xml
+msgid ""
+"The https scheme specifies an HTTPS server for an archive and is very "
+"similar in use and available options to the http scheme. The main difference "
+"is that the communication between apt and server (or proxy) is encrypted. "
+"Note that the encryption does not prevent an attacker from knowing which "
+"server (or proxy) apt is communicating with and deeper analyses can "
+"potentially still reveal which data was downloaded. If this is a concern the "
+"Tor-based schemes mentioned further below might be a suitable alternative."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: sources.list.5.xml
+msgid ""
 "The file scheme allows an arbitrary directory in the file system to be "
 "considered an archive. This is useful for NFS mounts and local mirrors or "
 "archives."
@@ -8115,9 +8154,15 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml
+#, fuzzy
+#| msgid ""
+#| "The cdrom scheme allows APT to use a local CD-ROM drive with media "
+#| "swapping. Use the &apt-cdrom; program to create cdrom entries in the "
+#| "source list."
 msgid ""
-"The cdrom scheme allows APT to use a local CD-ROM drive with media swapping. "
-"Use the &apt-cdrom; program to create cdrom entries in the source list."
+"The cdrom scheme allows APT to use a local CD-ROM, DVD or USB drive with "
+"media swapping. Use the &apt-cdrom; program to create cdrom entries in the "
+"source list."
 msgstr ""
 "El esquema «cdrom» permite a APT utilizar la unidad de CD-ROM local. Utilice "
 "el programa &apt-cdrom; para añadir entradas de un disco óptico a «sources."
@@ -8126,26 +8171,26 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml
 msgid ""
-"The http scheme specifies an HTTP server for the archive. If an environment "
-"variable <envar>http_proxy</envar> is set with the format http://server:"
-"port/, the proxy server specified in <envar>http_proxy</envar> will be used. "
-"Users of authenticated HTTP/1.1 proxies may use a string of the format "
-"http://user:pass@server:port/.  Note that this is an insecure method of "
-"authentication."
-msgstr ""
-"El esquema «http» define un servidor HTTP como el archivo de paquetes. Si la "
-"variable de entorno <envar>http_proxy</envar> está definida con formato "
-"«http://servidor:puerto/», se usará el servidor proxy definido en "
-"<envar>http_proxy</envar>. Los usuarios de servidores proxy con "
-"autenticación HTTP/1.1 deberán usar la cadena de caracteres «http://usuario:"
-"contraseña@servidor:puerto/». Tenga en cuenta que este método de "
-"autenticación no es seguro."
+"The ftp scheme specifies an FTP server for an archive. Use of FTP is on the "
+"decline in favour of <literal>http</literal> and <literal>https</literal> "
+"and many archives either never offered or are retiring FTP access. If you "
+"still need this method many configuration options for it are available in "
+"the <literal>Acquire::ftp</literal> scope and detailed in &apt-conf;."
+msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml
+#, fuzzy
+#| msgid ""
+#| "The ftp scheme specifies an FTP server for the archive. APT's FTP "
+#| "behavior is highly configurable; for more information see the &apt-conf; "
+#| "manual page. Please note that an FTP proxy can be specified by using the "
+#| "<envar>ftp_proxy</envar> environment variable. It is possible to specify "
+#| "an HTTP proxy (HTTP proxy servers often understand FTP URLs)  using this "
+#| "environment variable and <emphasis>only</emphasis> this environment "
+#| "variable. Proxies using HTTP specified in the configuration file will be "
+#| "ignored."
 msgid ""
-"The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
-"is highly configurable; for more information see the &apt-conf; manual page. "
 "Please note that an FTP proxy can be specified by using the "
 "<envar>ftp_proxy</envar> environment variable. It is possible to specify an "
 "HTTP proxy (HTTP proxy servers often understand FTP URLs)  using this "
@@ -8196,14 +8241,21 @@ msgstr "Añadir más tipos de URI reconocidos."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml
+#, fuzzy
+#| msgid ""
+#| "APT can be extended with more methods shipped in other optional packages, "
+#| "which should follow the naming scheme <package>apt-transport-"
+#| "<replaceable>method</replaceable></package>.  For instance, the APT team "
+#| "also maintains the package <package>apt-transport-https</package>, which "
+#| "provides access methods for HTTPS URIs with features similar to the http "
+#| "method.  Methods for using e.g. debtorrent are also available - see &apt-"
+#| "transport-debtorrent;."
 msgid ""
 "APT can be extended with more methods shipped in other optional packages, "
 "which should follow the naming scheme <package>apt-transport-"
 "<replaceable>method</replaceable></package>.  For instance, the APT team "
-"also maintains the package <package>apt-transport-https</package>, which "
-"provides access methods for HTTPS URIs with features similar to the http "
-"method.  Methods for using e.g. debtorrent are also available - see &apt-"
-"transport-debtorrent;."
+"also maintains the package <package>apt-transport-tor</package>, which "
+"provides access methods for HTTP and HTTPS URIs routed via the Tor network."
 msgstr ""
 "APT se puede extender con más métodos proporcionados por paquetes "
 "opcionales, que deben seguir el esquema de denominación <package>apt-"
@@ -11218,6 +11270,22 @@ msgstr "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade\n"
 msgid "Which will use the already fetched archives on the disc."
 msgstr "Esto utiliza los archivos del disco previamente obtenidos."
 
+#~ msgid ""
+#~ "The http scheme specifies an HTTP server for the archive. If an "
+#~ "environment variable <envar>http_proxy</envar> is set with the format "
+#~ "http://server:port/, the proxy server specified in <envar>http_proxy</"
+#~ "envar> will be used. Users of authenticated HTTP/1.1 proxies may use a "
+#~ "string of the format http://user:pass@server:port/.  Note that this is an "
+#~ "insecure method of authentication."
+#~ msgstr ""
+#~ "El esquema «http» define un servidor HTTP como el archivo de paquetes. Si "
+#~ "la variable de entorno <envar>http_proxy</envar> está definida con "
+#~ "formato «http://servidor:puerto/», se usará el servidor proxy definido en "
+#~ "<envar>http_proxy</envar>. Los usuarios de servidores proxy con "
+#~ "autenticación HTTP/1.1 deberán usar la cadena de caracteres «http://"
+#~ "usuario:contraseña@servidor:puerto/». Tenga en cuenta que este método de "
+#~ "autenticación no es seguro."
+
 #~ msgid "Archive Configuration"
 #~ msgstr "Configuración del archivo"
 
diff --git a/doc/po/fr.po b/doc/po/fr.po
index 8a6c8f620..ef67f2033 100644
--- a/doc/po/fr.po
+++ b/doc/po/fr.po
@@ -12,7 +12,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: 2017-07-03 16:55+0200\n"
+"POT-Creation-Date: 2017-08-17 19:28+0200\n"
 "PO-Revision-Date: 2017-01-24 22:43+0100\n"
 "Last-Translator: Jean-Pierre Giraud <jean-pierregiraud@neuf.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -1745,14 +1745,24 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
+#, fuzzy
+#| msgid ""
+#| "Force yes; this is a dangerous option that will cause apt to continue "
+#| "without prompting if it is doing something potentially harmful. It should "
+#| "not be used except in very special situations. Using <literal>force-yes</"
+#| "literal> can potentially destroy your system! Configuration Item: "
+#| "<literal>APT::Get::force-yes</literal>. This is deprecated and replaced "
+#| "by <option>--allow-downgrades</option>, <option>--allow-remove-essential</"
+#| "option>, <option>--allow-change-held-packages</option> in 1.1."
 msgid ""
 "Force yes; this is a dangerous option that will cause apt to continue "
 "without prompting if it is doing something potentially harmful. It should "
 "not be used except in very special situations. Using <literal>force-yes</"
 "literal> can potentially destroy your system! Configuration Item: "
 "<literal>APT::Get::force-yes</literal>. This is deprecated and replaced by "
-"<option>--allow-downgrades</option>, <option>--allow-remove-essential</"
-"option>, <option>--allow-change-held-packages</option> in 1.1."
+"<option>--allow-unauthenticated</option> , <option>--allow-downgrades</"
+"option> , <option>--allow-remove-essential</option> , <option>--allow-change-"
+"held-packages</option> in 1.1."
 msgstr ""
 "Forcer l'acceptation ; cette option est dangereuse parce qu'elle laisse APT "
 "continuer sans poser de questions quand il réalise quelque chose de "
@@ -8216,6 +8226,44 @@ msgstr "Les types d'URI actuellement reconnus sont :"
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml
 msgid ""
+"The http scheme specifies an HTTP server for an archive and is the most "
+"commonly used method, with many options in the <literal>Acquire::http</"
+"literal> scope detailed in &apt-conf;. The URI can directly include login "
+"information if the archive requires it, but the use of &apt-authconf; should "
+"be preferred. The method also supports SOCKS5 and HTTP(S) proxies either "
+"configured via apt-specific configuration or specified by the environment "
+"variable <envar>http_proxy</envar> in the format (assuming an HTTP proxy "
+"requiring authentication)  <replaceable>http://user:pass@server:port/</"
+"replaceable>.  The authentication details for proxies can also be supplied "
+"via &apt-authconf;."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: sources.list.5.xml
+msgid ""
+"Note that these forms of authentication are insecure as the whole "
+"communication with the remote server (or proxy) is not encrypted so a "
+"sufficiently capable attacker can observe and record login as well as all "
+"other interactions. The attacker can <emphasis>not</emphasis> modify the "
+"communication through as APTs data security model is independent of the "
+"chosen transport method. See &apt-secure; for details."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: sources.list.5.xml
+msgid ""
+"The https scheme specifies an HTTPS server for an archive and is very "
+"similar in use and available options to the http scheme. The main difference "
+"is that the communication between apt and server (or proxy) is encrypted. "
+"Note that the encryption does not prevent an attacker from knowing which "
+"server (or proxy) apt is communicating with and deeper analyses can "
+"potentially still reveal which data was downloaded. If this is a concern the "
+"Tor-based schemes mentioned further below might be a suitable alternative."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: sources.list.5.xml
+msgid ""
 "The file scheme allows an arbitrary directory in the file system to be "
 "considered an archive. This is useful for NFS mounts and local mirrors or "
 "archives."
@@ -8226,9 +8274,15 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml
+#, fuzzy
+#| msgid ""
+#| "The cdrom scheme allows APT to use a local CD-ROM drive with media "
+#| "swapping. Use the &apt-cdrom; program to create cdrom entries in the "
+#| "source list."
 msgid ""
-"The cdrom scheme allows APT to use a local CD-ROM drive with media swapping. "
-"Use the &apt-cdrom; program to create cdrom entries in the source list."
+"The cdrom scheme allows APT to use a local CD-ROM, DVD or USB drive with "
+"media swapping. Use the &apt-cdrom; program to create cdrom entries in the "
+"source list."
 msgstr ""
 "Le procédé <literal>cdrom</literal> permet l'utilisation d'un lecteur de CD "
 "avec la possibilité de changer de media. Utilisez le programme &apt-cdrom; "
@@ -8237,25 +8291,26 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml
 msgid ""
-"The http scheme specifies an HTTP server for the archive. If an environment "
-"variable <envar>http_proxy</envar> is set with the format http://server:"
-"port/, the proxy server specified in <envar>http_proxy</envar> will be used. "
-"Users of authenticated HTTP/1.1 proxies may use a string of the format "
-"http://user:pass@server:port/.  Note that this is an insecure method of "
-"authentication."
+"The ftp scheme specifies an FTP server for an archive. Use of FTP is on the "
+"decline in favour of <literal>http</literal> and <literal>https</literal> "
+"and many archives either never offered or are retiring FTP access. If you "
+"still need this method many configuration options for it are available in "
+"the <literal>Acquire::ftp</literal> scope and detailed in &apt-conf;."
 msgstr ""
-"Le procédé <literal>http</literal> indique un serveur HTTP comme archive. Si "
-"une variable d'environnement <envar>http_proxy</envar> (au format http://"
-"server:port/)  existe, le serveur mandataire indiqué par <envar>http_proxy</"
-"envar> est utilisé.  Quand un serveur mandataire HTTP/1.1 demande une "
-"authentification, on peut utiliser la chaîne http://user:pass@server:port/. "
-"Notez qu'il s'agit d'une méthode d'authentification peu sûre."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml
+#, fuzzy
+#| msgid ""
+#| "The ftp scheme specifies an FTP server for the archive. APT's FTP "
+#| "behavior is highly configurable; for more information see the &apt-conf; "
+#| "manual page. Please note that an FTP proxy can be specified by using the "
+#| "<envar>ftp_proxy</envar> environment variable. It is possible to specify "
+#| "an HTTP proxy (HTTP proxy servers often understand FTP URLs)  using this "
+#| "environment variable and <emphasis>only</emphasis> this environment "
+#| "variable. Proxies using HTTP specified in the configuration file will be "
+#| "ignored."
 msgid ""
-"The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
-"is highly configurable; for more information see the &apt-conf; manual page. "
 "Please note that an FTP proxy can be specified by using the "
 "<envar>ftp_proxy</envar> environment variable. It is possible to specify an "
 "HTTP proxy (HTTP proxy servers often understand FTP URLs)  using this "
@@ -8308,14 +8363,21 @@ msgstr "ajout de types d'URI supplémentaires reconnues"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml
+#, fuzzy
+#| msgid ""
+#| "APT can be extended with more methods shipped in other optional packages, "
+#| "which should follow the naming scheme <package>apt-transport-"
+#| "<replaceable>method</replaceable></package>.  For instance, the APT team "
+#| "also maintains the package <package>apt-transport-https</package>, which "
+#| "provides access methods for HTTPS URIs with features similar to the http "
+#| "method.  Methods for using e.g. debtorrent are also available - see &apt-"
+#| "transport-debtorrent;."
 msgid ""
 "APT can be extended with more methods shipped in other optional packages, "
 "which should follow the naming scheme <package>apt-transport-"
 "<replaceable>method</replaceable></package>.  For instance, the APT team "
-"also maintains the package <package>apt-transport-https</package>, which "
-"provides access methods for HTTPS URIs with features similar to the http "
-"method.  Methods for using e.g. debtorrent are also available - see &apt-"
-"transport-debtorrent;."
+"also maintains the package <package>apt-transport-tor</package>, which "
+"provides access methods for HTTP and HTTPS URIs routed via the Tor network."
 msgstr ""
 "APT peut être complété avec des méthodes supplémentaires fournies par des "
 "paquets optionnels dont le schéma de nommage est <literal>apt-transport-"
@@ -11358,6 +11420,22 @@ msgid "Which will use the already fetched archives on the disc."
 msgstr "Cette commande utilisera les fichiers récupérés sur le disque."
 
 #~ msgid ""
+#~ "The http scheme specifies an HTTP server for the archive. If an "
+#~ "environment variable <envar>http_proxy</envar> is set with the format "
+#~ "http://server:port/, the proxy server specified in <envar>http_proxy</"
+#~ "envar> will be used. Users of authenticated HTTP/1.1 proxies may use a "
+#~ "string of the format http://user:pass@server:port/.  Note that this is an "
+#~ "insecure method of authentication."
+#~ msgstr ""
+#~ "Le procédé <literal>http</literal> indique un serveur HTTP comme archive. "
+#~ "Si une variable d'environnement <envar>http_proxy</envar> (au format "
+#~ "http://server:port/)  existe, le serveur mandataire indiqué par "
+#~ "<envar>http_proxy</envar> est utilisé.  Quand un serveur mandataire "
+#~ "HTTP/1.1 demande une authentification, on peut utiliser la chaîne http://"
+#~ "user:pass@server:port/. Notez qu'il s'agit d'une méthode "
+#~ "d'authentification peu sûre."
+
+#~ msgid ""
 #~ "As a temporary exception &apt-get; (not &apt;!) raises warnings only if "
 #~ "it encounters unauthenticated archives to give a slightly longer grace "
 #~ "period on this backward compatibility effecting change. This exception "
diff --git a/doc/po/it.po b/doc/po/it.po
index 716fa8b02..65c74391d 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: 2017-07-08 14:03+0200\n"
+"POT-Creation-Date: 2017-08-17 19:28+0200\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"
@@ -1789,14 +1789,24 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
+#, fuzzy
+#| msgid ""
+#| "Force yes; this is a dangerous option that will cause apt to continue "
+#| "without prompting if it is doing something potentially harmful. It should "
+#| "not be used except in very special situations. Using <literal>force-yes</"
+#| "literal> can potentially destroy your system! Configuration Item: "
+#| "<literal>APT::Get::force-yes</literal>. This is deprecated and replaced "
+#| "by <option>--allow-downgrades</option>, <option>--allow-remove-essential</"
+#| "option>, <option>--allow-change-held-packages</option> in 1.1."
 msgid ""
 "Force yes; this is a dangerous option that will cause apt to continue "
 "without prompting if it is doing something potentially harmful. It should "
 "not be used except in very special situations. Using <literal>force-yes</"
 "literal> can potentially destroy your system! Configuration Item: "
 "<literal>APT::Get::force-yes</literal>. This is deprecated and replaced by "
-"<option>--allow-downgrades</option>, <option>--allow-remove-essential</"
-"option>, <option>--allow-change-held-packages</option> in 1.1."
+"<option>--allow-unauthenticated</option> , <option>--allow-downgrades</"
+"option> , <option>--allow-remove-essential</option> , <option>--allow-change-"
+"held-packages</option> in 1.1."
 msgstr ""
 "Forza «sì»; questa è un'opzione pericolosa che fa sì che apt, se sta facendo "
 "qualcosa di potenzialmente pericoloso, continui senza chiedere "
@@ -8223,6 +8233,44 @@ msgstr "I tipi di URI attualmente riconosciuti sono:"
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml
 msgid ""
+"The http scheme specifies an HTTP server for an archive and is the most "
+"commonly used method, with many options in the <literal>Acquire::http</"
+"literal> scope detailed in &apt-conf;. The URI can directly include login "
+"information if the archive requires it, but the use of &apt-authconf; should "
+"be preferred. The method also supports SOCKS5 and HTTP(S) proxies either "
+"configured via apt-specific configuration or specified by the environment "
+"variable <envar>http_proxy</envar> in the format (assuming an HTTP proxy "
+"requiring authentication)  <replaceable>http://user:pass@server:port/</"
+"replaceable>.  The authentication details for proxies can also be supplied "
+"via &apt-authconf;."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: sources.list.5.xml
+msgid ""
+"Note that these forms of authentication are insecure as the whole "
+"communication with the remote server (or proxy) is not encrypted so a "
+"sufficiently capable attacker can observe and record login as well as all "
+"other interactions. The attacker can <emphasis>not</emphasis> modify the "
+"communication through as APTs data security model is independent of the "
+"chosen transport method. See &apt-secure; for details."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: sources.list.5.xml
+msgid ""
+"The https scheme specifies an HTTPS server for an archive and is very "
+"similar in use and available options to the http scheme. The main difference "
+"is that the communication between apt and server (or proxy) is encrypted. "
+"Note that the encryption does not prevent an attacker from knowing which "
+"server (or proxy) apt is communicating with and deeper analyses can "
+"potentially still reveal which data was downloaded. If this is a concern the "
+"Tor-based schemes mentioned further below might be a suitable alternative."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: sources.list.5.xml
+msgid ""
 "The file scheme allows an arbitrary directory in the file system to be "
 "considered an archive. This is useful for NFS mounts and local mirrors or "
 "archives."
@@ -8233,9 +8281,15 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml
+#, fuzzy
+#| msgid ""
+#| "The cdrom scheme allows APT to use a local CD-ROM drive with media "
+#| "swapping. Use the &apt-cdrom; program to create cdrom entries in the "
+#| "source list."
 msgid ""
-"The cdrom scheme allows APT to use a local CD-ROM drive with media swapping. "
-"Use the &apt-cdrom; program to create cdrom entries in the source list."
+"The cdrom scheme allows APT to use a local CD-ROM, DVD or USB drive with "
+"media swapping. Use the &apt-cdrom; program to create cdrom entries in the "
+"source list."
 msgstr ""
 "Il tipo cdrom permette ad APT di usare un'unità CD-ROM locale cambiando i "
 "supporti. Usare il programma &apt-cdrom; per creare voci cdrom nell'elenco "
@@ -8244,25 +8298,26 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml
 msgid ""
-"The http scheme specifies an HTTP server for the archive. If an environment "
-"variable <envar>http_proxy</envar> is set with the format http://server:"
-"port/, the proxy server specified in <envar>http_proxy</envar> will be used. "
-"Users of authenticated HTTP/1.1 proxies may use a string of the format "
-"http://user:pass@server:port/.  Note that this is an insecure method of "
-"authentication."
+"The ftp scheme specifies an FTP server for an archive. Use of FTP is on the "
+"decline in favour of <literal>http</literal> and <literal>https</literal> "
+"and many archives either never offered or are retiring FTP access. If you "
+"still need this method many configuration options for it are available in "
+"the <literal>Acquire::ftp</literal> scope and detailed in &apt-conf;."
 msgstr ""
-"Il tipo http specifica un server HTTP per l'archivio. Se è impostata una "
-"variabile d'ambiente <envar>http_proxy</envar> con il formato http://server:"
-"porta/, verrà usato il server proxy specificato in <envar>http_proxy</"
-"envar>. Gli utenti con proxy HTTP/1.1 con autenticazione possono usare una "
-"stringa nel formato http://utente:password@server:porta/. Notare che questo "
-"è un metodo di autenticazione non sicuro."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml
+#, fuzzy
+#| msgid ""
+#| "The ftp scheme specifies an FTP server for the archive. APT's FTP "
+#| "behavior is highly configurable; for more information see the &apt-conf; "
+#| "manual page. Please note that an FTP proxy can be specified by using the "
+#| "<envar>ftp_proxy</envar> environment variable. It is possible to specify "
+#| "an HTTP proxy (HTTP proxy servers often understand FTP URLs)  using this "
+#| "environment variable and <emphasis>only</emphasis> this environment "
+#| "variable. Proxies using HTTP specified in the configuration file will be "
+#| "ignored."
 msgid ""
-"The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
-"is highly configurable; for more information see the &apt-conf; manual page. "
 "Please note that an FTP proxy can be specified by using the "
 "<envar>ftp_proxy</envar> environment variable. It is possible to specify an "
 "HTTP proxy (HTTP proxy servers often understand FTP URLs)  using this "
@@ -8312,14 +8367,21 @@ msgstr "aggiungere ulteriori tipi di URI riconoscibili"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml
+#, fuzzy
+#| msgid ""
+#| "APT can be extended with more methods shipped in other optional packages, "
+#| "which should follow the naming scheme <package>apt-transport-"
+#| "<replaceable>method</replaceable></package>.  For instance, the APT team "
+#| "also maintains the package <package>apt-transport-https</package>, which "
+#| "provides access methods for HTTPS URIs with features similar to the http "
+#| "method.  Methods for using e.g. debtorrent are also available - see &apt-"
+#| "transport-debtorrent;."
 msgid ""
 "APT can be extended with more methods shipped in other optional packages, "
 "which should follow the naming scheme <package>apt-transport-"
 "<replaceable>method</replaceable></package>.  For instance, the APT team "
-"also maintains the package <package>apt-transport-https</package>, which "
-"provides access methods for HTTPS URIs with features similar to the http "
-"method.  Methods for using e.g. debtorrent are also available - see &apt-"
-"transport-debtorrent;."
+"also maintains the package <package>apt-transport-tor</package>, which "
+"provides access methods for HTTP and HTTPS URIs routed via the Tor network."
 msgstr ""
 "APT può essere esteso con ulteriori metodi forniti in altri pacchetti "
 "opzionali, i cui nomi devono seguire lo schema <package>apt-transport-"
@@ -11326,6 +11388,22 @@ msgid "Which will use the already fetched archives on the disc."
 msgstr "che userà gli archivi già scaricati e presenti sul disco."
 
 #~ msgid ""
+#~ "The http scheme specifies an HTTP server for the archive. If an "
+#~ "environment variable <envar>http_proxy</envar> is set with the format "
+#~ "http://server:port/, the proxy server specified in <envar>http_proxy</"
+#~ "envar> will be used. Users of authenticated HTTP/1.1 proxies may use a "
+#~ "string of the format http://user:pass@server:port/.  Note that this is an "
+#~ "insecure method of authentication."
+#~ msgstr ""
+#~ "Il tipo http specifica un server HTTP per l'archivio. Se è impostata una "
+#~ "variabile d'ambiente <envar>http_proxy</envar> con il formato http://"
+#~ "server:porta/, verrà usato il server proxy specificato in "
+#~ "<envar>http_proxy</envar>. Gli utenti con proxy HTTP/1.1 con "
+#~ "autenticazione possono usare una stringa nel formato http://utente:"
+#~ "password@server:porta/. Notare che questo è un metodo di autenticazione "
+#~ "non sicuro."
+
+#~ msgid ""
 #~ "As a temporary exception &apt-get; (not &apt;!) raises warnings only if "
 #~ "it encounters unauthenticated archives to give a slightly longer grace "
 #~ "period on this backward compatibility effecting change. This exception "
diff --git a/doc/po/ja.po b/doc/po/ja.po
index 07f66a33e..c25f109b1 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: 2017-07-03 16:55+0200\n"
+"POT-Creation-Date: 2017-08-17 19:28+0200\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"
@@ -1734,14 +1734,24 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
+#, fuzzy
+#| msgid ""
+#| "Force yes; this is a dangerous option that will cause apt to continue "
+#| "without prompting if it is doing something potentially harmful. It should "
+#| "not be used except in very special situations. Using <literal>force-yes</"
+#| "literal> can potentially destroy your system! Configuration Item: "
+#| "<literal>APT::Get::force-yes</literal>. This is deprecated and replaced "
+#| "by <option>--allow-downgrades</option>, <option>--allow-remove-essential</"
+#| "option>, <option>--allow-change-held-packages</option> in 1.1."
 msgid ""
 "Force yes; this is a dangerous option that will cause apt to continue "
 "without prompting if it is doing something potentially harmful. It should "
 "not be used except in very special situations. Using <literal>force-yes</"
 "literal> can potentially destroy your system! Configuration Item: "
 "<literal>APT::Get::force-yes</literal>. This is deprecated and replaced by "
-"<option>--allow-downgrades</option>, <option>--allow-remove-essential</"
-"option>, <option>--allow-change-held-packages</option> in 1.1."
+"<option>--allow-unauthenticated</option> , <option>--allow-downgrades</"
+"option> , <option>--allow-remove-essential</option> , <option>--allow-change-"
+"held-packages</option> in 1.1."
 msgstr ""
 "強制承諾 - 何か損傷を与えかねない動作をしようとした場合でも、確認なしで実行し"
 "てしまう危険なオプションです。よほどの状況でなければ、使うべきではありませ"
@@ -7874,6 +7884,44 @@ msgstr "現在認識できる URI タイプは以下のとおりです:"
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml
 msgid ""
+"The http scheme specifies an HTTP server for an archive and is the most "
+"commonly used method, with many options in the <literal>Acquire::http</"
+"literal> scope detailed in &apt-conf;. The URI can directly include login "
+"information if the archive requires it, but the use of &apt-authconf; should "
+"be preferred. The method also supports SOCKS5 and HTTP(S) proxies either "
+"configured via apt-specific configuration or specified by the environment "
+"variable <envar>http_proxy</envar> in the format (assuming an HTTP proxy "
+"requiring authentication)  <replaceable>http://user:pass@server:port/</"
+"replaceable>.  The authentication details for proxies can also be supplied "
+"via &apt-authconf;."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: sources.list.5.xml
+msgid ""
+"Note that these forms of authentication are insecure as the whole "
+"communication with the remote server (or proxy) is not encrypted so a "
+"sufficiently capable attacker can observe and record login as well as all "
+"other interactions. The attacker can <emphasis>not</emphasis> modify the "
+"communication through as APTs data security model is independent of the "
+"chosen transport method. See &apt-secure; for details."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: sources.list.5.xml
+msgid ""
+"The https scheme specifies an HTTPS server for an archive and is very "
+"similar in use and available options to the http scheme. The main difference "
+"is that the communication between apt and server (or proxy) is encrypted. "
+"Note that the encryption does not prevent an attacker from knowing which "
+"server (or proxy) apt is communicating with and deeper analyses can "
+"potentially still reveal which data was downloaded. If this is a concern the "
+"Tor-based schemes mentioned further below might be a suitable alternative."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: sources.list.5.xml
+msgid ""
 "The file scheme allows an arbitrary directory in the file system to be "
 "considered an archive. This is useful for NFS mounts and local mirrors or "
 "archives."
@@ -7883,9 +7931,15 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml
+#, fuzzy
+#| msgid ""
+#| "The cdrom scheme allows APT to use a local CD-ROM drive with media "
+#| "swapping. Use the &apt-cdrom; program to create cdrom entries in the "
+#| "source list."
 msgid ""
-"The cdrom scheme allows APT to use a local CD-ROM drive with media swapping. "
-"Use the &apt-cdrom; program to create cdrom entries in the source list."
+"The cdrom scheme allows APT to use a local CD-ROM, DVD or USB drive with "
+"media swapping. Use the &apt-cdrom; program to create cdrom entries in the "
+"source list."
 msgstr ""
 "cdrom スキームは、APT がローカル CD-ROM ドライブを、メディア交換しながら使え"
 "るようにします。取得元リストに cdrom エントリを追加するには、&apt-cdrom; プロ"
@@ -7894,24 +7948,26 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml
 msgid ""
-"The http scheme specifies an HTTP server for the archive. If an environment "
-"variable <envar>http_proxy</envar> is set with the format http://server:"
-"port/, the proxy server specified in <envar>http_proxy</envar> will be used. "
-"Users of authenticated HTTP/1.1 proxies may use a string of the format "
-"http://user:pass@server:port/.  Note that this is an insecure method of "
-"authentication."
+"The ftp scheme specifies an FTP server for an archive. Use of FTP is on the "
+"decline in favour of <literal>http</literal> and <literal>https</literal> "
+"and many archives either never offered or are retiring FTP access. If you "
+"still need this method many configuration options for it are available in "
+"the <literal>Acquire::ftp</literal> scope and detailed in &apt-conf;."
 msgstr ""
-"http スキームはアーカイブとして、HTTP サーバを指定します。環境変数 "
-"<envar>http_proxy</envar> が、http://server:port/ と言った形で指定されていれ"
-"ば、<envar>http_proxy</envar> で指定したプロキシサーバを使用します。ユーザ認"
-"証が必要な HTTP/1.1 プロキシの場合、http://user:pass@server:port/ という形で"
-"指定してください。この認証方法は安全ではないことに注意してください。"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml
+#, fuzzy
+#| msgid ""
+#| "The ftp scheme specifies an FTP server for the archive. APT's FTP "
+#| "behavior is highly configurable; for more information see the &apt-conf; "
+#| "manual page. Please note that an FTP proxy can be specified by using the "
+#| "<envar>ftp_proxy</envar> environment variable. It is possible to specify "
+#| "an HTTP proxy (HTTP proxy servers often understand FTP URLs)  using this "
+#| "environment variable and <emphasis>only</emphasis> this environment "
+#| "variable. Proxies using HTTP specified in the configuration file will be "
+#| "ignored."
 msgid ""
-"The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
-"is highly configurable; for more information see the &apt-conf; manual page. "
 "Please note that an FTP proxy can be specified by using the "
 "<envar>ftp_proxy</envar> environment variable. It is possible to specify an "
 "HTTP proxy (HTTP proxy servers often understand FTP URLs)  using this "
@@ -7959,14 +8015,21 @@ msgstr "さらに認識できる URI タイプの追加"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml
+#, fuzzy
+#| msgid ""
+#| "APT can be extended with more methods shipped in other optional packages, "
+#| "which should follow the naming scheme <package>apt-transport-"
+#| "<replaceable>method</replaceable></package>.  For instance, the APT team "
+#| "also maintains the package <package>apt-transport-https</package>, which "
+#| "provides access methods for HTTPS URIs with features similar to the http "
+#| "method.  Methods for using e.g. debtorrent are also available - see &apt-"
+#| "transport-debtorrent;."
 msgid ""
 "APT can be extended with more methods shipped in other optional packages, "
 "which should follow the naming scheme <package>apt-transport-"
 "<replaceable>method</replaceable></package>.  For instance, the APT team "
-"also maintains the package <package>apt-transport-https</package>, which "
-"provides access methods for HTTPS URIs with features similar to the http "
-"method.  Methods for using e.g. debtorrent are also available - see &apt-"
-"transport-debtorrent;."
+"also maintains the package <package>apt-transport-tor</package>, which "
+"provides access methods for HTTP and HTTPS URIs routed via the Tor network."
 msgstr ""
 "APT は他の追加パッケージ (<package>apt-transport-<replaceable>method</"
 "replaceable></package> という命名規則) により、より多くの方法を使えるよう拡張"
@@ -10883,6 +10946,20 @@ msgid "Which will use the already fetched archives on the disc."
 msgstr "これで、ディスクにある取得済みのアーカイブを使用するようになります。"
 
 #~ msgid ""
+#~ "The http scheme specifies an HTTP server for the archive. If an "
+#~ "environment variable <envar>http_proxy</envar> is set with the format "
+#~ "http://server:port/, the proxy server specified in <envar>http_proxy</"
+#~ "envar> will be used. Users of authenticated HTTP/1.1 proxies may use a "
+#~ "string of the format http://user:pass@server:port/.  Note that this is an "
+#~ "insecure method of authentication."
+#~ msgstr ""
+#~ "http スキームはアーカイブとして、HTTP サーバを指定します。環境変数 "
+#~ "<envar>http_proxy</envar> が、http://server:port/ と言った形で指定されてい"
+#~ "れば、<envar>http_proxy</envar> で指定したプロキシサーバを使用します。ユー"
+#~ "ザ認証が必要な HTTP/1.1 プロキシの場合、http://user:pass@server:port/ とい"
+#~ "う形で指定してください。この認証方法は安全ではないことに注意してください。"
+
+#~ msgid ""
 #~ "As a temporary exception &apt-get; (not &apt;!) raises warnings only if "
 #~ "it encounters unauthenticated archives to give a slightly longer grace "
 #~ "period on this backward compatibility effecting change. This exception "
diff --git a/doc/po/nl.po b/doc/po/nl.po
index 2da4013bd..069223ec6 100644
--- a/doc/po/nl.po
+++ b/doc/po/nl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 1.4~beta4-nl\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-07-03 16:55+0200\n"
+"POT-Creation-Date: 2017-08-17 19:28+0200\n"
 "PO-Revision-Date: 2017-01-19 17:53+0100\n"
 "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n"
 "Language-Team: Debian Dutch l10n Team <debian-l10n-dutch@lists.debian.org>\n"
@@ -1820,14 +1820,24 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
+#, fuzzy
+#| msgid ""
+#| "Force yes; this is a dangerous option that will cause apt to continue "
+#| "without prompting if it is doing something potentially harmful. It should "
+#| "not be used except in very special situations. Using <literal>force-yes</"
+#| "literal> can potentially destroy your system! Configuration Item: "
+#| "<literal>APT::Get::force-yes</literal>. This is deprecated and replaced "
+#| "by <option>--allow-downgrades</option>, <option>--allow-remove-essential</"
+#| "option>, <option>--allow-change-held-packages</option> in 1.1."
 msgid ""
 "Force yes; this is a dangerous option that will cause apt to continue "
 "without prompting if it is doing something potentially harmful. It should "
 "not be used except in very special situations. Using <literal>force-yes</"
 "literal> can potentially destroy your system! Configuration Item: "
 "<literal>APT::Get::force-yes</literal>. This is deprecated and replaced by "
-"<option>--allow-downgrades</option>, <option>--allow-remove-essential</"
-"option>, <option>--allow-change-held-packages</option> in 1.1."
+"<option>--allow-unauthenticated</option> , <option>--allow-downgrades</"
+"option> , <option>--allow-remove-essential</option> , <option>--allow-change-"
+"held-packages</option> in 1.1."
 msgstr ""
 "Een ja doordrukken; dit is een gevaarlijke optie die er voor zorgt dat apt "
 "zonder vragen voortgaat als het iets doet dat schadelijk kan zijn. U zou dit "
@@ -8381,6 +8391,44 @@ msgstr "De momenteel herkende URI-types zijn:"
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml
 msgid ""
+"The http scheme specifies an HTTP server for an archive and is the most "
+"commonly used method, with many options in the <literal>Acquire::http</"
+"literal> scope detailed in &apt-conf;. The URI can directly include login "
+"information if the archive requires it, but the use of &apt-authconf; should "
+"be preferred. The method also supports SOCKS5 and HTTP(S) proxies either "
+"configured via apt-specific configuration or specified by the environment "
+"variable <envar>http_proxy</envar> in the format (assuming an HTTP proxy "
+"requiring authentication)  <replaceable>http://user:pass@server:port/</"
+"replaceable>.  The authentication details for proxies can also be supplied "
+"via &apt-authconf;."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: sources.list.5.xml
+msgid ""
+"Note that these forms of authentication are insecure as the whole "
+"communication with the remote server (or proxy) is not encrypted so a "
+"sufficiently capable attacker can observe and record login as well as all "
+"other interactions. The attacker can <emphasis>not</emphasis> modify the "
+"communication through as APTs data security model is independent of the "
+"chosen transport method. See &apt-secure; for details."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: sources.list.5.xml
+msgid ""
+"The https scheme specifies an HTTPS server for an archive and is very "
+"similar in use and available options to the http scheme. The main difference "
+"is that the communication between apt and server (or proxy) is encrypted. "
+"Note that the encryption does not prevent an attacker from knowing which "
+"server (or proxy) apt is communicating with and deeper analyses can "
+"potentially still reveal which data was downloaded. If this is a concern the "
+"Tor-based schemes mentioned further below might be a suitable alternative."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: sources.list.5.xml
+msgid ""
 "The file scheme allows an arbitrary directory in the file system to be "
 "considered an archive. This is useful for NFS mounts and local mirrors or "
 "archives."
@@ -8391,9 +8439,15 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml
+#, fuzzy
+#| msgid ""
+#| "The cdrom scheme allows APT to use a local CD-ROM drive with media "
+#| "swapping. Use the &apt-cdrom; program to create cdrom entries in the "
+#| "source list."
 msgid ""
-"The cdrom scheme allows APT to use a local CD-ROM drive with media swapping. "
-"Use the &apt-cdrom; program to create cdrom entries in the source list."
+"The cdrom scheme allows APT to use a local CD-ROM, DVD or USB drive with "
+"media swapping. Use the &apt-cdrom; program to create cdrom entries in the "
+"source list."
 msgstr ""
 "De methode cdrom laat APT toe om met meerdere CD's in een lokaal CD-station "
 "te werken. Gebruik het programma &apt-cdrom; om regels met CD-pakketbronnen "
@@ -8402,25 +8456,26 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml
 msgid ""
-"The http scheme specifies an HTTP server for the archive. If an environment "
-"variable <envar>http_proxy</envar> is set with the format http://server:"
-"port/, the proxy server specified in <envar>http_proxy</envar> will be used. "
-"Users of authenticated HTTP/1.1 proxies may use a string of the format "
-"http://user:pass@server:port/.  Note that this is an insecure method of "
-"authentication."
+"The ftp scheme specifies an FTP server for an archive. Use of FTP is on the "
+"decline in favour of <literal>http</literal> and <literal>https</literal> "
+"and many archives either never offered or are retiring FTP access. If you "
+"still need this method many configuration options for it are available in "
+"the <literal>Acquire::ftp</literal> scope and detailed in &apt-conf;."
 msgstr ""
-"De methode http specificeert een HTTP-server voor het archief. Indien een "
-"omgevingsvariabele <envar>http_proxy</envar> bestaat in het formaat http://"
-"server:port/, dan zal de in <envar>http_proxy</envar> opgegeven proxy-server "
-"gebruikt worden. Gebruikers van een geauthenticeerde HTTP/1.1 proxy kunnen "
-"een tekenreeks gebruiken volgens het formaat http://user:pass@server:port/. "
-"Merk op dat dit geen veilige authenticatiemethode is."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml
+#, fuzzy
+#| msgid ""
+#| "The ftp scheme specifies an FTP server for the archive. APT's FTP "
+#| "behavior is highly configurable; for more information see the &apt-conf; "
+#| "manual page. Please note that an FTP proxy can be specified by using the "
+#| "<envar>ftp_proxy</envar> environment variable. It is possible to specify "
+#| "an HTTP proxy (HTTP proxy servers often understand FTP URLs)  using this "
+#| "environment variable and <emphasis>only</emphasis> this environment "
+#| "variable. Proxies using HTTP specified in the configuration file will be "
+#| "ignored."
 msgid ""
-"The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
-"is highly configurable; for more information see the &apt-conf; manual page. "
 "Please note that an FTP proxy can be specified by using the "
 "<envar>ftp_proxy</envar> environment variable. It is possible to specify an "
 "HTTP proxy (HTTP proxy servers often understand FTP URLs)  using this "
@@ -8472,14 +8527,21 @@ msgstr "nog andere herkenbare URI-types toevoegen"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml
+#, fuzzy
+#| msgid ""
+#| "APT can be extended with more methods shipped in other optional packages, "
+#| "which should follow the naming scheme <package>apt-transport-"
+#| "<replaceable>method</replaceable></package>.  For instance, the APT team "
+#| "also maintains the package <package>apt-transport-https</package>, which "
+#| "provides access methods for HTTPS URIs with features similar to the http "
+#| "method.  Methods for using e.g. debtorrent are also available - see &apt-"
+#| "transport-debtorrent;."
 msgid ""
 "APT can be extended with more methods shipped in other optional packages, "
 "which should follow the naming scheme <package>apt-transport-"
 "<replaceable>method</replaceable></package>.  For instance, the APT team "
-"also maintains the package <package>apt-transport-https</package>, which "
-"provides access methods for HTTPS URIs with features similar to the http "
-"method.  Methods for using e.g. debtorrent are also available - see &apt-"
-"transport-debtorrent;."
+"also maintains the package <package>apt-transport-tor</package>, which "
+"provides access methods for HTTP and HTTPS URIs routed via the Tor network."
 msgstr ""
 "APT kan uitgebreid worden met extra methodes die door andere optionele "
 "pakketten ter beschikking gesteld worden en die moeten voldoen aan het "
@@ -11564,6 +11626,22 @@ msgstr ""
 "En dit zal gebruik maken van de reeds opgehaalde archieven op de schijf."
 
 #~ msgid ""
+#~ "The http scheme specifies an HTTP server for the archive. If an "
+#~ "environment variable <envar>http_proxy</envar> is set with the format "
+#~ "http://server:port/, the proxy server specified in <envar>http_proxy</"
+#~ "envar> will be used. Users of authenticated HTTP/1.1 proxies may use a "
+#~ "string of the format http://user:pass@server:port/.  Note that this is an "
+#~ "insecure method of authentication."
+#~ msgstr ""
+#~ "De methode http specificeert een HTTP-server voor het archief. Indien een "
+#~ "omgevingsvariabele <envar>http_proxy</envar> bestaat in het formaat "
+#~ "http://server:port/, dan zal de in <envar>http_proxy</envar> opgegeven "
+#~ "proxy-server gebruikt worden. Gebruikers van een geauthenticeerde "
+#~ "HTTP/1.1 proxy kunnen een tekenreeks gebruiken volgens het formaat http://"
+#~ "user:pass@server:port/. Merk op dat dit geen veilige authenticatiemethode "
+#~ "is."
+
+#~ msgid ""
 #~ "As a temporary exception &apt-get; (not &apt;!) raises warnings only if "
 #~ "it encounters unauthenticated archives to give a slightly longer grace "
 #~ "period on this backward compatibility effecting change. This exception "
diff --git a/doc/po/pl.po b/doc/po/pl.po
index 03e9f380e..e8fb21af7 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: 2017-07-03 16:55+0200\n"
+"POT-Creation-Date: 2017-08-17 19:28+0200\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"
@@ -1839,8 +1839,9 @@ msgid ""
 "not be used except in very special situations. Using <literal>force-yes</"
 "literal> can potentially destroy your system! Configuration Item: "
 "<literal>APT::Get::force-yes</literal>. This is deprecated and replaced by "
-"<option>--allow-downgrades</option>, <option>--allow-remove-essential</"
-"option>, <option>--allow-change-held-packages</option> in 1.1."
+"<option>--allow-unauthenticated</option> , <option>--allow-downgrades</"
+"option> , <option>--allow-remove-essential</option> , <option>--allow-change-"
+"held-packages</option> in 1.1."
 msgstr ""
 "Wymuszenie. Jest to niebezpieczna opcja, która powoduje, że apt-get "
 "kontynuuje swoje działanie bez żadnej interakcji z użytkownikiem, nawet "
@@ -7495,6 +7496,44 @@ msgstr "Obecnie rozpoznawane są następujące typy URI:"
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml
 msgid ""
+"The http scheme specifies an HTTP server for an archive and is the most "
+"commonly used method, with many options in the <literal>Acquire::http</"
+"literal> scope detailed in &apt-conf;. The URI can directly include login "
+"information if the archive requires it, but the use of &apt-authconf; should "
+"be preferred. The method also supports SOCKS5 and HTTP(S) proxies either "
+"configured via apt-specific configuration or specified by the environment "
+"variable <envar>http_proxy</envar> in the format (assuming an HTTP proxy "
+"requiring authentication)  <replaceable>http://user:pass@server:port/</"
+"replaceable>.  The authentication details for proxies can also be supplied "
+"via &apt-authconf;."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: sources.list.5.xml
+msgid ""
+"Note that these forms of authentication are insecure as the whole "
+"communication with the remote server (or proxy) is not encrypted so a "
+"sufficiently capable attacker can observe and record login as well as all "
+"other interactions. The attacker can <emphasis>not</emphasis> modify the "
+"communication through as APTs data security model is independent of the "
+"chosen transport method. See &apt-secure; for details."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: sources.list.5.xml
+msgid ""
+"The https scheme specifies an HTTPS server for an archive and is very "
+"similar in use and available options to the http scheme. The main difference "
+"is that the communication between apt and server (or proxy) is encrypted. "
+"Note that the encryption does not prevent an attacker from knowing which "
+"server (or proxy) apt is communicating with and deeper analyses can "
+"potentially still reveal which data was downloaded. If this is a concern the "
+"Tor-based schemes mentioned further below might be a suitable alternative."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: sources.list.5.xml
+msgid ""
 "The file scheme allows an arbitrary directory in the file system to be "
 "considered an archive. This is useful for NFS mounts and local mirrors or "
 "archives."
@@ -7505,9 +7544,15 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml
+#, fuzzy
+#| msgid ""
+#| "The cdrom scheme allows APT to use a local CD-ROM drive with media "
+#| "swapping. Use the &apt-cdrom; program to create cdrom entries in the "
+#| "source list."
 msgid ""
-"The cdrom scheme allows APT to use a local CD-ROM drive with media swapping. "
-"Use the &apt-cdrom; program to create cdrom entries in the source list."
+"The cdrom scheme allows APT to use a local CD-ROM, DVD or USB drive with "
+"media swapping. Use the &apt-cdrom; program to create cdrom entries in the "
+"source list."
 msgstr ""
 "Schemat cdrom pozwala APT na użycie lokalnego dysku CD-ROM ze zmianą dysków. "
 "Prosimy używać programu &apt-cdrom; do dodawania takich wpisów w sources."
@@ -7516,25 +7561,26 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml
 msgid ""
-"The http scheme specifies an HTTP server for the archive. If an environment "
-"variable <envar>http_proxy</envar> is set with the format http://server:"
-"port/, the proxy server specified in <envar>http_proxy</envar> will be used. "
-"Users of authenticated HTTP/1.1 proxies may use a string of the format "
-"http://user:pass@server:port/.  Note that this is an insecure method of "
-"authentication."
+"The ftp scheme specifies an FTP server for an archive. Use of FTP is on the "
+"decline in favour of <literal>http</literal> and <literal>https</literal> "
+"and many archives either never offered or are retiring FTP access. If you "
+"still need this method many configuration options for it are available in "
+"the <literal>Acquire::ftp</literal> scope and detailed in &apt-conf;."
 msgstr ""
-"Schemat http opisuje serwer archiwum HTTP. Jeśli ustawiono zmienną "
-"środowiskową <envar>http_proxy</envar> w formacie http://serwer:port/, to "
-"APT użyje serwera proxy określonego w tej zmiennej. Użytkownicy serwerów "
-"proxy wymagających autoryzacji mogą ustawić tę zmienną na http://użytkownik:"
-"hasło@serwer:port/. Proszę zauważyć, że taki sposób autoryzacji nie jest "
-"bezpieczny."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml
+#, fuzzy
+#| msgid ""
+#| "The ftp scheme specifies an FTP server for the archive. APT's FTP "
+#| "behavior is highly configurable; for more information see the &apt-conf; "
+#| "manual page. Please note that an FTP proxy can be specified by using the "
+#| "<envar>ftp_proxy</envar> environment variable. It is possible to specify "
+#| "an HTTP proxy (HTTP proxy servers often understand FTP URLs)  using this "
+#| "environment variable and <emphasis>only</emphasis> this environment "
+#| "variable. Proxies using HTTP specified in the configuration file will be "
+#| "ignored."
 msgid ""
-"The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
-"is highly configurable; for more information see the &apt-conf; manual page. "
 "Please note that an FTP proxy can be specified by using the "
 "<envar>ftp_proxy</envar> environment variable. It is possible to specify an "
 "HTTP proxy (HTTP proxy servers often understand FTP URLs)  using this "
@@ -7584,14 +7630,21 @@ msgstr "dodawanie innych rozpoznawanych typów URI"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml
+#, fuzzy
+#| msgid ""
+#| "APT can be extended with more methods shipped in other optional packages, "
+#| "which should follow the naming scheme <package>apt-transport-"
+#| "<replaceable>method</replaceable></package>.  For instance, the APT team "
+#| "also maintains the package <package>apt-transport-https</package>, which "
+#| "provides access methods for HTTPS URIs with features similar to the http "
+#| "method.  Methods for using e.g. debtorrent are also available - see &apt-"
+#| "transport-debtorrent;."
 msgid ""
 "APT can be extended with more methods shipped in other optional packages, "
 "which should follow the naming scheme <package>apt-transport-"
 "<replaceable>method</replaceable></package>.  For instance, the APT team "
-"also maintains the package <package>apt-transport-https</package>, which "
-"provides access methods for HTTPS URIs with features similar to the http "
-"method.  Methods for using e.g. debtorrent are also available - see &apt-"
-"transport-debtorrent;."
+"also maintains the package <package>apt-transport-tor</package>, which "
+"provides access methods for HTTP and HTTPS URIs routed via the Tor network."
 msgstr ""
 "APT może być rozszerzone o więcej metod, pochodzących z innych opcjonalnych "
 "pakietów, które powinny się nazywać <package>apt-transport-"
@@ -10384,6 +10437,21 @@ msgstr "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade\n"
 msgid "Which will use the already fetched archives on the disc."
 msgstr "Które użyje pobranych uprzednio archiwów z dysku."
 
+#~ msgid ""
+#~ "The http scheme specifies an HTTP server for the archive. If an "
+#~ "environment variable <envar>http_proxy</envar> is set with the format "
+#~ "http://server:port/, the proxy server specified in <envar>http_proxy</"
+#~ "envar> will be used. Users of authenticated HTTP/1.1 proxies may use a "
+#~ "string of the format http://user:pass@server:port/.  Note that this is an "
+#~ "insecure method of authentication."
+#~ msgstr ""
+#~ "Schemat http opisuje serwer archiwum HTTP. Jeśli ustawiono zmienną "
+#~ "środowiskową <envar>http_proxy</envar> w formacie http://serwer:port/, to "
+#~ "APT użyje serwera proxy określonego w tej zmiennej. Użytkownicy serwerów "
+#~ "proxy wymagających autoryzacji mogą ustawić tę zmienną na http://"
+#~ "użytkownik:hasło@serwer:port/. Proszę zauważyć, że taki sposób "
+#~ "autoryzacji nie jest bezpieczny."
+
 #, fuzzy
 #~| msgid "Archive configuration"
 #~ msgid "Archive Configuration"
diff --git a/doc/po/pt.po b/doc/po/pt.po
index 0ea4faabb..83d3c3071 100644
--- a/doc/po/pt.po
+++ b/doc/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 1.0.7\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-07-03 16:55+0200\n"
+"POT-Creation-Date: 2017-08-17 19:28+0200\n"
 "PO-Revision-Date: 2014-08-29 00:34+0100\n"
 "Last-Translator: Américo Monteiro <a_monteiro@gmx.com>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -1791,8 +1791,9 @@ msgid ""
 "not be used except in very special situations. Using <literal>force-yes</"
 "literal> can potentially destroy your system! Configuration Item: "
 "<literal>APT::Get::force-yes</literal>. This is deprecated and replaced by "
-"<option>--allow-downgrades</option>, <option>--allow-remove-essential</"
-"option>, <option>--allow-change-held-packages</option> in 1.1."
+"<option>--allow-unauthenticated</option> , <option>--allow-downgrades</"
+"option> , <option>--allow-remove-essential</option> , <option>--allow-change-"
+"held-packages</option> in 1.1."
 msgstr ""
 "Força o sim; Esta é uma opção perigosa que irá fazer com que o apt continue "
 "sem avisar quando está a fazer algo potencialmente prejudicial. Não deve ser "
@@ -8042,6 +8043,44 @@ msgstr "Os tipos de URI actualmente reconhecidos são:"
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml
 msgid ""
+"The http scheme specifies an HTTP server for an archive and is the most "
+"commonly used method, with many options in the <literal>Acquire::http</"
+"literal> scope detailed in &apt-conf;. The URI can directly include login "
+"information if the archive requires it, but the use of &apt-authconf; should "
+"be preferred. The method also supports SOCKS5 and HTTP(S) proxies either "
+"configured via apt-specific configuration or specified by the environment "
+"variable <envar>http_proxy</envar> in the format (assuming an HTTP proxy "
+"requiring authentication)  <replaceable>http://user:pass@server:port/</"
+"replaceable>.  The authentication details for proxies can also be supplied "
+"via &apt-authconf;."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: sources.list.5.xml
+msgid ""
+"Note that these forms of authentication are insecure as the whole "
+"communication with the remote server (or proxy) is not encrypted so a "
+"sufficiently capable attacker can observe and record login as well as all "
+"other interactions. The attacker can <emphasis>not</emphasis> modify the "
+"communication through as APTs data security model is independent of the "
+"chosen transport method. See &apt-secure; for details."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: sources.list.5.xml
+msgid ""
+"The https scheme specifies an HTTPS server for an archive and is very "
+"similar in use and available options to the http scheme. The main difference "
+"is that the communication between apt and server (or proxy) is encrypted. "
+"Note that the encryption does not prevent an attacker from knowing which "
+"server (or proxy) apt is communicating with and deeper analyses can "
+"potentially still reveal which data was downloaded. If this is a concern the "
+"Tor-based schemes mentioned further below might be a suitable alternative."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: sources.list.5.xml
+msgid ""
 "The file scheme allows an arbitrary directory in the file system to be "
 "considered an archive. This is useful for NFS mounts and local mirrors or "
 "archives."
@@ -8052,9 +8091,15 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml
+#, fuzzy
+#| msgid ""
+#| "The cdrom scheme allows APT to use a local CD-ROM drive with media "
+#| "swapping. Use the &apt-cdrom; program to create cdrom entries in the "
+#| "source list."
 msgid ""
-"The cdrom scheme allows APT to use a local CD-ROM drive with media swapping. "
-"Use the &apt-cdrom; program to create cdrom entries in the source list."
+"The cdrom scheme allows APT to use a local CD-ROM, DVD or USB drive with "
+"media swapping. Use the &apt-cdrom; program to create cdrom entries in the "
+"source list."
 msgstr ""
 "O esquema cdrom permite ao APT usar uma drive de CD-ROM local com mudança de "
 "media. Use o programa &apt-cdrom; para criar entradas cdrom na lista de "
@@ -8063,25 +8108,26 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml
 msgid ""
-"The http scheme specifies an HTTP server for the archive. If an environment "
-"variable <envar>http_proxy</envar> is set with the format http://server:"
-"port/, the proxy server specified in <envar>http_proxy</envar> will be used. "
-"Users of authenticated HTTP/1.1 proxies may use a string of the format "
-"http://user:pass@server:port/.  Note that this is an insecure method of "
-"authentication."
+"The ftp scheme specifies an FTP server for an archive. Use of FTP is on the "
+"decline in favour of <literal>http</literal> and <literal>https</literal> "
+"and many archives either never offered or are retiring FTP access. If you "
+"still need this method many configuration options for it are available in "
+"the <literal>Acquire::ftp</literal> scope and detailed in &apt-conf;."
 msgstr ""
-"O esquema http especifica um servidor HTTP para o arquivo. Se uma variável "
-"de ambiente <envar>http_proxy</envar> estiver definida com o formato http://"
-"server:port/, será usado o servidor proxy especificado em <envar>http_proxy</"
-"envar>. Os utilizadores de proxies HTTP/1.1 autenticados pode usar uma "
-"string do formato http://user:pass@server:port/. Note que este não é um "
-"método de autenticação seguro."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml
+#, fuzzy
+#| msgid ""
+#| "The ftp scheme specifies an FTP server for the archive. APT's FTP "
+#| "behavior is highly configurable; for more information see the &apt-conf; "
+#| "manual page. Please note that an FTP proxy can be specified by using the "
+#| "<envar>ftp_proxy</envar> environment variable. It is possible to specify "
+#| "an HTTP proxy (HTTP proxy servers often understand FTP URLs)  using this "
+#| "environment variable and <emphasis>only</emphasis> this environment "
+#| "variable. Proxies using HTTP specified in the configuration file will be "
+#| "ignored."
 msgid ""
-"The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
-"is highly configurable; for more information see the &apt-conf; manual page. "
 "Please note that an FTP proxy can be specified by using the "
 "<envar>ftp_proxy</envar> environment variable. It is possible to specify an "
 "HTTP proxy (HTTP proxy servers often understand FTP URLs)  using this "
@@ -8132,14 +8178,21 @@ msgstr "adicionando mais tipos de URI reconhecíveis"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml
+#, fuzzy
+#| msgid ""
+#| "APT can be extended with more methods shipped in other optional packages, "
+#| "which should follow the naming scheme <package>apt-transport-"
+#| "<replaceable>method</replaceable></package>.  For instance, the APT team "
+#| "also maintains the package <package>apt-transport-https</package>, which "
+#| "provides access methods for HTTPS URIs with features similar to the http "
+#| "method.  Methods for using e.g. debtorrent are also available - see &apt-"
+#| "transport-debtorrent;."
 msgid ""
 "APT can be extended with more methods shipped in other optional packages, "
 "which should follow the naming scheme <package>apt-transport-"
 "<replaceable>method</replaceable></package>.  For instance, the APT team "
-"also maintains the package <package>apt-transport-https</package>, which "
-"provides access methods for HTTPS URIs with features similar to the http "
-"method.  Methods for using e.g. debtorrent are also available - see &apt-"
-"transport-debtorrent;."
+"also maintains the package <package>apt-transport-tor</package>, which "
+"provides access methods for HTTP and HTTPS URIs routed via the Tor network."
 msgstr ""
 "O APT pode ser estendido com mais métodos lançados em outros pacotes "
 "opcionais, que devem seguir o esquema de nomeação <literal>apt-transport-"
@@ -11136,6 +11189,21 @@ msgstr "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade\n"
 msgid "Which will use the already fetched archives on the disc."
 msgstr "O qual irá usar os arquivos já obtidos e que estão no disco."
 
+#~ msgid ""
+#~ "The http scheme specifies an HTTP server for the archive. If an "
+#~ "environment variable <envar>http_proxy</envar> is set with the format "
+#~ "http://server:port/, the proxy server specified in <envar>http_proxy</"
+#~ "envar> will be used. Users of authenticated HTTP/1.1 proxies may use a "
+#~ "string of the format http://user:pass@server:port/.  Note that this is an "
+#~ "insecure method of authentication."
+#~ msgstr ""
+#~ "O esquema http especifica um servidor HTTP para o arquivo. Se uma "
+#~ "variável de ambiente <envar>http_proxy</envar> estiver definida com o "
+#~ "formato http://server:port/, será usado o servidor proxy especificado em "
+#~ "<envar>http_proxy</envar>. Os utilizadores de proxies HTTP/1.1 "
+#~ "autenticados pode usar uma string do formato http://user:pass@server:"
+#~ "port/. Note que este não é um método de autenticação seguro."
+
 #~ msgid "Archive Configuration"
 #~ msgstr "Configuração de arquivos"
 
diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po
index b68a7dc91..b4db10629 100644
--- a/doc/po/pt_BR.po
+++ b/doc/po/pt_BR.po
@@ -9,7 +9,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: 2017-07-03 16:55+0200\n"
+"POT-Creation-Date: 2017-08-17 19:28+0200\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"
@@ -1247,8 +1247,9 @@ msgid ""
 "not be used except in very special situations. Using <literal>force-yes</"
 "literal> can potentially destroy your system! Configuration Item: "
 "<literal>APT::Get::force-yes</literal>. This is deprecated and replaced by "
-"<option>--allow-downgrades</option>, <option>--allow-remove-essential</"
-"option>, <option>--allow-change-held-packages</option> in 1.1."
+"<option>--allow-unauthenticated</option> , <option>--allow-downgrades</"
+"option> , <option>--allow-remove-essential</option> , <option>--allow-change-"
+"held-packages</option> in 1.1."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -6031,6 +6032,44 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml
 msgid ""
+"The http scheme specifies an HTTP server for an archive and is the most "
+"commonly used method, with many options in the <literal>Acquire::http</"
+"literal> scope detailed in &apt-conf;. The URI can directly include login "
+"information if the archive requires it, but the use of &apt-authconf; should "
+"be preferred. The method also supports SOCKS5 and HTTP(S) proxies either "
+"configured via apt-specific configuration or specified by the environment "
+"variable <envar>http_proxy</envar> in the format (assuming an HTTP proxy "
+"requiring authentication)  <replaceable>http://user:pass@server:port/</"
+"replaceable>.  The authentication details for proxies can also be supplied "
+"via &apt-authconf;."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: sources.list.5.xml
+msgid ""
+"Note that these forms of authentication are insecure as the whole "
+"communication with the remote server (or proxy) is not encrypted so a "
+"sufficiently capable attacker can observe and record login as well as all "
+"other interactions. The attacker can <emphasis>not</emphasis> modify the "
+"communication through as APTs data security model is independent of the "
+"chosen transport method. See &apt-secure; for details."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: sources.list.5.xml
+msgid ""
+"The https scheme specifies an HTTPS server for an archive and is very "
+"similar in use and available options to the http scheme. The main difference "
+"is that the communication between apt and server (or proxy) is encrypted. "
+"Note that the encryption does not prevent an attacker from knowing which "
+"server (or proxy) apt is communicating with and deeper analyses can "
+"potentially still reveal which data was downloaded. If this is a concern the "
+"Tor-based schemes mentioned further below might be a suitable alternative."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: sources.list.5.xml
+msgid ""
 "The file scheme allows an arbitrary directory in the file system to be "
 "considered an archive. This is useful for NFS mounts and local mirrors or "
 "archives."
@@ -6039,26 +6078,24 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml
 msgid ""
-"The cdrom scheme allows APT to use a local CD-ROM drive with media swapping. "
-"Use the &apt-cdrom; program to create cdrom entries in the source list."
+"The cdrom scheme allows APT to use a local CD-ROM, DVD or USB drive with "
+"media swapping. Use the &apt-cdrom; program to create cdrom entries in the "
+"source list."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml
 msgid ""
-"The http scheme specifies an HTTP server for the archive. If an environment "
-"variable <envar>http_proxy</envar> is set with the format http://server:"
-"port/, the proxy server specified in <envar>http_proxy</envar> will be used. "
-"Users of authenticated HTTP/1.1 proxies may use a string of the format "
-"http://user:pass@server:port/.  Note that this is an insecure method of "
-"authentication."
+"The ftp scheme specifies an FTP server for an archive. Use of FTP is on the "
+"decline in favour of <literal>http</literal> and <literal>https</literal> "
+"and many archives either never offered or are retiring FTP access. If you "
+"still need this method many configuration options for it are available in "
+"the <literal>Acquire::ftp</literal> scope and detailed in &apt-conf;."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml
 msgid ""
-"The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
-"is highly configurable; for more information see the &apt-conf; manual page. "
 "Please note that an FTP proxy can be specified by using the "
 "<envar>ftp_proxy</envar> environment variable. It is possible to specify an "
 "HTTP proxy (HTTP proxy servers often understand FTP URLs)  using this "
@@ -6096,10 +6133,8 @@ msgid ""
 "APT can be extended with more methods shipped in other optional packages, "
 "which should follow the naming scheme <package>apt-transport-"
 "<replaceable>method</replaceable></package>.  For instance, the APT team "
-"also maintains the package <package>apt-transport-https</package>, which "
-"provides access methods for HTTPS URIs with features similar to the http "
-"method.  Methods for using e.g. debtorrent are also available - see &apt-"
-"transport-debtorrent;."
+"also maintains the package <package>apt-transport-tor</package>, which "
+"provides access methods for HTTP and HTTPS URIs routed via the Tor network."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>