X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/b39c18596d05cea1b3c0f0445b17080e9a2e4c19..0c1a7101fda38ad9e43ef4c6757bfc9c0191a30c:/doc/po/apt-doc.pot

diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index 40ed1f589..8365c460f 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: 2010-01-20 12:18+0100\n"
+"POT-Creation-Date: 2010-10-14 00:03+0300\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
@@ -147,282 +148,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>1</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>1</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>1</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>1</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 +163,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 +180,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 +191,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 +207,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:240
+#: apt.ent:48
 #, no-wrap
 msgid ""
 "<!-- Boiler plate Author section -->\n"
@@ -560,7 +221,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 +236,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:258
+#: apt.ent:66
 #, no-wrap
 msgid ""
 "     <varlistentry>\n"
@@ -588,7 +249,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:268
+#: apt.ent:78
 #, no-wrap
 msgid ""
 "     <varlistentry>\n"
@@ -597,14 +258,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 +289,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 +306,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:297
+#: apt.ent:107
 #, no-wrap
 msgid ""
 "<!ENTITY file-aptconf \"\n"
@@ -653,7 +318,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 +330,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:309
+#: apt.ent:119
 #, no-wrap
 msgid ""
 "<!ENTITY file-cachearchives \"\n"
@@ -677,7 +342,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:315
+#: apt.ent:125
 #, no-wrap
 msgid ""
 "     "
@@ -690,7 +355,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:325
+#: apt.ent:135
 #, no-wrap
 msgid ""
 "<!ENTITY file-preferences \"\n"
@@ -706,7 +371,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:331
+#: apt.ent:141
 #, no-wrap
 msgid ""
 "     "
@@ -719,7 +384,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:337
+#: apt.ent:147
 #, no-wrap
 msgid ""
 "<!ENTITY file-sourceslist \"\n"
@@ -731,7 +396,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:343
+#: apt.ent:153
 #, no-wrap
 msgid ""
 "     "
@@ -744,7 +409,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:350
+#: apt.ent:160
 #, no-wrap
 msgid ""
 "<!ENTITY file-statelists \"\n"
@@ -758,7 +423,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:356
+#: apt.ent:166
 #, no-wrap
 msgid ""
 "     "
@@ -771,7 +436,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:362
+#: apt.ent:172
 #, no-wrap
 msgid ""
 "<!ENTITY file-trustedgpg \"\n"
@@ -784,7 +449,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:369
+#: apt.ent:179
 #, no-wrap
 msgid ""
 "     "
@@ -799,16 +464,36 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:371
-msgid "<!ENTITY translation-title \"TRANSLATION\">"
+#: 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:380
+#: 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 "
-"constributed\n"
+"contributed\n"
 "     to the translation in the past, who is responsible now and maybe "
 "further information\n"
 "     specially related to your translation. -->\n"
@@ -823,12 +508,18 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:387
+#: apt.ent:210
 #, no-wrap
 msgid ""
 "<!-- TRANSLATOR: As a translation is allowed to have 20% of "
 "untranslated/fuzzy strings\n"
-"     in a shipped manpage will maybe appear english parts. -->\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"
@@ -838,34 +529,34 @@ 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-sortpkgs.1.xml:13 sources.list.5.xml:13
+#: apt-cache.8.xml:16 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-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
+#: apt-cache.8.xml:33
 msgid "APT package handling utility -- cache manipulator"
 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> "
@@ -894,12 +585,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:35 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:65 apt-cdrom.8.xml:50 apt-config.8.xml:50 apt-extracttemplates.1.xml:46 apt-ftparchive.1.xml:59 apt-get.8.xml:114 apt-key.8.xml:38 apt-mark.8.xml:55 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:66
 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 "
@@ -908,31 +599,31 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:68 apt-get.8.xml:131
+#: apt-cache.8.xml:71 apt-get.8.xml:120
 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
+#: apt-cache.8.xml:75
 msgid "add <replaceable>file(s)</replaceable>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:73
+#: apt-cache.8.xml:76
 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:80
 msgid "gencaches"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:78
+#: apt-cache.8.xml:81
 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 "
@@ -940,12 +631,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:84
+#: apt-cache.8.xml:87
 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:88
 msgid ""
 "<literal>showpkg</literal> displays information about the packages listed on "
 "the command line. Remaining arguments are package names. The available "
@@ -959,7 +650,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
-#: apt-cache.8.xml:97
+#: apt-cache.8.xml:100
 #, no-wrap
 msgid ""
 "Package: libreadline2\n"
@@ -975,7 +666,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:109
+#: apt-cache.8.xml:112
 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, "
@@ -987,26 +678,26 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:118
+#: apt-cache.8.xml:121
 msgid "stats"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:118
+#: apt-cache.8.xml:121
 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:124
 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:128
 msgid ""
 "<literal>Normal packages</literal> is the number of regular, ordinary "
 "package names; these are packages that bear a one-to-one correspondence "
@@ -1015,7 +706,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:131
+#: apt-cache.8.xml:134
 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 "
@@ -1026,7 +717,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:139
+#: apt-cache.8.xml:142
 msgid ""
 "<literal>Single virtual packages</literal> is the number of packages with "
 "only one package providing a particular virtual package. For example, in the "
@@ -1035,7 +726,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:145
+#: apt-cache.8.xml:148
 msgid ""
 "<literal>Mixed virtual packages</literal> is the number of packages that "
 "either provide a particular virtual package or have the virtual package name "
@@ -1045,7 +736,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:152
+#: apt-cache.8.xml:155
 msgid ""
 "<literal>Missing</literal> is the number of package names that were "
 "referenced in a dependency but were not provided by any package. Missing "
@@ -1055,7 +746,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:159
+#: apt-cache.8.xml:162
 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 "
@@ -1065,19 +756,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:166
+#: apt-cache.8.xml:169
 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:176
 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:177
 msgid ""
 "<literal>showsrc</literal> displays all the source package records that "
 "match the given package names. All versions are shown, as well as all "
@@ -1085,48 +776,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:182 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:183
 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:187
 msgid "dumpavail"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:185
+#: apt-cache.8.xml:188
 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:192
 msgid "unmet"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:190
+#: apt-cache.8.xml:193
 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:197
 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:198
 msgid ""
 "<literal>show</literal> performs a function similar to <command>dpkg "
 "--print-avail</command>; it displays the package records for the named "
@@ -1134,12 +825,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:200
+#: apt-cache.8.xml:203
 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:204
 msgid ""
 "<literal>search</literal> performs a full text search on all available "
 "package lists for the POSIX regex pattern given, see "
@@ -1154,43 +845,43 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:214
+#: apt-cache.8.xml:217
 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:221
 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:222
 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:226
 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:227
 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:231
 msgid "pkgnames <replaceable>[ prefix ]</replaceable>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:229
+#: apt-cache.8.xml:232
 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 "
@@ -1200,7 +891,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:234
+#: apt-cache.8.xml:237
 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 "
@@ -1208,12 +899,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:239
+#: apt-cache.8.xml:242
 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:243
 msgid ""
 "<literal>dotty</literal> takes a list of packages on the command line and "
 "generates output suitable for use by dotty from the <ulink "
@@ -1226,7 +917,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:249
+#: apt-cache.8.xml:252
 msgid ""
 "The resulting nodes will have several shapes; normal packages are boxes, "
 "pure provides are triangles, mixed provides are diamonds, missing packages "
@@ -1235,17 +926,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:254
+#: apt-cache.8.xml:257
 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:260
 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:261
 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 "
@@ -1253,12 +944,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:262
+#: apt-cache.8.xml:265
 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:266
 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 "
@@ -1267,12 +958,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:269
+#: apt-cache.8.xml:272
 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:273
 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 "
@@ -1284,22 +975,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:502 apt.conf.5.xml:524
+#: apt-cache.8.xml:284 apt-config.8.xml:96 apt-extracttemplates.1.xml:59 apt-ftparchive.1.xml:522 apt-get.8.xml:308 apt-mark.8.xml:92 apt-sortpkgs.1.xml:57 apt.conf.5.xml:559 apt.conf.5.xml:581
 msgid "options"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:285
+#: apt-cache.8.xml:288
 msgid "<option>-p</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:285
+#: apt-cache.8.xml:288
 msgid "<option>--pkg-cache</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:286
+#: apt-cache.8.xml:289
 msgid ""
 "Select the file to store the package cache. The package cache is the primary "
 "cache used by all operations.  Configuration Item: "
@@ -1307,17 +998,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:294 apt-ftparchive.1.xml:565 apt-get.8.xml:365 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:294
 msgid "<option>--src-cache</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:292
+#: apt-cache.8.xml:295
 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 "
@@ -1327,17 +1018,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:302 apt-ftparchive.1.xml:539 apt-get.8.xml:355
 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:302 apt-ftparchive.1.xml:539 apt-get.8.xml:355
 msgid "<option>--quiet</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:300
+#: apt-cache.8.xml:303
 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 "
@@ -1346,17 +1037,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:306
+#: apt-cache.8.xml:309
 msgid "<option>-i</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:306
+#: apt-cache.8.xml:309
 msgid "<option>--important</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:307
+#: apt-cache.8.xml:310
 msgid ""
 "Print only important dependencies; for use with unmet and depends. Causes "
 "only Depends and Pre-Depends relations to be printed.  Configuration Item: "
@@ -1364,34 +1055,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
+#: apt-cache.8.xml:315
+msgid "<option>--no-pre-depends</option>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-cache.8.xml:316
+msgid "<option>--no-depends</option>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-cache.8.xml:317
+msgid "<option>--no-recommends</option>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-cache.8.xml:318
+msgid "<option>--no-suggests</option>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-cache.8.xml:319
+msgid "<option>--no-conflicts</option>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-cache.8.xml:320
+msgid "<option>--no-breaks</option>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-cache.8.xml:321
+msgid "<option>--no-replaces</option>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-cache.8.xml:322
+msgid "<option>--no-enhances</option>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-cache.8.xml:323
+msgid ""
+"Per default the <literal>depends</literal> and <literal>rdepends</literal> "
+"print all dependencies. This can be twicked 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:329 apt-cdrom.8.xml:124 apt-get.8.xml:322
 msgid "<option>-f</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:312
+#: apt-cache.8.xml:329
 msgid "<option>--full</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:313
+#: apt-cache.8.xml:330
 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:334 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:577
 msgid "<option>-a</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:317
+#: apt-cache.8.xml:334
 msgid "<option>--all-versions</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:318
+#: apt-cache.8.xml:335
 msgid ""
 "Print full records for all available versions. This is the default; to turn "
 "it off, use <option>--no-all-versions</option>.  If "
