Release 1.5~beta21.5_beta2

1 files changed, 55 insertions, 19 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>