X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/5632b305b24161e18a809b4bb33a19ec8ea3d497..2130caa8f4f4d9512551fdf869af499fc901b117:/doc/po/apt-doc.pot

diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index 20f563c46..630aec3b0 100644
--- a/doc/po/apt-doc.pot
+++ b/doc/po/apt-doc.pot
@@ -7,13 +7,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-10-18 10:39+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"
+"Language: \n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: ENCODING"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #. type: TH
 #: apt.8:17
@@ -73,57 +74,40 @@ msgstr ""
 #. type: SH
 #: apt.8:31
 #, no-wrap
-msgid "OPTIONS"
-msgstr ""
-
-#. type: Plain text
-#: apt.8:33 apt.8:35
-msgid "None."
-msgstr ""
-
-#. type: SH
-#: apt.8:33
-#, no-wrap
-msgid "FILES"
-msgstr ""
-
-#. type: SH
-#: apt.8:35
-#, no-wrap
 msgid "SEE ALSO"
 msgstr ""
 
 #. type: Plain text
-#: apt.8:42
+#: apt.8:38
 msgid ""
 "B<apt-cache>(8), B<apt-get>(8), B<apt.conf>(5), B<sources.list>(5), "
 "B<apt_preferences>(5), B<apt-secure>(8)"
 msgstr ""
 
 #. type: SH
-#: apt.8:42
+#: apt.8:38
 #, no-wrap
 msgid "DIAGNOSTICS"
 msgstr ""
 
 #. type: Plain text
-#: apt.8:44
+#: apt.8:40
 msgid "apt returns zero on normal operation, decimal 100 on error."
 msgstr ""
 
 #. type: SH
-#: apt.8:44
+#: apt.8:40
 #, no-wrap
 msgid "BUGS"
 msgstr ""
 
 #. type: Plain text
-#: apt.8:46
+#: apt.8:42
 msgid "This manpage isn't even started."
 msgstr ""
 
 #. type: Plain text
-#: apt.8:55
+#: apt.8:51
 msgid ""
 "See E<lt>http://bugs.debian.org/aptE<gt>.  If you wish to report a bug in "
 "B<apt>, please see I</usr/share/doc/debian/bug-reporting.txt> or the "
@@ -131,13 +115,13 @@ msgid ""
 msgstr ""
 
 #. type: SH
-#: apt.8:55
+#: apt.8:51
 #, no-wrap
 msgid "AUTHOR"
 msgstr ""
 
 #. type: Plain text
-#: apt.8:56
+#: apt.8:52
 msgid "apt was written by the APT team E<lt>apt@packages.debian.orgE<gt>."
 msgstr ""
 
@@ -147,282 +131,7 @@ msgid "<!-- -*- mode: sgml; mode: fold -*- -->"
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:10
-msgid ""
-"<!-- Some common paths.. --> <!ENTITY docdir \"/usr/share/doc/apt/\"> "
-"<!ENTITY guidesdir \"/usr/share/doc/apt-doc/\"> <!ENTITY configureindex "
-"\"<filename>&docdir;examples/configure-index.gz</filename>\"> <!ENTITY "
-"aptconfdir \"<filename>/etc/apt.conf</filename>\"> <!ENTITY statedir "
-"\"/var/lib/apt\"> <!ENTITY cachedir \"/var/cache/apt\">"
-msgstr ""
-
-#. type: Plain text
-#: apt.ent:17
-#, no-wrap
-msgid ""
-"<!-- Cross references to other man pages -->\n"
-"<!ENTITY apt-conf \"<citerefentry>\n"
-"    <refentrytitle><filename>apt.conf</filename></refentrytitle>\n"
-"    <manvolnum>5</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-msgstr ""
-
-#. type: Plain text
-#: apt.ent:23
-#, no-wrap
-msgid ""
-"<!ENTITY apt-get \"<citerefentry>\n"
-"    <refentrytitle><command>apt-get</command></refentrytitle>\n"
-"    <manvolnum>8</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-msgstr ""
-
-#. type: Plain text
-#: apt.ent:29
-#, no-wrap
-msgid ""
-"<!ENTITY apt-config \"<citerefentry>\n"
-"    <refentrytitle><command>apt-config</command></refentrytitle>\n"
-"    <manvolnum>8</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-msgstr ""
-
-#. type: Plain text
-#: apt.ent:35
-#, no-wrap
-msgid ""
-"<!ENTITY apt-cdrom \"<citerefentry>\n"
-"    <refentrytitle><command>apt-cdrom</command></refentrytitle>\n"
-"    <manvolnum>8</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-msgstr ""
-
-#. type: Plain text
-#: apt.ent:41
-#, no-wrap
-msgid ""
-"<!ENTITY apt-cache \"<citerefentry>\n"
-"    <refentrytitle><command>apt-cache</command></refentrytitle>\n"
-"    <manvolnum>8</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-msgstr ""
-
-#. type: Plain text
-#: apt.ent:47
-#, no-wrap
-msgid ""
-"<!ENTITY apt-preferences \"<citerefentry>\n"
-"    <refentrytitle><command>apt_preferences</command></refentrytitle>\n"
-"    <manvolnum>5</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-msgstr ""
-
-#. type: Plain text
-#: apt.ent:53
-#, no-wrap
-msgid ""
-"<!ENTITY apt-key \"<citerefentry>\n"
-"    <refentrytitle><command>apt-key</command></refentrytitle>\n"
-"    <manvolnum>8</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-msgstr ""
-
-#. type: Plain text
-#: apt.ent:59
-#, no-wrap
-msgid ""
-"<!ENTITY apt-secure \"<citerefentry>\n"
-"    <refentrytitle>apt-secure</refentrytitle>\n"
-"    <manvolnum>8</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-msgstr ""
-
-#. type: Plain text
-#: apt.ent:65
-#, no-wrap
-msgid ""
-"<!ENTITY apt-ftparchive \"<citerefentry>\n"
-"    <refentrytitle><filename>apt-ftparchive</filename></refentrytitle>\n"
-"    <manvolnum>1</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-msgstr ""
-
-#. type: Plain text
-#: apt.ent:72
-#, no-wrap
-msgid ""
-"<!ENTITY sources-list \"<citerefentry>\n"
-"    <refentrytitle><filename>sources.list</filename></refentrytitle>\n"
-"    <manvolnum>5</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-msgstr ""
-
-#. type: Plain text
-#: apt.ent:78
-#, no-wrap
-msgid ""
-"<!ENTITY reportbug \"<citerefentry>\n"
-"    <refentrytitle><command>reportbug</command></refentrytitle>\n"
-"    <manvolnum>1</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-msgstr ""
-
-#. type: Plain text
-#: apt.ent:84
-#, no-wrap
-msgid ""
-"<!ENTITY dpkg \"<citerefentry>\n"
-"    <refentrytitle><command>dpkg</command></refentrytitle>\n"
-"    <manvolnum>8</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-msgstr ""
-
-#. type: Plain text
-#: apt.ent:90
-#, no-wrap
-msgid ""
-"<!ENTITY dpkg-buildpackage \"<citerefentry>\n"
-"    <refentrytitle><command>dpkg-buildpackage</command></refentrytitle>\n"
-"    <manvolnum>1</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-msgstr ""
-
-#. type: Plain text
-#: apt.ent:96
-#, no-wrap
-msgid ""
-"<!ENTITY gzip \"<citerefentry>\n"
-"    <refentrytitle><command>gzip</command></refentrytitle>\n"
-"    <manvolnum>1</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-msgstr ""
-
-#. type: Plain text
-#: apt.ent:102
-#, no-wrap
-msgid ""
-"<!ENTITY dpkg-scanpackages \"<citerefentry>\n"
-"    <refentrytitle><command>dpkg-scanpackages</command></refentrytitle>\n"
-"    <manvolnum>8</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-msgstr ""
-
-#. type: Plain text
-#: apt.ent:108
-#, no-wrap
-msgid ""
-"<!ENTITY dpkg-scansources \"<citerefentry>\n"
-"    <refentrytitle><command>dpkg-scansources</command></refentrytitle>\n"
-"    <manvolnum>8</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-msgstr ""
-
-#. type: Plain text
-#: apt.ent:114
-#, no-wrap
-msgid ""
-"<!ENTITY dselect \"<citerefentry>\n"
-"    <refentrytitle><command>dselect</command></refentrytitle>\n"
-"    <manvolnum>8</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-msgstr ""
-
-#. type: Plain text
-#: apt.ent:120
-#, no-wrap
-msgid ""
-"<!ENTITY aptitude \"<citerefentry>\n"
-"    <refentrytitle><command>aptitude</command></refentrytitle>\n"
-"    <manvolnum>8</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-msgstr ""
-
-#. type: Plain text
-#: apt.ent:126
-#, no-wrap
-msgid ""
-"<!ENTITY synaptic \"<citerefentry>\n"
-"    <refentrytitle><command>synaptic</command></refentrytitle>\n"
-"    <manvolnum>8</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-msgstr ""
-
-#. type: Plain text
-#: apt.ent:132
-#, no-wrap
-msgid ""
-"<!ENTITY debsign \"<citerefentry>\n"
-"    <refentrytitle><command>debsign</command></refentrytitle>\n"
-"    <manvolnum>1</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-msgstr ""
-
-#. type: Plain text
-#: apt.ent:138
-#, no-wrap
-msgid ""
-"<!ENTITY debsig-verify \"<citerefentry>\n"
-"    <refentrytitle><command>debsig-verify</command></refentrytitle>\n"
-"    <manvolnum>1</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-msgstr ""
-
-#. type: Plain text
-#: apt.ent:144
-#, no-wrap
-msgid ""
-"<!ENTITY gpg \"<citerefentry>\n"
-"    <refentrytitle><command>gpg</command></refentrytitle>\n"
-"    <manvolnum>1</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-msgstr ""
-
-#. type: Plain text
-#: apt.ent:150
-#, no-wrap
-msgid ""
-"<!ENTITY gnome-apt \"<citerefentry>\n"
-"    <refentrytitle><command>gnome-apt</command></refentrytitle>\n"
-"    <manvolnum>1</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-msgstr ""
-
-#. type: Plain text
-#: apt.ent:156
-#, no-wrap
-msgid ""
-"<!ENTITY wajig \"<citerefentry>\n"
-"    <refentrytitle><command>wajig</command></refentrytitle>\n"
-"    <manvolnum>1</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-msgstr ""
-
-#. type: Plain text
-#: apt.ent:168
+#: apt.ent:16
 #, no-wrap
 msgid ""
 "<!-- Boiler plate docinfo section -->\n"
@@ -437,55 +146,12 @@ msgid ""
 "Gunthorpe</holder></copyright>\n"
 "   <date>28 October 2008</date>\n"
 "   <productname>Linux</productname>\n"
-msgstr ""
-
-#. type: Plain text
-#: apt.ent:171
-#, no-wrap
-msgid ""
 " </refentryinfo>\n"
-"\"> \n"
-msgstr ""
-
-#. type: Plain text
-#: apt.ent:177
-#, no-wrap
-msgid ""
-"<!ENTITY apt-email \"\n"
-"   <address>\n"
-"    <email>apt@packages.debian.org</email>\n"
-"   </address>\n"
-"\">\n"
-msgstr ""
-
-#. type: Plain text
-#: apt.ent:185
-#, no-wrap
-msgid ""
-"<!ENTITY apt-author.jgunthorpe \"\n"
-"   <author>\n"
-"    <firstname>Jason</firstname>\n"
-"    <surname>Gunthorpe</surname>\n"
-"    <contrib></contrib>\n"
-"   </author>\n"
 "\">\n"
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:193
-#, no-wrap
-msgid ""
-"<!ENTITY apt-author.moconnor \"\n"
-"   <author>\n"
-"    <firstname>Mike</firstname>\n"
-"    <surname>O'Connor</surname>\n"
-"    <contrib></contrib>\n"
-"   </author>\n"
-"\">\n"
-msgstr ""
-
-#. type: Plain text
-#: apt.ent:200
+#: apt.ent:23
 #, no-wrap
 msgid ""
 "<!ENTITY apt-author.team \"\n"
@@ -497,28 +163,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:204 apt.ent:215
-#, no-wrap
-msgid ""
-"<!ENTITY apt-product \"\n"
-"   <productname>Linux</productname>\n"
-"\">\n"
-msgstr ""
-
-#. type: Plain text
-#: apt.ent:211
-#, no-wrap
-msgid ""
-"<!ENTITY apt-copyright \"\n"
-"    <copyright>\n"
-"     <holder>Jason Gunthorpe</holder>\n"
-"     <year>1998-2001</year>\n"
-"    </copyright>\n"
-"\">\n"
-msgstr ""
-
-#. type: Plain text
-#: apt.ent:221
+#: apt.ent:29
 #, no-wrap
 msgid ""
 "<!ENTITY apt-qapage \"\n"
@@ -529,14 +174,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:232
+#: apt.ent:40
 #, no-wrap
 msgid ""
 "<!-- Boiler plate Bug reporting section -->\n"
 "<!ENTITY manbugs \"\n"
 " <refsect1><title>Bugs</title>\n"
-"   <para><ulink url='http://bugs.debian.org/src:apt'>APT bug "
-"page</ulink>. \n"
+"   <para><ulink url='http://bugs.debian.org/src:apt'>APT bug page</ulink>.\n"
 "   If you wish to report a bug in APT, please see\n"
 "   <filename>/usr/share/doc/debian/bug-reporting.txt</filename> or the\n"
 "   &reportbug; command.\n"
@@ -546,7 +190,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:240
+#: apt.ent:48
 #, no-wrap
 msgid ""
 "<!-- Boiler plate Author section -->\n"
@@ -560,7 +204,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:250
+#: apt.ent:58
 #, no-wrap
 msgid ""
 "<!-- Should be used within the option section of the text to\n"
@@ -575,7 +219,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:258
+#: apt.ent:66
 #, no-wrap
 msgid ""
 "     <varlistentry>\n"
@@ -588,7 +232,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:268
+#: apt.ent:78
 #, no-wrap
 msgid ""
 "     <varlistentry>\n"
@@ -597,14 +241,18 @@ msgid ""
 "     <listitem><para>Configuration File; Specify a configuration file to "
 "use. \n"
 "     The program will read the default configuration file and then this \n"
-"     configuration file. See &apt-conf; for syntax information.     \n"
+"     configuration file. If configuration settings need to be set before "
+"the\n"
+"     default configuration files are parsed specify a file with the "
+"<envar>APT_CONFIG</envar>\n"
+"     environment variable. See &apt-conf; for syntax information.\n"
 "     </para>\n"
 "     </listitem>\n"
 "     </varlistentry>\n"
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:280
+#: apt.ent:90
 #, no-wrap
 msgid ""
 "     <varlistentry>\n"
@@ -624,7 +272,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:291
+#: apt.ent:101
 #, no-wrap
 msgid ""
 "<!-- Should be used within the option section of the text to\n"
@@ -641,7 +289,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:297
+#: apt.ent:107
 #, no-wrap
 msgid ""
 "<!ENTITY file-aptconf \"\n"
@@ -653,7 +301,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:303
+#: apt.ent:113
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>/etc/apt/apt.conf.d/</filename></term>\n"
@@ -665,7 +313,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:309
+#: apt.ent:119
 #, no-wrap
 msgid ""
 "<!ENTITY file-cachearchives \"\n"
@@ -677,7 +325,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:315
+#: apt.ent:125
 #, no-wrap
 msgid ""
 "     "
@@ -690,7 +338,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:325
+#: apt.ent:135
 #, no-wrap
 msgid ""
 "<!ENTITY file-preferences \"\n"
@@ -706,7 +354,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:331
+#: apt.ent:141
 #, no-wrap
 msgid ""
 "     "
@@ -719,7 +367,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:337
+#: apt.ent:147
 #, no-wrap
 msgid ""
 "<!ENTITY file-sourceslist \"\n"
@@ -731,7 +379,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:343
+#: apt.ent:153
 #, no-wrap
 msgid ""
 "     "
@@ -744,7 +392,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:350
+#: apt.ent:160
 #, no-wrap
 msgid ""
 "<!ENTITY file-statelists \"\n"
@@ -758,7 +406,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:355
+#: apt.ent:166
 #, no-wrap
 msgid ""
 "     "
@@ -770,43 +418,133 @@ msgid ""
 "\">\n"
 msgstr ""
 
+#. type: Plain text
+#: apt.ent:172
+#, no-wrap
+msgid ""
+"<!ENTITY file-trustedgpg \"\n"
+"     <varlistentry><term><filename>/etc/apt/trusted.gpg</filename></term>\n"
+"     <listitem><para>Keyring of local trusted keys, new keys will be added "
+"here.\n"
+"     Configuration Item: "
+"<literal>Dir::Etc::Trusted</literal>.</para></listitem>\n"
+"     </varlistentry>\n"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:179
+#, no-wrap
+msgid ""
+"     "
+"<varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>\n"
+"     <listitem><para>File fragments for the trusted keys, additional "
+"keyrings can\n"
+"     be stored here (by other packages or the administrator).\n"
+"     Configuration Item "
+"<literal>Dir::Etc::TrustedParts</literal>.</para></listitem>\n"
+"     </varlistentry>\n"
+"\">\n"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:187
+#, no-wrap
+msgid ""
+"<!ENTITY file-extended_states \"\n"
+"      "
+"<varlistentry><term><filename>/var/lib/apt/extended_states</filename></term>\n"
+"      <listitem><para>Status list of auto-installed packages.\n"
+"      Configuration Item: <literal>Dir::State::extended_states</literal>.\n"
+"      </para></listitem>\n"
+"      </varlistentry>\n"
+"\">\n"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:191
+#, no-wrap
+msgid ""
+"<!-- TRANSLATOR: This is the section header for the following paragraphs - "
+"comparable\n"
+"     to the other headers like NAME and DESCRIPTION and should therefore be "
+"uppercase. -->\n"
+"<!ENTITY translation-title \"TRANSLATION\">\n"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:200
+#, no-wrap
+msgid ""
+"<!-- TRANSLATOR: This is a placeholder. You should write here who has "
+"contributed\n"
+"     to the translation in the past, who is responsible now and maybe "
+"further information\n"
+"     specially related to your translation. -->\n"
+"<!ENTITY translation-holder \"\n"
+"     The english translation was done by John Doe "
+"<email>john@doe.org</email> in 2009,\n"
+"     2010 and Daniela Acme <email>daniela@acme.us</email> in 2010 together "
+"with the\n"
+"     Debian Dummy l10n Team "
+"<email>debian-l10n-dummy@lists.debian.org</email>.\n"
+"\">\n"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:210
+#, no-wrap
+msgid ""
+"<!-- TRANSLATOR: As a translation is allowed to have 20% of "
+"untranslated/fuzzy strings\n"
+"     in a shipped manpage newer/modified paragraphs will maybe appear in "
+"english in\n"
+"     the generated manpage. This sentence is therefore here to tell the "
+"reader that this\n"
+"     is not a mistake by the translator - obviously the target is that at "
+"least for stable\n"
+"     releases this sentence is not needed. :) -->\n"
+"<!ENTITY translation-english \"\n"
+"     Note that this translated document may contain untranslated parts.\n"
+"     This is done on purpose, to avoid losing content when the\n"
+"     translation is lagging behind the original content.\n"
+"\">\n"
+msgstr ""
+
 #.  The last update date 
 #. type: Content of: <refentry><refentryinfo>
-#: apt-cache.8.xml:13 apt-config.8.xml:13 apt-extracttemplates.1.xml:13 apt-ftparchive.1.xml:13 apt-sortpkgs.1.xml:13 sources.list.5.xml:13
+#: apt-cache.8.xml:16
 msgid ""
-"&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>29 "
-"February 2004</date>"
+"&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>04 "
+"February 2011</date>"
 msgstr ""
 
 #. type: Content of: <refentry><refnamediv><refname>
-#: apt-cache.8.xml:22 apt-cache.8.xml:29
+#: apt-cache.8.xml:25 apt-cache.8.xml:32
 msgid "apt-cache"
 msgstr ""
 
 #. type: Content of: <refentry><refmeta><manvolnum>
-#: apt-cache.8.xml:23 apt-cdrom.8.xml:22 apt-config.8.xml:23 apt-get.8.xml:23 apt-key.8.xml:15 apt-mark.8.xml:23 apt-secure.8.xml:15
+#: apt-cache.8.xml:26 apt-cdrom.8.xml:25 apt-config.8.xml:26 apt-get.8.xml:26 apt-key.8.xml:18 apt-mark.8.xml:26 apt-secure.8.xml:18
 msgid "8"
 msgstr ""
 
 #. type: Content of: <refentry><refmeta><refmiscinfo>
-#: apt-cache.8.xml:24 apt-cdrom.8.xml:23 apt-config.8.xml:24 apt-extracttemplates.1.xml:24 apt-ftparchive.1.xml:24 apt-get.8.xml:24 apt-key.8.xml:16 apt-mark.8.xml:24 apt-secure.8.xml:16 apt-sortpkgs.1.xml:24 apt.conf.5.xml:30 apt_preferences.5.xml:23 sources.list.5.xml:24
+#: apt-cache.8.xml:27 apt-cdrom.8.xml:26 apt-config.8.xml:27 apt-extracttemplates.1.xml:27 apt-ftparchive.1.xml:27 apt-get.8.xml:27 apt-key.8.xml:19 apt-mark.8.xml:27 apt-secure.8.xml:19 apt-sortpkgs.1.xml:27 apt.conf.5.xml:33 apt_preferences.5.xml:26 sources.list.5.xml:27
 msgid "APT"
 msgstr ""
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-cache.8.xml:30
-msgid "APT package handling utility -- cache manipulator"
+#: apt-cache.8.xml:33
+msgid "query the APT cache"
 msgstr ""
 
 #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-cache.8.xml:36
+#: apt-cache.8.xml:39
 msgid ""
 "<command>apt-cache</command> <arg><option>-hvsn</option></arg> "
 "<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
 "<arg><option>-c=<replaceable>file</replaceable></option></arg> <group "
-"choice=\"req\"> <arg>add <arg choice=\"plain\" "
-"rep=\"repeat\"><replaceable>file</replaceable></arg></arg> "
-"<arg>gencaches</arg> <arg>showpkg <arg choice=\"plain\" "
+"choice=\"req\"> <arg>gencaches</arg> <arg>showpkg <arg choice=\"plain\" "
 "rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg>showsrc <arg "
 "choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
 "<arg>stats</arg> <arg>dump</arg> <arg>dumpavail</arg> <arg>unmet</arg> "
@@ -828,12 +566,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:62 apt-cdrom.8.xml:47 apt-config.8.xml:47 apt-extracttemplates.1.xml:43 apt-ftparchive.1.xml:55 apt-get.8.xml:125 apt-key.8.xml:34 apt-mark.8.xml:52 apt-secure.8.xml:40 apt-sortpkgs.1.xml:44 apt.conf.5.xml:39 apt_preferences.5.xml:33 sources.list.5.xml:33
+#: apt-cache.8.xml:64 apt-cdrom.8.xml:50 apt-config.8.xml:50 apt-extracttemplates.1.xml:46 apt-ftparchive.1.xml:59 apt-get.8.xml:121 apt-key.8.xml:38 apt-mark.8.xml:56 apt-secure.8.xml:43 apt-sortpkgs.1.xml:47 apt.conf.5.xml:42 apt_preferences.5.xml:36 sources.list.5.xml:36
 msgid "Description"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:63
+#: apt-cache.8.xml:65
 msgid ""
 "<command>apt-cache</command> performs a variety of operations on APT's "
 "package cache. <command>apt-cache</command> does not manipulate the state of "
@@ -842,31 +580,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:68 apt-get.8.xml:131
+#: apt-cache.8.xml:70 apt-get.8.xml:127
 msgid ""
 "Unless the <option>-h</option>, or <option>--help</option> option is given, "
 "one of the commands below must be present."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:72
-msgid "add <replaceable>file(s)</replaceable>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:73
-msgid ""
-"<literal>add</literal> adds the named package index files to the package "
-"cache.  This is for debugging only."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:77
+#: apt-cache.8.xml:74
 msgid "gencaches"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:78
+#: apt-cache.8.xml:75
 msgid ""
 "<literal>gencaches</literal> performs the same operation as <command>apt-get "
 "check</command>. It builds the source and package caches from the sources in "
@@ -874,12 +600,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:84
+#: apt-cache.8.xml:81
 msgid "showpkg <replaceable>pkg(s)</replaceable>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:85
+#: apt-cache.8.xml:82
 msgid ""
 "<literal>showpkg</literal> displays information about the packages listed on "
 "the command line. Remaining arguments are package names. The available "
@@ -893,7 +619,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
-#: apt-cache.8.xml:97
+#: apt-cache.8.xml:94
 #, no-wrap
 msgid ""
 "Package: libreadline2\n"
@@ -909,7 +635,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:109
+#: apt-cache.8.xml:106
 msgid ""
 "Thus it may be seen that libreadline2, version 2.1-12, depends on libc5 and "
 "ncurses3.0 which must be installed for libreadline2 to work.  In turn, "