@@ -1402,17 +1143,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:326
+#: apt-cache.8.xml:343
 msgid "<option>-g</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:326
+#: apt-cache.8.xml:343
 msgid "<option>--generate</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:327
+#: apt-cache.8.xml:344
 msgid ""
 "Perform automatic package cache regeneration, rather than use the cache as "
 "it is. This is the default; to turn it off, use "
@@ -1421,29 +1162,29 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:332
+#: apt-cache.8.xml:349
 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:349 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:350
 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:354
 msgid "<option>--all-names</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:338
+#: apt-cache.8.xml:355
 msgid ""
 "Make <literal>pkgnames</literal> print all names, including virtual packages "
 "and missing dependencies.  Configuration Item: "
@@ -1451,12 +1192,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:343
+#: apt-cache.8.xml:360
 msgid "<option>--recurse</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:344
+#: apt-cache.8.xml:361
 msgid ""
 "Make <literal>depends</literal> and <literal>rdepends</literal> recursive so "
 "that all packages mentioned are printed once.  Configuration Item: "
@@ -1464,12 +1205,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:349
+#: apt-cache.8.xml:366
 msgid "<option>--installed</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:351
+#: apt-cache.8.xml:368
 msgid ""
 "Limit the output of <literal>depends</literal> and "
 "<literal>rdepends</literal> to packages which are currently installed.  "
@@ -1477,61 +1218,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:568 apt-get.8.xml:554 apt-sortpkgs.1.xml:64
+#: apt-cache.8.xml:373 apt-cdrom.8.xml:153 apt-config.8.xml:101 apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:605 apt-get.8.xml:550 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:153 apt-mark.8.xml:122 apt.conf.5.xml:1035 apt_preferences.5.xml:622
+#: apt-cache.8.xml:378 apt-get.8.xml:555 apt-key.8.xml:156 apt-mark.8.xml:125 apt.conf.5.xml:1092 apt_preferences.5.xml:647
 msgid "Files"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt-cache.8.xml:363
+#: apt-cache.8.xml:380
 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:584 apt-get.8.xml:569 apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181 apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:629 sources.list.5.xml:233
+#: apt-cache.8.xml:385 apt-cdrom.8.xml:158 apt-config.8.xml:106 apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:621 apt-get.8.xml:565 apt-key.8.xml:177 apt-mark.8.xml:131 apt-secure.8.xml:184 apt-sortpkgs.1.xml:72 apt.conf.5.xml:1098 apt_preferences.5.xml:654 sources.list.5.xml:236
 msgid "See Also"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:369
+#: apt-cache.8.xml:386
 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:588 apt-get.8.xml:575 apt-mark.8.xml:137 apt-sortpkgs.1.xml:73
+#: apt-cache.8.xml:390 apt-cdrom.8.xml:163 apt-config.8.xml:111 apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:625 apt-get.8.xml:571 apt-mark.8.xml:135 apt-sortpkgs.1.xml:76
 msgid "Diagnostics"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:374
+#: apt-cache.8.xml:391
 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> "
@@ -1541,7 +1282,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 "
@@ -1550,7 +1291,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 "
@@ -1558,22 +1299,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 "
@@ -1581,19 +1322,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 "
@@ -1601,22 +1342,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cdrom.8.xml:91 apt-key.8.xml:139
+#: apt-cdrom.8.xml:94 apt-key.8.xml:142
 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:533 apt-get.8.xml:317
 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.  "
@@ -1624,17 +1365,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 "
@@ -1642,17 +1383,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:336
 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: "
@@ -1660,12 +1401,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 "
@@ -1674,12 +1415,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 "
@@ -1687,22 +1428,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:367
 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:369
 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:370
 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: "
@@ -1710,29 +1451,29 @@ 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 ""
 
 #. 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> "
@@ -1741,7 +1482,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 "
@@ -1750,19 +1491,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 "
@@ -1772,7 +1513,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"
@@ -1781,14 +1522,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 "
@@ -1796,39 +1537,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:585 apt-sortpkgs.1.xml:70
+#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:622 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 "
@@ -1837,7 +1578,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 "
@@ -1847,12 +1588,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 "
@@ -1862,17 +1603,17 @@ 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:484
 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: "
@@ -1880,7 +1621,7 @@ msgid ""
 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."
@@ -1888,29 +1629,30 @@ msgstr ""
 
 #.  The last update date 
 #. type: Content of: <refentry><refentryinfo>
-#: apt-ftparchive.1.xml:13
+#: 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\" "
@@ -1929,7 +1671,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 "
@@ -1938,7 +1680,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 "
@@ -1948,7 +1690,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 "
@@ -1958,12 +1700,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, "
@@ -1972,17 +1714,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 "
@@ -1991,7 +1733,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 "
@@ -1999,12 +1741,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 "
@@ -2015,12 +1757,12 @@ 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, "
@@ -2030,7 +1772,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:118
+#: apt-ftparchive.1.xml:122
 msgid ""
 "Values for the additional metadata fields in the Release file are taken from "
 "the corresponding variables under "
@@ -2039,17 +1781,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:133
 msgid "generate"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:130
+#: apt-ftparchive.1.xml:135
 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 "
@@ -2059,24 +1801,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:142 apt-get.8.xml:281
 msgid "clean"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:139
+#: apt-ftparchive.1.xml:144
 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:150
 msgid "The Generate Configuration"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:147
+#: apt-ftparchive.1.xml:152
 msgid ""
 "The <literal>generate</literal> command uses a configuration file to "
 "describe the archives that are going to be generated. It follows the typical "
@@ -2087,17 +1829,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:155
+#: apt-ftparchive.1.xml:160
 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:162
 msgid "Dir Section"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:159
+#: apt-ftparchive.1.xml:164
 msgid ""
 "The <literal>Dir</literal> section defines the standard directories needed "
 "to locate the files required during the generation process. These "
@@ -2106,12 +1848,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:164
+#: apt-ftparchive.1.xml:169
 msgid "ArchiveDir"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:166
+#: apt-ftparchive.1.xml:171
 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 "
@@ -2119,44 +1861,44 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:171
+#: apt-ftparchive.1.xml:176
 msgid "OverrideDir"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:173
+#: apt-ftparchive.1.xml:178
 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:181
 msgid "CacheDir"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:178
+#: apt-ftparchive.1.xml:183
 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:186
 msgid "FileListDir"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:183
+#: apt-ftparchive.1.xml:188
 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:194
 msgid "Default Section"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:191
+#: apt-ftparchive.1.xml:196
 msgid ""
 "The <literal>Default</literal> section specifies default values, and "
 "settings that control the operation of the generator. Other sections may "
@@ -2164,12 +1906,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:195
+#: apt-ftparchive.1.xml:200
 msgid "Packages::Compress"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:197
+#: apt-ftparchive.1.xml:202
 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 "
@@ -2178,60 +1920,72 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:203
+#: apt-ftparchive.1.xml:208
 msgid "Packages::Extensions"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:205
+#: apt-ftparchive.1.xml:210
 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:214
 msgid "Sources::Compress"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:211
+#: apt-ftparchive.1.xml:216
 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:220
 msgid "Sources::Extensions"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:217
+#: apt-ftparchive.1.xml:222
 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:226
 msgid "Contents::Compress"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:223
+#: apt-ftparchive.1.xml:228
 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:232
+msgid "Translation::Compress"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:234
+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:238
 msgid "DeLinkLimit"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:229
+#: apt-ftparchive.1.xml:240
 msgid ""
 "Specifies the number of kilobytes to delink (and replace with hard links) "
 "per run. This is used in conjunction with the per-section "
@@ -2239,24 +1993,36 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:234
+#: apt-ftparchive.1.xml:245
 msgid "FileMode"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:236
+#: apt-ftparchive.1.xml:247
 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:252 apt-ftparchive.1.xml:398
+msgid "LongDescription"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:254 apt-ftparchive.1.xml:400
+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:260
 msgid "TreeDefault Section"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:245
+#: apt-ftparchive.1.xml:262
 msgid ""
 "Sets defaults specific to <literal>Tree</literal> sections. All of these "
 "variables are substitution variables and have the strings $(DIST), "
@@ -2264,12 +2030,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:250
+#: apt-ftparchive.1.xml:267
 msgid "MaxContentsChange"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:252
+#: apt-ftparchive.1.xml:269
 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 "
@@ -2277,12 +2043,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:257
+#: apt-ftparchive.1.xml:274
 msgid "ContentsAge"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:259
+#: apt-ftparchive.1.xml:276
 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 "
@@ -2293,60 +2059,73 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:268
+#: apt-ftparchive.1.xml:285
 msgid "Directory"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:270
+#: apt-ftparchive.1.xml:287
 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:291
 msgid "SrcDirectory"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:276
+#: apt-ftparchive.1.xml:293
 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:297 apt-ftparchive.1.xml:436
 msgid "Packages"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:282
+#: apt-ftparchive.1.xml:299
 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:303 apt-ftparchive.1.xml:441
 msgid "Sources"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:288
+#: apt-ftparchive.1.xml:305
 msgid ""
 "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:309
+msgid "Translation"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:311
+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:316
 msgid "InternalPrefix"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:294
+#: apt-ftparchive.1.xml:318
 msgid ""
 "Sets the path prefix that causes a symlink to be considered an internal link "
 "instead of an external link. Defaults to "
@@ -2354,12 +2133,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:323 apt-ftparchive.1.xml:447
 msgid "Contents"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:301
+#: apt-ftparchive.1.xml:325
 msgid ""
 "Sets the output Contents file. Defaults to "
 "<filename>$(DIST)/Contents-$(ARCH)</filename>. If this setting causes "
@@ -2369,34 +2148,34 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:308
+#: apt-ftparchive.1.xml:332
 msgid "Contents::Header"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:310
+#: apt-ftparchive.1.xml:334
 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:337 apt-ftparchive.1.xml:472
 msgid "BinCacheDB"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:315
+#: apt-ftparchive.1.xml:339
 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:343
 msgid "FileList"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:321
+#: apt-ftparchive.1.xml:345
 msgid ""
 "Specifies that instead of walking the directory tree, "
 "<command>apt-ftparchive</command> should read the list of files from the "
@@ -2404,12 +2183,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:326
+#: apt-ftparchive.1.xml:350
 msgid "SourceFileList"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:328
+#: apt-ftparchive.1.xml:352
 msgid ""
 "Specifies that instead of walking the directory tree, "
 "<command>apt-ftparchive</command> should read the list of files from the "
@@ -2418,12 +2197,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:336
+#: apt-ftparchive.1.xml:360
 msgid "Tree Section"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:338
