Merge branch 'docs' into 'master'

Perform minor copy-editing on the docs

See merge request apt-team/apt!58

9 files changed, 14 insertions, 14 deletions

diff --git a/doc/acquire-additional-files.md b/doc/acquire-additional-files.md
index 30c83ef25..5b0335bc2 100644
--- a/doc/acquire-additional-files.md
+++ b/doc/acquire-additional-files.md
@@ -96,7 +96,7 @@ Additional optional properties:
   deal with compressed files transparently you have to explicitly set
   this option to `false` to avoid problems with users setting the option
   globally. On the other hand, if you set it to `true` or don't set it you
-  have to ensure your front-end can deal with all compressed fileformats
+  have to ensure your front-end can deal with all compressed file formats
   supported by apt (libapt users can e.g. use `FileFd`, others can use
   the `cat-file` command of `/usr/lib/apt/apt-helper`).
 * `Fallback-Of`: Is by default not set. If it is set and specifies another
diff --git a/doc/apt-cache.8.xml b/doc/apt-cache.8.xml
index b8c6aa989..fdb25ee03 100644
--- a/doc/apt-cache.8.xml
+++ b/doc/apt-cache.8.xml
@@ -54,7 +54,7 @@
 
      <varlistentry><term><option>showpkg</option> <option><replaceable>&synopsis-pkg;</replaceable>…</option></term>
      <listitem><para><literal>showpkg</literal> displays information about the packages listed on the 
-     command line. Remaining arguments are package names. The available 
+     command line. Remaining arguments are package names. The available
      versions and reverse dependencies of each package listed are listed, as 
      well as forward dependencies for each version. Forward (normal) 
      dependencies are those packages upon which the package in question 
@@ -208,7 +208,7 @@ Reverse Provides:
      </varlistentry>
      
      <varlistentry><term><option>dotty</option> <option><replaceable>&synopsis-pkg;</replaceable>…</option></term>
-     <listitem><para><literal>dotty</literal> takes a list of packages on the command line and 
+     <listitem><para><literal>dotty</literal> takes a list of packages on the command line and
      generates output suitable for use by dotty from the 
      <ulink url="http://www.research.att.com/sw/tools/graphviz/">GraphViz</ulink>
      package. The result will be a set of nodes and edges representing the 
diff --git a/doc/apt-ftparchive.1.xml b/doc/apt-ftparchive.1.xml
index 246cc03d3..32b01aa82 100644
--- a/doc/apt-ftparchive.1.xml
+++ b/doc/apt-ftparchive.1.xml
@@ -32,7 +32,7 @@
  &synopsis-command-apt-ftparchive;
 
  <refsect1><title>Description</title>
-   <para><command>apt-ftparchive</command> is the command line tool that generates the index 
+   <para><command>apt-ftparchive</command> is the command line tool that generates the index
    files that APT uses to access a distribution source. The index files should 
    be generated on the origin site based on the content of that site.</para>
 
@@ -584,7 +584,7 @@ for i in Sections do
      as the now outdated cached metadata like size and checksums will be used. With this option
      enabled this will no longer happen as it will be checked if the file was changed.
      Note that this option is set to "<literal>false</literal>" by default as it is not recommend
-     to upload multiply versions/builds of a package with the same versionnumber, so in theory
+     to upload multiply versions/builds of a package with the same version number, so in theory
      nobody will have these problems and therefore all these extra checks are useless.
      </para></listitem>
      </varlistentry>
diff --git a/doc/apt-key.8.xml b/doc/apt-key.8.xml
index a1c677d65..31bd3d862 100644
--- a/doc/apt-key.8.xml
+++ b/doc/apt-key.8.xml
@@ -40,7 +40,7 @@
    Note that if usage of <command>apt-key</command> is desired the additional
    installation of the GNU Privacy Guard suite (packaged in
    <package>gnupg</package>) is required. For this reason alone the programmatic
-   usage (especially in package maintainerscripts!) is strongly discouraged.
+   usage (especially in package maintainer scripts!) is strongly discouraged.
    Further more the output format of all commands is undefined and can and does
    change whenever the underlying commands change. <command>apt-key</command> will
    try to detect such usage and generates warnings on stderr in these cases.