@@ -921,26 +647,26 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:118
+#: apt-cache.8.xml:115
 msgid "stats"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:118
+#: apt-cache.8.xml:115
 msgid ""
 "<literal>stats</literal> displays some statistics about the cache.  No "
 "further arguments are expected. Statistics reported are:"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:121
+#: apt-cache.8.xml:118
 msgid ""
 "<literal>Total package names</literal> is the number of package names found "
 "in the cache."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:125
+#: apt-cache.8.xml:122
 msgid ""
 "<literal>Normal packages</literal> is the number of regular, ordinary "
 "package names; these are packages that bear a one-to-one correspondence "
@@ -949,7 +675,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:131
+#: apt-cache.8.xml:128
 msgid ""
 "<literal>Pure virtual packages</literal> is the number of packages that "
 "exist only as a virtual package name; that is, packages only \"provide\" the "
@@ -960,7 +686,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:139
+#: apt-cache.8.xml:136
 msgid ""
 "<literal>Single virtual packages</literal> is the number of packages with "
 "only one package providing a particular virtual package. For example, in the "
@@ -969,7 +695,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:145
+#: apt-cache.8.xml:142
 msgid ""
 "<literal>Mixed virtual packages</literal> is the number of packages that "
 "either provide a particular virtual package or have the virtual package name "
@@ -979,17 +705,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:152
+#: apt-cache.8.xml:149
 msgid ""
 "<literal>Missing</literal> is the number of package names that were "
 "referenced in a dependency but were not provided by any package. Missing "
-"packages may be in evidence if a full distribution is not accessed, or if a "
+"packages may be an evidence if a full distribution is not accessed, or if a "
 "package (real or virtual) has been dropped from the distribution. Usually "
 "they are referenced from Conflicts or Breaks statements."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:159
+#: apt-cache.8.xml:156
 msgid ""
 "<literal>Total distinct</literal> versions is the number of package versions "
 "found in the cache; this value is therefore at least equal to the number of "
@@ -999,19 +725,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:166
+#: apt-cache.8.xml:163
 msgid ""
 "<literal>Total dependencies</literal> is the number of dependency "
 "relationships claimed by all of the packages in the cache."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:173
+#: apt-cache.8.xml:170
 msgid "showsrc <replaceable>pkg(s)</replaceable>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:174
+#: apt-cache.8.xml:171
 msgid ""
 "<literal>showsrc</literal> displays all the source package records that "
 "match the given package names. All versions are shown, as well as all "
@@ -1019,48 +745,48 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:179 apt-config.8.xml:84
+#: apt-cache.8.xml:176 apt-config.8.xml:87
 msgid "dump"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:180
+#: apt-cache.8.xml:177
 msgid ""
 "<literal>dump</literal> shows a short listing of every package in the "
 "cache. It is primarily for debugging."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:184
+#: apt-cache.8.xml:181
 msgid "dumpavail"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:185
+#: apt-cache.8.xml:182
 msgid ""
 "<literal>dumpavail</literal> prints out an available list to stdout. This is "
 "suitable for use with &dpkg; and is used by the &dselect; method."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:189
+#: apt-cache.8.xml:186
 msgid "unmet"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:190
+#: apt-cache.8.xml:187
 msgid ""
 "<literal>unmet</literal> displays a summary of all unmet dependencies in the "
 "package cache."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:194
+#: apt-cache.8.xml:191
 msgid "show <replaceable>pkg(s)</replaceable>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:195
+#: apt-cache.8.xml:192
 msgid ""
 "<literal>show</literal> performs a function similar to <command>dpkg "
 "--print-avail</command>; it displays the package records for the named "
@@ -1068,12 +794,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:200
+#: apt-cache.8.xml:197
 msgid "search <replaceable>regex [ regex ... ]</replaceable>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:201
+#: apt-cache.8.xml:198
 msgid ""
 "<literal>search</literal> performs a full text search on all available "
 "package lists for the POSIX regex pattern given, see "
@@ -1088,43 +814,43 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:214
+#: apt-cache.8.xml:211
 msgid ""
 "Separate arguments can be used to specify multiple search patterns that are "
 "and'ed together."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:218
+#: apt-cache.8.xml:215
 msgid "depends <replaceable>pkg(s)</replaceable>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:219
+#: apt-cache.8.xml:216
 msgid ""
 "<literal>depends</literal> shows a listing of each dependency a package has "
 "and all the possible other packages that can fulfill that dependency."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:223
+#: apt-cache.8.xml:220
 msgid "rdepends <replaceable>pkg(s)</replaceable>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:224
+#: apt-cache.8.xml:221
 msgid ""
 "<literal>rdepends</literal> shows a listing of each reverse dependency a "
 "package has."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:228
+#: apt-cache.8.xml:225
 msgid "pkgnames <replaceable>[ prefix ]</replaceable>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:229
+#: apt-cache.8.xml:226
 msgid ""
 "This command prints the name of each package APT knows. The optional "
 "argument is a prefix match to filter the name list. The output is suitable "
@@ -1134,7 +860,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:234
+#: apt-cache.8.xml:231
 msgid ""
 "Note that a package which APT knows of is not necessarily available to "
 "download, installable or installed, e.g. virtual packages are also listed in "
@@ -1142,12 +868,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:239
+#: apt-cache.8.xml:236
 msgid "dotty <replaceable>pkg(s)</replaceable>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:240
+#: apt-cache.8.xml:237
 msgid ""
 "<literal>dotty</literal> takes a list of packages on the command line and "
 "generates output suitable for use by dotty from the <ulink "
@@ -1160,7 +886,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:249
+#: apt-cache.8.xml:246
 msgid ""
 "The resulting nodes will have several shapes; normal packages are boxes, "
 "pure provides are triangles, mixed provides are diamonds, missing packages "
@@ -1169,17 +895,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:254
+#: apt-cache.8.xml:251
 msgid "Caution, dotty cannot graph larger sets of packages."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:257
+#: apt-cache.8.xml:254
 msgid "xvcg <replaceable>pkg(s)</replaceable>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:258
+#: apt-cache.8.xml:255
 msgid ""
 "The same as <literal>dotty</literal>, only for xvcg from the <ulink "
 "url=\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG "
@@ -1187,12 +913,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:262
+#: apt-cache.8.xml:259
 msgid "policy <replaceable>[ pkg(s) ]</replaceable>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:263
+#: apt-cache.8.xml:260
 msgid ""
 "<literal>policy</literal> is meant to help debug issues relating to the "
 "preferences file. With no arguments it will print out the priorities of each "
@@ -1201,12 +927,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:269
-msgid "madison <replaceable>/[ pkg(s) ]</replaceable>"
+#: apt-cache.8.xml:266
+msgid "madison <replaceable>[ pkg(s) ]</replaceable>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:270
+#: apt-cache.8.xml:267
 msgid ""
 "<literal>apt-cache</literal>'s <literal>madison</literal> command attempts "
 "to mimic the output format and a subset of the functionality of the Debian "
@@ -1218,22 +944,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56 apt-ftparchive.1.xml:492 apt-get.8.xml:319 apt-mark.8.xml:89 apt-sortpkgs.1.xml:54 apt.conf.5.xml:452 apt.conf.5.xml:474
+#: apt-cache.8.xml:278 apt-config.8.xml:96 apt-extracttemplates.1.xml:59 apt-ftparchive.1.xml:525 apt-get.8.xml:342 apt-mark.8.xml:126 apt-sortpkgs.1.xml:57 apt.conf.5.xml:577 apt.conf.5.xml:599
 msgid "options"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:285
+#: apt-cache.8.xml:282
 msgid "<option>-p</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:285
+#: apt-cache.8.xml:282
 msgid "<option>--pkg-cache</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:286
+#: apt-cache.8.xml:283
 msgid ""
 "Select the file to store the package cache. The package cache is the primary "
 "cache used by all operations.  Configuration Item: "
@@ -1241,17 +967,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:291 apt-ftparchive.1.xml:535 apt-get.8.xml:376 apt-sortpkgs.1.xml:58
+#: apt-cache.8.xml:288 apt-ftparchive.1.xml:572 apt-get.8.xml:404 apt-sortpkgs.1.xml:61
 msgid "<option>-s</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:291
+#: apt-cache.8.xml:288
 msgid "<option>--src-cache</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:292
+#: apt-cache.8.xml:289
 msgid ""
 "Select the file to store the source cache. The source is used only by "
 "<literal>gencaches</literal> and it stores a parsed version of the package "
@@ -1261,17 +987,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:299 apt-ftparchive.1.xml:509 apt-get.8.xml:366
+#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:394
 msgid "<option>-q</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:299 apt-ftparchive.1.xml:509 apt-get.8.xml:366
+#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:394
 msgid "<option>--quiet</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:300
+#: apt-cache.8.xml:297
 msgid ""
 "Quiet; produces output suitable for logging, omitting progress indicators.  "
 "More q's will produce more quietness up to a maximum of 2. You can also use "
@@ -1280,17 +1006,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:306
+#: apt-cache.8.xml:303
 msgid "<option>-i</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:306
+#: apt-cache.8.xml:303
 msgid "<option>--important</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:307
+#: apt-cache.8.xml:304
 msgid ""
 "Print only important dependencies; for use with unmet and depends. Causes "
 "only Depends and Pre-Depends relations to be printed.  Configuration Item: "
@@ -1298,34 +1024,84 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:312 apt-cdrom.8.xml:121 apt-get.8.xml:333
-msgid "<option>-f</option>"
+#: apt-cache.8.xml:309
+msgid "<option>--no-pre-depends</option>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-cache.8.xml:310
+msgid "<option>--no-depends</option>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-cache.8.xml:311
+msgid "<option>--no-recommends</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-cache.8.xml:312
+msgid "<option>--no-suggests</option>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-cache.8.xml:313
+msgid "<option>--no-conflicts</option>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-cache.8.xml:314
+msgid "<option>--no-breaks</option>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-cache.8.xml:315
+msgid "<option>--no-replaces</option>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-cache.8.xml:316
+msgid "<option>--no-enhances</option>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-cache.8.xml:317
+msgid ""
+"Per default the <literal>depends</literal> and <literal>rdepends</literal> "
+"print all dependencies. This can be tweaked with these flags which will omit "
+"the specified dependency type.  Configuration Item: "
+"<literal>APT::Cache::Show<replaceable>DependencyType</replaceable></literal> "
+"e.g. <literal>APT::Cache::ShowRecommends</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-cache.8.xml:323 apt-cdrom.8.xml:124 apt-get.8.xml:361
+msgid "<option>-f</option>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-cache.8.xml:323
 msgid "<option>--full</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:313
+#: apt-cache.8.xml:324
 msgid ""
 "Print full package records when searching.  Configuration Item: "
 "<literal>APT::Cache::ShowFull</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:317 apt-cdrom.8.xml:131
+#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:584 apt-get.8.xml:447
 msgid "<option>-a</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:317
+#: apt-cache.8.xml:328
 msgid "<option>--all-versions</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:318
+#: apt-cache.8.xml:329
 msgid ""
 "Print full records for all available versions. This is the default; to turn "
 "it off, use <option>--no-all-versions</option>.  If "
@@ -1336,17 +1112,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:326
+#: apt-cache.8.xml:337
 msgid "<option>-g</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:326
+#: apt-cache.8.xml:337
 msgid "<option>--generate</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:327
+#: apt-cache.8.xml:338
 msgid ""
 "Perform automatic package cache regeneration, rather than use the cache as "
 "it is. This is the default; to turn it off, use "
@@ -1355,29 +1131,29 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:332
+#: apt-cache.8.xml:343
 msgid "<option>--names-only</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:332 apt-cdrom.8.xml:139
+#: apt-cache.8.xml:343 apt-cdrom.8.xml:142
 msgid "<option>-n</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:333
+#: apt-cache.8.xml:344
 msgid ""
 "Only search on the package names, not the long descriptions.  Configuration "
 "Item: <literal>APT::Cache::NamesOnly</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:337
+#: apt-cache.8.xml:348
 msgid "<option>--all-names</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:338
+#: apt-cache.8.xml:349
 msgid ""
 "Make <literal>pkgnames</literal> print all names, including virtual packages "
 "and missing dependencies.  Configuration Item: "
@@ -1385,12 +1161,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:343
+#: apt-cache.8.xml:354
 msgid "<option>--recurse</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:344
+#: apt-cache.8.xml:355
 msgid ""
 "Make <literal>depends</literal> and <literal>rdepends</literal> recursive so "
 "that all packages mentioned are printed once.  Configuration Item: "
@@ -1398,12 +1174,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:349
+#: apt-cache.8.xml:360
 msgid "<option>--installed</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:351
+#: apt-cache.8.xml:362
 msgid ""
 "Limit the output of <literal>depends</literal> and "
 "<literal>rdepends</literal> to packages which are currently installed.  "
@@ -1411,61 +1187,61 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98 apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:547 apt-get.8.xml:554 apt-sortpkgs.1.xml:64
+#: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101 apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:612 apt-get.8.xml:591 apt-mark.8.xml:140 apt-sortpkgs.1.xml:67
 msgid "&apt-commonoptions;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:138 apt-mark.8.xml:122 apt.conf.5.xml:984 apt_preferences.5.xml:615
+#: apt-cache.8.xml:372 apt-get.8.xml:596 apt-key.8.xml:175 apt-mark.8.xml:144 apt.conf.5.xml:1110 apt_preferences.5.xml:697
 msgid "Files"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt-cache.8.xml:363
+#: apt-cache.8.xml:374
 msgid "&file-sourceslist; &file-statelists;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103 apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:563 apt-get.8.xml:569 apt-key.8.xml:162 apt-mark.8.xml:133 apt-secure.8.xml:181 apt-sortpkgs.1.xml:69 apt.conf.5.xml:990 apt_preferences.5.xml:622 sources.list.5.xml:233
+#: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106 apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:628 apt-get.8.xml:606 apt-key.8.xml:196 apt-mark.8.xml:150 apt-secure.8.xml:185 apt-sortpkgs.1.xml:72 apt.conf.5.xml:1116 apt_preferences.5.xml:704 sources.list.5.xml:250
 msgid "See Also"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:369
+#: apt-cache.8.xml:380
 msgid "&apt-conf;, &sources-list;, &apt-get;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:567 apt-get.8.xml:575 apt-mark.8.xml:137 apt-sortpkgs.1.xml:73
+#: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111 apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:632 apt-get.8.xml:612 apt-mark.8.xml:154 apt-sortpkgs.1.xml:76
 msgid "Diagnostics"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:374
+#: apt-cache.8.xml:385
 msgid ""
 "<command>apt-cache</command> returns zero on normal operation, decimal 100 "
 "on error."
 msgstr ""
 
 #. type: Content of: <refentry><refentryinfo>
-#: apt-cdrom.8.xml:13
+#: apt-cdrom.8.xml:16
 msgid ""
 "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>14 "
 "February 2004</date>"
 msgstr ""
 
 #. type: Content of: <refentry><refnamediv><refname>
-#: apt-cdrom.8.xml:21 apt-cdrom.8.xml:28
+#: apt-cdrom.8.xml:24 apt-cdrom.8.xml:31
 msgid "apt-cdrom"
 msgstr ""
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-cdrom.8.xml:29
+#: apt-cdrom.8.xml:32
 msgid "APT CDROM management utility"
 msgstr ""
 
 #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-cdrom.8.xml:35
+#: apt-cdrom.8.xml:38
 msgid ""
 "<command>apt-cdrom</command> <arg><option>-hvrmfan</option></arg> "
 "<arg><option>-d=<replaceable>cdrom mount point</replaceable></option></arg> "
@@ -1475,7 +1251,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:48
+#: apt-cdrom.8.xml:51
 msgid ""
 "<command>apt-cdrom</command> is used to add a new CDROM to APTs list of "
 "available sources. <command>apt-cdrom</command> takes care of determining "
@@ -1484,7 +1260,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:55
+#: apt-cdrom.8.xml:58
 msgid ""
 "It is necessary to use <command>apt-cdrom</command> to add CDs to the APT "
 "system, it cannot be done by hand. Furthermore each disk in a multi-cd set "
@@ -1492,22 +1268,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:65
+#: apt-cdrom.8.xml:68
 msgid "add"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:66
+#: apt-cdrom.8.xml:69
 msgid ""
 "<literal>add</literal> is used to add a new disc to the source list. It will "
-"unmount the CDROM device, prompt for a disk to be inserted and then procceed "
+"unmount the CDROM device, prompt for a disk to be inserted and then proceed "
 "to scan it and copy the index files. If the disc does not have a proper "
 "<filename>disk</filename> directory you will be prompted for a descriptive "
 "title."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:74
+#: apt-cdrom.8.xml:77
 msgid ""
 "APT uses a CDROM ID to track which disc is currently in the drive and "
 "maintains a database of these IDs in "
@@ -1515,19 +1291,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:81
+#: apt-cdrom.8.xml:84
 msgid "ident"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:82
+#: apt-cdrom.8.xml:85
 msgid ""
 "A debugging tool to report the identity of the current disc as well as the "
 "stored file name"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:61
+#: apt-cdrom.8.xml:64
 msgid ""
 "Unless the <option>-h</option>, or <option>--help</option> option is given "
 "one of the commands below must be present.  <placeholder "
@@ -1535,22 +1311,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cdrom.8.xml:91
+#: apt-cdrom.8.xml:94 apt-key.8.xml:161
 msgid "Options"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:95 apt-ftparchive.1.xml:503 apt-get.8.xml:328
+#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:540 apt-get.8.xml:356
 msgid "<option>-d</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:95
+#: apt-cdrom.8.xml:98
 msgid "<option>--cdrom</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:96
+#: apt-cdrom.8.xml:99
 msgid ""
 "Mount point; specify the location to mount the cdrom. This mount point must "
 "be listed in <filename>/etc/fstab</filename> and properly configured.  "
@@ -1558,17 +1334,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:104
+#: apt-cdrom.8.xml:107
 msgid "<option>-r</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:104
+#: apt-cdrom.8.xml:107
 msgid "<option>--rename</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:105
+#: apt-cdrom.8.xml:108
 msgid ""
 "Rename a disc; change the label of a disk or override the disks given "
 "label. This option will cause <command>apt-cdrom</command> to prompt for a "
@@ -1576,17 +1352,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:113 apt-get.8.xml:347
+#: apt-cdrom.8.xml:116 apt-get.8.xml:375
 msgid "<option>-m</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:113
+#: apt-cdrom.8.xml:116
 msgid "<option>--no-mount</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:114
+#: apt-cdrom.8.xml:117
 msgid ""
 "No mounting; prevent <command>apt-cdrom</command> from mounting and "
 "unmounting the mount point.  Configuration Item: "
@@ -1594,12 +1370,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:121
+#: apt-cdrom.8.xml:124
 msgid "<option>--fast</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:122
+#: apt-cdrom.8.xml:125
 msgid ""
 "Fast Copy; Assume the package files are valid and do not check every "
 "package. This option should be used only if <command>apt-cdrom</command> has "
@@ -1608,12 +1384,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:131
+#: apt-cdrom.8.xml:134
 msgid "<option>--thorough</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:132
+#: apt-cdrom.8.xml:135
 msgid ""
 "Thorough Package Scan; This option may be needed with some old Debian "
 "1.1/1.2 discs that have Package files in strange places. It takes much "
@@ -1621,22 +1397,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:140 apt-get.8.xml:378
+#: apt-cdrom.8.xml:143 apt-get.8.xml:406
 msgid "<option>--just-print</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:141 apt-get.8.xml:380
+#: apt-cdrom.8.xml:144 apt-get.8.xml:408
 msgid "<option>--recon</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:142 apt-get.8.xml:381
+#: apt-cdrom.8.xml:145 apt-get.8.xml:409
 msgid "<option>--no-act</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:143
+#: apt-cdrom.8.xml:146
 msgid ""
 "No Changes; Do not change the &sources-list; file and do not write index "
 "files. Everything is still checked however.  Configuration Item: "
@@ -1644,29 +1420,37 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:156
+#: apt-cdrom.8.xml:159
 msgid "&apt-conf;, &apt-get;, &sources-list;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:161
+#: apt-cdrom.8.xml:164
 msgid ""
 "<command>apt-cdrom</command> returns zero on normal operation, decimal 100 "
 "on error."
 msgstr ""
 
+#.  The last update date 
+#. type: Content of: <refentry><refentryinfo>
+#: apt-config.8.xml:16 apt-extracttemplates.1.xml:16 apt-sortpkgs.1.xml:16 sources.list.5.xml:16
+msgid ""
+"&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>29 "
+"February 2004</date>"
+msgstr ""
+
 #. type: Content of: <refentry><refnamediv><refname>
-#: apt-config.8.xml:22 apt-config.8.xml:29
+#: apt-config.8.xml:25 apt-config.8.xml:32
 msgid "apt-config"
 msgstr ""
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-config.8.xml:30
+#: apt-config.8.xml:33
 msgid "APT Configuration Query program"
 msgstr ""
 
 #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-config.8.xml:36
+#: apt-config.8.xml:39
 msgid ""
 "<command>apt-config</command> <arg><option>-hv</option></arg> "
 "<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
@@ -1675,7 +1459,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:48
+#: apt-config.8.xml:51
 msgid ""
 "<command>apt-config</command> is an internal program used by various "
 "portions of the APT suite to provide consistent configurability. It accesses "
@@ -1684,19 +1468,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:53 apt-ftparchive.1.xml:71
+#: apt-config.8.xml:56 apt-ftparchive.1.xml:75
 msgid ""
 "Unless the <option>-h</option>, or <option>--help</option> option is given "
 "one of the commands below must be present."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-config.8.xml:58
+#: apt-config.8.xml:61
 msgid "shell"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:60
+#: apt-config.8.xml:63
 msgid ""
 "shell is used to access the configuration information from a shell "
 "script. It is given pairs of arguments, the first being a shell variable and "
@@ -1706,7 +1490,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
-#: apt-config.8.xml:68
+#: apt-config.8.xml:71
 #, no-wrap
 msgid ""
 "OPTS=\"-f\"\n"
@@ -1715,14 +1499,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:73
+#: apt-config.8.xml:76
 msgid ""
 "This will set the shell environment variable $OPTS to the value of "
 "MyApp::options with a default of <option>-f</option>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:77
+#: apt-config.8.xml:80
 msgid ""
 "The configuration item may be postfixed with a /[fdbi]. f returns file "
 "names, d returns directories, b returns true or false and i returns an "
@@ -1730,39 +1514,39 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:86
+#: apt-config.8.xml:89
 msgid "Just show the contents of the configuration space."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:564 apt-sortpkgs.1.xml:70
+#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:629 apt-sortpkgs.1.xml:73
 msgid "&apt-conf;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:109
+#: apt-config.8.xml:112
 msgid ""
 "<command>apt-config</command> returns zero on normal operation, decimal 100 "
 "on error."
 msgstr ""
 
 #. type: Content of: <refentry><refnamediv><refname>
-#: apt-extracttemplates.1.xml:22 apt-extracttemplates.1.xml:29
+#: apt-extracttemplates.1.xml:25 apt-extracttemplates.1.xml:32
 msgid "apt-extracttemplates"
 msgstr ""
 
 #. type: Content of: <refentry><refmeta><manvolnum>
-#: apt-extracttemplates.1.xml:23 apt-ftparchive.1.xml:23 apt-sortpkgs.1.xml:23
+#: apt-extracttemplates.1.xml:26 apt-ftparchive.1.xml:26 apt-sortpkgs.1.xml:26
 msgid "1"
 msgstr ""
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-extracttemplates.1.xml:30
+#: apt-extracttemplates.1.xml:33
 msgid "Utility to extract DebConf config and templates from Debian packages"
 msgstr ""
 
 #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-extracttemplates.1.xml:36
+#: apt-extracttemplates.1.xml:39
 msgid ""
 "<command>apt-extracttemplates</command> <arg><option>-hv</option></arg> "
 "<arg><option>-t=<replaceable>temporary "
@@ -1771,7 +1555,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:44
+#: apt-extracttemplates.1.xml:47
 msgid ""
 "<command>apt-extracttemplates</command> will take one or more Debian package "
 "files as input and write out (to a temporary directory) all associated "
@@ -1781,12 +1565,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:49
+#: apt-extracttemplates.1.xml:52
 msgid "package version template-file config-script"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:50
+#: apt-extracttemplates.1.xml:53
 msgid ""
 "template-file and config-script are written to the temporary directory "
 "specified by the -t or --tempdir "
@@ -1796,47 +1580,56 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-extracttemplates.1.xml:60 apt-get.8.xml:488
+#: apt-extracttemplates.1.xml:63 apt-get.8.xml:525
 msgid "<option>-t</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-extracttemplates.1.xml:60
+#: apt-extracttemplates.1.xml:63
 msgid "<option>--tempdir</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-extracttemplates.1.xml:62
+#: apt-extracttemplates.1.xml:65
 msgid ""
 "Temporary directory in which to write extracted debconf template files and "