+#: apt-ftparchive.1.xml:362
 msgid ""
 "The <literal>Tree</literal> section defines a standard Debian file tree "
 "which consists of a base directory, then multiple sections in that base "
@@ -2433,16 +2212,16 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:343
+#: apt-ftparchive.1.xml:367
 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:372
 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 "
@@ -2450,7 +2229,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt-ftparchive.1.xml:354
+#: apt-ftparchive.1.xml:378
 #, no-wrap
 msgid ""
 "for i in Sections do \n"
@@ -2460,7 +2239,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:351
+#: apt-ftparchive.1.xml:375
 msgid ""
 "When processing a <literal>Tree</literal> section "
 "<command>apt-ftparchive</command> performs an operation similar to: "
@@ -2468,12 +2247,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:360
+#: apt-ftparchive.1.xml:384
 msgid "Sections"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:362
+#: apt-ftparchive.1.xml:386
 msgid ""
 "This is a space separated list of sections which appear under the "
 "distribution, typically this is something like <literal>main contrib "
@@ -2481,12 +2260,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:367
+#: apt-ftparchive.1.xml:391
 msgid "Architectures"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:369
+#: apt-ftparchive.1.xml:393
 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 "
@@ -2494,56 +2273,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:404 apt-ftparchive.1.xml:452
 msgid "BinOverride"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:376
+#: apt-ftparchive.1.xml:406
 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:410 apt-ftparchive.1.xml:457
 msgid "SrcOverride"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:382
+#: apt-ftparchive.1.xml:412
 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:416 apt-ftparchive.1.xml:462
 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:418 apt-ftparchive.1.xml:464
 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:421 apt-ftparchive.1.xml:467
 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:423 apt-ftparchive.1.xml:469
 msgid "Sets the source extra override file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:398
+#: apt-ftparchive.1.xml:428
 msgid "BinDirectory Section"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:400
+#: apt-ftparchive.1.xml:430
 msgid ""
 "The <literal>bindirectory</literal> section defines a binary directory tree "
 "with no special structure. The scope tag specifies the location of the "
@@ -2553,64 +2332,64 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:408
+#: apt-ftparchive.1.xml:438
 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:443
 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:449
 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:454
 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:459
 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:474
 msgid "Sets the cache DB."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:447
+#: apt-ftparchive.1.xml:477
 msgid "PathPrefix"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:449
+#: apt-ftparchive.1.xml:479
 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:482
 msgid "FileList, SourceFileList"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:454
+#: apt-ftparchive.1.xml:484
 msgid "Specifies the file list file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:461
+#: apt-ftparchive.1.xml:491
 msgid "The Binary Override File"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:462
+#: apt-ftparchive.1.xml:492
 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, "
@@ -2620,19 +2399,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:468
+#: apt-ftparchive.1.xml:498
 #, no-wrap
 msgid "old [// oldn]* => new"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:470
+#: apt-ftparchive.1.xml:500
 #, no-wrap
 msgid "new"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:467
+#: apt-ftparchive.1.xml:497
 msgid ""
 "The general form of the maintainer field is: <placeholder "
 "type=\"literallayout\" id=\"0\"/> or simply, <placeholder "
@@ -2643,12 +2422,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:478
+#: apt-ftparchive.1.xml:508
 msgid "The Source Override File"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:480
+#: apt-ftparchive.1.xml:510
 msgid ""
 "The source override file is fully compatible with &dpkg-scansources;. It "
 "contains 2 fields separated by spaces. The first fields is the source "
@@ -2656,12 +2435,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:485
+#: apt-ftparchive.1.xml:515
 msgid "The Extra Override File"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:487
+#: apt-ftparchive.1.xml:517
 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 "
@@ -2669,12 +2448,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:496
+#: apt-ftparchive.1.xml:526
 msgid "<option>--md5</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:498
+#: apt-ftparchive.1.xml:528
 msgid ""
 "Generate MD5 sums. This defaults to on, when turned off the generated index "
 "files will not have MD5Sum fields where possible.  Configuration Item: "
@@ -2682,19 +2461,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:503
+#: apt-ftparchive.1.xml:533
 msgid "<option>--db</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:505
+#: apt-ftparchive.1.xml:535
 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:541
 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 "
@@ -2703,12 +2482,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:517
+#: apt-ftparchive.1.xml:547
 msgid "<option>--delink</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:519
+#: apt-ftparchive.1.xml:549
 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 "
@@ -2717,12 +2496,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:525
+#: apt-ftparchive.1.xml:555
 msgid "<option>--contents</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:527
+#: apt-ftparchive.1.xml:557
 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 "
@@ -2732,12 +2511,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:535
+#: apt-ftparchive.1.xml:565
 msgid "<option>--source-override</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:537
+#: apt-ftparchive.1.xml:567
 msgid ""
 "Select the source override file to use with the <literal>sources</literal> "
 "command.  Configuration Item: "
@@ -2745,26 +2524,40 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:541
+#: apt-ftparchive.1.xml:571
 msgid "<option>--readonly</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:543
+#: apt-ftparchive.1.xml:573
 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:547
+#: apt-ftparchive.1.xml:577
+msgid "<option>--arch</option>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:578
+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:584
 msgid "<option>APT::FTPArchive::AlwaysStat</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:549
+#: apt-ftparchive.1.xml:586
 msgid ""
-"&apt-ftparchive; caches as much as possible of metadata in it is cachedb. If "
+"&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 "
@@ -2776,27 +2569,27 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:559
+#: apt-ftparchive.1.xml:596
 msgid "<option>APT::FTPArchive::LongDescription</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:561
+#: apt-ftparchive.1.xml:598
 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 it is currently not possible to create these files with "
-"<command>apt-ftparchive</command>."
+"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:573 apt.conf.5.xml:1029 apt_preferences.5.xml:469 sources.list.5.xml:193
+#: apt-ftparchive.1.xml:610 apt.conf.5.xml:1086 apt_preferences.5.xml:494 sources.list.5.xml:196
 msgid "Examples"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><programlisting>
-#: apt-ftparchive.1.xml:579
+#: apt-ftparchive.1.xml:616
 #, no-wrap
 msgid ""
 "<command>apt-ftparchive</command> packages "
@@ -2805,14 +2598,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:575
+#: apt-ftparchive.1.xml:612
 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:589
+#: apt-ftparchive.1.xml:626
 msgid ""
 "<command>apt-ftparchive</command> returns zero on normal operation, decimal "
 "100 on error."
@@ -2820,50 +2613,46 @@ 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> <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 "
@@ -2874,21 +2663,21 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:126
+#: apt-get.8.xml:115
 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:124
+#: apt-get.8.xml:124 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:125
 msgid ""
 "<literal>update</literal> is used to resynchronize the package index files "
 "from their sources. The indexes of available packages are fetched from the "
@@ -2903,12 +2692,12 @@ msgid ""
 msgstr ""
 
 #. type: <tag></tag>
-#: apt-get.8.xml:147 guide.sgml:121
+#: apt-get.8.xml:136 guide.sgml:121
 msgid "upgrade"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:148
+#: apt-get.8.xml:137
 msgid ""
 "<literal>upgrade</literal> is used to install the newest versions of all "
 "packages currently installed on the system from the sources enumerated in "
@@ -2924,12 +2713,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:160
+#: apt-get.8.xml:149
 msgid "dselect-upgrade"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:161
+#: apt-get.8.xml:150
 msgid ""
 "<literal>dselect-upgrade</literal> is used in conjunction with the "
 "traditional Debian packaging front-end, "
@@ -2940,12 +2729,12 @@ msgid ""
 msgstr ""
 
 #. type: <tag></tag>
-#: apt-get.8.xml:170 guide.sgml:140
+#: apt-get.8.xml:159 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:160
 msgid ""
 "<literal>dist-upgrade</literal> in addition to performing the function of "
 "<literal>upgrade</literal>, also intelligently handles changing dependencies "
@@ -2959,12 +2748,12 @@ msgid ""
 msgstr ""
 
 #. type: <tag></tag>
-#: apt-get.8.xml:183 guide.sgml:131
+#: apt-get.8.xml:172 guide.sgml:131
 msgid "install"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:185
+#: apt-get.8.xml:174
 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 "
@@ -2980,7 +2769,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:203
+#: apt-get.8.xml:192
 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 "
@@ -2991,14 +2780,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:210
+#: apt-get.8.xml:199
 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:202
 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 "
@@ -3010,14 +2799,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:224
+#: apt-get.8.xml:213
 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:217
 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 "
@@ -3029,12 +2818,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:237
+#: apt-get.8.xml:226
 msgid "remove"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:238
+#: apt-get.8.xml:227
 msgid ""
 "<literal>remove</literal> is identical to <literal>install</literal> except "
 "that packages are removed instead of installed. Note the removing a package "
@@ -3044,12 +2833,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:245
+#: apt-get.8.xml:234
 msgid "purge"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:246
+#: apt-get.8.xml:235
 msgid ""
 "<literal>purge</literal> is identical to <literal>remove</literal> except "
 "that packages are removed and purged (any configuration files are deleted "
@@ -3057,12 +2846,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:250
+#: apt-get.8.xml:239
 msgid "source"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:251
+#: apt-get.8.xml:240
 msgid ""
 "<literal>source</literal> causes <command>apt-get</command> to fetch source "
 "packages. APT will examine the available packages to decide which source "
@@ -3074,7 +2863,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:259
+#: apt-get.8.xml:248
 msgid ""
 "Source packages are tracked separately from binary packages via "
 "<literal>deb-src</literal> type lines in the &sources-list; file. This means "
@@ -3085,7 +2874,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:266
+#: apt-get.8.xml:255
 msgid ""
 "If the <option>--compile</option> option is specified then the package will "
 "be compiled to a binary .deb using <command>dpkg-buildpackage</command>, if "
@@ -3094,7 +2883,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:271
+#: apt-get.8.xml:260
 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 "
@@ -3104,7 +2893,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:277
+#: apt-get.8.xml:266
 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 "
@@ -3112,31 +2901,31 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:282
+#: apt-get.8.xml:271
 msgid "build-dep"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:283
+#: apt-get.8.xml:272
 msgid ""
 "<literal>build-dep</literal> causes apt-get to install/remove packages in an "
 "attempt to satisfy the build dependencies for a source package."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:287
+#: apt-get.8.xml:276
 msgid "check"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:288
+#: apt-get.8.xml:277
 msgid ""
 "<literal>check</literal> is a diagnostic tool; it updates the package cache "
 "and checks for broken dependencies."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:293
+#: apt-get.8.xml:282
 msgid ""
 "<literal>clean</literal> clears out the local repository of retrieved "
 "package files. It removes everything but the lock file from "