diff --git a/doc/apt-transport-http.1.xml b/doc/apt-transport-http.1.xml
index f239da554..92fac0467 100644
--- a/doc/apt-transport-http.1.xml
+++ b/doc/apt-transport-http.1.xml
@@ -51,7 +51,7 @@ server limitations.</para>
 <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 which should be used only for certain hosts can be specified via
-<literal>Acquire::http::Proxy::<replaceable>host</replaceable></literal>. Even more finegrained control
+<literal>Acquire::http::Proxy::<replaceable>host</replaceable></literal>. Even more fine-grained control
 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>.
diff --git a/doc/apt.8.xml b/doc/apt.8.xml
index f81ae18d3..e43ad9e9e 100644
--- a/doc/apt.8.xml
+++ b/doc/apt.8.xml
@@ -140,7 +140,7 @@
 
      <varlistentry><term><option>edit-sources</option> (work-in-progress)</term>
      <listitem><para><literal>edit-sources</literal> lets you edit
-	   your &sources-list; files in your preferred texteditor while also
+	   your &sources-list; files in your preferred text editor while also
 	   providing basic sanity checks.
      </para></listitem>
      </varlistentry>
diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml
index 5ce693c2c..fdb1023a7 100644
--- a/doc/apt.conf.5.xml
+++ b/doc/apt.conf.5.xml
@@ -254,7 +254,7 @@ APT::Compressor::rev {
      with this option disabled you should try to explicitly
      <literal>install</literal> the package APT is unable to configure
      immediately; but please make sure you also report your problem to your
-     distribution and to the APT team with the buglink below, so they can
+     distribution and to the APT team with the bug link below, so they can
      work on improving or correcting the upgrade process.
      </para></listitem>
      </varlistentry>
@@ -431,7 +431,7 @@ APT::Compressor::rev {
      </varlistentry>
 
      <varlistentry><term><option>http</option> <option>https</option></term>
-     <listitem><para>The options in these scopes configure APTs acquire transports for the protocols
+     <listitem><para>The options in these scopes configure APT's acquire transports for the protocols
      HTTP and HTTPS and are documented in the &apt-transport-http; and &apt-transport-https;
      manpages respectively.</para></listitem>
      </varlistentry>
diff --git a/doc/json-hooks-protocol.md b/doc/json-hooks-protocol.md
index ddf0fa0e3..09633e71d 100644
--- a/doc/json-hooks-protocol.md
+++ b/doc/json-hooks-protocol.md
@@ -27,7 +27,7 @@ The general life of a hook is as following.
 
 It is unspecified whether a hook is sent one or more messages. For
 example, a hook may be started only once for the lifetime of the apt
-process and receive multiple notificatgions, but a hook may also be
+process and receive multiple notifications, but a hook may also be
 started multiple times. Hooks should thus be stateless.
 
 ## JSON messages
diff --git a/doc/sources.list.5.xml b/doc/sources.list.5.xml
index 302154999..7395a74f3 100644
--- a/doc/sources.list.5.xml
+++ b/doc/sources.list.5.xml
@@ -99,7 +99,7 @@
        usually easier to add the field "Enabled: no" to the stanza to disable
        the entry. Removing the field or setting it to yes re-enables it.
 
-       Options have the same syntax as every other field: A fieldname separated by
+       Options have the same syntax as every other field: A field name separated by
        a colon (<literal>:</literal>) and optionally spaces from its value(s).
        Note especially that multiple values are separated by whitespaces (like spaces,
        tabs and newlines), not by commas as in the one-line format.
@@ -198,7 +198,7 @@ deb-src [ option1=value1 option2=value2 ] uri suite [component1] [component2] [.
        is accessed and how data is acquired from it. Format, syntax and names
        of the options vary between the one-line-style and deb822-style formats
        as described, but they both have the same options available. For simplicity
-       we list the deb822 fieldname and provide the one-line name in brackets.
+       we list the deb822 field name and provide the one-line name in brackets.
        Remember that besides setting multivalue options explicitly, there is also
        the option to modify them based on the default, but we aren't listing those
        names explicitly here. Unsupported options are silently ignored by all
@@ -398,7 +398,7 @@ deb-src [ option1=value1 option2=value2 ] uri suite [component1] [component2] [.
     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
+    communication through as APT's data security model is independent of the
     chosen transport method. See &apt-secure; for details.</para></listitem>
     </varlistentry>