-"config scripts Configuration Item: "
+"config scripts.  Configuration Item: "
 "<literal>APT::ExtractTemplates::TempDir</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:79
+#: apt-extracttemplates.1.xml:82
 msgid ""
 "<command>apt-extracttemplates</command> returns zero on normal operation, "
 "decimal 100 on error."
 msgstr ""
 
+#.  The last update date 
+#. type: Content of: <refentry><refentryinfo>
+#: apt-ftparchive.1.xml:16
+msgid ""
+"&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>17 "
+"August 2009</date>"
+msgstr ""
+
 #. type: Content of: <refentry><refnamediv><refname>
-#: apt-ftparchive.1.xml:22 apt-ftparchive.1.xml:29
+#: apt-ftparchive.1.xml:25 apt-ftparchive.1.xml:32
 msgid "apt-ftparchive"
 msgstr ""
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-ftparchive.1.xml:30
+#: apt-ftparchive.1.xml:33
 msgid "Utility to generate index files"
 msgstr ""
 
 #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-ftparchive.1.xml:36
+#: apt-ftparchive.1.xml:39
 msgid ""
 "<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> "
 "<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> "
 "<arg><option>--readonly</option></arg> "
-"<arg><option>--contents</option></arg> <arg><option>-o "
+"<arg><option>--contents</option></arg> <arg><option>--arch "
+"<replaceable>architecture</replaceable></option></arg> <arg><option>-o "
 "<replaceable>config</replaceable>=<replaceable>string</replaceable></option></arg> "
 "<arg><option>-c=<replaceable>file</replaceable></option></arg> <group "
 "choice=\"req\"> <arg>packages<arg choice=\"plain\" "
@@ -1855,7 +1648,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:56
+#: apt-ftparchive.1.xml:60
 msgid ""
 "<command>apt-ftparchive</command> is the command line tool that generates "
 "the index files that APT uses to access a distribution source. The index "
@@ -1864,7 +1657,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:60
+#: apt-ftparchive.1.xml:64
 msgid ""
 "<command>apt-ftparchive</command> is a superset of the &dpkg-scanpackages; "
 "program, incorporating its entire functionality via the "
@@ -1874,7 +1667,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:66
+#: apt-ftparchive.1.xml:70
 msgid ""
 "Internally <command>apt-ftparchive</command> can make use of binary "
 "databases to cache the contents of a .deb file and it does not rely on any "
@@ -1884,12 +1677,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:75
+#: apt-ftparchive.1.xml:79
 msgid "packages"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:77
+#: apt-ftparchive.1.xml:81
 msgid ""
 "The packages command generates a package file from a directory tree. It "
 "takes the given directory and recursively searches it for .deb files, "
@@ -1898,17 +1691,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:82 apt-ftparchive.1.xml:106
+#: apt-ftparchive.1.xml:86 apt-ftparchive.1.xml:110
 msgid "The option <option>--db</option> can be used to specify a binary caching DB."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:85
+#: apt-ftparchive.1.xml:89
 msgid "sources"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:87
+#: apt-ftparchive.1.xml:91
 msgid ""
 "The <literal>sources</literal> command generates a source index file from a "
 "directory tree.  It takes the given directory and recursively searches it "
@@ -1917,7 +1710,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:92
+#: apt-ftparchive.1.xml:96
 msgid ""
 "If an override file is specified then a source override file will be looked "
 "for with an extension of .src. The --source-override option can be used to "
@@ -1925,12 +1718,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:97
+#: apt-ftparchive.1.xml:101
 msgid "contents"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:99
+#: apt-ftparchive.1.xml:103
 msgid ""
 "The <literal>contents</literal> command generates a contents file from a "
 "directory tree. It takes the given directory and recursively searches it for "
@@ -1941,22 +1734,28 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:109
+#: apt-ftparchive.1.xml:113
 msgid "release"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:111
+#: apt-ftparchive.1.xml:115
 msgid ""
 "The <literal>release</literal> command generates a Release file from a "
-"directory tree. It recursively searches the given directory for Packages, "
-"Packages.gz, Packages.bz2, Sources, Sources.gz, Sources.bz2, Release and "
-"md5sum.txt files.  It then writes to stdout a Release file containing an MD5 "
-"digest and SHA1 digest for each file."
+"directory tree. It recursively searches the given directory for uncompressed "
+"<filename>Packages</filename> and <filename>Sources</filename> files and the "
+"ones compressed with <command>gzip</command>, <command>bzip2</command> or "
+"<command>lzma</command> as well as <filename>Release</filename> and "
+"<filename>md5sum.txt</filename> files by default "
+"(<literal>APT::FTPArchive::Release::Default-Patterns</literal>). Additional "
+"filename patterns can be added by listing them in "
+"<literal>APT::FTPArchive::Release::Patterns</literal>.  It then writes to "
+"stdout a Release file containing a MD5, SHA1 and SHA256 digest for each "
+"file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:118
+#: apt-ftparchive.1.xml:125
 msgid ""
 "Values for the additional metadata fields in the Release file are taken from "
 "the corresponding variables under "
@@ -1965,17 +1764,17 @@ msgid ""
 "fields are: <literal>Origin</literal>, <literal>Label</literal>, "
 "<literal>Suite</literal>, <literal>Version</literal>, "
 "<literal>Codename</literal>, <literal>Date</literal>, "
-"<literal>Architectures</literal>, <literal>Components</literal>, "
-"<literal>Description</literal>."
+"<literal>Valid-Until</literal>, <literal>Architectures</literal>, "
+"<literal>Components</literal>, <literal>Description</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:128
+#: apt-ftparchive.1.xml:136
 msgid "generate"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:130
+#: apt-ftparchive.1.xml:138
 msgid ""
 "The <literal>generate</literal> command is designed to be runnable from a "
 "cron script and builds indexes according to the given config file. The "
@@ -1985,24 +1784,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:137 apt-get.8.xml:292
+#: apt-ftparchive.1.xml:145 apt-get.8.xml:298
 msgid "clean"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:139
+#: apt-ftparchive.1.xml:147
 msgid ""
 "The <literal>clean</literal> command tidies the databases used by the given "
 "configuration file by removing any records that are no longer necessary."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:145
+#: apt-ftparchive.1.xml:153
 msgid "The Generate Configuration"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:147
+#: apt-ftparchive.1.xml:155
 msgid ""
 "The <literal>generate</literal> command uses a configuration file to "
 "describe the archives that are going to be generated. It follows the typical "
@@ -2013,31 +1812,31 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:155
+#: apt-ftparchive.1.xml:163
 msgid "The generate configuration has 4 separate sections, each described below."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:157
+#: apt-ftparchive.1.xml:165
 msgid "Dir Section"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:159
+#: apt-ftparchive.1.xml:167
 msgid ""
 "The <literal>Dir</literal> section defines the standard directories needed "
 "to locate the files required during the generation process. These "
-"directories are prepended to certain relative paths defined in later "
-"sections to produce a complete an absolute path."
+"directories are prepended certain relative paths defined in later sections "
+"to produce a complete an absolute path."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:164
+#: apt-ftparchive.1.xml:172
 msgid "ArchiveDir"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:166
+#: apt-ftparchive.1.xml:174
 msgid ""
 "Specifies the root of the FTP archive, in a standard Debian configuration "
 "this is the directory that contains the <filename>ls-LR</filename> and dist "
@@ -2045,44 +1844,44 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:171
+#: apt-ftparchive.1.xml:179
 msgid "OverrideDir"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:173
+#: apt-ftparchive.1.xml:181
 msgid "Specifies the location of the override files."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:176
+#: apt-ftparchive.1.xml:184
 msgid "CacheDir"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:178
+#: apt-ftparchive.1.xml:186
 msgid "Specifies the location of the cache files"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:181
+#: apt-ftparchive.1.xml:189
 msgid "FileListDir"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:183
+#: apt-ftparchive.1.xml:191
 msgid ""
 "Specifies the location of the file list files, if the "
 "<literal>FileList</literal> setting is used below."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:189
+#: apt-ftparchive.1.xml:197
 msgid "Default Section"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:191
+#: apt-ftparchive.1.xml:199
 msgid ""
 "The <literal>Default</literal> section specifies default values, and "
 "settings that control the operation of the generator. Other sections may "
@@ -2090,12 +1889,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:195
+#: apt-ftparchive.1.xml:203
 msgid "Packages::Compress"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:197
+#: apt-ftparchive.1.xml:205
 msgid ""
 "Sets the default compression schemes to use for the Package index files. It "
 "is a string that contains a space separated list of at least one of: '.' (no "
@@ -2104,60 +1903,72 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:203
+#: apt-ftparchive.1.xml:211
 msgid "Packages::Extensions"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:205
+#: apt-ftparchive.1.xml:213
 msgid ""
 "Sets the default list of file extensions that are package files.  This "
 "defaults to '.deb'."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:209
+#: apt-ftparchive.1.xml:217
 msgid "Sources::Compress"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:211
+#: apt-ftparchive.1.xml:219
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Sources files."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:215
+#: apt-ftparchive.1.xml:223
 msgid "Sources::Extensions"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:217
+#: apt-ftparchive.1.xml:225
 msgid ""
 "Sets the default list of file extensions that are source files.  This "
 "defaults to '.dsc'."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:221
+#: apt-ftparchive.1.xml:229
 msgid "Contents::Compress"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:223
+#: apt-ftparchive.1.xml:231
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Contents files."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:227
+#: apt-ftparchive.1.xml:235
+msgid "Translation::Compress"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:237
+msgid ""
+"This is similar to <literal>Packages::Compress</literal> except that it "
+"controls the compression for the Translation-en master file."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
+#: apt-ftparchive.1.xml:241
 msgid "DeLinkLimit"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:229
+#: apt-ftparchive.1.xml:243
 msgid ""
 "Specifies the number of kilobytes to delink (and replace with hard links) "
 "per run. This is used in conjunction with the per-section "
@@ -2165,24 +1976,36 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:234
+#: apt-ftparchive.1.xml:248
 msgid "FileMode"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:236
+#: apt-ftparchive.1.xml:250
 msgid ""
 "Specifies the mode of all created index files. It defaults to 0644. All "
 "index files are set to this mode with no regard to the umask."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
+#: apt-ftparchive.1.xml:255 apt-ftparchive.1.xml:401
+msgid "LongDescription"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:257 apt-ftparchive.1.xml:403
+msgid ""
+"Sets if long descriptions should be included in the Packages file or split "
+"out into a master Translation-en file."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:243
+#: apt-ftparchive.1.xml:263
 msgid "TreeDefault Section"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:245
+#: apt-ftparchive.1.xml:265
 msgid ""
 "Sets defaults specific to <literal>Tree</literal> sections. All of these "
 "variables are substitution variables and have the strings $(DIST), "
@@ -2190,12 +2013,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:250
+#: apt-ftparchive.1.xml:270
 msgid "MaxContentsChange"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:252
+#: apt-ftparchive.1.xml:272
 msgid ""
 "Sets the number of kilobytes of contents files that are generated each "
 "day. The contents files are round-robined so that over several days they "
@@ -2203,12 +2026,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:257
+#: apt-ftparchive.1.xml:277
 msgid "ContentsAge"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:259
+#: apt-ftparchive.1.xml:279
 msgid ""
 "Controls the number of days a contents file is allowed to be checked without "
 "changing. If this limit is passed the mtime of the contents file is "
@@ -2219,60 +2042,73 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:268
+#: apt-ftparchive.1.xml:288
 msgid "Directory"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:270
+#: apt-ftparchive.1.xml:290
 msgid ""
 "Sets the top of the .deb directory tree. Defaults to "
 "<filename>$(DIST)/$(SECTION)/binary-$(ARCH)/</filename>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:274
+#: apt-ftparchive.1.xml:294
 msgid "SrcDirectory"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:276
+#: apt-ftparchive.1.xml:296
 msgid ""
 "Sets the top of the source package directory tree. Defaults to "
 "<filename>$(DIST)/$(SECTION)/source/</filename>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:280 apt-ftparchive.1.xml:406
+#: apt-ftparchive.1.xml:300 apt-ftparchive.1.xml:439
 msgid "Packages"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:282
+#: apt-ftparchive.1.xml:302
 msgid ""
 "Sets the output Packages file. Defaults to "
 "<filename>$(DIST)/$(SECTION)/binary-$(ARCH)/Packages</filename>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:286 apt-ftparchive.1.xml:411
+#: apt-ftparchive.1.xml:306 apt-ftparchive.1.xml:444
 msgid "Sources"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:288
+#: apt-ftparchive.1.xml:308
 msgid ""
-"Sets the output Packages file. Defaults to "
+"Sets the output Sources file. Defaults to "
 "<filename>$(DIST)/$(SECTION)/source/Sources</filename>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:292
+#: apt-ftparchive.1.xml:312
+msgid "Translation"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:314
+msgid ""
+"Set the output Translation-en master file with the long descriptions if they "
+"should be not included in the Packages file. Defaults to "
+"<filename>$(DIST)/$(SECTION)/i18n/Translation-en</filename>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
+#: apt-ftparchive.1.xml:319
 msgid "InternalPrefix"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:294
+#: apt-ftparchive.1.xml:321
 msgid ""
 "Sets the path prefix that causes a symlink to be considered an internal link "
 "instead of an external link. Defaults to "
@@ -2280,12 +2116,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:299 apt-ftparchive.1.xml:417
+#: apt-ftparchive.1.xml:326 apt-ftparchive.1.xml:450
 msgid "Contents"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:301
+#: apt-ftparchive.1.xml:328
 msgid ""
 "Sets the output Contents file. Defaults to "
 "<filename>$(DIST)/Contents-$(ARCH)</filename>. If this setting causes "
@@ -2295,34 +2131,34 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:308
+#: apt-ftparchive.1.xml:335
 msgid "Contents::Header"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:310
+#: apt-ftparchive.1.xml:337
 msgid "Sets header file to prepend to the contents output."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:313 apt-ftparchive.1.xml:442
+#: apt-ftparchive.1.xml:340 apt-ftparchive.1.xml:475
 msgid "BinCacheDB"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:315
+#: apt-ftparchive.1.xml:342
 msgid ""
 "Sets the binary cache database to use for this section. Multiple sections "
 "can share the same database."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:319
+#: apt-ftparchive.1.xml:346
 msgid "FileList"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:321
+#: apt-ftparchive.1.xml:348
 msgid ""
 "Specifies that instead of walking the directory tree, "
 "<command>apt-ftparchive</command> should read the list of files from the "
@@ -2330,12 +2166,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:326
+#: apt-ftparchive.1.xml:353
 msgid "SourceFileList"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:328
+#: apt-ftparchive.1.xml:355
 msgid ""
 "Specifies that instead of walking the directory tree, "
 "<command>apt-ftparchive</command> should read the list of files from the "
@@ -2344,12 +2180,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:336
+#: apt-ftparchive.1.xml:363
 msgid "Tree Section"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:338
+#: apt-ftparchive.1.xml:365
 msgid ""
 "The <literal>Tree</literal> section defines a standard Debian file tree "
 "which consists of a base directory, then multiple sections in that base "
@@ -2359,58 +2195,60 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:343
+#: apt-ftparchive.1.xml:370
 msgid ""
 "The <literal>Tree</literal> section takes a scope tag which sets the "
 "<literal>$(DIST)</literal> variable and defines the root of the tree (the "
 "path is prefixed by <literal>ArchiveDir</literal>).  Typically this is a "
-"setting such as <filename>dists/woody</filename>."
+"setting such as <filename>dists/&stable-codename;</filename>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:348
+#: apt-ftparchive.1.xml:375
 msgid ""
 "All of the settings defined in the <literal>TreeDefault</literal> section "
 "can be use in a <literal>Tree</literal> section as well as three new "
 "variables."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:351
-msgid ""
-"When processing a <literal>Tree</literal> section "
-"<command>apt-ftparchive</command> performs an operation similar to:"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><para><informalexample><programlisting>
-#: apt-ftparchive.1.xml:354
+#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
+#: apt-ftparchive.1.xml:381
 #, no-wrap
 msgid ""
 "for i in Sections do \n"
 "   for j in Architectures do\n"
 "      Generate for DIST=scope SECTION=i ARCH=j\n"
+"     "
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-ftparchive.1.xml:378
+msgid ""
+"When processing a <literal>Tree</literal> section "
+"<command>apt-ftparchive</command> performs an operation similar to: "
+"<placeholder type=\"programlisting\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:360
+#: apt-ftparchive.1.xml:387
 msgid "Sections"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:362
+#: apt-ftparchive.1.xml:389
 msgid ""
 "This is a space separated list of sections which appear under the "
 "distribution, typically this is something like <literal>main contrib "
 "non-free</literal>"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:367
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-ftparchive.1.xml:394 apt.conf.5.xml:157
 msgid "Architectures"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:369
+#: apt-ftparchive.1.xml:396
 msgid ""
 "This is a space separated list of all the architectures that appear under "
 "search section. The special architecture 'source' is used to indicate that "
@@ -2418,56 +2256,56 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:374 apt-ftparchive.1.xml:422
+#: apt-ftparchive.1.xml:407 apt-ftparchive.1.xml:455
 msgid "BinOverride"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:376
+#: apt-ftparchive.1.xml:409
 msgid ""
 "Sets the binary override file. The override file contains section, priority "
 "and maintainer address information."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:380 apt-ftparchive.1.xml:427
+#: apt-ftparchive.1.xml:413 apt-ftparchive.1.xml:460
 msgid "SrcOverride"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:382
+#: apt-ftparchive.1.xml:415
 msgid ""
 "Sets the source override file. The override file contains section "
 "information."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:386 apt-ftparchive.1.xml:432
+#: apt-ftparchive.1.xml:419 apt-ftparchive.1.xml:465
 msgid "ExtraOverride"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:388 apt-ftparchive.1.xml:434
+#: apt-ftparchive.1.xml:421 apt-ftparchive.1.xml:467
 msgid "Sets the binary extra override file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:391 apt-ftparchive.1.xml:437
+#: apt-ftparchive.1.xml:424 apt-ftparchive.1.xml:470
 msgid "SrcExtraOverride"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:393 apt-ftparchive.1.xml:439
+#: apt-ftparchive.1.xml:426 apt-ftparchive.1.xml:472
 msgid "Sets the source extra override file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:398
+#: apt-ftparchive.1.xml:431
 msgid "BinDirectory Section"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:400
+#: apt-ftparchive.1.xml:433
 msgid ""
 "The <literal>bindirectory</literal> section defines a binary directory tree "
 "with no special structure. The scope tag specifies the location of the "
@@ -2477,64 +2315,64 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:408
+#: apt-ftparchive.1.xml:441
 msgid "Sets the Packages file output."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:413
+#: apt-ftparchive.1.xml:446
 msgid ""
 "Sets the Sources file output. At least one of <literal>Packages</literal> or "
 "<literal>Sources</literal> is required."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:419
+#: apt-ftparchive.1.xml:452
 msgid "Sets the Contents file output. (optional)"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:424
+#: apt-ftparchive.1.xml:457
 msgid "Sets the binary override file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:429
+#: apt-ftparchive.1.xml:462
 msgid "Sets the source override file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:444
+#: apt-ftparchive.1.xml:477
 msgid "Sets the cache DB."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:447
+#: apt-ftparchive.1.xml:480
 msgid "PathPrefix"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:449
+#: apt-ftparchive.1.xml:482
 msgid "Appends a path to all the output paths."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:452
+#: apt-ftparchive.1.xml:485
 msgid "FileList, SourceFileList"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:454
+#: apt-ftparchive.1.xml:487
 msgid "Specifies the file list file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:461
+#: apt-ftparchive.1.xml:494
 msgid "The Binary Override File"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:462
+#: apt-ftparchive.1.xml:495
 msgid ""
 "The binary override file is fully compatible with &dpkg-scanpackages;. It "
 "contains 4 fields separated by spaces. The first field is the package name, "
@@ -2544,19 +2382,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:468
+#: apt-ftparchive.1.xml:501
 #, no-wrap
 msgid "old [// oldn]* => new"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:470
+#: apt-ftparchive.1.xml:503
 #, no-wrap
 msgid "new"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:467
+#: apt-ftparchive.1.xml:500
 msgid ""
 "The general form of the maintainer field is: <placeholder "
 "type=\"literallayout\" id=\"0\"/> or simply, <placeholder "
@@ -2567,12 +2405,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:478
+#: apt-ftparchive.1.xml:511
 msgid "The Source Override File"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:480
+#: apt-ftparchive.1.xml:513
 msgid ""
 "The source override file is fully compatible with &dpkg-scansources;. It "
 "contains 2 fields separated by spaces. The first fields is the source "
@@ -2580,12 +2418,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:485
+#: apt-ftparchive.1.xml:518
 msgid "The Extra Override File"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:487
+#: apt-ftparchive.1.xml:520
 msgid ""
 "The extra override file allows any arbitrary tag to be added or replaced in "
 "the output. It has 3 columns, the first is the package, the second is the "
@@ -2593,32 +2431,40 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:496
-msgid "<option>--md5</option>"
+#: apt-ftparchive.1.xml:529
+msgid "<option>--md5</option>, <option>--sha1</option>, <option>--sha256</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:498
+#: apt-ftparchive.1.xml:531
 msgid ""
-"Generate MD5 sums. This defaults to on, when turned off the generated index "
-"files will not have MD5Sum fields where possible.  Configuration Item: "
-"<literal>APT::FTPArchive::MD5</literal>"
+"Generate the given checksum. These options default to on, when turned off "
+"the generated index files will not have the checksum fields where possible.  "
+"Configuration Items: "
+"<literal>APT::FTPArchive::<replaceable>Checksum</replaceable></literal> and "
+"<literal>APT::FTPArchive::<replaceable>Index</replaceable>::<replaceable>Checksum</replaceable></literal> "
+"where <literal><replaceable>Index</replaceable></literal> can be "
+"<literal>Packages</literal>, <literal>Sources</literal> or "
+"<literal>Release</literal> and "
+"<literal><replaceable>Checksum</replaceable></literal> can be "
+"<literal>MD5</literal>, <literal>SHA1</literal> or "
+"<literal>SHA256</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:503
+#: apt-ftparchive.1.xml:540
 msgid "<option>--db</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:505
+#: apt-ftparchive.1.xml:542
 msgid ""
 "Use a binary caching DB. This has no effect on the generate command.  "
 "Configuration Item: <literal>APT::FTPArchive::DB</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:511
+#: apt-ftparchive.1.xml:548
 msgid ""
 "Quiet; produces output suitable for logging, omitting progress indicators.  "
 "More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -2627,12 +2473,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:517
+#: apt-ftparchive.1.xml:554
 msgid "<option>--delink</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:519
+#: apt-ftparchive.1.xml:556
 msgid ""
 "Perform Delinking. If the <literal>External-Links</literal> setting is used "
 "then this option actually enables delinking of the files. It defaults to on "
@@ -2641,12 +2487,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:525
+#: apt-ftparchive.1.xml:562
 msgid "<option>--contents</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:527
+#: apt-ftparchive.1.xml:564
 msgid ""
 "Perform contents generation. When this option is set and package indexes are "
 "being generated with a cache DB then the file listing will also be extracted "
@@ -2656,12 +2502,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:535
+#: apt-ftparchive.1.xml:572
 msgid "<option>--source-override</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:537
+#: apt-ftparchive.1.xml:574
 msgid ""
 "Select the source override file to use with the <literal>sources</literal> "
 "command.  Configuration Item: "
@@ -2669,24 +2515,72 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:541
+#: apt-ftparchive.1.xml:578
 msgid "<option>--readonly</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:543
+#: apt-ftparchive.1.xml:580
 msgid ""
 "Make the caching databases read only.  Configuration Item: "
 "<literal>APT::FTPArchive::ReadOnlyDB</literal>."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-ftparchive.1.xml:584
+msgid "<option>--arch</option>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:585
+msgid ""
+"Accept in the <literal>packages</literal> and <literal>contents</literal> "
+"commands only package files matching <literal>*_arch.deb</literal> or "
+"<literal>*_all.deb</literal> instead of all package files in the given "
+"path.  Configuration Item: <literal>APT::FTPArchive::Architecture</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-ftparchive.1.xml:591
+msgid "<option>APT::FTPArchive::AlwaysStat</option>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:593
+msgid ""
+"&apt-ftparchive; caches as much as possible of metadata in a cachedb. If "
+"packages are recompiled and/or republished with the same version again, this "
+"will lead to problems 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 nobody will have these problems and therefore all these extra checks "
+"are useless."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-ftparchive.1.xml:603
+msgid "<option>APT::FTPArchive::LongDescription</option>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:605
+msgid ""
+"This configuration option defaults to \"<literal>true</literal>\" and should "
+"only be set to <literal>\"false\"</literal> if the Archive generated with "
+"&apt-ftparchive; also provides <filename>Translation</filename> files. Note "
+"that the <filename>Translation-en</filename> master file can only be created "
+"in the generate command."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:552 apt.conf.5.xml:978 apt_preferences.5.xml:462 sources.list.5.xml:193
+#: apt-ftparchive.1.xml:617 apt.conf.5.xml:1104 apt_preferences.5.xml:544 sources.list.5.xml:209
 msgid "Examples"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><programlisting>