@@ -3148,12 +2937,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:302
+#: apt-get.8.xml:291
 msgid "autoclean"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:303
+#: apt-get.8.xml:292
 msgid ""
 "Like <literal>clean</literal>, <literal>autoclean</literal> clears out the "
 "local repository of retrieved package files. The difference is that it only "
@@ -3165,12 +2954,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:312
+#: apt-get.8.xml:301
 msgid "autoremove"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:313
+#: apt-get.8.xml:302
 msgid ""
 "<literal>autoremove</literal> is used to remove packages that were "
 "automatically installed to satisfy dependencies for some package and that "
@@ -3178,36 +2967,36 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:323 apt-get.8.xml:429
+#: apt-get.8.xml:312 apt-get.8.xml:418
 msgid "<option>--no-install-recommends</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:324
+#: apt-get.8.xml:313
 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:317
 msgid "<option>--download-only</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:329
+#: apt-get.8.xml:318
 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:322
 msgid "<option>--fix-broken</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:334
+#: apt-get.8.xml:323
 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 "
@@ -3223,17 +3012,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:347
+#: apt-get.8.xml:336
 msgid "<option>--ignore-missing</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:348
+#: apt-get.8.xml:337
 msgid "<option>--fix-missing</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:349
+#: apt-get.8.xml:338
 msgid ""
 "Ignore missing packages; If packages cannot be retrieved or fail the "
 "integrity check after retrieval (corrupted package files), hold back those "
@@ -3245,12 +3034,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:359
+#: apt-get.8.xml:348
 msgid "<option>--no-download</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:360
+#: apt-get.8.xml:349
 msgid ""
 "Disables downloading of packages. This is best used with "
 "<option>--ignore-missing</option> to force APT to use only the .debs it has "
@@ -3259,7 +3048,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:367
+#: apt-get.8.xml:356
 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 "
@@ -3271,17 +3060,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:377
+#: apt-get.8.xml:366
 msgid "<option>--simulate</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:379
+#: apt-get.8.xml:368
 msgid "<option>--dry-run</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:382
+#: apt-get.8.xml:371
 msgid ""
 "No action; perform a simulation of events that would occur but do not "
 "actually change the system.  Configuration Item: "
@@ -3289,7 +3078,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:386
+#: apt-get.8.xml:375
 msgid ""
 "Simulation run as user will deactivate locking "
 "(<literal>Debug::NoLocking</literal>)  automatic. Also a notice will be "
@@ -3301,7 +3090,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:392
+#: apt-get.8.xml:381
 msgid ""
 "Simulate prints out a series of lines each one representing a dpkg "
 "operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square brackets "
@@ -3310,22 +3099,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:399
+#: apt-get.8.xml:388
 msgid "<option>-y</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:399
+#: apt-get.8.xml:388
 msgid "<option>--yes</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:400
+#: apt-get.8.xml:389
 msgid "<option>--assume-yes</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:401
+#: apt-get.8.xml:390
 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 "
@@ -3335,83 +3124,83 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:408
+#: apt-get.8.xml:397
 msgid "<option>-u</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:408
+#: apt-get.8.xml:397
 msgid "<option>--show-upgraded</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:409
+#: apt-get.8.xml:398
 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:403
 msgid "<option>-V</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:414
+#: apt-get.8.xml:403
 msgid "<option>--verbose-versions</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:415
+#: apt-get.8.xml:404
 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:408
 msgid "<option>-b</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:419
+#: apt-get.8.xml:408
 msgid "<option>--compile</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:420
+#: apt-get.8.xml:409
 msgid "<option>--build</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:421
+#: apt-get.8.xml:410
 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
+#: apt-get.8.xml:414
 msgid "<option>--install-recommends</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:426
+#: apt-get.8.xml:415
 msgid "Also install recommended packages."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:430
+#: apt-get.8.xml:419
 msgid "Do not install recommended packages."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:433
+#: apt-get.8.xml:422
 msgid "<option>--ignore-hold</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:434
+#: apt-get.8.xml:423
 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 "
@@ -3420,12 +3209,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:440
+#: apt-get.8.xml:429
 msgid "<option>--no-upgrade</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:441
+#: apt-get.8.xml:430
 msgid ""
 "Do not upgrade packages; When used in conjunction with "
 "<literal>install</literal>, <literal>no-upgrade</literal> will prevent "
@@ -3434,12 +3223,26 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:447
+#: apt-get.8.xml:436
+msgid "<option>--only-upgrade</option>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:437
+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:443
 msgid "<option>--force-yes</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:448
+#: apt-get.8.xml:444
 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 "
@@ -3449,12 +3252,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:455
+#: apt-get.8.xml:451
 msgid "<option>--print-uris</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:456
+#: apt-get.8.xml:452
 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 "
@@ -3467,12 +3270,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:466
+#: apt-get.8.xml:462
 msgid "<option>--purge</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:467
+#: apt-get.8.xml:463
 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 "
@@ -3482,24 +3285,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:474
+#: apt-get.8.xml:470
 msgid "<option>--reinstall</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:475
+#: apt-get.8.xml:471
 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:475
 msgid "<option>--list-cleanup</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:480
+#: apt-get.8.xml:476
 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 "
@@ -3510,17 +3313,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:489
+#: apt-get.8.xml:485
 msgid "<option>--target-release</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:490
+#: apt-get.8.xml:486
 msgid "<option>--default-release</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:491
+#: apt-get.8.xml:487
 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 "
@@ -3535,12 +3338,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:504
+#: apt-get.8.xml:500
 msgid "<option>--trivial-only</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:506
+#: apt-get.8.xml:502
 msgid ""
 "Only perform operations that are 'trivial'. Logically this can be considered "
 "related to <option>--assume-yes</option>, where "
@@ -3550,24 +3353,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:512
+#: apt-get.8.xml:508
 msgid "<option>--no-remove</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:513
+#: apt-get.8.xml:509
 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:514
 msgid "<option>--auto-remove</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:519
+#: apt-get.8.xml:515
 msgid ""
 "If the command is either <literal>install</literal> or "
 "<literal>remove</literal>, then this option acts like running "
@@ -3576,12 +3379,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:525
+#: apt-get.8.xml:521
 msgid "<option>--only-source</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:526
+#: apt-get.8.xml:522
 msgid ""
 "Only has meaning for the <literal>source</literal> and "
 "<literal>build-dep</literal> commands.  Indicates that the given source "
@@ -3593,22 +3396,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:536
+#: apt-get.8.xml:532
 msgid "<option>--diff-only</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:536
+#: apt-get.8.xml:532
 msgid "<option>--dsc-only</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:536
+#: apt-get.8.xml:532
 msgid "<option>--tar-only</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:537
+#: apt-get.8.xml:533
 msgid ""
 "Download only the diff, dsc, or tar file of a source archive.  Configuration "
 "Item: <literal>APT::Get::Diff-Only</literal>, "
@@ -3617,24 +3420,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:542
+#: apt-get.8.xml:538
 msgid "<option>--arch-only</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:543
+#: apt-get.8.xml:539
 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:543
 msgid "<option>--allow-unauthenticated</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:548
+#: apt-get.8.xml:544
 msgid ""
 "Ignore if packages can't be authenticated and don't prompt about it.  This "
 "is useful for tools like pbuilder.  Configuration Item: "
@@ -3642,14 +3445,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt-get.8.xml:561
+#: apt-get.8.xml:557
 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:566
 msgid ""
 "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
 "&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, "
@@ -3657,44 +3460,44 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:576
+#: apt-get.8.xml:572
 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:575
 msgid "ORIGINAL AUTHORS"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:580
+#: apt-get.8.xml:576
 msgid "&apt-author.jgunthorpe;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:583
+#: apt-get.8.xml:579
 msgid "CURRENT AUTHORS"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:585
+#: apt-get.8.xml:581
 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><option>--keyring "
 "<replaceable>filename</replaceable></option></arg> "
@@ -3703,7 +3506,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:37
+#: 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 "
@@ -3711,17 +3514,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-key.8.xml:43
+#: apt-key.8.xml:46
 msgid "Commands"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:45
+#: apt-key.8.xml:48
 msgid "add <replaceable>filename</replaceable>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:49
+#: 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 "
@@ -3729,88 +3532,88 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:57
+#: apt-key.8.xml:60
 msgid "del <replaceable>keyid</replaceable>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:61
+#: 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:68
+#: apt-key.8.xml:71
 msgid "export <replaceable>keyid</replaceable>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:72
+#: 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:79
+#: apt-key.8.xml:82
 msgid "exportall"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:83
+#: 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:90
+#: apt-key.8.xml:93
 msgid "list"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:94
+#: apt-key.8.xml:97
 msgid "List trusted keys."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:101
+#: apt-key.8.xml:104
 msgid "finger"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:105
+#: apt-key.8.xml:108
 msgid "List fingerprints of trusted keys."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:112
+#: apt-key.8.xml:115
 msgid "adv"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:116
+#: 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:128
+#: 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."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:140
+#: apt-key.8.xml:143
 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:142
+#: apt-key.8.xml:145
 msgid "--keyring <replaceable>filename</replaceable>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:143
+#: apt-key.8.xml:146
 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 "
@@ -3821,65 +3624,65 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt-key.8.xml:156
+#: apt-key.8.xml:159
 msgid "&file-trustedgpg;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:158
+#: apt-key.8.xml:161
 msgid "<filename>/etc/apt/trustdb.gpg</filename>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:159
+#: apt-key.8.xml:162
 msgid "Local trust database of archive keys."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:162
+#: apt-key.8.xml:165
 msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:163
+#: apt-key.8.xml:166
 msgid "Keyring of Debian archive trusted keys."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:166
+#: apt-key.8.xml:169
 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:167
+#: apt-key.8.xml:170
 msgid "Keyring of Debian archive removed trusted keys."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:176
+#: apt-key.8.xml:179
 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>"
 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 "
@@ -3891,14 +3694,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:53
+#: apt-mark.8.xml:56
 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:60
 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 "
@@ -3908,12 +3711,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:65
+#: apt-mark.8.xml:68
 msgid "markauto"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:66
+#: apt-mark.8.xml:69
 msgid ""
 "<literal>markauto</literal> is used to mark a package as being automatically "
 "installed, which will cause the package to be removed when no more manually "
@@ -3921,12 +3724,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:73
+#: apt-mark.8.xml:76
 msgid "unmarkauto"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:74
+#: apt-mark.8.xml:77
 msgid ""
 "<literal>unmarkauto</literal> is used to mark a package as being manually "
 "installed, which will prevent the package from being automatically removed "
