summaryrefslogtreecommitdiff
path: root/doc/apt-transport-http.1.xml
diff options
context:
space:
mode:
authorJustin B Rye <justin.byam.rye@gmail.com>2018-01-05 22:35:31 +0100
committerDavid Kalnischkies <david@kalnischkies.de>2018-01-18 15:26:39 +0100
commitb199b7329801efd705c41d93dae4869900a952f1 (patch)
tree9ff4b7e2d917263727a7f800f64235cab4e6043c /doc/apt-transport-http.1.xml
parent697b6cc80057b08534fb2e7ea6c913aae34cceb9 (diff)
review and fix the three new apt-transport- manpages
References: https://lists.debian.org/debian-l10n-english/2018/01/msg00002.html
Diffstat (limited to 'doc/apt-transport-http.1.xml')
-rw-r--r--doc/apt-transport-http.1.xml34
1 files changed, 17 insertions, 17 deletions
diff --git a/doc/apt-transport-http.1.xml b/doc/apt-transport-http.1.xml
index 546e47761..7426a4502 100644
--- a/doc/apt-transport-http.1.xml
+++ b/doc/apt-transport-http.1.xml
@@ -35,30 +35,30 @@ most used of all transports. Note that a transport is never called directly by
a user but used by APT tools based on user configuration.</para>
<para>HTTP is an unencrypted transport protocol meaning that the
whole communication with the remote server (or proxy) can be observed by a
-sufficiently capable attacker referred to commonly as man in the middle (MITM).
-Such an attacker can <emphasis>not</emphasis> modify the communication to compromise
-the security of your system through as APTs data security model is independent of the
-chosen transport method. This is explained in detail in &apt-secure;. An overview over
+sufficiently capable attacker commonly referred to as a "man in the middle" (MITM).
+However, such an attacker can <emphasis>not</emphasis> modify the communication to compromise
+the security of your system, as APT's data security model is independent of the
+chosen transport method. This is explained in detail in &apt-secure;. An overview of
available transport methods is given in &sources-list;.</para>
</refsect1>
<refsect1><title>Options</title>
-<para>Various options are available to modify its behaviour which can be set in
-an &apt-conf; file ranging from proxy configuration to workaround for specific
-server insufficiencies.</para>
+<para>Various options can be set in an &apt-conf; file to modify its behavior,
+ranging from proxy configuration to workarounds for specific
+server limitations.</para>
<refsect2><title>Proxy Configuration</title>
<para>The environment variable <envar>http_proxy</envar> is supported for system wide configuration.
-Proxies specific to apt can be configured via the option <literal>Acquire::http::Proxy</literal>.
+Proxies specific to APT can be configured via the option <literal>Acquire::http::Proxy</literal>.
Proxies which should be used only for certain hosts can be specified via
<literal>Acquire::http::Proxy::<replaceable>host</replaceable></literal>. Even more finegrained control
-can be achieved via proxy autodetection detailed further below.
+can be achieved via proxy autodetection, detailed further below.
All these options use the URI format <literal><replaceable>scheme</replaceable>://[[<replaceable>user</replaceable>][:<replaceable>pass</replaceable>]@]<replaceable>host</replaceable>[:<replaceable>port</replaceable>]/</literal>.
Supported URI schemes are <literal>socks5h</literal> (SOCKS5 with remote DNS resolution), <literal>http</literal> and <literal>https</literal>.
-Authentification details can be supplied via &apt-authconf; instead of including it in the URI directly.</para>
+Authentication details can be supplied via &apt-authconf; instead of including it in the URI directly.</para>
<para>The various APT configuration options support the special value <literal>DIRECT</literal> meaning that
-no proxy should be used. The environment variable <envar>no_proxy</envar> with the same propose is also supported.</para>
-<para>Further more there are three settings provided for cache control with HTTP/1.1 compliant proxy caches:
+no proxy should be used. The environment variable <envar>no_proxy</envar> is also supported for the same purpose.</para>
+<para>Furthermore, there are three settings provided for cache control with HTTP/1.1 compliant proxy caches:
<literal>Acquire::http::No-Cache</literal> tells the proxy not to use its
cached response under any circumstances.
<literal>Acquire::http::Max-Age</literal> sets the allowed maximum age (in
@@ -70,8 +70,8 @@ the proxy from polluting its cache with (big) .deb files.</para>
<refsect2><title>Automatic Proxy Configuration</title>
<para><literal>Acquire::http::Proxy-Auto-Detect</literal> can be used to
-specify an external command to discover the http proxy to use. The first
-and only parameter is an URI denoting the host to be contacted to allow
+specify an external command to discover the HTTP proxy to use. The first
+and only parameter is a URI denoting the host to be contacted, to allow
for host-specific configuration. APT expects the command to output the
proxy on stdout as a single line in the previously specified URI format
or the word <literal>DIRECT</literal> if no proxy should be used. No output
@@ -93,8 +93,8 @@ disables downloading from multiple servers at the same time.</para>
<para>The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to
enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be beneficial e.g. on
high-latency connections. It specifies how many requests are sent in a pipeline.
-APT tries to detect and workaround misbehaving webservers and proxies at runtime, but
-if you know that yours does not conform to the HTTP/1.1 specification pipelining can
+APT tries to detect and work around misbehaving webservers and proxies at runtime, but
+if you know that yours does not conform to the HTTP/1.1 specification, pipelining can
be disabled by setting the value to 0. It is enabled by default with the value 10.</para>
<para><literal>Acquire::http::AllowRedirect</literal> controls whether APT will follow
redirects, which is enabled by default.</para>
@@ -102,7 +102,7 @@ redirects, which is enabled by default.</para>
User-Agent for the http download method as some proxies allow access for clients
only if the client uses a known identifier.</para>
<para><literal>Acquire::http::SendAccept</literal> is enabled by default and
-sends a <literal>Accept: text/*</literal> header field to the server for
+sends an <literal>Accept: text/*</literal> header field to the server for
requests without file extensions to prevent the server from attempting content
negotiation.</para>
</refsect2>