-#: apt-ftparchive.1.xml:558
+#: apt-ftparchive.1.xml:623
 #, no-wrap
 msgid ""
 "<command>apt-ftparchive</command> packages "
@@ -2695,14 +2589,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:554
+#: apt-ftparchive.1.xml:619
 msgid ""
 "To create a compressed Packages file for a directory containing binary "
 "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:568
+#: apt-ftparchive.1.xml:633
 msgid ""
 "<command>apt-ftparchive</command> returns zero on normal operation, decimal "
 "100 on error."
@@ -2710,50 +2604,48 @@ msgstr ""
 
 #.  The last update date 
 #. type: Content of: <refentry><refentryinfo>
-#: apt-get.8.xml:13
+#: apt-get.8.xml:16
 msgid ""
 "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>08 "
 "November 2008</date>"
 msgstr ""
 
 #. type: <heading></heading>
-#: apt-get.8.xml:22 apt-get.8.xml:29 guide.sgml:96
+#: apt-get.8.xml:25 apt-get.8.xml:32 guide.sgml:96
 msgid "apt-get"
 msgstr ""
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-get.8.xml:30
+#: apt-get.8.xml:33
 msgid "APT package handling utility -- command-line interface"
 msgstr ""
 
 #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-get.8.xml:36
+#: apt-get.8.xml:39
 msgid ""
 "<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
 "<option>-o= <replaceable>config_string</replaceable> </option> </arg> <arg> "
 "<option>-c= <replaceable>config_file</replaceable> </option> </arg> <arg> "
-"<option>-t=</option> <group choice='req'> <arg choice='plain'> "
-"<replaceable>target_release_name</replaceable> </arg> <arg choice='plain'> "
-"<replaceable>target_release_number_expression</replaceable> </arg> <arg "
-"choice='plain'> <replaceable>target_release_codename</replaceable> </arg> "
-"</group> </arg> <group choice=\"req\"> <arg choice='plain'>update</arg> <arg "
+"<option>-t=</option> <arg choice='plain'> "
+"<replaceable>target_release</replaceable> </arg> </arg> <arg> "
+"<option>-a=</option> <arg choice='plain'> "
+"<replaceable>default_architecture</replaceable> </arg> </arg> <group "
+"choice=\"req\"> <arg choice='plain'>update</arg> <arg "
 "choice='plain'>upgrade</arg> <arg choice='plain'>dselect-upgrade</arg> <arg "
 "choice='plain'>dist-upgrade</arg> <arg choice='plain'>install <arg "
 "choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable> <arg> <group "
 "choice='req'> <arg choice='plain'> "
 "=<replaceable>pkg_version_number</replaceable> </arg> <arg choice='plain'> "
-"/<replaceable>target_release_name</replaceable> </arg> <arg choice='plain'> "
-"/<replaceable>target_release_codename</replaceable> </arg> </group> </arg> "
-"</arg> </arg> <arg choice='plain'>remove <arg choice=\"plain\" "
+"/<replaceable>target_release</replaceable> </arg> </group> </arg> </arg> "
+"</arg> <arg choice='plain'>remove <arg choice=\"plain\" "
 "rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
 "choice='plain'>purge <arg choice=\"plain\" "
 "rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
 "choice='plain'>source <arg choice=\"plain\" "
 "rep=\"repeat\"><replaceable>pkg</replaceable> <arg> <group choice='req'> "
 "<arg choice='plain'> =<replaceable>pkg_version_number</replaceable> </arg> "
-"<arg choice='plain'> /<replaceable>target_release_name</replaceable> </arg> "
-"<arg choice='plain'> /<replaceable>target_release_codename</replaceable> "
-"</arg> </group> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg "
+"<arg choice='plain'> /<replaceable>target_release</replaceable> </arg> "
+"</group> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg "
 "choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
 "<arg choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg "
 "choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> <arg "
@@ -2764,21 +2656,21 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:126
+#: apt-get.8.xml:122
 msgid ""
 "<command>apt-get</command> is the command-line tool for handling packages, "
 "and may be considered the user's \"back-end\" to other tools using the APT "
 "library.  Several \"front-end\" interfaces exist, such as &dselect;, "
-"&aptitude;, &synaptic;, &gnome-apt; and &wajig;."
+"&aptitude;, &synaptic; and &wajig;."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:135 apt-key.8.xml:123
+#: apt-get.8.xml:131 apt-key.8.xml:127
 msgid "update"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:136
+#: apt-get.8.xml:132
 msgid ""
 "<literal>update</literal> is used to resynchronize the package index files "
 "from their sources. The indexes of available packages are fetched from the "
@@ -2793,12 +2685,12 @@ msgid ""
 msgstr ""
 
 #. type: <tag></tag>
-#: apt-get.8.xml:147 guide.sgml:121
+#: apt-get.8.xml:143 guide.sgml:121
 msgid "upgrade"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:148
+#: apt-get.8.xml:144
 msgid ""
 "<literal>upgrade</literal> is used to install the newest versions of all "
 "packages currently installed on the system from the sources enumerated in "
@@ -2814,12 +2706,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:160
+#: apt-get.8.xml:156
 msgid "dselect-upgrade"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:161
+#: apt-get.8.xml:157
 msgid ""
 "<literal>dselect-upgrade</literal> is used in conjunction with the "
 "traditional Debian packaging front-end, "
@@ -2830,12 +2722,12 @@ msgid ""
 msgstr ""
 
 #. type: <tag></tag>
-#: apt-get.8.xml:170 guide.sgml:140
+#: apt-get.8.xml:166 guide.sgml:140
 msgid "dist-upgrade"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:171
+#: apt-get.8.xml:167
 msgid ""
 "<literal>dist-upgrade</literal> in addition to performing the function of "
 "<literal>upgrade</literal>, also intelligently handles changing dependencies "
@@ -2849,12 +2741,12 @@ msgid ""
 msgstr ""
 
 #. type: <tag></tag>
-#: apt-get.8.xml:183 guide.sgml:131
+#: apt-get.8.xml:179 guide.sgml:131
 msgid "install"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:185
+#: apt-get.8.xml:181
 msgid ""
 "<literal>install</literal> is followed by one or more packages desired for "
 "installation or upgrading.  Each package is a package name, not a fully "
@@ -2870,7 +2762,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:203
+#: apt-get.8.xml:199
 msgid ""
 "A specific version of a package can be selected for installation by "
 "following the package name with an equals and the version of the package to "
@@ -2881,14 +2773,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:210
+#: apt-get.8.xml:206
 msgid ""
 "Both of the version selection mechanisms can downgrade packages and must be "
 "used with care."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:213
+#: apt-get.8.xml:209
 msgid ""
 "This is also the target to use if you want to upgrade one or more "
 "already-installed packages without upgrading every package you have on your "
@@ -2900,14 +2792,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:224
+#: apt-get.8.xml:220
 msgid ""
 "Finally, the &apt-preferences; mechanism allows you to create an alternative "
 "installation policy for individual packages."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:228
+#: apt-get.8.xml:224
 msgid ""
 "If no package matches the given expression and the expression contains one "
 "of '.', '?' or '*' then it is assumed to be a POSIX regular expression, and "
@@ -2919,12 +2811,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:237
+#: apt-get.8.xml:233
 msgid "remove"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:238
+#: apt-get.8.xml:234
 msgid ""
 "<literal>remove</literal> is identical to <literal>install</literal> except "
 "that packages are removed instead of installed. Note the removing a package "
@@ -2934,12 +2826,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:245
+#: apt-get.8.xml:241
 msgid "purge"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:246
+#: apt-get.8.xml:242
 msgid ""
 "<literal>purge</literal> is identical to <literal>remove</literal> except "
 "that packages are removed and purged (any configuration files are deleted "
@@ -2947,12 +2839,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:250
+#: apt-get.8.xml:246
 msgid "source"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:251
+#: apt-get.8.xml:247
 msgid ""
 "<literal>source</literal> causes <command>apt-get</command> to fetch source "
 "packages. APT will examine the available packages to decide which source "
@@ -2964,7 +2856,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:259
+#: apt-get.8.xml:255
 msgid ""
 "Source packages are tracked separately from binary packages via "
 "<literal>deb-src</literal> type lines in the &sources-list; file. This means "
@@ -2975,16 +2867,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:266
+#: apt-get.8.xml:262
 msgid ""
-"If the <option>--compile</option> options is specified then the package will "
-"be compiled to a binary .deb using <command>dpkg-buildpackage</command>, if "
-"<option>--download-only</option> is specified then the source package will "
-"not be unpacked."
+"If the <option>--compile</option> option is specified then the package will "
+"be compiled to a binary .deb using <command>dpkg-buildpackage</command> for "
+"the architecture as defined by the <command>--host-architecture</command> "
+"option.  If <option>--download-only</option> is specified then the source "
+"package will not be unpacked."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:271
+#: apt-get.8.xml:269
 msgid ""
 "A specific source version can be retrieved by postfixing the source name "
 "with an equals and then the version to fetch, similar to the mechanism used "
@@ -2994,7 +2887,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:277
+#: apt-get.8.xml:275
 msgid ""
 "Note that source packages are not tracked like binary packages, they exist "
 "only in the current directory and are similar to downloading source tar "
@@ -3002,15 +2895,18 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:282
+#: apt-get.8.xml:280
 msgid "build-dep"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:283
+#: apt-get.8.xml:281
 msgid ""
 "<literal>build-dep</literal> causes apt-get to install/remove packages in an "
-"attempt to satisfy the build dependencies for a source package."
+"attempt to satisfy the build dependencies for a source package. By default "
+"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 ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
@@ -3025,9 +2921,21 @@ msgid ""
 "and checks for broken dependencies."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-get.8.xml:292
+msgid "download"
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:293
 msgid ""
+"<literal>download</literal> will download the given binary package into the "
+"current directory."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:299
+msgid ""
 "<literal>clean</literal> clears out the local repository of retrieved "
 "package files. It removes everything but the lock file from "
 "<filename>&cachedir;/archives/</filename> and "
@@ -3038,12 +2946,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:302
+#: apt-get.8.xml:308
 msgid "autoclean"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:303
+#: apt-get.8.xml:309
 msgid ""
 "Like <literal>clean</literal>, <literal>autoclean</literal> clears out the "
 "local repository of retrieved package files. The difference is that it only "
@@ -3055,75 +2963,105 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:312
+#: apt-get.8.xml:318
 msgid "autoremove"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:313
+#: apt-get.8.xml:319
 msgid ""
 "<literal>autoremove</literal> is used to remove packages that were "
-"automatically installed to satisfy dependencies for some package and that "
-"are no more needed."
+"automatically installed to satisfy dependencies for other packages and are "
+"now no longer needed."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:323 apt-get.8.xml:429
-msgid "<option>--no-install-recommends</option>"
+#: apt-get.8.xml:323
+msgid "changelog"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:324
 msgid ""
+"<literal>changelog</literal> downloads a package changelog and displays it "
+"through <command>sensible-pager</command>. The server name and base "
+"directory is defined in the <literal>APT::Changelogs::Server</literal> "
+"variable (e. g. <ulink>http://packages.debian.org/changelogs</ulink> for "
+"Debian or <ulink>http://changelogs.ubuntu.com/changelogs</ulink> for "
+"Ubuntu).  By default it displays the changelog for the version that is "
+"installed.  However, you can specify the same options as for the "
+"<option>install</option> command."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-get.8.xml:346
+msgid "<option>--no-install-recommends</option>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:347
+msgid ""
 "Do not consider recommended packages as a dependency for installing.  "
 "Configuration Item: <literal>APT::Install-Recommends</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:328
+#: apt-get.8.xml:351
+msgid "<option>--install-suggests</option>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:352
+msgid ""
+"Consider suggested packages as a dependency for installing.  Configuration "
+"Item: <literal>APT::Install-Suggests</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-get.8.xml:356
 msgid "<option>--download-only</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:329
+#: apt-get.8.xml:357
 msgid ""
 "Download only; package files are only retrieved, not unpacked or installed.  "
 "Configuration Item: <literal>APT::Get::Download-Only</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:333
+#: apt-get.8.xml:361
 msgid "<option>--fix-broken</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:334
+#: apt-get.8.xml:362
 msgid ""
 "Fix; attempt to correct a system with broken dependencies in place. This "
 "option, when used with install/remove, can omit any packages to permit APT "
-"to deduce a likely solution. Any Package that are specified must completely "
-"correct the problem. The option is sometimes necessary when running APT for "
-"the first time; APT itself does not allow broken package dependencies to "
-"exist on a system. It is possible that a system's dependency structure can "
-"be so corrupt as to require manual intervention (which usually means using "
-"&dselect; or <command>dpkg --remove</command> to eliminate some of the "
-"offending packages). Use of this option together with <option>-m</option> "
-"may produce an error in some situations.  Configuration Item: "
-"<literal>APT::Get::Fix-Broken</literal>."
+"to deduce a likely solution. If packages are specified, these have to "
+"completely correct the problem. The option is sometimes necessary when "
+"running APT for the first time; APT itself does not allow broken package "
+"dependencies to exist on a system. It is possible that a system's dependency "
+"structure can be so corrupt as to require manual intervention (which usually "
+"means using &dselect; or <command>dpkg --remove</command> to eliminate some "
+"of the offending packages). Use of this option together with "
+"<option>-m</option> may produce an error in some situations.  Configuration "
+"Item: <literal>APT::Get::Fix-Broken</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:347
+#: apt-get.8.xml:375
 msgid "<option>--ignore-missing</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:348
+#: apt-get.8.xml:376
 msgid "<option>--fix-missing</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:349
+#: apt-get.8.xml:377
 msgid ""
 "Ignore missing packages; If packages cannot be retrieved or fail the "
 "integrity check after retrieval (corrupted package files), hold back those "
@@ -3135,12 +3073,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:359
+#: apt-get.8.xml:387
 msgid "<option>--no-download</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:360
+#: apt-get.8.xml:388
 msgid ""
 "Disables downloading of packages. This is best used with "
 "<option>--ignore-missing</option> to force APT to use only the .debs it has "
@@ -3149,7 +3087,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:367
+#: apt-get.8.xml:395
 msgid ""
 "Quiet; produces output suitable for logging, omitting progress indicators.  "
 "More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -3161,17 +3099,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:377
+#: apt-get.8.xml:405
 msgid "<option>--simulate</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:379
+#: apt-get.8.xml:407
 msgid "<option>--dry-run</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:382
+#: apt-get.8.xml:410
 msgid ""
 "No action; perform a simulation of events that would occur but do not "
 "actually change the system.  Configuration Item: "
@@ -3179,7 +3117,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:386
+#: apt-get.8.xml:414
 msgid ""
 "Simulation run as user will deactivate locking "
 "(<literal>Debug::NoLocking</literal>)  automatic. Also a notice will be "
@@ -3191,31 +3129,31 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:392
+#: apt-get.8.xml:420
 msgid ""
 "Simulate prints out a series of lines each one representing a dpkg "
 "operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square brackets "
-"indicate broken packages with and empty set of square brackets meaning "
-"breaks that are of no consequence (rare)."
+"indicate broken packages and empty set of square brackets meaning breaks "
+"that are of no consequence (rare)."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:399
+#: apt-get.8.xml:427
 msgid "<option>-y</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:399
+#: apt-get.8.xml:427
 msgid "<option>--yes</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:400
+#: apt-get.8.xml:428
 msgid "<option>--assume-yes</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:401
+#: apt-get.8.xml:429
 msgid ""
 "Automatic yes to prompts; assume \"yes\" as answer to all prompts and run "
 "non-interactively. If an undesirable situation, such as changing a held "
@@ -3225,83 +3163,84 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:408
+#: apt-get.8.xml:436
 msgid "<option>-u</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:408
+#: apt-get.8.xml:436
 msgid "<option>--show-upgraded</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:409
+#: apt-get.8.xml:437
 msgid ""
 "Show upgraded packages; Print out a list of all packages that are to be "
 "upgraded.  Configuration Item: <literal>APT::Get::Show-Upgraded</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:414
+#: apt-get.8.xml:442
 msgid "<option>-V</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:414
+#: apt-get.8.xml:442
 msgid "<option>--verbose-versions</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:415
+#: apt-get.8.xml:443
 msgid ""
 "Show full versions for upgraded and installed packages.  Configuration Item: "
 "<literal>APT::Get::Show-Versions</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:419
+#: apt-get.8.xml:448
+msgid "<option>--host-architecture</option>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:449
+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 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 ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-get.8.xml:457
 msgid "<option>-b</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:419
+#: apt-get.8.xml:457
 msgid "<option>--compile</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:420
+#: apt-get.8.xml:458
 msgid "<option>--build</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:421
+#: apt-get.8.xml:459
 msgid ""
 "Compile source packages after downloading them.  Configuration Item: "
 "<literal>APT::Get::Compile</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:425
-msgid "<option>--install-recommends</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:426
-msgid "Also install recommended packages."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:430
-msgid "Do not install recommended packages."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:433
+#: apt-get.8.xml:463
 msgid "<option>--ignore-hold</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:434
+#: apt-get.8.xml:464
 msgid ""
 "Ignore package Holds; This causes <command>apt-get</command> to ignore a "
 "hold placed on a package. This may be useful in conjunction with "
@@ -3310,12 +3249,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:440
+#: apt-get.8.xml:470
 msgid "<option>--no-upgrade</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:441
+#: apt-get.8.xml:471
 msgid ""
 "Do not upgrade packages; When used in conjunction with "
 "<literal>install</literal>, <literal>no-upgrade</literal> will prevent "
@@ -3324,12 +3263,26 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:447
+#: apt-get.8.xml:477
+msgid "<option>--only-upgrade</option>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:478
+msgid ""
+"Do not install new packages; When used in conjunction with "
+"<literal>install</literal>, <literal>only-upgrade</literal> will prevent "
+"packages on the command line from being upgraded if they are not already "
+"installed.  Configuration Item: <literal>APT::Get::Only-Upgrade</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-get.8.xml:484
 msgid "<option>--force-yes</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:448
+#: apt-get.8.xml:485
 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 "
@@ -3339,12 +3292,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:455
+#: apt-get.8.xml:492
 msgid "<option>--print-uris</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:456
+#: apt-get.8.xml:493
 msgid ""
 "Instead of fetching the files to install their URIs are printed. Each URI "
 "will have the path, the destination file name, the size and the expected md5 "
@@ -3357,39 +3310,39 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:466
+#: apt-get.8.xml:503
 msgid "<option>--purge</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:467
+#: apt-get.8.xml:504
 msgid ""
 "Use purge instead of remove for anything that would be removed.  An asterisk "
 "(\"*\") will be displayed next to packages which are scheduled to be "
-"purged. <option>remove --purge</option> is equivalent for "
+"purged. <option>remove --purge</option> is equivalent to the "
 "<option>purge</option> command.  Configuration Item: "
 "<literal>APT::Get::Purge</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:474
+#: apt-get.8.xml:511
 msgid "<option>--reinstall</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:475
+#: apt-get.8.xml:512
 msgid ""
 "Re-Install packages that are already installed and at the newest version.  "
 "Configuration Item: <literal>APT::Get::ReInstall</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:479
+#: apt-get.8.xml:516
 msgid "<option>--list-cleanup</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:480
+#: apt-get.8.xml:517
 msgid ""
 "This option defaults to on, use <literal>--no-list-cleanup</literal> to turn "
 "it off. When on <command>apt-get</command> will automatically manage the "
@@ -3400,17 +3353,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:489
+#: apt-get.8.xml:526
 msgid "<option>--target-release</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:490
+#: apt-get.8.xml:527
 msgid "<option>--default-release</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:491
+#: apt-get.8.xml:528
 msgid ""
 "This option controls the default input to the policy engine, it creates a "
 "default pin at priority 990 using the specified release string.  This "
@@ -3425,12 +3378,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:504
+#: apt-get.8.xml:541
 msgid "<option>--trivial-only</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:506
+#: apt-get.8.xml:543
 msgid ""
 "Only perform operations that are 'trivial'. Logically this can be considered "
 "related to <option>--assume-yes</option>, where "
@@ -3440,24 +3393,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:512
+#: apt-get.8.xml:549
 msgid "<option>--no-remove</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:513
+#: apt-get.8.xml:550
 msgid ""
 "If any packages are to be removed apt-get immediately aborts without "
 "prompting.  Configuration Item: <literal>APT::Get::Remove</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:518
+#: apt-get.8.xml:555
 msgid "<option>--auto-remove</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:519
+#: apt-get.8.xml:556
 msgid ""
 "If the command is either <literal>install</literal> or "
 "<literal>remove</literal>, then this option acts like running "
@@ -3466,12 +3419,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:525
+#: apt-get.8.xml:562
 msgid "<option>--only-source</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:526
+#: apt-get.8.xml:563
 msgid ""
 "Only has meaning for the <literal>source</literal> and "
 "<literal>build-dep</literal> commands.  Indicates that the given source "
@@ -3483,22 +3436,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:536
+#: apt-get.8.xml:573
 msgid "<option>--diff-only</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:536
+#: apt-get.8.xml:573
 msgid "<option>--dsc-only</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:536
+#: apt-get.8.xml:573
 msgid "<option>--tar-only</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:537
+#: apt-get.8.xml:574
 msgid ""
 "Download only the diff, dsc, or tar file of a source archive.  Configuration "
 "Item: <literal>APT::Get::Diff-Only</literal>, "
@@ -3507,24 +3460,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:542
+#: apt-get.8.xml:579
 msgid "<option>--arch-only</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:543
+#: apt-get.8.xml:580
 msgid ""
 "Only process architecture-dependent build-dependencies.  Configuration Item: "
 "<literal>APT::Get::Arch-Only</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:547
+#: apt-get.8.xml:584
 msgid "<option>--allow-unauthenticated</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:548
+#: apt-get.8.xml:585
 msgid ""
 "Ignore if packages can't be authenticated and don't prompt about it.  This "
 "is useful for tools like pbuilder.  Configuration Item: "
@@ -3532,14 +3485,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt-get.8.xml:561
+#: apt-get.8.xml:598
 msgid ""
 "&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; "
 "&file-statelists;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:570
+#: apt-get.8.xml:607
 msgid ""
 "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
 "&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, "
@@ -3547,52 +3500,53 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:576
+#: apt-get.8.xml:613
 msgid ""
 "<command>apt-get</command> returns zero on normal operation, decimal 100 on "
 "error."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:579
+#: apt-get.8.xml:616
 msgid "ORIGINAL AUTHORS"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:580
+#: apt-get.8.xml:617
 msgid "&apt-author.jgunthorpe;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:583
+#: apt-get.8.xml:620
 msgid "CURRENT AUTHORS"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:585
+#: apt-get.8.xml:622
 msgid "&apt-author.team;"
 msgstr ""
 
 #. type: Content of: <refentry><refnamediv><refname>
-#: apt-key.8.xml:14 apt-key.8.xml:21
+#: apt-key.8.xml:17 apt-key.8.xml:24
 msgid "apt-key"
 msgstr ""
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-key.8.xml:22
+#: apt-key.8.xml:25
 msgid "APT key management utility"
 msgstr ""
 
 #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-key.8.xml:28
+#: apt-key.8.xml:31
 msgid ""
-"<command>apt-key</command> <arg><replaceable>command</replaceable>/</arg> "
-"<arg "
+"<command>apt-key</command> <arg><option>--keyring "
+"<replaceable>filename</replaceable></option></arg> "
+"<arg><replaceable>command</replaceable></arg> <arg "
 "rep=\"repeat\"><option><replaceable>arguments</replaceable></option></arg>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:36
+#: apt-key.8.xml:40
 msgid ""
 "<command>apt-key</command> is used to manage the list of keys used by apt to "
 "authenticate packages.  Packages which have been authenticated using these "
@@ -3600,17 +3554,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-key.8.xml:42
+#: apt-key.8.xml:46
 msgid "Commands"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:44
+#: apt-key.8.xml:48
 msgid "add <replaceable>filename</replaceable>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:48
+#: apt-key.8.xml:52
 msgid ""
 "Add a new key to the list of trusted keys.  The key is read from "
 "<replaceable>filename</replaceable>, or standard input if "
@@ -3618,158 +3572,195 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:56
+#: apt-key.8.xml:60
 msgid "del <replaceable>keyid</replaceable>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:60
+#: apt-key.8.xml:64
 msgid "Remove a key from the list of trusted keys."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:67
+#: apt-key.8.xml:71
 msgid "export <replaceable>keyid</replaceable>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:71
+#: apt-key.8.xml:75
 msgid "Output the key <replaceable>keyid</replaceable> to standard output."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:78
+#: apt-key.8.xml:82
 msgid "exportall"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:82
+#: apt-key.8.xml:86
 msgid "Output all trusted keys to standard output."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:89
+#: apt-key.8.xml:93
 msgid "list"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:93
+#: apt-key.8.xml:97
 msgid "List trusted keys."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:100