@@ -3934,29 +3737,29 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:81
+#: apt-mark.8.xml:84
 msgid "showauto"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:82
+#: apt-mark.8.xml:85
 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
+#: apt-mark.8.xml:96
 msgid "<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:94
+#: apt-mark.8.xml:97
 msgid "<option>--file=<filename><replaceable>FILENAME</replaceable></filename></option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:97
+#: apt-mark.8.xml:100
 msgid ""
 "Read/Write package stats from "
 "<filename><replaceable>FILENAME</replaceable></filename> instead of the "
@@ -3965,72 +3768,64 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:103
+#: apt-mark.8.xml:106
 msgid "<option>-h</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:104
+#: apt-mark.8.xml:107
 msgid "<option>--help</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:105
+#: apt-mark.8.xml:108
 msgid "Show a short usage summary."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:111
+#: apt-mark.8.xml:114
 msgid "<option>-v</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:112
+#: apt-mark.8.xml:115
 msgid "<option>--version</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:113
+#: apt-mark.8.xml:116
 msgid "Show the program version."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:124
-msgid "<filename>/var/lib/apt/extended_states</filename>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:125
-msgid ""
-"Status list of auto-installed packages.  Configuration Item: "
-"<literal>Dir::State</literal> sets the path to the "
-"<filename>extended_states</filename> file."
+#. type: Content of: <refentry><refsect1><variablelist>
+#: apt-mark.8.xml:127
+msgid "  &file-extended_states;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:134
+#: apt-mark.8.xml:132
 msgid "&apt-get;,&aptitude;,&apt-conf;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:138
+#: apt-mark.8.xml:136
 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 "
@@ -4039,7 +3834,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 "
@@ -4049,19 +3844,19 @@ 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 "
@@ -4072,7 +3867,7 @@ msgid ""
 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 "
@@ -4081,7 +3876,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 "
@@ -4092,7 +3887,7 @@ 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 "
@@ -4103,7 +3898,7 @@ msgid ""
 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 "
@@ -4113,14 +3908,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 "
@@ -4130,7 +3925,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 "
@@ -4139,7 +3934,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 "
@@ -4148,12 +3943,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 "
@@ -4162,7 +3957,7 @@ 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 "
@@ -4173,19 +3968,19 @@ msgid ""
 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 ""
 "<emphasis>Create a toplevel Release file</emphasis>, if it does not exist "
 "already. You can do this by running <command>apt-ftparchive "
@@ -4193,14 +3988,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:165
+#: apt-secure.8.xml:168
 msgid ""
 "<emphasis>Sign it</emphasis>. You can do this by running <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:171
 msgid ""
 "<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 "
@@ -4208,7 +4003,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:175
+#: apt-secure.8.xml:178
 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 "
@@ -4216,14 +4011,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:183
+#: apt-secure.8.xml:186
 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:190
 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 "
@@ -4234,29 +4029,29 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:200
+#: apt-secure.8.xml:203
 msgid "Manpage Authors"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:202
+#: apt-secure.8.xml:205
 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> "
@@ -4265,7 +4060,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 "
@@ -4274,24 +4069,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."
@@ -4299,7 +4094,7 @@ 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 "
@@ -4308,22 +4103,22 @@ msgid ""
 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, but by far not the only place changes to options can be "
@@ -4332,21 +4127,21 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><orderedlist><para>
-#: apt.conf.5.xml:45
+#: 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:47
+#: 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:49
+#: apt.conf.5.xml:52
 msgid ""
 "all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending "
 "order which have no or \"<literal>conf</literal>\" as filename extension and "
@@ -4355,24 +4150,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:54
+#: apt.conf.5.xml:57
 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:56
+#: apt.conf.5.xml:59
 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:60
+#: apt.conf.5.xml:63
 msgid "Syntax"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:61
+#: apt.conf.5.xml:64
 msgid ""
 "The configuration file is organized in a tree with options organized into "
 "functional groups. Option specification is given with a double colon "
@@ -4382,7 +4177,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:67
+#: apt.conf.5.xml:70
 msgid ""
 "Syntactically the configuration language is modeled after what the ISC tools "
 "such as bind and dhcp use. Lines starting with <literal>//</literal> are "
@@ -4398,7 +4193,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><informalexample><programlisting>
-#: apt.conf.5.xml:81
+#: apt.conf.5.xml:84
 #, no-wrap
 msgid ""
 "APT {\n"
@@ -4410,7 +4205,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:89
+#: apt.conf.5.xml:92
 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 "
@@ -4419,13 +4214,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><informalexample><programlisting>
-#: apt.conf.5.xml:94
+#: apt.conf.5.xml:97
 #, no-wrap
 msgid "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:97
+#: apt.conf.5.xml:100
 msgid ""
 "In general the sample configuration file in "
 "<filename>&docdir;examples/apt.conf</filename> &configureindex; is a good "
@@ -4433,14 +4228,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:101
+#: apt.conf.5.xml:104
 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:104
+#: apt.conf.5.xml:107
 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 "
@@ -4450,7 +4245,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:109
+#: apt.conf.5.xml:112
 msgid ""
 "Two specials are allowed, <literal>#include</literal> (which is deprecated "
 "and not supported by alternative implementations) and "
@@ -4462,7 +4257,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:117
+#: apt.conf.5.xml:120
 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 "
@@ -4472,7 +4267,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:122
+#: apt.conf.5.xml:125
 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 "
@@ -4483,7 +4278,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:129
+#: apt.conf.5.xml:132
 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 "
@@ -4500,24 +4295,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:141
+#: apt.conf.5.xml:144
 msgid "The APT Group"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:142
+#: apt.conf.5.xml:145
 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:146
+#: apt.conf.5.xml:149
 msgid "Architecture"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:147
+#: apt.conf.5.xml:150
 msgid ""
 "System Architecture; sets the architecture to use when fetching files and "
 "parsing package lists. The internal default is the architecture apt was "
@@ -4525,38 +4320,38 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:152
+#: apt.conf.5.xml:155
 msgid "Default-Release"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:153
+#: apt.conf.5.xml:156
 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:157
+#: apt.conf.5.xml:161
 msgid "Ignore-Hold"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:158
+#: apt.conf.5.xml:162
 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:162
+#: apt.conf.5.xml:166
 msgid "Clean-Installed"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:163
+#: apt.conf.5.xml:167
 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 "
@@ -4565,12 +4360,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:169
+#: apt.conf.5.xml:173
 msgid "Immediate-Configure"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:170
+#: apt.conf.5.xml:174
 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 "
@@ -4603,12 +4398,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:192
+#: apt.conf.5.xml:196
 msgid "Force-LoopBreak"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:193
+#: apt.conf.5.xml:197
 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 "
@@ -4619,82 +4414,132 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:201
-msgid "Cache-Limit"
+#: apt.conf.5.xml:205
+msgid "Cache-Start, Cache-Grow and Cache-Limit"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:202
+#: apt.conf.5.xml:206
 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:206
+#: apt.conf.5.xml:221
 msgid "Build-Essential"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:207
+#: apt.conf.5.xml:222
 msgid "Defines which package(s) are considered essential build dependencies."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:210
+#: apt.conf.5.xml:225
 msgid "Get"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:211
+#: apt.conf.5.xml:226
 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:215
+#: apt.conf.5.xml:230
 msgid "Cache"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:216
+#: apt.conf.5.xml:231
 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:220
+#: apt.conf.5.xml:235
 msgid "CDROM"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:221
+#: apt.conf.5.xml:236
 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:227
+#: apt.conf.5.xml:242
 msgid "The Acquire Group"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:232
+#: apt.conf.5.xml:247
+msgid "Check-Valid-Until"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:248
+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:258
+msgid "Max-ValidTime"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:259
+msgid ""
+"Seconds the Release file should be considered valid after it was "
+"created. The default is \"for ever\" (0) if the Release file of the archive "
+"doesn't include a <literal>Valid-Until</literal> header.  If it does then "
+"this date is the default. The date from the Release file or the date "
+"specified by the creation time of the Release file (<literal>Date</literal> "
+"header) plus the seconds specified with this options are used to check if "
+"the validation of a file has expired by using the earlier date of the "
+"two. 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:271
 msgid "PDiffs"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:233
+#: apt.conf.5.xml:272
 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:236
+#: apt.conf.5.xml:275
 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 "
@@ -4705,12 +4550,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:245
+#: apt.conf.5.xml:284
 msgid "Queue-Mode"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:246
+#: apt.conf.5.xml:285
 msgid ""
 "Queuing mode; <literal>Queue-Mode</literal> can be one of "
 "<literal>host</literal> or <literal>access</literal> which determines how "
@@ -4720,36 +4565,36 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:253
+#: apt.conf.5.xml:292
 msgid "Retries"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:254
+#: apt.conf.5.xml:293
 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:258
+#: apt.conf.5.xml:297
 msgid "Source-Symlinks"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:259
+#: apt.conf.5.xml:298
 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:263 sources.list.5.xml:139
+#: apt.conf.5.xml:302 sources.list.5.xml:142
 msgid "http"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:264
+#: apt.conf.5.xml:303
 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 "
@@ -4761,7 +4606,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:272
+#: apt.conf.5.xml:311
 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 "
@@ -4775,7 +4620,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:282 apt.conf.5.xml:346
+#: apt.conf.5.xml:321 apt.conf.5.xml:385
 msgid ""
 "The option <literal>timeout</literal> sets the timeout timer used by the "
 "method, this applies to all things including connection timeout and data "
@@ -4783,7 +4628,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:285
+#: apt.conf.5.xml:324
 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).  "
@@ -4795,7 +4640,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:293
+#: apt.conf.5.xml:332
 msgid ""
 "The used bandwidth can be limited with "
 "<literal>Acquire::http::Dl-Limit</literal> which accepts integer values in "
@@ -4805,7 +4650,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:298
+#: apt.conf.5.xml:337
 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 "
@@ -4813,12 +4658,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:304
+#: apt.conf.5.xml:343
 msgid "https"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:305
+#: apt.conf.5.xml:344
 msgid ""
 "HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy "
 "options are the same as for <literal>http</literal> method and will also "
@@ -4828,7 +4673,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:311
+#: apt.conf.5.xml:350
 msgid ""
 "<literal>CaInfo</literal> suboption specifies place of file that holds info "
 "about trusted certificates.  <literal>&lt;host&gt;::CaInfo</literal> is "
@@ -4850,12 +4695,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:329 sources.list.5.xml:150
+#: apt.conf.5.xml:368 sources.list.5.xml:153
 msgid "ftp"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:330
+#: apt.conf.5.xml:369
 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 "
