merged from lp:~donkult/apt/sid

debian/changelog

@@ -1,10 +1,17 @@
-apt (0.8.15.9+nmu1) unstable; urgency=low
+apt (0.8.15.10) UNRELEASEDunstable; urgency=low
 
   [ David Kalnischkies ]
   * algorithms.cc:
     - show a debug why a package was kept by ResolveByKeep()
+  * doc/manpage-style.xml:
+    - put <brackets> around email addresses
 
- -- David Kalnischkies <kalnischkies@gmail.com>  Mon, 17 Oct 2011 16:36:22 +0200
+  [ Chris Leick ]
+  * German manpage translation update
+  * doc/*.xml:
+    - find and fix a bunch of misspellings
+
+ -- David Kalnischkies <kalnischkies@gmail.com>  Sun, 20 Nov 2011 18:02:08 +0100
 
 apt (0.8.15.9) unstable; urgency=low
 

doc/apt-get.8.xml

@@ -280,7 +280,7 @@
      <varlistentry><term>build-dep</term>
      <listitem><para><literal>build-dep</literal> causes apt-get to install/remove packages in an 
      attempt to satisfy the build dependencies for a source package. By default the dependencies are
-     satisfied to build the package nativly. If desired a host-architecture can be specified
+     satisfied to build the package natively. If desired a host-architecture can be specified
      with the <option>--host-architecture</option> option instead.</para></listitem>
      </varlistentry>
 
@@ -448,8 +448,8 @@
                    <term><option>--host-architecture</option></term>
      <listitem><para>This option controls the architecture packages are built for
      by <command>apt-get source --compile</command> and how cross-builddependencies
-     are satisfied. By default is not set which means that the host architecture
-     is the same as the build architecture (which is defined by <literal>APT::Architecture</literal>)
+     are satisfied. By default is it not set which means that the host architecture
+     is the same as the build architecture (which is defined by <literal>APT::Architecture</literal>).
      Configuration Item: <literal>APT::Get::Host-Architecture</literal>
      </para></listitem>
      </varlistentry>

doc/apt-key.8.xml

@@ -165,7 +165,7 @@
       <listitem><para>With this option it is possible to specify a specific keyring
       file the command should operate on. The default is that a command is executed
       on the <filename>trusted.gpg</filename> file as well as on all parts in the
-      <filename>trusted.gpg.d</filename> directory, through <filename>trusted.gpg</filename>
+      <filename>trusted.gpg.d</filename> directory, though <filename>trusted.gpg</filename>
       is the primary keyring which means that e.g. new keys are added to this one.
       </para></listitem>
       </varlistentry>

doc/apt.conf.5.xml

@@ -281,7 +281,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
 	 valid after it was created (indicated by the <literal>Date</literal> header).
 	 Use this if you need to use a seldomly updated (local) mirror of a more
 	 regular updated archive with a <literal>Valid-Until</literal> header
-	 instead of competely disabling the expiration date checking.
+	 instead of completely disabling the expiration date checking.
 	 Archive specific settings can and should be used by appending the label of
 	 the archive to the option name.
 	 </para></listitem>

doc/manpage-style.xsl

@@ -6,4 +6,6 @@
 
 <xsl:param name="man.output.encoding" select="'UTF-8'" />
 
+<xsl:template match="email">&lt;<xsl:apply-templates/>&gt;</xsl:template>
+
 </xsl:stylesheet>

doc/po/apt-doc.pot

@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-10-05 23:06+0300\n"
+"POT-Creation-Date: 2011-11-20 17:58+0100\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"
@@ -2904,7 +2904,7 @@ msgstr ""
 msgid ""
 "<literal>build-dep</literal> causes apt-get to install/remove packages in an "
 "attempt to satisfy the build dependencies for a source package. By default "
-"the dependencies are satisfied to build the package nativly. If desired a "
+"the dependencies are satisfied to build the package natively. If desired a "
 "host-architecture can be specified with the "
 "<option>--host-architecture</option> option instead."
 msgstr ""
@@ -3206,9 +3206,9 @@ msgstr ""
 msgid ""
 "This option controls the architecture packages are built for by "
 "<command>apt-get source --compile</command> and how cross-builddependencies "
-"are satisfied. By default is not set which means that the host architecture "
-"is the same as the build architecture (which is defined by "
-"<literal>APT::Architecture</literal>)  Configuration Item: "
+"are satisfied. By default is it not set which means that the host "
+"architecture is the same as the build architecture (which is defined by "
+"<literal>APT::Architecture</literal>).  Configuration Item: "
 "<literal>APT::Get::Host-Architecture</literal>"
 msgstr ""
 
@@ -3677,7 +3677,7 @@ msgid ""
 "With this option it is possible to specify a specific keyring file the "
 "command should operate on. The default is that a command is executed on the "
 "<filename>trusted.gpg</filename> file as well as on all parts in the "
-"<filename>trusted.gpg.d</filename> directory, through "
+"<filename>trusted.gpg.d</filename> directory, though "
 "<filename>trusted.gpg</filename> is the primary keyring which means that "
 "e.g. new keys are added to this one."
 msgstr ""
@@ -4633,7 +4633,7 @@ msgid ""
 "Minimum of seconds the Release file should be considered valid after it was "
 "created (indicated by the <literal>Date</literal> header).  Use this if you "
 "need to use a seldomly updated (local) mirror of a more regular updated "
-"archive with a <literal>Valid-Until</literal> header instead of competely "
+"archive with a <literal>Valid-Until</literal> header instead of completely "
 "disabling the expiration date checking.  Archive specific settings can and "
 "should be used by appending the label of the archive to the option name."
 msgstr ""
@@ -6987,7 +6987,7 @@ msgid ""
 "square brackets. It can consist of multiple settings in the form "
 "<literal><replaceable>setting</replaceable>=<replaceable>value</replaceable></literal>.  "
 "Multiple settings are separated by spaces. The following settings are "
-"supported by APT, note through that unsupported settings will be ignored "
+"supported by APT, note though that unsupported settings will be ignored "
 "silently:"
 msgstr ""
 

doc/sources.list.5.xml

@@ -113,7 +113,7 @@
    square brackets. It can consist of multiple settings in the form
    <literal><replaceable>setting</replaceable>=<replaceable>value</replaceable></literal>.
    Multiple settings are separated by spaces. The following settings are supported by APT,
-   note through that unsupported settings will be ignored silently:
+   note though that unsupported settings will be ignored silently:
    <itemizedlist><listitem><para><literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</replaceable>,…</literal>
    can be used to specify for which architectures packages information should
    be downloaded. If this option is not set all architectures defined by the