+#: apt-key.8.xml:104
 msgid "finger"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:104
+#: apt-key.8.xml:108
 msgid "List fingerprints of trusted keys."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:111
+#: apt-key.8.xml:115
 msgid "adv"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:115
+#: apt-key.8.xml:119
 msgid ""
 "Pass advanced options to gpg. With adv --recv-key you can download the "
 "public key."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:127
+#: apt-key.8.xml:131
 msgid ""
-"Update the local keyring with the keyring of Debian archive keys and removes "
-"from the keyring the archive keys which are no longer valid."
+"Update the local keyring with the archive keyring and remove from the local "
+"keyring the archive keys which are no longer valid.  The archive keyring is "
+"shipped in the <literal>archive-keyring</literal> package of your "
+"distribution, e.g. the <literal>debian-archive-keyring</literal> package in "
+"Debian."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:140
-msgid "<filename>/etc/apt/trusted.gpg</filename>"
+#: apt-key.8.xml:141
+msgid "net-update"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:141
-msgid "Keyring of local trusted keys, new keys will be added here."
+#: apt-key.8.xml:145
+msgid ""
+"Work similar to the <command>update</command> command above, but get the "
+"archive keyring from an URI instead and validate it against a master key.  "
+"This requires an installed &wget; and an APT build configured to have a "
+"server to fetch from and a master keyring to validate.  APT in Debian does "
+"not support this command and relies on <command>update</command> instead, "
+"but Ubuntu's APT does."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-key.8.xml:162
+msgid ""
+"Note that options need to be defined before the commands described in the "
+"previous section."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-key.8.xml:164
+msgid "--keyring <replaceable>filename</replaceable>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-key.8.xml:165
+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, though "
+"<filename>trusted.gpg</filename> is the primary keyring which means that "
+"e.g. new keys are added to this one."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist>
+#: apt-key.8.xml:178
+msgid "&file-trustedgpg;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:144
+#: apt-key.8.xml:180
 msgid "<filename>/etc/apt/trustdb.gpg</filename>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:145
+#: apt-key.8.xml:181
 msgid "Local trust database of archive keys."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:148
+#: apt-key.8.xml:184
 msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:149
+#: apt-key.8.xml:185
 msgid "Keyring of Debian archive trusted keys."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:152
+#: apt-key.8.xml:188
 msgid "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:153
+#: apt-key.8.xml:189
 msgid "Keyring of Debian archive removed trusted keys."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:164
+#: apt-key.8.xml:198
 msgid "&apt-get;, &apt-secure;"
 msgstr ""
 
 #.  The last update date 
 #. type: Content of: <refentry><refentryinfo>
-#: apt-mark.8.xml:13
+#: apt-mark.8.xml:16
 msgid ""
-"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 "
-"August 2009</date>"
+"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>21 "
+"April 2011</date>"
 msgstr ""
 
 #. type: Content of: <refentry><refnamediv><refname>
-#: apt-mark.8.xml:22 apt-mark.8.xml:29
+#: apt-mark.8.xml:25 apt-mark.8.xml:32
 msgid "apt-mark"
 msgstr ""
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-mark.8.xml:30
+#: apt-mark.8.xml:33
 msgid "mark/unmark a package as being automatically-installed"
 msgstr ""
 
 #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-mark.8.xml:36
+#: apt-mark.8.xml:39
 msgid ""
 "  <command>apt-mark</command> <arg><option>-hv</option></arg> "
 "<arg><option>-f=<replaceable>FILENAME</replaceable></option></arg> <group "
 "choice=\"plain\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg "
-"choice=\"plain\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> "
+"choice=\"plain\">auto</arg> <arg choice=\"plain\">manual</arg> <arg "
+"choice=\"plain\">showauto</arg> <arg choice=\"plain\">showmanual</arg> "
 "</group> <arg choice=\"plain\" "
-"rep=\"repeat\"><replaceable>package</replaceable></arg> </arg> <arg "
-"choice=\"plain\">showauto</arg> </group>"
+"rep=\"repeat\"><replaceable>package</replaceable></arg> </arg> </group>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:53
+#: apt-mark.8.xml:57
 msgid ""
 "<command>apt-mark</command> will change whether a package has been marked as "
 "being automatically installed."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:57
+#: apt-mark.8.xml:61
 msgid ""
 "When you request that a package is installed, and as a result other packages "
 "are installed to satisfy its dependencies, the dependencies are marked as "
@@ -3779,129 +3770,145 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:65
-msgid "markauto"
+#: apt-mark.8.xml:69
+msgid "auto"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:66
+#: apt-mark.8.xml:70
 msgid ""
-"<literal>markauto</literal> is used to mark a package as being automatically "
+"<literal>auto</literal> is used to mark a package as being automatically "
 "installed, which will cause the package to be removed when no more manually "
 "installed packages depend on this package."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:73
-msgid "unmarkauto"
+#: apt-mark.8.xml:77
+msgid "manual"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:74
+#: apt-mark.8.xml:78
 msgid ""
-"<literal>unmarkauto</literal> is used to mark a package as being manually "
+"<literal>manual</literal> is used to mark a package as being manually "
 "installed, which will prevent the package from being automatically removed "
 "if no other packages depend on it."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:81
-msgid "showauto"
+#: apt-mark.8.xml:85
+msgid "hold"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:82
+#: apt-mark.8.xml:86
 msgid ""
-"<literal>showauto</literal> is used to print a list of automatically "
-"installed packages with each package on a new line."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:93
-msgid "<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>"
+"<literal>hold</literal> is used to mark a package as hold back, which will "
+"prevent the package from being automatically installed, upgraded or "
+"removed.  The command is only a wrapper around <command>dpkg "
+"--set-selections</command> and the state is therefore maintained by &dpkg; "
+"and not effected by the <option>--filename</option> option."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:94
-msgid "<option>--file=<filename><replaceable>FILENAME</replaceable></filename></option>"
+#: apt-mark.8.xml:95
+msgid "unhold"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:97
+#: apt-mark.8.xml:96
 msgid ""
-"Read/Write package stats from "
-"<filename><replaceable>FILENAME</replaceable></filename> instead of the "
-"default location, which is <filename>extended_status</filename> in the "
-"directory defined by the Configuration Item: <literal>Dir::State</literal>."
+"<literal>unhold</literal> is used to cancel a previously set hold on a "
+"package to allow all actions again."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:103
-msgid "<option>-h</option>"
+#: apt-mark.8.xml:101
+msgid "showauto"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml:102
+msgid ""
+"<literal>showauto</literal> is used to print a list of automatically "
+"installed packages with each package on a new line.  All automatically "
+"installed packages will be listed if no package is given.  If packages are "
+"given only those which are automatically installed will be shown."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:104
-msgid "<option>--help</option>"
+#: apt-mark.8.xml:109
+msgid "showmanual"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:105
-msgid "Show a short usage summary."
+#: apt-mark.8.xml:110
+msgid ""
+"<literal>showmanual</literal> can be used in the same way as "
+"<literal>showauto</literal> except that it will print a list of manually "
+"installed packages instead."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:111
-msgid "<option>-v</option>"
+#: apt-mark.8.xml:116
+msgid "showhold"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:112
-msgid "<option>--version</option>"
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml:117
+msgid ""
+"<literal>showhold</literal> is used to print a list of packages on hold in "
+"the same way as for the other show commands."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:113
-msgid "Show the program version."
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-mark.8.xml:130
+msgid "<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:124
-msgid "<filename>/var/lib/apt/extended_states</filename>"
+#: apt-mark.8.xml:131
+msgid "<option>--file=<filename><replaceable>FILENAME</replaceable></filename></option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:125
+#: apt-mark.8.xml:134
 msgid ""
-"Status list of auto-installed packages.  Configuration Item: "
-"<literal>Dir::State</literal> sets the path to the "
-"<filename>extended_states</filename> file."
+"Read/Write package stats from "
+"<filename><replaceable>FILENAME</replaceable></filename> instead of the "
+"default location, which is <filename>extended_status</filename> in the "
+"directory defined by the Configuration Item: <literal>Dir::State</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist>
+#: apt-mark.8.xml:146
+msgid "  &file-extended_states;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:134
+#: apt-mark.8.xml:151
 msgid "&apt-get;,&aptitude;,&apt-conf;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:138
+#: apt-mark.8.xml:155
 msgid ""
 "<command>apt-mark</command> returns zero on normal operation, non-zero on "
 "error."
 msgstr ""
 
 #. type: Content of: <refentry><refnamediv><refname>
-#: apt-secure.8.xml:14 apt-secure.8.xml:36
+#: apt-secure.8.xml:17 apt-secure.8.xml:39
 msgid "apt-secure"
 msgstr ""
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-secure.8.xml:37
+#: apt-secure.8.xml:40
 msgid "Archive authentication support for APT"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:42
+#: apt-secure.8.xml:45
 msgid ""
 "Starting with version 0.6, <command>apt</command> contains code that does "
 "signature checking of the Release file for all archives. This ensures that "
@@ -3910,7 +3917,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:50
+#: apt-secure.8.xml:53
 msgid ""
 "If a package comes from a archive without a signature or with a signature "
 "that apt does not have a key for that package is considered untrusted and "
@@ -3920,30 +3927,30 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:59
+#: apt-secure.8.xml:62
 msgid ""
 "The package frontends &apt-get;, &aptitude; and &synaptic; support this new "
 "authentication feature."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:64
+#: apt-secure.8.xml:67
 msgid "Trusted archives"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:67
+#: apt-secure.8.xml:70
 msgid ""
 "The chain of trust from an apt archive to the end user is made up of "
 "different steps. <command>apt-secure</command> is the last step in this "
 "chain, trusting an archive does not mean that the packages that you trust it "
 "do not contain malicious code but means that you trust the archive "
-"maintainer. Its the archive maintainer responsibility to ensure that the "
+"maintainer. It's the archive maintainer responsibility to ensure that the "
 "archive integrity is correct."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:75
+#: apt-secure.8.xml:78
 msgid ""
 "apt-secure does not review signatures at a package level. If you require "
 "tools to do this you should look at <command>debsig-verify</command> and "
@@ -3952,7 +3959,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:82
+#: apt-secure.8.xml:85
 msgid ""
 "The chain of trust in Debian starts when a maintainer uploads a new package "
 "or a new version of a package to the Debian archive. This upload in order to "
@@ -3963,18 +3970,18 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:92
+#: apt-secure.8.xml:95
 msgid ""
 "Once the uploaded package is verified and included in the archive, the "
 "maintainer signature is stripped off, an MD5 sum of the package is computed "
 "and put in the Packages file. The MD5 sum of all of the packages files are "
 "then computed and put into the Release file. The Release file is then signed "
-"by the archive key (which is created once a year and distributed through the "
-"FTP server. This key is also on the Debian keyring."
+"by the archive key (which is created once a year) and distributed through "
+"the FTP server. This key is also on the Debian keyring."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:102
+#: apt-secure.8.xml:105
 msgid ""
 "Any end user can check the signature of the Release file, extract the MD5 "
 "sum of a package from it and compare it with the MD5 sum of the package he "
@@ -3984,14 +3991,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:109
+#: apt-secure.8.xml:112
 msgid ""
 "Notice that this is distinct from checking signatures on a per package "
 "basis. It is designed to prevent two possible attacks:"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:114
+#: apt-secure.8.xml:117
 msgid ""
 "<literal>Network \"man in the middle\" attacks</literal>. Without signature "
 "checking, a malicious agent can introduce himself in the package download "
@@ -4001,7 +4008,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:122
+#: apt-secure.8.xml:125
 msgid ""
 "<literal>Mirror network compromise</literal>.  Without signature checking, a "
 "malicious agent can compromise a mirror host and modify the files in it to "
@@ -4010,7 +4017,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:129
+#: apt-secure.8.xml:132
 msgid ""
 "However, it does not defend against a compromise of the Debian master server "
 "itself (which signs the packages) or against a compromise of the key used to "
@@ -4019,12 +4026,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:135
+#: apt-secure.8.xml:138
 msgid "User configuration"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:137
+#: apt-secure.8.xml:140
 msgid ""
 "<command>apt-key</command> is the program that manages the list of keys used "
 "by apt. It can be used to add or remove keys although an installation of "
@@ -4033,53 +4040,54 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:144
+#: apt-secure.8.xml:147
 msgid ""
 "In order to add a new key you need to first download it (you should make "
 "sure you are using a trusted communication channel when retrieving it), add "
 "it with <command>apt-key</command> and then run <command>apt-get "
 "update</command> so that apt can download and verify the "
-"<filename>Release.gpg</filename> files from the archives you have "
-"configured."
+"<filename>InRelease</filename> or <filename>Release.gpg</filename> files "
+"from the archives you have configured."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:153
+#: apt-secure.8.xml:156
 msgid "Archive configuration"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:155
+#: apt-secure.8.xml:158
 msgid ""
 "If you want to provide archive signatures in an archive under your "
 "maintenance you have to:"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:160
+#: apt-secure.8.xml:163
 msgid ""
-"<literal>Create a toplevel Release file</literal>.  if it does not exist "
+"<emphasis>Create a toplevel Release file</emphasis>, if it does not exist "
 "already. You can do this by running <command>apt-ftparchive "
 "release</command> (provided in apt-utils)."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:165
+#: apt-secure.8.xml:168
 msgid ""
-"<literal>Sign it</literal>. You can do this by running <command>gpg -abs -o "
+"<emphasis>Sign it</emphasis>. You can do this by running <command>gpg "
+"--clearsign -o InRelease Release</command> and <command>gpg -abs -o "
 "Release.gpg Release</command>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:168
+#: apt-secure.8.xml:172
 msgid ""
-"<literal>Publish the key fingerprint</literal>, that way your users will "
+"<emphasis>Publish the key fingerprint</emphasis>, that way your users will "
 "know what key they need to import in order to authenticate the files in the "
 "archive."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:175
+#: apt-secure.8.xml:179
 msgid ""
 "Whenever the contents of the archive changes (new packages are added or "
 "removed) the archive maintainer has to follow the first two steps previously "
@@ -4087,14 +4095,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:183
+#: apt-secure.8.xml:187
 msgid ""
 "&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, "
 "&debsign; &debsig-verify;, &gpg;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:187
+#: apt-secure.8.xml:191
 msgid ""
 "For more background information you might want to review the <ulink "
 "url=\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7.en.html\">Debian "
@@ -4105,29 +4113,29 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:200
+#: apt-secure.8.xml:204
 msgid "Manpage Authors"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:202
+#: apt-secure.8.xml:206
 msgid ""
 "This man-page is based on the work of Javier Fernández-Sanguino Peña, Isaac "
 "Jones, Colin Walters, Florian Weimer and Michael Vogt."
 msgstr ""
 
 #. type: Content of: <refentry><refnamediv><refname>
-#: apt-sortpkgs.1.xml:22 apt-sortpkgs.1.xml:29
+#: apt-sortpkgs.1.xml:25 apt-sortpkgs.1.xml:32
 msgid "apt-sortpkgs"
 msgstr ""
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-sortpkgs.1.xml:30
+#: apt-sortpkgs.1.xml:33
 msgid "Utility to sort package index files"
 msgstr ""
 
 #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-sortpkgs.1.xml:36
+#: apt-sortpkgs.1.xml:39
 msgid ""
 "<command>apt-sortpkgs</command> <arg><option>-hvs</option></arg> "
 "<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
@@ -4136,7 +4144,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-sortpkgs.1.xml:45
+#: apt-sortpkgs.1.xml:48
 msgid ""
 "<command>apt-sortpkgs</command> will take an index file (Source index or "
 "Package index) and sort the records so that they are ordered by the package "
@@ -4145,24 +4153,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-sortpkgs.1.xml:51
+#: apt-sortpkgs.1.xml:54
 msgid "All output is sent to stdout, the input must be a seekable file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-sortpkgs.1.xml:58
+#: apt-sortpkgs.1.xml:61
 msgid "<option>--source</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-sortpkgs.1.xml:60
+#: apt-sortpkgs.1.xml:63
 msgid ""
 "Use Source index field ordering.  Configuration Item: "
 "<literal>APT::SortPkgs::Source</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-sortpkgs.1.xml:74
+#: apt-sortpkgs.1.xml:77
 msgid ""
 "<command>apt-sortpkgs</command> returns zero on normal operation, decimal "
 "100 on error."
@@ -4170,71 +4178,109 @@ msgstr ""
 
 #.  The last update date 
 #. type: Content of: <refentry><refentryinfo>
-#: apt.conf.5.xml:13
+#: apt.conf.5.xml:16
 msgid ""
 "&apt-author.jgunthorpe; &apt-author.team; <author> "
 "<firstname>Daniel</firstname> <surname>Burrows</surname> <contrib>Initial "
 "documentation of Debug::*.</contrib> <email>dburrows@debian.org</email> "
-"</author> &apt-email; &apt-product; <date>18 September 2009</date>"
+"</author> &apt-email; &apt-product; <date>16 January 2010</date>"
 msgstr ""
 
 #. type: Content of: <refentry><refnamediv><refname>
-#: apt.conf.5.xml:28 apt.conf.5.xml:35
+#: apt.conf.5.xml:31 apt.conf.5.xml:38
 msgid "apt.conf"
 msgstr ""
 
 #. type: Content of: <refentry><refmeta><manvolnum>
-#: apt.conf.5.xml:29 apt_preferences.5.xml:22 sources.list.5.xml:23
+#: apt.conf.5.xml:32 apt_preferences.5.xml:25 sources.list.5.xml:26
 msgid "5"
 msgstr ""
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt.conf.5.xml:36
+#: apt.conf.5.xml:39
 msgid "Configuration file for APT"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:40
+#: apt.conf.5.xml:43
 msgid ""
 "<filename>apt.conf</filename> is the main configuration file for the APT "
-"suite of tools, all tools make use of the configuration file and a common "
-"command line parser to provide a uniform environment. When an APT tool "
-"starts up it will read the configuration specified by the "
-"<envar>APT_CONFIG</envar> environment variable (if any) and then read the "
-"files in <literal>Dir::Etc::Parts</literal> then read the main configuration "
-"file specified by <literal>Dir::Etc::main</literal> then finally apply the "
-"command line options to override the configuration directives, possibly "
-"loading even more config files."
+"suite of tools, but by far not the only place changes to options can be "
+"made. All tools therefore share the configuration files and also use a "
+"common command line parser to provide a uniform environment."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para>
+#. type: Content of: <refentry><refsect1><orderedlist><para>
+#: apt.conf.5.xml:48
+msgid ""
+"When an APT tool starts up it will read the configuration files in the "
+"following order:"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
 #: apt.conf.5.xml:50
 msgid ""
+"the file specified by the <envar>APT_CONFIG</envar> environment variable (if "
+"any)"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
+#: apt.conf.5.xml:52
+msgid ""
+"all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending "
+"order which have either no or \"<literal>conf</literal>\" as filename "
+"extension and which only contain alphanumeric, hyphen (-), underscore (_) "
+"and period (.) characters.  Otherwise APT will print a notice that it has "
+"ignored a file if the file doesn't match a pattern in the "
+"<literal>Dir::Ignore-Files-Silently</literal> configuration list - in this "
+"case it will be silently ignored."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
+#: apt.conf.5.xml:59
+msgid "the main configuration file specified by <literal>Dir::Etc::main</literal>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
+#: apt.conf.5.xml:61
+msgid ""
+"the command line options are applied to override the configuration "
+"directives or to load even more configuration files."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt.conf.5.xml:65
+msgid "Syntax"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt.conf.5.xml:66
+msgid ""
 "The configuration file is organized in a tree with options organized into "
-"functional groups. option specification is given with a double colon "
+"functional groups. Option specification is given with a double colon "
 "notation, for instance <literal>APT::Get::Assume-Yes</literal> is an option "
-"within the APT tool group, for the Get tool. options do not inherit from "
+"within the APT tool group, for the Get tool. Options do not inherit from "
 "their parent groups."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:56
+#: apt.conf.5.xml:72
 msgid ""
 "Syntactically the configuration language is modeled after what the ISC tools "
 "such as bind and dhcp use. Lines starting with <literal>//</literal> are "
 "treated as comments (ignored), as well as all text between "
 "<literal>/*</literal> and <literal>*/</literal>, just like C/C++ comments.  "
-"Each line is of the form <literal>APT::Get::Assume-Yes \"true\";</literal> "
-"The trailing semicolon and the quotes are required. The value must be on one "
-"line, and there is no kind of string concatenation. It must not include "
-"inside quotes.  The behavior of the backslash \"\\\" and escaped characters "
-"inside a value is undefined and it should not be used. An option name may "
-"include alphanumerical characters and the \"/-:._+\" characters. A new scope "
-"can be opened with curly braces, like:"
+"Each line is of the form <literal>APT::Get::Assume-Yes "
+"\"true\";</literal>. The trailing semicolon and the quotes are required. The "
+"value must be on one line, and there is no kind of string concatenation. It "
+"must not include inside quotes.  The behavior of the backslash \"\\\" and "
+"escaped characters inside a value is undefined and it should not be used. An "
+"option name may include alphanumerical characters and the \"/-:._+\" "
+"characters. A new scope can be opened with curly braces, like:"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><informalexample><programlisting>
-#: apt.conf.5.xml:70
+#: apt.conf.5.xml:86
 #, no-wrap
 msgid ""
 "APT {\n"
@@ -4246,7 +4292,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:78
+#: apt.conf.5.xml:94
 msgid ""
 "with newlines placed to make it more readable. Lists can be created by "
 "opening a scope and including a single string enclosed in quotes followed by "
@@ -4255,13 +4301,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><informalexample><programlisting>
-#: apt.conf.5.xml:83
+#: apt.conf.5.xml:99
 #, no-wrap
 msgid "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:86
+#: apt.conf.5.xml:102
 msgid ""
 "In general the sample configuration file in "
 "<filename>&docdir;examples/apt.conf</filename> &configureindex; is a good "
@@ -4269,14 +4315,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:90
+#: apt.conf.5.xml:106
 msgid ""
 "The names of the configuration items are not case-sensitive. So in the "
 "previous example you could use <literal>dpkg::pre-install-pkgs</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:93
+#: apt.conf.5.xml:109
 msgid ""
 "Names for the configuration items are optional if a list is defined as it "
 "can be see in the <literal>DPkg::Pre-Install-Pkgs</literal> example "
@@ -4286,7 +4332,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:98
+#: apt.conf.5.xml:114
 msgid ""
 "Two specials are allowed, <literal>#include</literal> (which is deprecated "
 "and not supported by alternative implementations) and "
@@ -4298,7 +4344,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:106
+#: apt.conf.5.xml:122
 msgid ""
 "The #clear command is the only way to delete a list or a complete scope.  "
 "Reopening a scope or the ::-style described below will "
@@ -4308,7 +4354,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:111
+#: apt.conf.5.xml:127
 msgid ""
 "All of the APT tools take a -o option which allows an arbitrary "
 "configuration directive to be specified on the command line. The syntax is a "
@@ -4319,7 +4365,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:118
+#: apt.conf.5.xml:134
 msgid ""
 "Note that you can use :: only for appending one item per line to a list and "
 "that you should not use it in combination with the scope syntax.  (The scope "
@@ -4336,63 +4382,74 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:130
+#: apt.conf.5.xml:146
 msgid "The APT Group"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:131
+#: apt.conf.5.xml:147
 msgid ""
 "This group of options controls general APT behavior as well as holding the "
 "options for all of the tools."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:135
+#: apt.conf.5.xml:151
 msgid "Architecture"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:136
+#: apt.conf.5.xml:152
 msgid ""
 "System Architecture; sets the architecture to use when fetching files and "
 "parsing package lists. The internal default is the architecture apt was "
 "compiled for."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:158
+msgid ""
+"All Architectures the system supports. Processors implementing the "
+"<literal>amd64</literal> are e.g. also able to execute binaries compiled for "
+"<literal>i386</literal>; This list is use when fetching files and parsing "
+"package lists. The internal default is always the native architecture "
+"(<literal>APT::Architecture</literal>)  and all foreign architectures it can "
+"retrieve by calling <command>dpkg --print-foreign-architectures</command>."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:141
+#: apt.conf.5.xml:165
 msgid "Default-Release"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:142
+#: apt.conf.5.xml:166
 msgid ""
 "Default release to install packages from if more than one version "
 "available. Contains release name, codename or release version. Examples: "
-"'stable', 'testing', 'unstable', 'lenny', 'squeeze', '4.0', '5.0*'. See also "
-"&apt-preferences;."
+"'stable', 'testing', 'unstable', '&stable-codename;', '&testing-codename;', "
+"'4.0', '5.0*'. See also &apt-preferences;."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:146
+#: apt.conf.5.xml:171
 msgid "Ignore-Hold"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:147
+#: apt.conf.5.xml:172
 msgid ""
 "Ignore Held packages; This global option causes the problem resolver to "
 "ignore held packages in its decision making."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:151
+#: apt.conf.5.xml:176
 msgid "Clean-Installed"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:152