@@ -4875,7 +4720,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:349
+#: apt.conf.5.xml:388
 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 "
@@ -4885,7 +4730,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:356
+#: apt.conf.5.xml:395
 msgid ""
 "It is possible to proxy FTP over HTTP by setting the "
 "<envar>ftp_proxy</envar> environment variable to a http url - see the "
@@ -4895,7 +4740,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:361
+#: apt.conf.5.xml:400
 msgid ""
 "The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
 "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -4905,18 +4750,18 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:368 sources.list.5.xml:132
+#: apt.conf.5.xml:407 sources.list.5.xml:135
 msgid "cdrom"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:374
+#: apt.conf.5.xml:413
 #, no-wrap
 msgid "/cdrom/::Mount \"foo\";"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:369
+#: apt.conf.5.xml:408
 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 "
@@ -4929,12 +4774,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:379
+#: apt.conf.5.xml:418
 msgid "gpgv"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:380
+#: apt.conf.5.xml:419
 msgid ""
 "GPGV URIs; the only option for GPGV URIs is the option to pass additional "
 "parameters to gpgv.  <literal>gpgv::Options</literal> Additional options "
@@ -4942,12 +4787,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:385
+#: apt.conf.5.xml:424
 msgid "CompressionTypes"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:391
+#: apt.conf.5.xml:430
 #, no-wrap
 msgid ""
 "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> "
@@ -4955,7 +4800,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:386
+#: apt.conf.5.xml:425
 msgid ""
 "List of compression types which are understood by the acquire methods.  "
 "Files like <filename>Packages</filename> can be available in various "
@@ -4967,19 +4812,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:396
+#: apt.conf.5.xml:435
 #, no-wrap
 msgid "Acquire::CompressionTypes::Order:: \"gz\";"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:399
+#: apt.conf.5.xml:438
 #, no-wrap
 msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:392
+#: apt.conf.5.xml:431
 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 "
@@ -4996,13 +4841,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:403
+#: apt.conf.5.xml:442
 #, no-wrap
 msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:401
+#: apt.conf.5.xml:440
 msgid ""
 "Note that at run time the "
 "<literal>Dir::Bin::<replaceable>Methodname</replaceable></literal> will be "
@@ -5017,7 +4862,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:408
+#: apt.conf.5.xml:447
 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 "
@@ -5027,12 +4872,26 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:414
+#: apt.conf.5.xml:453
+msgid "GzipIndexes"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:455
+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:462
 msgid "Languages"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:415
+#: apt.conf.5.xml:463
 msgid ""
 "The Languages subsection controls which <filename>Translation</filename> "
 "files are downloaded and in which order APT tries to display the "
@@ -5045,13 +4904,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting>
-#: apt.conf.5.xml:431
+#: apt.conf.5.xml:479
 #, 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:421
+#: apt.conf.5.xml:469
 msgid ""
 "The default list includes \"environment\" and "
 "\"en\". \"<literal>environment</literal>\" has a special meaning here: It "
@@ -5074,7 +4933,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:228
+#: apt.conf.5.xml:243
 msgid ""
 "The <literal>Acquire</literal> group of options controls the download of "
 "packages and the URI handlers.  <placeholder type=\"variablelist\" "
@@ -5082,12 +4941,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:438
+#: apt.conf.5.xml:486
 msgid "Directories"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:440
+#: apt.conf.5.xml:488
 msgid ""
 "The <literal>Dir::State</literal> section has directories that pertain to "
 "local state information. <literal>lists</literal> is the directory to place "
@@ -5099,7 +4958,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:447
+#: apt.conf.5.xml:495
 msgid ""
 "<literal>Dir::Cache</literal> contains locations pertaining to local cache "
 "information, such as the two package caches <literal>srcpkgcache</literal> "
@@ -5112,7 +4971,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:456
+#: apt.conf.5.xml:504
 msgid ""
 "<literal>Dir::Etc</literal> contains the location of configuration files, "
 "<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -5122,7 +4981,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:462
+#: apt.conf.5.xml:510
 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 "
@@ -5130,7 +4989,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:466
+#: apt.conf.5.xml:514
 msgid ""
 "Binary programs are pointed to by "
 "<literal>Dir::Bin</literal>. <literal>Dir::Bin::Methods</literal> specifies "
@@ -5142,7 +5001,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:474
+#: apt.conf.5.xml:522
 msgid ""
 "The configuration item <literal>RootDir</literal> has a special meaning.  If "
 "set, all paths in <literal>Dir::</literal> will be relative to "
@@ -5154,13 +5013,24 @@ msgid ""
 "looked up in <filename>/tmp/staging/var/lib/dpkg/status</filename>."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><para>
+#: apt.conf.5.xml:535
+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:487
+#: apt.conf.5.xml:544
 msgid "APT in DSelect"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:489
+#: apt.conf.5.xml:546
 msgid ""
 "When APT is used as a &dselect; method several configuration directives "
 "control the default behaviour. These are in the <literal>DSelect</literal> "
@@ -5168,12 +5038,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:493
+#: apt.conf.5.xml:550
 msgid "Clean"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:494
+#: apt.conf.5.xml:551
 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 "
@@ -5184,50 +5054,50 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:503
+#: apt.conf.5.xml:560
 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:507
+#: apt.conf.5.xml:564
 msgid "Updateoptions"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:508
+#: apt.conf.5.xml:565
 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:512
+#: apt.conf.5.xml:569
 msgid "PromptAfterUpdate"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:513
+#: apt.conf.5.xml:570
 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:519
+#: apt.conf.5.xml:576
 msgid "How APT calls dpkg"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:520
+#: apt.conf.5.xml:577
 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:525
+#: apt.conf.5.xml:582
 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 "
@@ -5235,17 +5105,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:530
+#: apt.conf.5.xml:587
 msgid "Pre-Invoke"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:530
+#: apt.conf.5.xml:587
 msgid "Post-Invoke"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:531
+#: apt.conf.5.xml:588
 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 "
@@ -5254,12 +5124,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:537
+#: apt.conf.5.xml:594
 msgid "Pre-Install-Pkgs"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:538
+#: apt.conf.5.xml:595
 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 "
@@ -5269,7 +5139,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:544
+#: apt.conf.5.xml:601
 msgid ""
 "Version 2 of this protocol dumps more information, including the protocol "
 "version, the APT configuration space and the packages, files and versions "
@@ -5280,36 +5150,36 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:551
+#: apt.conf.5.xml:608
 msgid "Run-Directory"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:552
+#: apt.conf.5.xml:609
 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:556
+#: apt.conf.5.xml:613
 msgid "Build-options"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:557
+#: apt.conf.5.xml:614
 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:562
+#: apt.conf.5.xml:619
 msgid "dpkg trigger usage (and related options)"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:563
+#: apt.conf.5.xml:620
 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 "
@@ -5324,7 +5194,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:578
+#: apt.conf.5.xml:635
 #, no-wrap
 msgid ""
 "DPkg::NoTriggers \"true\";\n"
@@ -5334,7 +5204,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:572
+#: apt.conf.5.xml:629
 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 "
@@ -5348,12 +5218,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:584
+#: apt.conf.5.xml:641
 msgid "DPkg::NoTriggers"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:585
+#: apt.conf.5.xml:642
 msgid ""
 "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 "
@@ -5365,12 +5235,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:592
+#: apt.conf.5.xml:649
 msgid "PackageManager::Configure"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:593
+#: apt.conf.5.xml:650
 msgid ""
 "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
 "and \"<literal>no</literal>\".  \"<literal>all</literal>\" is the default "
@@ -5387,12 +5257,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:603
+#: apt.conf.5.xml:660
 msgid "DPkg::ConfigurePending"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:604
+#: apt.conf.5.xml:661
 msgid ""
 "If this option is set apt will call <command>dpkg --configure "
 "--pending</command> to let dpkg handle all required configurations and "
@@ -5404,12 +5274,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:610
+#: apt.conf.5.xml:667
 msgid "DPkg::TriggersPending"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:611
+#: apt.conf.5.xml:668
 msgid ""
 "Useful for <literal>smart</literal> configuration as a package which has "
 "pending triggers is not considered as <literal>installed</literal> and dpkg "
@@ -5419,12 +5289,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:616
+#: apt.conf.5.xml:673
 msgid "PackageManager::UnpackAll"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:617
+#: apt.conf.5.xml:674
 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 "
@@ -5436,12 +5306,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:624
+#: apt.conf.5.xml:681
 msgid "OrderList::Score::Immediate"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:632
+#: apt.conf.5.xml:689
 #, no-wrap
 msgid ""
 "OrderList::Score {\n"
@@ -5453,7 +5323,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:625
+#: apt.conf.5.xml:682
 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 "
@@ -5467,12 +5337,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:645
+#: apt.conf.5.xml:702
 msgid "Periodic and Archives options"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:646
+#: apt.conf.5.xml:703
 msgid ""
 "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
 "of options configure behavior of apt periodic updates, which is done by "
@@ -5481,12 +5351,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:654
+#: apt.conf.5.xml:711
 msgid "Debug options"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:656
+#: apt.conf.5.xml:713
 msgid ""
 "Enabling options in the <literal>Debug::</literal> section will cause "
 "debugging information to be sent to the standard error stream of the program "
@@ -5497,7 +5367,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:667
+#: apt.conf.5.xml:724
 msgid ""
 "<literal>Debug::pkgProblemResolver</literal> enables output about the "
 "decisions made by <literal>dist-upgrade, upgrade, install, remove, "
@@ -5505,7 +5375,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:675
+#: apt.conf.5.xml:732
 msgid ""
 "<literal>Debug::NoLocking</literal> disables all file locking.  This can be "
 "used to run some operations (for instance, <literal>apt-get -s "
@@ -5513,7 +5383,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:684
+#: apt.conf.5.xml:741
 msgid ""
 "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
 "time that <literal>apt</literal> invokes &dpkg;."
@@ -5523,110 +5393,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:692
+#: apt.conf.5.xml:749
 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:702
+#: apt.conf.5.xml:759
 msgid "A full list of debugging options to apt follows."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:707
+#: apt.conf.5.xml:764
 msgid "<literal>Debug::Acquire::cdrom</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:711
+#: apt.conf.5.xml:768
 msgid "Print information related to accessing <literal>cdrom://</literal> sources."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:718
+#: apt.conf.5.xml:775
 msgid "<literal>Debug::Acquire::ftp</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:722
+#: apt.conf.5.xml:779
 msgid "Print information related to downloading packages using FTP."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:729
+#: apt.conf.5.xml:786
 msgid "<literal>Debug::Acquire::http</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:733
+#: apt.conf.5.xml:790
 msgid "Print information related to downloading packages using HTTP."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:740
+#: apt.conf.5.xml:797
 msgid "<literal>Debug::Acquire::https</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:744
+#: apt.conf.5.xml:801
 msgid "Print information related to downloading packages using HTTPS."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:751
+#: apt.conf.5.xml:808
 msgid "<literal>Debug::Acquire::gpgv</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:755
+#: apt.conf.5.xml:812
 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:762
+#: apt.conf.5.xml:819
 msgid "<literal>Debug::aptcdrom</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:766
+#: apt.conf.5.xml:823
 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:773
+#: apt.conf.5.xml:830
 msgid "<literal>Debug::BuildDeps</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:776
+#: apt.conf.5.xml:833
 msgid "Describes the process of resolving build-dependencies in &apt-get;."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:783
+#: apt.conf.5.xml:840
 msgid "<literal>Debug::Hashes</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:786
+#: apt.conf.5.xml:843
 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:793
+#: apt.conf.5.xml:850
 msgid "<literal>Debug::IdentCDROM</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:796
+#: apt.conf.5.xml:853
 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 "
@@ -5634,92 +5504,92 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:804
+#: apt.conf.5.xml:861
 msgid "<literal>Debug::NoLocking</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:807
+#: apt.conf.5.xml:864
 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:815
+#: apt.conf.5.xml:872
 msgid "<literal>Debug::pkgAcquire</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:819
+#: apt.conf.5.xml:876
 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:826
+#: apt.conf.5.xml:883
 msgid "<literal>Debug::pkgAcquire::Auth</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:829
+#: apt.conf.5.xml:886
 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:836
+#: apt.conf.5.xml:893
 msgid "<literal>Debug::pkgAcquire::Diffs</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:839
+#: apt.conf.5.xml:896
 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:847
+#: apt.conf.5.xml:904
 msgid "<literal>Debug::pkgAcquire::RRed</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:851
+#: apt.conf.5.xml:908
 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:858
+#: apt.conf.5.xml:915
 msgid "<literal>Debug::pkgAcquire::Worker</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:862
+#: apt.conf.5.xml:919
 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:869
+#: apt.conf.5.xml:926
 msgid "<literal>Debug::pkgAutoRemove</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:873
+#: apt.conf.5.xml:930
 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:880
+#: apt.conf.5.xml:937
 msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:883
+#: apt.conf.5.xml:940
 msgid ""
 "Generate debug messages describing which packages are being automatically "
 "installed to resolve dependencies.  This corresponds to the initial "
@@ -5729,12 +5599,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:894
+#: apt.conf.5.xml:951
 msgid "<literal>Debug::pkgDepCache::Marker</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:897
+#: apt.conf.5.xml:954
 msgid ""
 "Generate debug messages describing which package is marked as "
 "keep/install/remove while the ProblemResolver does his work.  Each addition "
@@ -5752,90 +5622,90 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:916
+#: apt.conf.5.xml:973
 msgid "<literal>Debug::pkgInitConfig</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:919
+#: apt.conf.5.xml:976
 msgid "Dump the default configuration to standard error on startup."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:926
+#: apt.conf.5.xml:983
 msgid "<literal>Debug::pkgDPkgPM</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:929
+#: apt.conf.5.xml:986
 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:937
+#: apt.conf.5.xml:994
 msgid "<literal>Debug::pkgDPkgProgressReporting</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:940
+#: apt.conf.5.xml:997
 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:947
+#: apt.conf.5.xml:1004
 msgid "<literal>Debug::pkgOrderList</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:951
+#: apt.conf.5.xml:1008
 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:959
+#: apt.conf.5.xml:1016
 msgid "<literal>Debug::pkgPackageManager</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:963
+#: apt.conf.5.xml:1020
 msgid "Output status messages tracing the steps performed when invoking &dpkg;."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:970
+#: apt.conf.5.xml:1027
 msgid "<literal>Debug::pkgPolicy</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:974
+#: apt.conf.5.xml:1031
 msgid "Output the priority of each package list on startup."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:980
+#: apt.conf.5.xml:1037
 msgid "<literal>Debug::pkgProblemResolver</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:984
+#: apt.conf.5.xml:1041
 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:992
+#: apt.conf.5.xml:1049
 msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:995
+#: apt.conf.5.xml:1052
 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 "
@@ -5843,53 +5713,53 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1003
+#: apt.conf.5.xml:1060
 msgid "<literal>Debug::sourceList</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1007
+#: apt.conf.5.xml:1064
 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:1030
+#: apt.conf.5.xml:1087
 msgid ""
 "&configureindex; is a configuration file showing example values for all "
 "possible options."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt.conf.5.xml:1037
+#: apt.conf.5.xml:1094
 msgid "&file-aptconf;"
 msgstr ""
 
 #.  ? reading apt.conf 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1042
+#: apt.conf.5.xml:1099
 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 "
@@ -5898,7 +5768,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 "
@@ -5911,7 +5781,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 "
@@ -5921,7 +5791,21 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:56
+#: 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 "
@@ -5932,12 +5816,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:63
+#: apt_preferences.5.xml:77
 msgid "APT's Default Priority Assignments"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:78
+#: apt_preferences.5.xml:92
 #, no-wrap
 msgid ""
 "<command>apt-get install -t testing "
@@ -5945,13 +5829,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:81
+#: apt_preferences.5.xml:95
 #, no-wrap
 msgid "APT::Default-Release \"stable\";\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:65
+#: apt_preferences.5.xml:79
 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 "
@@ -5968,39 +5852,52 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:90
+#: apt_preferences.5.xml:104
+msgid "priority 1"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
+#: apt_preferences.5.xml:105
+msgid ""
+"to the versions coming from archives which in their "
+"<filename>Release</filename> files are marked as \"NotAutomatic: yes\" like "
+"the debian experimental archive."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
+#: apt_preferences.5.xml:110
 msgid "priority 100"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:91
+#: apt_preferences.5.xml:111
 msgid "to the version that is already installed (if any)."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:95
+#: apt_preferences.5.xml:115
 msgid "priority 500"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:96
+#: apt_preferences.5.xml:116
 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:100
+#: apt_preferences.5.xml:120
 msgid "priority 990"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:101
+#: apt_preferences.5.xml:121
 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:85
+#: apt_preferences.5.xml:99
 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: "
@@ -6008,22 +5905,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:106
+#: apt_preferences.5.xml:126
 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, expect versions coming from archives which in "
+"their <filename>Release</filename> files are marked as \"NotAutomatic: yes\" "
+"- these versions get the priority 1."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:110
+#: apt_preferences.5.xml:132
 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:113
+#: apt_preferences.5.xml:135
 msgid ""
 "Never downgrade unless the priority of an available version exceeds 1000.  "
 "(\"Downgrading\" is installing a less recent version of a package in place "
@@ -6033,19 +5932,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:119
+#: apt_preferences.5.xml:141
 msgid "Install the highest priority version."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:120
+#: apt_preferences.5.xml:142
 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:123
+#: apt_preferences.5.xml:145
 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 "
@@ -6053,7 +5952,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:129
+#: apt_preferences.5.xml:151
 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 "
@@ -6064,7 +5963,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:136
+#: apt_preferences.5.xml:158
 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 "
@@ -6074,7 +5973,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:141
+#: apt_preferences.5.xml:163
 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 "
@@ -6086,12 +5985,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:150
+#: apt_preferences.5.xml:172
 msgid "The Effect of APT Preferences"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:152
+#: apt_preferences.5.xml:174
 msgid ""
 "The APT preferences file allows the system administrator to control the "
 "assignment of priorities.  The file consists of one or more multi-line "
@@ -6100,7 +5999,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:158
+#: apt_preferences.5.xml:180
 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 "
@@ -6110,7 +6009,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:165
+#: apt_preferences.5.xml:187
 #, no-wrap
 msgid ""
 "Package: perl\n"
@@ -6119,7 +6018,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:171
+#: apt_preferences.5.xml:193
 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 "
@@ -6129,7 +6028,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:177
+#: apt_preferences.5.xml:199
 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 "
@@ -6137,7 +6036,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:182
+#: apt_preferences.5.xml:204
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -6146,17 +6045,35 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:187
+#: apt_preferences.5.xml:209
+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:213
+#, no-wrap
 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\"."
+"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:193
+#: apt_preferences.5.xml:217
+msgid ""
+"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:222
 msgid ""
 "The following record assigns a low priority to all package versions "
 "belonging to any distribution whose Archive name is "
@@ -6164,7 +6081,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:197
+#: apt_preferences.5.xml:226
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -6173,24 +6090,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:202
+#: apt_preferences.5.xml:231
 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:206
+#: apt_preferences.5.xml:235
 #, 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:211
+#: apt_preferences.5.xml:240
 msgid ""
 "The following record assigns a high priority to all package versions "
 "belonging to any release whose Archive name is \"<literal>stable</literal>\" "
@@ -6198,7 +6115,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:216
+#: apt_preferences.5.xml:245
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -6207,82 +6124,82 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:227
+#: apt_preferences.5.xml:256
 msgid "How APT Interprets Priorities"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:235
+#: apt_preferences.5.xml:264
 msgid "P &gt; 1000"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:236
+#: apt_preferences.5.xml:265
 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:240
+#: apt_preferences.5.xml:269
 msgid "990 &lt; P &lt;=1000"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:241
+#: apt_preferences.5.xml:270
 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:246
+#: apt_preferences.5.xml:275
 msgid "500 &lt; P &lt;=990"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:247
+#: apt_preferences.5.xml:276
 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:252
+#: apt_preferences.5.xml:281
 msgid "100 &lt; P &lt;=500"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:253
+#: apt_preferences.5.xml:282
 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:258
+#: apt_preferences.5.xml:287
 msgid "0 &lt; P &lt;=100"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:259
+#: apt_preferences.5.xml:288
 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:263
+#: apt_preferences.5.xml:292
 msgid "P &lt; 0"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:264
+#: apt_preferences.5.xml:293
 msgid "prevents the version from being installed"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:230
+#: apt_preferences.5.xml:259
 msgid ""
 "Priorities (P) assigned in the APT preferences file must be positive or "
 "negative integers.  They are interpreted as follows (roughly speaking): "
@@ -6290,7 +6207,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:269
+#: apt_preferences.5.xml:298
 msgid ""
 "If any specific-form records match an available package version then the "
 "first such record determines the priority of the package version.  Failing "
@@ -6299,14 +6216,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:275
+#: apt_preferences.5.xml:304
 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:279
+#: apt_preferences.5.xml:308
 #, no-wrap
 msgid ""
 "Package: perl\n"