+#: apt.conf.5.xml:177
 msgid ""
 "Defaults to on. When turned on the autoclean feature will remove any "
 "packages which can no longer be downloaded from the cache. If turned off "
@@ -4401,44 +4458,50 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:158
+#: apt.conf.5.xml:183
 msgid "Immediate-Configure"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:159
+#: apt.conf.5.xml:184
 msgid ""
 "Defaults to on which will cause APT to install essential and important "
 "packages as fast as possible in the install/upgrade operation. This is done "
 "to limit the effect of a failing &dpkg; call: If this option is disabled APT "
-"doesn't treat an important package in the same way as an extra package: "
-"Between the unpacking of the important package A and his configuration can "
-"then be many other unpack or configuration calls, e.g. for package B which "
-"has no relation to A, but causes the dpkg call to fail (e.g. because "
-"maintainer script of package B generates an error) which results in a system "
-"state in which package A is unpacked but unconfigured - each package "
-"depending on A is now no longer guaranteed to work as their dependency on A "
-"is not longer satisfied. The immediate configuration marker is also applied "
-"to all dependencies which can generate a problem if the dependencies "
-"e.g. form a circle as a dependency with the immediate flag is comparable "
-"with a Pre-Dependency. So in theory it is possible that APT encounters a "
-"situation in which it is unable to perform immediate configuration, error "
-"out and refers to this option so the user can deactivate the immediate "
-"configuration temporary to be able to perform an install/upgrade again. Note "
-"the use of the word \"theory\" here as this problem was only encountered by "
-"now in real world a few times in non-stable distribution versions and caused "
-"by wrong dependencies of the package in question, so you should not blindly "
-"disable this option as the mentioned scenario above is not the only problem "
-"immediate configuration can help to prevent in the first place."
+"does treat an important package in the same way as an extra package: Between "
+"the unpacking of the important package A and his configuration can then be "
+"many other unpack or configuration calls, e.g. for package B which has no "
+"relation to A, but causes the dpkg call to fail (e.g. because maintainer "
+"script of package B generates an error) which results in a system state in "
+"which package A is unpacked but unconfigured - each package depending on A "
+"is now no longer guaranteed to work as their dependency on A is not longer "
+"satisfied. The immediate configuration marker is also applied to all "
+"dependencies which can generate a problem if the dependencies e.g. form a "
+"circle as a dependency with the immediate flag is comparable with a "
+"Pre-Dependency. So in theory it is possible that APT encounters a situation "
+"in which it is unable to perform immediate configuration, errors out and "
+"refers to this option so the user can deactivate the immediate configuration "
+"temporarily to be able to perform an install/upgrade again. Note the use of "
+"the word \"theory\" here as this problem was only encountered by now in real "
+"world a few times in non-stable distribution versions and was caused by "
+"wrong dependencies of the package in question or by a system in an already "
+"broken state, so you should not blindly disable this option as the mentioned "
+"scenario above is not the only problem immediate configuration can help to "
+"prevent in the first place.  Before a big operation like "
+"<literal>dist-upgrade</literal> is run with this option disabled it should "
+"be tried to explicitly <literal>install</literal> the package APT is unable "
+"to configure immediately, but please make sure to report your problem also "
+"to your distribution and to the APT team with the buglink below so they can "
+"work on improving or correcting the upgrade process."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:177
+#: apt.conf.5.xml:206
 msgid "Force-LoopBreak"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:178
+#: apt.conf.5.xml:207
 msgid ""
 "Never Enable this option unless you -really- know what you are doing. It "
 "permits APT to temporarily remove an essential package to break a "
@@ -4449,87 +4512,162 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:186
-msgid "Cache-Limit"
+#: apt.conf.5.xml:215
+msgid "Cache-Start, Cache-Grow and Cache-Limit"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:187
+#: apt.conf.5.xml:216
 msgid ""
-"APT uses a fixed size memory mapped cache file to store the 'available' "
-"information. This sets the size of that cache (in bytes)."
+"APT uses since version 0.7.26 a resizable memory mapped cache file to store "
+"the 'available' information. <literal>Cache-Start</literal> acts as a hint "
+"to which size the Cache will grow and is therefore the amount of memory APT "
+"will request at startup. The default value is 20971520 bytes (~20 MB). Note "
+"that these amount of space need to be available for APT otherwise it will "
+"likely fail ungracefully, so for memory restricted devices these value "
+"should be lowered while on systems with a lot of configured sources this "
+"might be increased.  <literal>Cache-Grow</literal> defines in byte with the "
+"default of 1048576 (~1 MB) how much the Cache size will be increased in the "
+"event the space defined by <literal>Cache-Start</literal> is not "
+"enough. These value will be applied again and again until either the cache "
+"is big enough to store all information or the size of the cache reaches the "
+"<literal>Cache-Limit</literal>.  The default of "
+"<literal>Cache-Limit</literal> is 0 which stands for no limit.  If "
+"<literal>Cache-Grow</literal> is set to 0 the automatic grow of the cache is "
+"disabled."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:191
+#: apt.conf.5.xml:231
 msgid "Build-Essential"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:192
+#: apt.conf.5.xml:232
 msgid "Defines which package(s) are considered essential build dependencies."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:195
+#: apt.conf.5.xml:235
 msgid "Get"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:196
+#: apt.conf.5.xml:236
 msgid ""
 "The Get subsection controls the &apt-get; tool, please see its documentation "
 "for more information about the options here."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:200
+#: apt.conf.5.xml:240
 msgid "Cache"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:201
+#: apt.conf.5.xml:241
 msgid ""
 "The Cache subsection controls the &apt-cache; tool, please see its "
 "documentation for more information about the options here."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:205
+#: apt.conf.5.xml:245
 msgid "CDROM"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:206
+#: apt.conf.5.xml:246
 msgid ""
 "The CDROM subsection controls the &apt-cdrom; tool, please see its "
 "documentation for more information about the options here."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:212
+#: apt.conf.5.xml:252
 msgid "The Acquire Group"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:217
+#: apt.conf.5.xml:257
+msgid "Check-Valid-Until"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:258
+msgid ""
+"Security related option defaulting to true as an expiring validation for a "
+"Release file prevents longtime replay attacks and can e.g. also help users "
+"to identify no longer updated mirrors - but the feature depends on the "
+"correctness of the time on the user system.  Archive maintainers are "
+"encouraged to create Release files with the <literal>Valid-Until</literal> "
+"header, but if they don't or a stricter value is volitional the following "
+"<literal>Max-ValidTime</literal> option can be used."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+#: apt.conf.5.xml:268
+msgid "Max-ValidTime"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:269
+msgid ""
+"Seconds the Release file should be considered valid after it was created "
+"(indicated by the <literal>Date</literal> header).  If the Release file "
+"itself includes a <literal>Valid-Until</literal> header the earlier date of "
+"the two is used as the expiration date.  The default value is "
+"<literal>0</literal> which stands for \"for ever\".  Archive specific "
+"settings can be made by appending the label of the archive to the option "
+"name."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+#: apt.conf.5.xml:279
+msgid "Min-ValidTime"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:280
+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 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 ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+#: apt.conf.5.xml:290
 msgid "PDiffs"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:218
+#: apt.conf.5.xml:291
 msgid ""
 "Try to download deltas called <literal>PDiffs</literal> for Packages or "
 "Sources files instead of downloading whole ones. True by default."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:294
+msgid ""
+"Two sub-options to limit the use of PDiffs are also available: With "
+"<literal>FileLimit</literal> can be specified how many PDiff files are "
+"downloaded at most to patch a file. <literal>SizeLimit</literal> on the "
+"other hand is the maximum percentage of the size of all patches compared to "
+"the size of the targeted file. If one of these limits is exceeded the "
+"complete file is downloaded instead of the patches."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:223
+#: apt.conf.5.xml:303
 msgid "Queue-Mode"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:224
+#: apt.conf.5.xml:304
 msgid ""
 "Queuing mode; <literal>Queue-Mode</literal> can be one of "
 "<literal>host</literal> or <literal>access</literal> which determines how "
@@ -4539,36 +4677,36 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:231
+#: apt.conf.5.xml:311
 msgid "Retries"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:232
+#: apt.conf.5.xml:312
 msgid ""
 "Number of retries to perform. If this is non-zero APT will retry failed "
 "files the given number of times."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:236
+#: apt.conf.5.xml:316
 msgid "Source-Symlinks"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:237
+#: apt.conf.5.xml:317
 msgid ""
 "Use symlinks for source archives. If set to true then source archives will "
 "be symlinked when possible instead of copying. True is the default."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:241 sources.list.5.xml:139
+#: apt.conf.5.xml:321 sources.list.5.xml:155
 msgid "http"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:242
+#: apt.conf.5.xml:322
 msgid ""
 "HTTP URIs; http::Proxy is the default http proxy to use. It is in the "
 "standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. Per "
@@ -4580,7 +4718,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:250
+#: apt.conf.5.xml:330
 msgid ""
 "Three settings are provided for cache control with HTTP/1.1 compliant proxy "
 "caches. <literal>No-Cache</literal> tells the proxy to not use its cached "
@@ -4594,7 +4732,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:260 apt.conf.5.xml:317
+#: apt.conf.5.xml:340 apt.conf.5.xml:404
 msgid ""
 "The option <literal>timeout</literal> sets the timeout timer used by the "
 "method, this applies to all things including connection timeout and data "
@@ -4602,10 +4740,10 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:263
+#: apt.conf.5.xml:343
 msgid ""
 "One setting is provided to control the pipeline depth in cases where the "
-"remote server is not RFC conforming or buggy (such as Squid 2.0.2)  "
+"remote server is not RFC conforming or buggy (such as Squid 2.0.2).  "
 "<literal>Acquire::http::Pipeline-Depth</literal> can be a value from 0 to 5 "
 "indicating how many outstanding requests APT should send. A value of zero "
 "MUST be specified if the remote host does not properly linger on TCP "
@@ -4614,7 +4752,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:271
+#: apt.conf.5.xml:351
 msgid ""
 "The used bandwidth can be limited with "
 "<literal>Acquire::http::Dl-Limit</literal> which accepts integer values in "
@@ -4623,21 +4761,31 @@ msgid ""
 "deactivates the download from multiple servers at the same time.)"
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:356
+msgid ""
+"<literal>Acquire::http::User-Agent</literal> can be used to set a different "
+"User-Agent for the http download method as some proxies allow access for "
+"clients only if the client uses a known identifier."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:277
+#: apt.conf.5.xml:362
 msgid "https"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:278
+#: apt.conf.5.xml:363
 msgid ""
-"HTTPS URIs. Cache-control and proxy options are the same as for "
-"<literal>http</literal> method.  <literal>Pipeline-Depth</literal> option is "
+"HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy "
+"options are the same as for <literal>http</literal> method and will also "
+"default to the options from the <literal>http</literal> method if they are "
+"not explicitly set for https. <literal>Pipeline-Depth</literal> option is "
 "not supported yet."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:282
+#: apt.conf.5.xml:369
 msgid ""
 "<literal>CaInfo</literal> suboption specifies place of file that holds info "
 "about trusted certificates.  <literal>&lt;host&gt;::CaInfo</literal> is "
@@ -4659,12 +4807,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:300 sources.list.5.xml:150
+#: apt.conf.5.xml:387 sources.list.5.xml:166
 msgid "ftp"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:301
+#: apt.conf.5.xml:388
 msgid ""
 "FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard "
 "form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. Per host "
@@ -4684,7 +4832,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:320
+#: apt.conf.5.xml:407
 msgid ""
 "Several settings are provided to control passive mode. Generally it is safe "
 "to leave passive mode on, it works in nearly every environment.  However "
@@ -4694,7 +4842,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:327
+#: apt.conf.5.xml:414
 msgid ""
 "It is possible to proxy FTP over HTTP by setting the "
 "<envar>ftp_proxy</envar> environment variable to a http url - see the "
@@ -4704,7 +4852,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:332
+#: apt.conf.5.xml:419
 msgid ""
 "The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
 "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -4714,18 +4862,18 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:339 sources.list.5.xml:132
+#: apt.conf.5.xml:426 sources.list.5.xml:148
 msgid "cdrom"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:345
+#: apt.conf.5.xml:432
 #, no-wrap
 msgid "/cdrom/::Mount \"foo\";"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:340
+#: apt.conf.5.xml:427
 msgid ""
 "CDROM URIs; the only setting for CDROM URIs is the mount point, "
 "<literal>cdrom::Mount</literal> which must be the mount point for the CDROM "
@@ -4738,12 +4886,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:350
+#: apt.conf.5.xml:437
 msgid "gpgv"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:351
+#: apt.conf.5.xml:438
 msgid ""
 "GPGV URIs; the only option for GPGV URIs is the option to pass additional "
 "parameters to gpgv.  <literal>gpgv::Options</literal> Additional options "
@@ -4751,12 +4899,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:356
+#: apt.conf.5.xml:443
 msgid "CompressionTypes"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:362
+#: apt.conf.5.xml:449
 #, no-wrap
 msgid ""
 "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> "
@@ -4764,7 +4912,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:357
+#: apt.conf.5.xml:444
 msgid ""
 "List of compression types which are understood by the acquire methods.  "
 "Files like <filename>Packages</filename> can be available in various "
@@ -4776,19 +4924,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:367
+#: apt.conf.5.xml:454
 #, no-wrap
 msgid "Acquire::CompressionTypes::Order:: \"gz\";"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:370
+#: apt.conf.5.xml:457
 #, no-wrap
 msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:363
+#: apt.conf.5.xml:450
 msgid ""
 "Also the <literal>Order</literal> subgroup can be used to define in which "
 "order the acquire system will try to download the compressed files. The "
@@ -4805,38 +4953,97 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:374
+#: apt.conf.5.xml:461
 #, no-wrap
 msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:372
+#: apt.conf.5.xml:459
 msgid ""
 "Note that at run time the "
 "<literal>Dir::Bin::<replaceable>Methodname</replaceable></literal> will be "
 "checked: If this setting exists the method will only be used if this file "
-"exists, e.g. for the bzip2 method (the inbuilt) setting is <placeholder "
+"exists, e.g. for the bzip2 method (the inbuilt) setting is: <placeholder "
 "type=\"literallayout\" id=\"0\"/> Note also that list entries specified on "
 "the command line will be added at the end of the list specified in the "
 "configuration files, but before the default entries. To prefer a type in "
-"this case over the ones specified in in the configuration files you can set "
-"the option direct - not in list style.  This will not override the defined "
-"list, it will only prefix the list with this type."
+"this case over the ones specified in the configuration files you can set the "
+"option direct - not in list style.  This will not override the defined list, "
+"it will only prefix the list with this type."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:466
+msgid ""
+"The special type <literal>uncompressed</literal> can be used to give "
+"uncompressed files a preference, but note that most archives don't provide "
+"uncompressed files so this is mostly only useable for local mirrors."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+#: apt.conf.5.xml:471
+msgid "GzipIndexes"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:473
+msgid ""
+"When downloading <literal>gzip</literal> compressed indexes (Packages, "
+"Sources, or Translations), keep them gzip compressed locally instead of "
+"unpacking them. This saves quite a lot of disk space at the expense of more "
+"CPU requirements when building the local package caches. False by default."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+#: apt.conf.5.xml:480
+msgid "Languages"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:481
+msgid ""
+"The Languages subsection controls which <filename>Translation</filename> "
+"files are downloaded and in which order APT tries to display the "
+"Description-Translations. APT will try to display the first available "
+"Description in the Language which is listed at first. Languages can be "
+"defined with their short or long Languagecodes. Note that not all archives "
+"provide <filename>Translation</filename> files for every Language - "
+"especially the long Languagecodes are rare, so please inform you which ones "
+"are available before you set here impossible values."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting>
+#: apt.conf.5.xml:497
+#, no-wrap
+msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:379
+#: apt.conf.5.xml:487
 msgid ""
-"While it is possible to add an empty compression type to the order list, but "
-"APT in its current version doesn't understand it correctly and will display "
-"many warnings about not downloaded files - these warnings are most of the "
-"time false negatives. Future versions will maybe include a way to really "
-"prefer uncompressed files to support the usage of local mirrors."
+"The default list includes \"environment\" and "
+"\"en\". \"<literal>environment</literal>\" has a special meaning here: It "
+"will be replaced at runtime with the languagecodes extracted from the "
+"<literal>LC_MESSAGES</literal> environment variable.  It will also ensure "
+"that these codes are not included twice in the list. If "
+"<literal>LC_MESSAGES</literal> is set to \"C\" only the "
+"<filename>Translation-en</filename> file (if available) will be used.  To "
+"force apt to use no Translation file use the setting "
+"<literal>Acquire::Languages=none</literal>. \"<literal>none</literal>\" is "
+"another special meaning code which will stop the search for a fitting "
+"<filename>Translation</filename> file.  This can be used by the system "
+"administrator to let APT know that it should download also this files "
+"without actually use them if the environment doesn't specify this "
+"languages. So the following example configuration will result in the order "
+"\"en, de\" in an english and in \"de, en\" in a german localization. Note "
+"that \"fr\" is downloaded, but not used if APT is not used in a french "
+"localization, in such an environment the order would be \"fr, de, en\".  "
+"<placeholder type=\"programlisting\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:213
+#: apt.conf.5.xml:253
 msgid ""
 "The <literal>Acquire</literal> group of options controls the download of "
 "packages and the URI handlers.  <placeholder type=\"variablelist\" "
@@ -4844,12 +5051,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:388
+#: apt.conf.5.xml:504
 msgid "Directories"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:390
+#: apt.conf.5.xml:506
 msgid ""
 "The <literal>Dir::State</literal> section has directories that pertain to "
 "local state information. <literal>lists</literal> is the directory to place "
@@ -4861,7 +5068,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:397
+#: apt.conf.5.xml:513
 msgid ""
 "<literal>Dir::Cache</literal> contains locations pertaining to local cache "
 "information, such as the two package caches <literal>srcpkgcache</literal> "
@@ -4874,7 +5081,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:406
+#: apt.conf.5.xml:522
 msgid ""
 "<literal>Dir::Etc</literal> contains the location of configuration files, "
 "<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -4884,7 +5091,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:412
+#: apt.conf.5.xml:528
 msgid ""
 "The <literal>Dir::Parts</literal> setting reads in all the config fragments "
 "in lexical order from the directory specified. After this is done then the "
@@ -4892,7 +5099,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:416
+#: apt.conf.5.xml:532
 msgid ""
 "Binary programs are pointed to by "
 "<literal>Dir::Bin</literal>. <literal>Dir::Bin::Methods</literal> specifies "
@@ -4904,7 +5111,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:424
+#: apt.conf.5.xml:540
 msgid ""
 "The configuration item <literal>RootDir</literal> has a special meaning.  If "
 "set, all paths in <literal>Dir::</literal> will be relative to "
@@ -4916,13 +5123,24 @@ msgid ""
 "looked up in <filename>/tmp/staging/var/lib/dpkg/status</filename>."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><para>
+#: apt.conf.5.xml:553
+msgid ""
+"The <literal>Ignore-Files-Silently</literal> list can be used to specify "
+"which files APT should silently ignore while parsing the files in the "
+"fragment directories. Per default a file which end with "
+"<literal>.disabled</literal>, <literal>~</literal>, <literal>.bak</literal> "
+"or <literal>.dpkg-[a-z]+</literal> is silently ignored. As seen in the last "
+"default value these patterns can use regular expression syntax."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:437
+#: apt.conf.5.xml:562
 msgid "APT in DSelect"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:439
+#: apt.conf.5.xml:564
 msgid ""
 "When APT is used as a &dselect; method several configuration directives "
 "control the default behaviour. These are in the <literal>DSelect</literal> "
@@ -4930,12 +5148,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:443
+#: apt.conf.5.xml:568
 msgid "Clean"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:444
+#: apt.conf.5.xml:569
 msgid ""
 "Cache Clean mode; this value may be one of always, prompt, auto, pre-auto "
 "and never.  always and prompt will remove all packages from the cache after "
@@ -4946,50 +5164,50 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:453
+#: apt.conf.5.xml:578
 msgid ""
 "The contents of this variable is passed to &apt-get; as command line options "
 "when it is run for the install phase."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:457
+#: apt.conf.5.xml:582
 msgid "Updateoptions"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:458
+#: apt.conf.5.xml:583
 msgid ""
 "The contents of this variable is passed to &apt-get; as command line options "
 "when it is run for the update phase."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:462
+#: apt.conf.5.xml:587
 msgid "PromptAfterUpdate"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:463
+#: apt.conf.5.xml:588
 msgid ""
 "If true the [U]pdate operation in &dselect; will always prompt to continue.  "
 "The default is to prompt only on error."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:469
+#: apt.conf.5.xml:594
 msgid "How APT calls dpkg"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:470
+#: apt.conf.5.xml:595
 msgid ""
 "Several configuration directives control how APT invokes &dpkg;. These are "
 "in the <literal>DPkg</literal> section."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:475
+#: apt.conf.5.xml:600
 msgid ""
 "This is a list of options to pass to dpkg. The options must be specified "
 "using the list notation and each list item is passed as a single argument to "
@@ -4997,17 +5215,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:480
+#: apt.conf.5.xml:605
 msgid "Pre-Invoke"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:480
+#: apt.conf.5.xml:605
 msgid "Post-Invoke"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:481
+#: apt.conf.5.xml:606
 msgid ""
 "This is a list of shell commands to run before/after invoking &dpkg;.  Like "
 "<literal>options</literal> this must be specified in list notation. The "
@@ -5016,12 +5234,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:487
+#: apt.conf.5.xml:612
 msgid "Pre-Install-Pkgs"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:488
+#: apt.conf.5.xml:613
 msgid ""
 "This is a list of shell commands to run before invoking dpkg. Like "
 "<literal>options</literal> this must be specified in list notation. The "
@@ -5031,7 +5249,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:494
+#: apt.conf.5.xml:619
 msgid ""
 "Version 2 of this protocol dumps more information, including the protocol "
 "version, the APT configuration space and the packages, files and versions "
@@ -5042,39 +5260,39 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:501
+#: apt.conf.5.xml:626
 msgid "Run-Directory"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:502
+#: apt.conf.5.xml:627
 msgid ""
 "APT chdirs to this directory before invoking dpkg, the default is "
 "<filename>/</filename>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:506
+#: apt.conf.5.xml:631
 msgid "Build-options"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:507
+#: apt.conf.5.xml:632
 msgid ""
 "These options are passed to &dpkg-buildpackage; when compiling packages, the "
 "default is to disable signing and produce all binaries."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:512
+#: apt.conf.5.xml:637
 msgid "dpkg trigger usage (and related options)"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:513
+#: apt.conf.5.xml:638
 msgid ""
 "APT can call dpkg in a way so it can make aggressive use of triggers over "
-"multiply calls of dpkg. Without further options dpkg will use triggers only "
+"multiple calls of dpkg. Without further options dpkg will use triggers only "
 "in between his own run. Activating these options can therefore decrease the "
 "time needed to perform the install / upgrade. Note that it is intended to "
 "activate these options per default in the future, but as it changes the way "
@@ -5086,7 +5304,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:528
+#: apt.conf.5.xml:653
 #, no-wrap
 msgid ""
 "DPkg::NoTriggers \"true\";\n"
@@ -5096,7 +5314,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:522
+#: apt.conf.5.xml:647
 msgid ""
 "Note that it is not guaranteed that APT will support these options or that "
 "these options will not cause (big) trouble in the future. If you have "
@@ -5110,29 +5328,29 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:534
+#: apt.conf.5.xml:659
 msgid "DPkg::NoTriggers"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:535
+#: apt.conf.5.xml:660
 msgid ""
-"Add the no triggers flag to all dpkg calls (expect the ConfigurePending "
+"Add the no triggers flag to all dpkg calls (except the ConfigurePending "
 "call).  See &dpkg; if you are interested in what this actually means. In "
-"short: dpkg will not run the triggers then this flag is present unless it is "
-"explicit called to do so in an extra call.  Note that this option exists "
+"short: dpkg will not run the triggers when this flag is present unless it is "
+"explicitly called to do so in an extra call.  Note that this option exists "
 "(undocumented) also in older apt versions with a slightly different meaning: "
 "Previously these option only append --no-triggers to the configure calls to "
 "dpkg - now apt will add these flag also to the unpack and remove calls."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:542
+#: apt.conf.5.xml:667
 msgid "PackageManager::Configure"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:543
+#: apt.conf.5.xml:668
 msgid ""
 "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
 "and \"<literal>no</literal>\".  \"<literal>all</literal>\" is the default "
@@ -5141,37 +5359,37 @@ msgid ""
 "to be configured before another package can be unpacked (Pre-Depends) and "
 "let the rest configure by dpkg with a call generated by the next "
 "option. \"<literal>no</literal>\" on the other hand will not configure "
-"anything and totally relay on dpkg for configuration (which will at the "
+"anything and totally rely on dpkg for configuration (which will at the "
 "moment fail if a Pre-Depends is encountered).  Setting this option to "
-"another than the all value will implicit activate also the next option per "
+"another than the all value will implicitly activate also the next option per "
 "default as otherwise the system could end in an unconfigured status which "
 "could be unbootable!"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:553