@@ -6323,12 +6240,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:292
+#: apt_preferences.5.xml:321
 msgid "Then:"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:294
+#: apt_preferences.5.xml:323
 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 "
@@ -6338,7 +6255,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:299
+#: apt_preferences.5.xml:328
 msgid ""
 "A version of any package other than <literal>perl</literal> that is "
 "available from the local system has priority over other versions, even "
@@ -6346,7 +6263,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:303
+#: apt_preferences.5.xml:332
 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 "
@@ -6355,12 +6272,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:313
+#: apt_preferences.5.xml:342
 msgid "Determination of Package Version and Distribution Properties"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:315
+#: apt_preferences.5.xml:344
 msgid ""
 "The locations listed in the &sources-list; file should provide "
 "<filename>Packages</filename> and <filename>Release</filename> files to "
@@ -6368,27 +6285,27 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:327
+#: apt_preferences.5.xml:356
 msgid "the <literal>Package:</literal> line"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:328
+#: apt_preferences.5.xml:357
 msgid "gives the package name"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:331 apt_preferences.5.xml:381
+#: apt_preferences.5.xml:360 apt_preferences.5.xml:410
 msgid "the <literal>Version:</literal> line"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:332
+#: apt_preferences.5.xml:361
 msgid "gives the version number for the named package"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:319
+#: apt_preferences.5.xml:348
 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>: "
@@ -6400,12 +6317,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:348
+#: apt_preferences.5.xml:377
 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:349
+#: apt_preferences.5.xml:378
 msgid ""
 "names the archive to which all the packages in the directory tree belong.  "
 "For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@ -6416,35 +6333,35 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:359
+#: apt_preferences.5.xml:388
 #, no-wrap
 msgid "Pin: release a=stable\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:365
+#: apt_preferences.5.xml:394
 msgid "the <literal>Codename:</literal> line"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:366
+#: apt_preferences.5.xml:395
 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:375
+#: apt_preferences.5.xml:404
 #, 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:382
+#: apt_preferences.5.xml:411
 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 "
@@ -6455,7 +6372,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:391
+#: apt_preferences.5.xml:420
 #, no-wrap
 msgid ""
 "Pin: release v=3.0\n"
@@ -6464,12 +6381,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:400
+#: apt_preferences.5.xml:429
 msgid "the <literal>Component:</literal> line"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:401
+#: apt_preferences.5.xml:430
 msgid ""
 "names the licensing component associated with the packages in the directory "
 "tree of the <filename>Release</filename> file.  For example, the line "
@@ -6481,18 +6398,18 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:410
+#: apt_preferences.5.xml:439
 #, no-wrap
 msgid "Pin: release c=main\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:416
+#: apt_preferences.5.xml:445
 msgid "the <literal>Origin:</literal> line"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:417
+#: apt_preferences.5.xml:446
 msgid ""
 "names the originator of the packages in the directory tree of the "
 "<filename>Release</filename> file.  Most commonly, this is "
@@ -6501,18 +6418,18 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:423
+#: apt_preferences.5.xml:452
 #, no-wrap
 msgid "Pin: release o=Debian\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:429
+#: apt_preferences.5.xml:458
 msgid "the <literal>Label:</literal> line"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:430
+#: apt_preferences.5.xml:459
 msgid ""
 "names the label of the packages in the directory tree of the "
 "<filename>Release</filename> file.  Most commonly, this is "
@@ -6521,27 +6438,27 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:436
+#: apt_preferences.5.xml:465
 #, no-wrap
 msgid "Pin: release l=Debian\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:337
+#: apt_preferences.5.xml:366
 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:443
+#: apt_preferences.5.xml:472
 msgid ""
 "All of the <filename>Packages</filename> and <filename>Release</filename> "
 "files retrieved from locations listed in the &sources-list; file are stored "
@@ -6556,34 +6473,25 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:456
+#: apt_preferences.5.xml:485
 msgid "Optional Lines in an APT Preferences Record"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:458
+#: apt_preferences.5.xml:487
 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:462
-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:471
+#: apt_preferences.5.xml:496
 msgid "Tracking Stable"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:479
+#: apt_preferences.5.xml:504
 #, no-wrap
 msgid ""
 "Explanation: Uninstall or do not install any Debian-originated\n"
@@ -6598,7 +6506,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:473
+#: apt_preferences.5.xml:498
 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 "
@@ -6608,7 +6516,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:496 apt_preferences.5.xml:542 apt_preferences.5.xml:600
+#: apt_preferences.5.xml:521 apt_preferences.5.xml:567 apt_preferences.5.xml:625
 #, no-wrap
 msgid ""
 "apt-get install <replaceable>package-name</replaceable>\n"
@@ -6617,7 +6525,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:491
+#: apt_preferences.5.xml:516
 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 "
@@ -6626,13 +6534,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:508
+#: apt_preferences.5.xml:533
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/testing\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:502
+#: apt_preferences.5.xml:527
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>testing</literal> distribution; the package "
@@ -6641,12 +6549,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:514
+#: apt_preferences.5.xml:539
 msgid "Tracking Testing or Unstable"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:523
+#: apt_preferences.5.xml:548
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -6663,7 +6571,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:516
+#: apt_preferences.5.xml:541
 msgid ""
 "The following APT preferences file will cause APT to assign a high priority "
 "to package versions from the <literal>testing</literal> distribution, a "
@@ -6674,7 +6582,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:537
+#: apt_preferences.5.xml:562
 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 "
@@ -6683,13 +6591,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:557
+#: apt_preferences.5.xml:582
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:548
+#: apt_preferences.5.xml:573
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>unstable</literal> distribution.  "
@@ -6701,25 +6609,25 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:564
+#: apt_preferences.5.xml:589
 msgid "Tracking the evolution of a codename release"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:578
+#: apt_preferences.5.xml:603
 #, 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"
@@ -6728,7 +6636,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:566
+#: apt_preferences.5.xml:591
 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 "
@@ -6743,54 +6651,54 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:595
+#: apt_preferences.5.xml:620
 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:615
+#: apt_preferences.5.xml:640
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/sid\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:606
+#: apt_preferences.5.xml:631
 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:624
+#: apt_preferences.5.xml:649
 msgid "&file-preferences;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:630
+#: apt_preferences.5.xml:655
 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 "
@@ -6799,7 +6707,7 @@ msgid ""
 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 "
@@ -6812,12 +6720,12 @@ msgid ""
 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 "
@@ -6828,12 +6736,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:60
+#: sources.list.5.xml:63
 msgid "The deb and deb-src types"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:61
+#: sources.list.5.xml:64
 msgid ""
 "The <literal>deb</literal> type describes a typical two-level Debian "
 "archive, <filename>distribution/component</filename>. Typically, "
@@ -6848,20 +6756,20 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:73
+#: sources.list.5.xml:76
 msgid ""
 "The format for a <filename>sources.list</filename> entry using the "
 "<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:79
 #, no-wrap
 msgid "deb uri distribution [component1] [component2] [...]"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:78
+#: sources.list.5.xml:81
 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.  "
@@ -6874,7 +6782,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:87
+#: sources.list.5.xml:90
 msgid ""
 "<literal>distribution</literal> may also contain a variable, "
 "<literal>$(ARCH)</literal> which expands to the Debian architecture (i386, "
@@ -6886,7 +6794,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:95
+#: sources.list.5.xml:98
 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 "
@@ -6901,7 +6809,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:107
+#: sources.list.5.xml:110
 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 "
@@ -6910,31 +6818,32 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:112
+#: sources.list.5.xml:115
 msgid "Some examples:"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:114
+#: sources.list.5.xml:117
 #, 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:123
 msgid "URI specification"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:125
+#: sources.list.5.xml:128
 msgid "file"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:127
+#: sources.list.5.xml:130
 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 "
@@ -6942,7 +6851,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:134
+#: sources.list.5.xml:137
 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 "
@@ -6950,7 +6859,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:141
+#: sources.list.5.xml:144
 msgid ""
 "The http scheme specifies an HTTP server for the archive. If an environment "
 "variable <envar>http_proxy</envar> is set with the format "
@@ -6961,7 +6870,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:152
+#: sources.list.5.xml:155
 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 "
@@ -6973,12 +6882,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:161
+#: sources.list.5.xml:164
 msgid "copy"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:163
+#: sources.list.5.xml:166
 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.  "
@@ -6986,17 +6895,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:168
+#: sources.list.5.xml:171
 msgid "rsh"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:168
+#: sources.list.5.xml:171
 msgid "ssh"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:170
+#: sources.list.5.xml:173
 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 "
@@ -7006,12 +6915,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:178
+#: sources.list.5.xml:181
 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:183
 msgid ""
 "APT can be extended with more methods shipped in other optional packages "
 "which should follow the nameing scheme "
@@ -7025,75 +6934,75 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:122
+#: sources.list.5.xml:125
 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:197
 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:199
 #, 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:201
 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:202
 #, 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:204
 msgid "Source line for the above"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:202
+#: sources.list.5.xml:205
 #, 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:207
 msgid ""
 "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:206
+#: sources.list.5.xml:209
 #, no-wrap
 msgid "deb http://archive.debian.org/debian-archive hamm main"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:208
+#: sources.list.5.xml:211
 msgid ""
 "Uses FTP to access the archive at ftp.debian.org, under the debian "
-"directory, and uses only the stable/contrib area."
+"directory, and uses only the &stable-codename;/contrib area."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:210
+#: sources.list.5.xml:213
 #, no-wrap
-msgid "deb ftp://ftp.debian.org/debian stable contrib"
+msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:212
+#: sources.list.5.xml:215
 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 "
@@ -7102,20 +7011,20 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:216
+#: sources.list.5.xml:219
 #, no-wrap
 msgid "deb ftp://ftp.debian.org/debian unstable contrib"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:218
+#: sources.list.5.xml:221
 msgid ""
 "Uses HTTP to access the archive at nonus.debian.org, under the debian-non-US "
 "directory."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:220
+#: sources.list.5.xml:223
 #, no-wrap
 msgid ""
 "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib "
@@ -7123,13 +7032,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:229
+#: sources.list.5.xml:232
 #, no-wrap
 msgid "deb http://ftp.de.debian.org/debian-non-US unstable/binary-$(ARCH)/"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:222
+#: sources.list.5.xml:225
 msgid ""
 "Uses HTTP to access the archive at nonus.debian.org, under the debian-non-US "
 "directory, and uses only files found under "
@@ -7141,7 +7050,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:234
+#: sources.list.5.xml:237
 msgid "&apt-cache; &apt-conf;"
 msgstr ""