+#: apt.conf.5.xml:678
 msgid "DPkg::ConfigurePending"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:554
+#: apt.conf.5.xml:679
 msgid ""
 "If this option is set apt will call <command>dpkg --configure "
 "--pending</command> to let dpkg handle all required configurations and "
 "triggers. This option is activated automatic per default if the previous "
 "option is not set to <literal>all</literal>, but deactivating could be "
 "useful if you want to run APT multiple times in a row - e.g. in an "
-"installer. In this sceneries you could deactivate this option in all but the "
-"last run."
+"installer. In these sceneries you could deactivate this option in all but "
+"the last run."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:560
+#: apt.conf.5.xml:685
 msgid "DPkg::TriggersPending"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:561
+#: apt.conf.5.xml:686
 msgid ""
 "Useful for <literal>smart</literal> configuration as a package which has "
 "pending triggers is not considered as <literal>installed</literal> and dpkg "
@@ -5181,12 +5399,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:566
+#: apt.conf.5.xml:691
 msgid "PackageManager::UnpackAll"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:567
+#: apt.conf.5.xml:692
 msgid ""
 "As the configuration can be deferred to be done at the end by dpkg it can be "
 "tried to order the unpack series only by critical needs, e.g. by "
@@ -5198,12 +5416,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:574
+#: apt.conf.5.xml:699
 msgid "OrderList::Score::Immediate"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:582
+#: apt.conf.5.xml:707
 #, no-wrap
 msgid ""
 "OrderList::Score {\n"
@@ -5215,7 +5433,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:575
+#: apt.conf.5.xml:700
 msgid ""
 "Essential packages (and there dependencies) should be configured immediately "
 "after unpacking. It will be a good idea to do this quite early in the "
@@ -5229,12 +5447,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:595
+#: apt.conf.5.xml:720
 msgid "Periodic and Archives options"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:596
+#: apt.conf.5.xml:721
 msgid ""
 "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
 "of options configure behavior of apt periodic updates, which is done by "
@@ -5243,12 +5461,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:604
+#: apt.conf.5.xml:729
 msgid "Debug options"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:606
+#: apt.conf.5.xml:731
 msgid ""
 "Enabling options in the <literal>Debug::</literal> section will cause "
 "debugging information to be sent to the standard error stream of the program "
@@ -5259,7 +5477,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:617
+#: apt.conf.5.xml:742
 msgid ""
 "<literal>Debug::pkgProblemResolver</literal> enables output about the "
 "decisions made by <literal>dist-upgrade, upgrade, install, remove, "
@@ -5267,7 +5485,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:625
+#: apt.conf.5.xml:750
 msgid ""
 "<literal>Debug::NoLocking</literal> disables all file locking.  This can be "
 "used to run some operations (for instance, <literal>apt-get -s "
@@ -5275,7 +5493,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:634
+#: apt.conf.5.xml:759
 msgid ""
 "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
 "time that <literal>apt</literal> invokes &dpkg;."
@@ -5285,110 +5503,110 @@ msgstr ""
 #. 	   motivating example, except I haven't a clue why you'd want
 #. 	   to do this. 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:642
+#: apt.conf.5.xml:767
 msgid ""
 "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
 "in CDROM IDs."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:652
+#: apt.conf.5.xml:777
 msgid "A full list of debugging options to apt follows."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:657
+#: apt.conf.5.xml:782
 msgid "<literal>Debug::Acquire::cdrom</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:661
+#: apt.conf.5.xml:786
 msgid "Print information related to accessing <literal>cdrom://</literal> sources."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:668
+#: apt.conf.5.xml:793
 msgid "<literal>Debug::Acquire::ftp</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:672
+#: apt.conf.5.xml:797
 msgid "Print information related to downloading packages using FTP."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:679
+#: apt.conf.5.xml:804
 msgid "<literal>Debug::Acquire::http</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:683
+#: apt.conf.5.xml:808
 msgid "Print information related to downloading packages using HTTP."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:690
+#: apt.conf.5.xml:815
 msgid "<literal>Debug::Acquire::https</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:694
+#: apt.conf.5.xml:819
 msgid "Print information related to downloading packages using HTTPS."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:701
+#: apt.conf.5.xml:826
 msgid "<literal>Debug::Acquire::gpgv</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:705
+#: apt.conf.5.xml:830
 msgid ""
 "Print information related to verifying cryptographic signatures using "
 "<literal>gpg</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:712
+#: apt.conf.5.xml:837
 msgid "<literal>Debug::aptcdrom</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:716
+#: apt.conf.5.xml:841
 msgid ""
 "Output information about the process of accessing collections of packages "
 "stored on CD-ROMs."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:723
+#: apt.conf.5.xml:848
 msgid "<literal>Debug::BuildDeps</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:726
+#: apt.conf.5.xml:851
 msgid "Describes the process of resolving build-dependencies in &apt-get;."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:733
+#: apt.conf.5.xml:858
 msgid "<literal>Debug::Hashes</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:736
+#: apt.conf.5.xml:861
 msgid ""
 "Output each cryptographic hash that is generated by the "
 "<literal>apt</literal> libraries."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:743
+#: apt.conf.5.xml:868
 msgid "<literal>Debug::IdentCDROM</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:746
+#: apt.conf.5.xml:871
 msgid ""
 "Do not include information from <literal>statfs</literal>, namely the number "
 "of used and free blocks on the CD-ROM filesystem, when generating an ID for "
@@ -5396,92 +5614,92 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:754
+#: apt.conf.5.xml:879
 msgid "<literal>Debug::NoLocking</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:757
+#: apt.conf.5.xml:882
 msgid ""
 "Disable all file locking.  For instance, this will allow two instances of "
 "<quote><literal>apt-get update</literal></quote> to run at the same time."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:765
+#: apt.conf.5.xml:890
 msgid "<literal>Debug::pkgAcquire</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:769
+#: apt.conf.5.xml:894
 msgid "Log when items are added to or removed from the global download queue."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:776
+#: apt.conf.5.xml:901
 msgid "<literal>Debug::pkgAcquire::Auth</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:779
+#: apt.conf.5.xml:904
 msgid ""
 "Output status messages and errors related to verifying checksums and "
 "cryptographic signatures of downloaded files."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:786
+#: apt.conf.5.xml:911
 msgid "<literal>Debug::pkgAcquire::Diffs</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:789
+#: apt.conf.5.xml:914
 msgid ""
 "Output information about downloading and applying package index list diffs, "
 "and errors relating to package index list diffs."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:797
+#: apt.conf.5.xml:922
 msgid "<literal>Debug::pkgAcquire::RRed</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:801
+#: apt.conf.5.xml:926
 msgid ""
 "Output information related to patching apt package lists when downloading "
 "index diffs instead of full indices."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:808
+#: apt.conf.5.xml:933
 msgid "<literal>Debug::pkgAcquire::Worker</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:812
+#: apt.conf.5.xml:937
 msgid "Log all interactions with the sub-processes that actually perform downloads."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:819
+#: apt.conf.5.xml:944
 msgid "<literal>Debug::pkgAutoRemove</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:823
+#: apt.conf.5.xml:948
 msgid ""
 "Log events related to the automatically-installed status of packages and to "
 "the removal of unused packages."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:830
+#: apt.conf.5.xml:955
 msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:833
+#: apt.conf.5.xml:958
 msgid ""
 "Generate debug messages describing which packages are being automatically "
 "installed to resolve dependencies.  This corresponds to the initial "
@@ -5491,12 +5709,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:844
+#: apt.conf.5.xml:969
 msgid "<literal>Debug::pkgDepCache::Marker</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:847
+#: apt.conf.5.xml:972
 msgid ""
 "Generate debug messages describing which package is marked as "
 "keep/install/remove while the ProblemResolver does his work.  Each addition "
@@ -5514,90 +5732,90 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:866
+#: apt.conf.5.xml:991
 msgid "<literal>Debug::pkgInitConfig</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:869
+#: apt.conf.5.xml:994
 msgid "Dump the default configuration to standard error on startup."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:876
+#: apt.conf.5.xml:1001
 msgid "<literal>Debug::pkgDPkgPM</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:879
+#: apt.conf.5.xml:1004
 msgid ""
 "When invoking &dpkg;, output the precise command line with which it is being "
 "invoked, with arguments separated by a single space character."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:887
+#: apt.conf.5.xml:1012
 msgid "<literal>Debug::pkgDPkgProgressReporting</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:890
+#: apt.conf.5.xml:1015
 msgid ""
 "Output all the data received from &dpkg; on the status file descriptor and "
 "any errors encountered while parsing it."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:897
+#: apt.conf.5.xml:1022
 msgid "<literal>Debug::pkgOrderList</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:901
+#: apt.conf.5.xml:1026
 msgid ""
 "Generate a trace of the algorithm that decides the order in which "
 "<literal>apt</literal> should pass packages to &dpkg;."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:909
+#: apt.conf.5.xml:1034
 msgid "<literal>Debug::pkgPackageManager</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:913
+#: apt.conf.5.xml:1038
 msgid "Output status messages tracing the steps performed when invoking &dpkg;."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:920
+#: apt.conf.5.xml:1045
 msgid "<literal>Debug::pkgPolicy</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:924
+#: apt.conf.5.xml:1049
 msgid "Output the priority of each package list on startup."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:930
+#: apt.conf.5.xml:1055
 msgid "<literal>Debug::pkgProblemResolver</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:934
+#: apt.conf.5.xml:1059
 msgid ""
 "Trace the execution of the dependency resolver (this applies only to what "
 "happens when a complex dependency problem is encountered)."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:942
+#: apt.conf.5.xml:1067
 msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:945
+#: apt.conf.5.xml:1070
 msgid ""
 "Display a list of all installed packages with their calculated score used by "
 "the pkgProblemResolver. The description of the package is the same as "
@@ -5605,53 +5823,53 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:953
+#: apt.conf.5.xml:1078
 msgid "<literal>Debug::sourceList</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:957
+#: apt.conf.5.xml:1082
 msgid ""
 "Print information about the vendors read from "
 "<filename>/etc/apt/vendors.list</filename>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:979
+#: apt.conf.5.xml:1105
 msgid ""
 "&configureindex; is a configuration file showing example values for all "
 "possible options."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt.conf.5.xml:986
+#: apt.conf.5.xml:1112
 msgid "&file-aptconf;"
 msgstr ""
 
 #.  ? reading apt.conf 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:991
+#: apt.conf.5.xml:1117
 msgid "&apt-cache;, &apt-config;, &apt-preferences;."
 msgstr ""
 
 #.  The last update date 
 #. type: Content of: <refentry><refentryinfo>
-#: apt_preferences.5.xml:13
-msgid "&apt-author.team; &apt-email; &apt-product; <date>04 May 2009</date>"
+#: apt_preferences.5.xml:16
+msgid "&apt-author.team; &apt-email; &apt-product; <date>16 February 2010</date>"
 msgstr ""
 
 #. type: Content of: <refentry><refnamediv><refname>
-#: apt_preferences.5.xml:21 apt_preferences.5.xml:28
+#: apt_preferences.5.xml:24 apt_preferences.5.xml:31
 msgid "apt_preferences"
 msgstr ""
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt_preferences.5.xml:29
+#: apt_preferences.5.xml:32
 msgid "Preference control file for APT"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:34
+#: apt_preferences.5.xml:37
 msgid ""
 "The APT preferences file <filename>/etc/apt/preferences</filename> and the "
 "fragment files in the <filename>/etc/apt/preferences.d/</filename> folder "
@@ -5660,7 +5878,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:39
+#: apt_preferences.5.xml:42
 msgid ""
 "Several versions of a package may be available for installation when the "
 "&sources-list; file contains references to more than one distribution (for "
@@ -5673,7 +5891,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:49
+#: apt_preferences.5.xml:52
 msgid ""
 "Several instances of the same version of a package may be available when the "
 "&sources-list; file contains references to more than one source.  In this "
@@ -5682,13 +5900,40 @@ msgid ""
 "choice of instance, only the choice of version."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><para>
+#: apt_preferences.5.xml:59
+msgid ""
+"Preferences are a strong power in the hands of a system administrator but "
+"they can become also their biggest nightmare if used without care! APT will "
+"not questioning the preferences so wrong settings will therefore lead to "
+"uninstallable packages or wrong decisions while upgrading packages.  Even "
+"more problems will arise if multiply distribution releases are mixed without "
+"a good understanding of the following paragraphs.  Packages included in a "
+"specific release aren't tested in and therefore doesn't always work as "
+"expected in older or newer releases or together with other packages from "
+"different releases.  You have been warned."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt_preferences.5.xml:70
+msgid ""
+"Note that the files in the <filename>/etc/apt/preferences.d</filename> "
+"directory are parsed in alphanumeric ascending order and need to obey the "
+"following naming convention: The files have either no or "
+"\"<literal>pref</literal>\" as filename extension and only contain "
+"alphanumeric, hyphen (-), underscore (_) and period (.) characters.  "
+"Otherwise APT will print a notice that it has ignored a file if the file "
+"doesn't match a pattern in the <literal>Dir::Ignore-Files-Silently</literal> "
+"configuration list - in this case it will be silently ignored."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:56
+#: apt_preferences.5.xml:79
 msgid "APT's Default Priority Assignments"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:71
+#: apt_preferences.5.xml:94
 #, no-wrap
 msgid ""
 "<command>apt-get install -t testing "
@@ -5696,13 +5941,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:74
+#: apt_preferences.5.xml:97
 #, no-wrap
 msgid "APT::Default-Release \"stable\";\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:58
+#: apt_preferences.5.xml:81
 msgid ""
 "If there is no preferences file or if there is no entry in the file that "
 "applies to a particular version then the priority assigned to that version "
@@ -5719,39 +5964,57 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:83
+#: apt_preferences.5.xml:106
+msgid "priority 1"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
+#: apt_preferences.5.xml:107
+msgid ""
+"to the versions coming from archives which in their "
+"<filename>Release</filename> files are marked as \"NotAutomatic: yes\" but "
+"<emphasis>not</emphasis> as \"ButAutomaticUpgrades: yes\" like the debian "
+"<literal>experimental</literal> archive."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
+#: apt_preferences.5.xml:113
 msgid "priority 100"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:84
-msgid "to the version that is already installed (if any)."
+#: apt_preferences.5.xml:114
+msgid ""
+"to the version that is already installed (if any) and to the versions coming "
+"from archives which in their <filename>Release</filename> files are marked "
+"as \"NotAutomatic: yes\" and \"ButAutomaticUpgrades: yes\" like the debian "
+"backports archive since <literal>squeeze-backports</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:88
+#: apt_preferences.5.xml:121
 msgid "priority 500"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:89
+#: apt_preferences.5.xml:122
 msgid ""
 "to the versions that are not installed and do not belong to the target "
 "release."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:93
+#: apt_preferences.5.xml:126
 msgid "priority 990"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:94
+#: apt_preferences.5.xml:127
 msgid "to the versions that are not installed and belong to the target release."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:78
+#: apt_preferences.5.xml:101
 msgid ""
 "If the target release has been specified then APT uses the following "
 "algorithm to set the priorities of the versions of a package.  Assign: "
@@ -5759,22 +6022,25 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:99
+#: apt_preferences.5.xml:132
 msgid ""
 "If the target release has not been specified then APT simply assigns "
 "priority 100 to all installed package versions and priority 500 to all "
-"uninstalled package versions."
+"uninstalled package versions, except versions coming from archives which in "
+"their <filename>Release</filename> files are marked as \"NotAutomatic: yes\" "
+"- these versions get the priority 1 or priority 100 if it is additionally "
+"marked as \"ButAutomaticUpgrades: yes\"."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:103
+#: apt_preferences.5.xml:139
 msgid ""
 "APT then applies the following rules, listed in order of precedence, to "
 "determine which version of a package to install."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:106
+#: apt_preferences.5.xml:142
 msgid ""
 "Never downgrade unless the priority of an available version exceeds 1000.  "
 "(\"Downgrading\" is installing a less recent version of a package in place "
@@ -5784,19 +6050,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:112
+#: apt_preferences.5.xml:148
 msgid "Install the highest priority version."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:113
+#: apt_preferences.5.xml:149
 msgid ""
 "If two or more versions have the same priority, install the most recent one "
 "(that is, the one with the higher version number)."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:116
+#: apt_preferences.5.xml:152
 msgid ""
 "If two or more versions have the same priority and version number but either "
 "the packages differ in some of their metadata or the "
@@ -5804,7 +6070,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:122
+#: apt_preferences.5.xml:158
 msgid ""
 "In a typical situation, the installed version of a package (priority 100)  "
 "is not as recent as one of the versions available from the sources listed in "
@@ -5815,7 +6081,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:129
+#: apt_preferences.5.xml:165
 msgid ""
 "More rarely, the installed version of a package is <emphasis>more</emphasis> "
 "recent than any of the other available versions.  The package will not be "
@@ -5825,7 +6091,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:134
+#: apt_preferences.5.xml:170
 msgid ""
 "Sometimes the installed version of a package is more recent than the version "
 "belonging to the target release, but not as recent as a version belonging to "
@@ -5837,12 +6103,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:143
+#: apt_preferences.5.xml:179
 msgid "The Effect of APT Preferences"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:145
+#: apt_preferences.5.xml:181
 msgid ""
 "The APT preferences file allows the system administrator to control the "
 "assignment of priorities.  The file consists of one or more multi-line "
@@ -5851,7 +6117,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:151
+#: apt_preferences.5.xml:187
 msgid ""
 "The specific form assigns a priority (a \"Pin-Priority\") to one or more "
 "specified packages and specified version or version range.  For example, the "
@@ -5861,7 +6127,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:158
+#: apt_preferences.5.xml:194
 #, no-wrap
 msgid ""
 "Package: perl\n"
@@ -5870,7 +6136,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:164
+#: apt_preferences.5.xml:200
 msgid ""
 "The general form assigns a priority to all of the package versions in a "
 "given distribution (that is, to all the versions of packages that are listed "
@@ -5880,7 +6146,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:170
+#: apt_preferences.5.xml:206
 msgid ""
 "This general-form entry in the APT preferences file applies only to groups "
 "of packages.  For example, the following record assigns a high priority to "
@@ -5888,7 +6154,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:175
+#: apt_preferences.5.xml:211
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -5897,17 +6163,35 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:180
+#: apt_preferences.5.xml:216
+msgid ""
+"A note of caution: the keyword used here is \"<literal>origin</literal>\" "
+"which can be used to match a hostname. The following record will assign a "
+"high priority to all versions available from the server identified by the "
+"hostname \"ftp.de.debian.org\""
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
+#: apt_preferences.5.xml:220
+#, no-wrap
+msgid ""
+"Package: *\n"
+"Pin: origin \"ftp.de.debian.org\"\n"
+"Pin-Priority: 999\n"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
+#: apt_preferences.5.xml:224
 msgid ""
-"A note of caution: the keyword used here is \"<literal>origin</literal>\".  "
-"This should not be confused with the Origin of a distribution as specified "
-"in a <filename>Release</filename> file.  What follows the \"Origin:\" tag in "
-"a <filename>Release</filename> file is not an Internet address but an author "
-"or vendor name, such as \"Debian\" or \"Ximian\"."
+"This should <emphasis>not</emphasis> be confused with the Origin of a "
+"distribution as specified in a <filename>Release</filename> file.  What "
+"follows the \"Origin:\" tag in a <filename>Release</filename> file is not an "
+"Internet address but an author or vendor name, such as \"Debian\" or "
+"\"Ximian\"."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:186
+#: apt_preferences.5.xml:229
 msgid ""
 "The following record assigns a low priority to all package versions "
 "belonging to any distribution whose Archive name is "
@@ -5915,7 +6199,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:190
+#: apt_preferences.5.xml:233
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -5924,24 +6208,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:195
+#: apt_preferences.5.xml:238
 msgid ""
 "The following record assigns a high priority to all package versions "
 "belonging to any distribution whose Codename is "
-"\"<literal>squeeze</literal>\"."
+"\"<literal>&testing-codename;</literal>\"."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:199
+#: apt_preferences.5.xml:242
 #, no-wrap
 msgid ""
 "Package: *\n"
-"Pin: release n=squeeze\n"
+"Pin: release n=&testing-codename;\n"
 "Pin-Priority: 900\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:204
+#: apt_preferences.5.xml:247
 msgid ""
 "The following record assigns a high priority to all package versions "
 "belonging to any release whose Archive name is \"<literal>stable</literal>\" "
@@ -5949,7 +6233,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:209
+#: apt_preferences.5.xml:252
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -5958,82 +6242,133 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:220
+#: apt_preferences.5.xml:262
+msgid "Regular expressions and glob() syntax"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt_preferences.5.xml:264
+msgid ""
+"APT also supports pinning by glob() expressions and regular expressions "
+"surrounded by /. For example, the following example assigns the priority 500 "
+"to all packages from experimental where the name starts with gnome (as a "
+"glob()-like expression) or contains the word kde (as a POSIX extended "
+"regular expression surrounded by slashes)."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><programlisting>
+#: apt_preferences.5.xml:273
+#, no-wrap
+msgid ""
+"Package: gnome* /kde/\n"
+"Pin: release n=experimental\n"
+"Pin-Priority: 500\n"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt_preferences.5.xml:279
+msgid ""
+"The rule for those expressions is that they can occur anywhere where a "
+"string can occur. Thus, the following pin assigns the priority 990 to all "
+"packages from a release starting with karmic."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><programlisting>
+#: apt_preferences.5.xml:285
+#, no-wrap
+msgid ""
+"Package: *\n"
+"Pin: release n=karmic*\n"
+"Pin-Priority: 990\n"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><literal>
+#: apt_preferences.5.xml:290
+msgid "Package"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><literal>
+#: apt_preferences.5.xml:296
+msgid "*"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt_preferences.5.xml:306
 msgid "How APT Interprets Priorities"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:228
+#: apt_preferences.5.xml:314
 msgid "P &gt; 1000"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:229
+#: apt_preferences.5.xml:315
 msgid ""
 "causes a version to be installed even if this constitutes a downgrade of the "
 "package"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:233
+#: apt_preferences.5.xml:319
 msgid "990 &lt; P &lt;=1000"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:234
+#: apt_preferences.5.xml:320
 msgid ""
 "causes a version to be installed even if it does not come from the target "
 "release, unless the installed version is more recent"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:239
+#: apt_preferences.5.xml:325
 msgid "500 &lt; P &lt;=990"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:240
+#: apt_preferences.5.xml:326
 msgid ""
 "causes a version to be installed unless there is a version available "
 "belonging to the target release or the installed version is more recent"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:245
+#: apt_preferences.5.xml:331
 msgid "100 &lt; P &lt;=500"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:246
+#: apt_preferences.5.xml:332
 msgid ""
 "causes a version to be installed unless there is a version available "
 "belonging to some other distribution or the installed version is more recent"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:251
+#: apt_preferences.5.xml:337
 msgid "0 &lt; P &lt;=100"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:252
+#: apt_preferences.5.xml:338
 msgid ""
 "causes a version to be installed only if there is no installed version of "
 "the package"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:256
+#: apt_preferences.5.xml:342
 msgid "P &lt; 0"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:257
+#: apt_preferences.5.xml:343
 msgid "prevents the version from being installed"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:223
+#: apt_preferences.5.xml:309
 msgid ""
 "Priorities (P) assigned in the APT preferences file must be positive or "
 "negative integers.  They are interpreted as follows (roughly speaking): "
@@ -6041,7 +6376,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:262
+#: apt_preferences.5.xml:348
 msgid ""
 "If any specific-form records match an available package version then the "
 "first such record determines the priority of the package version.  Failing "
@@ -6050,14 +6385,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:268
+#: apt_preferences.5.xml:354
 msgid ""
 "For example, suppose the APT preferences file contains the three records "
 "presented earlier:"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:272
+#: apt_preferences.5.xml:358
 #, no-wrap
 msgid ""
 "Package: perl\n"
@@ -6074,12 +6409,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:285
+#: apt_preferences.5.xml:371
 msgid "Then:"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:287
+#: apt_preferences.5.xml:373
 msgid ""
 "The most recent available version of the <literal>perl</literal> package "
 "will be installed, so long as that version's version number begins with "
@@ -6089,7 +6424,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:292
+#: apt_preferences.5.xml:378
 msgid ""
 "A version of any package other than <literal>perl</literal> that is "
 "available from the local system has priority over other versions, even "
@@ -6097,7 +6432,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:296
+#: apt_preferences.5.xml:382
 msgid ""
 "A version of a package whose origin is not the local system but some other "
 "site listed in &sources-list; and which belongs to an "
@@ -6106,12 +6441,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:306
+#: apt_preferences.5.xml:392
 msgid "Determination of Package Version and Distribution Properties"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:308
+#: apt_preferences.5.xml:394
 msgid ""
 "The locations listed in the &sources-list; file should provide "
 "<filename>Packages</filename> and <filename>Release</filename> files to "
@@ -6119,27 +6454,27 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:320
+#: apt_preferences.5.xml:406
 msgid "the <literal>Package:</literal> line"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:321
+#: apt_preferences.5.xml:407
 msgid "gives the package name"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:324 apt_preferences.5.xml:374
+#: apt_preferences.5.xml:410 apt_preferences.5.xml:460
 msgid "the <literal>Version:</literal> line"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:325
+#: apt_preferences.5.xml:411
 msgid "gives the version number for the named package"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:312
+#: apt_preferences.5.xml:398
 msgid ""
 "The <filename>Packages</filename> file is normally found in the directory "
 "<filename>.../dists/<replaceable>dist-name</replaceable>/<replaceable>component</replaceable>/<replaceable>arch</replaceable></filename>: "
@@ -6151,12 +6486,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:341
+#: apt_preferences.5.xml:427
 msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:342
+#: apt_preferences.5.xml:428
 msgid ""
 "names the archive to which all the packages in the directory tree belong.  "
 "For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@ -6167,35 +6502,35 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:352
+#: apt_preferences.5.xml:438
 #, no-wrap
 msgid "Pin: release a=stable\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:358
+#: apt_preferences.5.xml:444
 msgid "the <literal>Codename:</literal> line"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:359
+#: apt_preferences.5.xml:445
 msgid ""
 "names the codename to which all the packages in the directory tree belong.  "
-"For example, the line \"Codename: squeeze\" specifies that all of the "
-"packages in the directory tree below the parent of the "
+"For example, the line \"Codename: &testing-codename;\" specifies that all of "
+"the packages in the directory tree below the parent of the "
 "<filename>Release</filename> file belong to a version named "
-"<literal>squeeze</literal>.  Specifying this value in the APT preferences "
-"file would require the line:"
+"<literal>&testing-codename;</literal>.  Specifying this value in the APT "
+"preferences file would require the line:"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:368
+#: apt_preferences.5.xml:454
 #, no-wrap
-msgid "Pin: release n=squeeze\n"
+msgid "Pin: release n=&testing-codename;\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:375
+#: apt_preferences.5.xml:461
 msgid ""
 "names the release version.  For example, the packages in the tree might "
 "belong to Debian GNU/Linux release version 3.0.  Note that there is normally "
@@ -6206,7 +6541,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:384
+#: apt_preferences.5.xml:470
 #, no-wrap
 msgid ""
 "Pin: release v=3.0\n"
@@ -6215,12 +6550,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:393
+#: apt_preferences.5.xml:479
 msgid "the <literal>Component:</literal> line"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:394
+#: apt_preferences.5.xml:480
 msgid ""
 "names the licensing component associated with the packages in the directory "
 "tree of the <filename>Release</filename> file.  For example, the line "
@@ -6232,18 +6567,18 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:403
+#: apt_preferences.5.xml:489
 #, no-wrap
 msgid "Pin: release c=main\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:409
+#: apt_preferences.5.xml:495
 msgid "the <literal>Origin:</literal> line"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:410
+#: apt_preferences.5.xml:496
 msgid ""
 "names the originator of the packages in the directory tree of the "
 "<filename>Release</filename> file.  Most commonly, this is "
@@ -6252,18 +6587,18 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:416
+#: apt_preferences.5.xml:502
 #, no-wrap
 msgid "Pin: release o=Debian\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:422
+#: apt_preferences.5.xml:508
 msgid "the <literal>Label:</literal> line"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:423
+#: apt_preferences.5.xml:509
 msgid ""
 "names the label of the packages in the directory tree of the "
 "<filename>Release</filename> file.  Most commonly, this is "
@@ -6272,27 +6607,27 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:429
+#: apt_preferences.5.xml:515
 #, no-wrap
 msgid "Pin: release l=Debian\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:330
+#: apt_preferences.5.xml:416
 msgid ""
 "The <filename>Release</filename> file is normally found in the directory "
 "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
 "example, <filename>.../dists/stable/Release</filename>, or "
-"<filename>.../dists/woody/Release</filename>.  It consists of a single "
-"multi-line record which applies to <emphasis>all</emphasis> of the packages "
-"in the directory tree below its parent.  Unlike the "
+"<filename>.../dists/&stable-codename;/Release</filename>.  It consists of a "
+"single multi-line record which applies to <emphasis>all</emphasis> of the "
+"packages in the directory tree below its parent.  Unlike the "
 "<filename>Packages</filename> file, nearly all of the lines in a "
 "<filename>Release</filename> file are relevant for setting APT priorities: "
 "<placeholder type=\"variablelist\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:436
+#: apt_preferences.5.xml:522
 msgid ""
 "All of the <filename>Packages</filename> and <filename>Release</filename> "
 "files retrieved from locations listed in the &sources-list; file are stored "
@@ -6307,34 +6642,25 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:449
+#: apt_preferences.5.xml:535
 msgid "Optional Lines in an APT Preferences Record"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:451
+#: apt_preferences.5.xml:537
 msgid ""
 "Each record in the APT preferences file can optionally begin with one or "
 "more lines beginning with the word <literal>Explanation:</literal>.  This "
 "provides a place for comments."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:455
-msgid ""
-"The <literal>Pin-Priority:</literal> line in each APT preferences record is "
-"optional.  If omitted, APT assigns a priority of 1 less than the last value "
-"specified on a line beginning with <literal>Pin-Priority: release "
-"...</literal>."
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:464
+#: apt_preferences.5.xml:546
 msgid "Tracking Stable"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:472
+#: apt_preferences.5.xml:554
 #, no-wrap
 msgid ""
 "Explanation: Uninstall or do not install any Debian-originated\n"
@@ -6349,7 +6675,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:466
+#: apt_preferences.5.xml:548
 msgid ""
 "The following APT preferences file will cause APT to assign a priority "
 "higher than the default (500) to all package versions belonging to a "
@@ -6359,7 +6685,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:489 apt_preferences.5.xml:535 apt_preferences.5.xml:593
+#: apt_preferences.5.xml:571 apt_preferences.5.xml:617 apt_preferences.5.xml:675
 #, no-wrap
 msgid ""
 "apt-get install <replaceable>package-name</replaceable>\n"
@@ -6368,7 +6694,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:484
+#: apt_preferences.5.xml:566
 msgid ""
 "With a suitable &sources-list; file and the above preferences file, any of "
 "the following commands will cause APT to upgrade to the latest "
@@ -6377,13 +6703,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:501
+#: apt_preferences.5.xml:583
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/testing\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:495
+#: apt_preferences.5.xml:577
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>testing</literal> distribution; the package "
@@ -6392,12 +6718,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:507
+#: apt_preferences.5.xml:589
 msgid "Tracking Testing or Unstable"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:516
+#: apt_preferences.5.xml:598
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -6414,7 +6740,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:509
+#: apt_preferences.5.xml:591
 msgid ""
 "The following APT preferences file will cause APT to assign a high priority "
 "to package versions from the <literal>testing</literal> distribution, a "
@@ -6425,7 +6751,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:530
+#: apt_preferences.5.xml:612
 msgid ""
 "With a suitable &sources-list; file and the above preferences file, any of "
 "the following commands will cause APT to upgrade to the latest "
@@ -6434,13 +6760,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:550
+#: apt_preferences.5.xml:632
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:541
+#: apt_preferences.5.xml:623
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>unstable</literal> distribution.  "
@@ -6452,25 +6778,25 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:557
+#: apt_preferences.5.xml:639
 msgid "Tracking the evolution of a codename release"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:571
+#: apt_preferences.5.xml:653
 #, no-wrap
 msgid ""
 "Explanation: Uninstall or do not install any Debian-originated package "
 "versions\n"
-"Explanation: other than those in the distribution codenamed with squeeze or "
-"sid\n"
+"Explanation: other than those in the distribution codenamed with "
+"&testing-codename; or sid\n"
 "Package: *\n"
-"Pin: release n=squeeze\n"
+"Pin: release n=&testing-codename;\n"
 "Pin-Priority: 900\n"
 "\n"
 "Explanation: Debian unstable is always codenamed with sid\n"
 "Package: *\n"
-"Pin: release a=sid\n"
+"Pin: release n=sid\n"
 "Pin-Priority: 800\n"
 "\n"
 "Package: *\n"
@@ -6479,7 +6805,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:559
+#: apt_preferences.5.xml:641
 msgid ""
 "The following APT preferences file will cause APT to assign a priority "
 "higher than the default (500) to all package versions belonging to a "
@@ -6494,138 +6820,141 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:588
+#: apt_preferences.5.xml:670
 msgid ""
 "With a suitable &sources-list; file and the above preferences file, any of "
 "the following commands will cause APT to upgrade to the latest version(s) in "
-"the release codenamed with <literal>squeeze</literal>.  <placeholder "
-"type=\"programlisting\" id=\"0\"/>"
+"the release codenamed with <literal>&testing-codename;</literal>.  "
+"<placeholder type=\"programlisting\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:608
+#: apt_preferences.5.xml:690
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/sid\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:599
+#: apt_preferences.5.xml:681
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>sid</literal> distribution.  Thereafter, "
 "<command>apt-get upgrade</command> will upgrade the package to the most "
-"recent <literal>squeeze</literal> version if that is more recent than the "
-"installed version, otherwise, to the most recent <literal>sid</literal> "
-"version if that is more recent than the installed version.  <placeholder "
-"type=\"programlisting\" id=\"0\"/>"
+"recent <literal>&testing-codename;</literal> version if that is more recent "
+"than the installed version, otherwise, to the most recent "
+"<literal>sid</literal> version if that is more recent than the installed "
+"version.  <placeholder type=\"programlisting\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt_preferences.5.xml:617
+#: apt_preferences.5.xml:699
 msgid "&file-preferences;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:623
+#: apt_preferences.5.xml:705
 msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 msgstr ""
 
 #. type: Content of: <refentry><refnamediv><refname>
-#: sources.list.5.xml:22 sources.list.5.xml:29
+#: sources.list.5.xml:25 sources.list.5.xml:32
 msgid "sources.list"
 msgstr ""
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: sources.list.5.xml:30
+#: sources.list.5.xml:33
 msgid "Package resource list for APT"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:34
+#: sources.list.5.xml:37
 msgid ""
 "The package resource list is used to locate archives of the package "
 "distribution system in use on the system. At this time, this manual page "
 "documents only the packaging system used by the Debian GNU/Linux system.  "
-"This control file is located in <filename>/etc/apt/sources.list</filename>"
+"This control file is <filename>/etc/apt/sources.list</filename>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:39
+#: sources.list.5.xml:42
 msgid ""
 "The source list is designed to support any number of active sources and a "
 "variety of source media. The file lists one source per line, with the most "
 "preferred source listed first. The format of each line is: <literal>type uri "
 "args</literal> The first item, <literal>type</literal> determines the format "
-"for <literal>args</literal> <literal>uri</literal> is a Universal Resource "
+"for <literal>args</literal>. <literal>uri</literal> is a Universal Resource "
 "Identifier (URI), which is a superset of the more specific and well-known "
 "Universal Resource Locator, or URL. The rest of the line can be marked as a "
 "comment by using a #."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:50
+#: sources.list.5.xml:53
 msgid "sources.list.d"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:51
+#: sources.list.5.xml:54
 msgid ""
 "The <filename>/etc/apt/sources.list.d</filename> directory provides a way to "
 "add sources.list entries in separate files.  The format is the same as for "
 "the regular <filename>sources.list</filename> file.  File names need to end "
 "with <filename>.list</filename> and may only contain letters (a-z and A-Z), "
 "digits (0-9), underscore (_), hyphen (-) and period (.) characters.  "
-"Otherwise they will be silently ignored."
+"Otherwise APT will print a notice that it has ignored a file if the file "
+"doesn't match a pattern in the <literal>Dir::Ignore-Files-Silently</literal> "
+"configuration list - in this case it will be silently ignored."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:60
+#: sources.list.5.xml:65
 msgid "The deb and deb-src types"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:61
+#: sources.list.5.xml:66
 msgid ""
 "The <literal>deb</literal> type describes a typical two-level Debian "
 "archive, <filename>distribution/component</filename>. Typically, "
-"<literal>distribution</literal> is generally one of "
-"<literal>stable</literal> <literal>unstable</literal> or "
-"<literal>testing</literal> while component is one of <literal>main</literal> "
-"<literal>contrib</literal> <literal>non-free</literal> or "
-"<literal>non-us</literal> The <literal>deb-src</literal> type describes a "
+"<literal>distribution</literal> is generally an archivename like "
+"<literal>stable</literal> or <literal>testing</literal> or a codename like "
+"<literal>&stable-codename;</literal> or "
+"<literal>&testing-codename;</literal> while component is one of "
+"<literal>main</literal> <literal>contrib</literal> or "
+"<literal>non-free</literal>. The <literal>deb-src</literal> type describes a "
 "debian distribution's source code in the same form as the "
 "<literal>deb</literal> type.  A <literal>deb-src</literal> line is required "
 "to fetch source indexes."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:73
+#: sources.list.5.xml:78
 msgid ""
 "The format for a <filename>sources.list</filename> entry using the "
-"<literal>deb</literal> and <literal>deb-src</literal> types are:"
+"<literal>deb</literal> and <literal>deb-src</literal> types is:"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:76
+#: sources.list.5.xml:81
 #, no-wrap
-msgid "deb uri distribution [component1] [component2] [...]"
+msgid "deb [ options ] uri distribution [component1] [component2] [...]"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:78
+#: sources.list.5.xml:83
 msgid ""
 "The URI for the <literal>deb</literal> type must specify the base of the "
 "Debian distribution, from which APT will find the information it needs.  "
 "<literal>distribution</literal> can specify an exact path, in which case the "
 "components must be omitted and <literal>distribution</literal> must end with "
-"a slash (/). This is useful for when only a particular sub-section of the "
-"archive denoted by the URI is of interest.  If "
+"a slash (/). This is useful for when the case only a particular sub-section "
+"of the archive denoted by the URI is of interest.  If "
 "<literal>distribution</literal> does not specify an exact path, at least one "
 "<literal>component</literal> must be present."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:87
+#: sources.list.5.xml:92
 msgid ""
 "<literal>distribution</literal> may also contain a variable, "
 "<literal>$(ARCH)</literal> which expands to the Debian architecture (i386, "
@@ -6637,7 +6966,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:95
+#: sources.list.5.xml:100
 msgid ""
 "Since only one distribution can be specified per line it may be necessary to "
 "have multiple lines for the same URI, if a subset of all available "
@@ -6652,7 +6981,27 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:107
+#: sources.list.5.xml:112
+msgid ""
+"<literal>options</literal> is always optional and needs to be surounded by "
+"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 though that unsupported settings will be ignored "
+"silently:"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml:117
+msgid ""
+"<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 "
+"<literal>APT::Architectures</literal> option will be downloaded."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:123
 msgid ""
 "It is important to list sources in order of preference, with the most "
 "preferred source listed first. Typically this will result in sorting by "
@@ -6661,31 +7010,32 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:112
+#: sources.list.5.xml:128
 msgid "Some examples:"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:114
+#: sources.list.5.xml:130
 #, no-wrap
 msgid ""
-"deb http://http.us.debian.org/debian stable main contrib non-free\n"
-"deb http://http.us.debian.org/debian dists/stable-updates/\n"
+"deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
+"deb http://security.debian.org/ &stable-codename;/updates main contrib "
+"non-free\n"
 "   "
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:120
+#: sources.list.5.xml:136
 msgid "URI specification"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:125
+#: sources.list.5.xml:141
 msgid "file"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:127
+#: sources.list.5.xml:143
 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 "
@@ -6693,7 +7043,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:134
+#: sources.list.5.xml:150
 msgid ""
 "The cdrom scheme allows APT to use a local CDROM drive with media "
 "swapping. Use the &apt-cdrom; program to create cdrom entries in the source "
@@ -6701,18 +7051,18 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:141
+#: sources.list.5.xml:157
 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 "
+"the format http://user:pass@server:port/.  Note that this is an insecure "
 "method of authentication."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:152
+#: sources.list.5.xml:168
 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 "
@@ -6724,12 +7074,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:161
+#: sources.list.5.xml:177
 msgid "copy"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:163
+#: sources.list.5.xml:179
 msgid ""
 "The copy scheme is identical to the file scheme except that packages are "
 "copied into the cache directory instead of used directly at their location.  "
@@ -6737,17 +7087,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:168
+#: sources.list.5.xml:184
 msgid "rsh"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:168
+#: sources.list.5.xml:184
 msgid "ssh"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:170
+#: sources.list.5.xml:186
 msgid ""
 "The rsh/ssh method invokes rsh/ssh to connect to a remote host as a given "
 "user and access the files. It is a good idea to do prior arrangements with "
@@ -6757,18 +7107,18 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:178
-msgid "more recongnizable URI types"
+#: sources.list.5.xml:194
+msgid "more recognizable URI types"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:180
+#: sources.list.5.xml:196
 msgid ""
 "APT can be extended with more methods shipped in other optional packages "
 "which should follow the nameing scheme "
 "<literal>apt-transport-<replaceable>method</replaceable></literal>.  The APT "
-"team e.g. maintain also the <literal>apt-transport-https</literal> package "
-"which provides access methods for https-URIs with features similiar to the "
+"team e.g. maintains also the <literal>apt-transport-https</literal> package "
+"which provides access methods for https-URIs with features similar to the "
 "http method, but other methods for using e.g. debtorrent are also available, "
 "see <citerefentry> "
 "<refentrytitle><filename>apt-transport-debtorrent</filename></refentrytitle> "
@@ -6776,124 +7126,124 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:122
+#: sources.list.5.xml:138
 msgid ""
 "The currently recognized URI types are cdrom, file, http, ftp, copy, ssh, "
 "rsh.  <placeholder type=\"variablelist\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:194
+#: sources.list.5.xml:210
 msgid ""
 "Uses the archive stored locally (or NFS mounted) at /home/jason/debian for "
 "stable/main, stable/contrib, and stable/non-free."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:196
+#: sources.list.5.xml:212
 #, no-wrap
 msgid "deb file:/home/jason/debian stable main contrib non-free"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:198
+#: sources.list.5.xml:214
 msgid "As above, except this uses the unstable (development) distribution."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:199
+#: sources.list.5.xml:215
 #, no-wrap
 msgid "deb file:/home/jason/debian unstable main contrib non-free"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:201
+#: sources.list.5.xml:217
 msgid "Source line for the above"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:202
+#: sources.list.5.xml:218
 #, no-wrap
 msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:204
+#: sources.list.5.xml:220
 msgid ""
-"Uses HTTP to access the archive at archive.debian.org, and uses only the "
-"hamm/main area."
+"The first line gets package information for the architectures in "
+"<literal>APT::Architectures</literal> while the second always retrieves "
+"<literal>amd64</literal> and <literal>armel</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:206
+#: sources.list.5.xml:222
 #, no-wrap
-msgid "deb http://archive.debian.org/debian-archive hamm main"
+msgid ""
+"deb http://ftp.debian.org/debian &stable-codename; main\n"
+"deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:208
+#: sources.list.5.xml:225
 msgid ""
-"Uses FTP to access the archive at ftp.debian.org, under the debian "
-"directory, and uses only the stable/contrib area."
+"Uses HTTP to access the archive at archive.debian.org, and uses only the "
+"hamm/main area."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:210
+#: sources.list.5.xml:227
 #, no-wrap
-msgid "deb ftp://ftp.debian.org/debian stable contrib"
+msgid "deb http://archive.debian.org/debian-archive hamm main"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:212
+#: sources.list.5.xml:229
 msgid ""
 "Uses FTP to access the archive at ftp.debian.org, under the debian "
-"directory, and uses only the unstable/contrib area. If this line appears as "
-"well as the one in the previous example in "
-"<filename>sources.list</filename>.  a single FTP session will be used for "
-"both resource lines."
+"directory, and uses only the &stable-codename;/contrib area."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:216
+#: sources.list.5.xml:231
 #, no-wrap
-msgid "deb ftp://ftp.debian.org/debian unstable contrib"
+msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:218
+#: sources.list.5.xml:233
 msgid ""
-"Uses HTTP to access the archive at nonus.debian.org, under the debian-non-US "
-"directory."
+"Uses FTP to access the archive at ftp.debian.org, under the debian "
+"directory, and uses only the unstable/contrib area. If this line appears as "
+"well as the one in the previous example in <filename>sources.list</filename> "
+"a single FTP session will be used for both resource lines."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:220
+#: sources.list.5.xml:237
 #, no-wrap
-msgid ""
-"deb http://nonus.debian.org/debian-non-US stable/non-US main contrib "
-"non-free"
+msgid "deb ftp://ftp.debian.org/debian unstable contrib"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:229
+#: sources.list.5.xml:246
 #, no-wrap
-msgid "deb http://ftp.de.debian.org/debian-non-US unstable/binary-$(ARCH)/"
+msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:222
+#: sources.list.5.xml:239
 msgid ""
-"Uses HTTP to access the archive at nonus.debian.org, under the debian-non-US "
+"Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe "
 "directory, and uses only files found under "
 "<filename>unstable/binary-i386</filename> on i386 machines, "
-"<filename>unstable/binary-m68k</filename> on m68k, and so forth for other "
+"<filename>unstable/binary-amd64</filename> on amd64, and so forth for other "
 "supported architectures. [Note this example only illustrates how to use the "
-"substitution variable; non-us is no longer structured like this] "
-"<placeholder type=\"literallayout\" id=\"0\"/>"
+"substitution variable; official debian archives are not structured like "
+"this] <placeholder type=\"literallayout\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:234
+#: sources.list.5.xml:251
 msgid "&apt-cache; &apt-conf;"
 msgstr ""
 
@@ -6990,7 +7340,7 @@ msgstr ""
 #: guide.sgml:63
 msgid ""
 "For instance, mailcrypt is an emacs extension that aids in encrypting email "
-"with GPG. Without GPGP installed mail-crypt is useless, so mailcrypt has a "
+"with GPG. Without GPGP installed mailcrypt is useless, so mailcrypt has a "
 "simple dependency on GPG. Also, because it is an emacs extension it has a "
 "simple dependency on emacs, without emacs it is completely useless."
 msgstr ""
@@ -7139,11 +7489,11 @@ msgstr ""
 #. type: <p></p>
 #: guide.sgml:184
 msgid ""
-"To enable the APT method you need to to select [A]ccess in "
-"<prgn>dselect</prgn> and then choose the APT method. You will be prompted "
-"for a set of <em>Sources</em> which are places to fetch archives from. These "
-"can be remote Internet sites, local Debian mirrors or CDROMs. Each source "
-"can provide a fragment of the total Debian archive, APT will automatically "
+"To enable the APT method you need to select [A]ccess in <prgn>dselect</prgn> "
+"and then choose the APT method. You will be prompted for a set of "
+"<em>Sources</em> which are places to fetch archives from. These can be "
+"remote Internet sites, local Debian mirrors or CDROMs. Each source can "
+"provide a fragment of the total Debian archive, APT will automatically "
 "combine them to form a complete set of packages. If you have a CDROM then it "
 "is a good idea to specify it first and then specify a mirror so that you "
 "have access to the latest bug fixes. APT will automatically use packages on "
@@ -7228,7 +7578,7 @@ msgstr ""
 #: guide.sgml:247
 msgid ""
 "Before starting to use <prgn>dselect</prgn> it is necessary to update the "
-"available list by selecting [U]pdate from the menu. This is a super-set of "
+"available list by selecting [U]pdate from the menu. This is a superset of "
 "<tt>apt-get update</tt> that makes the fetched information available to "
 "<prgn>dselect</prgn>. [U]pdate must be performed even if <tt>apt-get "
 "update</tt> has been run before."
@@ -7708,7 +8058,7 @@ msgstr ""
 #: offline.sgml:57
 msgid ""
 "This is achieved by creatively manipulating the APT configuration file. The "
-"essential premis to tell APT to look on a disc for it's archive files. Note "
+"essential premise to tell APT to look on a disc for it's archive files. Note "
 "that the disc should be formated with a filesystem that can handle long file "
 "names such as ext2, fat32 or vfat."
 msgstr ""
@@ -7807,7 +8157,7 @@ msgid ""
 "On the target machine the first thing to do is mount the disc and copy "
 "<em>/var/lib/dpkg/status</em> to it. You will also need to create the "
 "directories outlined in the Overview, <em>archives/partial/</em> and "
-"<em>lists/partial/</em> Then take the disc to the remote machine and "
+"<em>lists/partial/</em>. Then take the disc to the remote machine and "
 "configure the sources.list. On the remote machine execute the following:"
 msgstr ""
 
@@ -7825,9 +8175,9 @@ msgstr ""
 #. type: </example></p>
 #: offline.sgml:149
 msgid ""
-"The dist-upgrade command can be replaced with any-other standard APT "
+"The dist-upgrade command can be replaced with any other standard APT "
 "commands, particularly dselect-upgrade. You can even use an APT front end "
-"such as <em>dselect</em> However this presents a problem in communicating "
+"such as <em>dselect</em>. However this presents a problem in communicating "
 "your selections back to the local computer."
 msgstr ""