Merge branch 'debian/sid' into ubuntu/master

Conflicts:
	configure.ac
	debian/changelog
	doc/apt-verbatim.ent
	doc/po/apt-doc.pot
	doc/po/de.po
	doc/po/es.po
	doc/po/fr.po
	doc/po/it.po
	doc/po/ja.po
	doc/po/pl.po
	doc/po/pt.po
	doc/po/pt_BR.po
	po/apt-all.pot
	po/ar.po
	po/ast.po
	po/bg.po
	po/bs.po
	po/ca.po
	po/cs.po
	po/cy.po
	po/da.po
	po/de.po
	po/dz.po
	po/el.po
	po/es.po
	po/eu.po
	po/fi.po
	po/fr.po
	po/gl.po
	po/hu.po
	po/it.po
	po/ja.po
	po/km.po
	po/ko.po
	po/ku.po
	po/lt.po
	po/mr.po
	po/nb.po
	po/ne.po
	po/nl.po
	po/nn.po
	po/pl.po
	po/pt.po
	po/pt_BR.po
	po/ro.po
	po/ru.po
	po/sk.po
	po/sl.po
	po/sv.po
	po/th.po
	po/tl.po
	po/tr.po
	po/uk.po
	po/vi.po
	po/zh_CN.po
	po/zh_TW.po

9 files changed, 12530 insertions, 12359 deletions

diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index 7a51f0ab5..83e1de724 100644
--- a/doc/po/apt-doc.pot
+++ b/doc/po/apt-doc.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: apt-doc 1.0.4ubuntu1\n"
+"Project-Id-Version: apt-doc 1.0.8\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-11 14:52+0200\n"
+"POT-Creation-Date: 2014-09-09 20:35+0200\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"
@@ -497,27 +497,27 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refmeta><manvolnum>
-#: apt.8.xml:25 apt-get.8.xml:28 apt-cache.8.xml:28 apt-key.8.xml:27 apt-mark.8.xml:28 apt-secure.8.xml:27 apt-cdrom.8.xml:27 apt-config.8.xml:28
+#: apt.8.xml:21 apt-get.8.xml:22 apt-cache.8.xml:22 apt-key.8.xml:21 apt-mark.8.xml:22 apt-secure.8.xml:21 apt-cdrom.8.xml:21 apt-config.8.xml:22
 msgid "8"
 msgstr ""
 
 #. type: Content of: <refentry><refmeta><refmiscinfo>
-#: apt.8.xml:26 apt-get.8.xml:29 apt-cache.8.xml:29 apt-key.8.xml:28 apt-mark.8.xml:29 apt-secure.8.xml:28 apt-cdrom.8.xml:28 apt-config.8.xml:29 apt.conf.5.xml:34 apt_preferences.5.xml:28 sources.list.5.xml:29 apt-extracttemplates.1.xml:29 apt-sortpkgs.1.xml:29 apt-ftparchive.1.xml:29
+#: apt.8.xml:22 apt-get.8.xml:23 apt-cache.8.xml:23 apt-key.8.xml:22 apt-mark.8.xml:23 apt-secure.8.xml:22 apt-cdrom.8.xml:22 apt-config.8.xml:23 apt.conf.5.xml:28 apt_preferences.5.xml:22 sources.list.5.xml:23 apt-extracttemplates.1.xml:23 apt-sortpkgs.1.xml:23 apt-ftparchive.1.xml:23
 msgid "APT"
 msgstr ""
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt.8.xml:32
+#: apt.8.xml:28
 msgid "command-line interface"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:37 apt-get.8.xml:40 apt-cache.8.xml:40 apt-key.8.xml:39 apt-mark.8.xml:40 apt-secure.8.xml:52 apt-cdrom.8.xml:39 apt-config.8.xml:40 apt.conf.5.xml:43 apt_preferences.5.xml:38 sources.list.5.xml:38 apt-extracttemplates.1.xml:40 apt-sortpkgs.1.xml:40 apt-ftparchive.1.xml:40
+#: apt.8.xml:33 apt-get.8.xml:34 apt-cache.8.xml:34 apt-key.8.xml:33 apt-mark.8.xml:34 apt-secure.8.xml:46 apt-cdrom.8.xml:33 apt-config.8.xml:34 apt.conf.5.xml:37 apt_preferences.5.xml:32 sources.list.5.xml:32 apt-extracttemplates.1.xml:34 apt-sortpkgs.1.xml:34 apt-ftparchive.1.xml:34
 msgid "Description"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:38
+#: apt.8.xml:34
 msgid ""
 "<command>apt</command> (Advanced Package Tool) is the command-line tool for "
 "handling packages. It provides a commandline interface for the package "
@@ -526,7 +526,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:47
+#: apt.8.xml:43
 msgid ""
 "<literal>list</literal> is used to display a list of packages. It supports "
 "shell pattern for matching package names and the following options: "
@@ -535,28 +535,28 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:58
+#: apt.8.xml:54
 msgid ""
 "<literal>search</literal> searches for the given term(s) and display "
 "matching packages."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:64
+#: apt.8.xml:60
 msgid ""
 "<literal>show</literal> shows the package information for the given "
 "package(s)."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:71
+#: apt.8.xml:67
 msgid ""
 "<literal>install</literal> is followed by one or more package names desired "
 "for installation or upgrading."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:75 apt-get.8.xml:118
+#: apt.8.xml:71 apt-get.8.xml:112
 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 "
@@ -567,7 +567,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:85 apt-get.8.xml:153
+#: apt.8.xml:81 apt-get.8.xml:147
 msgid ""
 "<literal>remove</literal> is identical to <literal>install</literal> except "
 "that packages are removed instead of installed. Note that removing a package "
@@ -577,30 +577,30 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:93
+#: apt.8.xml:89
 msgid ""
 "<literal>edit-sources</literal> lets you edit your sources.list file and "
 "provides basic sanity checks."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:99
+#: apt.8.xml:95
 msgid ""
 "<literal>update</literal> is used to resynchronize the package index files "
 "from their sources."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:105
+#: apt.8.xml:101
 msgid ""
 "<literal>upgrade</literal> is used to install the newest versions of all "
 "packages currently installed on the system from the sources enumerated in "
-"<filename>/etc/apt/sources.list</filename>. New package will be installed, "
-"but existing package will never removed."
+"<filename>/etc/apt/sources.list</filename>. New packages will be installed, "
+"but existing packages will never be removed."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:114
+#: apt.8.xml:110
 msgid ""
 "<literal>full-upgrade</literal> performs the function of upgrade but may "
 "also remove installed packages if that is required in order to resolve a "
@@ -608,17 +608,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:124 apt-get.8.xml:257 apt-cache.8.xml:250 apt-mark.8.xml:110 apt-config.8.xml:86 apt-extracttemplates.1.xml:54 apt-sortpkgs.1.xml:50 apt-ftparchive.1.xml:506
+#: apt.8.xml:120 apt-get.8.xml:251 apt-cache.8.xml:244 apt-mark.8.xml:104 apt-config.8.xml:80 apt-extracttemplates.1.xml:48 apt-sortpkgs.1.xml:44 apt-ftparchive.1.xml:500
 msgid "options"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:134
+#: apt.8.xml:130
 msgid "Script usage"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:136
+#: apt.8.xml:132
 msgid ""
 "The &apt; commandline is designed as a end-user tool and it may change the "
 "output between versions. While it tries to not break backward compatibility "
@@ -628,12 +628,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:144
+#: apt.8.xml:140
 msgid "Differences to &apt-get;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:145
+#: apt.8.xml:141
 msgid ""
 "The <command>apt</command> command is meant to be pleasant for end users and "
 "does not need to be backward compatible like &apt-get;. Therefore some "
@@ -641,60 +641,60 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml:151
+#: apt.8.xml:147
 msgid "The option <literal>DPkg::Progress-Fancy</literal> is enabled."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml:155
+#: apt.8.xml:151
 msgid "The option <literal>APT::Color</literal> is enabled."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml:159
+#: apt.8.xml:155
 msgid ""
 "A new <literal>list</literal> command is available similar to <literal>dpkg "
 "--list</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml:164
+#: apt.8.xml:160
 msgid ""
 "The option <literal>upgrade</literal> has <literal>--with-new-pkgs</literal> "
 "enabled by default."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:174 apt-get.8.xml:558 apt-cache.8.xml:352 apt-key.8.xml:197 apt-mark.8.xml:133 apt-secure.8.xml:193 apt-cdrom.8.xml:154 apt-config.8.xml:111 apt.conf.5.xml:1227 apt_preferences.5.xml:707 sources.list.5.xml:280 apt-extracttemplates.1.xml:72 apt-sortpkgs.1.xml:65 apt-ftparchive.1.xml:609
+#: apt.8.xml:170 apt-get.8.xml:552 apt-cache.8.xml:346 apt-key.8.xml:191 apt-mark.8.xml:127 apt-secure.8.xml:187 apt-cdrom.8.xml:148 apt-config.8.xml:105 apt.conf.5.xml:1222 apt_preferences.5.xml:701 sources.list.5.xml:274 apt-extracttemplates.1.xml:66 apt-sortpkgs.1.xml:59 apt-ftparchive.1.xml:603
 msgid "See Also"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:175
+#: apt.8.xml:171
 msgid ""
 "&apt-get;, &apt-cache;, &sources-list;, &apt-conf;, &apt-config;, The APT "
 "User's guide in &guidesdir;, &apt-preferences;, the APT Howto."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:180 apt-get.8.xml:564 apt-cache.8.xml:357 apt-mark.8.xml:137 apt-cdrom.8.xml:159 apt-config.8.xml:116 apt-extracttemplates.1.xml:76 apt-sortpkgs.1.xml:69 apt-ftparchive.1.xml:613
+#: apt.8.xml:176 apt-get.8.xml:558 apt-cache.8.xml:351 apt-mark.8.xml:131 apt-cdrom.8.xml:153 apt-config.8.xml:110 apt-extracttemplates.1.xml:70 apt-sortpkgs.1.xml:63 apt-ftparchive.1.xml:607
 msgid "Diagnostics"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:181
+#: apt.8.xml:177
 msgid ""
 "<command>apt</command> returns zero on normal operation, decimal 100 on "
 "error."
 msgstr ""
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-get.8.xml:35
+#: apt-get.8.xml:29
 msgid "APT package handling utility -- command-line interface"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:41
+#: apt-get.8.xml:35
 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 "
@@ -703,14 +703,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:46 apt-cache.8.xml:46 apt-cdrom.8.xml:53 apt-config.8.xml:46 apt-ftparchive.1.xml:56
+#: apt-get.8.xml:40 apt-cache.8.xml:40 apt-cdrom.8.xml:47 apt-config.8.xml:40 apt-ftparchive.1.xml:50
 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><listitem><para>
-#: apt-get.8.xml:51
+#: apt-get.8.xml:45
 msgid ""
 "<literal>update</literal> is used to resynchronize the package index files "
 "from their sources. The indexes of available packages are fetched from the "
@@ -725,7 +725,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:63
+#: apt-get.8.xml:57
 msgid ""
 "<literal>upgrade</literal> is used to install the newest versions of all "
 "packages currently installed on the system from the sources enumerated in "
@@ -741,7 +741,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:76
+#: apt-get.8.xml:70
 msgid ""
 "<literal>dist-upgrade</literal> in addition to performing the function of "
 "<literal>upgrade</literal>, also intelligently handles changing dependencies "
@@ -756,7 +756,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:89
+#: apt-get.8.xml:83
 msgid ""
 "<literal>dselect-upgrade</literal> is used in conjunction with the "
 "traditional Debian packaging front-end, "
@@ -767,7 +767,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:100
+#: apt-get.8.xml:94
 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 "
@@ -784,14 +784,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:125
+#: apt-get.8.xml:119
 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:128
+#: apt-get.8.xml:122
 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 "
@@ -803,14 +803,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:139
+#: apt-get.8.xml:133
 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:143
+#: apt-get.8.xml:137
 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 "
@@ -822,7 +822,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:161
+#: apt-get.8.xml:155
 msgid ""
 "<literal>purge</literal> is identical to <literal>remove</literal> except "
 "that packages are removed and purged (any configuration files are deleted "
@@ -830,7 +830,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:166
+#: apt-get.8.xml:160
 msgid ""
 "<literal>source</literal> causes <command>apt-get</command> to fetch source "
 "packages. APT will examine the available packages to decide which source "
@@ -842,7 +842,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:174
+#: apt-get.8.xml:168
 msgid ""
 "Source packages are tracked separately from binary packages via "
 "<literal>deb-src</literal> lines in the &sources-list; file. This means that "
@@ -852,7 +852,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:180
+#: apt-get.8.xml:174
 msgid ""
 "If the <option>--compile</option> option is specified then the package will "
 "be compiled to a binary .deb using <command>dpkg-buildpackage</command> for "
@@ -862,7 +862,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:187
+#: apt-get.8.xml:181
 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 "
@@ -872,7 +872,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:193
+#: apt-get.8.xml:187
 msgid ""
 "Note that source packages are not installed and tracked in the "
 "<command>dpkg</command> database like binary packages; they are simply "
@@ -880,7 +880,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:199
+#: apt-get.8.xml:193
 msgid ""
 "<literal>build-dep</literal> causes apt-get to install/remove packages in an "
 "attempt to satisfy the build dependencies for a source package. By default "
@@ -890,21 +890,21 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:206
+#: apt-get.8.xml:200
 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:211
+#: apt-get.8.xml:205
 msgid ""
 "<literal>download</literal> will download the given binary package into the "
 "current directory."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:217
+#: apt-get.8.xml:211
 msgid ""
 "<literal>clean</literal> clears out the local repository of retrieved "
 "package files. It removes everything but the lock file from "
@@ -913,7 +913,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:224
+#: apt-get.8.xml:218
 msgid ""
 "Like <literal>clean</literal>, <literal>autoclean</literal> clears out the "
 "local repository of retrieved package files. The difference is that it only "
@@ -925,7 +925,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:234
+#: apt-get.8.xml:228
 msgid ""
 "<literal>autoremove</literal> is used to remove packages that were "
 "automatically installed to satisfy dependencies for other packages and are "
@@ -933,7 +933,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:239
+#: apt-get.8.xml:233
 msgid ""
 "<literal>changelog</literal> downloads a package changelog and displays it "
 "through <command>sensible-pager</command>. The server name and base "
@@ -948,28 +948,28 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:262
+#: apt-get.8.xml:256
 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><listitem><para>
-#: apt-get.8.xml:267
+#: apt-get.8.xml:261
 msgid ""
 "Consider suggested packages as a dependency for installing.  Configuration "
 "Item: <literal>APT::Install-Suggests</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:272
+#: apt-get.8.xml:266
 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><listitem><para>
-#: apt-get.8.xml:277
+#: apt-get.8.xml:271
 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 "
@@ -985,7 +985,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:292
+#: apt-get.8.xml:286
 msgid ""
 "Ignore missing packages; if packages cannot be retrieved or fail the "
 "integrity check after retrieval (corrupted package files), hold back those "
@@ -997,7 +997,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:303
+#: apt-get.8.xml:297
 msgid ""
 "Disables downloading of packages. This is best used with "
 "<option>--ignore-missing</option> to force APT to use only the .debs it has "
@@ -1006,7 +1006,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:310
+#: apt-get.8.xml:304
 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 "
@@ -1018,7 +1018,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:325
+#: apt-get.8.xml:319
 msgid ""
 "No action; perform a simulation of events that would occur but do not "
 "actually change the system.  Configuration Item: "
@@ -1026,7 +1026,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:329
+#: apt-get.8.xml:323
 msgid ""
 "Simulated runs performed as a user will automatically deactivate locking "
 "(<literal>Debug::NoLocking</literal>), and if the option "
@@ -1038,7 +1038,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:337
+#: apt-get.8.xml:331
 msgid ""
 "Simulated runs print out a series of lines, each representing a "
 "<command>dpkg</command> operation: configure (<literal>Conf</literal>), "
@@ -1048,7 +1048,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:345
+#: apt-get.8.xml:339
 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 "
@@ -1058,28 +1058,28 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:353
+#: apt-get.8.xml:347
 msgid ""
 "Automatic \"no\" to all prompts.  Configuration Item: "
 "<literal>APT::Get::Assume-No</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:358
+#: apt-get.8.xml:352
 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><listitem><para>
-#: apt-get.8.xml:364
+#: apt-get.8.xml:358
 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><listitem><para>
-#: apt-get.8.xml:370
+#: apt-get.8.xml:364
 msgid ""
 "This option controls the architecture packages are built for by "
 "<command>apt-get source --compile</command> and how cross-builddependencies "
@@ -1090,7 +1090,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:380
+#: apt-get.8.xml:374
 msgid ""
 "This option controls the activated build profiles for which a source package "
 "is built by <command>apt-get source --compile</command> and how build "
@@ -1100,14 +1100,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:391
+#: apt-get.8.xml:385
 msgid ""
 "Compile source packages after downloading them.  Configuration Item: "
 "<literal>APT::Get::Compile</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:396
+#: apt-get.8.xml:390
 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 "
@@ -1116,7 +1116,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:403
+#: apt-get.8.xml:397
 msgid ""
 "Allow installing new packages when used in conjunction with "
 "<literal>upgrade</literal>.  This is useful if the update of a installed "
@@ -1128,7 +1128,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:415
+#: apt-get.8.xml:409
 msgid ""
 "Do not upgrade packages; when used in conjunction with "
 "<literal>install</literal>, <literal>no-upgrade</literal> will prevent "
@@ -1137,7 +1137,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:422
+#: apt-get.8.xml:416
 msgid ""
 "Do not install new packages; when used in conjunction with "
 "<literal>install</literal>, <literal>only-upgrade</literal> will install "
@@ -1147,7 +1147,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:430
+#: apt-get.8.xml:424
 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 "
@@ -1157,7 +1157,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:438
+#: apt-get.8.xml:432
 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 "
@@ -1170,7 +1170,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:449
+#: apt-get.8.xml:443
 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 "
@@ -1180,14 +1180,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:457
+#: apt-get.8.xml:451
 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><listitem><para>
-#: apt-get.8.xml:462
+#: apt-get.8.xml:456
 msgid ""
 "This option is on by default; use <literal>--no-list-cleanup</literal> to "
 "turn it off. When it is on, <command>apt-get</command> will automatically "
@@ -1198,7 +1198,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:472
+#: apt-get.8.xml:466
 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 "
@@ -1213,7 +1213,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:487
+#: apt-get.8.xml:481
 msgid ""
 "Only perform operations that are 'trivial'. Logically this can be considered "
 "related to <option>--assume-yes</option>; where "
@@ -1223,14 +1223,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:494
+#: apt-get.8.xml:488
 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><listitem><para>
-#: apt-get.8.xml:500
+#: apt-get.8.xml:494
 msgid ""
 "If the command is either <literal>install</literal> or "
 "<literal>remove</literal>, then this option acts like running the "
@@ -1239,7 +1239,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:507
+#: apt-get.8.xml:501
 msgid ""
 "Only has meaning for the <literal>source</literal> and "
 "<literal>build-dep</literal> commands.  Indicates that the given source "
@@ -1251,7 +1251,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:518
+#: apt-get.8.xml:512
 msgid ""
 "Download only the diff, dsc, or tar file of a source archive.  Configuration "
 "Item: <literal>APT::Get::Diff-Only</literal>, "
@@ -1260,14 +1260,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:524
+#: apt-get.8.xml:518
 msgid ""
 "Only process architecture-dependent build-dependencies.  Configuration Item: "
 "<literal>APT::Get::Arch-Only</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:529
+#: apt-get.8.xml:523
 msgid ""
 "Ignore if packages can't be authenticated and don't prompt about it.  This "
 "is useful for tools like pbuilder.  Configuration Item: "
@@ -1275,7 +1275,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:535
+#: apt-get.8.xml:529
 msgid ""
 "Show user friendly progress information in the terminal window when packages "
 "are installed, upgraded or removed. For a machine parsable version of this "
@@ -1285,12 +1285,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:548 apt-cache.8.xml:345 apt-key.8.xml:176 apt-mark.8.xml:127 apt.conf.5.xml:1221 apt_preferences.5.xml:700
+#: apt-get.8.xml:542 apt-cache.8.xml:339 apt-key.8.xml:170 apt-mark.8.xml:121 apt.conf.5.xml:1216 apt_preferences.5.xml:694
 msgid "Files"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:559
+#: apt-get.8.xml:553
 msgid ""
 "&apt-cache;, &apt-cdrom;, &dpkg;, &sources-list;, &apt-conf;, &apt-config;, "
 "&apt-secure;, The APT User's guide in &guidesdir;, &apt-preferences;, the "
@@ -1298,19 +1298,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:565
+#: apt-get.8.xml:559
 msgid ""
 "<command>apt-get</command> returns zero on normal operation, decimal 100 on "
 "error."
 msgstr ""
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-cache.8.xml:35
+#: apt-cache.8.xml:29
 msgid "query the APT cache"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:41
+#: apt-cache.8.xml:35
 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 "
@@ -1319,19 +1319,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:51
+#: apt-cache.8.xml:45
 msgid ""
 "<literal>gencaches</literal> creates APT's package cache. This is done "
 "implicitly by all commands needing this cache if it is missing or outdated."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
-#: apt-cache.8.xml:55 apt-cache.8.xml:144 apt-cache.8.xml:165 apt-cache.8.xml:187 apt-cache.8.xml:192 apt-cache.8.xml:208 apt-cache.8.xml:226 apt-cache.8.xml:238
+#: apt-cache.8.xml:49 apt-cache.8.xml:138 apt-cache.8.xml:159 apt-cache.8.xml:181 apt-cache.8.xml:186 apt-cache.8.xml:202 apt-cache.8.xml:220 apt-cache.8.xml:232
 msgid "&synopsis-pkg;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:56
+#: apt-cache.8.xml:50
 msgid ""
 "<literal>showpkg</literal> displays information about the packages listed on "
 "the command line. Remaining arguments are package names. The available "
@@ -1345,7 +1345,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
-#: apt-cache.8.xml:68
+#: apt-cache.8.xml:62
 #, no-wrap
 msgid ""
 "Package: libreadline2\n"
@@ -1361,7 +1361,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:80
+#: apt-cache.8.xml:74
 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, "
@@ -1373,21 +1373,21 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:89
+#: apt-cache.8.xml:83
 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:92
+#: apt-cache.8.xml:86
 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:96
+#: apt-cache.8.xml:90
 msgid ""
 "<literal>Normal packages</literal> is the number of regular, ordinary "
 "package names; these are packages that bear a one-to-one correspondence "
@@ -1396,7 +1396,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:102
+#: apt-cache.8.xml:96
 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 "
@@ -1407,7 +1407,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:110
+#: apt-cache.8.xml:104
 msgid ""
 "<literal>Single virtual packages</literal> is the number of packages with "
 "only one package providing a particular virtual package. For example, in the "
@@ -1416,7 +1416,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:116
+#: apt-cache.8.xml:110
 msgid ""
 "<literal>Mixed virtual packages</literal> is the number of packages that "
 "either provide a particular virtual package or have the virtual package name "
@@ -1425,7 +1425,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:123
+#: apt-cache.8.xml:117
 msgid ""
 "<literal>Missing</literal> is the number of package names that were "
 "referenced in a dependency but were not provided by any package. Missing "
@@ -1435,7 +1435,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:130
+#: apt-cache.8.xml:124
 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 "
@@ -1445,14 +1445,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:137
+#: apt-cache.8.xml:131
 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><listitem><para>
-#: apt-cache.8.xml:145
+#: apt-cache.8.xml:139
 msgid ""
 "<literal>showsrc</literal> displays all the source package records that "
 "match the given package names. All versions are shown, as well as all "
@@ -1460,28 +1460,28 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:151
+#: apt-cache.8.xml:145
 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><listitem><para>
-#: apt-cache.8.xml:156
+#: apt-cache.8.xml:150
 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><listitem><para>
-#: apt-cache.8.xml:161
+#: apt-cache.8.xml:155
 msgid ""
 "<literal>unmet</literal> displays a summary of all unmet dependencies in the "
 "package cache."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:166
+#: apt-cache.8.xml:160
 msgid ""
 "<literal>show</literal> performs a function similar to <command>dpkg "
 "--print-avail</command>; it displays the package records for the named "
@@ -1489,12 +1489,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
-#: apt-cache.8.xml:171
+#: apt-cache.8.xml:165
 msgid "&synopsis-regex;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:172
+#: apt-cache.8.xml:166
 msgid ""
 "<literal>search</literal> performs a full text search on all available "
 "package lists for the POSIX regex pattern given, see &regex;.  It searches "
@@ -1507,33 +1507,33 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:183
+#: apt-cache.8.xml:177
 msgid ""
 "Separate arguments can be used to specify multiple search patterns that are "
 "and'ed together."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:188
+#: apt-cache.8.xml:182
 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><listitem><para>
-#: apt-cache.8.xml:193
+#: apt-cache.8.xml:187
 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:197
+#: apt-cache.8.xml:191
 msgid "<optional><replaceable>&synopsis-prefix;</replaceable></optional>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:198
+#: apt-cache.8.xml:192
 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 "
@@ -1543,7 +1543,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:203
+#: apt-cache.8.xml:197
 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 "
@@ -1551,7 +1551,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:209
+#: apt-cache.8.xml:203
 msgid ""
 "<literal>dotty</literal> takes a list of packages on the command line and "
 "generates output suitable for use by dotty from the <ulink "
@@ -1564,7 +1564,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:218
+#: apt-cache.8.xml:212
 msgid ""
 "The resulting nodes will have several shapes; normal packages are boxes, "
 "pure virtual packages are triangles, mixed virtual packages are diamonds, "
@@ -1573,12 +1573,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:223
+#: apt-cache.8.xml:217
 msgid "Caution, dotty cannot graph larger sets of packages."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:227
+#: apt-cache.8.xml:221
 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 "
@@ -1586,12 +1586,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:231
+#: apt-cache.8.xml:225
 msgid "<optional><replaceable>&synopsis-pkg;</replaceable>…</optional>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:232
+#: apt-cache.8.xml:226
 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 "
@@ -1600,7 +1600,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:239
+#: apt-cache.8.xml:233
 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 "
@@ -1612,7 +1612,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:255
+#: apt-cache.8.xml:249
 msgid ""
 "Select the file to store the package cache. The package cache is the primary "
 "cache used by all operations.  Configuration Item: "
@@ -1620,7 +1620,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:261
+#: apt-cache.8.xml:255
 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 "
@@ -1630,7 +1630,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:269
+#: apt-cache.8.xml:263
 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 "
@@ -1639,7 +1639,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:276
+#: apt-cache.8.xml:270
 msgid ""
 "Print only important dependencies; for use with <literal>unmet</literal> and "
 "<literal>depends</literal>. Causes only Depends and Pre-Depends relations to "
@@ -1647,7 +1647,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:290
+#: apt-cache.8.xml:284
 msgid ""
 "Per default the <literal>depends</literal> and <literal>rdepends</literal> "
 "print all dependencies. This can be tweaked with these flags which will omit "
@@ -1657,14 +1657,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:297
+#: apt-cache.8.xml:291
 msgid ""
 "Print full package records when searching.  Configuration Item: "
 "<literal>APT::Cache::ShowFull</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:302
+#: apt-cache.8.xml:296
 msgid ""
 "Print full records for all available versions. This is the default; to turn "
 "it off, use <option>--no-all-versions</option>.  If "
@@ -1675,7 +1675,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:311
+#: apt-cache.8.xml:305
 msgid ""
 "Perform automatic package cache regeneration, rather than use the cache as "
 "it is. This is the default; to turn it off, use "
@@ -1684,14 +1684,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:317
+#: apt-cache.8.xml:311
 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><listitem><para>
-#: apt-cache.8.xml:322
+#: apt-cache.8.xml:316
 msgid ""
 "Make <literal>pkgnames</literal> print all names, including virtual packages "
 "and missing dependencies.  Configuration Item: "
@@ -1699,7 +1699,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:328
+#: apt-cache.8.xml:322
 msgid ""
 "Make <literal>depends</literal> and <literal>rdepends</literal> recursive so "
 "that all packages mentioned are printed once.  Configuration Item: "
@@ -1707,7 +1707,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:335
+#: apt-cache.8.xml:329
 msgid ""
 "Limit the output of <literal>depends</literal> and "
 "<literal>rdepends</literal> to packages which are currently installed.  "
@@ -1715,24 +1715,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:353
+#: apt-cache.8.xml:347
 msgid "&apt-conf;, &sources-list;, &apt-get;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:358
+#: apt-cache.8.xml:352
 msgid ""
 "<command>apt-cache</command> returns zero on normal operation, decimal 100 "
 "on error."
 msgstr ""
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-key.8.xml:34
+#: apt-key.8.xml:28
 msgid "APT key management utility"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:41
+#: apt-key.8.xml:35
 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 "
@@ -1740,12 +1740,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-key.8.xml:47
+#: apt-key.8.xml:41
 msgid "Commands"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:52
+#: apt-key.8.xml:46
 msgid ""
 "Add a new key to the list of trusted keys.  The key is read from the "
 "filename given with the parameter &synopsis-param-filename; or if the "
@@ -1753,39 +1753,39 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:65
+#: apt-key.8.xml:59
 msgid "Remove a key from the list of trusted keys."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:76
+#: apt-key.8.xml:70
 msgid "Output the key &synopsis-param-keyid; to standard output."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:87
+#: apt-key.8.xml:81
 msgid "Output all trusted keys to standard output."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:98
+#: apt-key.8.xml:92
 msgid "List trusted keys."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:109
+#: apt-key.8.xml:103
 msgid "List fingerprints of trusted keys."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:120
+#: apt-key.8.xml:114
 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:132
+#: apt-key.8.xml:126
 msgid ""
 "Update the local keyring with the archive keyring and remove from the local "
 "keyring the archive keys which are no longer valid.  The archive keyring is "
@@ -1794,7 +1794,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:146
+#: apt-key.8.xml:140
 msgid ""
 "Perform an update working similarly to the <command>update</command> command "
 "above, but get the archive keyring from a URI instead and validate it "
@@ -1805,19 +1805,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-key.8.xml:162 apt-cdrom.8.xml:82
+#: apt-key.8.xml:156 apt-cdrom.8.xml:76
 msgid "Options"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:163
+#: apt-key.8.xml:157
 msgid ""
 "Note that options need to be defined before the commands described in the "
 "previous section."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:166
+#: apt-key.8.xml:160
 msgid ""
 "With this option it is possible to specify a particular keyring file the "
 "command should operate on. The default is that a command is executed on the "
@@ -1828,54 +1828,54 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:181
+#: apt-key.8.xml:175
 msgid "<filename>/etc/apt/trustdb.gpg</filename>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:182
+#: apt-key.8.xml:176
 msgid "Local trust database of archive keys."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:185
+#: apt-key.8.xml:179
 msgid "&keyring-filename;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:186
+#: apt-key.8.xml:180
 msgid "Keyring of &keyring-distro; archive trusted keys."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:189
+#: apt-key.8.xml:183
 msgid "&keyring-removed-filename;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:190
+#: apt-key.8.xml:184
 msgid "Keyring of &keyring-distro; archive removed trusted keys."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:199
+#: apt-key.8.xml:193
 msgid "&apt-get;, &apt-secure;"
 msgstr ""
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-mark.8.xml:35
+#: apt-mark.8.xml:29
 msgid "mark/unmark a package as being automatically-installed"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:41
+#: apt-mark.8.xml:35
 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:45
+#: apt-mark.8.xml:39
 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 "
@@ -1885,7 +1885,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:54
+#: apt-mark.8.xml:48
 msgid ""
 "<literal>auto</literal> is used to mark a package as being automatically "
 "installed, which will cause the package to be removed when no more manually "
@@ -1893,7 +1893,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:62
+#: apt-mark.8.xml:56
 msgid ""
 "<literal>manual</literal> is used to mark a package as being manually "
 "installed, which will prevent the package from being automatically removed "
@@ -1901,7 +1901,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:70
+#: apt-mark.8.xml:64
 msgid ""
 "<literal>hold</literal> is used to mark a package as held back, which will "
 "prevent the package from being automatically installed, upgraded or "
@@ -1911,14 +1911,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:80
+#: apt-mark.8.xml:74
 msgid ""
 "<literal>unhold</literal> is used to cancel a previously set hold on a "
 "package to allow all actions again."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:86
+#: apt-mark.8.xml:80
 msgid ""
 "<literal>showauto</literal> is used to print a list of automatically "
 "installed packages with each package on a new line.  All automatically "
@@ -1927,7 +1927,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:94
+#: apt-mark.8.xml:88
 msgid ""
 "<literal>showmanual</literal> can be used in the same way as "
 "<literal>showauto</literal> except that it will print a list of manually "
@@ -1935,14 +1935,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:101
+#: apt-mark.8.xml:95
 msgid ""
 "<literal>showhold</literal> is used to print a list of packages on hold in "
 "the same way as for the other show commands."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:117
+#: apt-mark.8.xml:111
 msgid ""
 "Read/Write package stats from the filename given with the parameter "
 "&synopsis-param-filename; instead of from the default location, which is "
@@ -1951,19 +1951,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:138
+#: apt-mark.8.xml:132
 msgid ""
 "<command>apt-mark</command> returns zero on normal operation, non-zero on "
 "error."
 msgstr ""
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-secure.8.xml:49
+#: apt-secure.8.xml:43
 msgid "Archive authentication support for APT"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:54
+#: apt-secure.8.xml:48
 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 "
@@ -1972,7 +1972,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:62
+#: apt-secure.8.xml:56
 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 "
@@ -1982,19 +1982,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:71
+#: apt-secure.8.xml:65
 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:76
+#: apt-secure.8.xml:70
 msgid "Trusted archives"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:79
+#: apt-secure.8.xml:73
 msgid ""
 "The chain of trust from an apt archive to the end user is made up of several "
 "steps. <command>apt-secure</command> is the last step in this chain; "
@@ -2005,7 +2005,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:87
+#: apt-secure.8.xml:81
 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 "
@@ -2014,7 +2014,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:94
+#: apt-secure.8.xml:88
 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. In order to become "
@@ -2025,7 +2025,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:104
+#: apt-secure.8.xml:98
 msgid ""
 "Once the uploaded package is verified and included in the archive, the "
 "maintainer signature is stripped off, and checksums of the package are "
@@ -2038,7 +2038,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:115
+#: apt-secure.8.xml:109
 msgid ""
 "End users can check the signature of the Release file, extract a checksum of "
 "a package from it and compare it with the checksum of the package they "
@@ -2046,14 +2046,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:120
+#: apt-secure.8.xml:114
 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:125
+#: apt-secure.8.xml:119
 msgid ""
 "<literal>Network \"man in the middle\" attacks</literal>. Without signature "
 "checking, malicious agents can introduce themselves into the package "
@@ -2063,7 +2063,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:133
+#: apt-secure.8.xml:127
 msgid ""
 "<literal>Mirror network compromise</literal>.  Without signature checking, a "
 "malicious agent can compromise a mirror host and modify the files in it to "
@@ -2072,7 +2072,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:140
+#: apt-secure.8.xml:134
 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 "
@@ -2081,12 +2081,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:146
+#: apt-secure.8.xml:140
 msgid "User configuration"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:148
+#: apt-secure.8.xml:142
 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 "
@@ -2095,7 +2095,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:155
+#: apt-secure.8.xml:149
 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 "
@@ -2106,19 +2106,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:164
+#: apt-secure.8.xml:158
 msgid "Archive configuration"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:166
+#: apt-secure.8.xml:160
 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:171
+#: apt-secure.8.xml:165
 msgid ""
 "<emphasis>Create a toplevel Release file</emphasis>, if it does not exist "
 "already. You can do this by running <command>apt-ftparchive "
@@ -2126,7 +2126,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:176
+#: apt-secure.8.xml:170
 msgid ""
 "<emphasis>Sign it</emphasis>. You can do this by running <command>gpg "
 "--clearsign -o InRelease Release</command> and <command>gpg -abs -o "
@@ -2134,7 +2134,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:180
+#: apt-secure.8.xml:174
 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 "
@@ -2142,7 +2142,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:187
+#: apt-secure.8.xml:181
 msgid ""
 "Whenever the contents of the archive change (new packages are added or "
 "removed) the archive maintainer has to follow the first two steps outlined "
@@ -2150,14 +2150,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:195
+#: apt-secure.8.xml:189
 msgid ""
 "&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, "
-"&debsign; &debsig-verify;, &gpg;"
+"&debsign;, &debsig-verify;, &gpg;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:199
+#: apt-secure.8.xml:193
 msgid ""
 "For more background information you might want to review the <ulink "
 "url=\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "
@@ -2168,24 +2168,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:212
+#: apt-secure.8.xml:206
 msgid "Manpage Authors"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:214
+#: apt-secure.8.xml:208
 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><refpurpose>
-#: apt-cdrom.8.xml:34
+#: apt-cdrom.8.xml:28
 msgid "APT CD-ROM management utility"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:40
+#: apt-cdrom.8.xml:34
 msgid ""
 "<command>apt-cdrom</command> is used to add a new CD-ROM to APT's list of "
 "available sources. <command>apt-cdrom</command> takes care of determining "
@@ -2194,7 +2194,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:47
+#: apt-cdrom.8.xml:41
 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 disc in a multi-CD set "
@@ -2202,7 +2202,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:58
+#: apt-cdrom.8.xml:52
 msgid ""
 "<literal>add</literal> is used to add a new disc to the source list. It will "
 "unmount the CD-ROM device, prompt for a disc to be inserted and then proceed "
@@ -2212,7 +2212,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:66
+#: apt-cdrom.8.xml:60
 msgid ""
 "APT uses a CD-ROM ID to track which disc is currently in the drive and "
 "maintains a database of these IDs in "
@@ -2220,14 +2220,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:74
+#: apt-cdrom.8.xml:68
 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><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:87
+#: apt-cdrom.8.xml:81
 msgid ""
 "Do not try to auto-detect the CD-ROM path. Usually combined with the "
 "<option>--cdrom</option> option.  Configuration Item: "
@@ -2235,7 +2235,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:95
+#: apt-cdrom.8.xml:89
 msgid ""
 "Mount point; specify the location to mount the CD-ROM. This mount point must "
 "be listed in <filename>/etc/fstab</filename> and properly configured.  "
@@ -2243,7 +2243,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:104
+#: apt-cdrom.8.xml:98
 msgid ""
 "Rename a disc; change the label of a disc or override the disc's given "
 "label. This option will cause <command>apt-cdrom</command> to prompt for a "
@@ -2251,7 +2251,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:113
+#: apt-cdrom.8.xml:107
 msgid ""
 "No mounting; prevent <command>apt-cdrom</command> from mounting and "
 "unmounting the mount point.  Configuration Item: "
@@ -2259,7 +2259,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:121
+#: apt-cdrom.8.xml:115
 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 "
@@ -2268,7 +2268,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:131
+#: apt-cdrom.8.xml:125
 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 "
@@ -2276,7 +2276,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:142
+#: apt-cdrom.8.xml:136
 msgid ""
 "No Changes; Do not change the &sources-list; file and do not write index "
 "files. Everything is still checked however.  Configuration Item: "
@@ -2284,24 +2284,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:155
+#: apt-cdrom.8.xml:149
 msgid "&apt-conf;, &apt-get;, &sources-list;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:160
+#: apt-cdrom.8.xml:154
 msgid ""
 "<command>apt-cdrom</command> returns zero on normal operation, decimal 100 "
 "on error."
 msgstr ""
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-config.8.xml:35
+#: apt-config.8.xml:29
 msgid "APT Configuration Query program"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:41
+#: apt-config.8.xml:35
 msgid ""
 "<command>apt-config</command> is an internal program used by various "
 "portions of the APT suite to provide consistent configurability. It accesses "
@@ -2310,7 +2310,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:53
+#: apt-config.8.xml:47
 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 "
@@ -2320,7 +2320,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
-#: apt-config.8.xml:61
+#: apt-config.8.xml:55
 #, no-wrap
 msgid ""
 "OPTS=\"-f\"\n"
@@ -2329,14 +2329,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:66
+#: apt-config.8.xml:60
 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:70
+#: apt-config.8.xml:64
 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 "
@@ -2344,24 +2344,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:79
+#: apt-config.8.xml:73
 msgid "Just show the contents of the configuration space."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:92
+#: apt-config.8.xml:86
 msgid ""
 "Include options which have an empty value. This is the default, so use "
 "--no-empty to remove them from the output."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
-#: apt-config.8.xml:97
+#: apt-config.8.xml:91
 msgid "&percnt;f &#x0022;&percnt;v&#x0022;;&percnt;n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:98
+#: apt-config.8.xml:92
 msgid ""
 "Defines the output of each config option. &percnt;t will be replaced with "
 "its individual name, &percnt;f with its full hierarchical name and &percnt;v "
@@ -2372,39 +2372,39 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:112 apt-extracttemplates.1.xml:73 apt-sortpkgs.1.xml:66 apt-ftparchive.1.xml:610
+#: apt-config.8.xml:106 apt-extracttemplates.1.xml:67 apt-sortpkgs.1.xml:60 apt-ftparchive.1.xml:604
 msgid "&apt-conf;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:117
+#: apt-config.8.xml:111
 msgid ""
 "<command>apt-config</command> returns zero on normal operation, decimal 100 "
 "on error."
 msgstr ""
 
 #. type: Content of: <refentry><refentryinfo><author><contrib>
-#: apt.conf.5.xml:22
+#: apt.conf.5.xml:16
 msgid "Initial documentation of Debug::*."
 msgstr ""
 
 #. type: Content of: <refentry><refentryinfo><author><email>
-#: apt.conf.5.xml:23
+#: apt.conf.5.xml:17
 msgid "dburrows@debian.org"
 msgstr ""
 
 #. type: Content of: <refentry><refmeta><manvolnum>
-#: apt.conf.5.xml:33 apt_preferences.5.xml:27 sources.list.5.xml:28
+#: apt.conf.5.xml:27 apt_preferences.5.xml:21 sources.list.5.xml:22
 msgid "5"
 msgstr ""
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt.conf.5.xml:40
+#: apt.conf.5.xml:34
 msgid "Configuration file for APT"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:44
+#: apt.conf.5.xml:38
 msgid ""
 "<filename>/etc/apt/apt.conf</filename> is the main configuration file shared "
 "by all the tools in the APT suite of tools, though it is by no means the "
@@ -2413,21 +2413,21 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><orderedlist><para>
-#: apt.conf.5.xml:50
+#: apt.conf.5.xml:44
 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:52
+#: apt.conf.5.xml:46
 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:54
+#: apt.conf.5.xml:48
 msgid ""
 "all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending "
 "order which have either no or \"<literal>conf</literal>\" as filename "
@@ -2439,24 +2439,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:61
+#: apt.conf.5.xml:55
 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:63
+#: apt.conf.5.xml:57
 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:67
+#: apt.conf.5.xml:61
 msgid "Syntax"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:68
+#: apt.conf.5.xml:62
 msgid ""
 "The configuration file is organized in a tree with options organized into "
 "functional groups. Option specification is given with a double colon "
@@ -2466,7 +2466,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:74
+#: apt.conf.5.xml:68
 msgid ""
 "Syntactically the configuration language is modeled after what the ISC tools "
 "such as bind and dhcp use. Lines starting with <literal>//</literal> are "
@@ -2481,7 +2481,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><informalexample><programlisting>
-#: apt.conf.5.xml:87
+#: apt.conf.5.xml:81
 #, no-wrap
 msgid ""
 "APT {\n"
@@ -2493,7 +2493,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:95
+#: apt.conf.5.xml:89
 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 "
@@ -2501,27 +2501,27 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><informalexample><programlisting>
-#: apt.conf.5.xml:100
+#: apt.conf.5.xml:94
 #, no-wrap
 msgid "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:103
+#: apt.conf.5.xml:97
 msgid ""
 "In general the sample configuration file &configureindex; is a good guide "
 "for how it should look."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:106
+#: apt.conf.5.xml:100
 msgid ""
 "Case is not significant in names of configuration items, 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:109
+#: apt.conf.5.xml:103
 msgid ""
 "Names for the configuration items are optional if a list is defined as can "
 "be seen in the <literal>DPkg::Pre-Install-Pkgs</literal> example above. If "
@@ -2531,7 +2531,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:114
+#: apt.conf.5.xml:108
 msgid ""
 "Two special commands are defined: <literal>#include</literal> (which is "
 "deprecated and not supported by alternative implementations) and "
@@ -2543,7 +2543,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:124
+#: apt.conf.5.xml:118
 msgid ""
 "The <literal>#clear</literal> command is the only way to delete a list or a "
 "complete scope. Reopening a scope (or using the syntax described below with "
@@ -2553,7 +2553,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:132
+#: apt.conf.5.xml:126
 msgid ""
 "All of the APT tools take an -o option which allows an arbitrary "
 "configuration directive to be specified on the command line. The syntax is a "
@@ -2565,7 +2565,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:140
+#: apt.conf.5.xml:134
 msgid ""
 "Note that appending items to a list using <literal>::</literal> only works "
 "for one item per line, and that you should not use it in combination with "
@@ -2582,19 +2582,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:155
+#: apt.conf.5.xml:149
 msgid "The APT Group"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:156
+#: apt.conf.5.xml:150
 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><listitem><para>
-#: apt.conf.5.xml:161
+#: apt.conf.5.xml:155
 msgid ""
 "System Architecture; sets the architecture to use when fetching files and "
 "parsing package lists. The internal default is the architecture apt was "
@@ -2602,7 +2602,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:168
+#: apt.conf.5.xml:162
 msgid ""
 "All Architectures the system supports. For instance, CPUs implementing the "
 "<literal>amd64</literal> (also called <literal>x86-64</literal>)  "
@@ -2616,7 +2616,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:182
+#: apt.conf.5.xml:176
 msgid ""
 "List of all build profiles enabled for build-dependency resolution, without "
 "the \"<literal>profile.</literal>\" namespace prefix.  By default this list "
@@ -2625,7 +2625,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:190
+#: apt.conf.5.xml:184
 msgid ""
 "Default release to install packages from if more than one version is "
 "available. Contains release name, codename or release version. Examples: "
@@ -2634,14 +2634,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:196
+#: apt.conf.5.xml:190
 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><listitem><para>
-#: apt.conf.5.xml:201
+#: apt.conf.5.xml:195
 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 "
@@ -2650,7 +2650,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:209
+#: apt.conf.5.xml:203
 msgid ""
 "Defaults to on, which will cause APT to install essential and important "
 "packages as soon as possible in an install/upgrade operation, in order to "
@@ -2665,7 +2665,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:221
+#: apt.conf.5.xml:215
 msgid ""
 "The immediate configuration marker is also applied in the potentially "
 "problematic case of circular dependencies, since a dependency with the "
@@ -2682,7 +2682,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:234
+#: apt.conf.5.xml:228
 msgid ""
 "Before a big operation like <literal>dist-upgrade</literal> is run with this "
 "option disabled you should try to explicitly <literal>install</literal> the "
@@ -2693,7 +2693,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:245
+#: apt.conf.5.xml:239
 msgid ""
 "Never enable this option unless you <emphasis>really</emphasis> know what "
 "you are doing. It permits APT to temporarily remove an essential package to "
@@ -2706,7 +2706,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:257
+#: apt.conf.5.xml:251
 msgid ""
 "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 of "
@@ -2727,38 +2727,38 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:273
+#: apt.conf.5.xml:267
 msgid "Defines which packages are considered essential build dependencies."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:277
+#: apt.conf.5.xml:271
 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><listitem><para>
-#: apt.conf.5.xml:282
+#: apt.conf.5.xml:276
 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><listitem><para>
-#: apt.conf.5.xml:287
+#: apt.conf.5.xml:281
 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:293
+#: apt.conf.5.xml:287
 msgid "The Acquire Group"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:294
+#: apt.conf.5.xml:288
 msgid ""
 "The <literal>Acquire</literal> group of options controls the download of "
 "packages as well as the various \"acquire methods\" responsible for the "
@@ -2766,7 +2766,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:301
+#: apt.conf.5.xml:295
 msgid ""
 "Security related option defaulting to true, as giving a Release file's "
 "validation an expiration date prevents replay attacks over a long timescale, "
@@ -2779,7 +2779,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:314
+#: apt.conf.5.xml:308
 msgid ""
 "Maximum time (in seconds) after its creation (as indicated by the "
 "<literal>Date</literal> header) that the <filename>Release</filename> file "
@@ -2791,7 +2791,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:326
+#: apt.conf.5.xml:320
 msgid ""
 "Minimum time (in seconds) after its creation (as indicated by the "
 "<literal>Date</literal> header) that the <filename>Release</filename> file "
@@ -2803,7 +2803,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:338
+#: apt.conf.5.xml:332
 msgid ""
 "Try to download deltas called <literal>PDiffs</literal> for indexes (like "
 "<filename>Packages</filename> files) instead of downloading whole ones. True "
@@ -2811,7 +2811,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:341
+#: apt.conf.5.xml:335
 msgid ""
 "Two sub-options to limit the use of PDiffs are also available: "
 "<literal>FileLimit</literal> can be used to specify a maximum number of "
@@ -2823,7 +2823,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:351
+#: apt.conf.5.xml:345
 msgid ""
 "Queuing mode; <literal>Queue-Mode</literal> can be one of "
 "<literal>host</literal> or <literal>access</literal> which determines how "
@@ -2833,21 +2833,21 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:359
+#: apt.conf.5.xml:353
 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><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:364
+#: apt.conf.5.xml:358
 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><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:369
+#: apt.conf.5.xml:363
 msgid ""
 "<literal>http::Proxy</literal> sets the default proxy to use for HTTP "
 "URIs. It is in the standard form of "
@@ -2860,7 +2860,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:377
+#: apt.conf.5.xml:371
 msgid ""
 "Three settings are provided for cache control with HTTP/1.1 compliant proxy "
 "caches.  <literal>No-Cache</literal> tells the proxy not to use its cached "
@@ -2872,14 +2872,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:387 apt.conf.5.xml:475
+#: apt.conf.5.xml:381 apt.conf.5.xml:469
 msgid ""
 "The option <literal>timeout</literal> sets the timeout timer used by the "
 "method; this value applies to the connection as well as the data timeout."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:390
+#: apt.conf.5.xml:384
 msgid ""
 "The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to "
 "enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be beneficial "
@@ -2891,14 +2891,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:397
+#: apt.conf.5.xml:391
 msgid ""
 "<literal>Acquire::http::AllowRedirect</literal> controls whether APT will "
 "follow redirects, which is enabled by default."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:400
+#: apt.conf.5.xml:394
 msgid ""
 "The used bandwidth can be limited with "
 "<literal>Acquire::http::Dl-Limit</literal> which accepts integer values in "
@@ -2908,7 +2908,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:407
+#: apt.conf.5.xml:401
 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 "
@@ -2916,7 +2916,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:411
+#: apt.conf.5.xml:405
 msgid ""
 "<literal>Acquire::http::Proxy-Auto-Detect</literal> can be used to specify "
 "an external command to discover the http proxy to use. Apt expects the "
@@ -2930,7 +2930,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:429
+#: apt.conf.5.xml:423
 msgid ""
 "The <literal>Cache-control</literal>, <literal>Timeout</literal>, "
 "<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> and "
@@ -2941,7 +2941,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:437
+#: apt.conf.5.xml:431
 msgid ""
 "<literal>CaInfo</literal> suboption specifies place of file that holds info "
 "about trusted certificates.  <literal>&lt;host&gt;::CaInfo</literal> is the "
@@ -2965,7 +2965,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:458
+#: apt.conf.5.xml:452
 msgid ""
 "<literal>ftp::Proxy</literal> sets the default proxy to use for FTP URIs.  "
 "It is in the standard form of "
@@ -2986,7 +2986,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:478
+#: apt.conf.5.xml:472
 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, "
@@ -2996,7 +2996,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:485
+#: apt.conf.5.xml:479
 msgid ""
 "It is possible to proxy FTP over HTTP by setting the "
 "<envar>ftp_proxy</envar> environment variable to an HTTP URL - see the "
@@ -3006,7 +3006,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:490
+#: apt.conf.5.xml:484
 msgid ""
 "The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
 "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -3016,13 +3016,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:504
+#: apt.conf.5.xml:498
 #, no-wrap
 msgid "/cdrom/::Mount \"foo\";"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:499
+#: apt.conf.5.xml:493
 msgid ""
 "For URIs using the <literal>cdrom</literal> method, the only configurable "
 "option is the mount point, <literal>cdrom::Mount</literal>, which must be "
@@ -3035,7 +3035,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:512
+#: apt.conf.5.xml:506
 msgid ""
 "For GPGV URIs the only configurable option is "
 "<literal>gpgv::Options</literal>, which passes additional parameters to "
@@ -3043,7 +3043,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:523
+#: apt.conf.5.xml:517
 #, no-wrap
 msgid ""
 "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> "
@@ -3051,7 +3051,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:518
+#: apt.conf.5.xml:512
 msgid ""
 "List of compression types which are understood by the acquire methods.  "
 "Files like <filename>Packages</filename> can be available in various "
@@ -3063,19 +3063,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:528
+#: apt.conf.5.xml:522
 #, no-wrap
 msgid "Acquire::CompressionTypes::Order:: \"gz\";"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:531
+#: apt.conf.5.xml:525
 #, no-wrap
 msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:524
+#: apt.conf.5.xml:518
 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 "
@@ -3093,13 +3093,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:538
+#: apt.conf.5.xml:532
 #, no-wrap
 msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:533
+#: apt.conf.5.xml:527
 msgid ""
 "Note that the "
 "<literal>Dir::Bin::<replaceable>Methodname</replaceable></literal> will be "
@@ -3115,7 +3115,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:543
+#: apt.conf.5.xml:537
 msgid ""
 "The special type <literal>uncompressed</literal> can be used to give "
 "uncompressed files a preference, but note that most archives don't provide "
@@ -3123,7 +3123,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:550
+#: apt.conf.5.xml:544
 msgid ""
 "When downloading <literal>gzip</literal> compressed indexes (Packages, "
 "Sources, or Translations), keep them gzip compressed locally instead of "
@@ -3132,7 +3132,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:558
+#: apt.conf.5.xml:552
 msgid ""
 "The Languages subsection controls which <filename>Translation</filename> "
 "files are downloaded and in which order APT tries to display the "
@@ -3144,13 +3144,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><programlisting>
-#: apt.conf.5.xml:575
+#: apt.conf.5.xml:569
 #, no-wrap
 msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:563
+#: apt.conf.5.xml:557
 msgid ""
 "The default list includes \"environment\" and "
 "\"en\". \"<literal>environment</literal>\" has a special meaning here: it "
@@ -3172,7 +3172,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:576
+#: apt.conf.5.xml:570
 msgid ""
 "Note: To prevent problems resulting from APT being executed in different "
 "environments (e.g. by different users or by other programs) all Translation "
@@ -3182,22 +3182,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:585
+#: apt.conf.5.xml:579
 msgid "When downloading, force to use only the IPv4 protocol."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:591
+#: apt.conf.5.xml:585
 msgid "When downloading, force to use only the IPv6 protocol."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:598
+#: apt.conf.5.xml:592
 msgid "Directories"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:600
+#: apt.conf.5.xml:594
 msgid ""
 "The <literal>Dir::State</literal> section has directories that pertain to "
 "local state information. <literal>lists</literal> is the directory to place "
@@ -3209,20 +3209,21 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:607
+#: apt.conf.5.xml:601
 msgid ""
 "<literal>Dir::Cache</literal> contains locations pertaining to local cache "
 "information, such as the two package caches <literal>srcpkgcache</literal> "
 "and <literal>pkgcache</literal> as well as the location to place downloaded "
 "archives, <literal>Dir::Cache::archives</literal>. Generation of caches can "
-"be turned off by setting their names to the empty string. This will slow "
+"be turned off by setting <literal>pkgcache</literal> or "
+"<literal>srcpkgcache</literal> to <literal>\"\"</literal>.  This will slow "
 "down startup but save disk space. It is probably preferable to turn off the "
-"pkgcache rather than the srcpkgcache. Like <literal>Dir::State</literal> the "
-"default directory is contained in <literal>Dir::Cache</literal>"
+"pkgcache rather than the srcpkgcache.  Like <literal>Dir::State</literal> "
+"the default directory is contained in <literal>Dir::Cache</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:616
+#: apt.conf.5.xml:611
 msgid ""
 "<literal>Dir::Etc</literal> contains the location of configuration files, "
 "<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -3232,7 +3233,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:622
+#: apt.conf.5.xml:617
 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 "
@@ -3240,7 +3241,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:626
+#: apt.conf.5.xml:621
 msgid ""
 "Binary programs are pointed to by "
 "<literal>Dir::Bin</literal>. <literal>Dir::Bin::Methods</literal> specifies "
@@ -3252,7 +3253,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:634
+#: apt.conf.5.xml:629
 msgid ""
 "The configuration item <literal>RootDir</literal> has a special meaning.  If "
 "set, all paths in <literal>Dir::</literal> will be relative to "
@@ -3265,7 +3266,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:647
+#: apt.conf.5.xml:642
 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 "
@@ -3276,12 +3277,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:656
+#: apt.conf.5.xml:651
 msgid "APT in DSelect"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:658
+#: apt.conf.5.xml:653
 msgid ""
 "When APT is used as a &dselect; method several configuration directives "
 "control the default behavior. These are in the <literal>DSelect</literal> "
@@ -3289,7 +3290,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:663
+#: apt.conf.5.xml:658
 msgid ""
 "Cache Clean mode; this value may be one of <literal>always</literal>, "
 "<literal>prompt</literal>, <literal>auto</literal>, "
@@ -3303,40 +3304,40 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:677
+#: apt.conf.5.xml:672
 msgid ""
 "The contents of this variable are passed to &apt-get; as command line "
 "options when it is run for the install phase."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:682
+#: apt.conf.5.xml:677
 msgid ""
 "The contents of this variable are passed to &apt-get; as command line "
 "options when it is run for the update phase."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:687
+#: apt.conf.5.xml:682
 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:693
+#: apt.conf.5.xml:688
 msgid "How APT calls &dpkg;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:694
+#: apt.conf.5.xml:689
 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:699
+#: apt.conf.5.xml:694
 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 "
@@ -3344,7 +3345,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:705
+#: apt.conf.5.xml:700
 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 "
@@ -3353,7 +3354,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:712
+#: apt.conf.5.xml:707
 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 "
@@ -3364,7 +3365,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:719
+#: apt.conf.5.xml:714
 msgid ""
 "Version 2 of this protocol dumps more information, including the protocol "
 "version, the APT configuration space and the packages, files and versions "
@@ -3373,7 +3374,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:724
+#: apt.conf.5.xml:719
 msgid ""
 "The version of the protocol to be used for the command "
 "<literal><replaceable>cmd</replaceable></literal> can be chosen by setting "
@@ -3384,7 +3385,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:731
+#: apt.conf.5.xml:726
 msgid ""
 "The file descriptor to be used to send the information can be requested with "
 "<literal>DPkg::Tools::options::<replaceable>cmd</replaceable>::InfoFD</literal> "
@@ -3395,26 +3396,26 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:741
+#: apt.conf.5.xml:736
 msgid ""
 "APT chdirs to this directory before invoking &dpkg;, the default is "
 "<filename>/</filename>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:746
+#: apt.conf.5.xml:741
 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:751
+#: apt.conf.5.xml:746
 msgid "dpkg trigger usage (and related options)"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:752
+#: apt.conf.5.xml:747
 msgid ""
 "APT can call &dpkg; in such a way as to let it make aggressive use of "
 "triggers over multiple calls of &dpkg;. Without further options &dpkg; will "
@@ -3429,7 +3430,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:767
+#: apt.conf.5.xml:762
 #, no-wrap
 msgid ""
 "DPkg::NoTriggers \"true\";\n"
@@ -3439,7 +3440,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:761
+#: apt.conf.5.xml:756
 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 "
@@ -3453,7 +3454,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:774
+#: apt.conf.5.xml:769
 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 "
@@ -3466,7 +3467,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:782
+#: apt.conf.5.xml:777
 msgid ""
 "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
 "and \"<literal>no</literal>\".  The default value is "
@@ -3484,7 +3485,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:797
+#: apt.conf.5.xml:792
 msgid ""
 "If this option is set APT will call <command>dpkg --configure "
 "--pending</command> to let &dpkg; handle all required configurations and "
@@ -3496,7 +3497,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:804
+#: apt.conf.5.xml:799
 msgid ""
 "Useful for the <literal>smart</literal> configuration as a package which has "
 "pending triggers is not considered as <literal>installed</literal>, and "
@@ -3507,7 +3508,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:817
+#: apt.conf.5.xml:812
 #, no-wrap
 msgid ""
 "OrderList::Score {\n"
@@ -3519,7 +3520,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:810
+#: apt.conf.5.xml:805
 msgid ""
 "Essential packages (and their dependencies) should be configured immediately "
 "after unpacking. It is a good idea to do this quite early in the upgrade "
@@ -3533,12 +3534,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:830
+#: apt.conf.5.xml:825
 msgid "Periodic and Archives options"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:831
+#: apt.conf.5.xml:826
 msgid ""
 "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
 "of options configure behavior of apt periodic updates, which is done by the "
@@ -3547,12 +3548,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:839
+#: apt.conf.5.xml:834
 msgid "Debug options"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:841
+#: apt.conf.5.xml:836
 msgid ""
 "Enabling options in the <literal>Debug::</literal> section will cause "
 "debugging information to be sent to the standard error stream of the program "
@@ -3563,7 +3564,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:852
+#: apt.conf.5.xml:847
 msgid ""
 "<literal>Debug::pkgProblemResolver</literal> enables output about the "
 "decisions made by <literal>dist-upgrade, upgrade, install, remove, "
@@ -3571,7 +3572,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:860
+#: apt.conf.5.xml:855
 msgid ""
 "<literal>Debug::NoLocking</literal> disables all file locking.  This can be "
 "used to run some operations (for instance, <literal>apt-get -s "
@@ -3579,7 +3580,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:869
+#: apt.conf.5.xml:864
 msgid ""
 "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
 "time that <literal>apt</literal> invokes &dpkg;."
@@ -3589,65 +3590,65 @@ 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:877
+#: apt.conf.5.xml:872
 msgid ""
 "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
 "in CD-ROM IDs."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:887
+#: apt.conf.5.xml:882
 msgid "A full list of debugging options to apt follows."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:896
+#: apt.conf.5.xml:891
 msgid "Print information related to accessing <literal>cdrom://</literal> sources."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:907
+#: apt.conf.5.xml:902
 msgid "Print information related to downloading packages using FTP."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:918
+#: apt.conf.5.xml:913
 msgid "Print information related to downloading packages using HTTP."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:929
+#: apt.conf.5.xml:924
 msgid "Print information related to downloading packages using HTTPS."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:940
+#: apt.conf.5.xml:935
 msgid ""
 "Print information related to verifying cryptographic signatures using "
 "<literal>gpg</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:951
+#: apt.conf.5.xml:946
 msgid ""
 "Output information about the process of accessing collections of packages "
 "stored on CD-ROMs."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:961
+#: apt.conf.5.xml:956
 msgid "Describes the process of resolving build-dependencies in &apt-get;."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:971
+#: apt.conf.5.xml:966
 msgid ""
 "Output each cryptographic hash that is generated by the "
 "<literal>apt</literal> libraries."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:981
+#: apt.conf.5.xml:976
 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 "
@@ -3655,52 +3656,52 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:992
+#: apt.conf.5.xml:987
 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><listitem><para>
-#: apt.conf.5.xml:1004
+#: apt.conf.5.xml:999
 msgid "Log when items are added to or removed from the global download queue."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1014
+#: apt.conf.5.xml:1009
 msgid ""
 "Output status messages and errors related to verifying checksums and "
 "cryptographic signatures of downloaded files."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1024
+#: apt.conf.5.xml:1019
 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><listitem><para>
-#: apt.conf.5.xml:1036
+#: apt.conf.5.xml:1031
 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><listitem><para>
-#: apt.conf.5.xml:1047
+#: apt.conf.5.xml:1042
 msgid "Log all interactions with the sub-processes that actually perform downloads."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1058
+#: apt.conf.5.xml:1053
 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><listitem><para>
-#: apt.conf.5.xml:1068
+#: apt.conf.5.xml:1063
 msgid ""
 "Generate debug messages describing which packages are being automatically "
 "installed to resolve dependencies.  This corresponds to the initial "
@@ -3710,7 +3711,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1082
+#: apt.conf.5.xml:1077
 msgid ""
 "Generate debug messages describing which packages are marked as "
 "keep/install/remove while the ProblemResolver does his work.  Each addition "
@@ -3728,45 +3729,45 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1103
+#: apt.conf.5.xml:1098
 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><listitem><para>
-#: apt.conf.5.xml:1114
+#: apt.conf.5.xml:1109
 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><listitem><para>
-#: apt.conf.5.xml:1125
+#: apt.conf.5.xml:1120
 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><listitem><para>
-#: apt.conf.5.xml:1137
+#: apt.conf.5.xml:1132
 msgid "Output status messages tracing the steps performed when invoking &dpkg;."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1148
+#: apt.conf.5.xml:1143
 msgid "Output the priority of each package list on startup."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1158
+#: apt.conf.5.xml:1153
 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><listitem><para>
-#: apt.conf.5.xml:1169
+#: apt.conf.5.xml:1164
 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 "
@@ -3774,14 +3775,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1181
+#: apt.conf.5.xml:1176
 msgid ""
 "Print information about the vendors read from "
 "<filename>/etc/apt/vendors.list</filename>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1191
+#: apt.conf.5.xml:1186
 msgid ""
 "Display the external commands that are called by apt hooks.  This includes "
 "e.g. the config options <literal>DPkg::{Pre,Post}-Invoke</literal> or "
@@ -3789,12 +3790,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1215 apt_preferences.5.xml:547 sources.list.5.xml:239 apt-ftparchive.1.xml:598
+#: apt.conf.5.xml:1210 apt_preferences.5.xml:541 sources.list.5.xml:233 apt-ftparchive.1.xml:592
 msgid "Examples"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1216
+#: apt.conf.5.xml:1211
 msgid ""
 "&configureindex; is a configuration file showing example values for all "
 "possible options."
@@ -3802,17 +3803,17 @@ msgstr ""
 
 #.  ? reading apt.conf 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1228
+#: apt.conf.5.xml:1223
 msgid "&apt-cache;, &apt-config;, &apt-preferences;."
 msgstr ""
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt_preferences.5.xml:34
+#: apt_preferences.5.xml:28
 msgid "Preference control file for APT"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:39
+#: apt_preferences.5.xml:33
 msgid ""
 "The APT preferences file <filename>/etc/apt/preferences</filename> and the "
 "fragment files in the <filename>/etc/apt/preferences.d/</filename> folder "
@@ -3821,7 +3822,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:44
+#: apt_preferences.5.xml:38
 msgid ""
 "Several versions of a package may be available for installation when the "
 "&sources-list; file contains references to more than one distribution (for "
@@ -3834,7 +3835,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:54
+#: apt_preferences.5.xml:48
 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 "
@@ -3844,7 +3845,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:61
+#: apt_preferences.5.xml:55
 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 "
@@ -3858,7 +3859,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:72
+#: apt_preferences.5.xml:66
 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 "
@@ -3871,12 +3872,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:81
+#: apt_preferences.5.xml:75
 msgid "APT's Default Priority Assignments"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:96
+#: apt_preferences.5.xml:90
 #, no-wrap
 msgid ""
 "<command>apt-get install -t testing "
@@ -3884,13 +3885,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:99
+#: apt_preferences.5.xml:93
 #, no-wrap
 msgid "APT::Default-Release \"stable\";\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:83
+#: apt_preferences.5.xml:77
 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 "
@@ -3907,19 +3908,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:103
+#: apt_preferences.5.xml:97
 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:"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:108
+#: apt_preferences.5.xml:102
 msgid "priority 1"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:109
+#: apt_preferences.5.xml:103
 msgid ""
 "to the versions coming from archives which in their "
 "<filename>Release</filename> files are marked as \"NotAutomatic: yes\" but "
@@ -3928,12 +3929,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:115
+#: apt_preferences.5.xml:109
 msgid "priority 100"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:116
+#: apt_preferences.5.xml:110
 msgid ""
 "to the version that is already installed (if any) and to the versions coming "
 "from archives which in their <filename>Release</filename> files are marked "
@@ -3942,29 +3943,29 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:123
+#: apt_preferences.5.xml:117
 msgid "priority 500"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:124
+#: apt_preferences.5.xml:118
 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:128
+#: apt_preferences.5.xml:122
 msgid "priority 990"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:129
+#: apt_preferences.5.xml:123
 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:134
+#: apt_preferences.5.xml:128
 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 "
@@ -3975,14 +3976,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:141
+#: apt_preferences.5.xml:135
 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:144
+#: apt_preferences.5.xml:138
 msgid ""
 "Never downgrade unless the priority of an available version exceeds 1000.  "
 "(\"Downgrading\" is installing a less recent version of a package in place "
@@ -3992,19 +3993,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:150
+#: apt_preferences.5.xml:144
 msgid "Install the highest priority version."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:151
+#: apt_preferences.5.xml:145
 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:154
+#: apt_preferences.5.xml:148
 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 "
@@ -4012,7 +4013,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:160
+#: apt_preferences.5.xml:154
 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 "
@@ -4023,7 +4024,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:167
+#: apt_preferences.5.xml:161
 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 "
@@ -4033,7 +4034,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:172
+#: apt_preferences.5.xml:166
 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 "
@@ -4045,12 +4046,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:181
+#: apt_preferences.5.xml:175
 msgid "The Effect of APT Preferences"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:183
+#: apt_preferences.5.xml:177
 msgid ""
 "The APT preferences file allows the system administrator to control the "
 "assignment of priorities.  The file consists of one or more multi-line "
@@ -4059,7 +4060,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:189
+#: apt_preferences.5.xml:183
 msgid ""
 "The specific form assigns a priority (a \"Pin-Priority\") to one or more "
 "specified packages with a specified version or version range.  For example, "
@@ -4070,7 +4071,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:196
+#: apt_preferences.5.xml:190
 #, no-wrap
 msgid ""
 "Package: perl\n"
@@ -4079,7 +4080,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:202
+#: apt_preferences.5.xml:196
 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 "
@@ -4089,7 +4090,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:208
+#: apt_preferences.5.xml:202
 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 "
@@ -4097,7 +4098,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:213
+#: apt_preferences.5.xml:207
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -4106,7 +4107,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:218
+#: apt_preferences.5.xml:212
 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 "
@@ -4115,7 +4116,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:222
+#: apt_preferences.5.xml:216
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -4124,7 +4125,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:226
+#: apt_preferences.5.xml:220
 msgid ""
 "This should <emphasis>not</emphasis> be confused with the Origin of a "
 "distribution as specified in a <filename>Release</filename> file.  What "
@@ -4134,7 +4135,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:231
+#: apt_preferences.5.xml:225
 msgid ""
 "The following record assigns a low priority to all package versions "
 "belonging to any distribution whose Archive name is "
@@ -4142,7 +4143,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:235
+#: apt_preferences.5.xml:229
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -4151,7 +4152,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:240
+#: apt_preferences.5.xml:234
 msgid ""
 "The following record assigns a high priority to all package versions "
 "belonging to any distribution whose Codename is "
@@ -4159,7 +4160,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:244
+#: apt_preferences.5.xml:238
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -4168,7 +4169,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:249
+#: apt_preferences.5.xml:243
 msgid ""
 "The following record assigns a high priority to all package versions "
 "belonging to any release whose Archive name is \"<literal>stable</literal>\" "
@@ -4176,7 +4177,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:254
+#: apt_preferences.5.xml:248
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -4185,12 +4186,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:264
+#: apt_preferences.5.xml:258
 msgid "Regular expressions and &glob; syntax"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:266
+#: apt_preferences.5.xml:260
 msgid ""
 "APT also supports pinning by &glob; expressions, and regular expressions "
 "surrounded by slashes. For example, the following example assigns the "
@@ -4200,7 +4201,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:275
+#: apt_preferences.5.xml:269
 #, no-wrap
 msgid ""
 "Package: gnome* /kde/\n"
@@ -4209,7 +4210,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:281
+#: apt_preferences.5.xml:275
 msgid ""
 "The rule for those expressions is that they can occur anywhere where a "
 "string can occur. Thus, the following pin assigns the priority 990 to all "
@@ -4217,7 +4218,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:287
+#: apt_preferences.5.xml:281
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -4226,7 +4227,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:293
+#: apt_preferences.5.xml:287
 msgid ""
 "If a regular expression occurs in a <literal>Package</literal> field, the "
 "behavior is the same as if this regular expression were replaced with a list "
@@ -4237,89 +4238,89 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:309
+#: apt_preferences.5.xml:303
 msgid "How APT Interprets Priorities"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:312
+#: apt_preferences.5.xml:306
 msgid ""
 "Priorities (P) assigned in the APT preferences file must be positive or "
 "negative integers.  They are interpreted as follows (roughly speaking):"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:317
+#: apt_preferences.5.xml:311
 msgid "P &gt;= 1000"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:318
+#: apt_preferences.5.xml:312
 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:322
+#: apt_preferences.5.xml:316
 msgid "990 &lt;= P &lt; 1000"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:323
+#: apt_preferences.5.xml:317
 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:328
+#: apt_preferences.5.xml:322
 msgid "500 &lt;= P &lt; 990"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:329
+#: apt_preferences.5.xml:323
 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:334
+#: apt_preferences.5.xml:328
 msgid "100 &lt;= P &lt; 500"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:335
+#: apt_preferences.5.xml:329
 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:340
+#: apt_preferences.5.xml:334
 msgid "0 &lt; P &lt; 100"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:341
+#: apt_preferences.5.xml:335
 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:345
+#: apt_preferences.5.xml:339
 msgid "P &lt; 0"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:346
+#: apt_preferences.5.xml:340
 msgid "prevents the version from being installed"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:351
+#: apt_preferences.5.xml:345
 msgid ""
 "If any specific-form records match an available package version then the "
 "first such record determines the priority of the package version.  Failing "
@@ -4328,14 +4329,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:357
+#: apt_preferences.5.xml:351
 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:361
+#: apt_preferences.5.xml:355
 #, no-wrap
 msgid ""
 "Package: perl\n"
@@ -4352,12 +4353,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:374
+#: apt_preferences.5.xml:368
 msgid "Then:"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:376
+#: apt_preferences.5.xml:370
 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 "
@@ -4368,7 +4369,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:381
+#: apt_preferences.5.xml:375
 msgid ""
 "A version of any package other than <literal>perl</literal> that is "
 "available from the local system has priority over other versions, even "
@@ -4376,7 +4377,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:385
+#: apt_preferences.5.xml:379
 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 "
@@ -4385,12 +4386,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:395
+#: apt_preferences.5.xml:389
 msgid "Determination of Package Version and Distribution Properties"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:397
+#: apt_preferences.5.xml:391
 msgid ""
 "The locations listed in the &sources-list; file should provide "
 "<filename>Packages</filename> and <filename>Release</filename> files to "
@@ -4398,7 +4399,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:401
+#: apt_preferences.5.xml:395
 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>: "
@@ -4410,27 +4411,27 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:409
+#: apt_preferences.5.xml:403
 msgid "the <literal>Package:</literal> line"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:410
+#: apt_preferences.5.xml:404
 msgid "gives the package name"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:413 apt_preferences.5.xml:463
+#: apt_preferences.5.xml:407 apt_preferences.5.xml:457
 msgid "the <literal>Version:</literal> line"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:414
+#: apt_preferences.5.xml:408
 msgid "gives the version number for the named package"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:419
+#: apt_preferences.5.xml:413
 msgid ""
 "The <filename>Release</filename> file is normally found in the directory "
 "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
@@ -4443,12 +4444,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:430
+#: apt_preferences.5.xml:424
 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:431
+#: apt_preferences.5.xml:425
 msgid ""
 "names the archive to which all the packages in the directory tree belong.  "
 "For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@ -4459,18 +4460,18 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:441
+#: apt_preferences.5.xml:435
 #, no-wrap
 msgid "Pin: release a=stable\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:447
+#: apt_preferences.5.xml:441
 msgid "the <literal>Codename:</literal> line"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:448
+#: apt_preferences.5.xml:442
 msgid ""
 "names the codename to which all the packages in the directory tree belong.  "
 "For example, the line \"Codename: &testing-codename;\" specifies that all of "
@@ -4481,13 +4482,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:457
+#: apt_preferences.5.xml:451
 #, no-wrap
 msgid "Pin: release n=&testing-codename;\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:464
+#: apt_preferences.5.xml:458
 msgid ""
 "names the release version.  For example, the packages in the tree might "
 "belong to Debian release version &stable-version;.  Note that there is "
@@ -4498,7 +4499,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:473
+#: apt_preferences.5.xml:467
 #, no-wrap
 msgid ""
 "Pin: release v=&stable-version;\n"
@@ -4507,12 +4508,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:482
+#: apt_preferences.5.xml:476
 msgid "the <literal>Component:</literal> line"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:483
+#: apt_preferences.5.xml:477
 msgid ""
 "names the licensing component associated with the packages in the directory "
 "tree of the <filename>Release</filename> file.  For example, the line "
@@ -4524,18 +4525,18 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:492
+#: apt_preferences.5.xml:486
 #, no-wrap
 msgid "Pin: release c=main\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:498
+#: apt_preferences.5.xml:492
 msgid "the <literal>Origin:</literal> line"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:499
+#: apt_preferences.5.xml:493
 msgid ""
 "names the originator of the packages in the directory tree of the "
 "<filename>Release</filename> file.  Most commonly, this is "
@@ -4544,18 +4545,18 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:505
+#: apt_preferences.5.xml:499
 #, no-wrap
 msgid "Pin: release o=Debian\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:511
+#: apt_preferences.5.xml:505
 msgid "the <literal>Label:</literal> line"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:512
+#: apt_preferences.5.xml:506
 msgid ""
 "names the label of the packages in the directory tree of the "
 "<filename>Release</filename> file.  Most commonly, this is "
@@ -4564,13 +4565,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:518
+#: apt_preferences.5.xml:512
 #, no-wrap
 msgid "Pin: release l=Debian\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:525
+#: apt_preferences.5.xml:519
 msgid ""
 "All of the <filename>Packages</filename> and <filename>Release</filename> "
 "files retrieved from locations listed in the &sources-list; file are stored "
@@ -4585,12 +4586,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:538
+#: apt_preferences.5.xml:532
 msgid "Optional Lines in an APT Preferences Record"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:540
+#: apt_preferences.5.xml:534
 msgid ""
 "Each record in the APT preferences file can optionally begin with one or "
 "more lines beginning with the word <literal>Explanation:</literal>.  This "
@@ -4598,12 +4599,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:549
+#: apt_preferences.5.xml:543
 msgid "Tracking Stable"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:557
+#: apt_preferences.5.xml:551
 #, no-wrap
 msgid ""
 "Explanation: Uninstall or do not install any Debian-originated\n"
@@ -4618,7 +4619,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:551
+#: apt_preferences.5.xml:545
 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 "
@@ -4628,7 +4629,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:574 apt_preferences.5.xml:620 apt_preferences.5.xml:678
+#: apt_preferences.5.xml:568 apt_preferences.5.xml:614 apt_preferences.5.xml:672
 #, no-wrap
 msgid ""
 "apt-get install <replaceable>package-name</replaceable>\n"
@@ -4637,7 +4638,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:569
+#: apt_preferences.5.xml:563
 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 "
@@ -4646,13 +4647,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:586
+#: apt_preferences.5.xml:580
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/testing\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:580
+#: apt_preferences.5.xml:574
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>testing</literal> distribution; the package "
@@ -4661,12 +4662,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:592
+#: apt_preferences.5.xml:586
 msgid "Tracking Testing or Unstable"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:601
+#: apt_preferences.5.xml:595
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -4683,7 +4684,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:594
+#: apt_preferences.5.xml:588
 msgid ""
 "The following APT preferences file will cause APT to assign a high priority "
 "to package versions from the <literal>testing</literal> distribution, a "
@@ -4694,7 +4695,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:615
+#: apt_preferences.5.xml:609
 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 "
@@ -4703,13 +4704,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:635
+#: apt_preferences.5.xml:629
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:626
+#: apt_preferences.5.xml:620
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>unstable</literal> distribution.  "
@@ -4721,12 +4722,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:642
+#: apt_preferences.5.xml:636
 msgid "Tracking the evolution of a codename release"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:656
+#: apt_preferences.5.xml:650
 #, no-wrap
 msgid ""
 "Explanation: Uninstall or do not install any Debian-originated package "
@@ -4748,7 +4749,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:644
+#: apt_preferences.5.xml:638
 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 "
@@ -4763,7 +4764,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:673
+#: apt_preferences.5.xml:667
 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 "
@@ -4772,13 +4773,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:693
+#: apt_preferences.5.xml:687
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/sid\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:684
+#: apt_preferences.5.xml:678
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>sid</literal> distribution.  Thereafter, "
@@ -4790,17 +4791,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:708
+#: apt_preferences.5.xml:702
 msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 msgstr ""
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: sources.list.5.xml:35
+#: sources.list.5.xml:29
 msgid "List of configured APT data sources"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:40
+#: sources.list.5.xml:34
 msgid ""
 "The source list <filename>/etc/apt/sources.list</filename> is designed to "
 "support any number of active sources and a variety of source media. The file "
@@ -4811,7 +4812,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:47
+#: sources.list.5.xml:41
 msgid ""
 "Each line specifying a source starts with type "
 "(e.g. <literal>deb-src</literal>)  followed by options and arguments for "
@@ -4821,12 +4822,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:55
+#: sources.list.5.xml:49
 msgid "sources.list.d"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:56
+#: sources.list.5.xml:50
 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 "
@@ -4839,12 +4840,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:67
+#: sources.list.5.xml:61
 msgid "The deb and deb-src types"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:68
+#: sources.list.5.xml:62
 msgid ""
 "The <literal>deb</literal> type references a typical two-level Debian "
 "archive, <filename>distribution/component</filename>. The "
@@ -4860,20 +4861,20 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:79
+#: sources.list.5.xml:73
 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:82
+#: sources.list.5.xml:76
 #, no-wrap
 msgid "deb [ options ] uri suite [component1] [component2] [...]"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:86
+#: sources.list.5.xml:80
 #, no-wrap
 msgid ""
 "     Types: deb deb-src\n"
@@ -4896,14 +4897,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:84
+#: sources.list.5.xml:78
 msgid ""
 "Alternatively a rfc822 style format is also supported: <placeholder "
 "type=\"literallayout\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:105
+#: sources.list.5.xml:99
 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.  "
@@ -4916,7 +4917,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:114
+#: sources.list.5.xml:108
 msgid ""
 "<literal>suite</literal> may also contain a variable, "
 "<literal>$(ARCH)</literal> which expands to the Debian architecture (such as "
@@ -4928,7 +4929,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:122
+#: sources.list.5.xml:116
 msgid ""
 "In the traditional style sources.list format since only one distribution can "
 "be specified per line it may be necessary to have multiple lines for the "
@@ -4944,7 +4945,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:136
+#: sources.list.5.xml:130
 msgid ""
 "<literal>options</literal> is always optional and needs to be surrounded by "
 "square brackets. It can consist of multiple settings in the form "
@@ -4955,7 +4956,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:142
+#: sources.list.5.xml:136
 msgid ""
 "<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</replaceable>,…</literal> "
 "can be used to specify for which architectures information should be "
@@ -4964,7 +4965,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:146
+#: sources.list.5.xml:140
 msgid ""
 "<literal>arch+=<replaceable>arch1</replaceable>,<replaceable>arch2</replaceable>,…</literal> "
 "and "
@@ -4974,7 +4975,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:149
+#: sources.list.5.xml:143
 msgid ""
 "<literal>trusted=yes</literal> can be set to indicate that packages from "
 "this source are always authenticated even if the "
@@ -4986,7 +4987,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:156
+#: sources.list.5.xml:150
 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 "
@@ -4995,12 +4996,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:161
+#: sources.list.5.xml:155
 msgid "Some examples:"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:163
+#: sources.list.5.xml:157
 #, no-wrap
 msgid ""
 "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
@@ -5010,17 +5011,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:169
+#: sources.list.5.xml:163
 msgid "URI specification"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:171
+#: sources.list.5.xml:165
 msgid "The currently recognized URI types are:"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:175
+#: sources.list.5.xml:169
 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 "
@@ -5028,7 +5029,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:182
+#: sources.list.5.xml:176
 msgid ""
 "The cdrom scheme allows APT to use a local CD-ROM drive with media "
 "swapping. Use the &apt-cdrom; program to create cdrom entries in the source "
@@ -5036,7 +5037,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:189
+#: sources.list.5.xml:183
 msgid ""
 "The http scheme specifies an HTTP server for the archive. If an environment "
 "variable <envar>http_proxy</envar> is set with the format "
@@ -5047,7 +5048,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:200
+#: sources.list.5.xml:194
 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 "
@@ -5060,7 +5061,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:212
+#: sources.list.5.xml:206
 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.  "
@@ -5069,7 +5070,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:219
+#: sources.list.5.xml:213
 msgid ""
 "The rsh/ssh method invokes RSH/SSH to connect to a remote host and access "
 "the files as a given user. Prior configuration of rhosts or RSA keys is "
@@ -5078,12 +5079,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:226
+#: sources.list.5.xml:220
 msgid "adding more recognizable URI types"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:228
+#: sources.list.5.xml:222
 msgid ""
 "APT can be extended with more methods shipped in other optional packages, "
 "which should follow the naming scheme "
@@ -5095,42 +5096,42 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:240
+#: sources.list.5.xml:234
 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:242
+#: sources.list.5.xml:236
 #, no-wrap
 msgid "deb file:/home/jason/debian stable main contrib non-free"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:244
+#: sources.list.5.xml:238
 msgid "As above, except this uses the unstable (development) distribution."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:245
+#: sources.list.5.xml:239
 #, no-wrap
 msgid "deb file:/home/jason/debian unstable main contrib non-free"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:247
+#: sources.list.5.xml:241
 msgid "Source line for the above"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:248
+#: sources.list.5.xml:242
 #, 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:250
+#: sources.list.5.xml:244
 msgid ""
 "The first line gets package information for the architectures in "
 "<literal>APT::Architectures</literal> while the second always retrieves "
@@ -5138,7 +5139,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:252
+#: sources.list.5.xml:246
 #, no-wrap
 msgid ""
 "deb http://ftp.debian.org/debian &stable-codename; main\n"
@@ -5146,33 +5147,33 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:255
+#: sources.list.5.xml:249
 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:257
+#: sources.list.5.xml:251
 #, no-wrap
 msgid "deb http://archive.debian.org/debian-archive hamm main"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:259
+#: sources.list.5.xml:253
 msgid ""
 "Uses FTP to access the archive at ftp.debian.org, under the debian "
 "directory, and uses only the &stable-codename;/contrib area."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:261
+#: sources.list.5.xml:255
 #, no-wrap
 msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:263
+#: sources.list.5.xml:257
 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 "
@@ -5181,19 +5182,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:267
+#: sources.list.5.xml:261
 #, no-wrap
 msgid "deb ftp://ftp.debian.org/debian unstable contrib"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:276
+#: sources.list.5.xml:270
 #, no-wrap
 msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:269
+#: sources.list.5.xml:263
 msgid ""
 "Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe "
 "directory, and uses only files found under "
@@ -5205,24 +5206,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:281
+#: sources.list.5.xml:275
 msgid "&apt-cache; &apt-conf;"
 msgstr ""
 
 #. type: Content of: <refentry><refmeta><manvolnum>
-#: apt-extracttemplates.1.xml:28 apt-sortpkgs.1.xml:28 apt-ftparchive.1.xml:28
+#: apt-extracttemplates.1.xml:22 apt-sortpkgs.1.xml:22 apt-ftparchive.1.xml:22
 msgid "1"
 msgstr ""
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-extracttemplates.1.xml:35
+#: apt-extracttemplates.1.xml:29
 msgid ""
 "Utility to extract <command>debconf</command> config and templates from "
 "Debian packages"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:41
+#: apt-extracttemplates.1.xml:35
 msgid ""
 "<command>apt-extracttemplates</command> will take one or more Debian package "
 "files as input and write out (to a temporary directory) all associated "
@@ -5232,12 +5233,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:46
+#: apt-extracttemplates.1.xml:40
 msgid "package version template-file config-script"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:47
+#: apt-extracttemplates.1.xml:41
 msgid ""
 "template-file and config-script are written to the temporary directory "
 "specified by the <option>-t</option> or <option>--tempdir</option> "
@@ -5247,7 +5248,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-extracttemplates.1.xml:60
+#: apt-extracttemplates.1.xml:54
 msgid ""
 "Temporary directory in which to write extracted <command>debconf</command> "
 "template files and config scripts.  Configuration Item: "
@@ -5255,19 +5256,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:77
+#: apt-extracttemplates.1.xml:71
 msgid ""
 "<command>apt-extracttemplates</command> returns zero on normal operation, "
 "decimal 100 on error."
 msgstr ""
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-sortpkgs.1.xml:35
+#: apt-sortpkgs.1.xml:29
 msgid "Utility to sort package index files"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-sortpkgs.1.xml:41
+#: apt-sortpkgs.1.xml:35
 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 "
@@ -5276,31 +5277,31 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-sortpkgs.1.xml:47
+#: apt-sortpkgs.1.xml:41
 msgid "All output is sent to standard output; the input must be a seekable file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-sortpkgs.1.xml:56
+#: apt-sortpkgs.1.xml:50
 msgid ""
 "Use source index field ordering.  Configuration Item: "
 "<literal>APT::SortPkgs::Source</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-sortpkgs.1.xml:70
+#: apt-sortpkgs.1.xml:64
 msgid ""
 "<command>apt-sortpkgs</command> returns zero on normal operation, decimal "
 "100 on error."
 msgstr ""
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-ftparchive.1.xml:35
+#: apt-ftparchive.1.xml:29
 msgid "Utility to generate index files"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:41
+#: apt-ftparchive.1.xml:35
 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 "
@@ -5309,7 +5310,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:45
+#: apt-ftparchive.1.xml:39
 msgid ""
 "<command>apt-ftparchive</command> is a superset of the &dpkg-scanpackages; "
 "program, incorporating its entire functionality via the "
@@ -5319,7 +5320,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:51
+#: apt-ftparchive.1.xml:45
 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 "
@@ -5329,7 +5330,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:62
+#: apt-ftparchive.1.xml:56
 msgid ""
 "The packages command generates a package file from a directory tree. It "
 "takes the given directory and recursively searches it for .deb files, "
@@ -5338,12 +5339,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:67 apt-ftparchive.1.xml:91
+#: apt-ftparchive.1.xml:61 apt-ftparchive.1.xml:85
 msgid "The option <option>--db</option> can be used to specify a binary caching DB."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:72
+#: apt-ftparchive.1.xml:66
 msgid ""
 "The <literal>sources</literal> command generates a source index file from a "
 "directory tree.  It takes the given directory and recursively searches it "
@@ -5352,7 +5353,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:77
+#: apt-ftparchive.1.xml:71
 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 "
@@ -5360,7 +5361,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:84
+#: apt-ftparchive.1.xml:78
 msgid ""
 "The <literal>contents</literal> command generates a contents file from a "
 "directory tree. It takes the given directory and recursively searches it for "
@@ -5371,7 +5372,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:96
+#: apt-ftparchive.1.xml:90
 msgid ""
 "The <literal>release</literal> command generates a Release file from a "
 "directory tree. It recursively searches the given directory for uncompressed "
@@ -5387,7 +5388,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:106
+#: apt-ftparchive.1.xml:100
 msgid ""
 "Values for the additional metadata fields in the Release file are taken from "
 "the corresponding variables under "
@@ -5401,7 +5402,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:119
+#: apt-ftparchive.1.xml:113
 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 "
@@ -5411,19 +5412,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:128
+#: apt-ftparchive.1.xml:122
 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:134
+#: apt-ftparchive.1.xml:128
 msgid "The Generate Configuration"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:136
+#: apt-ftparchive.1.xml:130
 msgid ""
 "The <literal>generate</literal> command uses a configuration file to "
 "describe the archives that are going to be generated. It follows the typical "
@@ -5434,17 +5435,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:144
+#: apt-ftparchive.1.xml:138
 msgid "The generate configuration has four separate sections, each described below."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:146
+#: apt-ftparchive.1.xml:140
 msgid "<literal>Dir</literal> Section"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:148
+#: apt-ftparchive.1.xml:142
 msgid ""
 "The <literal>Dir</literal> section defines the standard directories needed "
 "to locate the files required during the generation process. These "
@@ -5453,7 +5454,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:155
+#: apt-ftparchive.1.xml:149
 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 "
@@ -5461,29 +5462,29 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:162
+#: apt-ftparchive.1.xml:156
 msgid "Specifies the location of the override files."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:167
+#: apt-ftparchive.1.xml:161
 msgid "Specifies the location of the cache files."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:172
+#: apt-ftparchive.1.xml:166
 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:178
+#: apt-ftparchive.1.xml:172
 msgid "<literal>Default</literal> Section"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:180
+#: apt-ftparchive.1.xml:174
 msgid ""
 "The <literal>Default</literal> section specifies default values, and "
 "settings that control the operation of the generator. Other sections may "
@@ -5491,7 +5492,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:186
+#: apt-ftparchive.1.xml:180
 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 "
@@ -5500,42 +5501,42 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:194
+#: apt-ftparchive.1.xml:188
 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><listitem><para>
-#: apt-ftparchive.1.xml:200
+#: apt-ftparchive.1.xml:194
 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><listitem><para>
-#: apt-ftparchive.1.xml:206
+#: apt-ftparchive.1.xml:200
 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><listitem><para>
-#: apt-ftparchive.1.xml:212
+#: apt-ftparchive.1.xml:206
 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><listitem><para>
-#: apt-ftparchive.1.xml:218
+#: apt-ftparchive.1.xml:212
 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><listitem><para>
-#: apt-ftparchive.1.xml:224
+#: apt-ftparchive.1.xml:218
 msgid ""
 "Specifies the number of kilobytes to delink (and replace with hard links) "
 "per run. This is used in conjunction with the per-section "
@@ -5543,14 +5544,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:231
+#: apt-ftparchive.1.xml:225
 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><listitem><para>
-#: apt-ftparchive.1.xml:238 apt-ftparchive.1.xml:384
+#: apt-ftparchive.1.xml:232 apt-ftparchive.1.xml:378
 msgid ""
 "Specifies whether long descriptions should be included in the "
 "<filename>Packages</filename> file or split out into a master "
@@ -5558,12 +5559,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:244
+#: apt-ftparchive.1.xml:238
 msgid "<literal>TreeDefault</literal> Section"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:246
+#: apt-ftparchive.1.xml:240
 msgid ""
 "Sets defaults specific to <literal>Tree</literal> sections. All of these "
 "variables are substitution variables and have the strings $(DIST), "
@@ -5571,7 +5572,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:253
+#: apt-ftparchive.1.xml:247
 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 "
@@ -5579,7 +5580,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:260
+#: apt-ftparchive.1.xml:254
 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 "
@@ -5590,35 +5591,35 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:271
+#: apt-ftparchive.1.xml:265
 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><listitem><para>
-#: apt-ftparchive.1.xml:277
+#: apt-ftparchive.1.xml:271
 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><listitem><para>
-#: apt-ftparchive.1.xml:283
+#: apt-ftparchive.1.xml:277
 msgid ""
 "Sets the output Packages file. Defaults to "
 "<filename>$(DIST)/$(SECTION)/binary-$(ARCH)/Packages</filename>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:289
+#: apt-ftparchive.1.xml:283
 msgid ""
 "Sets the output Sources file. Defaults to "
 "<filename>$(DIST)/$(SECTION)/source/Sources</filename>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:295
+#: apt-ftparchive.1.xml:289
 msgid ""
 "Sets the output Translation-en master file with the long descriptions if "
 "they should be not included in the Packages file. Defaults to "
@@ -5626,7 +5627,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:302
+#: apt-ftparchive.1.xml:296
 msgid ""
 "Sets the path prefix that causes a symlink to be considered an internal link "
 "instead of an external link. Defaults to "
@@ -5634,7 +5635,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:309
+#: apt-ftparchive.1.xml:303
 msgid ""
 "Sets the output Contents file. Defaults to "
 "<filename>$(DIST)/$(SECTION)/Contents-$(ARCH)</filename>. If this setting "
@@ -5644,19 +5645,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:318
+#: apt-ftparchive.1.xml:312
 msgid "Sets header file to prepend to the contents output."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:323
+#: apt-ftparchive.1.xml:317
 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><listitem><para>
-#: apt-ftparchive.1.xml:329
+#: apt-ftparchive.1.xml:323
 msgid ""
 "Specifies that instead of walking the directory tree, "
 "<command>apt-ftparchive</command> should read the list of files from the "
@@ -5664,7 +5665,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:336
+#: apt-ftparchive.1.xml:330
 msgid ""
 "Specifies that instead of walking the directory tree, "
 "<command>apt-ftparchive</command> should read the list of files from the "
@@ -5673,12 +5674,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:344
+#: apt-ftparchive.1.xml:338
 msgid "<literal>Tree</literal> Section"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:346
+#: apt-ftparchive.1.xml:340
 msgid ""
 "The <literal>Tree</literal> section defines a standard Debian file tree "
 "which consists of a base directory, then multiple sections in that base "
@@ -5688,7 +5689,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:351
+#: apt-ftparchive.1.xml:345
 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 "
@@ -5697,7 +5698,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:356
+#: apt-ftparchive.1.xml:350
 msgid ""
 "All of the settings defined in the <literal>TreeDefault</literal> section "
 "can be used in a <literal>Tree</literal> section as well as three new "
@@ -5705,7 +5706,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt-ftparchive.1.xml:362
+#: apt-ftparchive.1.xml:356
 #, no-wrap
 msgid ""
 "for i in Sections do \n"
@@ -5715,7 +5716,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:359
+#: apt-ftparchive.1.xml:353
 msgid ""
 "When processing a <literal>Tree</literal> section "
 "<command>apt-ftparchive</command> performs an operation similar to: "
@@ -5723,7 +5724,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:370
+#: apt-ftparchive.1.xml:364
 msgid ""
 "This is a space separated list of sections which appear under the "
 "distribution; typically this is something like <literal>main contrib "
@@ -5731,7 +5732,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:377
+#: apt-ftparchive.1.xml:371
 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 "
@@ -5739,36 +5740,36 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:390
+#: apt-ftparchive.1.xml:384
 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><listitem><para>
-#: apt-ftparchive.1.xml:396
+#: apt-ftparchive.1.xml:390
 msgid ""
 "Sets the source override file. The override file contains section "
 "information."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:402 apt-ftparchive.1.xml:448
+#: apt-ftparchive.1.xml:396 apt-ftparchive.1.xml:442
 msgid "Sets the binary extra override file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:407 apt-ftparchive.1.xml:453
+#: apt-ftparchive.1.xml:401 apt-ftparchive.1.xml:447
 msgid "Sets the source extra override file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:412
+#: apt-ftparchive.1.xml:406
 msgid "<literal>BinDirectory</literal> Section"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:414
+#: apt-ftparchive.1.xml:408
 msgid ""
 "The <literal>bindirectory</literal> section defines a binary directory tree "
 "with no special structure. The scope tag specifies the location of the "
@@ -5778,54 +5779,54 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:422
+#: apt-ftparchive.1.xml:416
 msgid "Sets the Packages file output."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:427
+#: apt-ftparchive.1.xml:421
 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:433
+#: apt-ftparchive.1.xml:427
 msgid "Sets the Contents file output (optional)."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:438
+#: apt-ftparchive.1.xml:432
 msgid "Sets the binary override file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:443
+#: apt-ftparchive.1.xml:437
 msgid "Sets the source override file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:458
+#: apt-ftparchive.1.xml:452
 msgid "Sets the cache DB."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:463
+#: apt-ftparchive.1.xml:457
 msgid "Appends a path to all the output paths."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:468
+#: apt-ftparchive.1.xml:462
 msgid "Specifies the file list file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:475
+#: apt-ftparchive.1.xml:469
 msgid "The Binary Override File"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:476
+#: apt-ftparchive.1.xml:470
 msgid ""
 "The binary override file is fully compatible with &dpkg-scanpackages;. It "
 "contains four fields separated by spaces. The first field is the package "
@@ -5835,19 +5836,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:482
+#: apt-ftparchive.1.xml:476
 #, no-wrap
 msgid "old [// oldn]* => new"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:484
+#: apt-ftparchive.1.xml:478
 #, no-wrap
 msgid "new"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:481
+#: apt-ftparchive.1.xml:475
 msgid ""
 "The general form of the maintainer field is: <placeholder "
 "type=\"literallayout\" id=\"0\"/> or simply, <placeholder "
@@ -5858,12 +5859,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:492
+#: apt-ftparchive.1.xml:486
 msgid "The Source Override File"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:494
+#: apt-ftparchive.1.xml:488
 msgid ""
 "The source override file is fully compatible with &dpkg-scansources;. It "
 "contains two fields separated by spaces. The first field is the source "
@@ -5871,12 +5872,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:499
+#: apt-ftparchive.1.xml:493
 msgid "The Extra Override File"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:501
+#: apt-ftparchive.1.xml:495
 msgid ""
 "The extra override file allows any arbitrary tag to be added or replaced in "
 "the output. It has three columns, the first is the package, the second is "
@@ -5884,7 +5885,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:512
+#: apt-ftparchive.1.xml:506
 msgid ""
 "Generate the given checksum. These options default to on, when turned off "
 "the generated index files will not have the checksum fields where possible.  "
@@ -5900,14 +5901,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:523
+#: apt-ftparchive.1.xml:517
 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:529
+#: apt-ftparchive.1.xml:523
 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 "
@@ -5916,7 +5917,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:537
+#: apt-ftparchive.1.xml:531
 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 "
@@ -5925,7 +5926,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:545
+#: apt-ftparchive.1.xml:539
 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 "
@@ -5935,7 +5936,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:555
+#: apt-ftparchive.1.xml:549
 msgid ""
 "Select the source override file to use with the <literal>sources</literal> "
 "command.  Configuration Item: "
@@ -5943,14 +5944,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:561
+#: apt-ftparchive.1.xml:555
 msgid ""
 "Make the caching databases read only.  Configuration Item: "
 "<literal>APT::FTPArchive::ReadOnlyDB</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:566
+#: apt-ftparchive.1.xml:560
 msgid ""
 "Accept in the <literal>packages</literal> and <literal>contents</literal> "
 "commands only package files matching <literal>*_arch.deb</literal> or "
@@ -5959,7 +5960,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:574
+#: apt-ftparchive.1.xml:568
 msgid ""
 "&apt-ftparchive; caches as much as possible of metadata in a cachedb. If "
 "packages are recompiled and/or republished with the same version again, this "
@@ -5973,7 +5974,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:586
+#: apt-ftparchive.1.xml:580
 msgid ""
 "This configuration option defaults to \"<literal>true</literal>\" and should "
 "only be set to <literal>\"false\"</literal> if the Archive generated with "
@@ -5983,7 +5984,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><programlisting>
-#: apt-ftparchive.1.xml:604
+#: apt-ftparchive.1.xml:598
 #, no-wrap
 msgid ""
 "<command>apt-ftparchive</command> packages "
@@ -5992,48 +5993,63 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:600
+#: apt-ftparchive.1.xml:594
 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:614
+#: apt-ftparchive.1.xml:608
 msgid ""
 "<command>apt-ftparchive</command> returns zero on normal operation, decimal "
 "100 on error."
 msgstr ""
 
-#. type: <title></title>
-#: guide.sgml:4
+#. type: Attribute 'lang' of: <book>
+#: guide.dbk:9 offline.dbk:9
+msgid "en"
+msgstr ""
+
+#. type: Content of: <book><title>
+#: guide.dbk:11
 msgid "APT User's Guide"
 msgstr ""
 
-#. type: <author></author>
-#: guide.sgml:6 offline.sgml:6
-msgid "<name>Jason Gunthorpe </name><email>jgg@debian.org</email>"
+#. type: Content of: <book><bookinfo><authorgroup><author><personname>
+#: guide.dbk:17 offline.dbk:17
+msgid "Jason Gunthorpe"
 msgstr ""
 
-#. type: <version></version>
-#: guide.sgml:7
-msgid "$Id: guide.sgml,v 1.7 2003/04/26 23:26:13 doogie Exp $"
+#. type: Content of: <book><bookinfo><authorgroup><author><email>
+#: guide.dbk:17 offline.dbk:17
+msgid "jgg@debian.org"
 msgstr ""
 
-#. type: <abstract></abstract>
-#: guide.sgml:11
+#. type: Content of: <book><bookinfo><releaseinfo>
+#: guide.dbk:21 offline.dbk:21
+msgid "Version &apt-product-version;"
+msgstr ""
+
+#. type: Content of: <book><bookinfo><abstract><para>
+#: guide.dbk:25
 msgid ""
 "This document provides an overview of how to use the the APT package "
 "manager."
 msgstr ""
 
-#. type: <copyrightsummary></copyrightsummary>
-#: guide.sgml:15
-msgid "Copyright &copy; Jason Gunthorpe, 1998."
+#. type: Content of: <book><bookinfo>
+#: guide.dbk:29
+msgid "<copyright><year>1998</year><holder>Jason Gunthorpe</holder></copyright>"
+msgstr ""
+
+#. type: Content of: <book><bookinfo><legalnotice><title>
+#: guide.dbk:32 offline.dbk:33
+msgid "License Notice"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:21 offline.sgml:22
+#. type: Content of: <book><bookinfo><legalnotice><para>
+#: guide.dbk:34 offline.dbk:35
 msgid ""
 "\"APT\" and this document are free software; you can redistribute them "
 "and/or modify them under the terms of the GNU General Public License as "
@@ -6041,42 +6057,42 @@ msgid ""
 "or (at your option) any later version."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:24 offline.sgml:25
+#. type: Content of: <book><bookinfo><legalnotice><para>
+#: guide.dbk:43 offline.dbk:41
 msgid ""
 "For more details, on Debian systems, see the file "
 "/usr/share/common-licenses/GPL for the full license."
 msgstr ""
 
-#. type: <heading></heading>
-#: guide.sgml:32
+#. type: Content of: <book><chapter><title>
+#: guide.dbk:50
 msgid "General"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:38
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:52
 msgid ""
 "The APT package currently contains two sections, the APT "
-"<prgn>dselect</prgn> method and the <prgn>apt-get</prgn> command line user "
-"interface. Both provide a way to install and remove packages as well as "
-"download new packages from the Internet."
+"<command>dselect</command> method and the <command>apt-get</command> command "
+"line user interface. Both provide a way to install and remove packages as "
+"well as download new packages from the Internet."
 msgstr ""
 
-#. type: <heading></heading>
-#: guide.sgml:39
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:58
 msgid "Anatomy of the Package System"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:44
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:60
 msgid ""
 "The Debian packaging system has a large amount of information associated "
 "with each package to help assure that it integrates cleanly and easily into "
 "the system. The most prominent of its features is the dependency system."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:52
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:65
 msgid ""
 "The dependency system allows individual programs to make use of shared "
 "elements in the system such as libraries. It simplifies placing infrequently "
@@ -6085,8 +6101,8 @@ msgid ""
 "in mail transport agents, X servers and so on."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:57
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:72
 msgid ""
 "The first step to understanding the dependency system is to grasp the "
 "concept of a simple dependency. The meaning of a simple dependency is that a "
@@ -6094,8 +6110,8 @@ msgid ""
 "properly."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:63
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:77
 msgid ""
 "For instance, mailcrypt is an emacs extension that aids in encrypting email "
 "with GPG. Without GPGP installed mailcrypt is useless, so mailcrypt has a "
@@ -6103,8 +6119,8 @@ msgid ""
 "simple dependency on emacs, without emacs it is completely useless."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:73
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:83
 msgid ""
 "The other important dependency to understand is a conflicting dependency. It "
 "means that a package, when installed with another package, will not work and "
@@ -6116,8 +6132,8 @@ msgid ""
 "other mail transport agents."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:83
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:93
 msgid ""
 "As an added complication there is the possibility for a package to pretend "
 "to be another package. Consider that exim and sendmail for many intents are "
@@ -6129,8 +6145,8 @@ msgid ""
 "trying to manually fix packages."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:88
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:103
 msgid ""
 "At any given time a single dependency may be met by packages that are "
 "already installed or it may not be. APT attempts to help resolve dependency "
@@ -6138,71 +6154,78 @@ msgid ""
 "packages for installation."
 msgstr ""
 
-#. type: <heading></heading>
-#: guide.sgml:96
+#. type: Content of: <book><chapter><title>
+#: guide.dbk:112
 msgid "apt-get"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:102
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:114
 msgid ""
-"<prgn>apt-get</prgn> provides a simple way to install packages from the "
-"command line. Unlike <prgn>dpkg</prgn>, <prgn>apt-get</prgn> does not "
-"understand .deb files, it works with the package's proper name and can only "
-"install .deb archives from a <em>Source</em>."
+"<command>apt-get</command> provides a simple way to install packages from "
+"the command line. Unlike <command>dpkg</command>, <command>apt-get</command> "
+"does not understand .deb files, it works with the package's proper name and "
+"can only install .deb archives from a <emphasis>Source</emphasis>."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:109
+#. type: Content of: <book><chapter><para><footnote><para>
+#: guide.dbk:120
 msgid ""
-"The first <footnote><p>If you are using an http proxy server you must set "
-"the http_proxy environment variable first, see "
-"sources.list(5)</p></footnote> thing that should be done before using "
-"<prgn>apt-get</prgn> is to fetch the package lists from the <em>Sources</em> "
-"so that it knows what packages are available. This is done with <tt>apt-get "
-"update</tt>. For instance,"
+"If you are using an http proxy server you must set the http_proxy "
+"environment variable first, see sources.list(5)"
 msgstr ""
 
-#. type: <example></example>
-#: guide.sgml:116
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:120
+msgid ""
+"The first <placeholder type=\"footnote\" id=\"0\"/> thing that should be "
+"done before using <command>apt-get</command> is to fetch the package lists "
+"from the <emphasis>Sources</emphasis> so that it knows what packages are "
+"available. This is done with <literal>apt-get update</literal>. For "
+"instance,"
+msgstr ""
+
+#. type: Content of: <book><chapter><screen>
+#: guide.dbk:128
 #, no-wrap
 msgid ""
 "# apt-get update\n"
 "Get http://ftp.de.debian.org/debian-non-US/ stable/binary-i386/ Packages\n"
 "Get http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n"
 "Reading Package Lists... Done\n"
-"Building Dependency Tree... Done"
+"Building Dependency Tree... Done\n"
 msgstr ""
 
-#. type: <p><taglist>
-#: guide.sgml:120
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:135
 msgid "Once updated there are several commands that can be used:"
 msgstr ""
 
-#. type: <tag></tag>
-#: guide.sgml:121
+#. type: Content of: <book><chapter><variablelist><varlistentry><term>
+#: guide.dbk:139
 msgid "upgrade"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:131
+#. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
+#: guide.dbk:142
 msgid ""
 "Upgrade will attempt to gently upgrade the whole system. Upgrade will never "
 "install a new package or remove an existing package, nor will it ever "
 "upgrade a package that might cause some other package to break. This can be "
 "used daily to relatively safely upgrade the system. Upgrade will list all of "
 "the packages that it could not upgrade, this usually means that they depend "
-"on new packages or conflict with some other package. <prgn>dselect</prgn> or "
-"<tt>apt-get install</tt> can be used to force these packages to install."
+"on new packages or conflict with some other "
+"package. <command>dselect</command> or <literal>apt-get install</literal> "
+"can be used to force these packages to install."
 msgstr ""
 
-#. type: <tag></tag>
-#: guide.sgml:131
+#. type: Content of: <book><chapter><variablelist><varlistentry><term>
+#: guide.dbk:154
 msgid "install"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:140
+#. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
+#: guide.dbk:157
 msgid ""
 "Install is used to install packages by name. The package is automatically "
 "fetched and installed. This can be useful if you already know the name of "
@@ -6213,131 +6236,135 @@ msgid ""
 "anything other than its arguments are changed."
 msgstr ""
 
-#. type: <tag></tag>
-#: guide.sgml:140
+#. type: Content of: <book><chapter><variablelist><varlistentry><term>
+#: guide.dbk:168
 msgid "dist-upgrade"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:149
+#. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
+#: guide.dbk:171
 msgid ""
 "Dist-upgrade is a complete upgrader designed to simplify upgrading between "
 "releases of Debian. It uses a sophisticated algorithm to determine the best "
 "set of packages to install, upgrade and remove to get as much of the system "
 "to the newest release. In some situations it may be desired to use "
 "dist-upgrade rather than spend the time manually resolving dependencies in "
-"<prgn>dselect</prgn>. Once dist-upgrade has completed then "
-"<prgn>dselect</prgn> can be used to install any packages that may have been "
-"left out."
+"<command>dselect</command>. Once dist-upgrade has completed then "
+"<command>dselect</command> can be used to install any packages that may have "
+"been left out."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:152
+#. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
+#: guide.dbk:181
 msgid ""
 "It is important to closely look at what dist-upgrade is going to do, its "
 "decisions may sometimes be quite surprising."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:163
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:188
 msgid ""
-"<prgn>apt-get</prgn> has several command line options that are detailed in "
-"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful "
-"option is <tt>-d</tt> which does not install the fetched files. If the "
-"system has to download a large number of package it would be undesired to "
-"start installing them in case something goes wrong. When <tt>-d</tt> is used "
-"the downloaded archives can be installed by simply running the command that "
-"caused them to be downloaded again without <tt>-d</tt>."
+"<command>apt-get</command> has several command line options that are "
+"detailed in its man page, "
+"<citerefentry><refentrytitle>apt-get</refentrytitle><manvolnum>8</manvolnum></citerefentry>. "
+"The most useful option is <literal>-d</literal> which does not install the "
+"fetched files. If the system has to download a large number of package it "
+"would be undesired to start installing them in case something goes "
+"wrong. When <literal>-d</literal> is used the downloaded archives can be "
+"installed by simply running the command that caused them to be downloaded "
+"again without <literal>-d</literal>."
 msgstr ""
 
-#. type: <heading></heading>
-#: guide.sgml:168
+#. type: Content of: <book><chapter><title>
+#: guide.dbk:200
 msgid "DSelect"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:173
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:202
 msgid ""
-"The APT <prgn>dselect</prgn> method provides the complete APT system with "
-"the <prgn>dselect</prgn> package selection GUI. <prgn>dselect</prgn> is used "
-"to select the packages to be installed or removed and APT actually installs "
-"them."
+"The APT <command>dselect</command> method provides the complete APT system "
+"with the <command>dselect</command> package selection "
+"GUI. <command>dselect</command> is used to select the packages to be "
+"installed or removed and APT actually installs them."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:184
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:208
 msgid ""
-"To enable the APT method you need to select [A]ccess in <prgn>dselect</prgn> "
-"and then choose the APT method. You will be prompted for a set of "
-"<em>Sources</em> which are places to fetch archives from. These can be "
-"remote Internet sites, local Debian mirrors or CD-ROMs. Each source can "
-"provide a fragment of the total Debian archive, APT will automatically "
-"combine them to form a complete set of packages. If you have a CD-ROM then "
-"it is a good idea to specify it first and then specify a mirror so that you "
-"have access to the latest bug fixes. APT will automatically use packages on "
-"your CD-ROM before downloading from the Internet."
+"To enable the APT method you need to select [A]ccess in "
+"<command>dselect</command> and then choose the APT method. You will be "
+"prompted for a set of <emphasis>Sources</emphasis> which are places to fetch "
+"archives from. These can be remote Internet sites, local Debian mirrors or "
+"CD-ROMs. Each source can provide a fragment of the total Debian archive, APT "
+"will automatically combine them to form a complete set of packages. If you "
+"have a CD-ROM then it is a good idea to specify it first and then specify a "
+"mirror so that you have access to the latest bug fixes. APT will "
+"automatically use packages on your CD-ROM before downloading from the "
+"Internet."
 msgstr ""
 
-#. type: <example></example>
-#: guide.sgml:198
+#. type: Content of: <book><chapter><screen>
+#: guide.dbk:219
 #, no-wrap
 msgid ""
 "   Set up a list of distribution source locations\n"
-"\t \n"
+"\n"
 " Please give the base URL of the debian distribution.\n"
 " The access schemes I know about are: http file\n"
-"\t   \n"
+"\n"
 " For example:\n"
 "      file:/mnt/debian,\n"
 "      ftp://ftp.debian.org/debian,\n"
 "      http://ftp.de.debian.org/debian,\n"
-"      \n"
-"      \n"
-" URL [http://llug.sep.bnl.gov/debian]:"
+"\n"
+"\n"
+" URL [http://llug.sep.bnl.gov/debian]:\n"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:205
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:233
 msgid ""
-"The <em>Sources</em> setup starts by asking for the base of the Debian "
-"archive, defaulting to a HTTP mirror. Next it asks for the distribution to "
-"get."
+"The <emphasis>Sources</emphasis> setup starts by asking for the base of the "
+"Debian archive, defaulting to a HTTP mirror. Next it asks for the "
+"distribution to get."
 msgstr ""
 
-#. type: <example></example>
-#: guide.sgml:212
+#. type: Content of: <book><chapter><screen>
+#: guide.dbk:238
 #, no-wrap
 msgid ""
 " Please give the distribution tag to get or a path to the\n"
 " package file ending in a /. The distribution\n"
 " tags are typically something like: stable unstable testing non-US\n"
-"   \n"
-" Distribution [stable]:"
+"\n"
+" Distribution [stable]:\n"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:222
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:245
 msgid ""
 "The distribution refers to the Debian version in the archive, "
-"<em>stable</em> refers to the latest released version and <em>unstable</em> "
-"refers to the developmental version. <em>non-US</em> is only available on "
-"some mirrors and refers to packages that contain encryption technology or "
-"other things that cannot be exported from the United States. Importing these "
-"packages into the US is legal however."
+"<emphasis>stable</emphasis> refers to the latest released version and "
+"<emphasis>unstable</emphasis> refers to the developmental "
+"version. <emphasis>non-US</emphasis> is only available on some mirrors and "
+"refers to packages that contain encryption technology or other things that "
+"cannot be exported from the United States. Importing these packages into the "
+"US is legal however."
 msgstr ""
 
-#. type: <example></example>
-#: guide.sgml:228
+#. type: Content of: <book><chapter><screen>
+#: guide.dbk:254
 #, no-wrap
 msgid ""
 " Please give the components to get\n"
 " The components are typically something like: main contrib non-free\n"
-"  \n"
-" Components [main contrib non-free]:"
+"\n"
+" Components [main contrib non-free]:\n"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:236
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:260
 msgid ""
 "The components list refers to the list of sub distributions to fetch. The "
 "distribution is split up based on software licenses, main being DFSG free "
@@ -6345,25 +6372,25 @@ msgid ""
 "restrictions placed on their use and distribution."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:240
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:266
 msgid ""
 "Any number of sources can be added, the setup script will continue to prompt "
 "until you have specified all that you want."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:247
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:270
 msgid ""
-"Before starting to use <prgn>dselect</prgn> it is necessary to update the "
-"available list by selecting [U]pdate from the menu. This is a superset of "
-"<tt>apt-get update</tt> that makes the fetched information available to "
-"<prgn>dselect</prgn>. [U]pdate must be performed even if <tt>apt-get "
-"update</tt> has been run before."
+"Before starting to use <command>dselect</command> it is necessary to update "
+"the available list by selecting [U]pdate from the menu. This is a superset "
+"of <literal>apt-get update</literal> that makes the fetched information "
+"available to <command>dselect</command>. [U]pdate must be performed even if "
+"<literal>apt-get update</literal> has been run before."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:253
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:277
 msgid ""
 "You can then go on and make your selections using [S]elect and then perform "
 "the installation using [I]nstall. When using the APT method the [C]onfig and "
@@ -6371,57 +6398,63 @@ msgid ""
 "them together."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:258
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:283
 msgid ""
 "By default APT will automatically remove the package (.deb) files once they "
 "have been successfully installed. To change this behavior place "
-"<tt>Dselect::clean \"prompt\";</tt> in /etc/apt/apt.conf."
+"<literal>Dselect::clean \"prompt\";</literal> in /etc/apt/apt.conf."
 msgstr ""
 
-#. type: <heading></heading>
-#: guide.sgml:264
+#. type: Content of: <book><chapter><title>
+#: guide.dbk:289
 msgid "The Interface"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:278
+#. type: Content of: <book><chapter><para><footnote><para>
+#: guide.dbk:293
+msgid ""
+"The <command>dselect</command> method actually is a set of wrapper scripts "
+"to <command>apt-get</command>. The method actually provides more "
+"functionality than is present in <command>apt-get</command> alone."
+msgstr ""
+
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:291
 msgid ""
-"Both that APT <prgn>dselect</prgn> method and <prgn>apt-get</prgn> share the "
-"same interface. It is a simple system that generally tells you what it will "
-"do and then goes and does it. <footnote><p>The <prgn>dselect</prgn> method "
-"actually is a set of wrapper scripts to <prgn>apt-get</prgn>. The method "
-"actually provides more functionality than is present in <prgn>apt-get</prgn> "
-"alone.</p></footnote> After printing out a summary of what will happen APT "
-"then will print out some informative status messages so that you can "
-"estimate how far along it is and how much is left to do."
+"Both that APT <command>dselect</command> method and "
+"<command>apt-get</command> share the same interface. It is a simple system "
+"that generally tells you what it will do and then goes and does "
+"it. <placeholder type=\"footnote\" id=\"0\"/> After printing out a summary "
+"of what will happen APT then will print out some informative status messages "
+"so that you can estimate how far along it is and how much is left to do."
 msgstr ""
 
-#. type: <heading></heading>
-#: guide.sgml:280
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:302
 msgid "Startup"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:284
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:304
 msgid ""
 "Before all operations except update, APT performs a number of actions to "
 "prepare its internal state. It also does some checks of the system's "
-"state. At any time these operations can be performed by running <tt>apt-get "
-"check</tt>."
+"state. At any time these operations can be performed by running "
+"<literal>apt-get check</literal>."
 msgstr ""
 
-#. type: <example></example>
-#: guide.sgml:289
+#. type: Content of: <book><chapter><section><screen>
+#: guide.dbk:310
 #, no-wrap
 msgid ""
 "# apt-get check\n"
 "Reading Package Lists... Done\n"
-"Building Dependency Tree... Done"
+"Building Dependency Tree... Done\n"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:297
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:315
 msgid ""
 "The first thing it does is read all the package files into memory. APT uses "
 "a caching scheme so this operation will be faster the second time it is "
@@ -6429,17 +6462,17 @@ msgid ""
 "and a warning will be printed when apt-get exits."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:303
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:321
 msgid ""
 "The final operation performs a detailed analysis of the system's "
 "dependencies. It checks every dependency of every installed or unpacked "
 "package and considers if it is OK. Should this find a problem then a report "
-"will be printed out and <prgn>apt-get</prgn> will refuse to run."
+"will be printed out and <command>apt-get</command> will refuse to run."
 msgstr ""
 
-#. type: <example></example>
-#: guide.sgml:320
+#. type: Content of: <book><chapter><section><screen>
+#: guide.dbk:327
 #, no-wrap
 msgid ""
 "# apt-get check\n"
@@ -6449,18 +6482,18 @@ msgid ""
 "Sorry, but the following packages have unmet dependencies:\n"
 "  9fonts: Depends: xlib6g but it is not installed\n"
 "  uucp: Depends: mailx but it is not installed\n"
-"  blast: Depends: xlib6g (>= 3.3-5) but it is not installed\n"
+"  blast: Depends: xlib6g (&gt;= 3.3-5) but it is not installed\n"
 "  adduser: Depends: perl-base but it is not installed\n"
 "  aumix: Depends: libgpmg1 but it is not installed\n"
 "  debiandoc-sgml: Depends: sgml-base but it is not installed\n"
-"  bash-builtins: Depends: bash (>= 2.01) but 2.0-3 is installed\n"
+"  bash-builtins: Depends: bash (&gt;= 2.01) but 2.0-3 is installed\n"
 "  cthugha: Depends: svgalibg1 but it is not installed\n"
-"           Depends: xlib6g (>= 3.3-5) but it is not installed\n"
-"  libreadlineg2: Conflicts:libreadline2 (<< 2.1-2.1)"
+"           Depends: xlib6g (&gt;= 3.3-5) but it is not installed\n"
+"  libreadlineg2: Conflicts:libreadline2 (&lt;&lt; 2.1-2.1)\n"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:329
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:344
 msgid ""
 "In this example the system has many problems, including a serious problem "
 "with libreadlineg2. For each package that has unmet dependencies a line is "
@@ -6469,61 +6502,69 @@ msgid ""
 "problem is also included."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:337
+#. type: Content of: <book><chapter><section><para><footnote><para>
+#: guide.dbk:353
+msgid ""
+"APT however considers all known dependencies and attempts to prevent broken "
+"packages"
+msgstr ""
+
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:351
 msgid ""
 "There are two ways a system can get into a broken state like this. The first "
-"is caused by <prgn>dpkg</prgn> missing some subtle relationships between "
-"packages when performing upgrades. <footnote><p>APT however considers all "
-"known dependencies and attempts to prevent broken "
-"packages</p></footnote>. The second is if a package installation fails "
-"during an operation. In this situation a package may have been unpacked "
-"without its dependents being installed."
+"is caused by <command>dpkg</command> missing some subtle relationships "
+"between packages when performing upgrades. <placeholder type=\"footnote\" "
+"id=\"0\"/>. The second is if a package installation fails during an "
+"operation. In this situation a package may have been unpacked without its "
+"dependents being installed."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:345
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:360
 msgid ""
 "The second situation is much less serious than the first because APT places "
 "certain constraints on the order that packages are installed. In both cases "
-"supplying the <tt>-f</tt> option to <prgn>apt-get</prgn> will cause APT to "
-"deduce a possible solution to the problem and then continue on. The APT "
-"<prgn>dselect</prgn> method always supplies the <tt>-f</tt> option to allow "
-"for easy continuation of failed maintainer scripts."
+"supplying the <literal>-f</literal> option to <command>apt-get</command> "
+"will cause APT to deduce a possible solution to the problem and then "
+"continue on. The APT <command>dselect</command> method always supplies the "
+"<literal>-f</literal> option to allow for easy continuation of failed "
+"maintainer scripts."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:351
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:369
 msgid ""
-"However, if the <tt>-f</tt> option is used to correct a seriously broken "
-"system caused by the first case then it is possible that it will either fail "
-"immediately or the installation sequence will fail. In either case it is "
-"necessary to manually use dpkg (possibly with forcing options) to correct "
-"the situation enough to allow APT to proceed."
+"However, if the <literal>-f</literal> option is used to correct a seriously "
+"broken system caused by the first case then it is possible that it will "
+"either fail immediately or the installation sequence will fail. In either "
+"case it is necessary to manually use dpkg (possibly with forcing options) to "
+"correct the situation enough to allow APT to proceed."
 msgstr ""
 
-#. type: <heading></heading>
-#: guide.sgml:356
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:377
 msgid "The Status Report"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:363
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:379
 msgid ""
-"Before proceeding <prgn>apt-get</prgn> will present a report on what will "
-"happen. Generally the report reflects the type of operation being performed "
-"but there are several common elements. In all cases the lists reflect the "
-"final state of things, taking into account the <tt>-f</tt> option and any "
-"other relevant activities to the command being executed."
+"Before proceeding <command>apt-get</command> will present a report on what "
+"will happen. Generally the report reflects the type of operation being "
+"performed but there are several common elements. In all cases the lists "
+"reflect the final state of things, taking into account the "
+"<literal>-f</literal> option and any other relevant activities to the "
+"command being executed."
 msgstr ""
 
-#. type: <heading></heading>
-#: guide.sgml:364
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:386
 msgid "The Extra Package list"
 msgstr ""
 
-#. type: <example></example>
-#: guide.sgml:372
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:388
 #, no-wrap
 msgid ""
 "The following extra packages will be installed:\n"
@@ -6531,135 +6572,135 @@ msgid ""
 "  mailpgp xdpkg fileutils pinepgp zlib1g xlib6g perl-base\n"
 "  bin86 libgdbm1 libgdbmg1 quake-lib gmp2 bcc xbuffy\n"
 "  squake pgp-i python-base debmake ldso perl libreadlineg2\n"
-"  ssh"
+"  ssh\n"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:379
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:396
 msgid ""
 "The Extra Package list shows all of the packages that will be installed or "
 "upgraded in excess of the ones mentioned on the command line. It is only "
-"generated for an <tt>install</tt> command. The listed packages are often the "
-"result of an Auto Install."
+"generated for an <literal>install</literal> command. The listed packages are "
+"often the result of an Auto Install."
 msgstr ""
 
-#. type: <heading></heading>
-#: guide.sgml:382
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:403
 msgid "The Packages to Remove"
 msgstr ""
 
-#. type: <example></example>
-#: guide.sgml:389
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:405
 #, no-wrap
 msgid ""
 "The following packages will be REMOVED:\n"
 "  xlib6-dev xpat2 tk40-dev xkeycaps xbattle xonix\n"
 "  xdaliclock tk40 tk41 xforms0.86 ghostview xloadimage xcolorsel\n"
 "  xadmin xboard perl-debug tkined xtetris libreadline2-dev perl-suid\n"
-"  nas xpilot xfig"
+"  nas xpilot xfig\n"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:399
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:412
 msgid ""
 "The Packages to Remove list shows all of the packages that will be removed "
 "from the system. It can be shown for any of the operations and should be "
 "given a careful inspection to ensure nothing important is to be taken "
-"off. The <tt>-f</tt> option is especially good at generating packages to "
-"remove so extreme care should be used in that case. The list may contain "
-"packages that are going to be removed because they are only partially "
-"installed, possibly due to an aborted installation."
+"off. The <literal>-f</literal> option is especially good at generating "
+"packages to remove so extreme care should be used in that case. The list may "
+"contain packages that are going to be removed because they are only "
+"partially installed, possibly due to an aborted installation."
 msgstr ""
 
-#. type: <heading></heading>
-#: guide.sgml:402
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:422
 msgid "The New Packages list"
 msgstr ""
 
-#. type: <example></example>
-#: guide.sgml:406
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:424
 #, no-wrap
 msgid ""
 "The following NEW packages will installed:\n"
-"  zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base"
+"  zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base\n"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:411
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:428
 msgid ""
 "The New Packages list is simply a reminder of what will happen. The packages "
 "listed are not presently installed in the system but will be when APT is "
 "done."
 msgstr ""
 
-#. type: <heading></heading>
-#: guide.sgml:414
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:433
 msgid "The Kept Back list"
 msgstr ""
 
-#. type: <example></example>
-#: guide.sgml:419
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:435
 #, no-wrap
 msgid ""
 "The following packages have been kept back\n"
 "  compface man-db tetex-base msql libpaper svgalib1\n"
-"  gs snmp arena lynx xpat2 groff xscreensaver"
+"  gs snmp arena lynx xpat2 groff xscreensaver\n"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:428
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:440
 msgid ""
 "Whenever the whole system is being upgraded there is the possibility that "
 "new versions of packages cannot be installed because they require new things "
 "or conflict with already installed things. In this case the package will "
 "appear in the Kept Back list. The best way to convince packages listed there "
-"to install is with <tt>apt-get install</tt> or by using <prgn>dselect</prgn> "
-"to resolve their problems."
+"to install is with <literal>apt-get install</literal> or by using "
+"<command>dselect</command> to resolve their problems."
 msgstr ""
 
-#. type: <heading></heading>
-#: guide.sgml:431
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:449
 msgid "Held Packages warning"
 msgstr ""
 
-#. type: <example></example>
-#: guide.sgml:435
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:451
 #, no-wrap
 msgid ""
 "The following held packages will be changed:\n"
-"  cvs"
+"  cvs\n"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:441
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:455
 msgid ""
 "Sometimes you can ask APT to install a package that is on hold, in such a "
 "case it prints out a warning that the held package is going to be "
 "changed. This should only happen during dist-upgrade or install."
 msgstr ""
 
-#. type: <heading></heading>
-#: guide.sgml:444
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:461
 msgid "Final summary"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:447
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:463
 msgid "Finally, APT will print out a summary of all the changes that will occur."
 msgstr ""
 
-#. type: <example></example>
-#: guide.sgml:452
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:466
 #, no-wrap
 msgid ""
 "206 packages upgraded, 8 newly installed, 23 to remove and 51 not "
 "upgraded.\n"
 "12 packages not fully installed or removed.\n"
-"Need to get 65.7M/66.7M of archives. After unpacking 26.5M will be used."
+"Need to get 65.7M/66.7M of archives. After unpacking 26.5M will be used.\n"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:470
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:471
 msgid ""
 "The first line of the summary simply is a reduced version of all of the "
 "lists and includes the number of upgrades - that is packages already "
@@ -6676,27 +6717,27 @@ msgid ""
 "indicate the amount of space that will be freed."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:473
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:485
 msgid ""
 "Some other reports can be generated by using the -u option to show packages "
 "to upgrade, they are similar to the previous examples."
 msgstr ""
 
-#. type: <heading></heading>
-#: guide.sgml:477
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:492
 msgid "The Status Display"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:481
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:494
 msgid ""
 "During the download of archives and package files APT prints out a series of "
 "status messages."
 msgstr ""
 
-#. type: <example></example>
-#: guide.sgml:490
+#. type: Content of: <book><chapter><section><screen>
+#: guide.dbk:498
 #, no-wrap
 msgid ""
 "# apt-get update\n"
@@ -6706,111 +6747,107 @@ msgid ""
 "Get:4 http://ftp.de.debian.org/debian-non-US/ unstable/binary-i386/ "
 "Packages\n"
 "Get:5 http://llug.sep.bnl.gov/debian/ testing/non-free Packages\n"
-"11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s"
+"11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s\n"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:500
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:507
 msgid ""
-"The lines starting with <em>Get</em> are printed out when APT begins to "
-"fetch a file while the last line indicates the progress of the download. The "
-"first percent value on the progress line indicates the total percent done of "
-"all files. Unfortunately since the size of the Package files is unknown "
-"<tt>apt-get update</tt> estimates the percent done which causes some "
-"inaccuracies."
+"The lines starting with <emphasis>Get</emphasis> are printed out when APT "
+"begins to fetch a file while the last line indicates the progress of the "
+"download. The first percent value on the progress line indicates the total "
+"percent done of all files. Unfortunately since the size of the Package files "
+"is unknown <literal>apt-get update</literal> estimates the percent done "
+"which causes some inaccuracies."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:509
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:515
 msgid ""
 "The next section of the status line is repeated once for each download "
 "thread and indicates the operation being performed and some useful "
 "information about what is happening. Sometimes this section will simply read "
-"<em>Forking</em> which means the OS is loading the download module. The "
-"first word after the [ is the fetch number as shown on the history "
-"lines. The next word is the short form name of the object being "
+"<emphasis>Forking</emphasis> which means the OS is loading the download "
+"module. The first word after the [ is the fetch number as shown on the "
+"history lines. The next word is the short form name of the object being "
 "downloaded. For archives it will contain the name of the package that is "
 "being fetched."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:524
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:525
 msgid ""
 "Inside of the single quote is an informative string indicating the progress "
 "of the negotiation phase of the download. Typically it progresses from "
-"<em>Connecting</em> to <em>Waiting for file</em> to <em>Downloading</em> or "
-"<em>Resuming</em>. The final value is the number of bytes downloaded from "
-"the remote site. Once the download begins this is represented as "
-"<tt>102/10.2k</tt> indicating that 102 bytes have been fetched and 10.2 "
-"kilobytes is expected. The total size is always shown in 4 figure notation "
-"to preserve space. After the size display is a percent meter for the file "
-"itself. The second last element is the instantaneous average speed. This "
-"values is updated every 5 seconds and reflects the rate of data transfer for "
-"that period. Finally is shown the estimated transfer time. This is updated "
+"<emphasis>Connecting</emphasis> to <emphasis>Waiting for file</emphasis> to "
+"<emphasis>Downloading</emphasis> or <emphasis>Resuming</emphasis>. The final "
+"value is the number of bytes downloaded from the remote site. Once the "
+"download begins this is represented as <literal>102/10.2k</literal> "
+"indicating that 102 bytes have been fetched and 10.2 kilobytes is "
+"expected. The total size is always shown in 4 figure notation to preserve "
+"space. After the size display is a percent meter for the file itself. The "
+"second last element is the instantaneous average speed. This values is "
+"updated every 5 seconds and reflects the rate of data transfer for that "
+"period. Finally is shown the estimated transfer time. This is updated "
 "regularly and reflects the time to complete everything at the shown transfer "
 "rate."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:530
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:540
 msgid ""
 "The status display updates every half second to provide a constant feedback "
 "on the download progress while the Get lines scroll back whenever a new file "
 "is started. Since the status display is constantly updated it is unsuitable "
-"for logging to a file, use the <tt>-q</tt> option to remove the status "
-"display."
+"for logging to a file, use the <literal>-q</literal> option to remove the "
+"status display."
 msgstr ""
 
-#. type: <heading></heading>
-#: guide.sgml:535
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:548
 msgid "Dpkg"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:542
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:550
 msgid ""
-"APT uses <prgn>dpkg</prgn> for installing the archives and will switch over "
-"to the <prgn>dpkg</prgn> interface once downloading is "
-"completed. <prgn>dpkg</prgn> will also ask a number of questions as it "
+"APT uses <command>dpkg</command> for installing the archives and will switch "
+"over to the <command>dpkg</command> interface once downloading is "
+"completed. <command>dpkg</command> will also ask a number of questions as it "
 "processes the packages and the packages themselves may also ask several "
 "questions. Before each question there is usually a description of what it is "
 "asking and the questions are too varied to discuss completely here."
 msgstr ""
 
-#. type: <title></title>
-#: offline.sgml:4
+#. type: Content of: <book><title>
+#: offline.dbk:11
 msgid "Using APT Offline"
 msgstr ""
 
-#. type: <version></version>
-#: offline.sgml:7
-msgid "$Id: offline.sgml,v 1.8 2003/02/12 15:06:41 doogie Exp $"
-msgstr ""
-
-#. type: <abstract></abstract>
-#: offline.sgml:12
+#. type: Content of: <book><bookinfo><abstract><para>
+#: offline.dbk:25
 msgid ""
 "This document describes how to use APT in a non-networked environment, "
 "specifically a 'sneaker-net' approach for performing upgrades."
 msgstr ""
 
-#. type: <copyrightsummary></copyrightsummary>
-#: offline.sgml:16
-msgid "Copyright &copy; Jason Gunthorpe, 1999."
+#. type: Content of: <book><bookinfo>
+#: offline.dbk:30
+msgid "<copyright><year>1999</year><holder>Jason Gunthorpe</holder></copyright>"
 msgstr ""
 
-#. type: <heading></heading>
-#: offline.sgml:32
+#. type: Content of: <book><chapter><title>
+#: offline.dbk:48
 msgid "Introduction"
 msgstr ""
 
-#. type: <heading></heading>
-#: offline.sgml:34 offline.sgml:65 offline.sgml:180
+#. type: Content of: <book><chapter><section><title>
+#: offline.dbk:50 offline.dbk:80 offline.dbk:192
 msgid "Overview"
 msgstr ""
 
-#. type: <p></p>
-#: offline.sgml:40
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:52
 msgid ""
 "Normally APT requires direct access to a Debian archive, either from a local "
 "media or through a network. Another common complaint is that a Debian "
@@ -6818,8 +6855,8 @@ msgid ""
 "fast connection but they are physically distant."
 msgstr ""
 
-#. type: <p></p>
-#: offline.sgml:51
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:58
 msgid ""
 "The solution to this is to use large removable media such as a Zip disc or a "
 "SuperDisk disc. These discs are not large enough to store the entire Debian "
@@ -6827,13 +6864,13 @@ msgid ""
 "to use APT to generate a list of packages that are required and then fetch "
 "them onto the disc using another machine with good connectivity. It is even "
 "possible to use another Debian machine with APT or to use a completely "
-"different OS and a download tool like wget. Let <em>remote host</em> mean "
-"the machine downloading the packages, and <em>target host</em> the one with "
-"bad or no connection."
+"different OS and a download tool like wget. Let <emphasis>remote "
+"host</emphasis> mean the machine downloading the packages, and "
+"<emphasis>target host</emphasis> the one with bad or no connection."
 msgstr ""
 
-#. type: <p></p>
-#: offline.sgml:57
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:69
 msgid ""
 "This is achieved by creatively manipulating the APT configuration file. The "
 "essential premise to tell APT to look on a disc for it's archive files. Note "
@@ -6841,13 +6878,13 @@ msgid ""
 "names such as ext2, fat32 or vfat."
 msgstr ""
 
-#. type: <heading></heading>
-#: offline.sgml:63
+#. type: Content of: <book><chapter><title>
+#: offline.dbk:78
 msgid "Using APT on both machines"
 msgstr ""
 
-#. type: <p><example>
-#: offline.sgml:71
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:82
 msgid ""
 "APT being available on both machines gives the simplest configuration. The "
 "basic idea is to place a copy of the status file on the disc and use the "
@@ -6855,8 +6892,8 @@ msgid ""
 "to download. The disk directory structure should look like:"
 msgstr ""
 
-#. type: <example></example>
-#: offline.sgml:80
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:88
 #, no-wrap
 msgid ""
 "  /disc/\n"
@@ -6866,34 +6903,35 @@ msgid ""
 "       partial/\n"
 "    status\n"
 "    sources.list\n"
-"    apt.conf"
+"    apt.conf\n"
 msgstr ""
 
-#. type: <heading></heading>
-#: offline.sgml:88
+#. type: Content of: <book><chapter><section><title>
+#: offline.dbk:99
 msgid "The configuration file"
 msgstr ""
 
-#. type: <p></p>
-#: offline.sgml:96
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:101
 msgid ""
 "The configuration file should tell APT to store its files on the disc and to "
 "use the configuration files on the disc as well. The sources.list should "
 "contain the proper sites that you wish to use from the remote machine, and "
-"the status file should be a copy of <em>/var/lib/dpkg/status</em> from the "
-"<em>target host</em>. Please note, if you are using a local archive you must "
-"use copy URIs, the syntax is identical to file URIs."
+"the status file should be a copy of "
+"<emphasis>/var/lib/dpkg/status</emphasis> from the <emphasis>target "
+"host</emphasis>. Please note, if you are using a local archive you must use "
+"copy URIs, the syntax is identical to file URIs."
 msgstr ""
 
-#. type: <p><example>
-#: offline.sgml:100
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:109
 msgid ""
-"<em>apt.conf</em> must contain the necessary information to make APT use the "
-"disc:"
+"<emphasis>apt.conf</emphasis> must contain the necessary information to make "
+"APT use the disc:"
 msgstr ""
 
-#. type: <example></example>
-#: offline.sgml:124
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:113
 #, no-wrap
 msgid ""
 " APT\n"
@@ -6902,10 +6940,10 @@ msgid ""
 "tells\n"
 "      the remote APT what architecture the target machine is */\n"
 "   Architecture \"i386\";\n"
-"   \n"
+"\n"
 "   Get::Download-Only \"true\";\n"
 " };\n"
-" \n"
+"\n"
 " Dir\n"
 " {\n"
 "   /* Use the disc for state information and redirect the status file from\n"
@@ -6916,76 +6954,79 @@ msgid ""
 "   // Binary caches will be stored locally\n"
 "   Cache::archives \"/disc/archives/\";\n"
 "   Cache \"/tmp/\";\n"
-"   \n"
+"\n"
 "   // Location of the source list.\n"
 "   Etc \"/disc/\";\n"
-" };"
+" };\n"
 msgstr ""
 
-#. type: </example></p>
-#: offline.sgml:129
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:138
 msgid ""
 "More details can be seen by examining the apt.conf man page and the sample "
-"configuration file in <em>/usr/share/doc/apt/examples/apt.conf</em>."
+"configuration file in "
+"<emphasis>/usr/share/doc/apt/examples/apt.conf</emphasis>."
 msgstr ""
 
-#. type: <p><example>
-#: offline.sgml:136
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:143
 msgid ""
 "On the target machine the first thing to do is mount the disc and copy "
-"<em>/var/lib/dpkg/status</em> to it. You will also need to create the "
-"directories outlined in the Overview, <em>archives/partial/</em> and "
-"<em>lists/partial/</em>. Then take the disc to the remote machine and "
-"configure the sources.list. On the remote machine execute the following:"
+"<emphasis>/var/lib/dpkg/status</emphasis> to it. You will also need to "
+"create the directories outlined in the Overview, "
+"<emphasis>archives/partial/</emphasis> and "
+"<emphasis>lists/partial/</emphasis>. Then take the disc to the remote "
+"machine and configure the sources.list. On the remote machine execute the "
+"following:"
 msgstr ""
 
-#. type: <example></example>
-#: offline.sgml:142
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:152
 #, no-wrap
 msgid ""
 " # export APT_CONFIG=\"/disc/apt.conf\"\n"
 " # apt-get update\n"
 " [ APT fetches the package files ]\n"
 " # apt-get dist-upgrade\n"
-" [ APT fetches all the packages needed to upgrade the target machine ]"
+" [ APT fetches all the packages needed to upgrade the target machine ]\n"
 msgstr ""
 
-#. type: </example></p>
-#: offline.sgml:149
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:159
 msgid ""
 "The dist-upgrade command can be replaced with any other standard APT "
 "commands, particularly dselect-upgrade. You can even use an APT front end "
-"such as <em>dselect</em>. However this presents a problem in communicating "
-"your selections back to the local computer."
+"such as <emphasis>dselect</emphasis>. However this presents a problem in "
+"communicating your selections back to the local computer."
 msgstr ""
 
-#. type: <p><example>
-#: offline.sgml:153
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:165
 msgid ""
 "Now the disc contains all of the index files and archives needed to upgrade "
 "the target machine. Take the disc back and run:"
 msgstr ""
 
-#. type: <example></example>
-#: offline.sgml:159
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:169
 #, no-wrap
 msgid ""
 "  # export APT_CONFIG=\"/disc/apt.conf\"\n"
 "  # apt-get check\n"
 "  [ APT generates a local copy of the cache files ]\n"
 "  # apt-get --no-d -o dir::state::status=/var/lib/dpkg/status dist-upgrade\n"
-"  [ Or any other APT command ]"
+"  [ Or any other APT command ]\n"
 msgstr ""
 
-#. type: <p></p>
-#: offline.sgml:165
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:176
 msgid ""
 "It is necessary for proper function to re-specify the status file to be the "
 "local one. This is very important!"
 msgstr ""
 
-#. type: <p></p>
-#: offline.sgml:172
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:180
 msgid ""
 "If you are using dselect you can do the very risky operation of copying "
 "disc/status to /var/lib/dpkg/status so that any selections you made on the "
@@ -6994,21 +7035,21 @@ msgid ""
 "NOT copy the status file if dpkg or APT have been run in the mean time!!"
 msgstr ""
 
-#. type: <heading></heading>
-#: offline.sgml:178
+#. type: Content of: <book><chapter><title>
+#: offline.dbk:190
 msgid "Using APT and wget"
 msgstr ""
 
-#. type: <p></p>
-#: offline.sgml:185
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:194
 msgid ""
-"<em>wget</em> is a popular and portable download tool that can run on nearly "
-"any machine. Unlike the method above this requires that the Debian machine "
-"already has a list of available packages."
+"<emphasis>wget</emphasis> is a popular and portable download tool that can "
+"run on nearly any machine. Unlike the method above this requires that the "
+"Debian machine already has a list of available packages."
 msgstr ""
 
-#. type: <p></p>
-#: offline.sgml:190
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:199
 msgid ""
 "The basic idea is to create a disc that has only the archive files "
 "downloaded from the remote site. This is done by using the --print-uris "
@@ -7016,37 +7057,37 @@ msgid ""
 "packages."
 msgstr ""
 
-#. type: <heading></heading>
-#: offline.sgml:196
+#. type: Content of: <book><chapter><section><title>
+#: offline.dbk:205
 msgid "Operation"
 msgstr ""
 
-#. type: <p><example>
-#: offline.sgml:200
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:207
 msgid ""
 "Unlike the previous technique no special configuration files are "
 "required. We merely use the standard APT commands to generate the file list."
 msgstr ""
 
-#. type: <example></example>
-#: offline.sgml:205
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:211
 #, no-wrap
 msgid ""
-" # apt-get dist-upgrade \n"
+" # apt-get dist-upgrade\n"
 " [ Press no when prompted, make sure you are happy with the actions ]\n"
-" # apt-get -qq --print-uris dist-upgrade > uris\n"
-" # awk '{print \"wget -O \" $2 \" \" $1}' < uris > /disc/wget-script"
+" # apt-get -qq --print-uris dist-upgrade &gt; uris\n"
+" # awk '{print \"wget -O \" $2 \" \" $1}' &lt; uris &gt; /disc/wget-script\n"
 msgstr ""
 
-#. type: </example></p>
-#: offline.sgml:210
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:217
 msgid ""
 "Any command other than dist-upgrade could be used here, including "
 "dselect-upgrade."
 msgstr ""
 
-#. type: <p></p>
-#: offline.sgml:216
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:221
 msgid ""
 "The /disc/wget-script file will now contain a list of wget commands to "
 "execute in order to fetch the necessary archives. This script should be run "
@@ -7054,34 +7095,34 @@ msgid ""
 "output on the disc."
 msgstr ""
 
-#. type: <p><example>
-#: offline.sgml:219
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:227
 msgid "The remote machine would do something like"
 msgstr ""
 
-#. type: <example></example>
-#: offline.sgml:223
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:230
 #, no-wrap
 msgid ""
 "  # cd /disc\n"
 "  # sh -x ./wget-script\n"
-"  [ wait.. ]"
+"  [ wait.. ]\n"
 msgstr ""
 
-#. type: </example><example>
-#: offline.sgml:228
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:235
 msgid ""
 "Once the archives are downloaded and the disc returned to the Debian machine "
 "installation can proceed using,"
 msgstr ""
 
-#. type: <example></example>
-#: offline.sgml:230
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:239
 #, no-wrap
-msgid "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade"
+msgid "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade\n"
 msgstr ""
 
-#. type: </example></p>
-#: offline.sgml:234
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:242
 msgid "Which will use the already fetched archives on the disc."
 msgstr ""
diff --git a/doc/po/de.po b/doc/po/de.po
index c336f638c..b2cff7770 100644
--- a/doc/po/de.po
+++ b/doc/po/de.po
@@ -1,14 +1,14 @@
-# Translation of apt-doc to German
+# Translation of apt/doc to German
 # Copyright (C) 1997, 1998, 1999 Jason Gunthorpe and others.
-# This file is distributed under the same license as the apt-doc package.
+# This file is distributed under the same license as the apt package.
 # Chris Leick <c.leick@vollbio.de>, 2009-2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: apt-doc 0.9.16\n"
+"Project-Id-Version: apt-doc 1.0.4\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-11 14:52+0200\n"
-"PO-Revision-Date: 2014-04-01 14:00+0200\n"
+"POT-Creation-Date: 2014-08-28 00:20+0000\n"
+"PO-Revision-Date: 2014-07-04 00:34+0200\n"
 "Last-Translator: Chris Leick <c.leick@vollbio.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
 "Language: de\n"
@@ -615,82 +615,90 @@ msgid ""
 msgstr "<!ENTITY synopsis-keyid \"Schlüsselkennung\">"
 
 #. type: Content of: <refentry><refmeta><manvolnum>
-#: apt.8.xml:25 apt-get.8.xml:28 apt-cache.8.xml:28 apt-key.8.xml:27
-#: apt-mark.8.xml:28 apt-secure.8.xml:27 apt-cdrom.8.xml:27
-#: apt-config.8.xml:28
+#: apt.8.xml:21 apt-get.8.xml:22 apt-cache.8.xml:22 apt-key.8.xml:21
+#: apt-mark.8.xml:22 apt-secure.8.xml:21 apt-cdrom.8.xml:21
+#: apt-config.8.xml:22
 msgid "8"
 msgstr "8"
 
 #. type: Content of: <refentry><refmeta><refmiscinfo>
-#: apt.8.xml:26 apt-get.8.xml:29 apt-cache.8.xml:29 apt-key.8.xml:28
-#: apt-mark.8.xml:29 apt-secure.8.xml:28 apt-cdrom.8.xml:28
-#: apt-config.8.xml:29 apt.conf.5.xml:34 apt_preferences.5.xml:28
-#: sources.list.5.xml:29 apt-extracttemplates.1.xml:29 apt-sortpkgs.1.xml:29
-#: apt-ftparchive.1.xml:29
+#: apt.8.xml:22 apt-get.8.xml:23 apt-cache.8.xml:23 apt-key.8.xml:22
+#: apt-mark.8.xml:23 apt-secure.8.xml:22 apt-cdrom.8.xml:22
+#: apt-config.8.xml:23 apt.conf.5.xml:28 apt_preferences.5.xml:22
+#: sources.list.5.xml:23 apt-extracttemplates.1.xml:23 apt-sortpkgs.1.xml:23
+#: apt-ftparchive.1.xml:23
 msgid "APT"
 msgstr "APT"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt.8.xml:32
+#: apt.8.xml:28
 msgid "command-line interface"
-msgstr ""
+msgstr "Befehlszeilenschnittstelle"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:37 apt-get.8.xml:40 apt-cache.8.xml:40 apt-key.8.xml:39
-#: apt-mark.8.xml:40 apt-secure.8.xml:52 apt-cdrom.8.xml:39
-#: apt-config.8.xml:40 apt.conf.5.xml:43 apt_preferences.5.xml:38
-#: sources.list.5.xml:38 apt-extracttemplates.1.xml:40 apt-sortpkgs.1.xml:40
-#: apt-ftparchive.1.xml:40
+#: apt.8.xml:33 apt-get.8.xml:34 apt-cache.8.xml:34 apt-key.8.xml:33
+#: apt-mark.8.xml:34 apt-secure.8.xml:46 apt-cdrom.8.xml:33
+#: apt-config.8.xml:34 apt.conf.5.xml:37 apt_preferences.5.xml:32
+#: sources.list.5.xml:32 apt-extracttemplates.1.xml:34 apt-sortpkgs.1.xml:34
+#: apt-ftparchive.1.xml:34
 msgid "Description"
 msgstr "Beschreibung"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:38
+#: apt.8.xml:34
 msgid ""
 "<command>apt</command> (Advanced Package Tool) is the command-line tool for "
 "handling packages. It provides a commandline interface for the package "
 "management of the system.  See also &apt-get; and &apt-cache; for more low-"
 "level command options."
 msgstr ""
+"<command>apt</command> (Advanced Package Tool) ist das Befehlszeilenwerkzeug "
+"für den Umgang mit Paketen. Es stellt eine Befehlszeilenschnittstelle zur "
+"Verwaltung von Paketen auf dem System bereit. Tiefer ansetzende "
+"Befehlsoptionen finden sie unter &apt-get; und &apt-cache;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:47
+#: apt.8.xml:43
 msgid ""
 "<literal>list</literal> is used to display a list of packages. It supports "
 "shell pattern for matching package names and the following options: "
 "<option>--installed</option>, <option>--upgradable</option>, <option>--all-"
 "versions</option> are supported."
 msgstr ""
+"<literal>list</literal> wird benutzt, um eine Paketliste anzuzeigen. Es "
+"unterstützt Shell-Muster zur Beschränkung auf passende Paketnamen. Die "
+"folgenden Optionen werden unterstützt: <option>--installed</option>, "
+"<option>--upgradable</option>, <option>--all-versions</option>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:58
+#: apt.8.xml:54
 msgid ""
 "<literal>search</literal> searches for the given term(s) and display "
 "matching packages."
 msgstr ""
+"<literal>search</literal> sucht nach angegebenen Begriffen und zeigt "
+"passende Pakete an."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:64
-#, fuzzy
-#| msgid ""
-#| "<literal>rdepends</literal> shows a listing of each reverse dependency a "
-#| "package has."
+#: apt.8.xml:60
 msgid ""
 "<literal>show</literal> shows the package information for the given "
 "package(s)."
 msgstr ""
-"<literal>rdepends</literal> zeigt eine Liste von jeder "
-"Rückwärtsabhängigkeit, die ein Paket hat."
+"<literal>show</literal> zeigt die Paketinformationen für die angegebenen "
+"Pakete."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:71
+#: apt.8.xml:67
 msgid ""
 "<literal>install</literal> is followed by one or more package names desired "
 "for installation or upgrading."
 msgstr ""
+"<literal>install</literal> wird ergänzt mit einem oder mehreren Paketnamen, "
+"von denen eine Installation oder ein Upgrade gewünscht wird."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:75 apt-get.8.xml:118
+#: apt.8.xml:71 apt-get.8.xml:112
 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 "
@@ -708,7 +716,7 @@ msgstr ""
 "ausgewählt werden."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:85 apt-get.8.xml:153
+#: apt.8.xml:81 apt-get.8.xml:147
 msgid ""
 "<literal>remove</literal> is identical to <literal>install</literal> except "
 "that packages are removed instead of installed. Note that removing a package "
@@ -717,62 +725,73 @@ msgid ""
 "installed instead of removed."
 msgstr ""
 "<literal>remove</literal> ist identisch mit <literal>install</literal>, mit "
-"der Ausnahme, dass Pakte entfernt anstatt installiert werden. Beachten Sie, "
+"der Ausnahme, dass Pakete entfernt anstatt installiert werden. Beachten Sie, "
 "dass das Entfernen von Paketen deren Konfigurationsdateien im System "
 "belässt. Wenn ein Pluszeichen an den Paketnamen angehängt wird (ohne "
 "Leerzeichen dazwischen) wird das erkannte Paket installiert anstatt entfernt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:93
+#: apt.8.xml:89
 msgid ""
 "<literal>edit-sources</literal> lets you edit your sources.list file and "
 "provides basic sanity checks."
 msgstr ""
+"<literal>edit-sources</literal> ermöglicht die Bearbeitung Ihrer »sources."
+"list«-Datei und stellt grundlegende Plausibilitätsprüfungen bereit."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:99
-#, fuzzy
-#| msgid ""
-#| "<literal>showhold</literal> is used to print a list of packages on hold "
-#| "in the same way as for the other show commands."
+#: apt.8.xml:95
 msgid ""
 "<literal>update</literal> is used to resynchronize the package index files "
 "from their sources."
 msgstr ""
-"<literal>showhold</literal> wird benutzt, um eine Liste auf »hold« gesetzter "
-"Pakete auf die gleiche Art wie für andere Anzeigebefehle auszugeben."
+"<literal>update</literal> wird benutzt, um die Paketindexdateien wieder mit "
+"ihren Quellen in Einklang zu bringen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:105
+#: apt.8.xml:101
+#, fuzzy
+#| msgid ""
+#| "<literal>upgrade</literal> is used to install the newest versions of all "
+#| "packages currently installed on the system from the sources enumerated in "
+#| "<filename>/etc/apt/sources.list</filename>. New package will be "
+#| "installed, but existing package will never removed."
 msgid ""
 "<literal>upgrade</literal> is used to install the newest versions of all "
 "packages currently installed on the system from the sources enumerated in "
-"<filename>/etc/apt/sources.list</filename>. New package will be installed, "
-"but existing package will never removed."
+"<filename>/etc/apt/sources.list</filename>. New packages will be installed, "
+"but existing packages will never be removed."
 msgstr ""
+"<literal>upgrade</literal> wird verwendet, um die neuesten Versionen aller "
+"derzeit auf Ihrem System installierten Pakete von den in <filename>/etc/apt/"
+"sources.list</filename> aufgezählten Quellen zu installieren. Dabei werden "
+"neue Pakete installiert, existierende jedoch nicht entfernt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:114
+#: apt.8.xml:110
 msgid ""
 "<literal>full-upgrade</literal> performs the function of upgrade but may "
 "also remove installed packages if that is required in order to resolve a "
 "package conflict."
 msgstr ""
+"<literal>full-upgrade</literal> verrichtet die Funktion von »upgrade«, kann "
+"aber auch installierte Pakete entfernen, falls dies zum Auflösen eines "
+"Paketkonflikts nötig ist."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:124 apt-get.8.xml:257 apt-cache.8.xml:250 apt-mark.8.xml:110
-#: apt-config.8.xml:86 apt-extracttemplates.1.xml:54 apt-sortpkgs.1.xml:50
-#: apt-ftparchive.1.xml:506
+#: apt.8.xml:120 apt-get.8.xml:251 apt-cache.8.xml:244 apt-mark.8.xml:104
+#: apt-config.8.xml:80 apt-extracttemplates.1.xml:48 apt-sortpkgs.1.xml:44
+#: apt-ftparchive.1.xml:500
 msgid "options"
 msgstr "Optionen"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:134
+#: apt.8.xml:130
 msgid "Script usage"
-msgstr ""
+msgstr "Skriptaufruf"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:136
+#: apt.8.xml:132
 msgid ""
 "The &apt; commandline is designed as a end-user tool and it may change the "
 "output between versions. While it tries to not break backward compatibility "
@@ -780,101 +799,98 @@ msgid ""
 "&apt-cache; and &apt-get; via APT options. Please prefer using these "
 "commands in your scripts."
 msgstr ""
+"Die &apt;-Befehlszeile wurde als Endanwenderwerkzeug entworfen und kann bei "
+"Versionswechseln die Ausgabe ändern. Obwohl es versucht, nicht die "
+"Abwärtskompatibilität zu unterbrechen, kann sie nicht garantiert werden. "
+"Alle Funktionalitäten von &apt; sind in &apt-cache; und &apt-get; über APT-"
+"Optionen verfügbar. Bitte benutzen Sie vorzugsweise diese Befehle in Ihren "
+"Skripten."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:144
+#: apt.8.xml:140
 msgid "Differences to &apt-get;"
-msgstr ""
+msgstr "Unterschiede zu &apt-get;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:145
+#: apt.8.xml:141
 msgid ""
 "The <command>apt</command> command is meant to be pleasant for end users and "
 "does not need to be backward compatible like &apt-get;. Therefore some "
 "options are different:"
 msgstr ""
+"Der Befehl <command>apt</command> ist dazu gedacht, dem Endanwender die "
+"Arbeit zu erleichtern und benötigt keine Abwärtskompatibilität wie &apt-"
+"get;. Daher unterscheiden sich einige Optionen:"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml:151
-#, fuzzy
-#| msgid "the <literal>Package:</literal> line"
+#: apt.8.xml:147
 msgid "The option <literal>DPkg::Progress-Fancy</literal> is enabled."
-msgstr "die <literal>Package:</literal>-Zeile"
+msgstr "Die Option <literal>DPkg::Progress-Fancy</literal> ist aktiviert."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml:155
-#, fuzzy
-#| msgid "the <literal>Component:</literal> line"
+#: apt.8.xml:151
 msgid "The option <literal>APT::Color</literal> is enabled."
-msgstr "die <literal>Component:</literal>-Zeile"
+msgstr "Die Option <literal>APT::Color</literal> ist aktiviert."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml:159
+#: apt.8.xml:155
 msgid ""
 "A new <literal>list</literal> command is available similar to <literal>dpkg "
 "--list</literal>."
 msgstr ""
+"Ein neuer <literal>list</literal>-Befehl ist verfügbar. Er ist <literal>dpkg "
+"--list</literal> ähnlich."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml:164
-#, fuzzy
-#| msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
+#: apt.8.xml:160
 msgid ""
 "The option <literal>upgrade</literal> has <literal>--with-new-pkgs</literal> "
 "enabled by default."
-msgstr "die <literal>Archive:</literal>- oder <literal>Suite:</literal>-Zeile"
+msgstr ""
+"Bei der Option <literal>upgrade</literal> ist standardmäßig <literal>--with-"
+"new-pkgs</literal> aktiviert."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:174 apt-get.8.xml:558 apt-cache.8.xml:352 apt-key.8.xml:197
-#: apt-mark.8.xml:133 apt-secure.8.xml:193 apt-cdrom.8.xml:154
-#: apt-config.8.xml:111 apt.conf.5.xml:1227 apt_preferences.5.xml:707
-#: sources.list.5.xml:280 apt-extracttemplates.1.xml:72 apt-sortpkgs.1.xml:65
-#: apt-ftparchive.1.xml:609
+#: apt.8.xml:170 apt-get.8.xml:552 apt-cache.8.xml:346 apt-key.8.xml:191
+#: apt-mark.8.xml:127 apt-secure.8.xml:187 apt-cdrom.8.xml:148
+#: apt-config.8.xml:105 apt.conf.5.xml:1222 apt_preferences.5.xml:701
+#: sources.list.5.xml:274 apt-extracttemplates.1.xml:66 apt-sortpkgs.1.xml:59
+#: apt-ftparchive.1.xml:603
 msgid "See Also"
 msgstr "Siehe auch"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:175
-#, fuzzy
-#| msgid ""
-#| "&apt-cache;, &apt-cdrom;, &dpkg;, &sources-list;, &apt-conf;, &apt-"
-#| "config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-"
-#| "preferences;, the APT Howto."
+#: apt.8.xml:171
 msgid ""
 "&apt-get;, &apt-cache;, &sources-list;, &apt-conf;, &apt-config;, The APT "
 "User's guide in &guidesdir;, &apt-preferences;, the APT Howto."
 msgstr ""
-"&apt-cache;, &apt-cdrom;, &dpkg;, &sources-list;, &apt-conf;, &apt-config;, "
-"&apt-secure;, die APT-Benutzeranleitung in &guidesdir;, &apt-preferences;, "
-"das APT-Howto."
+"&apt-get;, &apt-cache;, &sources-list;, &apt-conf;, &apt-config;, die APT-"
+"Benutzeranleitung in &guidesdir;, &apt-preferences;, das APT-Howto."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:180 apt-get.8.xml:564 apt-cache.8.xml:357 apt-mark.8.xml:137
-#: apt-cdrom.8.xml:159 apt-config.8.xml:116 apt-extracttemplates.1.xml:76
-#: apt-sortpkgs.1.xml:69 apt-ftparchive.1.xml:613
+#: apt.8.xml:176 apt-get.8.xml:558 apt-cache.8.xml:351 apt-mark.8.xml:131
+#: apt-cdrom.8.xml:153 apt-config.8.xml:110 apt-extracttemplates.1.xml:70
+#: apt-sortpkgs.1.xml:63 apt-ftparchive.1.xml:607
 msgid "Diagnostics"
 msgstr "Diagnose"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:181
-#, fuzzy
-#| msgid ""
-#| "<command>apt-get</command> returns zero on normal operation, decimal 100 "
-#| "on error."
+#: apt.8.xml:177
 msgid ""
 "<command>apt</command> returns zero on normal operation, decimal 100 on "
 "error."
 msgstr ""
-"<command>apt-get</command> gibt bei normalen Operationen 0 zurück, dezimal "
-"100 bei Fehlern."
+"<command>apt</command> gibt bei normalen Operationen 0 zurück, dezimal 100 "
+"bei Fehlern."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-get.8.xml:35
+#: apt-get.8.xml:29
 msgid "APT package handling utility -- command-line interface"
 msgstr "APT-Werkzeug für den Umgang mit Paketen -- Befehlszeilenschnittstelle"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:41
+#: apt-get.8.xml:35
 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 "
@@ -887,8 +903,8 @@ msgstr ""
 "Oberflächenschnittstellen, wie &aptitude;, &synaptic; und &wajig;."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:46 apt-cache.8.xml:46 apt-cdrom.8.xml:53 apt-config.8.xml:46
-#: apt-ftparchive.1.xml:56
+#: apt-get.8.xml:40 apt-cache.8.xml:40 apt-cdrom.8.xml:47 apt-config.8.xml:40
+#: apt-ftparchive.1.xml:50
 msgid ""
 "Unless the <option>-h</option>, or <option>--help</option> option is given, "
 "one of the commands below must be present."
@@ -897,7 +913,7 @@ msgstr ""
 "angegeben ist, muss einer der unten aufgeführten Befehle vorkommen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:51
+#: apt-get.8.xml:45
 msgid ""
 "<literal>update</literal> is used to resynchronize the package index files "
 "from their sources. The indexes of available packages are fetched from the "
@@ -921,7 +937,7 @@ msgstr ""
 "Größe der Pakete nicht im voraus bekannt ist."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:63
+#: apt-get.8.xml:57
 msgid ""
 "<literal>upgrade</literal> is used to install the newest versions of all "
 "packages currently installed on the system from the sources enumerated in "
@@ -947,7 +963,7 @@ msgstr ""
 "get</command> die neuen Versionen der verfügbaren Pakete kennt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:76
+#: apt-get.8.xml:70
 msgid ""
 "<literal>dist-upgrade</literal> in addition to performing the function of "
 "<literal>upgrade</literal>, also intelligently handles changing dependencies "
@@ -972,7 +988,7 @@ msgstr ""
 "überschreiben der allgemeinen Einstellungen für einzelne Pakete."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:89
+#: apt-get.8.xml:83
 msgid ""
 "<literal>dselect-upgrade</literal> is used in conjunction with the "
 "traditional Debian packaging front-end, &dselect;. <literal>dselect-upgrade</"
@@ -989,7 +1005,7 @@ msgstr ""
 "Installieren von neuen Paketen)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:100
+#: apt-get.8.xml:94
 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 "
@@ -1020,7 +1036,7 @@ msgstr ""
 "get getroffen wurden."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:125
+#: apt-get.8.xml:119
 msgid ""
 "Both of the version selection mechanisms can downgrade packages and must be "
 "used with care."
@@ -1029,7 +1045,7 @@ msgstr ""
 "durchführen und müssen mit Vorsicht gehandhabt werden."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:128
+#: apt-get.8.xml:122
 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 system. "
@@ -1039,7 +1055,7 @@ msgid ""
 "you wish to upgrade, and if a newer version is available, it (and its "
 "dependencies, as described above) will be downloaded and installed."
 msgstr ""
-"Dies ist außerdem die bevorzugt zu benutzende Art, wenn Sie Sie ein Upgrade "
+"Dies ist außerdem die bevorzugt zu benutzende Art, wenn Sie ein Upgrade "
 "eines oder mehrerer bereits installierter Pakete durchführen möchten, ohne "
 "ein Upgrade aller Pakete, die Sie auf Ihrem System haben, durchzuführen. "
 "Anders als das Ziel von »upgrade«, das die neusten Versionen aller aktuell "
@@ -1050,7 +1066,7 @@ msgstr ""
 "heruntergeladen und installiert."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:139
+#: apt-get.8.xml:133
 msgid ""
 "Finally, the &apt-preferences; mechanism allows you to create an alternative "
 "installation policy for individual packages."
@@ -1059,7 +1075,7 @@ msgstr ""
 "alternative Installationsrichtlinie für eigene Pakete zu erzeugen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:143
+#: apt-get.8.xml:137
 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 "
@@ -1079,7 +1095,7 @@ msgstr ""
 "Zeichen, um genauere reguläre Ausdruck zu erstellen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:161
+#: apt-get.8.xml:155
 msgid ""
 "<literal>purge</literal> is identical to <literal>remove</literal> except "
 "that packages are removed and purged (any configuration files are deleted "
@@ -1090,7 +1106,7 @@ msgstr ""
 "Konfigurationsdateien werden mitgelöscht)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:166
+#: apt-get.8.xml:160
 msgid ""
 "<literal>source</literal> causes <command>apt-get</command> to fetch source "
 "packages. APT will examine the available packages to decide which source "
@@ -1110,7 +1126,7 @@ msgstr ""
 "wurde, wenn möglich."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:174
+#: apt-get.8.xml:168
 msgid ""
 "Source packages are tracked separately from binary packages via <literal>deb-"
 "src</literal> lines in the &sources-list; file. This means that you will "
@@ -1125,7 +1141,7 @@ msgstr ""
 "Versionen (zu alte/zu neue) oder überhaupt keine Quellpakete erhalten."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:180
+#: apt-get.8.xml:174
 msgid ""
 "If the <option>--compile</option> option is specified then the package will "
 "be compiled to a binary .deb using <command>dpkg-buildpackage</command> for "
@@ -1140,7 +1156,7 @@ msgstr ""
 "angegeben ist, wird das Quellpaket nicht entpackt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:187
+#: apt-get.8.xml:181
 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 "
@@ -1156,7 +1172,7 @@ msgstr ""
 "literal>-Option."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:193
+#: apt-get.8.xml:187
 msgid ""
 "Note that source packages are not installed and tracked in the "
 "<command>dpkg</command> database like binary packages; they are simply "
@@ -1168,7 +1184,7 @@ msgstr ""
 "heruntergeladen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:199
+#: apt-get.8.xml:193
 msgid ""
 "<literal>build-dep</literal> causes apt-get to install/remove packages in an "
 "attempt to satisfy the build dependencies for a source package. By default "
@@ -1184,7 +1200,7 @@ msgstr ""
 "angegeben werden."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:206
+#: apt-get.8.xml:200
 msgid ""
 "<literal>check</literal> is a diagnostic tool; it updates the package cache "
 "and checks for broken dependencies."
@@ -1193,7 +1209,7 @@ msgstr ""
 "Paketzwischenspeicher und prüft, ob beschädigte Abhängigkeiten vorliegen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:211
+#: apt-get.8.xml:205
 msgid ""
 "<literal>download</literal> will download the given binary package into the "
 "current directory."
@@ -1202,7 +1218,7 @@ msgstr ""
 "Verzeichnis herunterladen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:217
+#: apt-get.8.xml:211
 msgid ""
 "<literal>clean</literal> clears out the local repository of retrieved "
 "package files. It removes everything but the lock file from "
@@ -1215,7 +1231,7 @@ msgstr ""
 "partial/</filename>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:224
+#: apt-get.8.xml:218
 msgid ""
 "Like <literal>clean</literal>, <literal>autoclean</literal> clears out the "
 "local repository of retrieved package files. The difference is that it only "
@@ -1235,7 +1251,7 @@ msgstr ""
 "sie auf »off« gesetzt ist."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:234
+#: apt-get.8.xml:228
 msgid ""
 "<literal>autoremove</literal> is used to remove packages that were "
 "automatically installed to satisfy dependencies for other packages and are "
@@ -1246,7 +1262,7 @@ msgstr ""
 "erfüllen und die nicht mehr benötigt werden."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:239
+#: apt-get.8.xml:233
 msgid ""
 "<literal>changelog</literal> downloads a package changelog and displays it "
 "through <command>sensible-pager</command>. The server name and base "
@@ -1269,7 +1285,7 @@ msgstr ""
 "Befehl <option>install</option> angeben."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:262
+#: apt-get.8.xml:256
 msgid ""
 "Do not consider recommended packages as a dependency for installing.  "
 "Configuration Item: <literal>APT::Install-Recommends</literal>."
@@ -1278,7 +1294,7 @@ msgstr ""
 "Konfigurationselement: <literal>APT::Install-Recommends</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:267
+#: apt-get.8.xml:261
 msgid ""
 "Consider suggested packages as a dependency for installing.  Configuration "
 "Item: <literal>APT::Install-Suggests</literal>."
@@ -1287,7 +1303,7 @@ msgstr ""
 "Konfigurationselement: <literal>APT::Install-Suggests</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:272
+#: apt-get.8.xml:266
 msgid ""
 "Download only; package files are only retrieved, not unpacked or installed.  "
 "Configuration Item: <literal>APT::Get::Download-Only</literal>."
@@ -1297,7 +1313,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:277
+#: apt-get.8.xml:271
 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 "
@@ -1326,7 +1342,7 @@ msgstr ""
 "<literal>APT::Get::Fix-Broken</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:292
+#: apt-get.8.xml:286
 msgid ""
 "Ignore missing packages; if packages cannot be retrieved or fail the "
 "integrity check after retrieval (corrupted package files), hold back those "
@@ -1347,7 +1363,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:303
+#: apt-get.8.xml:297
 msgid ""
 "Disables downloading of packages. This is best used with <option>--ignore-"
 "missing</option> to force APT to use only the .debs it has already "
@@ -1359,7 +1375,7 @@ msgstr ""
 "<literal>APT::Get::Download</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:310
+#: apt-get.8.xml:304
 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 "
@@ -1379,7 +1395,7 @@ msgstr ""
 "Konfigurationselement: <literal>quiet</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:325
+#: apt-get.8.xml:319
 msgid ""
 "No action; perform a simulation of events that would occur but do not "
 "actually change the system.  Configuration Item: <literal>APT::Get::"
@@ -1390,7 +1406,7 @@ msgstr ""
 "<literal>APT::Get::Simulate</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:329
+#: apt-get.8.xml:323
 msgid ""
 "Simulated runs performed as a user will automatically deactivate locking "
 "(<literal>Debug::NoLocking</literal>), and if the option <literal>APT::Get::"
@@ -1410,7 +1426,7 @@ msgstr ""
 "wissen, was sie tun."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:337
+#: apt-get.8.xml:331
 msgid ""
 "Simulated runs print out a series of lines, each representing a "
 "<command>dpkg</command> operation: configure (<literal>Conf</literal>), "
@@ -1425,7 +1441,7 @@ msgstr ""
 "eckiger Klammern bedeutet Unterbrechungen, die keine Folgen haben (selten)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:345
+#: apt-get.8.xml:339
 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 "
@@ -1441,7 +1457,7 @@ msgstr ""
 "Get::Assume-Yes</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:353
+#: apt-get.8.xml:347
 msgid ""
 "Automatic \"no\" to all prompts.  Configuration Item: <literal>APT::Get::"
 "Assume-No</literal>."
@@ -1450,7 +1466,7 @@ msgstr ""
 "Get::Assume-No</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:358
+#: apt-get.8.xml:352
 msgid ""
 "Show upgraded packages; print out a list of all packages that are to be "
 "upgraded.  Configuration Item: <literal>APT::Get::Show-Upgraded</literal>."
@@ -1460,7 +1476,7 @@ msgstr ""
 "Konfigurationselement: <literal>APT::Get::Show-Upgraded</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:364
+#: apt-get.8.xml:358
 msgid ""
 "Show full versions for upgraded and installed packages.  Configuration Item: "
 "<literal>APT::Get::Show-Versions</literal>."
@@ -1470,7 +1486,7 @@ msgstr ""
 "Versions</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:370
+#: apt-get.8.xml:364
 msgid ""
 "This option controls the architecture packages are built for by <command>apt-"
 "get source --compile</command> and how cross-builddependencies are "
@@ -1487,7 +1503,7 @@ msgstr ""
 "Konfigurationselement: <literal>APT::Get::Host-Architecture</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:380
+#: apt-get.8.xml:374
 msgid ""
 "This option controls the activated build profiles for which a source package "
 "is built by <command>apt-get source --compile</command> and how build "
@@ -1503,7 +1519,7 @@ msgstr ""
 "Build-Profiles</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:391
+#: apt-get.8.xml:385
 msgid ""
 "Compile source packages after downloading them.  Configuration Item: "
 "<literal>APT::Get::Compile</literal>."
@@ -1512,7 +1528,7 @@ msgstr ""
 "Konfigurationselement: <literal>APT::Get::Compile</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:396
+#: apt-get.8.xml:390
 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 "
@@ -1526,7 +1542,7 @@ msgstr ""
 "<literal>APT::Ignore-Hold</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:403
+#: apt-get.8.xml:397
 msgid ""
 "Allow installing new packages when used in conjunction with "
 "<literal>upgrade</literal>.  This is useful if the update of a installed "
@@ -1546,7 +1562,7 @@ msgstr ""
 "wird.Konfigurationselement: <literal>APT::Get::Upgrade-Allow-New</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:415
+#: apt-get.8.xml:409
 msgid ""
 "Do not upgrade packages; when used in conjunction with <literal>install</"
 "literal>, <literal>no-upgrade</literal> will prevent packages on the command "
@@ -1560,7 +1576,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:422
+#: apt-get.8.xml:416
 msgid ""
 "Do not install new packages; when used in conjunction with <literal>install</"
 "literal>, <literal>only-upgrade</literal> will install upgrades for already "
@@ -1574,7 +1590,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:430
+#: apt-get.8.xml:424
 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 "
@@ -1589,7 +1605,7 @@ msgstr ""
 "zerstören! Konfigurationselement: <literal>APT::Get::force-yes</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:438
+#: apt-get.8.xml:432
 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 "
@@ -1611,7 +1627,7 @@ msgstr ""
 "Get::Print-URIs</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:449
+#: apt-get.8.xml:443
 msgid ""
 "Use purge instead of remove for anything that would be removed.  An asterisk "
 "(\"*\") will be displayed next to packages which are scheduled to be purged. "
@@ -1624,7 +1640,7 @@ msgstr ""
 "option>. Konfigurationselement: <literal>APT::Get::Purge</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:457
+#: apt-get.8.xml:451
 msgid ""
 "Re-install packages that are already installed and at the newest version.  "
 "Configuration Item: <literal>APT::Get::ReInstall</literal>."
@@ -1633,7 +1649,7 @@ msgstr ""
 "Version haben. Konfigurationselement: <literal>APT::Get::ReInstall</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:462
+#: apt-get.8.xml:456
 msgid ""
 "This option is on by default; use <literal>--no-list-cleanup</literal> to "
 "turn it off. When it is on, <command>apt-get</command> will automatically "
@@ -1651,7 +1667,7 @@ msgstr ""
 "Get::List-Cleanup</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:472
+#: apt-get.8.xml:466
 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 "
@@ -1676,7 +1692,7 @@ msgstr ""
 "auch die &apt-preferences;-Handbuchseite."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:487
+#: apt-get.8.xml:481
 msgid ""
 "Only perform operations that are 'trivial'. Logically this can be considered "
 "related to <option>--assume-yes</option>; where <option>--assume-yes</"
@@ -1690,7 +1706,7 @@ msgstr ""
 "Trivial-Only</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:494
+#: apt-get.8.xml:488
 msgid ""
 "If any packages are to be removed apt-get immediately aborts without "
 "prompting.  Configuration Item: <literal>APT::Get::Remove</literal>."
@@ -1699,7 +1715,7 @@ msgstr ""
 "Nachfrage ab. Konfigurationselement: <literal>APT::Get::Remove</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:500
+#: apt-get.8.xml:494
 msgid ""
 "If the command is either <literal>install</literal> or <literal>remove</"
 "literal>, then this option acts like running the <literal>autoremove</"
@@ -1713,7 +1729,7 @@ msgstr ""
 "AutomaticRemove</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:507
+#: apt-get.8.xml:501
 msgid ""
 "Only has meaning for the <literal>source</literal> and <literal>build-dep</"
 "literal> commands.  Indicates that the given source names are not to be "
@@ -1732,7 +1748,7 @@ msgstr ""
 "Get::Only-Source</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:518
+#: apt-get.8.xml:512
 msgid ""
 "Download only the diff, dsc, or tar file of a source archive.  Configuration "
 "Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</"
@@ -1744,7 +1760,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:524
+#: apt-get.8.xml:518
 msgid ""
 "Only process architecture-dependent build-dependencies.  Configuration Item: "
 "<literal>APT::Get::Arch-Only</literal>."
@@ -1753,7 +1769,7 @@ msgstr ""
 "Konfigurationselement: <literal>APT::Get::Arch-Only</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:529
+#: apt-get.8.xml:523
 msgid ""
 "Ignore if packages can't be authenticated and don't prompt about it.  This "
 "is useful for tools like pbuilder.  Configuration Item: <literal>APT::Get::"
@@ -1765,14 +1781,7 @@ msgstr ""
 
 # FIXME s/Item/Items/
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:535
-#, fuzzy
-#| msgid ""
-#| "Show user friendly progress information in the terminal window when "
-#| "packages are installed, upgraded or removed. For a machine parsable "
-#| "version of this data see README.progress-reporting in the apt doc "
-#| "directory.  Configuration Item: <literal>DpkgPM::Progress</literal> and "
-#| "<literal>Dpkg::Progress-Fancy</literal>."
+#: apt-get.8.xml:529
 msgid ""
 "Show user friendly progress information in the terminal window when packages "
 "are installed, upgraded or removed. For a machine parsable version of this "
@@ -1783,18 +1792,18 @@ msgstr ""
 "zeigt benutzerfreundliche Fortschrittsinformationen im Terminalfenster, wenn "
 "Pakete installiert beziehungsweise entfernt werden oder ein Upgrade "
 "durchgeführt wird. Informationen über eine maschinell auswertbare Version "
-"dieser Daten finden Sie in README.progress-reporting im Apt-doc-Verzeichnis. "
-"Konfigurationselemente: <literal>DpkgPM::Progress</literal> und "
-"<literal>Dpkg::Progress-Fancy</literal>."
+"dieser Daten finden Sie in README.progress-reporting im Verzeichnis apt/doc. "
+"Konfigurationselemente: <literal>Dpkg::Progress</literal> und <literal>Dpkg::"
+"Progress-Fancy</literal>."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:548 apt-cache.8.xml:345 apt-key.8.xml:176 apt-mark.8.xml:127
-#: apt.conf.5.xml:1221 apt_preferences.5.xml:700
+#: apt-get.8.xml:542 apt-cache.8.xml:339 apt-key.8.xml:170 apt-mark.8.xml:121
+#: apt.conf.5.xml:1216 apt_preferences.5.xml:694
 msgid "Files"
 msgstr "Dateien"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:559
+#: apt-get.8.xml:553
 msgid ""
 "&apt-cache;, &apt-cdrom;, &dpkg;, &sources-list;, &apt-conf;, &apt-config;, "
 "&apt-secure;, The APT User's guide in &guidesdir;, &apt-preferences;, the "
@@ -1805,7 +1814,7 @@ msgstr ""
 "das APT-Howto."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:565
+#: apt-get.8.xml:559
 msgid ""
 "<command>apt-get</command> returns zero on normal operation, decimal 100 on "
 "error."
@@ -1814,12 +1823,12 @@ msgstr ""
 "100 bei Fehlern."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-cache.8.xml:35
+#: apt-cache.8.xml:29
 msgid "query the APT cache"
 msgstr "den APT-Zwischenspeicher abfragen"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:41
+#: apt-cache.8.xml:35
 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 "
@@ -1832,7 +1841,7 @@ msgstr ""
 "und Generieren von interessanten Ausgaben der Paket-Metadaten bereit."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:51
+#: apt-cache.8.xml:45
 msgid ""
 "<literal>gencaches</literal> creates APT's package cache. This is done "
 "implicitly by all commands needing this cache if it is missing or outdated."
@@ -1842,14 +1851,14 @@ msgstr ""
 "benötigen, falls er fehlt oder veraltet ist."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
-#: apt-cache.8.xml:55 apt-cache.8.xml:144 apt-cache.8.xml:165
-#: apt-cache.8.xml:187 apt-cache.8.xml:192 apt-cache.8.xml:208
-#: apt-cache.8.xml:226 apt-cache.8.xml:238
+#: apt-cache.8.xml:49 apt-cache.8.xml:138 apt-cache.8.xml:159
+#: apt-cache.8.xml:181 apt-cache.8.xml:186 apt-cache.8.xml:202
+#: apt-cache.8.xml:220 apt-cache.8.xml:232
 msgid "&synopsis-pkg;"
 msgstr "&synopsis-pkg;"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:56
+#: apt-cache.8.xml:50
 msgid ""
 "<literal>showpkg</literal> displays information about the packages listed on "
 "the command line. Remaining arguments are package names. The available "
@@ -1873,7 +1882,7 @@ msgstr ""
 "Ausgabe ähnlich der folgenden erzeugen:"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
-#: apt-cache.8.xml:68
+#: apt-cache.8.xml:62
 #, no-wrap
 msgid ""
 "Package: libreadline2\n"
@@ -1899,7 +1908,7 @@ msgstr ""
 "Reverse Provides: \n"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:80
+#: apt-cache.8.xml:74
 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, "
@@ -1917,7 +1926,7 @@ msgstr ""
 "restlichen Ausgabe ist es am besten, den apt-Quelltext zu konsultieren."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:89
+#: apt-cache.8.xml:83
 msgid ""
 "<literal>stats</literal> displays some statistics about the cache.  No "
 "further arguments are expected. Statistics reported are:"
@@ -1926,7 +1935,7 @@ msgstr ""
 "Es werden keine weiteren Argumente erwartet. Berichtete Statistiken sind:"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:92
+#: apt-cache.8.xml:86
 msgid ""
 "<literal>Total package names</literal> is the number of package names found "
 "in the cache."
@@ -1935,7 +1944,7 @@ msgstr ""
 "Zwischenspeicher gefundenen Pakete."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:96
+#: apt-cache.8.xml:90
 msgid ""
 "<literal>Normal packages</literal> is the number of regular, ordinary "
 "package names; these are packages that bear a one-to-one correspondence "
@@ -1949,7 +1958,7 @@ msgstr ""
 "Kategorie."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:102
+#: apt-cache.8.xml:96
 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 "
@@ -1966,7 +1975,7 @@ msgstr ""
 "bereit, aber es gibt kein Paket mit dem Namen »mail-transport-agent«."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:110
+#: apt-cache.8.xml:104
 msgid ""
 "<literal>Single virtual packages</literal> is the number of packages with "
 "only one package providing a particular virtual package. For example, in the "
@@ -1979,7 +1988,7 @@ msgstr ""
 "aber nur ein Paket, xless, stellt »X11-text-viewer« bereit."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:116
+#: apt-cache.8.xml:110
 msgid ""
 "<literal>Mixed virtual packages</literal> is the number of packages that "
 "either provide a particular virtual package or have the virtual package name "
@@ -1992,7 +2001,7 @@ msgstr ""
 "tatsächliches Paket, wird aber auch vom Paket debconf-tiny bereitgestellt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:123
+#: apt-cache.8.xml:117
 msgid ""
 "<literal>Missing</literal> is the number of package names that were "
 "referenced in a dependency but were not provided by any package. Missing "
@@ -2008,7 +2017,7 @@ msgstr ""
 "Breaks-Angaben Bezug genommen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:130
+#: apt-cache.8.xml:124
 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 "
@@ -2024,7 +2033,7 @@ msgstr ""
 "Paketnamen sein."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:137
+#: apt-cache.8.xml:131
 msgid ""
 "<literal>Total dependencies</literal> is the number of dependency "
 "relationships claimed by all of the packages in the cache."
@@ -2033,7 +2042,7 @@ msgstr ""
 "Abhängigkeitsbeziehungen, den alle Pakete im Zwischenspeicher beanspruchen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:145
+#: apt-cache.8.xml:139
 msgid ""
 "<literal>showsrc</literal> displays all the source package records that "
 "match the given package names. All versions are shown, as well as all "
@@ -2044,7 +2053,7 @@ msgstr ""
 "wie alle Datensätze, die den Namen für ein Binärpaket deklarieren."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:151
+#: apt-cache.8.xml:145
 msgid ""
 "<literal>dump</literal> shows a short listing of every package in the cache. "
 "It is primarily for debugging."
@@ -2053,7 +2062,7 @@ msgstr ""
 "im Zwischenspeicher. Es dient in erster Linie der Fehlersuche."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:156
+#: apt-cache.8.xml:150
 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."
@@ -2063,7 +2072,7 @@ msgstr ""
 "benutzt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:161
+#: apt-cache.8.xml:155
 msgid ""
 "<literal>unmet</literal> displays a summary of all unmet dependencies in the "
 "package cache."
@@ -2072,7 +2081,7 @@ msgstr ""
 "Abhängigkeiten im Paketzwischenspeicher."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:166
+#: apt-cache.8.xml:160
 msgid ""
 "<literal>show</literal> performs a function similar to <command>dpkg --print-"
 "avail</command>; it displays the package records for the named packages."
@@ -2082,12 +2091,12 @@ msgstr ""
 "Pakete."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
-#: apt-cache.8.xml:171
+#: apt-cache.8.xml:165
 msgid "&synopsis-regex;"
 msgstr "&synopsis-regex;"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:172
+#: apt-cache.8.xml:166
 msgid ""
 "<literal>search</literal> performs a full text search on all available "
 "package lists for the POSIX regex pattern given, see &regex;.  It searches "
@@ -2108,7 +2117,7 @@ msgstr ""
 "wird die lange Beschreibung nicht durchsucht, sondern nur der Paketname."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:183
+#: apt-cache.8.xml:177
 msgid ""
 "Separate arguments can be used to specify multiple search patterns that are "
 "and'ed together."
@@ -2117,7 +2126,7 @@ msgstr ""
 "die »und«-verknüpft werden."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:188
+#: apt-cache.8.xml:182
 msgid ""
 "<literal>depends</literal> shows a listing of each dependency a package has "
 "and all the possible other packages that can fulfill that dependency."
@@ -2127,7 +2136,7 @@ msgstr ""
 "können."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:193
+#: apt-cache.8.xml:187
 msgid ""
 "<literal>rdepends</literal> shows a listing of each reverse dependency a "
 "package has."
@@ -2136,12 +2145,12 @@ msgstr ""
 "Rückwärtsabhängigkeit, die ein Paket hat."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:197
+#: apt-cache.8.xml:191
 msgid "<optional><replaceable>&synopsis-prefix;</replaceable></optional>"
 msgstr "<optional><replaceable>&synopsis-prefix;</replaceable></optional>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:198
+#: apt-cache.8.xml:192
 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 "
@@ -2156,7 +2165,7 @@ msgstr ""
 "besten mit der <option>--generate</option>-Option benutzt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:203
+#: apt-cache.8.xml:197
 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 "
@@ -2167,7 +2176,7 @@ msgstr ""
 "Pakete sind z.B. auch in der generierten Liste aufgeführt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:209
+#: apt-cache.8.xml:203
 msgid ""
 "<literal>dotty</literal> takes a list of packages on the command line and "
 "generates output suitable for use by dotty from the <ulink url=\"http://www."
@@ -2189,7 +2198,7 @@ msgstr ""
 "GivenOnly</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:218
+#: apt-cache.8.xml:212
 msgid ""
 "The resulting nodes will have several shapes; normal packages are boxes, "
 "pure virtual packages are triangles, mixed virtual packages are diamonds, "
@@ -2203,14 +2212,14 @@ msgstr ""
 "depends, grüne Linien sind Konflikte."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:223
+#: apt-cache.8.xml:217
 msgid "Caution, dotty cannot graph larger sets of packages."
 msgstr ""
 "Vorsicht, dotty kann keine größeren Zusammenstellungen von Paketen grafisch "
 "darstellen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:227
+#: apt-cache.8.xml:221
 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 tool</ulink>."
@@ -2220,12 +2229,12 @@ msgstr ""
 "ulink>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:231
+#: apt-cache.8.xml:225
 msgid "<optional><replaceable>&synopsis-pkg;</replaceable>…</optional>"
 msgstr "<optional><replaceable>&synopsis-pkg;</replaceable>…</optional>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:232
+#: apt-cache.8.xml:226
 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 "
@@ -2238,7 +2247,7 @@ msgstr ""
 "Informationen über die Prioritätenauswahl der genannten Pakete aus."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:239
+#: apt-cache.8.xml:233
 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 "
@@ -2257,7 +2266,7 @@ msgstr ""
 "(<literal>APT::Architecture</literal>)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:255
+#: apt-cache.8.xml:249
 msgid ""
 "Select the file to store the package cache. The package cache is the primary "
 "cache used by all operations.  Configuration Item: <literal>Dir::Cache::"
@@ -2269,7 +2278,7 @@ msgstr ""
 "pkgcache</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:261
+#: apt-cache.8.xml:255
 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 "
@@ -2286,7 +2295,7 @@ msgstr ""
 "srcpkgcache</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:269
+#: apt-cache.8.xml:263
 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 "
@@ -2300,7 +2309,7 @@ msgstr ""
 "Konfigurationselement: <literal>quiet</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:276
+#: apt-cache.8.xml:270
 msgid ""
 "Print only important dependencies; for use with <literal>unmet</literal> and "
 "<literal>depends</literal>. Causes only Depends and Pre-Depends relations to "
@@ -2312,7 +2321,7 @@ msgstr ""
 "<literal>APT::Cache::Important</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:290
+#: apt-cache.8.xml:284
 msgid ""
 "Per default the <literal>depends</literal> and <literal>rdepends</literal> "
 "print all dependencies. This can be tweaked with these flags which will omit "
@@ -2328,7 +2337,7 @@ msgstr ""
 "Cache::ShowRecommends</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:297
+#: apt-cache.8.xml:291
 msgid ""
 "Print full package records when searching.  Configuration Item: "
 "<literal>APT::Cache::ShowFull</literal>."
@@ -2337,7 +2346,7 @@ msgstr ""
 "Konfigurationselement: <literal>APT::Cache::ShowFull</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:302
+#: apt-cache.8.xml:296
 msgid ""
 "Print full records for all available versions. This is the default; to turn "
 "it off, use <option>--no-all-versions</option>.  If <option>--no-all-"
@@ -2354,7 +2363,7 @@ msgstr ""
 "anwendbar. Konfigurationselement: <literal>APT::Cache::AllVersions</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:311
+#: apt-cache.8.xml:305
 msgid ""
 "Perform automatic package cache regeneration, rather than use the cache as "
 "it is. This is the default; to turn it off, use <option>--no-generate</"
@@ -2366,7 +2375,7 @@ msgstr ""
 "Konfigurationselement: <literal>APT::Cache::Generate</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:317
+#: apt-cache.8.xml:311
 msgid ""
 "Only search on the package names, not the long descriptions.  Configuration "
 "Item: <literal>APT::Cache::NamesOnly</literal>."
@@ -2375,7 +2384,7 @@ msgstr ""
 "Konfigurationselement: <literal>APT::Cache::NamesOnly</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:322
+#: apt-cache.8.xml:316
 msgid ""
 "Make <literal>pkgnames</literal> print all names, including virtual packages "
 "and missing dependencies.  Configuration Item: <literal>APT::Cache::"
@@ -2386,7 +2395,7 @@ msgstr ""
 "<literal>APT::Cache::AllNames</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:328
+#: apt-cache.8.xml:322
 msgid ""
 "Make <literal>depends</literal> and <literal>rdepends</literal> recursive so "
 "that all packages mentioned are printed once.  Configuration Item: "
@@ -2397,7 +2406,7 @@ msgstr ""
 "Konfigurationselement: <literal>APT::Cache::RecurseDepends</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:335
+#: apt-cache.8.xml:329
 msgid ""
 "Limit the output of <literal>depends</literal> and <literal>rdepends</"
 "literal> to packages which are currently installed.  Configuration Item: "
@@ -2408,12 +2417,12 @@ msgstr ""
 "<literal>APT::Cache::Installed</literal>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:353
+#: apt-cache.8.xml:347
 msgid "&apt-conf;, &sources-list;, &apt-get;"
 msgstr "&apt-conf;, &sources-list;, &apt-get;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:358
+#: apt-cache.8.xml:352
 msgid ""
 "<command>apt-cache</command> returns zero on normal operation, decimal 100 "
 "on error."
@@ -2422,12 +2431,12 @@ msgstr ""
 "100 bei Fehlern."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-key.8.xml:34
+#: apt-key.8.xml:28
 msgid "APT key management utility"
 msgstr "APT-Schlüsselverwaltungsdienstprogramm"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:41
+#: apt-key.8.xml:35
 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 "
@@ -2439,12 +2448,12 @@ msgstr ""
 "vertrauenswürdig betrachtet."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-key.8.xml:47
+#: apt-key.8.xml:41
 msgid "Commands"
 msgstr "Befehle"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:52
+#: apt-key.8.xml:46
 msgid ""
 "Add a new key to the list of trusted keys.  The key is read from the "
 "filename given with the parameter &synopsis-param-filename; or if the "
@@ -2455,33 +2464,33 @@ msgstr ""
 "Dateiname <literal>-</literal> ist, von der Standardeingabe."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:65
+#: apt-key.8.xml:59
 msgid "Remove a key from the list of trusted keys."
 msgstr ""
 "entfernt einen Schlüssel von der Liste der vertrauenswürdigen Schlüssel."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:76
+#: apt-key.8.xml:70
 msgid "Output the key &synopsis-param-keyid; to standard output."
 msgstr "gibt den Schlüssel &synopsis-param-keyid; auf der Standardausgabe aus."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:87
+#: apt-key.8.xml:81
 msgid "Output all trusted keys to standard output."
 msgstr "gibt alle vertrauenswürdigen Schlüssel auf der Standardausgabe aus."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:98
+#: apt-key.8.xml:92
 msgid "List trusted keys."
 msgstr "listet vertrauenswürdige Schlüssel auf."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:109
+#: apt-key.8.xml:103
 msgid "List fingerprints of trusted keys."
 msgstr "listet Fingerabdrücke vertrauenswürdiger Schlüssel auf."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:120
+#: apt-key.8.xml:114
 msgid ""
 "Pass advanced options to gpg. With adv --recv-key you can download the "
 "public key."
@@ -2490,7 +2499,7 @@ msgstr ""
 "öffentlichen Schlüssel herunterladen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:132
+#: apt-key.8.xml:126
 msgid ""
 "Update the local keyring with the archive keyring and remove from the local "
 "keyring the archive keys which are no longer valid.  The archive keyring is "
@@ -2504,7 +2513,7 @@ msgstr ""
 "package; in &keyring-distro;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:146
+#: apt-key.8.xml:140
 msgid ""
 "Perform an update working similarly to the <command>update</command> command "
 "above, but get the archive keyring from a URI instead and validate it "
@@ -2522,12 +2531,12 @@ msgstr ""
 "Ubuntu funktioniert dies aber."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-key.8.xml:162 apt-cdrom.8.xml:82
+#: apt-key.8.xml:156 apt-cdrom.8.xml:76
 msgid "Options"
 msgstr "Optionen"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:163
+#: apt-key.8.xml:157
 msgid ""
 "Note that options need to be defined before the commands described in the "
 "previous section."
@@ -2536,7 +2545,7 @@ msgstr ""
 "Befehlen definiert sein müssen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:166
+#: apt-key.8.xml:160
 msgid ""
 "With this option it is possible to specify a particular keyring file the "
 "command should operate on. The default is that a command is executed on the "
@@ -2553,52 +2562,52 @@ msgstr ""
 "Schlüssel werden zu diesem hinzugefügt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:181
+#: apt-key.8.xml:175
 msgid "<filename>/etc/apt/trustdb.gpg</filename>"
 msgstr "<filename>/etc/apt/trustdb.gpg</filename>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:182
+#: apt-key.8.xml:176
 msgid "Local trust database of archive keys."
 msgstr "lokale Datenbank vertrauenswürdiger Archivschlüssel"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:185
+#: apt-key.8.xml:179
 msgid "&keyring-filename;"
 msgstr "&keyring-filename;"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:186
+#: apt-key.8.xml:180
 msgid "Keyring of &keyring-distro; archive trusted keys."
 msgstr ""
 "Schlüsselbund vertrauenswürdiger Schlüssel des &keyring-distro;-Archivs"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:189
+#: apt-key.8.xml:183
 msgid "&keyring-removed-filename;"
 msgstr "&keyring-removed-filename;"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:190
+#: apt-key.8.xml:184
 msgid "Keyring of &keyring-distro; archive removed trusted keys."
 msgstr ""
 "Schlüsselbund entfernter vertrauenswürdiger Schlüssel des &keyring-distro;-"
 "Archivs"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:199
+#: apt-key.8.xml:193
 msgid "&apt-get;, &apt-secure;"
 msgstr "&apt-get;, &apt-secure;"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-mark.8.xml:35
+#: apt-mark.8.xml:29
 msgid "mark/unmark a package as being automatically-installed"
 msgstr ""
 "ein Paket als automatisch installiert markieren oder diese Markierung "
 "entfernen"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:41
+#: apt-mark.8.xml:35
 msgid ""
 "<command>apt-mark</command> will change whether a package has been marked as "
 "being automatically installed."
@@ -2607,7 +2616,7 @@ msgstr ""
 "installiert markiert ist."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:45
+#: apt-mark.8.xml:39
 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 "
@@ -2623,7 +2632,7 @@ msgstr ""
 "<command>aptitude</command> entfernt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:54
+#: apt-mark.8.xml:48
 msgid ""
 "<literal>auto</literal> is used to mark a package as being automatically "
 "installed, which will cause the package to be removed when no more manually "
@@ -2634,7 +2643,7 @@ msgstr ""
 "keine manuell installierten Pakete von ihm abhängen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:62
+#: apt-mark.8.xml:56
 msgid ""
 "<literal>manual</literal> is used to mark a package as being manually "
 "installed, which will prevent the package from being automatically removed "
@@ -2645,7 +2654,7 @@ msgstr ""
 "kein anderes Paket von ihm abhängt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:70
+#: apt-mark.8.xml:64
 msgid ""
 "<literal>hold</literal> is used to mark a package as held back, which will "
 "prevent the package from being automatically installed, upgraded or "
@@ -2661,7 +2670,7 @@ msgstr ""
 "option>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:80
+#: apt-mark.8.xml:74
 msgid ""
 "<literal>unhold</literal> is used to cancel a previously set hold on a "
 "package to allow all actions again."
@@ -2670,7 +2679,7 @@ msgstr ""
 "ein Paket aufzuheben, um alle Aktionen wieder zu erlauben."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:86
+#: apt-mark.8.xml:80
 msgid ""
 "<literal>showauto</literal> is used to print a list of automatically "
 "installed packages with each package on a new line.  All automatically "
@@ -2684,7 +2693,7 @@ msgstr ""
 "die automatisch installiert wurden."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:94
+#: apt-mark.8.xml:88
 msgid ""
 "<literal>showmanual</literal> can be used in the same way as "
 "<literal>showauto</literal> except that it will print a list of manually "
@@ -2695,7 +2704,7 @@ msgstr ""
 "stattdessen eine Liste manuell installierter Pakete ausgibt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:101
+#: apt-mark.8.xml:95
 msgid ""
 "<literal>showhold</literal> is used to print a list of packages on hold in "
 "the same way as for the other show commands."
@@ -2704,7 +2713,7 @@ msgstr ""
 "Pakete auf die gleiche Art wie für andere Anzeigebefehle auszugeben."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:117
+#: apt-mark.8.xml:111
 msgid ""
 "Read/Write package stats from the filename given with the parameter "
 "&synopsis-param-filename; instead of from the default location, which is "
@@ -2717,7 +2726,7 @@ msgstr ""
 "<literal>Dir::State</literal> definierten Verzeichnis, ist."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:138
+#: apt-mark.8.xml:132
 msgid ""
 "<command>apt-mark</command> returns zero on normal operation, non-zero on "
 "error."
@@ -2726,12 +2735,12 @@ msgstr ""
 "Fehlern nicht Null."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-secure.8.xml:49
+#: apt-secure.8.xml:43
 msgid "Archive authentication support for APT"
 msgstr "Archivauthentifizierungsunterstützung für APT"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:54
+#: apt-secure.8.xml:48
 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 "
@@ -2744,7 +2753,7 @@ msgstr ""
 "auf den Signierschlüssel der Release-Datei haben."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:62
+#: apt-secure.8.xml:56
 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 "
@@ -2760,7 +2769,7 @@ msgstr ""
 "dem Herunterladen von Paketen von dort erzwingen."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:71
+#: apt-secure.8.xml:65
 msgid ""
 "The package frontends &apt-get;, &aptitude; and &synaptic; support this new "
 "authentication feature."
@@ -2769,12 +2778,12 @@ msgstr ""
 "neue Authentifizierungsfunktion."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:76
+#: apt-secure.8.xml:70
 msgid "Trusted archives"
 msgstr "Vertrauenswürdige Archive"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:79
+#: apt-secure.8.xml:73
 msgid ""
 "The chain of trust from an apt archive to the end user is made up of several "
 "steps. <command>apt-secure</command> is the last step in this chain; "
@@ -2792,7 +2801,7 @@ msgstr ""
 "sicherstellt."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:87
+#: apt-secure.8.xml:81
 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 "
@@ -2805,7 +2814,7 @@ msgstr ""
 "(bereitgestellt von den Paketen debsig-verify beziehungsweise devscripts)."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:94
+#: apt-secure.8.xml:88
 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. In order to become "
@@ -2823,7 +2832,7 @@ msgstr ""
 "sicherzustellen."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:104
+#: apt-secure.8.xml:98
 msgid ""
 "Once the uploaded package is verified and included in the archive, the "
 "maintainer signature is stripped off, and checksums of the package are "
@@ -2844,7 +2853,7 @@ msgstr ""
 "Archivschlüsselbund im Paket &keyring-package; verfügbar."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:115
+#: apt-secure.8.xml:109
 msgid ""
 "End users can check the signature of the Release file, extract a checksum of "
 "a package from it and compare it with the checksum of the package they "
@@ -2856,7 +2865,7 @@ msgstr ""
 "dies automatisch tut."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:120
+#: apt-secure.8.xml:114
 msgid ""
 "Notice that this is distinct from checking signatures on a per package "
 "basis. It is designed to prevent two possible attacks:"
@@ -2865,7 +2874,7 @@ msgstr ""
 "ist. Es wurde entworfen, um zwei mögliche Angriffe zu verhindern:"
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:125
+#: apt-secure.8.xml:119
 msgid ""
 "<literal>Network \"man in the middle\" attacks</literal>. Without signature "
 "checking, malicious agents can introduce themselves into the package "
@@ -2881,7 +2890,7 @@ msgstr ""
 "oder DNS-Manipulationsangriffe) erfolgen."
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:133
+#: apt-secure.8.xml:127
 msgid ""
 "<literal>Mirror network compromise</literal>.  Without signature checking, a "
 "malicious agent can compromise a mirror host and modify the files in it to "
@@ -2894,7 +2903,7 @@ msgstr ""
 "Pakete von diesem Rechner herunterladen."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:140
+#: apt-secure.8.xml:134
 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 "
@@ -2907,12 +2916,12 @@ msgstr ""
 "Fall kann dieser Mechanismus eine Signatur pro Paket ergänzen."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:146
+#: apt-secure.8.xml:140
 msgid "User configuration"
 msgstr "Benutzerkonfiguration"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:148
+#: apt-secure.8.xml:142
 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 "
@@ -2926,7 +2935,7 @@ msgstr ""
 "den Debian-Paketdepots benutzt werden."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:155
+#: apt-secure.8.xml:149
 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 "
@@ -2944,12 +2953,12 @@ msgstr ""
 "herunterladen und prüfen kann."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:164
+#: apt-secure.8.xml:158
 msgid "Archive configuration"
 msgstr "Archivkonfiguration"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:166
+#: apt-secure.8.xml:160
 msgid ""
 "If you want to provide archive signatures in an archive under your "
 "maintenance you have to:"
@@ -2958,7 +2967,7 @@ msgstr ""
 "stellen möchten, müssen Sie:"
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:171
+#: apt-secure.8.xml:165
 msgid ""
 "<emphasis>Create a toplevel Release file</emphasis>, if it does not exist "
 "already. You can do this by running <command>apt-ftparchive release</"
@@ -2969,7 +2978,7 @@ msgstr ""
 "<command>apt-ftparchive release</command> (aus apt-utils) ausführen."
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:176
+#: apt-secure.8.xml:170
 msgid ""
 "<emphasis>Sign it</emphasis>. You can do this by running <command>gpg --"
 "clearsign -o InRelease Release</command> and <command>gpg -abs -o Release."
@@ -2980,7 +2989,7 @@ msgstr ""
 "abs -o Release.gpg Release</command> ausführen."
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:180
+#: apt-secure.8.xml:174
 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 "
@@ -2991,7 +3000,7 @@ msgstr ""
 "Dateien im Archiv zu authentifizieren."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:187
+#: apt-secure.8.xml:181
 msgid ""
 "Whenever the contents of the archive change (new packages are added or "
 "removed) the archive maintainer has to follow the first two steps outlined "
@@ -3002,16 +3011,16 @@ msgstr ""
 "Schritten folgen."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:195
+#: apt-secure.8.xml:189
 msgid ""
 "&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, "
-"&debsign; &debsig-verify;, &gpg;"
+"&debsign;, &debsig-verify;, &gpg;"
 msgstr ""
 "&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, "
-"&debsign; &debsig-verify;, &gpg;"
+"&debsign;, &debsig-verify;, &gpg;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:199
+#: apt-secure.8.xml:193
 msgid ""
 "For more background information you might want to review the <ulink url="
 "\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "
@@ -3028,12 +3037,12 @@ msgstr ""
 ">Strong Distribution HOWTO</ulink> von V. Alex Brennen lesen."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:212
+#: apt-secure.8.xml:206
 msgid "Manpage Authors"
 msgstr "Autoren der Handbuchseite"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:214
+#: apt-secure.8.xml:208
 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."
@@ -3042,12 +3051,12 @@ msgstr ""
 "Peña, Isaac Jones, Colin Walters, Florian Weimer und Michael Vogt."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-cdrom.8.xml:34
+#: apt-cdrom.8.xml:28
 msgid "APT CD-ROM management utility"
 msgstr "APT-CD-ROM-Verwaltungswerkzeug"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:40
+#: apt-cdrom.8.xml:34
 msgid ""
 "<command>apt-cdrom</command> is used to add a new CD-ROM to APT's list of "
 "available sources. <command>apt-cdrom</command> takes care of determining "
@@ -3060,7 +3069,7 @@ msgstr ""
 "mehrere mögliche Fehlbrennungen und prüft die Indexdateien."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:47
+#: apt-cdrom.8.xml:41
 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 disc in a multi-CD set "
@@ -3072,7 +3081,7 @@ msgstr ""
 "gescannt werden, um auf mögliche Fehlbrennungen zu testen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:58
+#: apt-cdrom.8.xml:52
 msgid ""
 "<literal>add</literal> is used to add a new disc to the source list. It will "
 "unmount the CD-ROM device, prompt for a disc to be inserted and then proceed "
@@ -3087,7 +3096,7 @@ msgstr ""
 "Verzeichnis hat, werden Sie nach einem aussagekräftigen Titel gefragt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:66
+#: apt-cdrom.8.xml:60
 msgid ""
 "APT uses a CD-ROM ID to track which disc is currently in the drive and "
 "maintains a database of these IDs in <filename>&statedir;/cdroms.list</"
@@ -3098,7 +3107,7 @@ msgstr ""
 "<filename>&statedir;/cdroms.list</filename>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:74
+#: apt-cdrom.8.xml:68
 msgid ""
 "A debugging tool to report the identity of the current disc as well as the "
 "stored file name"
@@ -3107,7 +3116,7 @@ msgstr ""
 "gespeicherten Dateinamen zu berichten"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:87
+#: apt-cdrom.8.xml:81
 msgid ""
 "Do not try to auto-detect the CD-ROM path. Usually combined with the "
 "<option>--cdrom</option> option.  Configuration Item: <literal>Acquire::"
@@ -3118,7 +3127,7 @@ msgstr ""
 "Konfigurationselement: <literal>Acquire::cdrom::AutoDetect</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:95
+#: apt-cdrom.8.xml:89
 msgid ""
 "Mount point; specify the location to mount the CD-ROM. This mount point must "
 "be listed in <filename>/etc/fstab</filename> and properly configured.  "
@@ -3130,7 +3139,7 @@ msgstr ""
 "cdrom::mount</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:104
+#: apt-cdrom.8.xml:98
 msgid ""
 "Rename a disc; change the label of a disc or override the disc's given "
 "label. This option will cause <command>apt-cdrom</command> to prompt for a "
@@ -3142,7 +3151,7 @@ msgstr ""
 "Konfigurationselement: <literal>APT::CDROM::Rename</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:113
+#: apt-cdrom.8.xml:107
 msgid ""
 "No mounting; prevent <command>apt-cdrom</command> from mounting and "
 "unmounting the mount point.  Configuration Item: <literal>APT::CDROM::"
@@ -3153,7 +3162,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:121
+#: apt-cdrom.8.xml:115
 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 "
@@ -3166,7 +3175,7 @@ msgstr ""
 "festgestellt hat. Konfigurationselement: <literal>APT::CDROM::Fast</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:131
+#: apt-cdrom.8.xml:125
 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 "
@@ -3177,7 +3186,7 @@ msgstr ""
 "Dies verlängert das Durchsuchen des Mediums deutlich, nimmt aber alle auf."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:142
+#: apt-cdrom.8.xml:136
 msgid ""
 "No Changes; Do not change the &sources-list; file and do not write index "
 "files. Everything is still checked however.  Configuration Item: "
@@ -3188,12 +3197,12 @@ msgstr ""
 "Konfigurationselement: <literal>APT::CDROM::NoAct</literal>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:155
+#: apt-cdrom.8.xml:149
 msgid "&apt-conf;, &apt-get;, &sources-list;"
 msgstr "&apt-conf;, &apt-get;, &sources-list;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:160
+#: apt-cdrom.8.xml:154
 msgid ""
 "<command>apt-cdrom</command> returns zero on normal operation, decimal 100 "
 "on error."
@@ -3202,12 +3211,12 @@ msgstr ""
 "100 bei Fehlern."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-config.8.xml:35
+#: apt-config.8.xml:29
 msgid "APT Configuration Query program"
 msgstr "APT-Konfigurationsabfrageprogramm"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:41
+#: apt-config.8.xml:35
 msgid ""
 "<command>apt-config</command> is an internal program used by various "
 "portions of the APT suite to provide consistent configurability. It accesses "
@@ -3221,7 +3230,7 @@ msgstr ""
 "Anwendungen zu benutzen ist."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:53
+#: apt-config.8.xml:47
 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 the "
@@ -3237,7 +3246,7 @@ msgstr ""
 "sollte es wie folgt benutzt werden:"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
-#: apt-config.8.xml:61
+#: apt-config.8.xml:55
 #, no-wrap
 msgid ""
 "OPTS=\"-f\"\n"
@@ -3249,7 +3258,7 @@ msgstr ""
 "eval $RES\n"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:66
+#: apt-config.8.xml:60
 msgid ""
 "This will set the shell environment variable $OPTS to the value of MyApp::"
 "options with a default of <option>-f</option>."
@@ -3258,7 +3267,7 @@ msgstr ""
 "mit einer Vorgabe von <option>-f</option> setzen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:70
+#: apt-config.8.xml:64
 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 "
@@ -3270,12 +3279,12 @@ msgstr ""
 "intern geprüft."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:79
+#: apt-config.8.xml:73
 msgid "Just show the contents of the configuration space."
 msgstr "Nur der Inhalt des Konfigurationsbereichs wird angezeigt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:92
+#: apt-config.8.xml:86
 msgid ""
 "Include options which have an empty value. This is the default, so use --no-"
 "empty to remove them from the output."
@@ -3284,12 +3293,12 @@ msgstr ""
 "benutzen Sie daher --no-empty, um sie aus der Ausgabe zu entfernen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
-#: apt-config.8.xml:97
+#: apt-config.8.xml:91
 msgid "&percnt;f &#x0022;&percnt;v&#x0022;;&percnt;n"
 msgstr "&percnt;f &#x0022;&percnt;v&#x0022;;&percnt;n"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:98
+#: apt-config.8.xml:92
 msgid ""
 "Defines the output of each config option. &percnt;t will be replaced with "
 "its individual name, &percnt;f with its full hierarchical name and &percnt;v "
@@ -3308,13 +3317,13 @@ msgstr ""
 "&percnt; kann mittels &percnt;&percnt; ausgegeben werden."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:112 apt-extracttemplates.1.xml:73 apt-sortpkgs.1.xml:66
-#: apt-ftparchive.1.xml:610
+#: apt-config.8.xml:106 apt-extracttemplates.1.xml:67 apt-sortpkgs.1.xml:60
+#: apt-ftparchive.1.xml:604
 msgid "&apt-conf;"
 msgstr "&apt-conf;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:117
+#: apt-config.8.xml:111
 msgid ""
 "<command>apt-config</command> returns zero on normal operation, decimal 100 "
 "on error."
@@ -3323,27 +3332,27 @@ msgstr ""
 "dezimal 100 bei Fehlern."
 
 #. type: Content of: <refentry><refentryinfo><author><contrib>
-#: apt.conf.5.xml:22
+#: apt.conf.5.xml:16
 msgid "Initial documentation of Debug::*."
 msgstr "ursprüngliche Dokumentation von Debug::*."
 
 #. type: Content of: <refentry><refentryinfo><author><email>
-#: apt.conf.5.xml:23
+#: apt.conf.5.xml:17
 msgid "dburrows@debian.org"
 msgstr "dburrows@debian.org"
 
 #. type: Content of: <refentry><refmeta><manvolnum>
-#: apt.conf.5.xml:33 apt_preferences.5.xml:27 sources.list.5.xml:28
+#: apt.conf.5.xml:27 apt_preferences.5.xml:21 sources.list.5.xml:22
 msgid "5"
 msgstr "5"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt.conf.5.xml:40
+#: apt.conf.5.xml:34
 msgid "Configuration file for APT"
 msgstr "Konfigurationsdatei für APT"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:44
+#: apt.conf.5.xml:38
 msgid ""
 "<filename>/etc/apt/apt.conf</filename> is the main configuration file shared "
 "by all the tools in the APT suite of tools, though it is by no means the "
@@ -3357,7 +3366,7 @@ msgstr ""
 "Umgebung bereitzustellen."
 
 #. type: Content of: <refentry><refsect1><orderedlist><para>
-#: apt.conf.5.xml:50
+#: apt.conf.5.xml:44
 msgid ""
 "When an APT tool starts up it will read the configuration files in the "
 "following order:"
@@ -3366,7 +3375,7 @@ msgstr ""
 "folgenden Reihenfolge lesen:"
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:52
+#: apt.conf.5.xml:46
 msgid ""
 "the file specified by the <envar>APT_CONFIG</envar> environment variable (if "
 "any)"
@@ -3375,7 +3384,7 @@ msgstr ""
 "angegeben wird (falls gesetzt)"
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:54
+#: apt.conf.5.xml:48
 msgid ""
 "all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending "
 "order which have either no or \"<literal>conf</literal>\" as filename "
@@ -3395,7 +3404,7 @@ msgstr ""
 "sie stillschweigend ignoriert."
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:61
+#: apt.conf.5.xml:55
 msgid ""
 "the main configuration file specified by <literal>Dir::Etc::main</literal>"
 msgstr ""
@@ -3403,7 +3412,7 @@ msgstr ""
 "angegeben wird"
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:63
+#: apt.conf.5.xml:57
 msgid ""
 "the command line options are applied to override the configuration "
 "directives or to load even more configuration files."
@@ -3412,12 +3421,12 @@ msgstr ""
 "zu überschreiben oder um sogar mehrere Konfigurationsdateien zu laden."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:67
+#: apt.conf.5.xml:61
 msgid "Syntax"
 msgstr "Syntax"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:68
+#: apt.conf.5.xml:62
 msgid ""
 "The configuration file is organized in a tree with options organized into "
 "functional groups. Option specification is given with a double colon "
@@ -3432,7 +3441,7 @@ msgstr ""
 "das Werkzeug Get. Optionen werden nicht von ihren Elterngruppe geerbt."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:74
+#: apt.conf.5.xml:68
 msgid ""
 "Syntactically the configuration language is modeled after what the ISC tools "
 "such as bind and dhcp use. Lines starting with <literal>//</literal> are "
@@ -3459,7 +3468,7 @@ msgstr ""
 "werden, wie:"
 
 #. type: Content of: <refentry><refsect1><informalexample><programlisting>
-#: apt.conf.5.xml:87
+#: apt.conf.5.xml:81
 #, no-wrap
 msgid ""
 "APT {\n"
@@ -3477,7 +3486,7 @@ msgstr ""
 "};\n"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:95
+#: apt.conf.5.xml:89
 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 "
@@ -3490,13 +3499,13 @@ msgstr ""
 "eingefügt werden, jeweils getrennt durch einen Schrägstrich."
 
 #. type: Content of: <refentry><refsect1><informalexample><programlisting>
-#: apt.conf.5.xml:100
+#: apt.conf.5.xml:94
 #, no-wrap
 msgid "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n"
 msgstr "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:103
+#: apt.conf.5.xml:97
 msgid ""
 "In general the sample configuration file &configureindex; is a good guide "
 "for how it should look."
@@ -3505,7 +3514,7 @@ msgstr ""
 "gute Anleitung, wie dies aussehen könnte."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:106
+#: apt.conf.5.xml:100
 msgid ""
 "Case is not significant in names of configuration items, so in the previous "
 "example you could use <literal>dpkg::pre-install-pkgs</literal>."
@@ -3515,7 +3524,7 @@ msgstr ""
 "<literal>dpkg::pre-install-pkgs</literal> benutzen."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:109
+#: apt.conf.5.xml:103
 msgid ""
 "Names for the configuration items are optional if a list is defined as can "
 "be seen in the <literal>DPkg::Pre-Install-Pkgs</literal> example above. If "
@@ -3531,7 +3540,7 @@ msgstr ""
 "überschreiben, indem Sie der Option erneut einen neuen Wert zuweisen."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:114
+#: apt.conf.5.xml:108
 msgid ""
 "Two special commands are defined: <literal>#include</literal> (which is "
 "deprecated and not supported by alternative implementations) and "
@@ -3551,7 +3560,7 @@ msgstr ""
 "(Beachten Sie, dass diese Zeilen auch mit einem Schrägstrich enden müssen.)"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:124
+#: apt.conf.5.xml:118
 msgid ""
 "The <literal>#clear</literal> command is the only way to delete a list or a "
 "complete scope. Reopening a scope (or using the syntax described below with "
@@ -3568,7 +3577,7 @@ msgstr ""
 "nicht außer Kraft gesetzt, sondern nur bereinigt werden."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:132
+#: apt.conf.5.xml:126
 msgid ""
 "All of the APT tools take an -o option which allows an arbitrary "
 "configuration directive to be specified on the command line. The syntax is a "
@@ -3588,7 +3597,7 @@ msgstr ""
 "Befehlszeile benutzt werden.)"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:140
+#: apt.conf.5.xml:134
 msgid ""
 "Note that appending items to a list using <literal>::</literal> only works "
 "for one item per line, and that you should not use it in combination with "
@@ -3620,12 +3629,12 @@ msgstr ""
 "beklagt."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:155
+#: apt.conf.5.xml:149
 msgid "The APT Group"
 msgstr "Die APT-Gruppe"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:156
+#: apt.conf.5.xml:150
 msgid ""
 "This group of options controls general APT behavior as well as holding the "
 "options for all of the tools."
@@ -3634,7 +3643,7 @@ msgstr ""
 "wie es die Optionen für alle Werkzeuge enthält."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:161
+#: apt.conf.5.xml:155
 msgid ""
 "System Architecture; sets the architecture to use when fetching files and "
 "parsing package lists. The internal default is the architecture apt was "
@@ -3645,7 +3654,7 @@ msgstr ""
 "die Architektur für die APT kompiliert wurde."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:168
+#: apt.conf.5.xml:162
 msgid ""
 "All Architectures the system supports. For instance, CPUs implementing the "
 "<literal>amd64</literal> (also called <literal>x86-64</literal>)  "
@@ -3667,7 +3676,7 @@ msgstr ""
 "print-architectures</command> registriert werden."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:182
+#: apt.conf.5.xml:176
 msgid ""
 "List of all build profiles enabled for build-dependency resolution, without "
 "the \"<literal>profile.</literal>\" namespace prefix.  By default this list "
@@ -3681,7 +3690,7 @@ msgstr ""
 "außer Kraft."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:190
+#: apt.conf.5.xml:184
 msgid ""
 "Default release to install packages from if more than one version is "
 "available. Contains release name, codename or release version. Examples: "
@@ -3694,7 +3703,7 @@ msgstr ""
 "codename;«, »4.0«, »5.0*«. Siehe auch &apt-preferences;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:196
+#: apt.conf.5.xml:190
 msgid ""
 "Ignore held packages; this global option causes the problem resolver to "
 "ignore held packages in its decision making."
@@ -3703,7 +3712,7 @@ msgstr ""
 "Problemlöser, gehaltene Pakete beim Treffen von Entscheidungen zu ignorieren."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:201
+#: apt.conf.5.xml:195
 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 "
@@ -3718,7 +3727,7 @@ msgstr ""
 "Möglichkeiten bereitstellt, um sie erneut zu installieren."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:209
+#: apt.conf.5.xml:203
 msgid ""
 "Defaults to on, which will cause APT to install essential and important "
 "packages as soon as possible in an install/upgrade operation, in order to "
@@ -3746,7 +3755,7 @@ msgstr ""
 "Abhängigkeit von A nicht länger erfüllt wird."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:221
+#: apt.conf.5.xml:215
 msgid ""
 "The immediate configuration marker is also applied in the potentially "
 "problematic case of circular dependencies, since a dependency with the "
@@ -3776,7 +3785,7 @@ msgstr ""
 "Stelle verhindern kann."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:234
+#: apt.conf.5.xml:228
 msgid ""
 "Before a big operation like <literal>dist-upgrade</literal> is run with this "
 "option disabled you should try to explicitly <literal>install</literal> the "
@@ -3794,7 +3803,7 @@ msgstr ""
 "des Upgrade-Prozesses arbeiten können."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:245
+#: apt.conf.5.xml:239
 msgid ""
 "Never enable this option unless you <emphasis>really</emphasis> know what "
 "you are doing. It permits APT to temporarily remove an essential package to "
@@ -3816,7 +3825,7 @@ msgstr ""
 "davon abhängt, sind."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:257
+#: apt.conf.5.xml:251
 msgid ""
 "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 of "
@@ -3853,13 +3862,13 @@ msgstr ""
 "auf 0 gesetzt ist, kann der Zwischenspeicher nicht automatisch wachsen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:273
+#: apt.conf.5.xml:267
 msgid "Defines which packages are considered essential build dependencies."
 msgstr ""
 "definiert, welche Pakete als essentielle Bauabhängigkeiten betrachtet werden."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:277
+#: apt.conf.5.xml:271
 msgid ""
 "The Get subsection controls the &apt-get; tool; please see its documentation "
 "for more information about the options here."
@@ -3869,7 +3878,7 @@ msgstr ""
 "erhalten."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:282
+#: apt.conf.5.xml:276
 msgid ""
 "The Cache subsection controls the &apt-cache; tool; please see its "
 "documentation for more information about the options here."
@@ -3879,7 +3888,7 @@ msgstr ""
 "erhalten."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:287
+#: apt.conf.5.xml:281
 msgid ""
 "The CDROM subsection controls the &apt-cdrom; tool; please see its "
 "documentation for more information about the options here."
@@ -3889,12 +3898,12 @@ msgstr ""
 "erhalten."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:293
+#: apt.conf.5.xml:287
 msgid "The Acquire Group"
 msgstr "Die Erwerbgruppe"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:294
+#: apt.conf.5.xml:288
 msgid ""
 "The <literal>Acquire</literal> group of options controls the download of "
 "packages as well as the various \"acquire methods\" responsible for the "
@@ -3905,7 +3914,7 @@ msgstr ""
 "Herunterladen selbst zuständig sind (siehe auch &sources-list;)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:301
+#: apt.conf.5.xml:295
 msgid ""
 "Security related option defaulting to true, as giving a Release file's "
 "validation an expiration date prevents replay attacks over a long timescale, "
@@ -3927,7 +3936,7 @@ msgstr ""
 "ValidTime</literal> unten benutzt werden."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:314
+#: apt.conf.5.xml:308
 msgid ""
 "Maximum time (in seconds) after its creation (as indicated by the "
 "<literal>Date</literal> header) that the <filename>Release</filename> file "
@@ -3946,7 +3955,7 @@ msgstr ""
 "Anhängen der Archivbezeichnung an den Optionsnamen vorgenommen werden."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:326
+#: apt.conf.5.xml:320
 msgid ""
 "Minimum time (in seconds) after its creation (as indicated by the "
 "<literal>Date</literal> header) that the <filename>Release</filename> file "
@@ -3966,7 +3975,7 @@ msgstr ""
 "Optionsnamen vorgenommen werden."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:338
+#: apt.conf.5.xml:332
 msgid ""
 "Try to download deltas called <literal>PDiffs</literal> for indexes (like "
 "<filename>Packages</filename> files) instead of downloading whole ones. True "
@@ -3977,7 +3986,7 @@ msgstr ""
 "der kompletten Dateien. Vorgabe ist True."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:341
+#: apt.conf.5.xml:335
 msgid ""
 "Two sub-options to limit the use of PDiffs are also available: "
 "<literal>FileLimit</literal> can be used to specify a maximum number of "
@@ -3995,7 +4004,7 @@ msgstr ""
 "komplette Datei anstelle der Patche heruntergeladen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:351
+#: apt.conf.5.xml:345
 msgid ""
 "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</"
 "literal> or <literal>access</literal> which determines how APT parallelizes "
@@ -4011,7 +4020,7 @@ msgstr ""
 "URI-Art geöffnet wird."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:359
+#: apt.conf.5.xml:353
 msgid ""
 "Number of retries to perform. If this is non-zero APT will retry failed "
 "files the given number of times."
@@ -4020,7 +4029,7 @@ msgstr ""
 "APT fehlgeschlagene Dateien in der angegebenen Zahl erneut versuchen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:364
+#: apt.conf.5.xml:358
 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."
@@ -4030,7 +4039,7 @@ msgstr ""
 "kopiert zu werden. True ist die Vorgabe."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:369
+#: apt.conf.5.xml:363
 msgid ""
 "<literal>http::Proxy</literal> sets the default proxy to use for HTTP URIs. "
 "It is in the standard form of <literal>http://[[user][:pass]@]host[:port]/</"
@@ -4049,7 +4058,7 @@ msgstr ""
 "wurde, wird die Umgebungsvariable <envar>http_proxy</envar> benutzt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:377
+#: apt.conf.5.xml:371
 msgid ""
 "Three settings are provided for cache control with HTTP/1.1 compliant proxy "
 "caches.  <literal>No-Cache</literal> tells the proxy not to use its cached "
@@ -4070,7 +4079,7 @@ msgstr ""
 "Zwischenspeicher mit (großen) .deb-Dateien verunreinigt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:387 apt.conf.5.xml:475
+#: apt.conf.5.xml:381 apt.conf.5.xml:469
 msgid ""
 "The option <literal>timeout</literal> sets the timeout timer used by the "
 "method; this value applies to the connection as well as the data timeout."
@@ -4080,7 +4089,7 @@ msgstr ""
 "Datenzeitüberschreitungen angewandt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:390
+#: apt.conf.5.xml:384
 msgid ""
 "The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to "
 "enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be beneficial e."
@@ -4100,7 +4109,7 @@ msgstr ""
 "HTTP/1.1-Spezifikation entsprechen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:397
+#: apt.conf.5.xml:391
 msgid ""
 "<literal>Acquire::http::AllowRedirect</literal> controls whether APT will "
 "follow redirects, which is enabled by default."
@@ -4109,7 +4118,7 @@ msgstr ""
 "folgen wird, was standardmäßig aktiviert ist."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:400
+#: apt.conf.5.xml:394
 msgid ""
 "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
 "literal> which accepts integer values in kilobytes per second. The default "
@@ -4125,7 +4134,7 @@ msgstr ""
 "Zeit deaktiviert."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:407
+#: apt.conf.5.xml:401
 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 "
@@ -4137,7 +4146,7 @@ msgstr ""
 "bekannten Bezeichner verwendet."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:411
+#: apt.conf.5.xml:405
 msgid ""
 "<literal>Acquire::http::Proxy-Auto-Detect</literal> can be used to specify "
 "an external command to discover the http proxy to use. Apt expects the "
@@ -4160,7 +4169,7 @@ msgstr ""
 "dem veralteten Optionsnamen <literal>ProxyAutoDetect</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:429
+#: apt.conf.5.xml:423
 msgid ""
 "The <literal>Cache-control</literal>, <literal>Timeout</literal>, "
 "<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> and "
@@ -4177,7 +4186,7 @@ msgstr ""
 "<literal>Pipeline-Depth</literal> wird noch nicht unterstützt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:437
+#: apt.conf.5.xml:431
 msgid ""
 "<literal>CaInfo</literal> suboption specifies place of file that holds info "
 "about trusted certificates.  <literal>&lt;host&gt;::CaInfo</literal> is the "
@@ -4218,7 +4227,7 @@ msgstr ""
 "Rechner ist <literal>&lt;host&gt;::SslForceVersion</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:458
+#: apt.conf.5.xml:452
 msgid ""
 "<literal>ftp::Proxy</literal> sets the default proxy to use for FTP URIs.  "
 "It is in the standard form of <literal>ftp://[[user][:pass]@]host[:port]/</"
@@ -4253,7 +4262,7 @@ msgstr ""
 "literal> und <literal>$(SITE_PORT)</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:478
+#: apt.conf.5.xml:472
 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, "
@@ -4270,7 +4279,7 @@ msgstr ""
 "Musterkonfigurationsdatei)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:485
+#: apt.conf.5.xml:479
 msgid ""
 "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
 "envar> environment variable to an HTTP URL - see the discussion of the http "
@@ -4284,7 +4293,7 @@ msgstr ""
 "Effizienz nicht empfohlen FTP über HTTP zu benutzen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:490
+#: apt.conf.5.xml:484
 msgid ""
 "The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
 "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -4300,13 +4309,13 @@ msgstr ""
 "Server RFC2428 unterstützen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:504
+#: apt.conf.5.xml:498
 #, no-wrap
 msgid "/cdrom/::Mount \"foo\";"
 msgstr "/cdrom/::Mount \"foo\";"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:499
+#: apt.conf.5.xml:493
 msgid ""
 "For URIs using the <literal>cdrom</literal> method, the only configurable "
 "option is the mount point, <literal>cdrom::Mount</literal>, which must be "
@@ -4328,7 +4337,7 @@ msgstr ""
 "Aushängebefehle können per UMount angegeben werden."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:512
+#: apt.conf.5.xml:506
 msgid ""
 "For GPGV URIs the only configurable option is <literal>gpgv::Options</"
 "literal>, which passes additional parameters to gpgv."
@@ -4337,13 +4346,13 @@ msgstr ""
 "literal>, um zusätzliche Parameter an Gpgv weiterzuleiten."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:523
+#: apt.conf.5.xml:517
 #, no-wrap
 msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
 msgstr "Acquire::CompressionTypes::<replaceable>Dateierweiterung</replaceable> \"<replaceable>Methodenname</replaceable>\";"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:518
+#: apt.conf.5.xml:512
 msgid ""
 "List of compression types which are understood by the acquire methods.  "
 "Files like <filename>Packages</filename> can be available in various "
@@ -4363,19 +4372,19 @@ msgstr ""
 "\"synopsis\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:528
+#: apt.conf.5.xml:522
 #, no-wrap
 msgid "Acquire::CompressionTypes::Order:: \"gz\";"
 msgstr "Acquire::CompressionTypes::Order:: \"gz\";"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:531
+#: apt.conf.5.xml:525
 #, no-wrap
 msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
 msgstr "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:524
+#: apt.conf.5.xml:518
 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 "
@@ -4407,13 +4416,13 @@ msgstr ""
 "explizit zur Liste hinzuzufügen, da es automatisch hinzufügt wird."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:538
+#: apt.conf.5.xml:532
 #, no-wrap
 msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
 msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:533
+#: apt.conf.5.xml:527
 msgid ""
 "Note that the <literal>Dir::Bin::<replaceable>Methodname</replaceable></"
 "literal> will be checked at run time. If this option has been set, the "
@@ -4439,7 +4448,7 @@ msgstr ""
 "nicht überschreiben, es wird diesen Typ nur vor die Liste setzen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:543
+#: apt.conf.5.xml:537
 msgid ""
 "The special type <literal>uncompressed</literal> can be used to give "
 "uncompressed files a preference, but note that most archives don't provide "
@@ -4451,7 +4460,7 @@ msgstr ""
 "dies meist nur für lokale Spiegel benutzt werden kann."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:550
+#: apt.conf.5.xml:544
 msgid ""
 "When downloading <literal>gzip</literal> compressed indexes (Packages, "
 "Sources, or Translations), keep them gzip compressed locally instead of "
@@ -4465,7 +4474,7 @@ msgstr ""
 "False."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:558
+#: apt.conf.5.xml:552
 msgid ""
 "The Languages subsection controls which <filename>Translation</filename> "
 "files are downloaded and in which order APT tries to display the description-"
@@ -4485,13 +4494,13 @@ msgstr ""
 "langen Sprachcodes selten."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><programlisting>
-#: apt.conf.5.xml:575
+#: apt.conf.5.xml:569
 #, no-wrap
 msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
 msgstr "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:563
+#: apt.conf.5.xml:557
 msgid ""
 "The default list includes \"environment\" and \"en\". "
 "\"<literal>environment</literal>\" has a special meaning here: it will be "
@@ -4532,7 +4541,7 @@ msgstr ""
 "\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:576
+#: apt.conf.5.xml:570
 msgid ""
 "Note: To prevent problems resulting from APT being executed in different "
 "environments (e.g. by different users or by other programs) all Translation "
@@ -4546,22 +4555,22 @@ msgstr ""
 "Liste hinzugefügt (nach einem impliziten »<literal>none</literal>«)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:585
+#: apt.conf.5.xml:579
 msgid "When downloading, force to use only the IPv4 protocol."
 msgstr "Beim Herunterladen wird die Verwendung des IPv4-Protokolls erzwungen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:591
+#: apt.conf.5.xml:585
 msgid "When downloading, force to use only the IPv6 protocol."
 msgstr "Beim Herunterladen wird die Verwendung des IPv6-Protokolls erzwungen."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:598
+#: apt.conf.5.xml:592
 msgid "Directories"
 msgstr "Verzeichnisse"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:600
+#: apt.conf.5.xml:594
 msgid ""
 "The <literal>Dir::State</literal> section has directories that pertain to "
 "local state information. <literal>lists</literal> is the directory to place "
@@ -4581,16 +4590,28 @@ msgstr ""
 "nicht mit <filename>/</filename> oder <filename>./</filename> beginnen."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:607
+#: apt.conf.5.xml:601
+#, fuzzy
+#| msgid ""
+#| "<literal>Dir::Cache</literal> contains locations pertaining to local "
+#| "cache information, such as the two package caches <literal>srcpkgcache</"
+#| "literal> and <literal>pkgcache</literal> as well as the location to place "
+#| "downloaded archives, <literal>Dir::Cache::archives</literal>. Generation "
+#| "of caches can be turned off by setting their names to the empty string. "
+#| "This will slow down startup but save disk space. It is probably "
+#| "preferable to turn off the pkgcache rather than the srcpkgcache. Like "
+#| "<literal>Dir::State</literal> the default directory is contained in "
+#| "<literal>Dir::Cache</literal>"
 msgid ""
 "<literal>Dir::Cache</literal> contains locations pertaining to local cache "
 "information, such as the two package caches <literal>srcpkgcache</literal> "
 "and <literal>pkgcache</literal> as well as the location to place downloaded "
 "archives, <literal>Dir::Cache::archives</literal>. Generation of caches can "
-"be turned off by setting their names to the empty string. This will slow "
+"be turned off by setting <literal>pkgcache</literal> or "
+"<literal>srcpkgcache</literal> to <literal>\"\"</literal>.  This will slow "
 "down startup but save disk space. It is probably preferable to turn off the "
-"pkgcache rather than the srcpkgcache. Like <literal>Dir::State</literal> the "
-"default directory is contained in <literal>Dir::Cache</literal>"
+"pkgcache rather than the srcpkgcache.  Like <literal>Dir::State</literal> "
+"the default directory is contained in <literal>Dir::Cache</literal>"
 msgstr ""
 "<literal>Dir::Cache</literal> enthält Orte, die zu lokalen "
 "Zwischenspeicherinformationen gehören, so wie die beiden "
@@ -4604,7 +4625,7 @@ msgstr ""
 "Standardverzeichnis in <literal>Dir::Cache</literal> enthalten."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:616
+#: apt.conf.5.xml:611
 msgid ""
 "<literal>Dir::Etc</literal> contains the location of configuration files, "
 "<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -4619,7 +4640,7 @@ msgstr ""
 "Konfigurationsdatei erfolgt)."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:622
+#: apt.conf.5.xml:617
 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 "
@@ -4631,7 +4652,7 @@ msgstr ""
 "geladen."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:626
+#: apt.conf.5.xml:621
 msgid ""
 "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
 "Bin::Methods</literal> specifies the location of the method handlers and "
@@ -4649,7 +4670,7 @@ msgstr ""
 "Programms an."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:634
+#: apt.conf.5.xml:629
 msgid ""
 "The configuration item <literal>RootDir</literal> has a special meaning.  If "
 "set, all paths in <literal>Dir::</literal> will be relative to "
@@ -4669,7 +4690,7 @@ msgstr ""
 "<filename>/tmp/staging/var/lib/dpkg/status</filename> nachgesehen."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:647
+#: apt.conf.5.xml:642
 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 "
@@ -4687,12 +4708,12 @@ msgstr ""
 "diese Muster verwandt werden."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:656
+#: apt.conf.5.xml:651
 msgid "APT in DSelect"
 msgstr "APT in DSelect"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:658
+#: apt.conf.5.xml:653
 msgid ""
 "When APT is used as a &dselect; method several configuration directives "
 "control the default behavior. These are in the <literal>DSelect</literal> "
@@ -4703,7 +4724,7 @@ msgstr ""
 "<literal>DSelect</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:663
+#: apt.conf.5.xml:658
 msgid ""
 "Cache Clean mode; this value may be one of <literal>always</literal>, "
 "<literal>prompt</literal>, <literal>auto</literal>, <literal>pre-auto</"
@@ -4726,7 +4747,7 @@ msgstr ""
 "vor dem Herunterladen neuer Pakete durch."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:677
+#: apt.conf.5.xml:672
 msgid ""
 "The contents of this variable are passed to &apt-get; as command line "
 "options when it is run for the install phase."
@@ -4735,7 +4756,7 @@ msgstr ""
 "übermittelt, wenn es für die Installationsphase durchlaufen wird."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:682
+#: apt.conf.5.xml:677
 msgid ""
 "The contents of this variable are passed to &apt-get; as command line "
 "options when it is run for the update phase."
@@ -4744,7 +4765,7 @@ msgstr ""
 "übermittelt, wenn es für die Aktualisierungsphase durchlaufen wird."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:687
+#: apt.conf.5.xml:682
 msgid ""
 "If true the [U]pdate operation in &dselect; will always prompt to continue.  "
 "The default is to prompt only on error."
@@ -4753,12 +4774,12 @@ msgstr ""
 "nachfragen, um fortzufahren. Vorgabe ist es, nur bei Fehlern nachzufragen."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:693
+#: apt.conf.5.xml:688
 msgid "How APT calls &dpkg;"
 msgstr "Wie APT &dpkg; aufruft"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:694
+#: apt.conf.5.xml:689
 msgid ""
 "Several configuration directives control how APT invokes &dpkg;. These are "
 "in the <literal>DPkg</literal> section."
@@ -4767,7 +4788,7 @@ msgstr ""
 "stehen im Abschnitt <literal>DPkg</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:699
+#: apt.conf.5.xml:694
 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 "
@@ -4778,7 +4799,7 @@ msgstr ""
 "jedes Listenelement wird als einzelnes Argument an &dpkg; übermittelt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:705
+#: apt.conf.5.xml:700
 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 "
@@ -4792,7 +4813,7 @@ msgstr ""
 "APT abgebrochen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:712
+#: apt.conf.5.xml:707
 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 "
@@ -4811,7 +4832,7 @@ msgstr ""
 "übergeben."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:719
+#: apt.conf.5.xml:714
 msgid ""
 "Version 2 of this protocol dumps more information, including the protocol "
 "version, the APT configuration space and the packages, files and versions "
@@ -4824,7 +4845,7 @@ msgstr ""
 "Version die Architektur und den <literal>MultiArch</literal>-Schalter hinzu."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:724
+#: apt.conf.5.xml:719
 msgid ""
 "The version of the protocol to be used for the command "
 "<literal><replaceable>cmd</replaceable></literal> can be chosen by setting "
@@ -4842,7 +4863,7 @@ msgstr ""
 "bietet."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:731
+#: apt.conf.5.xml:726
 msgid ""
 "The file descriptor to be used to send the information can be requested with "
 "<literal>DPkg::Tools::options::<replaceable>cmd</replaceable>::InfoFD</"
@@ -4860,7 +4881,7 @@ msgstr ""
 "verwendeten Dateideskriptors als eine Bestätigung."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:741
+#: apt.conf.5.xml:736
 msgid ""
 "APT chdirs to this directory before invoking &dpkg;, the default is "
 "<filename>/</filename>."
@@ -4869,7 +4890,7 @@ msgstr ""
 "die Vorgabe ist <filename>/</filename>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:746
+#: apt.conf.5.xml:741
 msgid ""
 "These options are passed to &dpkg-buildpackage; when compiling packages; the "
 "default is to disable signing and produce all binaries."
@@ -4879,12 +4900,12 @@ msgstr ""
 "Programme werden erstellt."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:751
+#: apt.conf.5.xml:746
 msgid "dpkg trigger usage (and related options)"
 msgstr "Dpkd-Trigger-Benutzung (und zugehörige Optionen)"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:752
+#: apt.conf.5.xml:747
 msgid ""
 "APT can call &dpkg; in such a way as to let it make aggressive use of "
 "triggers over multiple calls of &dpkg;. Without further options &dpkg; will "
@@ -4911,7 +4932,7 @@ msgstr ""
 "Pakete konfiguriert werden."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:767
+#: apt.conf.5.xml:762
 #, no-wrap
 msgid ""
 "DPkg::NoTriggers \"true\";\n"
@@ -4925,7 +4946,7 @@ msgstr ""
 "DPkg::TriggersPending \"true\";"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:761
+#: apt.conf.5.xml:756
 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 "
@@ -4950,7 +4971,7 @@ msgstr ""
 "Optionenkombination wäre <placeholder type=\"literallayout\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:774
+#: apt.conf.5.xml:769
 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 "
@@ -4973,7 +4994,7 @@ msgstr ""
 "anhängen."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:782
+#: apt.conf.5.xml:777
 msgid ""
 "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
 "and \"<literal>no</literal>\".  The default value is \"<literal>all</literal>"
@@ -5003,7 +5024,7 @@ msgstr ""
 "enden könnte und möglicherweise nicht mehr startbar ist."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:797
+#: apt.conf.5.xml:792
 msgid ""
 "If this option is set APT will call <command>dpkg --configure --pending</"
 "command> to let &dpkg; handle all required configurations and triggers. This "
@@ -5022,7 +5043,7 @@ msgstr ""
 "deaktivieren."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:804
+#: apt.conf.5.xml:799
 msgid ""
 "Useful for the <literal>smart</literal> configuration as a package which has "
 "pending triggers is not considered as <literal>installed</literal>, and "
@@ -5038,7 +5059,7 @@ msgstr ""
 "benötigt werden."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:817
+#: apt.conf.5.xml:812
 #, no-wrap
 msgid ""
 "OrderList::Score {\n"
@@ -5056,7 +5077,7 @@ msgstr ""
 "};"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:810
+#: apt.conf.5.xml:805
 msgid ""
 "Essential packages (and their dependencies) should be configured immediately "
 "after unpacking. It is a good idea to do this quite early in the upgrade "
@@ -5080,12 +5101,12 @@ msgstr ""
 "mit ihren Vorgabewerten. <placeholder type=\"literallayout\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:830
+#: apt.conf.5.xml:825
 msgid "Periodic and Archives options"
 msgstr "Periodische- und Archivoptionen"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:831
+#: apt.conf.5.xml:826
 msgid ""
 "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
 "of options configure behavior of apt periodic updates, which is done by the "
@@ -5099,12 +5120,12 @@ msgstr ""
 "Dokumentation dieser Optionen zu erhalten."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:839
+#: apt.conf.5.xml:834
 msgid "Debug options"
 msgstr "Fehlersuchoptionen"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:841
+#: apt.conf.5.xml:836
 msgid ""
 "Enabling options in the <literal>Debug::</literal> section will cause "
 "debugging information to be sent to the standard error stream of the program "
@@ -5122,7 +5143,7 @@ msgstr ""
 "könnten es sein:"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:852
+#: apt.conf.5.xml:847
 msgid ""
 "<literal>Debug::pkgProblemResolver</literal> enables output about the "
 "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -5133,7 +5154,7 @@ msgstr ""
 "getroffenen Entscheidungen ein."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:860
+#: apt.conf.5.xml:855
 msgid ""
 "<literal>Debug::NoLocking</literal> disables all file locking.  This can be "
 "used to run some operations (for instance, <literal>apt-get -s install</"
@@ -5144,7 +5165,7 @@ msgstr ""
 "<literal>apt-get -s install</literal>) als nicht root-Anwender auszuführen."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:869
+#: apt.conf.5.xml:864
 msgid ""
 "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
 "time that <literal>apt</literal> invokes &dpkg;."
@@ -5156,7 +5177,7 @@ 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:877
+#: apt.conf.5.xml:872
 msgid ""
 "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
 "in CD-ROM IDs."
@@ -5165,12 +5186,12 @@ msgstr ""
 "Daten in CD-ROM-IDs aus."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:887
+#: apt.conf.5.xml:882
 msgid "A full list of debugging options to apt follows."
 msgstr "Eine vollständige Liste der Fehlersuchoptionen von APT folgt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:896
+#: apt.conf.5.xml:891
 msgid ""
 "Print information related to accessing <literal>cdrom://</literal> sources."
 msgstr ""
@@ -5178,28 +5199,28 @@ msgstr ""
 "literal>-Quellen beziehen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:907
+#: apt.conf.5.xml:902
 msgid "Print information related to downloading packages using FTP."
 msgstr ""
 "gibt Informationen aus, die sich auf das Herunterladen von Paketen per FTP "
 "beziehen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:918
+#: apt.conf.5.xml:913
 msgid "Print information related to downloading packages using HTTP."
 msgstr ""
 "gibt Informationen aus, die sich auf das Herunterladen von Paketen per HTTP "
 "beziehen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:929
+#: apt.conf.5.xml:924
 msgid "Print information related to downloading packages using HTTPS."
 msgstr ""
 "gibt Informationen aus, die sich auf das Herunterladen von Paketen per HTTPS "
 "beziehen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:940
+#: apt.conf.5.xml:935
 msgid ""
 "Print information related to verifying cryptographic signatures using "
 "<literal>gpg</literal>."
@@ -5208,7 +5229,7 @@ msgstr ""
 "mittels <literal>gpg</literal> beziehen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:951
+#: apt.conf.5.xml:946
 msgid ""
 "Output information about the process of accessing collections of packages "
 "stored on CD-ROMs."
@@ -5217,13 +5238,13 @@ msgstr ""
 "CD-ROMs gespeichert sind."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:961
+#: apt.conf.5.xml:956
 msgid "Describes the process of resolving build-dependencies in &apt-get;."
 msgstr ""
 "beschreibt den Prozess der Auflösung von Bauabhängigkeiten in &apt-get;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:971
+#: apt.conf.5.xml:966
 msgid ""
 "Output each cryptographic hash that is generated by the <literal>apt</"
 "literal> libraries."
@@ -5232,7 +5253,7 @@ msgstr ""
 "Bibliotheken generiert wurde."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:981
+#: apt.conf.5.xml:976
 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 "
@@ -5243,7 +5264,7 @@ msgstr ""
 "ID für eine CD-ROM generiert wird."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:992
+#: apt.conf.5.xml:987
 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."
@@ -5253,14 +5274,14 @@ msgstr ""
 "gleichen Zeit laufen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1004
+#: apt.conf.5.xml:999
 msgid "Log when items are added to or removed from the global download queue."
 msgstr ""
 "protokolliert, wenn Elemente aus der globalen Warteschlange zum "
 "Herunterladen hinzugefügt oder entfernt werden."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1014
+#: apt.conf.5.xml:1009
 msgid ""
 "Output status messages and errors related to verifying checksums and "
 "cryptographic signatures of downloaded files."
@@ -5269,7 +5290,7 @@ msgstr ""
 "und kryptografischen Signaturen von heruntergeladenen Dateien beziehen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1024
+#: apt.conf.5.xml:1019
 msgid ""
 "Output information about downloading and applying package index list diffs, "
 "and errors relating to package index list diffs."
@@ -5278,7 +5299,7 @@ msgstr ""
 "Diffs und Fehler, die die Paketindexlisten-Diffs betreffen, aus."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1036
+#: apt.conf.5.xml:1031
 msgid ""
 "Output information related to patching apt package lists when downloading "
 "index diffs instead of full indices."
@@ -5288,7 +5309,7 @@ msgstr ""
 "werden."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1047
+#: apt.conf.5.xml:1042
 msgid ""
 "Log all interactions with the sub-processes that actually perform downloads."
 msgstr ""
@@ -5296,7 +5317,7 @@ msgstr ""
 "durchführen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1058
+#: apt.conf.5.xml:1053
 msgid ""
 "Log events related to the automatically-installed status of packages and to "
 "the removal of unused packages."
@@ -5306,7 +5327,7 @@ msgstr ""
 "beziehen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1068
+#: apt.conf.5.xml:1063
 msgid ""
 "Generate debug messages describing which packages are being automatically "
 "installed to resolve dependencies.  This corresponds to the initial auto-"
@@ -5322,7 +5343,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1082
+#: apt.conf.5.xml:1077
 msgid ""
 "Generate debug messages describing which packages are marked as keep/install/"
 "remove while the ProblemResolver does his work.  Each addition or deletion "
@@ -5355,7 +5376,7 @@ msgstr ""
 "dem das Paket erscheint."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1103
+#: apt.conf.5.xml:1098
 msgid ""
 "When invoking &dpkg;, output the precise command line with which it is being "
 "invoked, with arguments separated by a single space character."
@@ -5365,7 +5386,7 @@ msgstr ""
 "sind, aus."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1114
+#: apt.conf.5.xml:1109
 msgid ""
 "Output all the data received from &dpkg; on the status file descriptor and "
 "any errors encountered while parsing it."
@@ -5374,7 +5395,7 @@ msgstr ""
 "und alle während deren Auswertung gefundenen Fehler aus."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1125
+#: apt.conf.5.xml:1120
 msgid ""
 "Generate a trace of the algorithm that decides the order in which "
 "<literal>apt</literal> should pass packages to &dpkg;."
@@ -5384,7 +5405,7 @@ msgstr ""
 "soll."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1137
+#: apt.conf.5.xml:1132
 msgid ""
 "Output status messages tracing the steps performed when invoking &dpkg;."
 msgstr ""
@@ -5392,12 +5413,12 @@ msgstr ""
 "von &dpkg; ausgeführt werden."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1148
+#: apt.conf.5.xml:1143
 msgid "Output the priority of each package list on startup."
 msgstr "gibt die Priorität jeder Paketliste beim Start aus."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1158
+#: apt.conf.5.xml:1153
 msgid ""
 "Trace the execution of the dependency resolver (this applies only to what "
 "happens when a complex dependency problem is encountered)."
@@ -5407,7 +5428,7 @@ msgstr ""
 "aufgetreten ist)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1169
+#: apt.conf.5.xml:1164
 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 "
@@ -5419,7 +5440,7 @@ msgstr ""
 "Marker</literal> beschrieben."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1181
+#: apt.conf.5.xml:1176
 msgid ""
 "Print information about the vendors read from <filename>/etc/apt/vendors."
 "list</filename>."
@@ -5428,21 +5449,24 @@ msgstr ""
 "filename> gelesenen Anbieter aus."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1191
+#: apt.conf.5.xml:1186
 msgid ""
 "Display the external commands that are called by apt hooks.  This includes e."
 "g. the config options <literal>DPkg::{Pre,Post}-Invoke</literal> or "
 "<literal>APT::Update::{Pre,Post}-Invoke</literal>."
 msgstr ""
+"zeigt die externen Befehle, die durch APT-Hooks aufgerufen werden. Dies "
+"schließt z.B. die Konfigurationsoptionen <literal>DPkg::{Pre,Post}-Invoke</"
+"literal> oder <literal>APT::Update::{Pre,Post}-Invoke</literal> mit ein."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1215 apt_preferences.5.xml:547 sources.list.5.xml:239
-#: apt-ftparchive.1.xml:598
+#: apt.conf.5.xml:1210 apt_preferences.5.xml:541 sources.list.5.xml:233
+#: apt-ftparchive.1.xml:592
 msgid "Examples"
 msgstr "Beispiele"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1216
+#: apt.conf.5.xml:1211
 msgid ""
 "&configureindex; is a configuration file showing example values for all "
 "possible options."
@@ -5452,17 +5476,17 @@ msgstr ""
 
 #.  ? reading apt.conf 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1228
+#: apt.conf.5.xml:1223
 msgid "&apt-cache;, &apt-config;, &apt-preferences;."
 msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt_preferences.5.xml:34
+#: apt_preferences.5.xml:28
 msgid "Preference control file for APT"
 msgstr "Voreinstellungssteuerdatei für APT"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:39
+#: apt_preferences.5.xml:33
 msgid ""
 "The APT preferences file <filename>/etc/apt/preferences</filename> and the "
 "fragment files in the <filename>/etc/apt/preferences.d/</filename> folder "
@@ -5475,7 +5499,7 @@ msgstr ""
 "Installation ausgewählt werden."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:44
+#: apt_preferences.5.xml:38
 msgid ""
 "Several versions of a package may be available for installation when the "
 "&sources-list; file contains references to more than one distribution (for "
@@ -5497,7 +5521,7 @@ msgstr ""
 "Installation ausgewählt wird."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:54
+#: apt_preferences.5.xml:48
 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 "
@@ -5513,7 +5537,7 @@ msgstr ""
 "der Version."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:61
+#: apt_preferences.5.xml:55
 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 "
@@ -5537,7 +5561,7 @@ msgstr ""
 "nicht. Sind wurden gewarnt."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:72
+#: apt_preferences.5.xml:66
 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 "
@@ -5559,24 +5583,24 @@ msgstr ""
 "diesem Fall wird sie stillschweigend ignoriert."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:81
+#: apt_preferences.5.xml:75
 msgid "APT's Default Priority Assignments"
 msgstr "APTs Standardprioritätszuweisungen"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:96
+#: apt_preferences.5.xml:90
 #, no-wrap
 msgid "<command>apt-get install -t testing <replaceable>some-package</replaceable></command>\n"
 msgstr "<command>apt-get install -t testing <replaceable>irgendein_Paket</replaceable></command>\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:99
+#: apt_preferences.5.xml:93
 #, no-wrap
 msgid "APT::Default-Release \"stable\";\n"
 msgstr "APT::Default-Release \"stable\";\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:83
+#: apt_preferences.5.xml:77
 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 "
@@ -5604,7 +5628,7 @@ msgstr ""
 "\"programlisting\" id=\"0\"/> <placeholder type=\"programlisting\" id=\"1\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:103
+#: apt_preferences.5.xml:97
 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:"
@@ -5614,12 +5638,12 @@ msgstr ""
 "Zuweisung:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:108
+#: apt_preferences.5.xml:102
 msgid "priority 1"
 msgstr "Priorität 1"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:109
+#: apt_preferences.5.xml:103
 msgid ""
 "to the versions coming from archives which in their <filename>Release</"
 "filename> files are marked as \"NotAutomatic: yes\" but <emphasis>not</"
@@ -5632,12 +5656,12 @@ msgstr ""
 "<literal>experimental</literal> von Debian."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:115
+#: apt_preferences.5.xml:109
 msgid "priority 100"
 msgstr "Priorität 100"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:116
+#: apt_preferences.5.xml:110
 msgid ""
 "to the version that is already installed (if any) and to the versions coming "
 "from archives which in their <filename>Release</filename> files are marked "
@@ -5651,12 +5675,12 @@ msgstr ""
 "backports</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:123
+#: apt_preferences.5.xml:117
 msgid "priority 500"
 msgstr "Priorität 500"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:124
+#: apt_preferences.5.xml:118
 msgid ""
 "to the versions that are not installed and do not belong to the target "
 "release."
@@ -5665,19 +5689,19 @@ msgstr ""
 "gehören."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:128
+#: apt_preferences.5.xml:122
 msgid "priority 990"
 msgstr "Priorität 990"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:129
+#: apt_preferences.5.xml:123
 msgid ""
 "to the versions that are not installed and belong to the target release."
 msgstr ""
 "zu den Versionen, die nicht installiert sind und zum Ziel-Release gehören."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:134
+#: apt_preferences.5.xml:128
 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 "
@@ -5695,7 +5719,7 @@ msgstr ""
 "markiert sind."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:141
+#: apt_preferences.5.xml:135
 msgid ""
 "APT then applies the following rules, listed in order of precedence, to "
 "determine which version of a package to install."
@@ -5705,7 +5729,7 @@ msgstr ""
 "ist."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:144
+#: apt_preferences.5.xml:138
 msgid ""
 "Never downgrade unless the priority of an available version exceeds 1000.  "
 "(\"Downgrading\" is installing a less recent version of a package in place "
@@ -5721,12 +5745,12 @@ msgstr ""
 "Downgrading eines Paketes riskant sein kann.)"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:150
+#: apt_preferences.5.xml:144
 msgid "Install the highest priority version."
 msgstr "installiert die Version mit der höchsten Priorität."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:151
+#: apt_preferences.5.xml:145
 msgid ""
 "If two or more versions have the same priority, install the most recent one "
 "(that is, the one with the higher version number)."
@@ -5735,7 +5759,7 @@ msgstr ""
 "aktuellste installiert (das ist die mit der höheren Versionsnummer)."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:154
+#: apt_preferences.5.xml:148
 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 <literal>--reinstall</"
@@ -5747,7 +5771,7 @@ msgstr ""
 "installierte installiert."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:160
+#: apt_preferences.5.xml:154
 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 "
@@ -5763,7 +5787,7 @@ msgstr ""
 "upgrade</command> ausgeführt wird."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:167
+#: apt_preferences.5.xml:161
 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 "
@@ -5777,7 +5801,7 @@ msgstr ""
 "upgrade</command> ausgeführt wird."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:172
+#: apt_preferences.5.xml:166
 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 "
@@ -5797,12 +5821,12 @@ msgstr ""
 "hat."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:181
+#: apt_preferences.5.xml:175
 msgid "The Effect of APT Preferences"
 msgstr "Die Auswirkungen von APT-Einstellungen"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:183
+#: apt_preferences.5.xml:177
 msgid ""
 "The APT preferences file allows the system administrator to control the "
 "assignment of priorities.  The file consists of one or more multi-line "
@@ -5816,7 +5840,7 @@ msgstr ""
 "allgemeine Gestalt."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:189
+#: apt_preferences.5.xml:183
 msgid ""
 "The specific form assigns a priority (a \"Pin-Priority\") to one or more "
 "specified packages with a specified version or version range.  For example, "
@@ -5833,7 +5857,7 @@ msgstr ""
 "Pakete können durch Leerzeichen getrennt werden."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:196
+#: apt_preferences.5.xml:190
 #, no-wrap
 msgid ""
 "Package: perl\n"
@@ -5845,7 +5869,7 @@ msgstr ""
 "Pin-Priority: 1001\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:202
+#: apt_preferences.5.xml:196
 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 "
@@ -5860,7 +5884,7 @@ msgstr ""
 "ausgebildeten Domänennamen identifiziert wird, eine Priorität zu."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:208
+#: apt_preferences.5.xml:202
 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 "
@@ -5871,7 +5895,7 @@ msgstr ""
 "Paketversionen eine hohe Priorität zu, die lokal liegen."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:213
+#: apt_preferences.5.xml:207
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -5883,7 +5907,7 @@ msgstr ""
 "Pin-Priority: 999\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:218
+#: apt_preferences.5.xml:212
 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 "
@@ -5897,7 +5921,7 @@ msgstr ""
 "de.debian.org« identifiziert wird."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:222
+#: apt_preferences.5.xml:216
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -5909,7 +5933,7 @@ msgstr ""
 "Pin-Priority: 999\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:226
+#: apt_preferences.5.xml:220
 msgid ""
 "This should <emphasis>not</emphasis> be confused with the Origin of a "
 "distribution as specified in a <filename>Release</filename> file.  What "
@@ -5924,7 +5948,7 @@ msgstr ""
 "oder »Ximian«."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:231
+#: apt_preferences.5.xml:225
 msgid ""
 "The following record assigns a low priority to all package versions "
 "belonging to any distribution whose Archive name is \"<literal>unstable</"
@@ -5935,7 +5959,7 @@ msgstr ""
 "Priorität zu."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:235
+#: apt_preferences.5.xml:229
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -5947,7 +5971,7 @@ msgstr ""
 "Pin-Priority: 50\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:240
+#: apt_preferences.5.xml:234
 msgid ""
 "The following record assigns a high priority to all package versions "
 "belonging to any distribution whose Codename is \"<literal>&testing-codename;"
@@ -5958,7 +5982,7 @@ msgstr ""
 "hohe Priorität zu."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:244
+#: apt_preferences.5.xml:238
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -5970,7 +5994,7 @@ msgstr ""
 "Pin-Priority: 900\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:249
+#: apt_preferences.5.xml:243
 msgid ""
 "The following record assigns a high priority to all package versions "
 "belonging to any release whose Archive name is \"<literal>stable</literal>\" "
@@ -5981,7 +6005,7 @@ msgstr ""
 "Nummer »<literal>&stable-version;</literal>« ist, eine hohe Priorität zu."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:254
+#: apt_preferences.5.xml:248
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -5993,12 +6017,12 @@ msgstr ""
 "Pin-Priority: 500\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:264
+#: apt_preferences.5.xml:258
 msgid "Regular expressions and &glob; syntax"
 msgstr "Reguläre Ausdrücke und &glob;-Syntax"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:266
+#: apt_preferences.5.xml:260
 msgid ""
 "APT also supports pinning by &glob; expressions, and regular expressions "
 "surrounded by slashes. For example, the following example assigns the "
@@ -6014,7 +6038,7 @@ msgstr ""
 "von Schrägstrichen umschlossen wird)."
 
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:275
+#: apt_preferences.5.xml:269
 #, no-wrap
 msgid ""
 "Package: gnome* /kde/\n"
@@ -6026,7 +6050,7 @@ msgstr ""
 "Pin-Priority: 500\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:281
+#: apt_preferences.5.xml:275
 msgid ""
 "The rule for those expressions is that they can occur anywhere where a "
 "string can occur. Thus, the following pin assigns the priority 990 to all "
@@ -6037,7 +6061,7 @@ msgstr ""
 "Paketen von einem Release seit Karmic die Priorität 900 zu."
 
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:287
+#: apt_preferences.5.xml:281
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -6049,7 +6073,7 @@ msgstr ""
 "Pin-Priority: 990\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:293
+#: apt_preferences.5.xml:287
 msgid ""
 "If a regular expression occurs in a <literal>Package</literal> field, the "
 "behavior is the same as if this regular expression were replaced with a list "
@@ -6067,12 +6091,12 @@ msgstr ""
 "»Package«-Feld wird selbst nicht als ein &glob;-Ausdruck angesehen."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:309
+#: apt_preferences.5.xml:303
 msgid "How APT Interprets Priorities"
 msgstr "Wie APT Prioritäten interpretiert"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:312
+#: apt_preferences.5.xml:306
 msgid ""
 "Priorities (P) assigned in the APT preferences file must be positive or "
 "negative integers.  They are interpreted as follows (roughly speaking):"
@@ -6082,12 +6106,12 @@ msgstr ""
 "(grob gesagt):"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:317
+#: apt_preferences.5.xml:311
 msgid "P &gt;= 1000"
 msgstr "P &gt;= 1000"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:318
+#: apt_preferences.5.xml:312
 msgid ""
 "causes a version to be installed even if this constitutes a downgrade of the "
 "package"
@@ -6096,12 +6120,12 @@ msgstr ""
 "des Pakets durchführt"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:322
+#: apt_preferences.5.xml:316
 msgid "990 &lt;= P &lt; 1000"
 msgstr "990 &lt;= P &lt; 1000"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:323
+#: apt_preferences.5.xml:317
 msgid ""
 "causes a version to be installed even if it does not come from the target "
 "release, unless the installed version is more recent"
@@ -6110,12 +6134,12 @@ msgstr ""
 "Ziel-Release kommt, außer wenn die installierte Version aktueller ist"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:328
+#: apt_preferences.5.xml:322
 msgid "500 &lt;= P &lt; 990"
 msgstr "500 &lt;= P &lt; 990"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:329
+#: apt_preferences.5.xml:323
 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"
@@ -6125,12 +6149,12 @@ msgstr ""
 "neuer ist"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:334
+#: apt_preferences.5.xml:328
 msgid "100 &lt;= P &lt; 500"
 msgstr "100 &lt;= P &lt; 500"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:335
+#: apt_preferences.5.xml:329
 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"
@@ -6140,12 +6164,12 @@ msgstr ""
 "installierte Version neuer ist"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:340
+#: apt_preferences.5.xml:334
 msgid "0 &lt; P &lt; 100"
 msgstr "0 &lt; P &lt; 100"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:341
+#: apt_preferences.5.xml:335
 msgid ""
 "causes a version to be installed only if there is no installed version of "
 "the package"
@@ -6154,17 +6178,17 @@ msgstr ""
 "installierte Version des Pakets gibt"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:345
+#: apt_preferences.5.xml:339
 msgid "P &lt; 0"
 msgstr "P &lt; 0"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:346
+#: apt_preferences.5.xml:340
 msgid "prevents the version from being installed"
 msgstr "verhindert das Installieren der Version"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:351
+#: apt_preferences.5.xml:345
 msgid ""
 "If any specific-form records match an available package version then the "
 "first such record determines the priority of the package version.  Failing "
@@ -6178,7 +6202,7 @@ msgstr ""
 "erste dieser Datensätze die Priorität der Paketversion fest."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:357
+#: apt_preferences.5.xml:351
 msgid ""
 "For example, suppose the APT preferences file contains the three records "
 "presented earlier:"
@@ -6187,7 +6211,7 @@ msgstr ""
 "bereits gezeigten Datensätze:"
 
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:361
+#: apt_preferences.5.xml:355
 #, no-wrap
 msgid ""
 "Package: perl\n"
@@ -6215,12 +6239,12 @@ msgstr ""
 "Pin-Priority: 50\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:374
+#: apt_preferences.5.xml:368
 msgid "Then:"
 msgstr "Dann:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:376
+#: apt_preferences.5.xml:370
 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 "
@@ -6235,7 +6259,7 @@ msgstr ""
 "perl;* ist, dann wird von <literal>perl</literal> ein Downgrade durchgeführt."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:381
+#: apt_preferences.5.xml:375
 msgid ""
 "A version of any package other than <literal>perl</literal> that is "
 "available from the local system has priority over other versions, even "
@@ -6246,7 +6270,7 @@ msgstr ""
 "sogar wenn diese Versionen zum Ziel-Release gehören."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:385
+#: apt_preferences.5.xml:379
 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 <literal>unstable</"
@@ -6260,12 +6284,12 @@ msgstr ""
 "Pakets installiert ist."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:395
+#: apt_preferences.5.xml:389
 msgid "Determination of Package Version and Distribution Properties"
 msgstr "Festlegung von Paketversion und Distributions-Eigenschaften"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:397
+#: apt_preferences.5.xml:391
 msgid ""
 "The locations listed in the &sources-list; file should provide "
 "<filename>Packages</filename> and <filename>Release</filename> files to "
@@ -6276,7 +6300,7 @@ msgstr ""
 "bereitstellen, um die an diesem Ort verfügbaren Pakete zu beschreiben."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:401
+#: apt_preferences.5.xml:395
 msgid ""
 "The <filename>Packages</filename> file is normally found in the directory "
 "<filename>.../dists/<replaceable>dist-name</replaceable>/"
@@ -6295,27 +6319,27 @@ msgstr ""
 "Datensatz sind nur zwei Zeilen zum Setzen der APT-Prioritäten relevant:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:409
+#: apt_preferences.5.xml:403
 msgid "the <literal>Package:</literal> line"
 msgstr "die <literal>Package:</literal>-Zeile"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:410
+#: apt_preferences.5.xml:404
 msgid "gives the package name"
 msgstr "gibt den Paketnamen an"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:413 apt_preferences.5.xml:463
+#: apt_preferences.5.xml:407 apt_preferences.5.xml:457
 msgid "the <literal>Version:</literal> line"
 msgstr "die <literal>Version:</literal>-Zeile"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:414
+#: apt_preferences.5.xml:408
 msgid "gives the version number for the named package"
 msgstr "gibt die Versionsnummer für das genannte Paket an"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:419
+#: apt_preferences.5.xml:413
 msgid ""
 "The <filename>Release</filename> file is normally found in the directory "
 "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
@@ -6337,12 +6361,12 @@ msgstr ""
 "APT-Prioritäten relevant:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:430
+#: apt_preferences.5.xml:424
 msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
 msgstr "die <literal>Archive:</literal>- oder <literal>Suite:</literal>-Zeile"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:431
+#: apt_preferences.5.xml:425
 msgid ""
 "names the archive to which all the packages in the directory tree belong.  "
 "For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@ -6359,18 +6383,18 @@ msgstr ""
 "die folgende Zeile benötigen:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:441
+#: apt_preferences.5.xml:435
 #, no-wrap
 msgid "Pin: release a=stable\n"
 msgstr "Pin: release a=stable\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:447
+#: apt_preferences.5.xml:441
 msgid "the <literal>Codename:</literal> line"
 msgstr "die <literal>Codename:</literal>-Zeile"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:448
+#: apt_preferences.5.xml:442
 msgid ""
 "names the codename to which all the packages in the directory tree belong.  "
 "For example, the line \"Codename: &testing-codename;\" specifies that all of "
@@ -6387,13 +6411,13 @@ msgstr ""
 "anzugeben würde die folgende Zeile benötigen:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:457
+#: apt_preferences.5.xml:451
 #, no-wrap
 msgid "Pin: release n=&testing-codename;\n"
 msgstr "Pin: release n=&testing-codename;\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:464
+#: apt_preferences.5.xml:458
 msgid ""
 "names the release version.  For example, the packages in the tree might "
 "belong to Debian release version &stable-version;.  Note that there is "
@@ -6410,7 +6434,7 @@ msgstr ""
 "eine der folgenden Zeilen benötigen:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:473
+#: apt_preferences.5.xml:467
 #, no-wrap
 msgid ""
 "Pin: release v=&stable-version;\n"
@@ -6422,12 +6446,12 @@ msgstr ""
 "Pin: release &stable-version;\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:482
+#: apt_preferences.5.xml:476
 msgid "the <literal>Component:</literal> line"
 msgstr "die <literal>Component:</literal>-Zeile"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:483
+#: apt_preferences.5.xml:477
 msgid ""
 "names the licensing component associated with the packages in the directory "
 "tree of the <filename>Release</filename> file.  For example, the line "
@@ -6445,18 +6469,18 @@ msgstr ""
 "Zeilen benötigen:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:492
+#: apt_preferences.5.xml:486
 #, no-wrap
 msgid "Pin: release c=main\n"
 msgstr "Pin: release c=main\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:498
+#: apt_preferences.5.xml:492
 msgid "the <literal>Origin:</literal> line"
 msgstr "die <literal>Origin:</literal>-Zeile"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:499
+#: apt_preferences.5.xml:493
 msgid ""
 "names the originator of the packages in the directory tree of the "
 "<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"
@@ -6468,18 +6492,18 @@ msgstr ""
 "in der APT-Einstellungsdatei anzugeben würde die folgende Zeile benötigen:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:505
+#: apt_preferences.5.xml:499
 #, no-wrap
 msgid "Pin: release o=Debian\n"
 msgstr "Pin: release o=Debian\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:511
+#: apt_preferences.5.xml:505
 msgid "the <literal>Label:</literal> line"
 msgstr "die <literal>Label:</literal>-Zeile"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:512
+#: apt_preferences.5.xml:506
 msgid ""
 "names the label of the packages in the directory tree of the "
 "<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"
@@ -6492,13 +6516,13 @@ msgstr ""
 "die folgende Zeile benötigen:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:518
+#: apt_preferences.5.xml:512
 #, no-wrap
 msgid "Pin: release l=Debian\n"
 msgstr "Pin: release l=Debian\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:525
+#: apt_preferences.5.xml:519
 msgid ""
 "All of the <filename>Packages</filename> and <filename>Release</filename> "
 "files retrieved from locations listed in the &sources-list; file are stored "
@@ -6524,12 +6548,12 @@ msgstr ""
 "Distribution heruntergeladen wurde."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:538
+#: apt_preferences.5.xml:532
 msgid "Optional Lines in an APT Preferences Record"
 msgstr "Optionale Zeilen in einem APT-Einstellungsdatensatz"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:540
+#: apt_preferences.5.xml:534
 msgid ""
 "Each record in the APT preferences file can optionally begin with one or "
 "more lines beginning with the word <literal>Explanation:</literal>.  This "
@@ -6540,12 +6564,12 @@ msgstr ""
 "anfangen. Dieses stellt einen Platz für Kommentare bereit."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:549
+#: apt_preferences.5.xml:543
 msgid "Tracking Stable"
 msgstr "Stable verfolgen"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:557
+#: apt_preferences.5.xml:551
 #, no-wrap
 msgid ""
 "Explanation: Uninstall or do not install any Debian-originated\n"
@@ -6569,7 +6593,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:551
+#: apt_preferences.5.xml:545
 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 "
@@ -6584,8 +6608,8 @@ msgstr ""
 "Distributionen gehören. <placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:574 apt_preferences.5.xml:620
-#: apt_preferences.5.xml:678
+#: apt_preferences.5.xml:568 apt_preferences.5.xml:614
+#: apt_preferences.5.xml:672
 #, no-wrap
 msgid ""
 "apt-get install <replaceable>package-name</replaceable>\n"
@@ -6597,7 +6621,7 @@ msgstr ""
 "apt-get dist-upgrade\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:569
+#: apt_preferences.5.xml:563
 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 "
@@ -6610,13 +6634,13 @@ msgstr ""
 "type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:586
+#: apt_preferences.5.xml:580
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/testing\n"
 msgstr "apt-get install <replaceable>Paket</replaceable>/testing\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:580
+#: apt_preferences.5.xml:574
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>testing</literal> distribution; the package "
@@ -6630,12 +6654,12 @@ msgstr ""
 "\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:592
+#: apt_preferences.5.xml:586
 msgid "Tracking Testing or Unstable"
 msgstr "Testing oder Unstable verfolgen"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:601
+#: apt_preferences.5.xml:595
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -6663,7 +6687,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:594
+#: apt_preferences.5.xml:588
 msgid ""
 "The following APT preferences file will cause APT to assign a high priority "
 "to package versions from the <literal>testing</literal> distribution, a "
@@ -6680,7 +6704,7 @@ msgstr ""
 "\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:615
+#: apt_preferences.5.xml:609
 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 "
@@ -6693,13 +6717,13 @@ msgstr ""
 "type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:635
+#: apt_preferences.5.xml:629
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
 msgstr "apt-get install <replaceable>Paket</replaceable>/unstable\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:626
+#: apt_preferences.5.xml:620
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>unstable</literal> distribution.  "
@@ -6719,12 +6743,12 @@ msgstr ""
 "\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:642
+#: apt_preferences.5.xml:636
 msgid "Tracking the evolution of a codename release"
 msgstr "Die Entwicklung eines Codename-Releases verfolgen"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:656
+#: apt_preferences.5.xml:650
 #, no-wrap
 msgid ""
 "Explanation: Uninstall or do not install any Debian-originated package versions\n"
@@ -6759,7 +6783,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:644
+#: apt_preferences.5.xml:638
 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 "
@@ -6785,7 +6809,7 @@ msgstr ""
 "benutzen. <placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:673
+#: apt_preferences.5.xml:667
 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 "
@@ -6798,13 +6822,13 @@ msgstr ""
 "literal> durchzuführen. <placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:693
+#: apt_preferences.5.xml:687
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/sid\n"
 msgstr "apt-get install <replaceable>Paket</replaceable>/sid\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:684
+#: apt_preferences.5.xml:678
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>sid</literal> distribution.  Thereafter, "
@@ -6824,17 +6848,17 @@ msgstr ""
 "\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:708
+#: apt_preferences.5.xml:702
 msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: sources.list.5.xml:35
+#: sources.list.5.xml:29
 msgid "List of configured APT data sources"
 msgstr "Liste konfigurierter APT-Datenquellen"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:40
+#: sources.list.5.xml:34
 msgid ""
 "The source list <filename>/etc/apt/sources.list</filename> is designed to "
 "support any number of active sources and a variety of source media. The file "
@@ -6851,7 +6875,7 @@ msgstr ""
 "einer anderen APT-Oberfläche) beschafft."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:47
+#: sources.list.5.xml:41
 msgid ""
 "Each line specifying a source starts with type (e.g. <literal>deb-src</"
 "literal>)  followed by options and arguments for this type.  Individual "
@@ -6866,12 +6890,12 @@ msgstr ""
 "einer Zeile kennzeichnet den Rest dieser Zeile als Kommentar."
 
 #. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:55
+#: sources.list.5.xml:49
 msgid "sources.list.d"
 msgstr "sources.list.d"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:56
+#: sources.list.5.xml:50
 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 "
@@ -6893,12 +6917,12 @@ msgstr ""
 "Silently</literal> passt – in diesem Fall wird sie stillschweigend ignoriert."
 
 #. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:67
+#: sources.list.5.xml:61
 msgid "The deb and deb-src types"
 msgstr "Die Typen deb und deb-src"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:68
+#: sources.list.5.xml:62
 msgid ""
 "The <literal>deb</literal> type references a typical two-level Debian "
 "archive, <filename>distribution/component</filename>. The "
@@ -6923,7 +6947,7 @@ msgstr ""
 "benötigt, um Quellindizes herunterzuladen."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:79
+#: sources.list.5.xml:73
 msgid ""
 "The format for a <filename>sources.list</filename> entry using the "
 "<literal>deb</literal> and <literal>deb-src</literal> types is:"
@@ -6932,13 +6956,13 @@ msgstr ""
 "<literal>deb</literal>- und <literal>deb-src</literal>-Typen benutzt, ist:"
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:82
+#: sources.list.5.xml:76
 #, no-wrap
 msgid "deb [ options ] uri suite [component1] [component2] [...]"
 msgstr "deb [ Optionen ] URI Suite [Komponente1] [Komponente2] […]"
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:86
+#: sources.list.5.xml:80
 #, no-wrap
 msgid ""
 "     Types: deb deb-src\n"
@@ -6978,7 +7002,7 @@ msgstr ""
 "   "
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:84
+#: sources.list.5.xml:78
 msgid ""
 "Alternatively a rfc822 style format is also supported: <placeholder type="
 "\"literallayout\" id=\"0\"/>"
@@ -6987,7 +7011,7 @@ msgstr ""
 "type=\"literallayout\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:105
+#: sources.list.5.xml:99
 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.  "
@@ -7008,7 +7032,7 @@ msgstr ""
 "muss mindestens eine <literal>Komponente</literal> angegeben sein."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:114
+#: sources.list.5.xml:108
 msgid ""
 "<literal>suite</literal> may also contain a variable, <literal>$(ARCH)</"
 "literal> which expands to the Debian architecture (such as <literal>amd64</"
@@ -7028,7 +7052,7 @@ msgstr ""
 "generieren."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:122
+#: sources.list.5.xml:116
 msgid ""
 "In the traditional style sources.list format since only one distribution can "
 "be specified per line it may be necessary to have multiple lines for the "
@@ -7057,7 +7081,7 @@ msgstr ""
 "hauszuhalten."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:136
+#: sources.list.5.xml:130
 msgid ""
 "<literal>options</literal> is always optional and needs to be surrounded by "
 "square brackets. It can consist of multiple settings in the form "
@@ -7075,7 +7099,7 @@ msgstr ""
 "stillschweigend ignoriert werden."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:142
+#: sources.list.5.xml:136
 msgid ""
 "<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
 "replaceable>,…</literal> can be used to specify for which architectures "
@@ -7091,7 +7115,7 @@ msgstr ""
 "heruntergeladen."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:146
+#: sources.list.5.xml:140
 msgid ""
 "<literal>arch+=<replaceable>arch1</replaceable>,<replaceable>arch2</"
 "replaceable>,…</literal> and <literal>arch-=<replaceable>arch1</replaceable>,"
@@ -7106,7 +7130,7 @@ msgstr ""
 "hinzuzufügen oder zu entfernen."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:149
+#: sources.list.5.xml:143
 msgid ""
 "<literal>trusted=yes</literal> can be set to indicate that packages from "
 "this source are always authenticated even if the <filename>Release</"
@@ -7124,7 +7148,7 @@ msgstr ""
 "korrekt authentifizierte Quellen als nicht authentifiziert."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:156
+#: sources.list.5.xml:150
 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 "
@@ -7138,12 +7162,12 @@ msgstr ""
 "Rechnern, zum Beispiel)."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:161
+#: sources.list.5.xml:155
 msgid "Some examples:"
 msgstr "Einige Beispiele:"
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:163
+#: sources.list.5.xml:157
 #, no-wrap
 msgid ""
 "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
@@ -7155,17 +7179,17 @@ msgstr ""
 "   "
 
 #. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:169
+#: sources.list.5.xml:163
 msgid "URI specification"
 msgstr "URI-Beschreibung"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:171
+#: sources.list.5.xml:165
 msgid "The currently recognized URI types are:"
 msgstr "Die derzeit zulässigen URI-Typen sind:"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:175
+#: sources.list.5.xml:169
 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 "
@@ -7176,7 +7200,7 @@ msgstr ""
 "lokale Spiegel oder Archive."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:182
+#: sources.list.5.xml:176
 msgid ""
 "The cdrom scheme allows APT to use a local CD-ROM drive with media swapping. "
 "Use the &apt-cdrom; program to create cdrom entries in the source list."
@@ -7186,7 +7210,7 @@ msgstr ""
 "der Quellenliste zu erstellen."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:189
+#: sources.list.5.xml:183
 msgid ""
 "The http scheme specifies an HTTP server for the archive. If an environment "
 "variable <envar>http_proxy</envar> is set with the format http://server:"
@@ -7203,7 +7227,7 @@ msgstr ""
 "Beachten Sie, dass dies eine unsichere Authentifizierungsmethode ist."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:200
+#: sources.list.5.xml:194
 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 page. "
@@ -7225,7 +7249,7 @@ msgstr ""
 "benutzen, werden ignoriert."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:212
+#: sources.list.5.xml:206
 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.  "
@@ -7238,7 +7262,7 @@ msgstr ""
 "Wechseldatenträger benutzen, um Dateien mit APT umherzukopieren."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:219
+#: sources.list.5.xml:213
 msgid ""
 "The rsh/ssh method invokes RSH/SSH to connect to a remote host and access "
 "the files as a given user. Prior configuration of rhosts or RSA keys is "
@@ -7252,12 +7276,12 @@ msgstr ""
 "<command>find</command> und <command>dd</command> verwandt."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:226
+#: sources.list.5.xml:220
 msgid "adding more recognizable URI types"
 msgstr "weitere zulässige URI-Typen hinzufügen"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:228
+#: sources.list.5.xml:222
 msgid ""
 "APT can be extended with more methods shipped in other optional packages, "
 "which should follow the naming scheme <package>apt-transport-"
@@ -7276,7 +7300,7 @@ msgstr ""
 "Benutzung von debtorrent verfügbar – siehe &apt-transport-debtorrent;."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:240
+#: sources.list.5.xml:234
 msgid ""
 "Uses the archive stored locally (or NFS mounted) at /home/jason/debian for "
 "stable/main, stable/contrib, and stable/non-free."
@@ -7285,37 +7309,37 @@ msgstr ""
 "jason/debian für stable/main, stable/contrib und stable/non-free."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:242
+#: sources.list.5.xml:236
 #, no-wrap
 msgid "deb file:/home/jason/debian stable main contrib non-free"
 msgstr "deb file:/home/jason/debian stable main contrib non-free"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:244
+#: sources.list.5.xml:238
 msgid "As above, except this uses the unstable (development) distribution."
 msgstr ""
 "wie oben, außer das dies die »unstable«- (Entwicklungs-) Distribution "
 "benutzt."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:245
+#: sources.list.5.xml:239
 #, no-wrap
 msgid "deb file:/home/jason/debian unstable main contrib non-free"
 msgstr "deb file:/home/jason/debian unstable main contrib non-free"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:247
+#: sources.list.5.xml:241
 msgid "Source line for the above"
 msgstr "Quellzeile für obiges"
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:248
+#: sources.list.5.xml:242
 #, no-wrap
 msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
 msgstr "deb-src file:/home/jason/debian unstable main contrib non-free"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:250
+#: sources.list.5.xml:244
 msgid ""
 "The first line gets package information for the architectures in "
 "<literal>APT::Architectures</literal> while the second always retrieves "
@@ -7326,7 +7350,7 @@ msgstr ""
 "<literal>amd64</literal> und <literal>armel</literal> holt."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:252
+#: sources.list.5.xml:246
 #, no-wrap
 msgid ""
 "deb http://ftp.debian.org/debian &stable-codename; main\n"
@@ -7336,7 +7360,7 @@ msgstr ""
 "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:255
+#: sources.list.5.xml:249
 msgid ""
 "Uses HTTP to access the archive at archive.debian.org, and uses only the "
 "hamm/main area."
@@ -7345,13 +7369,13 @@ msgstr ""
 "den hamm/main-Bereich zu benutzen."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:257
+#: sources.list.5.xml:251
 #, no-wrap
 msgid "deb http://archive.debian.org/debian-archive hamm main"
 msgstr "deb http://archive.debian.org/debian-archive hamm main"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:259
+#: sources.list.5.xml:253
 msgid ""
 "Uses FTP to access the archive at ftp.debian.org, under the debian "
 "directory, and uses only the &stable-codename;/contrib area."
@@ -7361,13 +7385,13 @@ msgstr ""
 "benutzen."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:261
+#: sources.list.5.xml:255
 #, no-wrap
 msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
 msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:263
+#: sources.list.5.xml:257
 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 "
@@ -7381,19 +7405,19 @@ msgstr ""
 "für beide Quellzeilen benutzt."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:267
+#: sources.list.5.xml:261
 #, no-wrap
 msgid "deb ftp://ftp.debian.org/debian unstable contrib"
 msgstr "deb ftp://ftp.debian.org/debian unstable contrib"
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:276
+#: sources.list.5.xml:270
 #, no-wrap
 msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
 msgstr "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:269
+#: sources.list.5.xml:263
 msgid ""
 "Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe "
 "directory, and uses only files found under <filename>unstable/binary-i386</"
@@ -7413,17 +7437,17 @@ msgstr ""
 "type=\"literallayout\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:281
+#: sources.list.5.xml:275
 msgid "&apt-cache; &apt-conf;"
 msgstr "&apt-cache; &apt-conf;"
 
 #. type: Content of: <refentry><refmeta><manvolnum>
-#: apt-extracttemplates.1.xml:28 apt-sortpkgs.1.xml:28 apt-ftparchive.1.xml:28
+#: apt-extracttemplates.1.xml:22 apt-sortpkgs.1.xml:22 apt-ftparchive.1.xml:22
 msgid "1"
 msgstr "1"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-extracttemplates.1.xml:35
+#: apt-extracttemplates.1.xml:29
 msgid ""
 "Utility to extract <command>debconf</command> config and templates from "
 "Debian packages"
@@ -7432,7 +7456,7 @@ msgstr ""
 "und Schablonen von Debian-Paketen"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:41
+#: apt-extracttemplates.1.xml:35
 msgid ""
 "<command>apt-extracttemplates</command> will take one or more Debian package "
 "files as input and write out (to a temporary directory) all associated "
@@ -7448,12 +7472,12 @@ msgstr ""
 "generiert:"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:46
+#: apt-extracttemplates.1.xml:40
 msgid "package version template-file config-script"
 msgstr "Paket Version Schablonendatei Konfigurationsskript"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:47
+#: apt-extracttemplates.1.xml:41
 msgid ""
 "template-file and config-script are written to the temporary directory "
 "specified by the <option>-t</option> or <option>--tempdir</option> "
@@ -7468,7 +7492,7 @@ msgstr ""
 "<filename>package.config.XXXXXX</filename> angegeben wurde."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-extracttemplates.1.xml:60
+#: apt-extracttemplates.1.xml:54
 msgid ""
 "Temporary directory in which to write extracted <command>debconf</command> "
 "template files and config scripts.  Configuration Item: <literal>APT::"
@@ -7479,7 +7503,7 @@ msgstr ""
 "Konfigurationselement: <literal>APT::ExtractTemplates::TempDir</literal>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:77
+#: apt-extracttemplates.1.xml:71
 msgid ""
 "<command>apt-extracttemplates</command> returns zero on normal operation, "
 "decimal 100 on error."
@@ -7488,12 +7512,12 @@ msgstr ""
 "zurück, dezimal 100 bei Fehlern."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-sortpkgs.1.xml:35
+#: apt-sortpkgs.1.xml:29
 msgid "Utility to sort package index files"
 msgstr "Werkzeug zum Sortieren von Paketindexdateien"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-sortpkgs.1.xml:41
+#: apt-sortpkgs.1.xml:35
 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 "
@@ -7505,7 +7529,7 @@ msgstr ""
 "die internen Felder jedes Datensatzes gemäß interner Sortierregeln sortieren."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-sortpkgs.1.xml:47
+#: apt-sortpkgs.1.xml:41
 msgid ""
 "All output is sent to standard output; the input must be a seekable file."
 msgstr ""
@@ -7513,7 +7537,7 @@ msgstr ""
 "durchsuchbare Datei sein."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-sortpkgs.1.xml:56
+#: apt-sortpkgs.1.xml:50
 msgid ""
 "Use source index field ordering.  Configuration Item: <literal>APT::"
 "SortPkgs::Source</literal>."
@@ -7522,7 +7546,7 @@ msgstr ""
 "SortPkgs::Source</literal>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-sortpkgs.1.xml:70
+#: apt-sortpkgs.1.xml:64
 msgid ""
 "<command>apt-sortpkgs</command> returns zero on normal operation, decimal "
 "100 on error."
@@ -7531,12 +7555,12 @@ msgstr ""
 "dezimal 100 bei Fehlern."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-ftparchive.1.xml:35
+#: apt-ftparchive.1.xml:29
 msgid "Utility to generate index files"
 msgstr "Hilfsprogramm zum Generieren von Indexdateien"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:41
+#: apt-ftparchive.1.xml:35
 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 "
@@ -7549,7 +7573,7 @@ msgstr ""
 "Inhalts dieser Stelle generiert werden."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:45
+#: apt-ftparchive.1.xml:39
 msgid ""
 "<command>apt-ftparchive</command> is a superset of the &dpkg-scanpackages; "
 "program, incorporating its entire functionality via the <literal>packages</"
@@ -7563,7 +7587,7 @@ msgstr ""
 "für ein komplettes Archiv zu »skripten«."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:51
+#: apt-ftparchive.1.xml:45
 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 "
@@ -7579,7 +7603,7 @@ msgstr ""
 "Ausgabedateien erzeugt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:62
+#: apt-ftparchive.1.xml:56
 msgid ""
 "The packages command generates a package file from a directory tree. It "
 "takes the given directory and recursively searches it for .deb files, "
@@ -7592,7 +7616,7 @@ msgstr ""
 "Befehl entspricht etwa &dpkg-scanpackages;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:67 apt-ftparchive.1.xml:91
+#: apt-ftparchive.1.xml:61 apt-ftparchive.1.xml:85
 msgid ""
 "The option <option>--db</option> can be used to specify a binary caching DB."
 msgstr ""
@@ -7600,7 +7624,7 @@ msgstr ""
 "Zwischenspeichern von Programmen anzugeben."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:72
+#: apt-ftparchive.1.xml:66
 msgid ""
 "The <literal>sources</literal> command generates a source index file from a "
 "directory tree.  It takes the given directory and recursively searches it "
@@ -7613,7 +7637,7 @@ msgstr ""
 "stdout ausgibt. Dieser Befehl entspricht etwa &dpkg-scansources;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:77
+#: apt-ftparchive.1.xml:71
 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 "
@@ -7625,7 +7649,7 @@ msgstr ""
 "ändern."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:84
+#: apt-ftparchive.1.xml:78
 msgid ""
 "The <literal>contents</literal> command generates a contents file from a "
 "directory tree. It takes the given directory and recursively searches it "
@@ -7643,7 +7667,7 @@ msgstr ""
 "getrennt in der Ausgabe."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:96
+#: apt-ftparchive.1.xml:90
 msgid ""
 "The <literal>release</literal> command generates a Release file from a "
 "directory tree. It recursively searches the given directory for uncompressed "
@@ -7670,7 +7694,7 @@ msgstr ""
 "Prüfsumme enthält."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:106
+#: apt-ftparchive.1.xml:100
 msgid ""
 "Values for the additional metadata fields in the Release file are taken from "
 "the corresponding variables under <literal>APT::FTPArchive::Release</"
@@ -7691,7 +7715,7 @@ msgstr ""
 "<literal>Description</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:119
+#: apt-ftparchive.1.xml:113
 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 "
@@ -7707,7 +7731,7 @@ msgstr ""
 "Verwaltung der erforderlichen Einstellungen bereitstellt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:128
+#: apt-ftparchive.1.xml:122
 msgid ""
 "The <literal>clean</literal> command tidies the databases used by the given "
 "configuration file by removing any records that are no longer necessary."
@@ -7717,12 +7741,12 @@ msgstr ""
 "Datensätze entfernt."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:134
+#: apt-ftparchive.1.xml:128
 msgid "The Generate Configuration"
 msgstr "Die Generate-Konfiguration"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:136
+#: apt-ftparchive.1.xml:130
 msgid ""
 "The <literal>generate</literal> command uses a configuration file to "
 "describe the archives that are going to be generated. It follows the typical "
@@ -7740,7 +7764,7 @@ msgstr ""
 "wenn die Markierung »scope« behandelt wird."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:144
+#: apt-ftparchive.1.xml:138
 msgid ""
 "The generate configuration has four separate sections, each described below."
 msgstr ""
@@ -7748,12 +7772,12 @@ msgstr ""
 "unterhalb beschrieben"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:146
+#: apt-ftparchive.1.xml:140
 msgid "<literal>Dir</literal> Section"
 msgstr "<literal>Dir</literal>-Abschnitt"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:148
+#: apt-ftparchive.1.xml:142
 msgid ""
 "The <literal>Dir</literal> section defines the standard directories needed "
 "to locate the files required during the generation process. These "
@@ -7767,7 +7791,7 @@ msgstr ""
 "absoluten Pfad zu bilden."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:155
+#: apt-ftparchive.1.xml:149
 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 "
@@ -7778,17 +7802,17 @@ msgstr ""
 "enthält."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:162
+#: apt-ftparchive.1.xml:156
 msgid "Specifies the location of the override files."
 msgstr "gibt den Ort der Override-Dateien an"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:167
+#: apt-ftparchive.1.xml:161
 msgid "Specifies the location of the cache files."
 msgstr "gibt den Ort der Zwischenspeicherdateien an"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:172
+#: apt-ftparchive.1.xml:166
 msgid ""
 "Specifies the location of the file list files, if the <literal>FileList</"
 "literal> setting is used below."
@@ -7797,12 +7821,12 @@ msgstr ""
 "unterhalb gesetzt ist."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:178
+#: apt-ftparchive.1.xml:172
 msgid "<literal>Default</literal> Section"
 msgstr "<literal>Default</literal>-Abschnitt"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:180
+#: apt-ftparchive.1.xml:174
 msgid ""
 "The <literal>Default</literal> section specifies default values, and "
 "settings that control the operation of the generator. Other sections may "
@@ -7813,7 +7837,7 @@ msgstr ""
 "können diese Vorgaben mit einer Einstellung pro Abschnitt überschreiben."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:186
+#: apt-ftparchive.1.xml:180
 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 "
@@ -7827,7 +7851,7 @@ msgstr ""
 "ist ». gzip«."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:194
+#: apt-ftparchive.1.xml:188
 msgid ""
 "Sets the default list of file extensions that are package files.  This "
 "defaults to '.deb'."
@@ -7836,7 +7860,7 @@ msgstr ""
 "Vorgabe ist ».deb«."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:200
+#: apt-ftparchive.1.xml:194
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Sources files."
@@ -7845,7 +7869,7 @@ msgstr ""
 "Kompression der Quelldateien steuert."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:206
+#: apt-ftparchive.1.xml:200
 msgid ""
 "Sets the default list of file extensions that are source files.  This "
 "defaults to '.dsc'."
@@ -7854,7 +7878,7 @@ msgstr ""
 "Vorgabe ist ».dsc«."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:212
+#: apt-ftparchive.1.xml:206
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Contents files."
@@ -7863,7 +7887,7 @@ msgstr ""
 "Kompression der Inhaltsdateien steuert."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:218
+#: apt-ftparchive.1.xml:212
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Translation-en master file."
@@ -7872,7 +7896,7 @@ msgstr ""
 "Kompression der Translation-en-Hauptdatei steuert."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:224
+#: apt-ftparchive.1.xml:218
 msgid ""
 "Specifies the number of kilobytes to delink (and replace with hard links) "
 "per run. This is used in conjunction with the per-section <literal>External-"
@@ -7883,7 +7907,7 @@ msgstr ""
 "<literal>External-Links</literal>-Einstellung pro Abschnitt benutzt."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:231
+#: apt-ftparchive.1.xml:225
 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."
@@ -7892,7 +7916,7 @@ msgstr ""
 "Indexdateien werden ohne Beachtung von umask auf diese Rechte gesetzt."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:238 apt-ftparchive.1.xml:384
+#: apt-ftparchive.1.xml:232 apt-ftparchive.1.xml:378
 msgid ""
 "Specifies whether long descriptions should be included in the "
 "<filename>Packages</filename> file or split out into a master "
@@ -7903,12 +7927,12 @@ msgstr ""
 "Hauptdatei unterteilt werden sollen"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:244
+#: apt-ftparchive.1.xml:238
 msgid "<literal>TreeDefault</literal> Section"
 msgstr "<literal>TreeDefault</literal>-Abschnitt"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:246
+#: apt-ftparchive.1.xml:240
 msgid ""
 "Sets defaults specific to <literal>Tree</literal> sections. All of these "
 "variables are substitution variables and have the strings $(DIST), "
@@ -7919,7 +7943,7 @@ msgstr ""
 "$(SECTION) und $(ARCH) durch ihre jeweiligen Werte ersetzt."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:253
+#: apt-ftparchive.1.xml:247
 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 will all "
@@ -7930,7 +7954,7 @@ msgstr ""
 "Tage alle neu gebildet werden."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:260
+#: apt-ftparchive.1.xml:254
 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 updated. "
@@ -7948,7 +7972,7 @@ msgstr ""
 "eine neue Datei benötigen. Die Vorgabe ist 10, die Einheiten sind Tage."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:271
+#: apt-ftparchive.1.xml:265
 msgid ""
 "Sets the top of the .deb directory tree. Defaults to <filename>$(DIST)/"
 "$(SECTION)/binary-$(ARCH)/</filename>"
@@ -7957,7 +7981,7 @@ msgstr ""
 "$(SECTION)/binary-$(ARCH)/</filename>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:277
+#: apt-ftparchive.1.xml:271
 msgid ""
 "Sets the top of the source package directory tree. Defaults to <filename>"
 "$(DIST)/$(SECTION)/source/</filename>"
@@ -7966,7 +7990,7 @@ msgstr ""
 "$(DIST)/$(SECTION)/source/</filename>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:283
+#: apt-ftparchive.1.xml:277
 msgid ""
 "Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
 "binary-$(ARCH)/Packages</filename>"
@@ -7975,7 +7999,7 @@ msgstr ""
 "binary-$(ARCH)/Packages</filename>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:289
+#: apt-ftparchive.1.xml:283
 msgid ""
 "Sets the output Sources file. Defaults to <filename>$(DIST)/$(SECTION)/"
 "source/Sources</filename>"
@@ -7984,7 +8008,7 @@ msgstr ""
 "source/Sources</filename>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:295
+#: apt-ftparchive.1.xml:289
 msgid ""
 "Sets the output Translation-en master file with the long descriptions if "
 "they should be not included in the Packages file. Defaults to <filename>"
@@ -7995,7 +8019,7 @@ msgstr ""
 "ist <filename>$(DIST)/$(SECTION)/i18n/Translation-en</filename>."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:302
+#: apt-ftparchive.1.xml:296
 msgid ""
 "Sets the path prefix that causes a symlink to be considered an internal link "
 "instead of an external link. Defaults to <filename>$(DIST)/$(SECTION)/</"
@@ -8006,7 +8030,7 @@ msgstr ""
 "<filename>$(DIST)/$(SECTION)/</filename>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:309
+#: apt-ftparchive.1.xml:303
 msgid ""
 "Sets the output Contents file. Defaults to <filename>$(DIST)/$(SECTION)/"
 "Contents-$(ARCH)</filename>. If this setting causes multiple Packages files "
@@ -8021,12 +8045,12 @@ msgstr ""
 "automatisch integrieren."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:318
+#: apt-ftparchive.1.xml:312
 msgid "Sets header file to prepend to the contents output."
 msgstr "setzt die Kopfdatendatei, um sie der Inhaltsausgabe voranzustellen."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:323
+#: apt-ftparchive.1.xml:317
 msgid ""
 "Sets the binary cache database to use for this section. Multiple sections "
 "can share the same database."
@@ -8035,7 +8059,7 @@ msgstr ""
 "Abschnitt. Mehrere Abschnitte können sich die gleiche Datenbank teilen."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:329
+#: apt-ftparchive.1.xml:323
 msgid ""
 "Specifies that instead of walking the directory tree, <command>apt-"
 "ftparchive</command> should read the list of files from the given file. "
@@ -8046,7 +8070,7 @@ msgstr ""
 "Relativen Dateinamen wird das Archivverzeichnis vorangestellt."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:336
+#: apt-ftparchive.1.xml:330
 msgid ""
 "Specifies that instead of walking the directory tree, <command>apt-"
 "ftparchive</command> should read the list of files from the given file. "
@@ -8059,12 +8083,12 @@ msgstr ""
 "benutzt, wenn Quellindizes verarbeitet werden."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:344
+#: apt-ftparchive.1.xml:338
 msgid "<literal>Tree</literal> Section"
 msgstr "<literal>Tree</literal>-Abschnitt"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:346
+#: apt-ftparchive.1.xml:340
 msgid ""
 "The <literal>Tree</literal> section defines a standard Debian file tree "
 "which consists of a base directory, then multiple sections in that base "
@@ -8079,7 +8103,7 @@ msgstr ""
 "<literal>Directory</literal>-Ersetzungsvariable definiert."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:351
+#: apt-ftparchive.1.xml:345
 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 "
@@ -8093,7 +8117,7 @@ msgstr ""
 "codename;</filename>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:356
+#: apt-ftparchive.1.xml:350
 msgid ""
 "All of the settings defined in the <literal>TreeDefault</literal> section "
 "can be used in a <literal>Tree</literal> section as well as three new "
@@ -8104,7 +8128,7 @@ msgstr ""
 "Variablen benutzt werden."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt-ftparchive.1.xml:362
+#: apt-ftparchive.1.xml:356
 #, no-wrap
 msgid ""
 "for i in Sections do \n"
@@ -8118,7 +8142,7 @@ msgstr ""
 "     "
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:359
+#: apt-ftparchive.1.xml:353
 msgid ""
 "When processing a <literal>Tree</literal> section <command>apt-ftparchive</"
 "command> performs an operation similar to: <placeholder type=\"programlisting"
@@ -8129,7 +8153,7 @@ msgstr ""
 "<placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:370
+#: apt-ftparchive.1.xml:364
 msgid ""
 "This is a space separated list of sections which appear under the "
 "distribution; typically this is something like <literal>main contrib non-"
@@ -8140,7 +8164,7 @@ msgstr ""
 "non-free</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:377
+#: apt-ftparchive.1.xml:371
 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 "
@@ -8151,7 +8175,7 @@ msgstr ""
 "benutzt, um anzugeben, dass dieser Baum ein Quellarchiv besitzt."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:390
+#: apt-ftparchive.1.xml:384
 msgid ""
 "Sets the binary override file. The override file contains section, priority "
 "and maintainer address information."
@@ -8160,7 +8184,7 @@ msgstr ""
 "Priorität und Adressinformationen des Betreuers."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:396
+#: apt-ftparchive.1.xml:390
 msgid ""
 "Sets the source override file. The override file contains section "
 "information."
@@ -8169,22 +8193,22 @@ msgstr ""
 "Abschnittsinformationen."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:402 apt-ftparchive.1.xml:448
+#: apt-ftparchive.1.xml:396 apt-ftparchive.1.xml:442
 msgid "Sets the binary extra override file."
 msgstr "setzt die zusätzliche Programm-Override-Datei"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:407 apt-ftparchive.1.xml:453
+#: apt-ftparchive.1.xml:401 apt-ftparchive.1.xml:447
 msgid "Sets the source extra override file."
 msgstr "setzt die zusätzliche Quell-Override-Datei"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:412
+#: apt-ftparchive.1.xml:406
 msgid "<literal>BinDirectory</literal> Section"
 msgstr "<literal>BinDirectory</literal>-Abschnitt"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:414
+#: apt-ftparchive.1.xml:408
 msgid ""
 "The <literal>bindirectory</literal> section defines a binary directory tree "
 "with no special structure. The scope tag specifies the location of the "
@@ -8199,12 +8223,12 @@ msgstr ""
 "<literal>Abschnitt</literal><literal>Architektur</literal> ähnlich."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:422
+#: apt-ftparchive.1.xml:416
 msgid "Sets the Packages file output."
 msgstr "setzt die Packages-Dateiausgabe"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:427
+#: apt-ftparchive.1.xml:421
 msgid ""
 "Sets the Sources file output. At least one of <literal>Packages</literal> or "
 "<literal>Sources</literal> is required."
@@ -8213,42 +8237,42 @@ msgstr ""
 "<literal>Sources</literal> ist erforderlich."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:433
+#: apt-ftparchive.1.xml:427
 msgid "Sets the Contents file output (optional)."
 msgstr "setzt die Contents-Dateiausgabe (optional)"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:438
+#: apt-ftparchive.1.xml:432
 msgid "Sets the binary override file."
 msgstr "setzt die Programm-Override-Datei"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:443
+#: apt-ftparchive.1.xml:437
 msgid "Sets the source override file."
 msgstr "setzt die Quell-Override-Datei"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:458
+#: apt-ftparchive.1.xml:452
 msgid "Sets the cache DB."
 msgstr "setzt die Zwischenspeicherdatenbank"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:463
+#: apt-ftparchive.1.xml:457
 msgid "Appends a path to all the output paths."
 msgstr "hängt einen Pfad an alle Ausgabepfade an"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:468
+#: apt-ftparchive.1.xml:462
 msgid "Specifies the file list file."
 msgstr "gibt die Dateilistendatei an"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:475
+#: apt-ftparchive.1.xml:469
 msgid "The Binary Override File"
 msgstr "Die Programm-Override-Datei"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:476
+#: apt-ftparchive.1.xml:470
 msgid ""
 "The binary override file is fully compatible with &dpkg-scanpackages;. It "
 "contains four fields separated by spaces. The first field is the package "
@@ -8263,19 +8287,19 @@ msgstr ""
 "und das letzte Feld ist das Betreuerumsetzungsfeld."
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:482
+#: apt-ftparchive.1.xml:476
 #, no-wrap
 msgid "old [// oldn]* => new"
 msgstr "alt [// oldn]* => neu"
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:484
+#: apt-ftparchive.1.xml:478
 #, no-wrap
 msgid "new"
 msgstr "neu"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:481
+#: apt-ftparchive.1.xml:475
 msgid ""
 "The general form of the maintainer field is: <placeholder type="
 "\"literallayout\" id=\"0\"/> or simply, <placeholder type=\"literallayout\" "
@@ -8292,12 +8316,12 @@ msgstr ""
 "bedingungslos."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:492
+#: apt-ftparchive.1.xml:486
 msgid "The Source Override File"
 msgstr "Die Quell-Override-Datei"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:494
+#: apt-ftparchive.1.xml:488
 msgid ""
 "The source override file is fully compatible with &dpkg-scansources;. It "
 "contains two fields separated by spaces. The first field is the source "
@@ -8308,12 +8332,12 @@ msgstr ""
 "Quellpaketname, das zweite ist der Abschnitt, dem er zugeordnet ist."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:499
+#: apt-ftparchive.1.xml:493
 msgid "The Extra Override File"
 msgstr "Die zusätzlich Override-Datei"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:501
+#: apt-ftparchive.1.xml:495
 msgid ""
 "The extra override file allows any arbitrary tag to be added or replaced in "
 "the output. It has three columns, the first is the package, the second is "
@@ -8325,7 +8349,7 @@ msgstr ""
 "ist der neue Wert."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:512
+#: apt-ftparchive.1.xml:506
 msgid ""
 "Generate the given checksum. These options default to on, when turned off "
 "the generated index files will not have the checksum fields where possible.  "
@@ -8350,7 +8374,7 @@ msgstr ""
 "literal> sein kann."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:523
+#: apt-ftparchive.1.xml:517
 msgid ""
 "Use a binary caching DB. This has no effect on the generate command.  "
 "Configuration Item: <literal>APT::FTPArchive::DB</literal>."
@@ -8360,7 +8384,7 @@ msgstr ""
 "DB</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:529
+#: apt-ftparchive.1.xml:523
 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 "
@@ -8374,7 +8398,7 @@ msgstr ""
 "Konfigurationselement: <literal>quiet</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:537
+#: apt-ftparchive.1.xml:531
 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 "
@@ -8388,7 +8412,7 @@ msgstr ""
 "DeLinkAct</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:545
+#: apt-ftparchive.1.xml:539
 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 "
@@ -8404,7 +8428,7 @@ msgstr ""
 "Konfigurationselement: <literal>APT::FTPArchive::Contents</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:555
+#: apt-ftparchive.1.xml:549
 msgid ""
 "Select the source override file to use with the <literal>sources</literal> "
 "command.  Configuration Item: <literal>APT::FTPArchive::SourceOverride</"
@@ -8415,7 +8439,7 @@ msgstr ""
 "SourceOverride</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:561
+#: apt-ftparchive.1.xml:555
 msgid ""
 "Make the caching databases read only.  Configuration Item: <literal>APT::"
 "FTPArchive::ReadOnlyDB</literal>."
@@ -8424,7 +8448,7 @@ msgstr ""
 "<literal>APT::FTPArchive::ReadOnlyDB</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:566
+#: apt-ftparchive.1.xml:560
 msgid ""
 "Accept in the <literal>packages</literal> and <literal>contents</literal> "
 "commands only package files matching <literal>*_arch.deb</literal> or "
@@ -8438,7 +8462,7 @@ msgstr ""
 "FTPArchive::Architecture</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:574
+#: apt-ftparchive.1.xml:568
 msgid ""
 "&apt-ftparchive; caches as much as possible of metadata in a cachedb. If "
 "packages are recompiled and/or republished with the same version again, this "
@@ -8462,7 +8486,7 @@ msgstr ""
 "haben sollte und all diese zusätzlichen Prüfungen daher nutzlos sind."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:586
+#: apt-ftparchive.1.xml:580
 msgid ""
 "This configuration option defaults to \"<literal>true</literal>\" and should "
 "only be set to <literal>\"false\"</literal> if the Archive generated with "
@@ -8478,13 +8502,13 @@ msgstr ""
 "werden kann."
 
 #. type: Content of: <refentry><refsect1><para><programlisting>
-#: apt-ftparchive.1.xml:604
+#: apt-ftparchive.1.xml:598
 #, no-wrap
 msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
 msgstr "<command>apt-ftparchive</command> Pakete <replaceable>Verzeichnis</replaceable> | <command>gzip</command> > <filename>Pakete.gz</filename>\n"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:600
+#: apt-ftparchive.1.xml:594
 msgid ""
 "To create a compressed Packages file for a directory containing binary "
 "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
@@ -8494,7 +8518,7 @@ msgstr ""
 ">"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:614
+#: apt-ftparchive.1.xml:608
 msgid ""
 "<command>apt-ftparchive</command> returns zero on normal operation, decimal "
 "100 on error."
@@ -8502,36 +8526,53 @@ msgstr ""
 "<command>apt-ftparchive</command> gibt bei normalen Operationen 0 zurück, "
 "dezimal 100 bei Fehlern."
 
-#. type: <title></title>
-#: guide.sgml:4
+#. type: Attribute 'lang' of: <book>
+#: guide.dbk:9 offline.dbk:9
+msgid "en"
+msgstr "de"
+
+#. type: Content of: <book><title>
+#: guide.dbk:11
 msgid "APT User's Guide"
 msgstr "APT-Benutzerhandbuch"
 
-#. type: <author></author>
-#: guide.sgml:6 offline.sgml:6
-msgid "<name>Jason Gunthorpe </name><email>jgg@debian.org</email>"
-msgstr "<name>Jason Gunthorpe </name><email>jgg@debian.org</email>"
+#. type: Content of: <book><bookinfo><authorgroup><author><personname>
+#: guide.dbk:17 offline.dbk:17
+msgid "Jason Gunthorpe"
+msgstr "Jason Gunthorpe"
+
+#. type: Content of: <book><bookinfo><authorgroup><author><email>
+#: guide.dbk:17 offline.dbk:17
+msgid "jgg@debian.org"
+msgstr "jgg@debian.org"
 
-#. type: <version></version>
-#: guide.sgml:7
-msgid "$Id: guide.sgml,v 1.7 2003/04/26 23:26:13 doogie Exp $"
-msgstr "$Id: guide.sgml,v 1.7 2003/04/26 23:26:13 doogie Exp $"
+#. type: Content of: <book><bookinfo><releaseinfo>
+#: guide.dbk:21 offline.dbk:21
+msgid "Version &apt-product-version;"
+msgstr ""
 
-#. type: <abstract></abstract>
-#: guide.sgml:11
+#. type: Content of: <book><bookinfo><abstract><para>
+#: guide.dbk:25
 msgid ""
 "This document provides an overview of how to use the the APT package manager."
 msgstr ""
 "Dieses Dokument stellt eine Übersicht bereit, wie das APT-"
 "Paketverwaltungsprogramm benutzt wird."
 
-#. type: <copyrightsummary></copyrightsummary>
-#: guide.sgml:15
-msgid "Copyright &copy; Jason Gunthorpe, 1998."
-msgstr "Copyright &copy; Jason Gunthorpe, 1998."
+#. type: Content of: <book><bookinfo>
+#: guide.dbk:29
+msgid ""
+"<copyright><year>1998</year><holder>Jason Gunthorpe</holder></copyright>"
+msgstr ""
+"<copyright><year>1998</year><holder>Jason Gunthorpe</holder></copyright>"
 
-#. type: <p></p>
-#: guide.sgml:21 offline.sgml:22
+#. type: Content of: <book><bookinfo><legalnotice><title>
+#: guide.dbk:32 offline.dbk:33
+msgid "License Notice"
+msgstr ""
+
+#. type: Content of: <book><bookinfo><legalnotice><para>
+#: guide.dbk:34 offline.dbk:35
 msgid ""
 "\"APT\" and this document are free software; you can redistribute them and/"
 "or modify them under the terms of the GNU General Public License as "
@@ -8543,8 +8584,8 @@ msgstr ""
 "sie von der Free Software Foundation veröffentlicht wird; entweder Version 2 "
 "der Lizenz oder (optional) jeder späteren Version."
 
-#. type: <p></p>
-#: guide.sgml:24 offline.sgml:25
+#. type: Content of: <book><bookinfo><legalnotice><para>
+#: guide.dbk:43 offline.dbk:41
 msgid ""
 "For more details, on Debian systems, see the file /usr/share/common-licenses/"
 "GPL for the full license."
@@ -8552,31 +8593,32 @@ msgstr ""
 "Siehe für weitere Details auf Debian-Systemen die Datei /usr/share/common-"
 "licenses/GPL, die die vollständige Lizenz enthält."
 
-#. type: <heading></heading>
-#: guide.sgml:32
+#. type: Content of: <book><chapter><title>
+#: guide.dbk:50
 msgid "General"
 msgstr "Allgemein"
 
-#. type: <p></p>
-#: guide.sgml:38
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:52
 msgid ""
-"The APT package currently contains two sections, the APT <prgn>dselect</"
-"prgn> method and the <prgn>apt-get</prgn> command line user interface. Both "
-"provide a way to install and remove packages as well as download new "
-"packages from the Internet."
+"The APT package currently contains two sections, the APT <command>dselect</"
+"command> method and the <command>apt-get</command> command line user "
+"interface. Both provide a way to install and remove packages as well as "
+"download new packages from the Internet."
 msgstr ""
-"Das Paket APT enthält derzeit zwei Abschnitte, die APT-<prgn>dselect</prgn>-"
-"Methode und die Anwenderschnittstelle <prgn>apt-get</prgn> für die "
-"Befehlszeile. Beide stellen eine Möglichkeit bereit, Pakete zu installieren, "
-"zu entfernen, sowie neue Pakete aus dem Internet herunterzuladen."
+"Das Paket APT enthält derzeit zwei Abschnitte, die APT-<command>dselect</"
+"command>-Methode und die Anwenderschnittstelle <command>apt-get</command> "
+"für die Befehlszeile. Beide stellen eine Möglichkeit bereit, Pakete zu "
+"installieren, zu entfernen, sowie neue Pakete aus dem Internet "
+"herunterzuladen."
 
-#. type: <heading></heading>
-#: guide.sgml:39
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:58
 msgid "Anatomy of the Package System"
 msgstr "Anatomie des Paketsystems"
 
-#. type: <p></p>
-#: guide.sgml:44
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:60
 msgid ""
 "The Debian packaging system has a large amount of information associated "
 "with each package to help assure that it integrates cleanly and easily into "
@@ -8587,8 +8629,8 @@ msgstr ""
 "ordentlich und leicht in das System integriert wird. Das bekannteste seiner "
 "Funktionen ist das Abhängigkeitssystem."
 
-#. type: <p></p>
-#: guide.sgml:52
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:65
 msgid ""
 "The dependency system allows individual programs to make use of shared "
 "elements in the system such as libraries. It simplifies placing infrequently "
@@ -8603,8 +8645,8 @@ msgstr ""
 "Durchschnittsanwender installieren sollte. Außerdem erlaubt es die Auswahl "
 "von Mail-Transport-Agenten, X-Servern und so weiter."
 
-#. type: <p></p>
-#: guide.sgml:57
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:72
 msgid ""
 "The first step to understanding the dependency system is to grasp the "
 "concept of a simple dependency. The meaning of a simple dependency is that a "
@@ -8617,8 +8659,8 @@ msgstr ""
 "benötigt, das zu gleichen Zeit installiert sein muss, um ordentlich zu "
 "funktionieren."
 
-#. type: <p></p>
-#: guide.sgml:63
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:77
 msgid ""
 "For instance, mailcrypt is an emacs extension that aids in encrypting email "
 "with GPG. Without GPGP installed mailcrypt is useless, so mailcrypt has a "
@@ -8631,8 +8673,8 @@ msgstr ""
 "eine Emacs-Erweiterung ist, hat es ebenfalls eine einfache Abhängigkeit von "
 "Emacs. Ohne Emacs ist es komplett unbenutzbar."
 
-#. type: <p></p>
-#: guide.sgml:73
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:83
 msgid ""
 "The other important dependency to understand is a conflicting dependency. It "
 "means that a package, when installed with another package, will not work and "
@@ -8654,8 +8696,8 @@ msgstr ""
 "in Konflikt stehende Abhängigkeiten mit allen anderen Mail-Transport-Agenten "
 "haben."
 
-#. type: <p></p>
-#: guide.sgml:83
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:93
 msgid ""
 "As an added complication there is the possibility for a package to pretend "
 "to be another package. Consider that exim and sendmail for many intents are "
@@ -8676,8 +8718,8 @@ msgstr ""
 "dass sie von einem Mail-Transport-Agenten abhängen. Die kann zu großer "
 "Verwirrung führen, wenn manuell versucht wird, Pakete zu reparieren."
 
-#. type: <p></p>
-#: guide.sgml:88
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:103
 msgid ""
 "At any given time a single dependency may be met by packages that are "
 "already installed or it may not be. APT attempts to help resolve dependency "
@@ -8690,77 +8732,85 @@ msgstr ""
 "Algorithmen bereitstellt, die bei der Auswahl von Paketen zur Installation "
 "helfen."
 
-#. type: <heading></heading>
-#: guide.sgml:96
+#. type: Content of: <book><chapter><title>
+#: guide.dbk:112
 msgid "apt-get"
 msgstr "apt-get"
 
-#. type: <p></p>
-#: guide.sgml:102
-msgid ""
-"<prgn>apt-get</prgn> provides a simple way to install packages from the "
-"command line. Unlike <prgn>dpkg</prgn>, <prgn>apt-get</prgn> does not "
-"understand .deb files, it works with the package's proper name and can only "
-"install .deb archives from a <em>Source</em>."
-msgstr ""
-"<prgn>apt-get</prgn> stellt eine einfache Möglichkeit zu Verfügung, Pakete "
-"auf der Befehlszeile zu installieren. Anders als <prgn>dpkg</prgn> versteht "
-"<prgn>apt-get</prgn> keine .deb-Dateien. Es arbeitet mit dem Eigennamen des "
-"Pakets und kann .deb-Archive nur aus einer <em>Quelle</em> installieren."
-
-#. type: <p></p>
-#: guide.sgml:109
-msgid ""
-"The first <footnote><p>If you are using an http proxy server you must set "
-"the http_proxy environment variable first, see sources.list(5)</p></"
-"footnote> thing that should be done before using <prgn>apt-get</prgn> is to "
-"fetch the package lists from the <em>Sources</em> so that it knows what "
-"packages are available. This is done with <tt>apt-get update</tt>. For "
-"instance,"
-msgstr ""
-"Das Erste <footnote><p>Falls Sie einen HTTP-Proxy-Server benutzen, müssen "
-"Sie zuerst die Umgebungsvariable »http_proxy« setzen, siehe sources.list(5)</"
-"p></footnote>, das Sie vor der Benutzung von <prgn>apt-get</prgn> tun "
-"sollten, ist es, die Paketlisten von der <em>Quelle</em> herunterzuladen, so "
-"dass es weiß, welche Pakete verfügbar sind. Dies wird mit <tt>apt-get "
-"update</tt> erledigt. Zum Beispiel,"
-
-#. type: <example></example>
-#: guide.sgml:116
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:114
+msgid ""
+"<command>apt-get</command> provides a simple way to install packages from "
+"the command line. Unlike <command>dpkg</command>, <command>apt-get</command> "
+"does not understand .deb files, it works with the package's proper name and "
+"can only install .deb archives from a <emphasis>Source</emphasis>."
+msgstr ""
+"<command>apt-get</command> stellt eine einfache Möglichkeit zu Verfügung, "
+"Pakete auf der Befehlszeile zu installieren. Anders als <command>dpkg</"
+"command> versteht <command>apt-get</command> keine .deb-Dateien. Es arbeitet "
+"mit dem Eigennamen des Pakets und kann .deb-Archive nur aus einer "
+"<emphasis>Quelle</emphasis> installieren."
+
+#. type: Content of: <book><chapter><para><footnote><para>
+#: guide.dbk:120
+msgid ""
+"If you are using an http proxy server you must set the http_proxy "
+"environment variable first, see sources.list(5)"
+msgstr ""
+"Falls Sie einen HTTP-Proxy-Server benutzen, müssen Sie zuerst die "
+"Umgebungsvariable »http_proxy« setzen, siehe sources.list(5)"
+
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:120
+msgid ""
+"The first <placeholder type=\"footnote\" id=\"0\"/> thing that should be "
+"done before using <command>apt-get</command> is to fetch the package lists "
+"from the <emphasis>Sources</emphasis> so that it knows what packages are "
+"available. This is done with <literal>apt-get update</literal>. For instance,"
+msgstr ""
+"Das Erste <placeholder type=\"footnote\" id=\"0\"/>, das Sie vor der "
+"Benutzung von <command>apt-get</command> tun sollten, ist es, die "
+"Paketlisten von der <emphasis>Quelle</emphasis> herunterzuladen, so dass es "
+"weiß, welche Pakete verfügbar sind. Dies wird mit <literal>apt-get update</"
+"literal> erledigt. Zum Beispiel,"
+
+#. type: Content of: <book><chapter><screen>
+#: guide.dbk:128
 #, no-wrap
 msgid ""
 "# apt-get update\n"
 "Get http://ftp.de.debian.org/debian-non-US/ stable/binary-i386/ Packages\n"
 "Get http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n"
 "Reading Package Lists... Done\n"
-"Building Dependency Tree... Done"
+"Building Dependency Tree... Done\n"
 msgstr ""
 "# apt-get update\n"
 "OK   http://ftp.de.debian.org/debian-non-US/ stable/binary-i386/ Packages\n"
 "OK   http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n"
 "Paketlisten werden gelesen … Fertig\n"
-"Abhängigkeitsbaum wird aufgebaut … Fertig"
+"Abhängigkeitsbaum wird aufgebaut … Fertig\n"
 
-#. type: <p><taglist>
-#: guide.sgml:120
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:135
 msgid "Once updated there are several commands that can be used:"
 msgstr "Einmal aktualisiert stehen mehrere Befehl zur Benutzung zur Verfügung:"
 
-#. type: <tag></tag>
-#: guide.sgml:121
+#. type: Content of: <book><chapter><variablelist><varlistentry><term>
+#: guide.dbk:139
 msgid "upgrade"
 msgstr "upgrade"
 
-#. type: <p></p>
-#: guide.sgml:131
+#. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
+#: guide.dbk:142
 msgid ""
 "Upgrade will attempt to gently upgrade the whole system. Upgrade will never "
 "install a new package or remove an existing package, nor will it ever "
 "upgrade a package that might cause some other package to break. This can be "
 "used daily to relatively safely upgrade the system. Upgrade will list all of "
 "the packages that it could not upgrade, this usually means that they depend "
-"on new packages or conflict with some other package. <prgn>dselect</prgn> or "
-"<tt>apt-get install</tt> can be used to force these packages to install."
+"on new packages or conflict with some other package. <command>dselect</"
+"command> or <literal>apt-get install</literal> can be used to force these "
+"packages to install."
 msgstr ""
 "»Upgrade« wird versuchen, ein behutsames Upgrade des ganzen Systems "
 "durchzuführen. »Upgrade« wird niemals ein neues Paket installieren oder "
@@ -8769,17 +8819,17 @@ msgstr ""
 "ein relativ sicheres Upgrade des Systems durchzuführen. »Upgrade« wird alle "
 "Pakete auflisten, von denen es kein Upgrade durchführen kann, was "
 "üblicherweise bedeutet, dass sie von neuen Paketen abhängen oder Konflikte "
-"mit anderen Paketen haben. <prgn>dselect</prgn> oder <tt>apt-get install</"
-"tt> können benutzt werden, um die Installation von diesen Paketen zu "
-"erzwingen."
+"mit anderen Paketen haben. <command>dselect</command> oder <literal>apt-get "
+"install</literal> können benutzt werden, um die Installation von diesen "
+"Paketen zu erzwingen."
 
-#. type: <tag></tag>
-#: guide.sgml:131
+#. type: Content of: <book><chapter><variablelist><varlistentry><term>
+#: guide.dbk:154
 msgid "install"
 msgstr "install"
 
-#. type: <p></p>
-#: guide.sgml:140
+#. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
+#: guide.dbk:157
 msgid ""
 "Install is used to install packages by name. The package is automatically "
 "fetched and installed. This can be useful if you already know the name of "
@@ -8798,21 +8848,22 @@ msgstr ""
 "aufzulösen, wird eine Zusammenfassung ausgeben und nach einer Bestätigung "
 "fragen, wenn sich etwas anderes als dessen Argumente ändert."
 
-#. type: <tag></tag>
-#: guide.sgml:140
+#. type: Content of: <book><chapter><variablelist><varlistentry><term>
+#: guide.dbk:168
 msgid "dist-upgrade"
 msgstr "dist-upgrade"
 
-#. type: <p></p>
-#: guide.sgml:149
+#. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
+#: guide.dbk:171
 msgid ""
 "Dist-upgrade is a complete upgrader designed to simplify upgrading between "
 "releases of Debian. It uses a sophisticated algorithm to determine the best "
 "set of packages to install, upgrade and remove to get as much of the system "
 "to the newest release. In some situations it may be desired to use dist-"
 "upgrade rather than spend the time manually resolving dependencies in "
-"<prgn>dselect</prgn>. Once dist-upgrade has completed then <prgn>dselect</"
-"prgn> can be used to install any packages that may have been left out."
+"<command>dselect</command>. Once dist-upgrade has completed then "
+"<command>dselect</command> can be used to install any packages that may have "
+"been left out."
 msgstr ""
 "»Dist-upgrade« führt vollständige Upgrades durch. Es wurde entworfen, um "
 "Upgrades zwischen Releases von Debian zu vereinfachen. Es benutzt einen "
@@ -8820,13 +8871,13 @@ msgstr ""
 "Installieren, für das Upgrade oder zum Entfernen festzulegen, um soviel wie "
 "möglich vom System auf das neuste Release zu bekommen. In einigen "
 "Situationen könnte es eher gewünscht sein, »dist-upgrade« zu benutzen, als "
-"Zeit in das manuelle Auflösen von Abhängigkeiten in <prgn>dselect</prgn> zu "
-"investieren. Ist »Dist-upgrade« erst vollständig, dann kann <prgn>dselect</"
-"prgn> benutzt werden, um einige Pakete zu installieren, die außen vor "
-"geblieben sind."
+"Zeit in das manuelle Auflösen von Abhängigkeiten in <command>dselect</"
+"command> zu investieren. Ist »Dist-upgrade« erst vollständig, dann kann "
+"<command>dselect</command> benutzt werden, um einige Pakete zu installieren, "
+"die außen vor geblieben sind."
 
-#. type: <p></p>
-#: guide.sgml:152
+#. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
+#: guide.dbk:181
 msgid ""
 "It is important to closely look at what dist-upgrade is going to do, its "
 "decisions may sometimes be quite surprising."
@@ -8834,168 +8885,167 @@ msgstr ""
 "Es ist wichtig, genau zu schauen, was »Dist-upgrade« tun wird, seine "
 "Entscheidungen können manchmal ziemlich überraschend sein."
 
-#. type: <p></p>
-#: guide.sgml:163
-#, fuzzy
-#| msgid ""
-#| "<prgn>apt-get</prgn> has several command line options that are detailed "
-#| "in its man page, <manref name=\"apt-get\" section=\"8\">. The most useful "
-#| "option is <tt>-d</tt> which does not install the fetched files. If the "
-#| "system has to download a large number of package it would be undesired to "
-#| "start installing them in case something goes wrong. When <tt>-d</tt> is "
-#| "used the downloaded archives can be installed by simply running the "
-#| "command that caused them to be downloaded again without <tt>-d</tt>."
-msgid ""
-"<prgn>apt-get</prgn> has several command line options that are detailed in "
-"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful "
-"option is <tt>-d</tt> which does not install the fetched files. If the "
-"system has to download a large number of package it would be undesired to "
-"start installing them in case something goes wrong. When <tt>-d</tt> is used "
-"the downloaded archives can be installed by simply running the command that "
-"caused them to be downloaded again without <tt>-d</tt>."
-msgstr ""
-"<prgn>apt-get</prgn> hat mehrere Befehlszeilenoptionen, die sich detailliert "
-"in dessen Handbuchseite, <manref name=\"apt-get\" section=\"8\"> finden. Die "
-"nützlichste Option ist <tt>-d</tt>, die die heruntergeladenen Dateien nicht "
-"installiert. Falls das System eine große Anzahl Pakete herunterladen soll, "
-"würde es nicht erwünscht sein, wenn die Installation in dem Fall gestartet "
-"würde, wenn etwas schief läuft. Falls <tt>-d</tt> benutzt wird, können die "
-"heruntergeladenen Archive dadurch installiert werden, indem einfach der "
-"Befehl, der das Herunterladen veranlasste, erneut ohne <tt>-d</tt> ausführt "
-"wird."
-
-#. type: <heading></heading>
-#: guide.sgml:168
+# s/package/packages/
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:188
+msgid ""
+"<command>apt-get</command> has several command line options that are "
+"detailed in its man page, <citerefentry><refentrytitle>apt-get</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>. The most useful "
+"option is <literal>-d</literal> which does not install the fetched files. If "
+"the system has to download a large number of package it would be undesired "
+"to start installing them in case something goes wrong. When <literal>-d</"
+"literal> is used the downloaded archives can be installed by simply running "
+"the command that caused them to be downloaded again without <literal>-d</"
+"literal>."
+msgstr ""
+"<command>apt-get</command> hat mehrere Befehlszeilenoptionen, die sich "
+"detailliert in seiner Handbuchseite, <citerefentry><refentrytitle>apt-get</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry> finden. Die "
+"nützlichste Option ist <literal>-d</literal>, die die heruntergeladenen "
+"Dateien nicht installiert. Falls das System eine große Anzahl Pakete "
+"herunterladen soll, würde es nicht erwünscht sein, wenn die Installation "
+"auch in dem Fall gestartet würde, dass etwas schief läuft. Falls <literal>-"
+"d</literal> benutzt wird, können die heruntergeladenen Archive dadurch "
+"installiert werden, indem einfach der Befehl, der das Herunterladen "
+"veranlasste, erneut ohne <literal>-d</literal> ausgeführt wird."
+
+#. type: Content of: <book><chapter><title>
+#: guide.dbk:200
 msgid "DSelect"
 msgstr "DSelect"
 
-#. type: <p></p>
-#: guide.sgml:173
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:202
 msgid ""
-"The APT <prgn>dselect</prgn> method provides the complete APT system with "
-"the <prgn>dselect</prgn> package selection GUI. <prgn>dselect</prgn> is used "
-"to select the packages to be installed or removed and APT actually installs "
-"them."
+"The APT <command>dselect</command> method provides the complete APT system "
+"with the <command>dselect</command> package selection GUI. <command>dselect</"
+"command> is used to select the packages to be installed or removed and APT "
+"actually installs them."
 msgstr ""
-"Die APT-<prgn>dselect</prgn>-Methode stellt das komplette APT-System mit dem "
-"<prgn>dselect</prgn>-Paketauswahl-GUI bereit. <prgn>dselect</prgn> wird "
-"benutzt, um Pakete zum Installieren oder Entfernen auszuwählen und APT "
-"installiert sie tatsächlich."
+"Die APT-<command>dselect</command>-Methode stellt das komplette APT-System "
+"mit dem <command>dselect</command>-Paketauswahl-GUI bereit. "
+"<command>dselect</command> wird benutzt, um Pakete zum Installieren oder "
+"Entfernen auszuwählen und APT installiert sie tatsächlich."
 
-#. type: <p></p>
-#: guide.sgml:184
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:208
 msgid ""
-"To enable the APT method you need to select [A]ccess in <prgn>dselect</prgn> "
-"and then choose the APT method. You will be prompted for a set of "
-"<em>Sources</em> which are places to fetch archives from. These can be "
-"remote Internet sites, local Debian mirrors or CD-ROMs. Each source can "
-"provide a fragment of the total Debian archive, APT will automatically "
+"To enable the APT method you need to select [A]ccess in <command>dselect</"
+"command> and then choose the APT method. You will be prompted for a set of "
+"<emphasis>Sources</emphasis> which are places to fetch archives from. These "
+"can be remote Internet sites, local Debian mirrors or CD-ROMs. Each source "
+"can provide a fragment of the total Debian archive, APT will automatically "
 "combine them to form a complete set of packages. If you have a CD-ROM then "
 "it is a good idea to specify it first and then specify a mirror so that you "
 "have access to the latest bug fixes. APT will automatically use packages on "
 "your CD-ROM before downloading from the Internet."
 msgstr ""
-"Um die APT-Methode einzuschalten, müssen Sie [Z]ugriff in <prgn>dselect</"
-"prgn> auswählen und dann die APT-Methode wählen. Sie werden nach einer "
-"Zusammenstellung von <em>Quellen</em> gefragt. Dies sind Plätze, von denen "
-"Archive heruntergeladen werden. Dies können ferne Internetsites, lokale "
-"Debian-Spiegel oder CD-ROMs sein. Jede Quelle kann einen Ausschnitt des "
-"gesamten Debian-Archives bereitstellen. APT wird sie automatisch "
+"Um die APT-Methode einzuschalten, müssen Sie [Z]ugriff in <command>dselect</"
+"command> auswählen und dann die APT-Methode wählen. Sie werden nach einer "
+"Zusammenstellung von <emphasis>Quellen</emphasis> gefragt. Dies sind Plätze, "
+"von denen Archive heruntergeladen werden. Dies können ferne Internetsites, "
+"lokale Debian-Spiegel oder CD-ROMs sein. Jede Quelle kann einen Ausschnitt "
+"des gesamten Debian-Archives bereitstellen. APT wird sie automatisch "
 "kombinieren, um eine komplette Zusammenstellung von Paketen zu formen. Falls "
 "Sie eine CD-ROM haben, ist es eine gute Idee, sie als erstes und dann den "
 "Spiegel anzugeben, so dass Sie Zugriff auf die neusten Fehlerbehebungen "
 "haben. APT wird automatisch Pakete auf der CD-ROM benutzen, bevor es sie aus "
 "dem Internet herunterlädt."
 
-#. type: <example></example>
-#: guide.sgml:198
+#. type: Content of: <book><chapter><screen>
+#: guide.dbk:219
 #, no-wrap
 msgid ""
 "   Set up a list of distribution source locations\n"
-"\t \n"
+"\n"
 " Please give the base URL of the debian distribution.\n"
 " The access schemes I know about are: http file\n"
-"\t   \n"
+"\n"
 " For example:\n"
 "      file:/mnt/debian,\n"
 "      ftp://ftp.debian.org/debian,\n"
 "      http://ftp.de.debian.org/debian,\n"
-"      \n"
-"      \n"
-" URL [http://llug.sep.bnl.gov/debian]:"
+"\n"
+"\n"
+" URL [http://llug.sep.bnl.gov/debian]:\n"
 msgstr ""
 "   eine Liste mit Orten von Distributionsquellen einrichten\n"
-"\t \n"
+"\n"
 " Bitte geben Sie die Basis-URL der Debian-Distribution an.\n"
 " Die bekannten Zugriffsschemata dafür sind: http file\n"
-"\t   \n"
+"\n"
 " Zum Beispiel:\n"
 "      file:/mnt/debian,\n"
 "      ftp://ftp.debian.org/debian,\n"
 "      http://ftp.de.debian.org/debian,\n"
-"      \n"
-"      \n"
-" URL [http://llug.sep.bnl.gov/debian]:"
+"\n"
+"\n"
+" URL [http://llug.sep.bnl.gov/debian]:\n"
 
-#. type: <p></p>
-#: guide.sgml:205
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:233
 msgid ""
-"The <em>Sources</em> setup starts by asking for the base of the Debian "
-"archive, defaulting to a HTTP mirror. Next it asks for the distribution to "
-"get."
+"The <emphasis>Sources</emphasis> setup starts by asking for the base of the "
+"Debian archive, defaulting to a HTTP mirror. Next it asks for the "
+"distribution to get."
 msgstr ""
-"Das Einrichten der <em>Quellen</em> beginnt durch das Erfragen der Basis des "
-"Debian-Archives, vorgegeben ist ein HTTP-Spiegel. Als nächstes wird nach der "
-"zu erhaltenden Distribution gefragt."
+"Das Einrichten der <emphasis>Quellen</emphasis> beginnt durch das Erfragen "
+"der Basis des Debian-Archives, vorgegeben ist ein HTTP-Spiegel. Als nächstes "
+"wird nach der zu erhaltenden Distribution gefragt."
 
-#. type: <example></example>
-#: guide.sgml:212
+#. type: Content of: <book><chapter><screen>
+#: guide.dbk:238
 #, no-wrap
 msgid ""
 " Please give the distribution tag to get or a path to the\n"
 " package file ending in a /. The distribution\n"
 " tags are typically something like: stable unstable testing non-US\n"
-"   \n"
-" Distribution [stable]:"
-msgstr ""
-" Bitte geben Sie die zu erhaltende Distributionskennzeichnung oder den mit  einem / endenden Pfad zum Paket an. Die Distributionskennzeichnungen sind  normalerweise etwas wie: stable unstable testing non-US\n"
-"   \n"
-" Distribution [stable]:"
-
-#. type: <p></p>
-#: guide.sgml:222
-msgid ""
-"The distribution refers to the Debian version in the archive, <em>stable</"
-"em> refers to the latest released version and <em>unstable</em> refers to "
-"the developmental version. <em>non-US</em> is only available on some mirrors "
-"and refers to packages that contain encryption technology or other things "
-"that cannot be exported from the United States. Importing these packages "
-"into the US is legal however."
-msgstr ""
-"Die Distribution bezieht sich auf die Debian-Version im Archiv, <em>stable</"
-"em> bezieht sich auf die zuletzt veröffentlichte Version und <em>unstable</"
-"em> bezieht sich auf die Entwicklungsversion. <em>non-US</em> ist nur auf "
-"einigen Spiegeln verfügbar und bezieht sich auf Pakete, die "
+"\n"
+" Distribution [stable]:\n"
+msgstr ""
+" Bitte geben Sie die zu erhaltende Distributionskennzeichnung oder den mit\n"
+" einem / endenden Pfad zum Paket an. Die Distributionskennzeichnungen sind\n"
+" normalerweise etwas wie: stable unstable testing non-US\n"
+"\n"
+" Distribution [stable]:\n"
+
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:245
+msgid ""
+"The distribution refers to the Debian version in the archive, "
+"<emphasis>stable</emphasis> refers to the latest released version and "
+"<emphasis>unstable</emphasis> refers to the developmental version. "
+"<emphasis>non-US</emphasis> is only available on some mirrors and refers to "
+"packages that contain encryption technology or other things that cannot be "
+"exported from the United States. Importing these packages into the US is "
+"legal however."
+msgstr ""
+"Die Distribution bezieht sich auf die Debian-Version im Archiv, "
+"<emphasis>stable</emphasis> bezieht sich auf die zuletzt veröffentlichte "
+"Version und <emphasis>unstable</emphasis> bezieht sich auf die "
+"Entwicklungsversion. <emphasis>non-US</emphasis> ist nur auf einigen "
+"Spiegeln verfügbar und bezieht sich auf Pakete, die "
 "Verschlüsselungstechnologie oder andere Dinge enthalten, die nicht aus den "
 "Vereinigten Staaten exportiert werden können. Diese Pakete in die USA zu "
 "importieren ist jedoch legal."
 
-#. type: <example></example>
-#: guide.sgml:228
+#. type: Content of: <book><chapter><screen>
+#: guide.dbk:254
 #, no-wrap
 msgid ""
 " Please give the components to get\n"
 " The components are typically something like: main contrib non-free\n"
-"  \n"
-" Components [main contrib non-free]:"
+"\n"
+" Components [main contrib non-free]:\n"
 msgstr ""
 " Bitte geben Sie die Komponenten an, die Sie erhalten möchten\n"
 " Die Komponenten sind normalerweise etwas wie: »main« »contrib« »non-free«\n"
-"  \n"
-" Komponenten [main contrib non-free]:"
+"\n"
+" Komponenten [main contrib non-free]:\n"
 
-#. type: <p></p>
-#: guide.sgml:236
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:260
 msgid ""
 "The components list refers to the list of sub distributions to fetch. The "
 "distribution is split up based on software licenses, main being DFSG free "
@@ -9008,8 +9058,8 @@ msgstr ""
 "»Contrib« und »Non-free« Dinge enthalten, die verschiedene Einschränkungen "
 "in ihrer Benutzung und ihren Vertrieb haben."
 
-#. type: <p></p>
-#: guide.sgml:240
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:266
 msgid ""
 "Any number of sources can be added, the setup script will continue to prompt "
 "until you have specified all that you want."
@@ -9018,24 +9068,24 @@ msgstr ""
 "wird mit Nachfragen fortfahren, bis Sie alles angegeben haben, was Sie "
 "möchten."
 
-#. type: <p></p>
-#: guide.sgml:247
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:270
 msgid ""
-"Before starting to use <prgn>dselect</prgn> it is necessary to update the "
-"available list by selecting [U]pdate from the menu. This is a superset of "
-"<tt>apt-get update</tt> that makes the fetched information available to "
-"<prgn>dselect</prgn>. [U]pdate must be performed even if <tt>apt-get update</"
-"tt> has been run before."
+"Before starting to use <command>dselect</command> it is necessary to update "
+"the available list by selecting [U]pdate from the menu. This is a superset "
+"of <literal>apt-get update</literal> that makes the fetched information "
+"available to <command>dselect</command>. [U]pdate must be performed even if "
+"<literal>apt-get update</literal> has been run before."
 msgstr ""
-"Bevor sie beginnen, <prgn>dselect</prgn> zu benutzen, ist es notwendig, die "
-"Verfügbarkeitsliste zu aktualisieren, indem sie aus dem Menü [E]rneuern "
-"auswählen. Dies ist eine Obermenge von <tt>apt-get update</tt>, das "
-"<prgn>dselect</prgn> heruntergeladene Informationen zur Verfügung stellt. "
-"[E]rneuern muss auch dann durchgeführt werden, wenn vorher <tt>apt-get "
-"update</tt> ausgeführt wurde."
+"Bevor sie beginnen, <command>dselect</command> zu benutzen, ist es "
+"notwendig, die Verfügbarkeitsliste zu aktualisieren, indem sie aus dem Menü "
+"[E]rneuern auswählen. Dies ist eine Obermenge von <literal>apt-get update</"
+"literal>, das <command>dselect</command> heruntergeladene Informationen zur "
+"Verfügung stellt. [E]rneuern muss auch dann durchgeführt werden, wenn vorher "
+"<literal>apt-get update</literal> ausgeführt wurde."
 
-#. type: <p></p>
-#: guide.sgml:253
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:277
 msgid ""
 "You can then go on and make your selections using [S]elect and then perform "
 "the installation using [I]nstall. When using the APT method the [C]onfig and "
@@ -9047,76 +9097,84 @@ msgstr ""
 "benutzen, haben die Befehle Kon[f]ig. und [L]öschen keine Bedeutung, der "
 "Befehl [I]nstall. führt beides gleichermaßen aus."
 
-#. type: <p></p>
-#: guide.sgml:258
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:283
 msgid ""
 "By default APT will automatically remove the package (.deb) files once they "
-"have been successfully installed. To change this behavior place <tt>Dselect::"
-"clean \"prompt\";</tt> in /etc/apt/apt.conf."
+"have been successfully installed. To change this behavior place "
+"<literal>Dselect::clean \"prompt\";</literal> in /etc/apt/apt.conf."
 msgstr ""
 "Standardmäßig wird APT automatisch die Paketdateien (.deb) entfernen, sobald "
 "sie erfolgreich installiert sind. Um dieses Verhalten zu ändern, platzieren "
-"Sie <tt>Dselect::clean \"prompt\";</tt> in /etc/apt/apt.conf."
+"Sie <literal>Dselect::clean \"prompt\";</literal> in /etc/apt/apt.conf."
 
-#. type: <heading></heading>
-#: guide.sgml:264
+#. type: Content of: <book><chapter><title>
+#: guide.dbk:289
 msgid "The Interface"
 msgstr "Die Schnittstelle"
 
-#. type: <p></p>
-#: guide.sgml:278
+#. type: Content of: <book><chapter><para><footnote><para>
+#: guide.dbk:293
+msgid ""
+"The <command>dselect</command> method actually is a set of wrapper scripts "
+"to <command>apt-get</command>. The method actually provides more "
+"functionality than is present in <command>apt-get</command> alone."
+msgstr ""
+"Die Methode <command>dselect</command> ist tatsächlich eine Zusammenstellung "
+"von Wrapper-Skripten für <command>apt-get</command>. Die Methode stellt "
+"tatsächlich mehr Funktionalitäten bereit, als in <command>apt-get</command> "
+"allein vorhanden sind."
+
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:291
 msgid ""
-"Both that APT <prgn>dselect</prgn> method and <prgn>apt-get</prgn> share the "
-"same interface. It is a simple system that generally tells you what it will "
-"do and then goes and does it. <footnote><p>The <prgn>dselect</prgn> method "
-"actually is a set of wrapper scripts to <prgn>apt-get</prgn>. The method "
-"actually provides more functionality than is present in <prgn>apt-get</prgn> "
-"alone.</p></footnote> After printing out a summary of what will happen APT "
+"Both that APT <command>dselect</command> method and <command>apt-get</"
+"command> share the same interface. It is a simple system that generally "
+"tells you what it will do and then goes and does it. <placeholder type="
+"\"footnote\" id=\"0\"/> After printing out a summary of what will happen APT "
 "then will print out some informative status messages so that you can "
 "estimate how far along it is and how much is left to do."
 msgstr ""
-"Sowohl die APT-Methode <prgn>dselect</prgn>, als auch <prgn>apt-get</prgn> "
-"teilen sich die gleiche Schnittstelle. Es ist ein einfaches System, das "
-"üblicherweise mitteilt, was es tun wird und es dann tut. <footnote><p>Die "
-"Methode <prgn>dselect</prgn> ist tatsächlich eine Zusammenstellung von "
-"Wrapper-Skripten für <prgn>apt-get</prgn>. Die Methode stellt tatsächlich "
-"mehr Funktionalitäten bereit, als in <prgn>apt-get</prgn> allein vorhanden "
-"sind.</p></footnote> Nach der Ausgabe einer Zusammenfassung was passieren "
-"wird, gibt APT einige informative Statusmeldungen aus, so dass Sie "
-"abschätzen können, wie weit es ist und wieviel noch zu tun ist."
-
-#. type: <heading></heading>
-#: guide.sgml:280
+"Sowohl die APT-Methode <command>dselect</command>, als auch <command>apt-"
+"get</command> teilen sich die gleiche Schnittstelle. Es ist ein einfaches "
+"System, das üblicherweise mitteilt, was es tun wird und es dann tut. "
+"<placeholder type=\"footnote\" id=\"0\"/> Nach der Ausgabe einer "
+"Zusammenfassung was passieren wird, gibt APT einige informative "
+"Statusmeldungen aus, so dass Sie abschätzen können, wie weit es ist und "
+"wieviel noch zu tun ist."
+
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:302
 msgid "Startup"
 msgstr "Anfang"
 
-#. type: <p></p>
-#: guide.sgml:284
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:304
 msgid ""
 "Before all operations except update, APT performs a number of actions to "
 "prepare its internal state. It also does some checks of the system's state. "
-"At any time these operations can be performed by running <tt>apt-get check</"
-"tt>."
+"At any time these operations can be performed by running <literal>apt-get "
+"check</literal>."
 msgstr ""
 "Vor allen Operationen, ausgenommen »update«, führt APT eine Reihe von "
 "Aktionen durch, um seinen internen Status vorzubereiten. Es macht außerdem "
 "einige Prüfungen des Systemstatus. Diese Operationen können jederzeit durch "
-"Ausführung von <tt>apt-get check</tt> durchgeführt werden."
+"Ausführung von <literal>apt-get check</literal> durchgeführt werden."
 
-#. type: <example></example>
-#: guide.sgml:289
+#. type: Content of: <book><chapter><section><screen>
+#: guide.dbk:310
 #, no-wrap
 msgid ""
 "# apt-get check\n"
 "Reading Package Lists... Done\n"
-"Building Dependency Tree... Done"
+"Building Dependency Tree... Done\n"
 msgstr ""
 "# apt-get check\n"
 "Paketlisten werden gelesen … Fertig\n"
-"Abhängigkeitsbaum wird aufgebaut … Fertig"
+"Abhängigkeitsbaum wird aufgebaut … Fertig\n"
 
-#. type: <p></p>
-#: guide.sgml:297
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:315
 msgid ""
 "The first thing it does is read all the package files into memory. APT uses "
 "a caching scheme so this operation will be faster the second time it is run. "
@@ -9129,22 +9187,22 @@ msgstr ""
 "gefunden werden, werden sie ignoriert und beim Beenden von Apt-get wird eine "
 "Warnung ausgegeben."
 
-#. type: <p></p>
-#: guide.sgml:303
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:321
 msgid ""
 "The final operation performs a detailed analysis of the system's "
 "dependencies. It checks every dependency of every installed or unpacked "
 "package and considers if it is OK. Should this find a problem then a report "
-"will be printed out and <prgn>apt-get</prgn> will refuse to run."
+"will be printed out and <command>apt-get</command> will refuse to run."
 msgstr ""
 "Die letzte Operation führt eine detaillierte Analyse der Abhängigkeiten des "
 "Systems durch. Sie prüft jede Abhängigkeit jedes installierten oder "
 "entpackten Pakets und berücksichtigt, ob es in Ordnung ist. Sollte sie ein "
-"Problem finden, dann wird eine Meldung ausgegeben und <prgn>apt-get</prgn> "
-"wird die Ausführung verweigern."
+"Problem finden, dann wird eine Meldung ausgegeben und <command>apt-get</"
+"command> wird die Ausführung verweigern."
 
-#. type: <example></example>
-#: guide.sgml:320
+#. type: Content of: <book><chapter><section><screen>
+#: guide.dbk:327
 #, no-wrap
 msgid ""
 "# apt-get check\n"
@@ -9154,14 +9212,14 @@ msgid ""
 "Sorry, but the following packages have unmet dependencies:\n"
 "  9fonts: Depends: xlib6g but it is not installed\n"
 "  uucp: Depends: mailx but it is not installed\n"
-"  blast: Depends: xlib6g (>= 3.3-5) but it is not installed\n"
+"  blast: Depends: xlib6g (&gt;= 3.3-5) but it is not installed\n"
 "  adduser: Depends: perl-base but it is not installed\n"
 "  aumix: Depends: libgpmg1 but it is not installed\n"
 "  debiandoc-sgml: Depends: sgml-base but it is not installed\n"
-"  bash-builtins: Depends: bash (>= 2.01) but 2.0-3 is installed\n"
+"  bash-builtins: Depends: bash (&gt;= 2.01) but 2.0-3 is installed\n"
 "  cthugha: Depends: svgalibg1 but it is not installed\n"
-"           Depends: xlib6g (>= 3.3-5) but it is not installed\n"
-"  libreadlineg2: Conflicts:libreadline2 (<< 2.1-2.1)"
+"           Depends: xlib6g (&gt;= 3.3-5) but it is not installed\n"
+"  libreadlineg2: Conflicts:libreadline2 (&lt;&lt; 2.1-2.1)\n"
 msgstr ""
 "# apt-get check\n"
 "Paketlisten werden gelesen … Fertig Fertig\n"
@@ -9171,17 +9229,17 @@ msgstr ""
 "Die folgenden Pakete haben nichterfüllte Abhängigkeiten:\n"
 "  9fonts: Hängt ab: xlib6g ist aber nicht installiert\n"
 "  uucp: Hängt ab: mailx ist aber nicht installiert\n"
-"  blast: Hängt ab: xlib6g (>= 3.3-5) ist aber nicht installiert\n"
+"  blast: Hängt ab: xlib6g (&gt;= 3.3-5) ist aber nicht installiert\n"
 "  adduser: Hängt ab: perl-base ist aber nicht installiert\n"
 "  aumix: Hängt ab: libgpmg1 ist aber nicht installiert\n"
 "  debiandoc-sgml: Hängt ab: sgml-base ist aber nicht installiert\n"
-"  bash-builtins: Hängt ab: bash (>= 2.01) but 2.0-3 ist installiert\n"
+"  bash-builtins: Hängt ab: bash (&gt;= 2.01) but 2.0-3 ist installiert\n"
 "  cthugha: Hängt ab: svgalibg1 ist aber nicht installiert\n"
-"           Hängt ab: xlib6g (>= 3.3-5) ist aber nicht installiert\n"
-"  libreadlineg2: Conflicts:libreadline2 (<< 2.1-2.1)"
+"           Hängt ab: xlib6g (&gt;= 3.3-5) ist aber nicht installiert\n"
+"  libreadlineg2: Conflicts:libreadline2 (&lt;&lt; 2.1-2.1)\n"
 
-#. type: <p></p>
-#: guide.sgml:329
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:344
 msgid ""
 "In this example the system has many problems, including a serious problem "
 "with libreadlineg2. For each package that has unmet dependencies a line is "
@@ -9195,87 +9253,98 @@ msgstr ""
 "Problem anzeigt und die Abhängigkeiten, die nicht erfüllt sind. Eine kurze "
 "Erklärung, warum das Paket ein Abhängigkeitsproblem hat, ist inbegriffen."
 
-#. type: <p></p>
-#: guide.sgml:337
+#. type: Content of: <book><chapter><section><para><footnote><para>
+#: guide.dbk:353
+msgid ""
+"APT however considers all known dependencies and attempts to prevent broken "
+"packages"
+msgstr ""
+"APT berücksichtigt jedoch alle bekannten Abhängigkeiten und versucht, "
+"kaputte Pakete zu vermeiden"
+
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:351
 msgid ""
 "There are two ways a system can get into a broken state like this. The first "
-"is caused by <prgn>dpkg</prgn> missing some subtle relationships between "
-"packages when performing upgrades. <footnote><p>APT however considers all "
-"known dependencies and attempts to prevent broken packages</p></footnote>. "
-"The second is if a package installation fails during an operation. In this "
-"situation a package may have been unpacked without its dependents being "
-"installed."
+"is caused by <command>dpkg</command> missing some subtle relationships "
+"between packages when performing upgrades. <placeholder type=\"footnote\" id="
+"\"0\"/>. The second is if a package installation fails during an operation. "
+"In this situation a package may have been unpacked without its dependents "
+"being installed."
 msgstr ""
 "Es gibt zwei Möglichkeiten, wie ein System in einen kaputten Status wie "
-"diesen kommen kann. Die erste wird dadurch verursacht, dass <prgn>dpkg</"
-"prgn> einige feine Beziehungen zwischen Paketen übersieht, wenn Upgrades "
-"durchgeführt werden. <footnote><p>APT berücksichtigt jedoch alle bekannten "
-"Abhängigkeiten und versucht, kaputte Pakete zu vermeiden</p></footnote>. Die "
-"zweite tritt auf, falls eine Paketinstallation während der Ausführung "
-"fehlschlägt. In dieser Situation könnte ein Paket entpackt worden sein, ohne "
-"dass die von ihm Abhängigen installiert sind."
+"diesen kommen kann. Die erste wird dadurch verursacht, dass <command>dpkg</"
+"command> einige feine Beziehungen zwischen Paketen übersieht, wenn Upgrades "
+"durchgeführt werden. <placeholder type=\"footnote\" id=\"0\"/>. Die zweite "
+"tritt auf, falls eine Paketinstallation während der Ausführung fehlschlägt. "
+"In dieser Situation könnte ein Paket entpackt worden sein, ohne dass die von "
+"ihm Abhängigen installiert sind."
 
-#. type: <p></p>
-#: guide.sgml:345
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:360
 msgid ""
 "The second situation is much less serious than the first because APT places "
 "certain constraints on the order that packages are installed. In both cases "
-"supplying the <tt>-f</tt> option to <prgn>apt-get</prgn> will cause APT to "
-"deduce a possible solution to the problem and then continue on. The APT "
-"<prgn>dselect</prgn> method always supplies the <tt>-f</tt> option to allow "
-"for easy continuation of failed maintainer scripts."
+"supplying the <literal>-f</literal> option to <command>apt-get</command> "
+"will cause APT to deduce a possible solution to the problem and then "
+"continue on. The APT <command>dselect</command> method always supplies the "
+"<literal>-f</literal> option to allow for easy continuation of failed "
+"maintainer scripts."
 msgstr ""
 "Die zweite Situation ist weit weniger ernst als die erste, weil APT "
 "bestimmte Beschränkungen in der Reihenfolge setzt, in der Pakete installiert "
-"werden. In beiden Fällen veranlasst die Option <tt>-f</tt> <prgn>apt-get</"
-"prgn>, eine mögliche Lösung für das Problem zu folgern und dann "
-"fortzufahren. Die APT-Methode <prgn>dselect</prgn> liefert immer die Option "
-"<tt>-f</tt>, zum einfachen Fortfahren von gescheiterten Betreuerskripten."
-
-#. type: <p></p>
-#: guide.sgml:351
-msgid ""
-"However, if the <tt>-f</tt> option is used to correct a seriously broken "
-"system caused by the first case then it is possible that it will either fail "
-"immediately or the installation sequence will fail. In either case it is "
-"necessary to manually use dpkg (possibly with forcing options) to correct "
-"the situation enough to allow APT to proceed."
-msgstr ""
-"Falls jedoch die Option <tt>-f</tt> benutzt wird, um ein ernsthaft kaputtes "
-"System zu korrigieren, das vom ersten Fall verursacht wurde, dann ist es "
-"möglich, dass es entweder sofort fehlschlägt oder die Installationsabfolge "
-"fehlschlagen wird. In beiden Fällen ist es nötig, Dpkg (möglicherweise mit "
-"erzwingenden Optionen) manuell zu benutzen, um die Situation ausreichend zu "
-"korrigieren, so dass es APT ermöglicht wird, fortzufahren."
-
-#. type: <heading></heading>
-#: guide.sgml:356
+"werden. In beiden Fällen veranlasst die Option <literal>-f</literal> "
+"<command>apt-get</command>, eine mögliche Lösung für das Problem zu folgern "
+"und dann fortzufahren. Die APT-Methode <command>dselect</command> liefert "
+"immer die Option <literal>-f</literal>, zum einfachen Fortfahren von "
+"gescheiterten Betreuerskripten."
+
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:369
+msgid ""
+"However, if the <literal>-f</literal> option is used to correct a seriously "
+"broken system caused by the first case then it is possible that it will "
+"either fail immediately or the installation sequence will fail. In either "
+"case it is necessary to manually use dpkg (possibly with forcing options) to "
+"correct the situation enough to allow APT to proceed."
+msgstr ""
+"Falls jedoch die Option <literal>-f</literal> benutzt wird, um ein ernsthaft "
+"kaputtes System zu korrigieren, das vom ersten Fall verursacht wurde, dann "
+"ist es möglich, dass es entweder sofort fehlschlägt oder die "
+"Installationsabfolge fehlschlagen wird. In beiden Fällen ist es nötig, Dpkg "
+"(möglicherweise mit erzwingenden Optionen) manuell zu benutzen, um die "
+"Situation ausreichend zu korrigieren, so dass es APT ermöglicht wird, "
+"fortzufahren."
+
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:377
 msgid "The Status Report"
 msgstr "Der Statusbericht"
 
-#. type: <p></p>
-#: guide.sgml:363
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:379
 msgid ""
-"Before proceeding <prgn>apt-get</prgn> will present a report on what will "
-"happen. Generally the report reflects the type of operation being performed "
-"but there are several common elements. In all cases the lists reflect the "
-"final state of things, taking into account the <tt>-f</tt> option and any "
-"other relevant activities to the command being executed."
+"Before proceeding <command>apt-get</command> will present a report on what "
+"will happen. Generally the report reflects the type of operation being "
+"performed but there are several common elements. In all cases the lists "
+"reflect the final state of things, taking into account the <literal>-f</"
+"literal> option and any other relevant activities to the command being "
+"executed."
 msgstr ""
-"Bevor es fortfährt, wird <prgn>apt-get</prgn> einen Bericht darüber "
+"Bevor es fortfährt, wird <command>apt-get</command> einen Bericht darüber "
 "präsentieren, was geschehen wird. Im Allgemeinen spiegelt der Bericht den "
 "Typ der Operation, die ausgeführt wird, wider, aber es gibt auch mehrere "
 "geläufige Elemente. Auf jeden Fall spiegelt die Liste den Endstatus der "
-"Dinge wider, bezieht die Option <tt>-f</tt> in Betracht und alle andere "
-"relevante Aktivitäten zum Befehl, der ausgeführt wird."
+"Dinge wider, bezieht die Option <literal>-f</literal> in Betracht und alle "
+"andere relevante Aktivitäten zum Befehl, der ausgeführt wird."
 
-#. type: <heading></heading>
-#: guide.sgml:364
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:386
 msgid "The Extra Package list"
 msgstr "Die zusätzliche Paketliste"
 
-#. type: <example></example>
-#: guide.sgml:372
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:388
 #, no-wrap
 msgid ""
 "The following extra packages will be installed:\n"
@@ -9283,87 +9352,87 @@ msgid ""
 "  mailpgp xdpkg fileutils pinepgp zlib1g xlib6g perl-base\n"
 "  bin86 libgdbm1 libgdbmg1 quake-lib gmp2 bcc xbuffy\n"
 "  squake pgp-i python-base debmake ldso perl libreadlineg2\n"
-"  ssh"
+"  ssh\n"
 msgstr ""
 "Die folgenden Pakete werden zusätzlich installiert:\n"
 "  libdbd-mysql-perl xlib6 zlib1 xzx libreadline2 libdbd-msql-perl\n"
 "  mailpgp xdpkg fileutils pinepgp zlib1g xlib6g perl-base\n"
 "  bin86 libgdbm1 libgdbmg1 quake-lib gmp2 bcc xbuffy\n"
 "  squake pgp-i python-base debmake ldso perl libreadlineg2\n"
-"  ssh"
+"  ssh\n"
 
-#. type: <p></p>
-#: guide.sgml:379
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:396
 msgid ""
 "The Extra Package list shows all of the packages that will be installed or "
 "upgraded in excess of the ones mentioned on the command line. It is only "
-"generated for an <tt>install</tt> command. The listed packages are often the "
-"result of an Auto Install."
+"generated for an <literal>install</literal> command. The listed packages are "
+"often the result of an Auto Install."
 msgstr ""
 "Die zusätzliche Paketliste zeigt alle Pakete, die installiert werden oder "
 "von denen ein Upgrade durchgeführt wird, zusätzlich zu den auf der "
-"Befehlszeile angegebenen. Sie wird nur für einen <tt>install</tt>-Befehl "
-"generiert. Die aufgelisteten Pakete sind häufig das Ergebnis einer "
+"Befehlszeile angegebenen. Sie wird nur für einen <literal>install</literal>-"
+"Befehl generiert. Die aufgelisteten Pakete sind häufig das Ergebnis einer "
 "automatischen Installation."
 
-#. type: <heading></heading>
-#: guide.sgml:382
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:403
 msgid "The Packages to Remove"
 msgstr "Die zu entfernenden Pakete"
 
-#. type: <example></example>
-#: guide.sgml:389
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:405
 #, no-wrap
 msgid ""
 "The following packages will be REMOVED:\n"
 "  xlib6-dev xpat2 tk40-dev xkeycaps xbattle xonix\n"
 "  xdaliclock tk40 tk41 xforms0.86 ghostview xloadimage xcolorsel\n"
 "  xadmin xboard perl-debug tkined xtetris libreadline2-dev perl-suid\n"
-"  nas xpilot xfig"
+"  nas xpilot xfig\n"
 msgstr ""
 "Die folgenden Pakete werden ENTFERNT:\n"
 "  xlib6-dev xpat2 tk40-dev xkeycaps xbattle xonix\n"
 "  xdaliclock tk40 tk41 xforms0.86 ghostview xloadimage xcolorsel\n"
 "  xadmin xboard perl-debug tkined xtetris libreadline2-dev perl-suid\n"
-"  nas xpilot xfig"
+"  nas xpilot xfig\n"
 
-#. type: <p></p>
-#: guide.sgml:399
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:412
 msgid ""
 "The Packages to Remove list shows all of the packages that will be removed "
 "from the system. It can be shown for any of the operations and should be "
 "given a careful inspection to ensure nothing important is to be taken off. "
-"The <tt>-f</tt> option is especially good at generating packages to remove "
-"so extreme care should be used in that case. The list may contain packages "
-"that are going to be removed because they are only partially installed, "
-"possibly due to an aborted installation."
+"The <literal>-f</literal> option is especially good at generating packages "
+"to remove so extreme care should be used in that case. The list may contain "
+"packages that are going to be removed because they are only partially "
+"installed, possibly due to an aborted installation."
 msgstr ""
 "Die Liste der zu entfernenden Pakete zeigt all die Pakete, die vom System "
 "entfernt werden. Sie kann für jede der Operationen angezeigt werden und "
 "sollte einer sorgfältige Überprüfung unterzogen werden, um sicherzustellen, "
-"dass nichts Wichtiges weggenommen wird. Die Option <tt>-f</tt> ist "
+"dass nichts Wichtiges weggenommen wird. Die Option <literal>-f</literal> ist "
 "insbesondere gut darin, Pakete zum Entfernen vorzumerken, so dass in diesem "
 "Fall mit extremer Vorsicht vorgegangen werden sollte. Die Liste könnte "
 "Pakete enthalten, die entfernt werden, weil sie nur teilweise installiert "
 "sind, möglicherweise aufgrund einer abgebrochenen Installation."
 
-#. type: <heading></heading>
-#: guide.sgml:402
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:422
 msgid "The New Packages list"
 msgstr "Die Liste neuer Pakete"
 
-#. type: <example></example>
-#: guide.sgml:406
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:424
 #, no-wrap
 msgid ""
 "The following NEW packages will installed:\n"
-"  zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base"
+"  zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base\n"
 msgstr ""
 "Die folgenden NEUEN Pakete werden zusätzlich installiert:\n"
-"  zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base"
+"  zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base\n"
 
-#. type: <p></p>
-#: guide.sgml:411
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:428
 msgid ""
 "The New Packages list is simply a reminder of what will happen. The packages "
 "listed are not presently installed in the system but will be when APT is "
@@ -9373,58 +9442,58 @@ msgstr ""
 "aufgelisteten Pakete sind zurzeit nicht auf dem System installiert, werden "
 "es aber sein, wenn APT fertig ist."
 
-#. type: <heading></heading>
-#: guide.sgml:414
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:433
 msgid "The Kept Back list"
 msgstr "Die Liste zurückgehaltener Pakete"
 
-#. type: <example></example>
-#: guide.sgml:419
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:435
 #, no-wrap
 msgid ""
 "The following packages have been kept back\n"
 "  compface man-db tetex-base msql libpaper svgalib1\n"
-"  gs snmp arena lynx xpat2 groff xscreensaver"
+"  gs snmp arena lynx xpat2 groff xscreensaver\n"
 msgstr ""
 "Die folgenden Pakete werden zurückgehalten:\n"
 "  compface man-db tetex-base msql libpaper svgalib1\n"
-"  gs snmp arena lynx xpat2 groff xscreensaver"
+"  gs snmp arena lynx xpat2 groff xscreensaver\n"
 
-#. type: <p></p>
-#: guide.sgml:428
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:440
 msgid ""
 "Whenever the whole system is being upgraded there is the possibility that "
 "new versions of packages cannot be installed because they require new things "
 "or conflict with already installed things. In this case the package will "
 "appear in the Kept Back list. The best way to convince packages listed there "
-"to install is with <tt>apt-get install</tt> or by using <prgn>dselect</prgn> "
-"to resolve their problems."
+"to install is with <literal>apt-get install</literal> or by using "
+"<command>dselect</command> to resolve their problems."
 msgstr ""
 "Jedesmal, wenn ein Upgrade des ganzen Systems durchgeführt wird, besteht die "
 "Möglichkeit, dass neue Versionen von Paketen nicht installiert werden "
 "können, weil sie neue Dinge benötigen oder einen Konflikt mit bereits "
 "installierten Dingen haben. In diesem Fall wird das Paket auf der Liste "
 "zurückgehaltener Pakete erscheinen. Der beste Weg dort aufgeführte Pakete "
-"zur Installation zu bewegen, ist per <tt>apt-get install</tt> oder indem "
-"<prgn>dselect</prgn> zum Lösen ihrer Probleme benutzt wird."
+"zur Installation zu bewegen, ist per <literal>apt-get install</literal> oder "
+"indem <command>dselect</command> zum Lösen ihrer Probleme benutzt wird."
 
-#. type: <heading></heading>
-#: guide.sgml:431
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:449
 msgid "Held Packages warning"
 msgstr "Warnung wegen zurückgehaltener Pakete"
 
-#. type: <example></example>
-#: guide.sgml:435
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:451
 #, no-wrap
 msgid ""
 "The following held packages will be changed:\n"
-"  cvs"
+"  cvs\n"
 msgstr ""
 "Die folgenden zurückgehaltenen Pakete werden geändert:\n"
-"  cvs"
+"  cvs\n"
 
-#. type: <p></p>
-#: guide.sgml:441
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:455
 msgid ""
 "Sometimes you can ask APT to install a package that is on hold, in such a "
 "case it prints out a warning that the held package is going to be changed. "
@@ -9435,33 +9504,33 @@ msgstr ""
 "zurückgehaltene Paket geändert wird. Dies sollte nur während »Dist-upgrade« "
 "oder »Install« vorkommen."
 
-#. type: <heading></heading>
-#: guide.sgml:444
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:461
 msgid "Final summary"
 msgstr "Abschließende Zusammenfassung"
 
-#. type: <p></p>
-#: guide.sgml:447
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:463
 msgid ""
 "Finally, APT will print out a summary of all the changes that will occur."
 msgstr ""
 "Abschließend wird APT eine Zusammenfassung aller Änderungen ausgeben, die "
 "auftreten werden."
 
-#. type: <example></example>
-#: guide.sgml:452
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:466
 #, no-wrap
 msgid ""
 "206 packages upgraded, 8 newly installed, 23 to remove and 51 not upgraded.\n"
 "12 packages not fully installed or removed.\n"
-"Need to get 65.7M/66.7M of archives. After unpacking 26.5M will be used."
+"Need to get 65.7M/66.7M of archives. After unpacking 26.5M will be used.\n"
 msgstr ""
 "206 Pakete aktualisiert, 8 zusätzlich installiert, 23 werden entfernt und 51 nicht aktualisiert.\n"
 "12 Pakete nicht vollständig installiert oder entfernt.\n"
-"Muss 65,7MB/66,7MB an Archiven herunterladen. Nach dem Entpacken werden 26,5MB zusätzlich belegt sein."
+"Muss 65,7MB/66,7MB an Archiven herunterladen. Nach dem Entpacken werden 26,5MB zusätzlich belegt sein.\n"
 
-#. type: <p></p>
-#: guide.sgml:470
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:471
 msgid ""
 "The first line of the summary simply is a reduced version of all of the "
 "lists and includes the number of upgrades - that is packages already "
@@ -9491,8 +9560,8 @@ msgstr ""
 "Speicher nachdem alles erledigt ist. Wenn eine große Anzahl Pakete entfernt "
 "wird, dann kann der Wert den Betrag des freiwerdenden Speichers anzeigen."
 
-#. type: <p></p>
-#: guide.sgml:473
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:485
 msgid ""
 "Some other reports can be generated by using the -u option to show packages "
 "to upgrade, they are similar to the previous examples."
@@ -9501,13 +9570,13 @@ msgstr ""
 "werden, um Pakete anzuzeigen, von denen ein Upgrade durchgeführt werden "
 "soll. Dies ist den vorherigen Beispielen ähnlich."
 
-#. type: <heading></heading>
-#: guide.sgml:477
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:492
 msgid "The Status Display"
 msgstr "Der Anzeigestatus"
 
-#. type: <p></p>
-#: guide.sgml:481
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:494
 msgid ""
 "During the download of archives and package files APT prints out a series of "
 "status messages."
@@ -9515,8 +9584,8 @@ msgstr ""
 "Während des Herunterladens von Archiven und Paketdateien gibt APT eine Reihe "
 "von Statusmeldungen aus."
 
-#. type: <example></example>
-#: guide.sgml:490
+#. type: Content of: <book><chapter><section><screen>
+#: guide.dbk:498
 #, no-wrap
 msgid ""
 "# apt-get update\n"
@@ -9525,7 +9594,7 @@ msgid ""
 "Hit http://llug.sep.bnl.gov/debian/ testing/main Packages\n"
 "Get:4 http://ftp.de.debian.org/debian-non-US/ unstable/binary-i386/ Packages\n"
 "Get:5 http://llug.sep.bnl.gov/debian/ testing/non-free Packages\n"
-"11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s"
+"11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s\n"
 msgstr ""
 "# apt-get update\n"
 "Hole:1 http://ftp.de.debian.org/debian-non-US/ stable/non-US/ Packages\n"
@@ -9533,69 +9602,71 @@ msgstr ""
 "Treffer http://llug.sep.bnl.gov/debian/ testing/main Packages\n"
 "Hole:4 http://ftp.de.debian.org/debian-non-US/ unstable/binary-i386/ Packages\n"
 "Hole:5 http://llug.sep.bnl.gov/debian/ testing/non-free Packages\n"
-"11% [5 testing/non-free 'Warte auf Datei' 0/32.1k 0%] 2203b/s 1m52s"
+"11% [5 testing/non-free 'Warte auf Datei' 0/32.1k 0%] 2203b/s 1m52s\n"
 
-#. type: <p></p>
-#: guide.sgml:500
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:507
 msgid ""
-"The lines starting with <em>Get</em> are printed out when APT begins to "
-"fetch a file while the last line indicates the progress of the download. The "
-"first percent value on the progress line indicates the total percent done of "
-"all files. Unfortunately since the size of the Package files is unknown "
-"<tt>apt-get update</tt> estimates the percent done which causes some "
-"inaccuracies."
+"The lines starting with <emphasis>Get</emphasis> are printed out when APT "
+"begins to fetch a file while the last line indicates the progress of the "
+"download. The first percent value on the progress line indicates the total "
+"percent done of all files. Unfortunately since the size of the Package files "
+"is unknown <literal>apt-get update</literal> estimates the percent done "
+"which causes some inaccuracies."
 msgstr ""
-"Die Zeilen, die mit <em>Hole</em> beginnen, werden ausgegeben, wenn APT "
-"anfängt, eine Datei herunterzuladen, während die letzte Zeile den "
+"Die Zeilen, die mit <emphasis>Hole</emphasis> beginnen, werden ausgegeben, "
+"wenn APT anfängt, eine Datei herunterzuladen, während die letzte Zeile den "
 "Fortschritt des Herunterladens anzeigt. Die erste Prozentzahl der "
 "Fortschrittszeile zeigt die gesamt erledigte Prozentzahl aller Dateien an. "
-"Unglücklicherweise schätzt <tt>apt-get update</tt> die erledigte "
+"Unglücklicherweise schätzt <literal>apt-get update</literal> die erledigte "
 "Prozentzahl, da die Größe der Pakete unbekannt ist, was einige "
 "Ungenauigkeiten bewirkt."
 
-#. type: <p></p>
-#: guide.sgml:509
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:515
 msgid ""
 "The next section of the status line is repeated once for each download "
 "thread and indicates the operation being performed and some useful "
 "information about what is happening. Sometimes this section will simply read "
-"<em>Forking</em> which means the OS is loading the download module. The "
-"first word after the [ is the fetch number as shown on the history lines. "
-"The next word is the short form name of the object being downloaded. For "
-"archives it will contain the name of the package that is being fetched."
+"<emphasis>Forking</emphasis> which means the OS is loading the download "
+"module. The first word after the [ is the fetch number as shown on the "
+"history lines. The next word is the short form name of the object being "
+"downloaded. For archives it will contain the name of the package that is "
+"being fetched."
 msgstr ""
 "Der nächste Abschnitt der Statuszeile wird für jeden Download-Thread "
 "wiederholt und zeigt die durchgeführte Operation, sowie einige nützliche "
 "Informationen darüber an was geschieht. Manchmal wird dieser Abschnitt "
-"einfach nur <em>Forking</em> darstellen, was bedeutet, dass das "
+"einfach nur <emphasis>Forking</emphasis> darstellen, was bedeutet, dass das "
 "Betriebssystem das Download-Modul am Laden ist. Das erste Wort nach dem »[« "
 "ist die Ladenummer, wie sie auf den Verlaufszeilen angezeigt wird. Das "
 "nächste Wort ist Name in Kurzform des Ojektes, das heruntergeladen wird. Für "
 "Archive wird es den Namen des Paketes enthalten, das heruntergeladen wird."
 
-#. type: <p></p>
-#: guide.sgml:524
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:525
 msgid ""
 "Inside of the single quote is an informative string indicating the progress "
 "of the negotiation phase of the download. Typically it progresses from "
-"<em>Connecting</em> to <em>Waiting for file</em> to <em>Downloading</em> or "
-"<em>Resuming</em>. The final value is the number of bytes downloaded from "
-"the remote site. Once the download begins this is represented as "
-"<tt>102/10.2k</tt> indicating that 102 bytes have been fetched and 10.2 "
-"kilobytes is expected. The total size is always shown in 4 figure notation "
-"to preserve space. After the size display is a percent meter for the file "
-"itself. The second last element is the instantaneous average speed. This "
-"values is updated every 5 seconds and reflects the rate of data transfer for "
-"that period. Finally is shown the estimated transfer time. This is updated "
-"regularly and reflects the time to complete everything at the shown transfer "
-"rate."
+"<emphasis>Connecting</emphasis> to <emphasis>Waiting for file</emphasis> to "
+"<emphasis>Downloading</emphasis> or <emphasis>Resuming</emphasis>. The final "
+"value is the number of bytes downloaded from the remote site. Once the "
+"download begins this is represented as <literal>102/10.2k</literal> "
+"indicating that 102 bytes have been fetched and 10.2 kilobytes is expected. "
+"The total size is always shown in 4 figure notation to preserve space. After "
+"the size display is a percent meter for the file itself. The second last "
+"element is the instantaneous average speed. This values is updated every 5 "
+"seconds and reflects the rate of data transfer for that period. Finally is "
+"shown the estimated transfer time. This is updated regularly and reflects "
+"the time to complete everything at the shown transfer rate."
 msgstr ""
 "Innerhalb von einzelnen Anführungszeichen folgt eine informative "
 "Zeichenkette, die den Fortschritt der Übertragungsphase des Downloads "
-"anzeigt. Normalerweise schreitet sie fort von <em>Verbinde</em> zu <em>Warte "
-"auf Datei</em> zu <em>Lade herunter</em> oder <em>Nehme wieder auf</em>. Der "
-"letzte Wert ist die Anzahl der von der fernen Site heruntergeladenen Bytes. "
-"Sobald der Download beginnt, zeigt sich dies wie <tt>102/10.2k</tt> was "
+"anzeigt. Normalerweise schreitet sie fort von <emphasis>Verbinde</emphasis> "
+"zu <emphasis>Warte auf Datei</emphasis> zu <emphasis>Lade herunter</"
+"emphasis> oder <emphasis>Nehme wieder auf</emphasis>. Der letzte Wert ist "
+"die Anzahl der von der fernen Site heruntergeladenen Bytes. Sobald der "
+"Download beginnt, zeigt sich dies wie <literal>102/10.2k</literal> was "
 "anzeigt, dass 102 Bytes heruntergeladen und 10,2 Kilobytes erwartet werden. "
 "Die Gesamtgröße wird immer in vierstelliger Schreibweise dargestellt, um "
 "Platz zu sparen. Nach der Größenanzeige ist eine Prozentangabe für die Datei "
@@ -9606,57 +9677,52 @@ msgstr ""
 "wird regelmäßig aktualisiert und spiegelt die Zeit zum Vervollständigen bei "
 "der angezeigten Datenübertragungsgeschwindigkeit wider."
 
-#. type: <p></p>
-#: guide.sgml:530
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:540
 msgid ""
 "The status display updates every half second to provide a constant feedback "
 "on the download progress while the Get lines scroll back whenever a new file "
 "is started. Since the status display is constantly updated it is unsuitable "
-"for logging to a file, use the <tt>-q</tt> option to remove the status "
-"display."
+"for logging to a file, use the <literal>-q</literal> option to remove the "
+"status display."
 msgstr ""
 "Die Statusanzeige aktualisiert sich alle halbe Sekunde, um eine gleichmäßige "
 "Rückmeldung über den Download-Fortschritt bereitzustellen, während die "
 "»Hole«-Zeilen bei jeder gestarteten neuen Datei zurückscrollen. Da die "
 "Statusanzeige ständig aktualisiert wird, ist sie für die Protokollierung in "
-"eine Datei ungeeignet. Benutzen Sie die Option <tt>-q</tt>, um die "
+"eine Datei ungeeignet. Benutzen Sie die Option <literal>-q</literal>, um die "
 "Statusanzeige zu entfernen."
 
-#. type: <heading></heading>
-#: guide.sgml:535
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:548
 msgid "Dpkg"
 msgstr "Dpkg"
 
-#. type: <p></p>
-#: guide.sgml:542
-msgid ""
-"APT uses <prgn>dpkg</prgn> for installing the archives and will switch over "
-"to the <prgn>dpkg</prgn> interface once downloading is completed. "
-"<prgn>dpkg</prgn> will also ask a number of questions as it processes the "
-"packages and the packages themselves may also ask several questions. Before "
-"each question there is usually a description of what it is asking and the "
-"questions are too varied to discuss completely here."
-msgstr ""
-"APT benutzt <prgn>dpkg</prgn>, um die Archive zu installieren und wird zu "
-"der <prgn>dpkg</prgn>-Schnittstelle herüberschalten, sobald der Download "
-"vollständig ist. <prgn>dpkg</prgn> wird außerdem eine Reihe von Fragen "
-"stellen, während es die Pakete abarbeitet und die Pakete können auch mehrere "
-"Fragen stellen . Vor jeder Frage ist üblicherweise eine Beschreibung des "
-"Gefragten und die Fragen sind zu vielfältig, um sie vollständig hier zu "
-"besprechen."
-
-#. type: <title></title>
-#: offline.sgml:4
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:550
+msgid ""
+"APT uses <command>dpkg</command> for installing the archives and will switch "
+"over to the <command>dpkg</command> interface once downloading is completed. "
+"<command>dpkg</command> will also ask a number of questions as it processes "
+"the packages and the packages themselves may also ask several questions. "
+"Before each question there is usually a description of what it is asking and "
+"the questions are too varied to discuss completely here."
+msgstr ""
+"APT benutzt <command>dpkg</command>, um die Archive zu installieren und wird "
+"zu der <command>dpkg</command>-Schnittstelle herüberschalten, sobald der "
+"Download vollständig ist. <command>dpkg</command> wird außerdem eine Reihe "
+"von Fragen stellen, während es die Pakete abarbeitet und die Pakete können "
+"auch mehrere Fragen stellen . Vor jeder Frage ist üblicherweise eine "
+"Beschreibung des Gefragten und die Fragen sind zu vielfältig, um sie "
+"vollständig hier zu besprechen."
+
+#. type: Content of: <book><title>
+#: offline.dbk:11
 msgid "Using APT Offline"
 msgstr "APT offline verwenden"
 
-#. type: <version></version>
-#: offline.sgml:7
-msgid "$Id: offline.sgml,v 1.8 2003/02/12 15:06:41 doogie Exp $"
-msgstr "$Id: offline.sgml,v 1.8 12.02.2003 15:06:41 doogie Exp $"
-
-#. type: <abstract></abstract>
-#: offline.sgml:12
+#. type: Content of: <book><bookinfo><abstract><para>
+#: offline.dbk:25
 msgid ""
 "This document describes how to use APT in a non-networked environment, "
 "specifically a 'sneaker-net' approach for performing upgrades."
@@ -9665,23 +9731,25 @@ msgstr ""
 "speziell einem »Turnschuhnetzwerk«, an die Durchführung von Upgrades "
 "herangeht."
 
-#. type: <copyrightsummary></copyrightsummary>
-#: offline.sgml:16
-msgid "Copyright &copy; Jason Gunthorpe, 1999."
-msgstr "Copyright &copy; Jason Gunthorpe, 1999."
+#. type: Content of: <book><bookinfo>
+#: offline.dbk:30
+msgid ""
+"<copyright><year>1999</year><holder>Jason Gunthorpe</holder></copyright>"
+msgstr ""
+"<copyright><year>1999</year><holder>Jason Gunthorpe</holder></copyright>"
 
-#. type: <heading></heading>
-#: offline.sgml:32
+#. type: Content of: <book><chapter><title>
+#: offline.dbk:48
 msgid "Introduction"
 msgstr "Einleitung"
 
-#. type: <heading></heading>
-#: offline.sgml:34 offline.sgml:65 offline.sgml:180
+#. type: Content of: <book><chapter><section><title>
+#: offline.dbk:50 offline.dbk:80 offline.dbk:192
 msgid "Overview"
 msgstr "Übersicht"
 
-#. type: <p></p>
-#: offline.sgml:40
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:52
 msgid ""
 "Normally APT requires direct access to a Debian archive, either from a local "
 "media or through a network. Another common complaint is that a Debian "
@@ -9694,8 +9762,8 @@ msgstr ""
 "wie einem Modem, hängt und eine andere Maschine eine sehr schnelle "
 "Verbindung hat, sie jedoch physisch fern sind."
 
-#. type: <p></p>
-#: offline.sgml:51
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:58
 msgid ""
 "The solution to this is to use large removable media such as a Zip disc or a "
 "SuperDisk disc. These discs are not large enough to store the entire Debian "
@@ -9703,9 +9771,9 @@ msgid ""
 "to use APT to generate a list of packages that are required and then fetch "
 "them onto the disc using another machine with good connectivity. It is even "
 "possible to use another Debian machine with APT or to use a completely "
-"different OS and a download tool like wget. Let <em>remote host</em> mean "
-"the machine downloading the packages, and <em>target host</em> the one with "
-"bad or no connection."
+"different OS and a download tool like wget. Let <emphasis>remote host</"
+"emphasis> mean the machine downloading the packages, and <emphasis>target "
+"host</emphasis> the one with bad or no connection."
 msgstr ""
 "Die Lösung dazu besteht darin, große Wechselmedien, wie eine Zip-Platte oder "
 "eine SuperDisk zu benutzen. Diese Platten sind nicht groß genug, um ein "
@@ -9716,11 +9784,11 @@ msgstr ""
 "herunterzuladen. Es ist sogar möglich, eine andere Debian-Maschine mit APT "
 "oder ein komplett unterschiedliches Betriebssystem und ein Download-Werkzeug "
 "wie Wget zu benutzen. Nennen wir die Maschine, die die Pakete herunterlädt "
-"<em>ferner Rechner</em> und die mit der schlechten oder fehlenden Verbindung "
-"<em>Zielrechner</em>."
+"<emphasis>ferner Rechner</emphasis> und die mit der schlechten oder "
+"fehlenden Verbindung <emphasis>Zielrechner</emphasis>."
 
-#. type: <p></p>
-#: offline.sgml:57
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:69
 msgid ""
 "This is achieved by creatively manipulating the APT configuration file. The "
 "essential premise to tell APT to look on a disc for it's archive files. Note "
@@ -9733,13 +9801,13 @@ msgstr ""
 "Platte mit einem Dateisystem formatiert sein sollte, das mit langen "
 "Dateinamen umgehen kann, so wie ext2, fat32 oder vfat."
 
-#. type: <heading></heading>
-#: offline.sgml:63
+#. type: Content of: <book><chapter><title>
+#: offline.dbk:78
 msgid "Using APT on both machines"
 msgstr "APT auf beiden Maschinen benutzen"
 
-#. type: <p><example>
-#: offline.sgml:71
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:82
 msgid ""
 "APT being available on both machines gives the simplest configuration. The "
 "basic idea is to place a copy of the status file on the disc and use the "
@@ -9752,8 +9820,8 @@ msgstr ""
 "Paketdateien herunterzuladen und zu entscheiden, welche Pakete "
 "heruntergeladen werden. Die Plattenverzeichnisstruktur sollte so aussehen:"
 
-#. type: <example></example>
-#: offline.sgml:80
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:88
 #, no-wrap
 msgid ""
 "  /disc/\n"
@@ -9763,7 +9831,7 @@ msgid ""
 "       partial/\n"
 "    status\n"
 "    sources.list\n"
-"    apt.conf"
+"    apt.conf\n"
 msgstr ""
 "  /Platte/\n"
 "    Archive/\n"
@@ -9772,42 +9840,43 @@ msgstr ""
 "       partial/\n"
 "    status\n"
 "    sources.list\n"
-"    apt.conf"
+"    apt.conf\n"
 
-#. type: <heading></heading>
-#: offline.sgml:88
+#. type: Content of: <book><chapter><section><title>
+#: offline.dbk:99
 msgid "The configuration file"
 msgstr "Die Konfigurationsdatei"
 
-#. type: <p></p>
-#: offline.sgml:96
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:101
 msgid ""
 "The configuration file should tell APT to store its files on the disc and to "
 "use the configuration files on the disc as well. The sources.list should "
 "contain the proper sites that you wish to use from the remote machine, and "
-"the status file should be a copy of <em>/var/lib/dpkg/status</em> from the "
-"<em>target host</em>. Please note, if you are using a local archive you must "
-"use copy URIs, the syntax is identical to file URIs."
+"the status file should be a copy of <emphasis>/var/lib/dpkg/status</"
+"emphasis> from the <emphasis>target host</emphasis>. Please note, if you are "
+"using a local archive you must use copy URIs, the syntax is identical to "
+"file URIs."
 msgstr ""
 "Die Konfigurationsdatei sollte APT mitteilen, dass es seine Dateien auf der "
 "Platte speichert und obendrein die Konfigurationsdateien auf der Platte "
 "benutzt. Die »sources.list« sollte genau die Sites enthalten, die Sie auf "
 "der fernen Maschine benutzen möchten und die Statusdatei sollte eine Kopie "
-"von <em>/var/lib/dpkg/status</em> vom <em>Zielrechner</em> sein. Bitte "
-"beachten Sie, falls Sie lokale Archive benutzen, dass Sie »copy«-URIs "
-"benutzen müssen. Die Syntax entspricht der von »file«-URIs."
+"von <emphasis>/var/lib/dpkg/status</emphasis> vom <emphasis>Zielrechner</"
+"emphasis> sein. Bitte beachten Sie, falls Sie lokale Archive benutzen, dass "
+"Sie »copy«-URIs benutzen müssen. Die Syntax entspricht der von »file«-URIs."
 
-#. type: <p><example>
-#: offline.sgml:100
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:109
 msgid ""
-"<em>apt.conf</em> must contain the necessary information to make APT use the "
-"disc:"
+"<emphasis>apt.conf</emphasis> must contain the necessary information to make "
+"APT use the disc:"
 msgstr ""
-"<em>apt.conf</em> muss die nötigen Informationen enthalten, damit APT die "
-"Platte benutzt:"
+"<emphasis>apt.conf</emphasis> muss die nötigen Informationen enthalten, "
+"damit APT die Platte benutzt:"
 
-#. type: <example></example>
-#: offline.sgml:124
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:113
 #, no-wrap
 msgid ""
 " APT\n"
@@ -9815,10 +9884,10 @@ msgid ""
 "   /* This is not necessary if the two machines are the same arch, it tells\n"
 "      the remote APT what architecture the target machine is */\n"
 "   Architecture \"i386\";\n"
-"   \n"
+"\n"
 "   Get::Download-Only \"true\";\n"
 " };\n"
-" \n"
+"\n"
 " Dir\n"
 " {\n"
 "   /* Use the disc for state information and redirect the status file from\n"
@@ -9829,10 +9898,10 @@ msgid ""
 "   // Binary caches will be stored locally\n"
 "   Cache::archives \"/disc/archives/\";\n"
 "   Cache \"/tmp/\";\n"
-"   \n"
+"\n"
 "   // Location of the source list.\n"
 "   Etc \"/disc/\";\n"
-" };"
+" };\n"
 msgstr ""
 " APT\n"
 " {\n"
@@ -9840,10 +9909,10 @@ msgstr ""
 "      Architektur haben. Es teilt dem fernen APT mit, welche Architektur die\n"
 "      Zielmaschine hat */\n"
 "   Architecture \"i386\";\n"
-"   \n"
+"\n"
 "   Get::Download-Only \"true\";\n"
 " };\n"
-" \n"
+"\n"
 " Dir\n"
 " {\n"
 "   /* Die Platte für Statusinformationen benutzen und die Statusdatei\n"
@@ -9854,68 +9923,72 @@ msgstr ""
 "   // Programmzwischenspeicher werden lokal gespeichert\n"
 "   Cache::archives \"/disc/archives/\";\n"
 "   Cache \"/tmp/\";\n"
-"   \n"
+"\n"
 "   // Ort der Quellenliste.\n"
 "   Etc \"/disc/\";\n"
-" };"
+" };\n"
 
-#. type: </example></p>
-#: offline.sgml:129
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:138
 msgid ""
 "More details can be seen by examining the apt.conf man page and the sample "
-"configuration file in <em>/usr/share/doc/apt/examples/apt.conf</em>."
+"configuration file in <emphasis>/usr/share/doc/apt/examples/apt.conf</"
+"emphasis>."
 msgstr ""
 "Weitere Details finden sich in der apt.conf-Handbuchseite und der "
-"Musterkonfigurationsdatei in <em>/usr/share/doc/apt/examples/apt.conf</em>."
+"Musterkonfigurationsdatei in <emphasis>/usr/share/doc/apt/examples/apt.conf</"
+"emphasis>."
 
-#. type: <p><example>
-#: offline.sgml:136
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:143
 msgid ""
-"On the target machine the first thing to do is mount the disc and copy <em>/"
-"var/lib/dpkg/status</em> to it. You will also need to create the directories "
-"outlined in the Overview, <em>archives/partial/</em> and <em>lists/partial/</"
-"em>. Then take the disc to the remote machine and configure the sources."
-"list. On the remote machine execute the following:"
+"On the target machine the first thing to do is mount the disc and copy "
+"<emphasis>/var/lib/dpkg/status</emphasis> to it. You will also need to "
+"create the directories outlined in the Overview, <emphasis>archives/partial/"
+"</emphasis> and <emphasis>lists/partial/</emphasis>. Then take the disc to "
+"the remote machine and configure the sources.list. On the remote machine "
+"execute the following:"
 msgstr ""
 "Das Erste, was auf der Zielmaschine getan werden muss, ist das Einhängen der "
-"Platte und das Kopieren von <em>/var/lib/dpkg/status</em> dorthin. Sie "
-"werden außerdem die in der Übersicht umrissenen Verzeichnisse <em>archives/"
-"partial/</em> und <em>lists/partial/</em> erstellen müssen. Dann bringen Sie "
-"die Platte zu der fernen Maschine und konfigurieren Sie die »sources.list«. "
-"Führen Sie das folgende aus:"
-
-#. type: <example></example>
-#: offline.sgml:142
+"Platte und das Kopieren von <emphasis>/var/lib/dpkg/status</emphasis> "
+"dorthin. Sie werden außerdem die in der Übersicht umrissenen Verzeichnisse "
+"<emphasis>archives/partial/</emphasis> und <emphasis>lists/partial/</"
+"emphasis> erstellen müssen. Dann bringen Sie die Platte zu der fernen "
+"Maschine und konfigurieren Sie die »sources.list«. Führen Sie das folgende "
+"aus:"
+
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:152
 #, no-wrap
 msgid ""
 " # export APT_CONFIG=\"/disc/apt.conf\"\n"
 " # apt-get update\n"
 " [ APT fetches the package files ]\n"
 " # apt-get dist-upgrade\n"
-" [ APT fetches all the packages needed to upgrade the target machine ]"
+" [ APT fetches all the packages needed to upgrade the target machine ]\n"
 msgstr ""
 " # export APT_CONFIG=\"/disc/apt.conf\"\n"
 " # apt-get update\n"
 " [ APT lädt die Paketdateien herunter ]\n"
 " # apt-get dist-upgrade\n"
 " [ APT lädt all die Pakete herunter, die die Zielmaschine benötigt, um ein\n"
-"   Upgrade durchzuführen ]"
+"   Upgrade durchzuführen ]\n"
 
-#. type: </example></p>
-#: offline.sgml:149
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:159
 msgid ""
 "The dist-upgrade command can be replaced with any other standard APT "
 "commands, particularly dselect-upgrade. You can even use an APT front end "
-"such as <em>dselect</em>. However this presents a problem in communicating "
-"your selections back to the local computer."
+"such as <emphasis>dselect</emphasis>. However this presents a problem in "
+"communicating your selections back to the local computer."
 msgstr ""
 "Der Befehl »dist-upgrade« kann durch alle anderen Standard-APT-Befehle "
 "ersetzt werden, insbesondere »dselect-upgrade«. Sie können sogar eine APT-"
-"Oberfläche, wie <em>dselect</em>, benutzen. Jedoch stellt dies ein Problem "
-"dar, Ihre Auswahl zurück an den lokalen Rechner zu kommunizieren."
+"Oberfläche, wie <emphasis>dselect</emphasis>, benutzen. Jedoch stellt dies "
+"ein Problem dar, Ihre Auswahl zurück an den lokalen Rechner zu kommunizieren."
 
-#. type: <p><example>
-#: offline.sgml:153
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:165
 msgid ""
 "Now the disc contains all of the index files and archives needed to upgrade "
 "the target machine. Take the disc back and run:"
@@ -9924,24 +9997,24 @@ msgstr ""
 "Upgrade der Zielmaschine druchzuführen. Bringen Sie die Platte zurück und "
 "starten Sie:"
 
-#. type: <example></example>
-#: offline.sgml:159
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:169
 #, no-wrap
 msgid ""
 "  # export APT_CONFIG=\"/disc/apt.conf\"\n"
 "  # apt-get check\n"
 "  [ APT generates a local copy of the cache files ]\n"
 "  # apt-get --no-d -o dir::state::status=/var/lib/dpkg/status dist-upgrade\n"
-"  [ Or any other APT command ]"
+"  [ Or any other APT command ]\n"
 msgstr ""
 "  # export APT_CONFIG=\"/disc/apt.conf\"\n"
 "  # apt-get check\n"
 "  [ APT generiert eine lokale Kopie der Zwischenspeicherdateien ]\n"
 "  # apt-get --no-d -o dir::state::status=/var/lib/dpkg/status dist-upgrade\n"
-"  [ Oder irgendeinen anderen APT-Befehl ]"
+"  [ Oder irgendeinen anderen APT-Befehl ]\n"
 
-#. type: <p></p>
-#: offline.sgml:165
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:176
 msgid ""
 "It is necessary for proper function to re-specify the status file to be the "
 "local one. This is very important!"
@@ -9949,8 +10022,8 @@ msgstr ""
 "Es ist für ordentliches Funktionieren notwendig, die Statusdatei erneut als "
 "die lokale anzugeben. Dies ist sehr wichtig!"
 
-#. type: <p></p>
-#: offline.sgml:172
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:180
 msgid ""
 "If you are using dselect you can do the very risky operation of copying disc/"
 "status to /var/lib/dpkg/status so that any selections you made on the remote "
@@ -9966,24 +10039,25 @@ msgstr ""
 "die Statusdatei NICHT, falls Dpkg oder APT in der Zwischenzeit benutzt "
 "wurden!"
 
-#. type: <heading></heading>
-#: offline.sgml:178
+#. type: Content of: <book><chapter><title>
+#: offline.dbk:190
 msgid "Using APT and wget"
 msgstr "APT und Wget benutzen"
 
-#. type: <p></p>
-#: offline.sgml:185
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:194
 msgid ""
-"<em>wget</em> is a popular and portable download tool that can run on nearly "
-"any machine. Unlike the method above this requires that the Debian machine "
-"already has a list of available packages."
+"<emphasis>wget</emphasis> is a popular and portable download tool that can "
+"run on nearly any machine. Unlike the method above this requires that the "
+"Debian machine already has a list of available packages."
 msgstr ""
-"<em>wget</em> ist eine populäres und portierbares Download-Werkzeug, das auf "
-"nahezu jeder Maschine laufen kann. Anders als die Methode oben wird hierfür "
-"benötigt, dass die Debian-Maschine bereits eine Liste verfügbarer Pakete hat."
+"<emphasis>wget</emphasis> ist eine populäres und portierbares Download-"
+"Werkzeug, das auf nahezu jeder Maschine laufen kann. Anders als die Methode "
+"oben wird hierfür benötigt, dass die Debian-Maschine bereits eine Liste "
+"verfügbarer Pakete hat."
 
-#. type: <p></p>
-#: offline.sgml:190
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:199
 msgid ""
 "The basic idea is to create a disc that has only the archive files "
 "downloaded from the remote site. This is done by using the --print-uris "
@@ -9996,13 +10070,13 @@ msgstr ""
 "Vorbereiten eines Wget-Skripts getan, um die eigentlichen Pakete "
 "herunterzuladen."
 
-#. type: <heading></heading>
-#: offline.sgml:196
+#. type: Content of: <book><chapter><section><title>
+#: offline.dbk:205
 msgid "Operation"
 msgstr "Betrieb"
 
-#. type: <p><example>
-#: offline.sgml:200
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:207
 msgid ""
 "Unlike the previous technique no special configuration files are required. "
 "We merely use the standard APT commands to generate the file list."
@@ -10011,23 +10085,23 @@ msgstr ""
 "Konfigurationsdateien benötigt. Es werden lediglich die Standard-APT-Befehle "
 "benutzt, um die Dateiliste zu erstellen."
 
-#. type: <example></example>
-#: offline.sgml:205
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:211
 #, no-wrap
 msgid ""
-" # apt-get dist-upgrade \n"
+" # apt-get dist-upgrade\n"
 " [ Press no when prompted, make sure you are happy with the actions ]\n"
-" # apt-get -qq --print-uris dist-upgrade > uris\n"
-" # awk '{print \"wget -O \" $2 \" \" $1}' < uris > /disc/wget-script"
+" # apt-get -qq --print-uris dist-upgrade &gt; uris\n"
+" # awk '{print \"wget -O \" $2 \" \" $1}' &lt; uris &gt; /disc/wget-script\n"
 msgstr ""
 " # apt-get dist-upgrade \n"
 " [ Antworten Sie »nein« auf gestellte Fragen, wenn Sie mit den Aktionen\n"
 "   zufrieden sind ]\n"
-" # apt-get -qq --print-uris dist-upgrade > uris\n"
-" # awk '{print \"wget -O \" $2 \" \" $1}' < uris > /Platte/wget-script"
+" # apt-get -qq --print-uris dist-upgrade &gt; uris\n"
+" # awk '{print \"wget -O \" $2 \" \" $1}' &lt; uris &gt; /Platte/wget-script\n"
 
-#. type: </example></p>
-#: offline.sgml:210
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:217
 msgid ""
 "Any command other than dist-upgrade could be used here, including dselect-"
 "upgrade."
@@ -10035,8 +10109,8 @@ msgstr ""
 "Jeder andere Befehl als »dist-upgrade« könnte hier benutzt werden, "
 "einschließlich »upgrade«."
 
-#. type: <p></p>
-#: offline.sgml:216
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:221
 msgid ""
 "The /disc/wget-script file will now contain a list of wget commands to "
 "execute in order to fetch the necessary archives. This script should be run "
@@ -10048,25 +10122,25 @@ msgstr ""
 "sollte mit dem aktuellen Verzeichnis als Platteneinhängepunkt ausgeführt "
 "werden, so dass die Ausgabe auf die Platte gespeichert wird."
 
-#. type: <p><example>
-#: offline.sgml:219
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:227
 msgid "The remote machine would do something like"
 msgstr "Die ferne Maschine würde etwas wie das folgende tun"
 
-#. type: <example></example>
-#: offline.sgml:223
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:230
 #, no-wrap
 msgid ""
 "  # cd /disc\n"
 "  # sh -x ./wget-script\n"
-"  [ wait.. ]"
+"  [ wait.. ]\n"
 msgstr ""
 "  # cd /Platte\n"
 "  # sh -x ./wget-script\n"
-"  [ warten … Fertig ]"
+"  [ warten … Fertig ]\n"
 
-#. type: </example><example>
-#: offline.sgml:228
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:235
 msgid ""
 "Once the archives are downloaded and the disc returned to the Debian machine "
 "installation can proceed using,"
@@ -10074,17 +10148,35 @@ msgstr ""
 "Sobald die Archive heruntergeladen und die Platte zur Debian-Maschine "
 "zurückgekehrt ist, kann die Installation fortfahren durch Benutzung von "
 
-#. type: <example></example>
-#: offline.sgml:230
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:239
 #, no-wrap
-msgid "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade"
-msgstr "  # apt-get -o dir::cache::archives=\"/Platte/\" dist-upgrade"
+msgid "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade\n"
+msgstr "  # apt-get -o dir::cache::archives=\"/Platte/\" dist-upgrade\n"
 
-#. type: </example></p>
-#: offline.sgml:234
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:242
 msgid "Which will use the already fetched archives on the disc."
 msgstr "Es wird die bereits auf die Platte heruntergeladenen Archive benutzen."
 
+#~ msgid "$Id: guide.sgml,v 1.7 2003/04/26 23:26:13 doogie Exp $"
+#~ msgstr "$Id: guide.sgml,v 1.7 2003/04/26 23:26:13 doogie Exp $"
+
+#~ msgid "<pubdate></pubdate>"
+#~ msgstr "<pubdate></pubdate>"
+
+#~ msgid "$Id: offline.sgml,v 1.8 2003/02/12 15:06:41 doogie Exp $"
+#~ msgstr "$Id: offline.sgml,v 1.8 12.02.2003 15:06:41 doogie Exp $"
+
+#~ msgid "<name>Jason Gunthorpe </name><email>jgg@debian.org</email>"
+#~ msgstr "<name>Jason Gunthorpe </name><email>jgg@debian.org</email>"
+
+#~ msgid "Copyright &copy; Jason Gunthorpe, 1998."
+#~ msgstr "Copyright &copy; Jason Gunthorpe, 1998."
+
+#~ msgid "Copyright &copy; Jason Gunthorpe, 1999."
+#~ msgstr "Copyright &copy; Jason Gunthorpe, 1999."
+
 #~ msgid "apt"
 #~ msgstr "apt"
 
@@ -10110,11 +10202,6 @@ msgstr "Es wird die bereits auf die Platte heruntergeladenen Archive benutzen."
 #~ msgstr "BESCHREIBUNG"
 
 #, fuzzy
-#~| msgid ""
-#~| "APT is a management system for software packages. For normal day to day "
-#~| "package management there are several frontends available, such as "
-#~| "B<aptitude>(8)  for the command line or B<synaptic>(8)  for the X Window "
-#~| "System. Some options are only implemented in B<apt-get>(8)  though."
 #~ msgid ""
 #~ "For normal day to day package management there are several frontends "
 #~ "available, such as B<aptitude>(8)  for the command line or "
@@ -10130,9 +10217,6 @@ msgstr "Es wird die bereits auf die Platte heruntergeladenen Archive benutzen."
 #~ msgstr "SIEHE AUCH"
 
 #, fuzzy
-#~| msgid ""
-#~| "B<apt-cache>(8), B<apt-get>(8), B<apt.conf>(5), B<sources.list>(5), "
-#~| "B<apt_preferences>(5), B<apt-secure>(8)"
 #~ msgid ""
 #~ "B<apt>(8), B<apt-cache>(8), B<apt-get>(8), B<apt.conf>(5), B<sources."
 #~ "list>(5), B<apt_preferences>(5), B<apt-secure>(8)"
diff --git a/doc/po/es.po b/doc/po/es.po
index cafda0041..24602318d 100644
--- a/doc/po/es.po
+++ b/doc/po/es.po
@@ -38,8 +38,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.9.7.1\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-11 14:52+0200\n"
-"PO-Revision-Date: 2014-04-01 14:00+0200\n"
+"POT-Creation-Date: 2014-08-28 00:20+0000\n"
+"PO-Revision-Date: 2014-07-04 01:31+0200\n"
 "Last-Translator: Omar Campagne <ocampagne@gmail.com>\n"
 "Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
 "Language: es\n"
@@ -699,37 +699,37 @@ msgstr ""
 "473041FA --> <!ENTITY synopsis-keyid \"keyid\">"
 
 #. type: Content of: <refentry><refmeta><manvolnum>
-#: apt.8.xml:25 apt-get.8.xml:28 apt-cache.8.xml:28 apt-key.8.xml:27
-#: apt-mark.8.xml:28 apt-secure.8.xml:27 apt-cdrom.8.xml:27
-#: apt-config.8.xml:28
+#: apt.8.xml:21 apt-get.8.xml:22 apt-cache.8.xml:22 apt-key.8.xml:21
+#: apt-mark.8.xml:22 apt-secure.8.xml:21 apt-cdrom.8.xml:21
+#: apt-config.8.xml:22
 msgid "8"
 msgstr "8"
 
 #. type: Content of: <refentry><refmeta><refmiscinfo>
-#: apt.8.xml:26 apt-get.8.xml:29 apt-cache.8.xml:29 apt-key.8.xml:28
-#: apt-mark.8.xml:29 apt-secure.8.xml:28 apt-cdrom.8.xml:28
-#: apt-config.8.xml:29 apt.conf.5.xml:34 apt_preferences.5.xml:28
-#: sources.list.5.xml:29 apt-extracttemplates.1.xml:29 apt-sortpkgs.1.xml:29
-#: apt-ftparchive.1.xml:29
+#: apt.8.xml:22 apt-get.8.xml:23 apt-cache.8.xml:23 apt-key.8.xml:22
+#: apt-mark.8.xml:23 apt-secure.8.xml:22 apt-cdrom.8.xml:22
+#: apt-config.8.xml:23 apt.conf.5.xml:28 apt_preferences.5.xml:22
+#: sources.list.5.xml:23 apt-extracttemplates.1.xml:23 apt-sortpkgs.1.xml:23
+#: apt-ftparchive.1.xml:23
 msgid "APT"
 msgstr "APT"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt.8.xml:32
+#: apt.8.xml:28
 msgid "command-line interface"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:37 apt-get.8.xml:40 apt-cache.8.xml:40 apt-key.8.xml:39
-#: apt-mark.8.xml:40 apt-secure.8.xml:52 apt-cdrom.8.xml:39
-#: apt-config.8.xml:40 apt.conf.5.xml:43 apt_preferences.5.xml:38
-#: sources.list.5.xml:38 apt-extracttemplates.1.xml:40 apt-sortpkgs.1.xml:40
-#: apt-ftparchive.1.xml:40
+#: apt.8.xml:33 apt-get.8.xml:34 apt-cache.8.xml:34 apt-key.8.xml:33
+#: apt-mark.8.xml:34 apt-secure.8.xml:46 apt-cdrom.8.xml:33
+#: apt-config.8.xml:34 apt.conf.5.xml:37 apt_preferences.5.xml:32
+#: sources.list.5.xml:32 apt-extracttemplates.1.xml:34 apt-sortpkgs.1.xml:34
+#: apt-ftparchive.1.xml:34
 msgid "Description"
 msgstr "Descripción"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:38
+#: apt.8.xml:34
 msgid ""
 "<command>apt</command> (Advanced Package Tool) is the command-line tool for "
 "handling packages. It provides a commandline interface for the package "
@@ -738,7 +738,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:47
+#: apt.8.xml:43
 msgid ""
 "<literal>list</literal> is used to display a list of packages. It supports "
 "shell pattern for matching package names and the following options: "
@@ -747,14 +747,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:58
+#: apt.8.xml:54
 msgid ""
 "<literal>search</literal> searches for the given term(s) and display "
 "matching packages."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:64
+#: apt.8.xml:60
 #, fuzzy
 #| msgid ""
 #| "<literal>rdepends</literal> shows a listing of each reverse dependency a "
@@ -766,14 +766,14 @@ msgstr ""
 "<literal>rdepends</literal> muestra las dependencias inversas de un paquete."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:71
+#: apt.8.xml:67
 msgid ""
 "<literal>install</literal> is followed by one or more package names desired "
 "for installation or upgrading."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:75 apt-get.8.xml:118
+#: apt.8.xml:71 apt-get.8.xml:112
 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 "
@@ -791,7 +791,7 @@ msgstr ""
 "(stable, testing, unstable)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:85 apt-get.8.xml:153
+#: apt.8.xml:81 apt-get.8.xml:147
 msgid ""
 "<literal>remove</literal> is identical to <literal>install</literal> except "
 "that packages are removed instead of installed. Note that removing a package "
@@ -807,14 +807,14 @@ msgstr ""
 "en cuestión será instalado en vez de eliminado."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:93
+#: apt.8.xml:89
 msgid ""
 "<literal>edit-sources</literal> lets you edit your sources.list file and "
 "provides basic sanity checks."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:99
+#: apt.8.xml:95
 #, fuzzy
 #| msgid ""
 #| "<literal>showhold</literal> is used to print a list of packages on hold "
@@ -827,16 +827,16 @@ msgstr ""
 "de la misma forma que las otras órdenes «show»."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:105
+#: apt.8.xml:101
 msgid ""
 "<literal>upgrade</literal> is used to install the newest versions of all "
 "packages currently installed on the system from the sources enumerated in "
-"<filename>/etc/apt/sources.list</filename>. New package will be installed, "
-"but existing package will never removed."
+"<filename>/etc/apt/sources.list</filename>. New packages will be installed, "
+"but existing packages will never be removed."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:114
+#: apt.8.xml:110
 msgid ""
 "<literal>full-upgrade</literal> performs the function of upgrade but may "
 "also remove installed packages if that is required in order to resolve a "
@@ -844,19 +844,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:124 apt-get.8.xml:257 apt-cache.8.xml:250 apt-mark.8.xml:110
-#: apt-config.8.xml:86 apt-extracttemplates.1.xml:54 apt-sortpkgs.1.xml:50
-#: apt-ftparchive.1.xml:506
+#: apt.8.xml:120 apt-get.8.xml:251 apt-cache.8.xml:244 apt-mark.8.xml:104
+#: apt-config.8.xml:80 apt-extracttemplates.1.xml:48 apt-sortpkgs.1.xml:44
+#: apt-ftparchive.1.xml:500
 msgid "options"
 msgstr "Opciones"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:134
+#: apt.8.xml:130
 msgid "Script usage"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:136
+#: apt.8.xml:132
 msgid ""
 "The &apt; commandline is designed as a end-user tool and it may change the "
 "output between versions. While it tries to not break backward compatibility "
@@ -866,12 +866,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:144
+#: apt.8.xml:140
 msgid "Differences to &apt-get;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:145
+#: apt.8.xml:141
 msgid ""
 "The <command>apt</command> command is meant to be pleasant for end users and "
 "does not need to be backward compatible like &apt-get;. Therefore some "
@@ -879,28 +879,28 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml:151
+#: apt.8.xml:147
 #, fuzzy
 #| msgid "the <literal>Package:</literal> line"
 msgid "The option <literal>DPkg::Progress-Fancy</literal> is enabled."
 msgstr "La línea <literal>Package:</literal>"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml:155
+#: apt.8.xml:151
 #, fuzzy
 #| msgid "the <literal>Component:</literal> line"
 msgid "The option <literal>APT::Color</literal> is enabled."
 msgstr "La línea <literal>Component:</literal>"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml:159
+#: apt.8.xml:155
 msgid ""
 "A new <literal>list</literal> command is available similar to <literal>dpkg "
 "--list</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml:164
+#: apt.8.xml:160
 #, fuzzy
 #| msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
 msgid ""
@@ -909,16 +909,16 @@ msgid ""
 msgstr "Las líneas <literal>Archive:</literal> o <literal>Suite:</literal>"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:174 apt-get.8.xml:558 apt-cache.8.xml:352 apt-key.8.xml:197
-#: apt-mark.8.xml:133 apt-secure.8.xml:193 apt-cdrom.8.xml:154
-#: apt-config.8.xml:111 apt.conf.5.xml:1227 apt_preferences.5.xml:707
-#: sources.list.5.xml:280 apt-extracttemplates.1.xml:72 apt-sortpkgs.1.xml:65
-#: apt-ftparchive.1.xml:609
+#: apt.8.xml:170 apt-get.8.xml:552 apt-cache.8.xml:346 apt-key.8.xml:191
+#: apt-mark.8.xml:127 apt-secure.8.xml:187 apt-cdrom.8.xml:148
+#: apt-config.8.xml:105 apt.conf.5.xml:1222 apt_preferences.5.xml:701
+#: sources.list.5.xml:274 apt-extracttemplates.1.xml:66 apt-sortpkgs.1.xml:59
+#: apt-ftparchive.1.xml:603
 msgid "See Also"
 msgstr "Véase también"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:175
+#: apt.8.xml:171
 #, fuzzy
 #| msgid ""
 #| "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
@@ -933,14 +933,14 @@ msgstr ""
 "preferences;, el Cómo de APT."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:180 apt-get.8.xml:564 apt-cache.8.xml:357 apt-mark.8.xml:137
-#: apt-cdrom.8.xml:159 apt-config.8.xml:116 apt-extracttemplates.1.xml:76
-#: apt-sortpkgs.1.xml:69 apt-ftparchive.1.xml:613
+#: apt.8.xml:176 apt-get.8.xml:558 apt-cache.8.xml:351 apt-mark.8.xml:131
+#: apt-cdrom.8.xml:153 apt-config.8.xml:110 apt-extracttemplates.1.xml:70
+#: apt-sortpkgs.1.xml:63 apt-ftparchive.1.xml:607
 msgid "Diagnostics"
 msgstr "Diagnósticos"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:181
+#: apt.8.xml:177
 #, fuzzy
 #| msgid ""
 #| "<command>apt-get</command> returns zero on normal operation, decimal 100 "
@@ -953,13 +953,13 @@ msgstr ""
 "100 en caso de error."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-get.8.xml:35
+#: apt-get.8.xml:29
 msgid "APT package handling utility -- command-line interface"
 msgstr ""
 "Herramienta de gestión de paquetes APT -- interfaz para la línea de órdenes"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:41
+#: apt-get.8.xml:35
 #, fuzzy
 #| msgid ""
 #| "<command>apt-get</command> is the command-line tool for handling "
@@ -979,8 +979,8 @@ msgstr ""
 "&synaptic; y &wajig;."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:46 apt-cache.8.xml:46 apt-cdrom.8.xml:53 apt-config.8.xml:46
-#: apt-ftparchive.1.xml:56
+#: apt-get.8.xml:40 apt-cache.8.xml:40 apt-cdrom.8.xml:47 apt-config.8.xml:40
+#: apt-ftparchive.1.xml:50
 msgid ""
 "Unless the <option>-h</option>, or <option>--help</option> option is given, "
 "one of the commands below must be present."
@@ -989,7 +989,7 @@ msgstr ""
 "una de las siguientes órdenes debe estar presente."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:51
+#: apt-get.8.xml:45
 msgid ""
 "<literal>update</literal> is used to resynchronize the package index files "
 "from their sources. The indexes of available packages are fetched from the "
@@ -1013,7 +1013,7 @@ msgstr ""
 "tamaño de los archivos de paquete."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:63
+#: apt-get.8.xml:57
 msgid ""
 "<literal>upgrade</literal> is used to install the newest versions of all "
 "packages currently installed on the system from the sources enumerated in "
@@ -1038,7 +1038,7 @@ msgstr ""
 "hay nuevas versiones disponibles."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:76
+#: apt-get.8.xml:70
 msgid ""
 "<literal>dist-upgrade</literal> in addition to performing the function of "
 "<literal>upgrade</literal>, also intelligently handles changing dependencies "
@@ -1063,7 +1063,7 @@ msgstr ""
 "invalidar este comportamiento para paquetes individuales."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:89
+#: apt-get.8.xml:83
 msgid ""
 "<literal>dselect-upgrade</literal> is used in conjunction with the "
 "traditional Debian packaging front-end, &dselect;. <literal>dselect-upgrade</"
@@ -1080,7 +1080,7 @@ msgstr ""
 "paquetes antiguos e instalar las nuevas versiones)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:100
+#: apt-get.8.xml:94
 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 "
@@ -1110,7 +1110,7 @@ msgstr ""
 "de apt-get."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:125
+#: apt-get.8.xml:119
 msgid ""
 "Both of the version selection mechanisms can downgrade packages and must be "
 "used with care."
@@ -1119,7 +1119,7 @@ msgstr ""
 "anterior de los paquetes y se debe utilizar con precaución."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:128
+#: apt-get.8.xml:122
 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 system. "
@@ -1139,7 +1139,7 @@ msgstr ""
 "instalarán."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:139
+#: apt-get.8.xml:133
 msgid ""
 "Finally, the &apt-preferences; mechanism allows you to create an alternative "
 "installation policy for individual packages."
@@ -1148,7 +1148,7 @@ msgstr ""
 "paquetes individuales."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:143
+#: apt-get.8.xml:137
 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 "
@@ -1168,7 +1168,7 @@ msgstr ""
 "«$», o bien crear una expresión regular más específica."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:161
+#: apt-get.8.xml:155
 msgid ""
 "<literal>purge</literal> is identical to <literal>remove</literal> except "
 "that packages are removed and purged (any configuration files are deleted "
@@ -1179,7 +1179,7 @@ msgstr ""
 "también cualquier fichero de configuración)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:166
+#: apt-get.8.xml:160
 msgid ""
 "<literal>source</literal> causes <command>apt-get</command> to fetch source "
 "packages. APT will examine the available packages to decide which source "
@@ -1198,7 +1198,7 @@ msgstr ""
 "release</literal>, si es posible."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:174
+#: apt-get.8.xml:168
 msgid ""
 "Source packages are tracked separately from binary packages via <literal>deb-"
 "src</literal> lines in the &sources-list; file. This means that you will "
@@ -1214,7 +1214,7 @@ msgstr ""
 "ninguna."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:180
+#: apt-get.8.xml:174
 msgid ""
 "If the <option>--compile</option> option is specified then the package will "
 "be compiled to a binary .deb using <command>dpkg-buildpackage</command> for "
@@ -1229,7 +1229,7 @@ msgstr ""
 "paquete fuente no se desempaquetará."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:187
+#: apt-get.8.xml:181
 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 "
@@ -1244,7 +1244,7 @@ msgstr ""
 "activando implícitamente la opción <literal>APT::Get::Only-Source</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:193
+#: apt-get.8.xml:187
 msgid ""
 "Note that source packages are not installed and tracked in the "
 "<command>dpkg</command> database like binary packages; they are simply "
@@ -1255,7 +1255,7 @@ msgstr ""
 "se descargan al directorio actual en la forma de archivos tar de fuentes."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:199
+#: apt-get.8.xml:193
 msgid ""
 "<literal>build-dep</literal> causes apt-get to install/remove packages in an "
 "attempt to satisfy the build dependencies for a source package. By default "
@@ -1270,7 +1270,7 @@ msgstr ""
 "<option>--host-architecture</option>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:206
+#: apt-get.8.xml:200
 msgid ""
 "<literal>check</literal> is a diagnostic tool; it updates the package cache "
 "and checks for broken dependencies."
@@ -1279,7 +1279,7 @@ msgstr ""
 "caché de paquetes y revisa la existencia de dependencias rotas."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:211
+#: apt-get.8.xml:205
 msgid ""
 "<literal>download</literal> will download the given binary package into the "
 "current directory."
@@ -1288,7 +1288,7 @@ msgstr ""
 "directorio actual."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:217
+#: apt-get.8.xml:211
 #, fuzzy
 #| msgid ""
 #| "<literal>clean</literal> clears out the local repository of retrieved "
@@ -1313,7 +1313,7 @@ msgstr ""
 "literal> de vez en cuando para liberar algo de espacio en disco."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:224
+#: apt-get.8.xml:218
 msgid ""
 "Like <literal>clean</literal>, <literal>autoclean</literal> clears out the "
 "local repository of retrieved package files. The difference is that it only "
@@ -1332,7 +1332,7 @@ msgstr ""
 "desactivada impedirá que se borren los paquetes instalados."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:234
+#: apt-get.8.xml:228
 msgid ""
 "<literal>autoremove</literal> is used to remove packages that were "
 "automatically installed to satisfy dependencies for other packages and are "
@@ -1343,7 +1343,7 @@ msgstr ""
 "ya no son necesarios."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:239
+#: apt-get.8.xml:233
 msgid ""
 "<literal>changelog</literal> downloads a package changelog and displays it "
 "through <command>sensible-pager</command>. The server name and base "
@@ -1367,7 +1367,7 @@ msgstr ""
 "option>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:262
+#: apt-get.8.xml:256
 msgid ""
 "Do not consider recommended packages as a dependency for installing.  "
 "Configuration Item: <literal>APT::Install-Recommends</literal>."
@@ -1376,7 +1376,7 @@ msgstr ""
 "de configuración: <literal>APT::Install-Recommends</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:267
+#: apt-get.8.xml:261
 msgid ""
 "Consider suggested packages as a dependency for installing.  Configuration "
 "Item: <literal>APT::Install-Suggests</literal>."
@@ -1385,7 +1385,7 @@ msgstr ""
 "instalar. Opción de configuración: <literal>APT::Install-Suggests</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:272
+#: apt-get.8.xml:266
 msgid ""
 "Download only; package files are only retrieved, not unpacked or installed.  "
 "Configuration Item: <literal>APT::Get::Download-Only</literal>."
@@ -1394,7 +1394,7 @@ msgstr ""
 "instala. Opción de configuración: <literal>APT::Get::Download-Only</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:277
+#: apt-get.8.xml:271
 #, fuzzy
 #| msgid ""
 #| "Fix; attempt to correct a system with broken dependencies in place. This "
@@ -1435,7 +1435,7 @@ msgstr ""
 "<literal>APT::Get::Fix-Broken</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:292
+#: apt-get.8.xml:286
 msgid ""
 "Ignore missing packages; if packages cannot be retrieved or fail the "
 "integrity check after retrieval (corrupted package files), hold back those "
@@ -1455,7 +1455,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:303
+#: apt-get.8.xml:297
 msgid ""
 "Disables downloading of packages. This is best used with <option>--ignore-"
 "missing</option> to force APT to use only the .debs it has already "
@@ -1467,7 +1467,7 @@ msgstr ""
 "<literal>APT::Get::Download</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:310
+#: apt-get.8.xml:304
 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 "
@@ -1487,7 +1487,7 @@ msgstr ""
 "no espera. Opción de configuración: <literal>quiet</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:325
+#: apt-get.8.xml:319
 msgid ""
 "No action; perform a simulation of events that would occur but do not "
 "actually change the system.  Configuration Item: <literal>APT::Get::"
@@ -1498,7 +1498,7 @@ msgstr ""
 "Simulate</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:329
+#: apt-get.8.xml:323
 msgid ""
 "Simulated runs performed as a user will automatically deactivate locking "
 "(<literal>Debug::NoLocking</literal>), and if the option <literal>APT::Get::"
@@ -1517,7 +1517,7 @@ msgstr ""
 "acciones sin avisos de <literal>apt-get</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:337
+#: apt-get.8.xml:331
 msgid ""
 "Simulated runs print out a series of lines, each representing a "
 "<command>dpkg</command> operation: configure (<literal>Conf</literal>), "
@@ -1533,7 +1533,7 @@ msgstr ""
 "(poco frecuente)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:345
+#: apt-get.8.xml:339
 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 "
@@ -1549,7 +1549,7 @@ msgstr ""
 "<literal>APT::Get::Assume-Yes</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:353
+#: apt-get.8.xml:347
 msgid ""
 "Automatic \"no\" to all prompts.  Configuration Item: <literal>APT::Get::"
 "Assume-No</literal>."
@@ -1558,7 +1558,7 @@ msgstr ""
 "Get::Assume-No</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:358
+#: apt-get.8.xml:352
 msgid ""
 "Show upgraded packages; print out a list of all packages that are to be "
 "upgraded.  Configuration Item: <literal>APT::Get::Show-Upgraded</literal>."
@@ -1567,7 +1567,7 @@ msgstr ""
 "<literal>APT::Get::Show-Upgraded</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:364
+#: apt-get.8.xml:358
 msgid ""
 "Show full versions for upgraded and installed packages.  Configuration Item: "
 "<literal>APT::Get::Show-Versions</literal>."
@@ -1576,7 +1576,7 @@ msgstr ""
 "Opción de configuración: <literal>APT::Get::Show-Versions</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:370
+#: apt-get.8.xml:364
 #, fuzzy
 #| msgid ""
 #| "This option controls the architecture packages are built for by "
@@ -1601,7 +1601,7 @@ msgstr ""
 "configuración: <literal>APT::Get::Host-Architecture</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:380
+#: apt-get.8.xml:374
 #, fuzzy
 #| msgid ""
 #| "This option controls the architecture packages are built for by "
@@ -1625,7 +1625,7 @@ msgstr ""
 "configuración: <literal>APT::Get::Host-Architecture</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:391
+#: apt-get.8.xml:385
 msgid ""
 "Compile source packages after downloading them.  Configuration Item: "
 "<literal>APT::Get::Compile</literal>."
@@ -1634,7 +1634,7 @@ msgstr ""
 "<literal>APT::Get::Compile</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:396
+#: apt-get.8.xml:390
 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 "
@@ -1648,7 +1648,7 @@ msgstr ""
 "Ignore-Hold</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:403
+#: apt-get.8.xml:397
 msgid ""
 "Allow installing new packages when used in conjunction with "
 "<literal>upgrade</literal>.  This is useful if the update of a installed "
@@ -1660,7 +1660,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:415
+#: apt-get.8.xml:409
 msgid ""
 "Do not upgrade packages; when used in conjunction with <literal>install</"
 "literal>, <literal>no-upgrade</literal> will prevent packages on the command "
@@ -1673,7 +1673,7 @@ msgstr ""
 "configuración: <literal>APT::Get::Upgrade</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:422
+#: apt-get.8.xml:416
 msgid ""
 "Do not install new packages; when used in conjunction with <literal>install</"
 "literal>, <literal>only-upgrade</literal> will install upgrades for already "
@@ -1687,7 +1687,7 @@ msgstr ""
 "<literal>APT::Get::Only-Upgrade</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:430
+#: apt-get.8.xml:424
 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 "
@@ -1703,7 +1703,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:438
+#: apt-get.8.xml:432
 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 "
@@ -1725,7 +1725,7 @@ msgstr ""
 "<literal>APT::Get::Print-URIs</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:449
+#: apt-get.8.xml:443
 msgid ""
 "Use purge instead of remove for anything that would be removed.  An asterisk "
 "(\"*\") will be displayed next to packages which are scheduled to be purged. "
@@ -1739,7 +1739,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:457
+#: apt-get.8.xml:451
 msgid ""
 "Re-install packages that are already installed and at the newest version.  "
 "Configuration Item: <literal>APT::Get::ReInstall</literal>."
@@ -1749,7 +1749,7 @@ msgstr ""
 "ReInstall</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:462
+#: apt-get.8.xml:456
 msgid ""
 "This option is on by default; use <literal>--no-list-cleanup</literal> to "
 "turn it off. When it is on, <command>apt-get</command> will automatically "
@@ -1767,7 +1767,7 @@ msgstr ""
 "<literal>APT::Get::List-Cleanup</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:472
+#: apt-get.8.xml:466
 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 "
@@ -1791,7 +1791,7 @@ msgstr ""
 "también la página del manual de &apt-preferences;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:487
+#: apt-get.8.xml:481
 msgid ""
 "Only perform operations that are 'trivial'. Logically this can be considered "
 "related to <option>--assume-yes</option>; where <option>--assume-yes</"
@@ -1805,7 +1805,7 @@ msgstr ""
 "<literal>APT::Get::Trivial-Only</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:494
+#: apt-get.8.xml:488
 msgid ""
 "If any packages are to be removed apt-get immediately aborts without "
 "prompting.  Configuration Item: <literal>APT::Get::Remove</literal>."
@@ -1814,7 +1814,7 @@ msgstr ""
 "preguntar. Opción de configuración: <literal>APT::Get::Remove</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:500
+#: apt-get.8.xml:494
 msgid ""
 "If the command is either <literal>install</literal> or <literal>remove</"
 "literal>, then this option acts like running the <literal>autoremove</"
@@ -1827,7 +1827,7 @@ msgstr ""
 "Get::AutomaticRemove</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:507
+#: apt-get.8.xml:501
 msgid ""
 "Only has meaning for the <literal>source</literal> and <literal>build-dep</"
 "literal> commands.  Indicates that the given source names are not to be "
@@ -1847,7 +1847,7 @@ msgstr ""
 "literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:518
+#: apt-get.8.xml:512
 msgid ""
 "Download only the diff, dsc, or tar file of a source archive.  Configuration "
 "Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</"
@@ -1858,7 +1858,7 @@ msgstr ""
 "Dsc-Only</literal> y <literal>APT::Get::Tar-Only</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:524
+#: apt-get.8.xml:518
 msgid ""
 "Only process architecture-dependent build-dependencies.  Configuration Item: "
 "<literal>APT::Get::Arch-Only</literal>."
@@ -1867,7 +1867,7 @@ msgstr ""
 "arquitectura. Opción de configuración: <literal>APT::Get::Arch-Only</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:529
+#: apt-get.8.xml:523
 msgid ""
 "Ignore if packages can't be authenticated and don't prompt about it.  This "
 "is useful for tools like pbuilder.  Configuration Item: <literal>APT::Get::"
@@ -1878,7 +1878,7 @@ msgstr ""
 "configuración: <literal>APT::Get::AllowUnauthenticated</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:535
+#: apt-get.8.xml:529
 msgid ""
 "Show user friendly progress information in the terminal window when packages "
 "are installed, upgraded or removed. For a machine parsable version of this "
@@ -1888,13 +1888,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:548 apt-cache.8.xml:345 apt-key.8.xml:176 apt-mark.8.xml:127
-#: apt.conf.5.xml:1221 apt_preferences.5.xml:700
+#: apt-get.8.xml:542 apt-cache.8.xml:339 apt-key.8.xml:170 apt-mark.8.xml:121
+#: apt.conf.5.xml:1216 apt_preferences.5.xml:694
 msgid "Files"
 msgstr "Ficheros"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:559
+#: apt-get.8.xml:553
 #, fuzzy
 #| msgid ""
 #| "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
@@ -1910,7 +1910,7 @@ msgstr ""
 "preferences;, el Cómo de APT."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:565
+#: apt-get.8.xml:559
 msgid ""
 "<command>apt-get</command> returns zero on normal operation, decimal 100 on "
 "error."
@@ -1919,12 +1919,12 @@ msgstr ""
 "100 en caso de error."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-cache.8.xml:35
+#: apt-cache.8.xml:29
 msgid "query the APT cache"
 msgstr "Realiza consultas al caché de APT"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:41
+#: apt-cache.8.xml:35
 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 "
@@ -1937,7 +1937,7 @@ msgstr ""
 "genera información interesante a partir de los metadatos del paquete."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:51
+#: apt-cache.8.xml:45
 msgid ""
 "<literal>gencaches</literal> creates APT's package cache. This is done "
 "implicitly by all commands needing this cache if it is missing or outdated."
@@ -1947,14 +1947,14 @@ msgstr ""
 "si está obsoleta."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
-#: apt-cache.8.xml:55 apt-cache.8.xml:144 apt-cache.8.xml:165
-#: apt-cache.8.xml:187 apt-cache.8.xml:192 apt-cache.8.xml:208
-#: apt-cache.8.xml:226 apt-cache.8.xml:238
+#: apt-cache.8.xml:49 apt-cache.8.xml:138 apt-cache.8.xml:159
+#: apt-cache.8.xml:181 apt-cache.8.xml:186 apt-cache.8.xml:202
+#: apt-cache.8.xml:220 apt-cache.8.xml:232
 msgid "&synopsis-pkg;"
 msgstr "&synopsis-pkg;"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:56
+#: apt-cache.8.xml:50
 msgid ""
 "<literal>showpkg</literal> displays information about the packages listed on "
 "the command line. Remaining arguments are package names. The available "
@@ -1978,7 +1978,7 @@ msgstr ""
 "siguiente:"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
-#: apt-cache.8.xml:68
+#: apt-cache.8.xml:62
 #, no-wrap
 msgid ""
 "Package: libreadline2\n"
@@ -2004,7 +2004,7 @@ msgstr ""
 "Reverse Provides: \n"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:80
+#: apt-cache.8.xml:74
 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, "
@@ -2023,7 +2023,7 @@ msgstr ""
 "salida lo mejor es consultar el código fuente de apt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:89
+#: apt-cache.8.xml:83
 msgid ""
 "<literal>stats</literal> displays some statistics about the cache.  No "
 "further arguments are expected. Statistics reported are:"
@@ -2032,7 +2032,7 @@ msgstr ""
 "necesita ningún argumento adicional. Las estadísticas que muestra son:"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:92
+#: apt-cache.8.xml:86
 msgid ""
 "<literal>Total package names</literal> is the number of package names found "
 "in the cache."
@@ -2041,7 +2041,7 @@ msgstr ""
 "encontrados en la caché."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:96
+#: apt-cache.8.xml:90
 msgid ""
 "<literal>Normal packages</literal> is the number of regular, ordinary "
 "package names; these are packages that bear a one-to-one correspondence "
@@ -2054,7 +2054,7 @@ msgstr ""
 "dependencias. La mayoría de los paquetes pertenecen a este grupo."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:102
+#: apt-cache.8.xml:96
 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 "
@@ -2071,7 +2071,7 @@ msgstr ""
 "agent», pero no hay ningún paquete que se llame «mail-transport-agent»."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:110
+#: apt-cache.8.xml:104
 msgid ""
 "<literal>Single virtual packages</literal> is the number of packages with "
 "only one package providing a particular virtual package. For example, in the "
@@ -2084,7 +2084,7 @@ msgstr ""
 "paquete, xless, proporciona «X11-text-viewer»."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:116
+#: apt-cache.8.xml:110
 msgid ""
 "<literal>Mixed virtual packages</literal> is the number of packages that "
 "either provide a particular virtual package or have the virtual package name "
@@ -2098,7 +2098,7 @@ msgstr ""
 "paquete debconf-tiny."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:123
+#: apt-cache.8.xml:117
 msgid ""
 "<literal>Missing</literal> is the number of package names that were "
 "referenced in a dependency but were not provided by any package. Missing "
@@ -2114,7 +2114,7 @@ msgstr ""
 "«Conflicts» o «Breaks» de la descripción de los paquetes."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:130
+#: apt-cache.8.xml:124
 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 "
@@ -2129,7 +2129,7 @@ msgstr ""
 "considerablemente mayor que el número total de paquetes."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:137
+#: apt-cache.8.xml:131
 msgid ""
 "<literal>Total dependencies</literal> is the number of dependency "
 "relationships claimed by all of the packages in the cache."
@@ -2138,7 +2138,7 @@ msgstr ""
 "dependencia de todos los paquetes de la caché."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:145
+#: apt-cache.8.xml:139
 msgid ""
 "<literal>showsrc</literal> displays all the source package records that "
 "match the given package names. All versions are shown, as well as all "
@@ -2150,7 +2150,7 @@ msgstr ""
 "son binarios."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:151
+#: apt-cache.8.xml:145
 msgid ""
 "<literal>dump</literal> shows a short listing of every package in the cache. "
 "It is primarily for debugging."
@@ -2159,7 +2159,7 @@ msgstr ""
 "la caché. Fundamentalmente para depuración."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:156
+#: apt-cache.8.xml:150
 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."
@@ -2169,7 +2169,7 @@ msgstr ""
 "además, la usa el método &dselect;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:161
+#: apt-cache.8.xml:155
 msgid ""
 "<literal>unmet</literal> displays a summary of all unmet dependencies in the "
 "package cache."
@@ -2178,7 +2178,7 @@ msgstr ""
 "satisfechas en la caché de paquetes."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:166
+#: apt-cache.8.xml:160
 msgid ""
 "<literal>show</literal> performs a function similar to <command>dpkg --print-"
 "avail</command>; it displays the package records for the named packages."
@@ -2187,12 +2187,12 @@ msgstr ""
 "avail</command>, muestra los campos del paquete para los paquetes nombrados."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
-#: apt-cache.8.xml:171
+#: apt-cache.8.xml:165
 msgid "&synopsis-regex;"
 msgstr "&synopsis-regex;"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:172
+#: apt-cache.8.xml:166
 msgid ""
 "<literal>search</literal> performs a full text search on all available "
 "package lists for the POSIX regex pattern given, see &regex;.  It searches "
@@ -2214,7 +2214,7 @@ msgstr ""
 "de los paquetes, no en la descripción larga."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:183
+#: apt-cache.8.xml:177
 msgid ""
 "Separate arguments can be used to specify multiple search patterns that are "
 "and'ed together."
@@ -2223,7 +2223,7 @@ msgstr ""
 "búsqueda que se juntarán mediante una «Y lógica»."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:188
+#: apt-cache.8.xml:182
 msgid ""
 "<literal>depends</literal> shows a listing of each dependency a package has "
 "and all the possible other packages that can fulfill that dependency."
@@ -2232,7 +2232,7 @@ msgstr ""
 "paquete y de todos los demás paquetes que la pueden satisfacer."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:193
+#: apt-cache.8.xml:187
 msgid ""
 "<literal>rdepends</literal> shows a listing of each reverse dependency a "
 "package has."
@@ -2240,12 +2240,12 @@ msgstr ""
 "<literal>rdepends</literal> muestra las dependencias inversas de un paquete."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:197
+#: apt-cache.8.xml:191
 msgid "<optional><replaceable>&synopsis-prefix;</replaceable></optional>"
 msgstr "<optional><replaceable>&synopsis-prefix;</replaceable></optional>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:198
+#: apt-cache.8.xml:192
 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 "
@@ -2261,7 +2261,7 @@ msgstr ""
 "generate</option>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:203
+#: apt-cache.8.xml:197
 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 "
@@ -2272,7 +2272,7 @@ msgstr ""
 "virtuales también aparecen en la lista generada."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:209
+#: apt-cache.8.xml:203
 msgid ""
 "<literal>dotty</literal> takes a list of packages on the command line and "
 "generates output suitable for use by dotty from the <ulink url=\"http://www."
@@ -2293,7 +2293,7 @@ msgstr ""
 "active la opción <literal>APT::Cache::GivenOnly</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:218
+#: apt-cache.8.xml:212
 msgid ""
 "The resulting nodes will have several shapes; normal packages are boxes, "
 "pure virtual packages are triangles, mixed virtual packages are diamonds, "
@@ -2308,12 +2308,12 @@ msgstr ""
 "líneas verdes son conflictos."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:223
+#: apt-cache.8.xml:217
 msgid "Caution, dotty cannot graph larger sets of packages."
 msgstr "Tenga cuidado, dotty no puede dibujar grandes conjuntos de paquetes."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:227
+#: apt-cache.8.xml:221
 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 tool</ulink>."
@@ -2323,12 +2323,12 @@ msgstr ""
 "ulink>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:231
+#: apt-cache.8.xml:225
 msgid "<optional><replaceable>&synopsis-pkg;</replaceable>…</optional>"
 msgstr "<optional><replaceable>&synopsis-pkg;</replaceable>…</optional>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:232
+#: apt-cache.8.xml:226
 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 "
@@ -2341,7 +2341,7 @@ msgstr ""
 "detallada acerca de la prioridad de selección del paquete nombrado."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:239
+#: apt-cache.8.xml:233
 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 "
@@ -2360,7 +2360,7 @@ msgstr ""
 "paquetes (<literal>APT::Architecture</literal>)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:255
+#: apt-cache.8.xml:249
 msgid ""
 "Select the file to store the package cache. The package cache is the primary "
 "cache used by all operations.  Configuration Item: <literal>Dir::Cache::"
@@ -2371,7 +2371,7 @@ msgstr ""
 "configuración: <literal>Dir::Cache::pkgcache</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:261
+#: apt-cache.8.xml:255
 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 "
@@ -2386,7 +2386,7 @@ msgstr ""
 "Opción de configuración: <literal>Dir::Cache::srcpkgcache</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:269
+#: apt-cache.8.xml:263
 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 "
@@ -2400,7 +2400,7 @@ msgstr ""
 "configuración: <literal>quiet</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:276
+#: apt-cache.8.xml:270
 msgid ""
 "Print only important dependencies; for use with <literal>unmet</literal> and "
 "<literal>depends</literal>. Causes only Depends and Pre-Depends relations to "
@@ -2412,7 +2412,7 @@ msgstr ""
 "Cache::Important</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:290
+#: apt-cache.8.xml:284
 msgid ""
 "Per default the <literal>depends</literal> and <literal>rdepends</literal> "
 "print all dependencies. This can be tweaked with these flags which will omit "
@@ -2428,7 +2428,7 @@ msgstr ""
 "<literal>APT::Cache::ShowRecommends</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:297
+#: apt-cache.8.xml:291
 msgid ""
 "Print full package records when searching.  Configuration Item: "
 "<literal>APT::Cache::ShowFull</literal>."
@@ -2437,7 +2437,7 @@ msgstr ""
 "Opción de configuración: <literal>APT::Cache::ShowFull</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:302
+#: apt-cache.8.xml:296
 msgid ""
 "Print full records for all available versions. This is the default; to turn "
 "it off, use <option>--no-all-versions</option>.  If <option>--no-all-"
@@ -2454,7 +2454,7 @@ msgstr ""
 "configuración: <literal>APT::Cache::AllVersions</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:311
+#: apt-cache.8.xml:305
 msgid ""
 "Perform automatic package cache regeneration, rather than use the cache as "
 "it is. This is the default; to turn it off, use <option>--no-generate</"
@@ -2466,7 +2466,7 @@ msgstr ""
 "Cache::Generate</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:317
+#: apt-cache.8.xml:311
 msgid ""
 "Only search on the package names, not the long descriptions.  Configuration "
 "Item: <literal>APT::Cache::NamesOnly</literal>."
@@ -2475,7 +2475,7 @@ msgstr ""
 "Opción de configuración: <literal>APT::Cache::NamesOnly</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:322
+#: apt-cache.8.xml:316
 msgid ""
 "Make <literal>pkgnames</literal> print all names, including virtual packages "
 "and missing dependencies.  Configuration Item: <literal>APT::Cache::"
@@ -2486,7 +2486,7 @@ msgstr ""
 "configuración: <literal>APT::Cache::AllNames</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:328
+#: apt-cache.8.xml:322
 msgid ""
 "Make <literal>depends</literal> and <literal>rdepends</literal> recursive so "
 "that all packages mentioned are printed once.  Configuration Item: "
@@ -2497,7 +2497,7 @@ msgstr ""
 "vez. Opción de configuración <literal>APT::Cache::RecurseDepends</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:335
+#: apt-cache.8.xml:329
 msgid ""
 "Limit the output of <literal>depends</literal> and <literal>rdepends</"
 "literal> to packages which are currently installed.  Configuration Item: "
@@ -2508,12 +2508,12 @@ msgstr ""
 "Cache::Installed</literal>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:353
+#: apt-cache.8.xml:347
 msgid "&apt-conf;, &sources-list;, &apt-get;"
 msgstr "&apt-conf;, &sources-list;, &apt-get;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:358
+#: apt-cache.8.xml:352
 msgid ""
 "<command>apt-cache</command> returns zero on normal operation, decimal 100 "
 "on error."
@@ -2522,12 +2522,12 @@ msgstr ""
 "valor 100 en caso de error."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-key.8.xml:34
+#: apt-key.8.xml:28
 msgid "APT key management utility"
 msgstr "Herramienta para gestionar las claves de APT"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:41
+#: apt-key.8.xml:35
 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 "
@@ -2538,12 +2538,12 @@ msgstr ""
 "claves se consideran de confianza."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-key.8.xml:47
+#: apt-key.8.xml:41
 msgid "Commands"
 msgstr "Órdenes"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:52
+#: apt-key.8.xml:46
 msgid ""
 "Add a new key to the list of trusted keys.  The key is read from the "
 "filename given with the parameter &synopsis-param-filename; or if the "
@@ -2554,32 +2554,32 @@ msgstr ""
 "entrada estándar si el nombre de fichero se define como <literal>-</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:65
+#: apt-key.8.xml:59
 msgid "Remove a key from the list of trusted keys."
 msgstr "Elimina una clave de la lista de claves de confianza."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:76
+#: apt-key.8.xml:70
 msgid "Output the key &synopsis-param-keyid; to standard output."
 msgstr "Muestra la clave &synopsis-param-keyid; por la salida estándar."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:87
+#: apt-key.8.xml:81
 msgid "Output all trusted keys to standard output."
 msgstr "Devuelve todas las claves de confianza por la salida estándar."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:98
+#: apt-key.8.xml:92
 msgid "List trusted keys."
 msgstr "Lista las claves de confianza."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:109
+#: apt-key.8.xml:103
 msgid "List fingerprints of trusted keys."
 msgstr "Lista las huellas digitales de las claves de confianza."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:120
+#: apt-key.8.xml:114
 msgid ""
 "Pass advanced options to gpg. With adv --recv-key you can download the "
 "public key."
@@ -2588,7 +2588,7 @@ msgstr ""
 "«adv --recv-key»."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:132
+#: apt-key.8.xml:126
 msgid ""
 "Update the local keyring with the archive keyring and remove from the local "
 "keyring the archive keys which are no longer valid.  The archive keyring is "
@@ -2602,7 +2602,7 @@ msgstr ""
 "en &keyring-distro;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:146
+#: apt-key.8.xml:140
 msgid ""
 "Perform an update working similarly to the <command>update</command> command "
 "above, but get the archive keyring from a URI instead and validate it "
@@ -2620,12 +2620,12 @@ msgstr ""
 "de APT para Ubuntu sí es compatible."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-key.8.xml:162 apt-cdrom.8.xml:82
+#: apt-key.8.xml:156 apt-cdrom.8.xml:76
 msgid "Options"
 msgstr "Opciones"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:163
+#: apt-key.8.xml:157
 msgid ""
 "Note that options need to be defined before the commands described in the "
 "previous section."
@@ -2634,7 +2634,7 @@ msgstr ""
 "descritas en el sección anterior."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:166
+#: apt-key.8.xml:160
 msgid ""
 "With this option it is possible to specify a particular keyring file the "
 "command should operate on. The default is that a command is executed on the "
@@ -2651,49 +2651,49 @@ msgstr ""
 "es, por ejemplo, que las claves nuevas se añaden a este fichero."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:181
+#: apt-key.8.xml:175
 msgid "<filename>/etc/apt/trustdb.gpg</filename>"
 msgstr "<filename>/etc/apt/trustdb.gpg</filename>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:182
+#: apt-key.8.xml:176
 msgid "Local trust database of archive keys."
 msgstr "Base de datos local de las claves de confianza de archivos Debian"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:185
+#: apt-key.8.xml:179
 msgid "&keyring-filename;"
 msgstr "&keyring-filename;"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:186
+#: apt-key.8.xml:180
 msgid "Keyring of &keyring-distro; archive trusted keys."
 msgstr "Registro de las claves de confianza del archivo de &keyring-distro;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:189
+#: apt-key.8.xml:183
 msgid "&keyring-removed-filename;"
 msgstr "&keyring-removed-filename;"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:190
+#: apt-key.8.xml:184
 msgid "Keyring of &keyring-distro; archive removed trusted keys."
 msgstr ""
 "Registro de las claves de confianza eliminadas del archivo de &keyring-"
 "distro;."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:199
+#: apt-key.8.xml:193
 msgid "&apt-get;, &apt-secure;"
 msgstr "&apt-get;, &apt-secure;"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-mark.8.xml:35
+#: apt-mark.8.xml:29
 msgid "mark/unmark a package as being automatically-installed"
 msgstr "Marca o desmarca un paquete como instalado automáticamente"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:41
+#: apt-mark.8.xml:35
 msgid ""
 "<command>apt-mark</command> will change whether a package has been marked as "
 "being automatically installed."
@@ -2702,7 +2702,7 @@ msgstr ""
 "o no."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:45
+#: apt-mark.8.xml:39
 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 "
@@ -2718,7 +2718,7 @@ msgstr ""
 "eliminará."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:54
+#: apt-mark.8.xml:48
 msgid ""
 "<literal>auto</literal> is used to mark a package as being automatically "
 "installed, which will cause the package to be removed when no more manually "
@@ -2729,7 +2729,7 @@ msgstr ""
 "ningún otro paquete manualmente instalado depende de este paquete."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:62
+#: apt-mark.8.xml:56
 msgid ""
 "<literal>manual</literal> is used to mark a package as being manually "
 "installed, which will prevent the package from being automatically removed "
@@ -2740,7 +2740,7 @@ msgstr ""
 "otro depende de él."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:70
+#: apt-mark.8.xml:64
 msgid ""
 "<literal>hold</literal> is used to mark a package as held back, which will "
 "prevent the package from being automatically installed, upgraded or "
@@ -2755,7 +2755,7 @@ msgstr ""
 "file</option> tenga efecto sobre él."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:80
+#: apt-mark.8.xml:74
 msgid ""
 "<literal>unhold</literal> is used to cancel a previously set hold on a "
 "package to allow all actions again."
@@ -2764,7 +2764,7 @@ msgstr ""
 "sobre un paquete previamente marcado con «hold»."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:86
+#: apt-mark.8.xml:80
 msgid ""
 "<literal>showauto</literal> is used to print a list of automatically "
 "installed packages with each package on a new line.  All automatically "
@@ -2777,7 +2777,7 @@ msgstr ""
 "paquetes solo se muestran aquellos automáticamente instalados."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:94
+#: apt-mark.8.xml:88
 msgid ""
 "<literal>showmanual</literal> can be used in the same way as "
 "<literal>showauto</literal> except that it will print a list of manually "
@@ -2788,7 +2788,7 @@ msgstr ""
 "paquetes manualmente instalados."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:101
+#: apt-mark.8.xml:95
 msgid ""
 "<literal>showhold</literal> is used to print a list of packages on hold in "
 "the same way as for the other show commands."
@@ -2797,7 +2797,7 @@ msgstr ""
 "de la misma forma que las otras órdenes «show»."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:117
+#: apt-mark.8.xml:111
 msgid ""
 "Read/Write package stats from the filename given with the parameter "
 "&synopsis-param-filename; instead of from the default location, which is "
@@ -2811,7 +2811,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:138
+#: apt-mark.8.xml:132
 msgid ""
 "<command>apt-mark</command> returns zero on normal operation, non-zero on "
 "error."
@@ -2820,12 +2820,12 @@ msgstr ""
 "100 en caso de error."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-secure.8.xml:49
+#: apt-secure.8.xml:43
 msgid "Archive authentication support for APT"
 msgstr "Compatibilidad con la autenticación en el archivo para APT"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:54
+#: apt-secure.8.xml:48
 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 "
@@ -2838,7 +2838,7 @@ msgstr ""
 "sin acceso a la clave con la que se firmó el fichero «Release»."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:62
+#: apt-secure.8.xml:56
 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 "
@@ -2854,7 +2854,7 @@ msgstr ""
 "ellas."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:71
+#: apt-secure.8.xml:65
 msgid ""
 "The package frontends &apt-get;, &aptitude; and &synaptic; support this new "
 "authentication feature."
@@ -2863,12 +2863,12 @@ msgstr ""
 "pueden usar esta nueva funcionalidad de autenticación."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:76
+#: apt-secure.8.xml:70
 msgid "Trusted archives"
 msgstr "Archivos de confianza"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:79
+#: apt-secure.8.xml:73
 msgid ""
 "The chain of trust from an apt archive to the end user is made up of several "
 "steps. <command>apt-secure</command> is the last step in this chain; "
@@ -2885,7 +2885,7 @@ msgstr ""
 "asegurar que la integridad del archivo es correcta."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:87
+#: apt-secure.8.xml:81
 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 "
@@ -2898,7 +2898,7 @@ msgstr ""
 "devscripts respectivamente)."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:94
+#: apt-secure.8.xml:88
 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. In order to become "
@@ -2916,7 +2916,7 @@ msgstr ""
 "identidad del propietario de la clave."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:104
+#: apt-secure.8.xml:98
 msgid ""
 "Once the uploaded package is verified and included in the archive, the "
 "maintainer signature is stripped off, and checksums of the package are "
@@ -2938,7 +2938,7 @@ msgstr ""
 "&keyring-distro; en el paquete &keyring-package; package."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:115
+#: apt-secure.8.xml:109
 msgid ""
 "End users can check the signature of the Release file, extract a checksum of "
 "a package from it and compare it with the checksum of the package they "
@@ -2950,7 +2950,7 @@ msgstr ""
 "APT."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:120
+#: apt-secure.8.xml:114
 msgid ""
 "Notice that this is distinct from checking signatures on a per package "
 "basis. It is designed to prevent two possible attacks:"
@@ -2959,7 +2959,7 @@ msgstr ""
 "individualmente. Se diseñó para prevenir dos posible ataques:"
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:125
+#: apt-secure.8.xml:119
 msgid ""
 "<literal>Network \"man in the middle\" attacks</literal>. Without signature "
 "checking, malicious agents can introduce themselves into the package "
@@ -2975,7 +2975,7 @@ msgstr ""
 "envenenamiento de ARP o de DNS)."
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:133
+#: apt-secure.8.xml:127
 msgid ""
 "<literal>Mirror network compromise</literal>.  Without signature checking, a "
 "malicious agent can compromise a mirror host and modify the files in it to "
@@ -2988,7 +2988,7 @@ msgstr ""
 "usuarios que descarguen paquetes de dicha réplica."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:140
+#: apt-secure.8.xml:134
 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 "
@@ -3001,12 +3001,12 @@ msgstr ""
 "una firma por paquete."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:146
+#: apt-secure.8.xml:140
 msgid "User configuration"
 msgstr "Configuración de usuario"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:148
+#: apt-secure.8.xml:142
 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 "
@@ -3020,7 +3020,7 @@ msgstr ""
 "paquetes de Debian."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:155
+#: apt-secure.8.xml:149
 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 "
@@ -3037,12 +3037,12 @@ msgstr ""
 "archivos de paquetes configurados."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:164
+#: apt-secure.8.xml:158
 msgid "Archive configuration"
 msgstr "Configuración del archivo"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:166
+#: apt-secure.8.xml:160
 msgid ""
 "If you want to provide archive signatures in an archive under your "
 "maintenance you have to:"
@@ -3051,7 +3051,7 @@ msgstr ""
 "que:"
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:171
+#: apt-secure.8.xml:165
 msgid ""
 "<emphasis>Create a toplevel Release file</emphasis>, if it does not exist "
 "already. You can do this by running <command>apt-ftparchive release</"
@@ -3062,7 +3062,7 @@ msgstr ""
 "utils)."
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:176
+#: apt-secure.8.xml:170
 msgid ""
 "<emphasis>Sign it</emphasis>. You can do this by running <command>gpg --"
 "clearsign -o InRelease Release</command> and <command>gpg -abs -o Release."
@@ -3073,7 +3073,7 @@ msgstr ""
 "o Release.gpg Release</command>."
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:180
+#: apt-secure.8.xml:174
 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 "
@@ -3084,7 +3084,7 @@ msgstr ""
 "del archivo."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:187
+#: apt-secure.8.xml:181
 msgid ""
 "Whenever the contents of the archive change (new packages are added or "
 "removed) the archive maintainer has to follow the first two steps outlined "
@@ -3095,16 +3095,16 @@ msgstr ""
 "explicados anteriormente."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:195
+#: apt-secure.8.xml:189
 msgid ""
 "&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, "
-"&debsign; &debsig-verify;, &gpg;"
+"&debsign;, &debsig-verify;, &gpg;"
 msgstr ""
 "&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, "
-"&debsign; &debsig-verify;, &gpg;"
+"&debsign;, &debsig-verify;, &gpg;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:199
+#: apt-secure.8.xml:193
 msgid ""
 "For more background information you might want to review the <ulink url="
 "\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "
@@ -3121,12 +3121,12 @@ msgstr ""
 "una Distribución</ulink> de V. Alex Brennen."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:212
+#: apt-secure.8.xml:206
 msgid "Manpage Authors"
 msgstr "Autores de la página del manual"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:214
+#: apt-secure.8.xml:208
 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."
@@ -3135,12 +3135,12 @@ msgstr ""
 "Peña, Isaac Jones, Colin Walters, Florian Weimer y Michael Vogt."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-cdrom.8.xml:34
+#: apt-cdrom.8.xml:28
 msgid "APT CD-ROM management utility"
 msgstr "Herramienta de APT para la gestión de discos ópticos"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:40
+#: apt-cdrom.8.xml:34
 msgid ""
 "<command>apt-cdrom</command> is used to add a new CD-ROM to APT's list of "
 "available sources. <command>apt-cdrom</command> takes care of determining "
@@ -3153,7 +3153,7 @@ msgstr ""
 "verifica los ficheros de índice."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:47
+#: apt-cdrom.8.xml:41
 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 disc in a multi-CD set "
@@ -3165,7 +3165,7 @@ msgstr ""
 "errores de grabación."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:58
+#: apt-cdrom.8.xml:52
 msgid ""
 "<literal>add</literal> is used to add a new disc to the source list. It will "
 "unmount the CD-ROM device, prompt for a disc to be inserted and then proceed "
@@ -3180,7 +3180,7 @@ msgstr ""
 "título descriptivo."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:66
+#: apt-cdrom.8.xml:60
 msgid ""
 "APT uses a CD-ROM ID to track which disc is currently in the drive and "
 "maintains a database of these IDs in <filename>&statedir;/cdroms.list</"
@@ -3191,7 +3191,7 @@ msgstr ""
 "identificadores en <filename>&statedir;/cdroms.list</filename>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:74
+#: apt-cdrom.8.xml:68
 msgid ""
 "A debugging tool to report the identity of the current disc as well as the "
 "stored file name"
@@ -3200,7 +3200,7 @@ msgstr ""
 "así como del nombre del fichero guardado."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:87
+#: apt-cdrom.8.xml:81
 #, fuzzy
 #| msgid ""
 #| "Mount point; specify the location to mount the CD-ROM. This mount point "
@@ -3217,7 +3217,7 @@ msgstr ""
 "mount</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:95
+#: apt-cdrom.8.xml:89
 msgid ""
 "Mount point; specify the location to mount the CD-ROM. This mount point must "
 "be listed in <filename>/etc/fstab</filename> and properly configured.  "
@@ -3229,7 +3229,7 @@ msgstr ""
 "mount</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:104
+#: apt-cdrom.8.xml:98
 msgid ""
 "Rename a disc; change the label of a disc or override the disc's given "
 "label. This option will cause <command>apt-cdrom</command> to prompt for a "
@@ -3241,7 +3241,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:113
+#: apt-cdrom.8.xml:107
 msgid ""
 "No mounting; prevent <command>apt-cdrom</command> from mounting and "
 "unmounting the mount point.  Configuration Item: <literal>APT::CDROM::"
@@ -3251,7 +3251,7 @@ msgstr ""
 "de montaje. Opción de configuración: <literal>APT::CDROM::NoMount</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:121
+#: apt-cdrom.8.xml:115
 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 "
@@ -3264,7 +3264,7 @@ msgstr ""
 "de configuración: <literal>APT::CDROM::Fast</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:131
+#: apt-cdrom.8.xml:125
 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 "
@@ -3276,7 +3276,7 @@ msgstr ""
 "pero encontrará todo el contenido."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:142
+#: apt-cdrom.8.xml:136
 msgid ""
 "No Changes; Do not change the &sources-list; file and do not write index "
 "files. Everything is still checked however.  Configuration Item: "
@@ -3287,12 +3287,12 @@ msgstr ""
 "CDROM::NoAct</literal>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:155
+#: apt-cdrom.8.xml:149
 msgid "&apt-conf;, &apt-get;, &sources-list;"
 msgstr "&apt-conf;, &apt-get;, &sources-list;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:160
+#: apt-cdrom.8.xml:154
 msgid ""
 "<command>apt-cdrom</command> returns zero on normal operation, decimal 100 "
 "on error."
@@ -3301,12 +3301,12 @@ msgstr ""
 "100 en caso de error."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-config.8.xml:35
+#: apt-config.8.xml:29
 msgid "APT Configuration Query program"
 msgstr "Programa para consultar la configuración de APT"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:41
+#: apt-config.8.xml:35
 msgid ""
 "<command>apt-config</command> is an internal program used by various "
 "portions of the APT suite to provide consistent configurability. It accesses "
@@ -3320,7 +3320,7 @@ msgstr ""
 "sencillo de usar por aplicaciones con scripts."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:53
+#: apt-config.8.xml:47
 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 the "
@@ -3336,7 +3336,7 @@ msgstr ""
 "manera en un script de intérprete de órdenes:"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
-#: apt-config.8.xml:61
+#: apt-config.8.xml:55
 #, no-wrap
 msgid ""
 "OPTS=\"-f\"\n"
@@ -3348,7 +3348,7 @@ msgstr ""
 "eval $RES\n"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:66
+#: apt-config.8.xml:60
 msgid ""
 "This will set the shell environment variable $OPTS to the value of MyApp::"
 "options with a default of <option>-f</option>."
@@ -3357,7 +3357,7 @@ msgstr ""
 "valor de MyApp::Opciones, y con <option>-f</option> por omisión."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:70
+#: apt-config.8.xml:64
 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 "
@@ -3370,12 +3370,12 @@ msgstr ""
 "internamente."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:79
+#: apt-config.8.xml:73
 msgid "Just show the contents of the configuration space."
 msgstr "Sólo muestra el contenido del espacio de configuración."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:92
+#: apt-config.8.xml:86
 msgid ""
 "Include options which have an empty value. This is the default, so use --no-"
 "empty to remove them from the output."
@@ -3384,12 +3384,12 @@ msgstr ""
 "predeterminado, utilice «--no-empty» para eliminarlos de la salida."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
-#: apt-config.8.xml:97
+#: apt-config.8.xml:91
 msgid "&percnt;f &#x0022;&percnt;v&#x0022;;&percnt;n"
 msgstr "&percnt;f &#x0022;&percnt;v&#x0022;;&percnt;n"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:98
+#: apt-config.8.xml:92
 msgid ""
 "Defines the output of each config option. &percnt;t will be replaced with "
 "its individual name, &percnt;f with its full hierarchical name and &percnt;v "
@@ -3407,13 +3407,13 @@ msgstr ""
 "utilizando &percnt;&percnt;."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:112 apt-extracttemplates.1.xml:73 apt-sortpkgs.1.xml:66
-#: apt-ftparchive.1.xml:610
+#: apt-config.8.xml:106 apt-extracttemplates.1.xml:67 apt-sortpkgs.1.xml:60
+#: apt-ftparchive.1.xml:604
 msgid "&apt-conf;"
 msgstr "&apt-conf;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:117
+#: apt-config.8.xml:111
 msgid ""
 "<command>apt-config</command> returns zero on normal operation, decimal 100 "
 "on error."
@@ -3422,27 +3422,27 @@ msgstr ""
 "valor 100 en caso de error."
 
 #. type: Content of: <refentry><refentryinfo><author><contrib>
-#: apt.conf.5.xml:22
+#: apt.conf.5.xml:16
 msgid "Initial documentation of Debug::*."
 msgstr "Documentación inicial de Debug::*."
 
 #. type: Content of: <refentry><refentryinfo><author><email>
-#: apt.conf.5.xml:23
+#: apt.conf.5.xml:17
 msgid "dburrows@debian.org"
 msgstr "dburrows@debian.org"
 
 #. type: Content of: <refentry><refmeta><manvolnum>
-#: apt.conf.5.xml:33 apt_preferences.5.xml:27 sources.list.5.xml:28
+#: apt.conf.5.xml:27 apt_preferences.5.xml:21 sources.list.5.xml:22
 msgid "5"
 msgstr "5"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt.conf.5.xml:40
+#: apt.conf.5.xml:34
 msgid "Configuration file for APT"
 msgstr "Fichero de configuración de APT"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:44
+#: apt.conf.5.xml:38
 msgid ""
 "<filename>/etc/apt/apt.conf</filename> is the main configuration file shared "
 "by all the tools in the APT suite of tools, though it is by no means the "
@@ -3456,7 +3456,7 @@ msgstr ""
 "ofrecer un entorno homogéneo."
 
 #. type: Content of: <refentry><refsect1><orderedlist><para>
-#: apt.conf.5.xml:50
+#: apt.conf.5.xml:44
 msgid ""
 "When an APT tool starts up it will read the configuration files in the "
 "following order:"
@@ -3465,7 +3465,7 @@ msgstr ""
 "en el siguiente orden:"
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:52
+#: apt.conf.5.xml:46
 msgid ""
 "the file specified by the <envar>APT_CONFIG</envar> environment variable (if "
 "any)"
@@ -3474,7 +3474,7 @@ msgstr ""
 "existir)."
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:54
+#: apt.conf.5.xml:48
 msgid ""
 "all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending "
 "order which have either no or \"<literal>conf</literal>\" as filename "
@@ -3493,7 +3493,7 @@ msgstr ""
 "forma silenciosa."
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:61
+#: apt.conf.5.xml:55
 msgid ""
 "the main configuration file specified by <literal>Dir::Etc::main</literal>"
 msgstr ""
@@ -3501,7 +3501,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:63
+#: apt.conf.5.xml:57
 msgid ""
 "the command line options are applied to override the configuration "
 "directives or to load even more configuration files."
@@ -3510,12 +3510,12 @@ msgstr ""
 "configuración o para cargar más ficheros de configuración."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:67
+#: apt.conf.5.xml:61
 msgid "Syntax"
 msgstr "Sintaxis"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:68
+#: apt.conf.5.xml:62
 msgid ""
 "The configuration file is organized in a tree with options organized into "
 "functional groups. Option specification is given with a double colon "
@@ -3530,7 +3530,7 @@ msgstr ""
 "APT. Las opciones no se heredan de sus grupos paternos."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:74
+#: apt.conf.5.xml:68
 msgid ""
 "Syntactically the configuration language is modeled after what the ISC tools "
 "such as bind and dhcp use. Lines starting with <literal>//</literal> are "
@@ -3556,7 +3556,7 @@ msgstr ""
 "llaves, como:"
 
 #. type: Content of: <refentry><refsect1><informalexample><programlisting>
-#: apt.conf.5.xml:87
+#: apt.conf.5.xml:81
 #, no-wrap
 msgid ""
 "APT {\n"
@@ -3574,7 +3574,7 @@ msgstr ""
 "};\n"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:95
+#: apt.conf.5.xml:89
 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 "
@@ -3586,13 +3586,13 @@ msgstr ""
 "separadas por punto y coma."
 
 #. type: Content of: <refentry><refsect1><informalexample><programlisting>
-#: apt.conf.5.xml:100
+#: apt.conf.5.xml:94
 #, no-wrap
 msgid "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n"
 msgstr "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:103
+#: apt.conf.5.xml:97
 msgid ""
 "In general the sample configuration file &configureindex; is a good guide "
 "for how it should look."
@@ -3601,7 +3601,7 @@ msgstr ""
 "buena guía para entender su aspecto."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:106
+#: apt.conf.5.xml:100
 msgid ""
 "Case is not significant in names of configuration items, so in the previous "
 "example you could use <literal>dpkg::pre-install-pkgs</literal>."
@@ -3611,7 +3611,7 @@ msgstr ""
 "<literal>dpkg::pre-install-pkgs</literal>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:109
+#: apt.conf.5.xml:103
 msgid ""
 "Names for the configuration items are optional if a list is defined as can "
 "be seen in the <literal>DPkg::Pre-Install-Pkgs</literal> example above. If "
@@ -3626,7 +3626,7 @@ msgstr ""
 "cualquier otra opción reasignando un nuevo valor a la opción."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:114
+#: apt.conf.5.xml:108
 msgid ""
 "Two special commands are defined: <literal>#include</literal> (which is "
 "deprecated and not supported by alternative implementations) and "
@@ -3646,7 +3646,7 @@ msgstr ""
 "acabar con punto y coma)."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:124
+#: apt.conf.5.xml:118
 msgid ""
 "The <literal>#clear</literal> command is the only way to delete a list or a "
 "complete scope. Reopening a scope (or using the syntax described below with "
@@ -3662,7 +3662,7 @@ msgstr ""
 "los ámbitos no se pueden redefinir, sólo eliminar."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:132
+#: apt.conf.5.xml:126
 msgid ""
 "All of the APT tools take an -o option which allows an arbitrary "
 "configuration directive to be specified on the command line. The syntax is a "
@@ -3681,7 +3681,7 @@ msgstr ""
 "sintaxis de ámbitos en la línea de órdenes)."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:140
+#: apt.conf.5.xml:134
 msgid ""
 "Note that appending items to a list using <literal>::</literal> only works "
 "for one item per line, and that you should not use it in combination with "
@@ -3711,12 +3711,12 @@ msgstr ""
 "declaraciones ahora que APT no muestra fallos de forma explícita."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:155
+#: apt.conf.5.xml:149
 msgid "The APT Group"
 msgstr "El grupo APT"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:156
+#: apt.conf.5.xml:150
 msgid ""
 "This group of options controls general APT behavior as well as holding the "
 "options for all of the tools."
@@ -3725,7 +3725,7 @@ msgstr ""
 "mantiene las opciones para todas las herramientas."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:161
+#: apt.conf.5.xml:155
 msgid ""
 "System Architecture; sets the architecture to use when fetching files and "
 "parsing package lists. The internal default is the architecture apt was "
@@ -3736,7 +3736,7 @@ msgstr ""
 "arquitectura para la que apt se compiló."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:168
+#: apt.conf.5.xml:162
 msgid ""
 "All Architectures the system supports. For instance, CPUs implementing the "
 "<literal>amd64</literal> (also called <literal>x86-64</literal>)  "
@@ -3758,7 +3758,7 @@ msgstr ""
 "add-architecture</command>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:182
+#: apt.conf.5.xml:176
 msgid ""
 "List of all build profiles enabled for build-dependency resolution, without "
 "the \"<literal>profile.</literal>\" namespace prefix.  By default this list "
@@ -3767,7 +3767,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:190
+#: apt.conf.5.xml:184
 msgid ""
 "Default release to install packages from if more than one version is "
 "available. Contains release name, codename or release version. Examples: "
@@ -3781,7 +3781,7 @@ msgstr ""
 "«5.0*». Consulte también &apt-preferences;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:196
+#: apt.conf.5.xml:190
 msgid ""
 "Ignore held packages; this global option causes the problem resolver to "
 "ignore held packages in its decision making."
@@ -3790,7 +3790,7 @@ msgstr ""
 "problemas ignore los paquetes retenidos en la toma de decisiones."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:201
+#: apt.conf.5.xml:195
 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 "
@@ -3804,7 +3804,7 @@ msgstr ""
 "mecanismo directo para reinstalarlos."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:209
+#: apt.conf.5.xml:203
 msgid ""
 "Defaults to on, which will cause APT to install essential and important "
 "packages as soon as possible in an install/upgrade operation, in order to "
@@ -3831,7 +3831,7 @@ msgstr ""
 "del paquete A, ya que no se satisface la dependencia sobre éste."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:221
+#: apt.conf.5.xml:215
 msgid ""
 "The immediate configuration marker is also applied in the potentially "
 "problematic case of circular dependencies, since a dependency with the "
@@ -3860,7 +3860,7 @@ msgstr ""
 "anteriormente."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:234
+#: apt.conf.5.xml:228
 msgid ""
 "Before a big operation like <literal>dist-upgrade</literal> is run with this "
 "option disabled you should try to explicitly <literal>install</literal> the "
@@ -3877,7 +3877,7 @@ msgstr ""
 "para que así pueden mejorar y corregir el proceso de actualización."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:245
+#: apt.conf.5.xml:239
 msgid ""
 "Never enable this option unless you <emphasis>really</emphasis> know what "
 "you are doing. It permits APT to temporarily remove an essential package to "
@@ -3898,7 +3898,7 @@ msgstr ""
 "sobre la que estos paquetes dependen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:257
+#: apt.conf.5.xml:251
 msgid ""
 "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 of "
@@ -3935,14 +3935,14 @@ msgstr ""
 "desactiva el crecimiento automático de la caché."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:273
+#: apt.conf.5.xml:267
 msgid "Defines which packages are considered essential build dependencies."
 msgstr ""
 "Define los paquetes que se consideran dependencias de construcción "
 "esenciales."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:277
+#: apt.conf.5.xml:271
 msgid ""
 "The Get subsection controls the &apt-get; tool; please see its documentation "
 "for more information about the options here."
@@ -3951,7 +3951,7 @@ msgstr ""
 "documentación para más información sobre esta opción."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:282
+#: apt.conf.5.xml:276
 msgid ""
 "The Cache subsection controls the &apt-cache; tool; please see its "
 "documentation for more information about the options here."
@@ -3960,7 +3960,7 @@ msgstr ""
 "documentación para más información sobre esta opción."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:287
+#: apt.conf.5.xml:281
 msgid ""
 "The CDROM subsection controls the &apt-cdrom; tool; please see its "
 "documentation for more information about the options here."
@@ -3969,12 +3969,12 @@ msgstr ""
 "documentación para más información sobre esta opción."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:293
+#: apt.conf.5.xml:287
 msgid "The Acquire Group"
 msgstr "El grupo Acquire"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:294
+#: apt.conf.5.xml:288
 msgid ""
 "The <literal>Acquire</literal> group of options controls the download of "
 "packages as well as the various \"acquire methods\" responsible for the "
@@ -3985,7 +3985,7 @@ msgstr ""
 "sí mismo (consulte también &sources-list;)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:301
+#: apt.conf.5.xml:295
 msgid ""
 "Security related option defaulting to true, as giving a Release file's "
 "validation an expiration date prevents replay attacks over a long timescale, "
@@ -4006,7 +4006,7 @@ msgstr ""
 "utilizar la opción <literal>Max-ValidTime</literal> a continuación."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:314
+#: apt.conf.5.xml:308
 msgid ""
 "Maximum time (in seconds) after its creation (as indicated by the "
 "<literal>Date</literal> header) that the <filename>Release</filename> file "
@@ -4025,7 +4025,7 @@ msgstr ""
 "se pueden realizar añadiendo la etiqueta del archivo al nombre de opción."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:326
+#: apt.conf.5.xml:320
 msgid ""
 "Minimum time (in seconds) after its creation (as indicated by the "
 "<literal>Date</literal> header) that the <filename>Release</filename> file "
@@ -4045,7 +4045,7 @@ msgstr ""
 "y deben utilizar añadiendo la etiqueta del archivo al nombre de opción."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:338
+#: apt.conf.5.xml:332
 msgid ""
 "Try to download deltas called <literal>PDiffs</literal> for indexes (like "
 "<filename>Packages</filename> files) instead of downloading whole ones. True "
@@ -4056,7 +4056,7 @@ msgstr ""
 "enteros. Su valor predeterminado es «true»."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:341
+#: apt.conf.5.xml:335
 msgid ""
 "Two sub-options to limit the use of PDiffs are also available: "
 "<literal>FileLimit</literal> can be used to specify a maximum number of "
@@ -4074,7 +4074,7 @@ msgstr ""
 "parches."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:351
+#: apt.conf.5.xml:345
 msgid ""
 "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</"
 "literal> or <literal>access</literal> which determines how APT parallelizes "
@@ -4089,7 +4089,7 @@ msgstr ""
 "se abrirá una conexión por cada tipo de URI."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:359
+#: apt.conf.5.xml:353
 msgid ""
 "Number of retries to perform. If this is non-zero APT will retry failed "
 "files the given number of times."
@@ -4098,7 +4098,7 @@ msgstr ""
 "intentar obtener los ficheros fallidos el número de veces proporcionado."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:364
+#: apt.conf.5.xml:358
 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."
@@ -4108,7 +4108,7 @@ msgstr ""
 "«true» de forma predeterminada."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:369
+#: apt.conf.5.xml:363
 msgid ""
 "<literal>http::Proxy</literal> sets the default proxy to use for HTTP URIs. "
 "It is in the standard form of <literal>http://[[user][:pass]@]host[:port]/</"
@@ -4128,7 +4128,7 @@ msgstr ""
 "opciones anteriores."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:377
+#: apt.conf.5.xml:371
 msgid ""
 "Three settings are provided for cache control with HTTP/1.1 compliant proxy "
 "caches.  <literal>No-Cache</literal> tells the proxy not to use its cached "
@@ -4147,7 +4147,7 @@ msgstr ""
 "impedir que el proxy contamine la caché con ficheros «.deb» (de gran tamaño)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:387 apt.conf.5.xml:475
+#: apt.conf.5.xml:381 apt.conf.5.xml:469
 msgid ""
 "The option <literal>timeout</literal> sets the timeout timer used by the "
 "method; this value applies to the connection as well as the data timeout."
@@ -4157,7 +4157,7 @@ msgstr ""
 "y a la recepción de datos."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:390
+#: apt.conf.5.xml:384
 msgid ""
 "The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to "
 "enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be beneficial e."
@@ -4177,7 +4177,7 @@ msgstr ""
 "cumplir la especificación HTTP/1.1."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:397
+#: apt.conf.5.xml:391
 msgid ""
 "<literal>Acquire::http::AllowRedirect</literal> controls whether APT will "
 "follow redirects, which is enabled by default."
@@ -4186,7 +4186,7 @@ msgstr ""
 "redirección; activado por omisión."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:400
+#: apt.conf.5.xml:394
 #, fuzzy
 #| msgid ""
 #| "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
@@ -4208,7 +4208,7 @@ msgstr ""
 "implícitamente la descarga simultánea desde varios servidores)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:407
+#: apt.conf.5.xml:401
 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 "
@@ -4219,7 +4219,7 @@ msgstr ""
 "permiten el acceso para clientes que usan un identificador conocido."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:411
+#: apt.conf.5.xml:405
 msgid ""
 "<literal>Acquire::http::Proxy-Auto-Detect</literal> can be used to specify "
 "an external command to discover the http proxy to use. Apt expects the "
@@ -4233,7 +4233,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:429
+#: apt.conf.5.xml:423
 msgid ""
 "The <literal>Cache-control</literal>, <literal>Timeout</literal>, "
 "<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> and "
@@ -4250,7 +4250,7 @@ msgstr ""
 "<literal>Pipeline-Depth</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:437
+#: apt.conf.5.xml:431
 msgid ""
 "<literal>CaInfo</literal> suboption specifies place of file that holds info "
 "about trusted certificates.  <literal>&lt;host&gt;::CaInfo</literal> is the "
@@ -4290,7 +4290,7 @@ msgstr ""
 "SslForceVersion</literal> es la opción correspondiente para cada servidor."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:458
+#: apt.conf.5.xml:452
 msgid ""
 "<literal>ftp::Proxy</literal> sets the default proxy to use for FTP URIs.  "
 "It is in the standard form of <literal>ftp://[[user][:pass]@]host[:port]/</"
@@ -4323,7 +4323,7 @@ msgstr ""
 "<literal>$(SITE)</literal> y <literal>$(SITE_PORT)</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:478
+#: apt.conf.5.xml:472
 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, "
@@ -4340,7 +4340,7 @@ msgstr ""
 "ejemplos)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:485
+#: apt.conf.5.xml:479
 msgid ""
 "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
 "envar> environment variable to an HTTP URL - see the discussion of the http "
@@ -4354,7 +4354,7 @@ msgstr ""
 "a su poca eficiencia."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:490
+#: apt.conf.5.xml:484
 msgid ""
 "The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
 "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -4370,13 +4370,13 @@ msgstr ""
 "compatibles con la RFC 2428."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:504
+#: apt.conf.5.xml:498
 #, no-wrap
 msgid "/cdrom/::Mount \"foo\";"
 msgstr "/cdrom/::Mount \"algo\";"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:499
+#: apt.conf.5.xml:493
 msgid ""
 "For URIs using the <literal>cdrom</literal> method, the only configurable "
 "option is the mount point, <literal>cdrom::Mount</literal>, which must be "
@@ -4398,7 +4398,7 @@ msgstr ""
 "especificar órdenes para desmontar mediante UMount."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:512
+#: apt.conf.5.xml:506
 msgid ""
 "For GPGV URIs the only configurable option is <literal>gpgv::Options</"
 "literal>, which passes additional parameters to gpgv."
@@ -4407,13 +4407,13 @@ msgstr ""
 "Options</literal>, que introduce parámetros adicionales a gpgv."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:523
+#: apt.conf.5.xml:517
 #, no-wrap
 msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
 msgstr "Acquire::CompressionTypes::<replaceable>extensión-del-fichero</replaceable> \"<replaceable>nombre-del-método</replaceable>\";"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:518
+#: apt.conf.5.xml:512
 msgid ""
 "List of compression types which are understood by the acquire methods.  "
 "Files like <filename>Packages</filename> can be available in various "
@@ -4433,19 +4433,19 @@ msgstr ""
 "\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:528
+#: apt.conf.5.xml:522
 #, no-wrap
 msgid "Acquire::CompressionTypes::Order:: \"gz\";"
 msgstr "Acquire::CompressionTypes::Order:: \"gz\";"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:531
+#: apt.conf.5.xml:525
 #, no-wrap
 msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
 msgstr "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:524
+#: apt.conf.5.xml:518
 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 "
@@ -4477,13 +4477,13 @@ msgstr ""
 "explícita ya que se añadirá de forma automática."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:538
+#: apt.conf.5.xml:532
 #, no-wrap
 msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
 msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:533
+#: apt.conf.5.xml:527
 msgid ""
 "Note that the <literal>Dir::Bin::<replaceable>Methodname</replaceable></"
 "literal> will be checked at run time. If this option has been set, the "
@@ -4508,7 +4508,7 @@ msgstr ""
 "omite la lista definida, simplemente prefija la lista con este tipo."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:543
+#: apt.conf.5.xml:537
 msgid ""
 "The special type <literal>uncompressed</literal> can be used to give "
 "uncompressed files a preference, but note that most archives don't provide "
@@ -4520,7 +4520,7 @@ msgstr ""
 "así que habitualmente esto solo sirve con réplicas locales."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:550
+#: apt.conf.5.xml:544
 msgid ""
 "When downloading <literal>gzip</literal> compressed indexes (Packages, "
 "Sources, or Translations), keep them gzip compressed locally instead of "
@@ -4534,7 +4534,7 @@ msgstr ""
 "paquetes locales. El valor predeterminado es «false»."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:558
+#: apt.conf.5.xml:552
 msgid ""
 "The Languages subsection controls which <filename>Translation</filename> "
 "files are downloaded and in which order APT tries to display the description-"
@@ -4553,13 +4553,13 @@ msgstr ""
 "idioma (especialmente para los códigos de idioma largos)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><programlisting>
-#: apt.conf.5.xml:575
+#: apt.conf.5.xml:569
 #, no-wrap
 msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
 msgstr "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; }"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:563
+#: apt.conf.5.xml:557
 msgid ""
 "The default list includes \"environment\" and \"en\". "
 "\"<literal>environment</literal>\" has a special meaning here: it will be "
@@ -4598,7 +4598,7 @@ msgstr ""
 "\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:576
+#: apt.conf.5.xml:570
 msgid ""
 "Note: To prevent problems resulting from APT being executed in different "
 "environments (e.g. by different users or by other programs) all Translation "
@@ -4612,22 +4612,22 @@ msgstr ""
 "implícito)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:585
+#: apt.conf.5.xml:579
 msgid "When downloading, force to use only the IPv4 protocol."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:591
+#: apt.conf.5.xml:585
 msgid "When downloading, force to use only the IPv6 protocol."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:598
+#: apt.conf.5.xml:592
 msgid "Directories"
 msgstr "Directorios"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:600
+#: apt.conf.5.xml:594
 msgid ""
 "The <literal>Dir::State</literal> section has directories that pertain to "
 "local state information. <literal>lists</literal> is the directory to place "
@@ -4648,16 +4648,28 @@ msgstr ""
 "filename> ó <filename>./</filename>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:607
+#: apt.conf.5.xml:601
+#, fuzzy
+#| msgid ""
+#| "<literal>Dir::Cache</literal> contains locations pertaining to local "
+#| "cache information, such as the two package caches <literal>srcpkgcache</"
+#| "literal> and <literal>pkgcache</literal> as well as the location to place "
+#| "downloaded archives, <literal>Dir::Cache::archives</literal>. Generation "
+#| "of caches can be turned off by setting their names to the empty string. "
+#| "This will slow down startup but save disk space. It is probably "
+#| "preferable to turn off the pkgcache rather than the srcpkgcache. Like "
+#| "<literal>Dir::State</literal> the default directory is contained in "
+#| "<literal>Dir::Cache</literal>"
 msgid ""
 "<literal>Dir::Cache</literal> contains locations pertaining to local cache "
 "information, such as the two package caches <literal>srcpkgcache</literal> "
 "and <literal>pkgcache</literal> as well as the location to place downloaded "
 "archives, <literal>Dir::Cache::archives</literal>. Generation of caches can "
-"be turned off by setting their names to the empty string. This will slow "
+"be turned off by setting <literal>pkgcache</literal> or "
+"<literal>srcpkgcache</literal> to <literal>\"\"</literal>.  This will slow "
 "down startup but save disk space. It is probably preferable to turn off the "
-"pkgcache rather than the srcpkgcache. Like <literal>Dir::State</literal> the "
-"default directory is contained in <literal>Dir::Cache</literal>"
+"pkgcache rather than the srcpkgcache.  Like <literal>Dir::State</literal> "
+"the default directory is contained in <literal>Dir::Cache</literal>"
 msgstr ""
 "<literal>Dir::Cache</literal> contiene las ubicaciones que afectan a la "
 "información de la caché local, como los dos cachés de paquetes "
@@ -4670,7 +4682,7 @@ msgstr ""
 "directorio predeterminado está en <literal>Dir::Cache</literal>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:616
+#: apt.conf.5.xml:611
 msgid ""
 "<literal>Dir::Etc</literal> contains the location of configuration files, "
 "<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -4686,7 +4698,7 @@ msgstr ""
 "<envar>APT_CONFIG</envar>)."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:622
+#: apt.conf.5.xml:617
 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 "
@@ -4697,7 +4709,7 @@ msgstr ""
 "Al finalizar este proceso carga el fichero de configuración principal."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:626
+#: apt.conf.5.xml:621
 msgid ""
 "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
 "Bin::Methods</literal> specifies the location of the method handlers and "
@@ -4714,7 +4726,7 @@ msgstr ""
 "literal> especifican la ubicación de sus respectivos programas."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:634
+#: apt.conf.5.xml:629
 msgid ""
 "The configuration item <literal>RootDir</literal> has a special meaning.  If "
 "set, all paths in <literal>Dir::</literal> will be relative to "
@@ -4735,7 +4747,7 @@ msgstr ""
 "staging/var/lib/dpkg/status</filename>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:647
+#: apt.conf.5.xml:642
 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 "
@@ -4753,12 +4765,12 @@ msgstr ""
 "de expresiones regulares."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:656
+#: apt.conf.5.xml:651
 msgid "APT in DSelect"
 msgstr "APT con DSelect"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:658
+#: apt.conf.5.xml:653
 msgid ""
 "When APT is used as a &dselect; method several configuration directives "
 "control the default behavior. These are in the <literal>DSelect</literal> "
@@ -4769,7 +4781,7 @@ msgstr ""
 "encuentran en la sección <literal>DSelect</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:663
+#: apt.conf.5.xml:658
 msgid ""
 "Cache Clean mode; this value may be one of <literal>always</literal>, "
 "<literal>prompt</literal>, <literal>auto</literal>, <literal>pre-auto</"
@@ -4791,7 +4803,7 @@ msgstr ""
 "realiza esta acción antes de descargar paquetes nuevos."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:677
+#: apt.conf.5.xml:672
 msgid ""
 "The contents of this variable are passed to &apt-get; as command line "
 "options when it is run for the install phase."
@@ -4800,7 +4812,7 @@ msgstr ""
 "la línea de ordenes al ejecutar la fase de instalación."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:682
+#: apt.conf.5.xml:677
 msgid ""
 "The contents of this variable are passed to &apt-get; as command line "
 "options when it is run for the update phase."
@@ -4809,7 +4821,7 @@ msgstr ""
 "la línea de ordenes al ejecutar la fase de actualización."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:687
+#: apt.conf.5.xml:682
 msgid ""
 "If true the [U]pdate operation in &dselect; will always prompt to continue.  "
 "The default is to prompt only on error."
@@ -4819,12 +4831,12 @@ msgstr ""
 "preguntará en caso de error."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:693
+#: apt.conf.5.xml:688
 msgid "How APT calls &dpkg;"
 msgstr "Invocación de APT a dpkg"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:694
+#: apt.conf.5.xml:689
 msgid ""
 "Several configuration directives control how APT invokes &dpkg;. These are "
 "in the <literal>DPkg</literal> section."
@@ -4833,7 +4845,7 @@ msgstr ""
 "se encuentran en la sección <literal>DPkg</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:699
+#: apt.conf.5.xml:694
 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 "
@@ -4844,7 +4856,7 @@ msgstr ""
 "introduce a &dpkg; como un sólo argumento."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:705
+#: apt.conf.5.xml:700
 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 "
@@ -4857,7 +4869,7 @@ msgstr ""
 "sh</filename>; en caso de fallo, APT cancela la acción."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:712
+#: apt.conf.5.xml:707
 #, fuzzy
 #| msgid ""
 #| "This is a list of shell commands to run before invoking &dpkg;. Like "
@@ -4881,7 +4893,7 @@ msgstr ""
 "la entrada estándar."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:719
+#: apt.conf.5.xml:714
 #, fuzzy
 #| msgid ""
 #| "Version 2 of this protocol dumps more information, including the protocol "
@@ -4903,7 +4915,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:724
+#: apt.conf.5.xml:719
 msgid ""
 "The version of the protocol to be used for the command "
 "<literal><replaceable>cmd</replaceable></literal> can be chosen by setting "
@@ -4914,7 +4926,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:731
+#: apt.conf.5.xml:726
 msgid ""
 "The file descriptor to be used to send the information can be requested with "
 "<literal>DPkg::Tools::options::<replaceable>cmd</replaceable>::InfoFD</"
@@ -4925,7 +4937,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:741
+#: apt.conf.5.xml:736
 msgid ""
 "APT chdirs to this directory before invoking &dpkg;, the default is "
 "<filename>/</filename>."
@@ -4934,7 +4946,7 @@ msgstr ""
 "predeterminado es <filename>/</filename>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:746
+#: apt.conf.5.xml:741
 msgid ""
 "These options are passed to &dpkg-buildpackage; when compiling packages; the "
 "default is to disable signing and produce all binaries."
@@ -4944,12 +4956,12 @@ msgstr ""
 "paquetes y a producir todos los binarios."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:751
+#: apt.conf.5.xml:746
 msgid "dpkg trigger usage (and related options)"
 msgstr "Uso del disparador de dpkg (y de las opciones relacionadas)"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:752
+#: apt.conf.5.xml:747
 msgid ""
 "APT can call &dpkg; in such a way as to let it make aggressive use of "
 "triggers over multiple calls of &dpkg;. Without further options &dpkg; will "
@@ -4976,7 +4988,7 @@ msgstr ""
 "tiempo (o más) durante la configuración de todos los paquetes."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:767
+#: apt.conf.5.xml:762
 #, no-wrap
 msgid ""
 "DPkg::NoTriggers \"true\";\n"
@@ -4990,7 +5002,7 @@ msgstr ""
 "DPkg::TriggersPending \"true\";"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:761
+#: apt.conf.5.xml:756
 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 "
@@ -5014,7 +5026,7 @@ msgstr ""
 "type=\"literallayout\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:774
+#: apt.conf.5.xml:769
 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 "
@@ -5037,7 +5049,7 @@ msgstr ""
 "eliminación."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:782
+#: apt.conf.5.xml:777
 msgid ""
 "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
 "and \"<literal>no</literal>\".  The default value is \"<literal>all</literal>"
@@ -5067,7 +5079,7 @@ msgstr ""
 "imposibilidad de arrancar el sistema. "
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:797
+#: apt.conf.5.xml:792
 msgid ""
 "If this option is set APT will call <command>dpkg --configure --pending</"
 "command> to let &dpkg; handle all required configurations and triggers. This "
@@ -5085,7 +5097,7 @@ msgstr ""
 "desactivar esta opción en todas las ejecuciones menos la última."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:804
+#: apt.conf.5.xml:799
 msgid ""
 "Useful for the <literal>smart</literal> configuration as a package which has "
 "pending triggers is not considered as <literal>installed</literal>, and "
@@ -5101,7 +5113,7 @@ msgstr ""
 "los disparadores necesarios para configurar este paquete."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:817
+#: apt.conf.5.xml:812
 #, no-wrap
 msgid ""
 "OrderList::Score {\n"
@@ -5119,7 +5131,7 @@ msgstr ""
 "};"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:810
+#: apt.conf.5.xml:805
 msgid ""
 "Essential packages (and their dependencies) should be configured immediately "
 "after unpacking. It is a good idea to do this quite early in the upgrade "
@@ -5144,12 +5156,12 @@ msgstr ""
 "<placeholder type=\"literallayout\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:830
+#: apt.conf.5.xml:825
 msgid "Periodic and Archives options"
 msgstr "Las opciones «Periodic» y «Archives»"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:831
+#: apt.conf.5.xml:826
 msgid ""
 "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
 "of options configure behavior of apt periodic updates, which is done by the "
@@ -5163,12 +5175,12 @@ msgstr ""
 "documentación de estas opciones."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:839
+#: apt.conf.5.xml:834
 msgid "Debug options"
 msgstr "Opciones de depuración"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:841
+#: apt.conf.5.xml:836
 msgid ""
 "Enabling options in the <literal>Debug::</literal> section will cause "
 "debugging information to be sent to the standard error stream of the program "
@@ -5185,7 +5197,7 @@ msgstr ""
 "para un usuario normal, aunque unas cuantas sí son:"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:852
+#: apt.conf.5.xml:847
 msgid ""
 "<literal>Debug::pkgProblemResolver</literal> enables output about the "
 "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -5196,7 +5208,7 @@ msgstr ""
 "purge</literal>."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:860
+#: apt.conf.5.xml:855
 msgid ""
 "<literal>Debug::NoLocking</literal> disables all file locking.  This can be "
 "used to run some operations (for instance, <literal>apt-get -s install</"
@@ -5207,7 +5219,7 @@ msgstr ""
 "<literal>apt-get -s install</literal>) como un usuario normal."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:869
+#: apt.conf.5.xml:864
 msgid ""
 "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
 "time that <literal>apt</literal> invokes &dpkg;."
@@ -5219,7 +5231,7 @@ 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:877
+#: apt.conf.5.xml:872
 msgid ""
 "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
 "in CD-ROM IDs."
@@ -5228,14 +5240,14 @@ msgstr ""
 "statfs en los identificadores de los discos ópticos."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:887
+#: apt.conf.5.xml:882
 msgid "A full list of debugging options to apt follows."
 msgstr ""
 "A continuación, se muestra la lista completa de las opciones de depuración "
 "de apt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:896
+#: apt.conf.5.xml:891
 msgid ""
 "Print information related to accessing <literal>cdrom://</literal> sources."
 msgstr ""
@@ -5243,26 +5255,26 @@ msgstr ""
 "<literal>cdrom://</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:907
+#: apt.conf.5.xml:902
 msgid "Print information related to downloading packages using FTP."
 msgstr ""
 "Muestra la información relacionada con la descarga de paquetes mediante FTP."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:918
+#: apt.conf.5.xml:913
 msgid "Print information related to downloading packages using HTTP."
 msgstr ""
 "Muestra la información relacionada con la descarga de paquetes mediante HTTP."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:929
+#: apt.conf.5.xml:924
 msgid "Print information related to downloading packages using HTTPS."
 msgstr ""
 "Muestra la información relacionada con la descarga de paquetes mediante "
 "HTTPS."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:940
+#: apt.conf.5.xml:935
 msgid ""
 "Print information related to verifying cryptographic signatures using "
 "<literal>gpg</literal>."
@@ -5271,7 +5283,7 @@ msgstr ""
 "criptográficas mediante <literal>gpg</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:951
+#: apt.conf.5.xml:946
 msgid ""
 "Output information about the process of accessing collections of packages "
 "stored on CD-ROMs."
@@ -5280,14 +5292,14 @@ msgstr ""
 "paquetes almacenadas en CD-ROM."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:961
+#: apt.conf.5.xml:956
 msgid "Describes the process of resolving build-dependencies in &apt-get;."
 msgstr ""
 "Describe el proceso de resolución de dependencias de compilación en &apt-"
 "get;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:971
+#: apt.conf.5.xml:966
 msgid ""
 "Output each cryptographic hash that is generated by the <literal>apt</"
 "literal> libraries."
@@ -5296,7 +5308,7 @@ msgstr ""
 "<literal>apt</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:981
+#: apt.conf.5.xml:976
 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 "
@@ -5307,7 +5319,7 @@ msgstr ""
 "identificador de un CD-ROM."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:992
+#: apt.conf.5.xml:987
 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."
@@ -5317,14 +5329,14 @@ msgstr ""
 "a la vez."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1004
+#: apt.conf.5.xml:999
 msgid "Log when items are added to or removed from the global download queue."
 msgstr ""
 "Registra los elementos que se añaden o se borran de la cola de descarga "
 "global."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1014
+#: apt.conf.5.xml:1009
 msgid ""
 "Output status messages and errors related to verifying checksums and "
 "cryptographic signatures of downloaded files."
@@ -5334,7 +5346,7 @@ msgstr ""
 "ficheros descargados."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1024
+#: apt.conf.5.xml:1019
 msgid ""
 "Output information about downloading and applying package index list diffs, "
 "and errors relating to package index list diffs."
@@ -5343,7 +5355,7 @@ msgstr ""
 "lista de índices de paquetes, y los errores relacionados con éstos."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1036
+#: apt.conf.5.xml:1031
 msgid ""
 "Output information related to patching apt package lists when downloading "
 "index diffs instead of full indices."
@@ -5353,7 +5365,7 @@ msgstr ""
 "índices completos."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1047
+#: apt.conf.5.xml:1042
 msgid ""
 "Log all interactions with the sub-processes that actually perform downloads."
 msgstr ""
@@ -5361,7 +5373,7 @@ msgstr ""
 "descargas."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1058
+#: apt.conf.5.xml:1053
 msgid ""
 "Log events related to the automatically-installed status of packages and to "
 "the removal of unused packages."
@@ -5370,7 +5382,7 @@ msgstr ""
 "de los paquetes y con la eliminación de los paquetes sin usar."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1068
+#: apt.conf.5.xml:1063
 msgid ""
 "Generate debug messages describing which packages are being automatically "
 "installed to resolve dependencies.  This corresponds to the initial auto-"
@@ -5386,7 +5398,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1082
+#: apt.conf.5.xml:1077
 msgid ""
 "Generate debug messages describing which packages are marked as keep/install/"
 "remove while the ProblemResolver does his work.  Each addition or deletion "
@@ -5417,7 +5429,7 @@ msgstr ""
 "la sección en la que aparece el paquete."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1103
+#: apt.conf.5.xml:1098
 msgid ""
 "When invoking &dpkg;, output the precise command line with which it is being "
 "invoked, with arguments separated by a single space character."
@@ -5426,7 +5438,7 @@ msgstr ""
 "invocó, con los argumentos separados por un espacio."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1114
+#: apt.conf.5.xml:1109
 msgid ""
 "Output all the data received from &dpkg; on the status file descriptor and "
 "any errors encountered while parsing it."
@@ -5435,7 +5447,7 @@ msgstr ""
 "estado y cualquier error encontrado durante el análisis."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1125
+#: apt.conf.5.xml:1120
 msgid ""
 "Generate a trace of the algorithm that decides the order in which "
 "<literal>apt</literal> should pass packages to &dpkg;."
@@ -5444,7 +5456,7 @@ msgstr ""
 "literal> debería entregar los paquetes a &dpkg;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1137
+#: apt.conf.5.xml:1132
 msgid ""
 "Output status messages tracing the steps performed when invoking &dpkg;."
 msgstr ""
@@ -5452,12 +5464,12 @@ msgstr ""
 "&dpkg;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1148
+#: apt.conf.5.xml:1143
 msgid "Output the priority of each package list on startup."
 msgstr "Muestra la prioridad de cada lista de paquetes al iniciarse."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1158
+#: apt.conf.5.xml:1153
 msgid ""
 "Trace the execution of the dependency resolver (this applies only to what "
 "happens when a complex dependency problem is encountered)."
@@ -5466,7 +5478,7 @@ msgstr ""
 "lo que ocurre cuando se encuentra un problema de dependencias complejo)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1169
+#: apt.conf.5.xml:1164
 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 "
@@ -5477,7 +5489,7 @@ msgstr ""
 "misma que la descrita en <literal>Debug::pkgDepCache::Marker</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1181
+#: apt.conf.5.xml:1176
 msgid ""
 "Print information about the vendors read from <filename>/etc/apt/vendors."
 "list</filename>."
@@ -5486,7 +5498,7 @@ msgstr ""
 "vendors.list</filename>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1191
+#: apt.conf.5.xml:1186
 msgid ""
 "Display the external commands that are called by apt hooks.  This includes e."
 "g. the config options <literal>DPkg::{Pre,Post}-Invoke</literal> or "
@@ -5494,13 +5506,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1215 apt_preferences.5.xml:547 sources.list.5.xml:239
-#: apt-ftparchive.1.xml:598
+#: apt.conf.5.xml:1210 apt_preferences.5.xml:541 sources.list.5.xml:233
+#: apt-ftparchive.1.xml:592
 msgid "Examples"
 msgstr "Ejemplos"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1216
+#: apt.conf.5.xml:1211
 msgid ""
 "&configureindex; is a configuration file showing example values for all "
 "possible options."
@@ -5510,17 +5522,17 @@ msgstr ""
 
 #.  ? reading apt.conf 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1228
+#: apt.conf.5.xml:1223
 msgid "&apt-cache;, &apt-config;, &apt-preferences;."
 msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt_preferences.5.xml:34
+#: apt_preferences.5.xml:28
 msgid "Preference control file for APT"
 msgstr "Fichero de preferencias de APT"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:39
+#: apt_preferences.5.xml:33
 msgid ""
 "The APT preferences file <filename>/etc/apt/preferences</filename> and the "
 "fragment files in the <filename>/etc/apt/preferences.d/</filename> folder "
@@ -5533,7 +5545,7 @@ msgstr ""
 "paquetes seleccionados para su instalación."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:44
+#: apt_preferences.5.xml:38
 msgid ""
 "Several versions of a package may be available for installation when the "
 "&sources-list; file contains references to more than one distribution (for "
@@ -5554,7 +5566,7 @@ msgstr ""
 "usuario sobre qué versión se seleccionará para su instalación."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:54
+#: apt_preferences.5.xml:48
 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 "
@@ -5569,7 +5581,7 @@ msgstr ""
 "APT no modifican la elección del ejemplar, sólo la elección de la versión."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:61
+#: apt_preferences.5.xml:55
 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 "
@@ -5593,7 +5605,7 @@ msgstr ""
 "que no funcionen como se espera. Queda avisado."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:72
+#: apt_preferences.5.xml:66
 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 "
@@ -5614,24 +5626,24 @@ msgstr ""
 "Files-Silently</literal>. Si coincide, el fichero se ignora silenciosamente."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:81
+#: apt_preferences.5.xml:75
 msgid "APT's Default Priority Assignments"
 msgstr "Asignación de prioridades predeterminadas de APT "
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:96
+#: apt_preferences.5.xml:90
 #, no-wrap
 msgid "<command>apt-get install -t testing <replaceable>some-package</replaceable></command>\n"
 msgstr "<command>apt-get install -t testing <replaceable>paquete</replaceable></command>\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:99
+#: apt_preferences.5.xml:93
 #, no-wrap
 msgid "APT::Default-Release \"stable\";\n"
 msgstr "APT::Default-Release \"stable\";\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:83
+#: apt_preferences.5.xml:77
 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 "
@@ -5659,7 +5671,7 @@ msgstr ""
 "\"0\"/><placeholder type=\"programlisting\" id=\"1\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:103
+#: apt_preferences.5.xml:97
 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:"
@@ -5669,12 +5681,12 @@ msgstr ""
 "Asignar: "
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:108
+#: apt_preferences.5.xml:102
 msgid "priority 1"
 msgstr "priority 1"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:109
+#: apt_preferences.5.xml:103
 msgid ""
 "to the versions coming from archives which in their <filename>Release</"
 "filename> files are marked as \"NotAutomatic: yes\" but <emphasis>not</"
@@ -5687,12 +5699,12 @@ msgstr ""
 "literal> de Debian."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:115
+#: apt_preferences.5.xml:109
 msgid "priority 100"
 msgstr "prioridad 100"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:116
+#: apt_preferences.5.xml:110
 msgid ""
 "to the version that is already installed (if any) and to the versions coming "
 "from archives which in their <filename>Release</filename> files are marked "
@@ -5706,12 +5718,12 @@ msgstr ""
 "<literal>squeeze-backports</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:123
+#: apt_preferences.5.xml:117
 msgid "priority 500"
 msgstr "prioridad 500"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:124
+#: apt_preferences.5.xml:118
 msgid ""
 "to the versions that are not installed and do not belong to the target "
 "release."
@@ -5720,12 +5732,12 @@ msgstr ""
 "objetivo."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:128
+#: apt_preferences.5.xml:122
 msgid "priority 990"
 msgstr "prioridad 990"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:129
+#: apt_preferences.5.xml:123
 msgid ""
 "to the versions that are not installed and belong to the target release."
 msgstr ""
@@ -5733,7 +5745,7 @@ msgstr ""
 "objetivo."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:134
+#: apt_preferences.5.xml:128
 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 "
@@ -5750,7 +5762,7 @@ msgstr ""
 "la opción «ButAutomaticUpgrades: yes»."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:141
+#: apt_preferences.5.xml:135
 msgid ""
 "APT then applies the following rules, listed in order of precedence, to "
 "determine which version of a package to install."
@@ -5759,7 +5771,7 @@ msgstr ""
 "determinar qué versión del paquete debe instalar."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:144
+#: apt_preferences.5.xml:138
 msgid ""
 "Never downgrade unless the priority of an available version exceeds 1000.  "
 "(\"Downgrading\" is installing a less recent version of a package in place "
@@ -5776,12 +5788,12 @@ msgstr ""
 "ser peligroso)."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:150
+#: apt_preferences.5.xml:144
 msgid "Install the highest priority version."
 msgstr "Instala la versión de mayor prioridad."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:151
+#: apt_preferences.5.xml:145
 msgid ""
 "If two or more versions have the same priority, install the most recent one "
 "(that is, the one with the higher version number)."
@@ -5790,7 +5802,7 @@ msgstr ""
 "(esto es, la que tiene un número de versión mayor)."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:154
+#: apt_preferences.5.xml:148
 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 <literal>--reinstall</"
@@ -5801,7 +5813,7 @@ msgstr ""
 "<literal>--reinstall</literal>, se instalará la que no está instalada."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:160
+#: apt_preferences.5.xml:154
 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 "
@@ -5816,7 +5828,7 @@ msgstr ""
 "command> o <command>apt-get upgrade</command>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:167
+#: apt_preferences.5.xml:161
 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 "
@@ -5830,7 +5842,7 @@ msgstr ""
 "upgrade</command>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:172
+#: apt_preferences.5.xml:166
 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 "
@@ -5849,12 +5861,12 @@ msgstr ""
 "versión instalada."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:181
+#: apt_preferences.5.xml:175
 msgid "The Effect of APT Preferences"
 msgstr "El efecto de las preferencias sobre APT"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:183
+#: apt_preferences.5.xml:177
 msgid ""
 "The APT preferences file allows the system administrator to control the "
 "assignment of priorities.  The file consists of one or more multi-line "
@@ -5867,7 +5879,7 @@ msgstr ""
 "registros pueden tener una de estos dos formatos: el específico o el general."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:189
+#: apt_preferences.5.xml:183
 msgid ""
 "The specific form assigns a priority (a \"Pin-Priority\") to one or more "
 "specified packages with a specified version or version range.  For example, "
@@ -5884,7 +5896,7 @@ msgstr ""
 "paquetes separados por espacios."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:196
+#: apt_preferences.5.xml:190
 #, no-wrap
 msgid ""
 "Package: perl\n"
@@ -5896,7 +5908,7 @@ msgstr ""
 "Pin-Priority: 1001\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:202
+#: apt_preferences.5.xml:196
 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 "
@@ -5911,7 +5923,7 @@ msgstr ""
 "identificado por su nombre de dominio."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:208
+#: apt_preferences.5.xml:202
 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 "
@@ -5922,7 +5934,7 @@ msgstr ""
 "prioridad alta a todas las versiones disponibles desde un sitio local."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:213
+#: apt_preferences.5.xml:207
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -5934,7 +5946,7 @@ msgstr ""
 "Pin-Priority: 999\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:218
+#: apt_preferences.5.xml:212
 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 "
@@ -5948,7 +5960,7 @@ msgstr ""
 "debian.org»."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:222
+#: apt_preferences.5.xml:216
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -5960,7 +5972,7 @@ msgstr ""
 "Pin-Priority: 999\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:226
+#: apt_preferences.5.xml:220
 msgid ""
 "This should <emphasis>not</emphasis> be confused with the Origin of a "
 "distribution as specified in a <filename>Release</filename> file.  What "
@@ -5975,7 +5987,7 @@ msgstr ""
 "sino el autor o el nombre del proveedor, tales como «Debian» o «Ximian»."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:231
+#: apt_preferences.5.xml:225
 msgid ""
 "The following record assigns a low priority to all package versions "
 "belonging to any distribution whose Archive name is \"<literal>unstable</"
@@ -5986,7 +5998,7 @@ msgstr ""
 "archivo de paquetes «<literal>unstable</literal>» (inestable)."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:235
+#: apt_preferences.5.xml:229
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -5998,7 +6010,7 @@ msgstr ""
 "Pin-Priority: 50\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:240
+#: apt_preferences.5.xml:234
 msgid ""
 "The following record assigns a high priority to all package versions "
 "belonging to any distribution whose Codename is \"<literal>&testing-codename;"
@@ -6009,7 +6021,7 @@ msgstr ""
 "«<literal>&testing-codename;</literal>»."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:244
+#: apt_preferences.5.xml:238
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -6021,7 +6033,7 @@ msgstr ""
 "Pin-Priority: 900\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:249
+#: apt_preferences.5.xml:243
 msgid ""
 "The following record assigns a high priority to all package versions "
 "belonging to any release whose Archive name is \"<literal>stable</literal>\" "
@@ -6033,7 +6045,7 @@ msgstr ""
 "«<literal>&stable-version;</literal>»."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:254
+#: apt_preferences.5.xml:248
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -6045,12 +6057,12 @@ msgstr ""
 "Pin-Priority: 500\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:264
+#: apt_preferences.5.xml:258
 msgid "Regular expressions and &glob; syntax"
 msgstr "Expresiones regulares y sintaxis &glob;"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:266
+#: apt_preferences.5.xml:260
 msgid ""
 "APT also supports pinning by &glob; expressions, and regular expressions "
 "surrounded by slashes. For example, the following example assigns the "
@@ -6065,7 +6077,7 @@ msgstr ""
 "«kde» (como expresión regular extendida POSIX delimitada por barras)."
 
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:275
+#: apt_preferences.5.xml:269
 #, no-wrap
 msgid ""
 "Package: gnome* /kde/\n"
@@ -6077,7 +6089,7 @@ msgstr ""
 "Pin-Priority: 500\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:281
+#: apt_preferences.5.xml:275
 msgid ""
 "The rule for those expressions is that they can occur anywhere where a "
 "string can occur. Thus, the following pin assigns the priority 990 to all "
@@ -6088,7 +6100,7 @@ msgstr ""
 "paquetes provenientes de una publicación a partir de &ubuntu-codename;."
 
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:287
+#: apt_preferences.5.xml:281
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -6100,7 +6112,7 @@ msgstr ""
 "Pin-Priority: 990\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:293
+#: apt_preferences.5.xml:287
 msgid ""
 "If a regular expression occurs in a <literal>Package</literal> field, the "
 "behavior is the same as if this regular expression were replaced with a list "
@@ -6118,12 +6130,12 @@ msgstr ""
 "literal>» en un campo «Package» no se considera una expresión &glob;."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:309
+#: apt_preferences.5.xml:303
 msgid "How APT Interprets Priorities"
 msgstr "Interpretación de APT de las prioridades"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:312
+#: apt_preferences.5.xml:306
 msgid ""
 "Priorities (P) assigned in the APT preferences file must be positive or "
 "negative integers.  They are interpreted as follows (roughly speaking):"
@@ -6133,12 +6145,12 @@ msgstr ""
 "siguiente modo:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:317
+#: apt_preferences.5.xml:311
 msgid "P &gt;= 1000"
 msgstr "P &gt;= 1000"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:318
+#: apt_preferences.5.xml:312
 msgid ""
 "causes a version to be installed even if this constitutes a downgrade of the "
 "package"
@@ -6147,12 +6159,12 @@ msgstr ""
 "el sistema."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:322
+#: apt_preferences.5.xml:316
 msgid "990 &lt;= P &lt; 1000"
 msgstr "990 &lt;= P &lt; 1000"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:323
+#: apt_preferences.5.xml:317
 msgid ""
 "causes a version to be installed even if it does not come from the target "
 "release, unless the installed version is more recent"
@@ -6161,12 +6173,12 @@ msgstr ""
 "que la versión instalada sea más reciente."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:328
+#: apt_preferences.5.xml:322
 msgid "500 &lt;= P &lt; 990"
 msgstr "500 &lt;= P &lt; 990"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:329
+#: apt_preferences.5.xml:323
 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"
@@ -6176,12 +6188,12 @@ msgstr ""
 "más reciente."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:334
+#: apt_preferences.5.xml:328
 msgid "100 &lt;= P &lt; 500"
 msgstr "100 &lt;= P &lt; 500"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:335
+#: apt_preferences.5.xml:329
 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"
@@ -6190,12 +6202,12 @@ msgstr ""
 "perteneciente a otra distribución, o si la versión instalada es más reciente."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:340
+#: apt_preferences.5.xml:334
 msgid "0 &lt; P &lt; 100"
 msgstr "0 &lt; P &lt; 100"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:341
+#: apt_preferences.5.xml:335
 msgid ""
 "causes a version to be installed only if there is no installed version of "
 "the package"
@@ -6203,17 +6215,17 @@ msgstr ""
 "La versión sólo se instala si no hay ninguna versión del paquete instalada."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:345
+#: apt_preferences.5.xml:339
 msgid "P &lt; 0"
 msgstr "P &lt; 0"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:346
+#: apt_preferences.5.xml:340
 msgid "prevents the version from being installed"
 msgstr "Evita la instalación de la versión."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:351
+#: apt_preferences.5.xml:345
 msgid ""
 "If any specific-form records match an available package version then the "
 "first such record determines the priority of the package version.  Failing "
@@ -6227,7 +6239,7 @@ msgstr ""
 "versión del paquete."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:357
+#: apt_preferences.5.xml:351
 msgid ""
 "For example, suppose the APT preferences file contains the three records "
 "presented earlier:"
@@ -6236,7 +6248,7 @@ msgstr ""
 "registros antes mencionados:"
 
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:361
+#: apt_preferences.5.xml:355
 #, no-wrap
 msgid ""
 "Package: perl\n"
@@ -6264,12 +6276,12 @@ msgstr ""
 "Pin-Priority: 50\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:374
+#: apt_preferences.5.xml:368
 msgid "Then:"
 msgstr "Por ello:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:376
+#: apt_preferences.5.xml:370
 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 "
@@ -6284,7 +6296,7 @@ msgstr ""
 "perl;*, se instalará una versión anterior de <literal>perl</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:381
+#: apt_preferences.5.xml:375
 msgid ""
 "A version of any package other than <literal>perl</literal> that is "
 "available from the local system has priority over other versions, even "
@@ -6295,7 +6307,7 @@ msgstr ""
 "versiones, incluso sobre los pertenecientes a la distribución objetivo."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:385
+#: apt_preferences.5.xml:379
 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 <literal>unstable</"
@@ -6308,12 +6320,12 @@ msgstr ""
 "hay ninguna versión del paquete ya instalado."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:395
+#: apt_preferences.5.xml:389
 msgid "Determination of Package Version and Distribution Properties"
 msgstr "Determinar la versión del paquete y las propiedades de la distribución"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:397
+#: apt_preferences.5.xml:391
 msgid ""
 "The locations listed in the &sources-list; file should provide "
 "<filename>Packages</filename> and <filename>Release</filename> files to "
@@ -6324,7 +6336,7 @@ msgstr ""
 "describen los paquetes disponibles en cada uno de los sitios."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:401
+#: apt_preferences.5.xml:395
 msgid ""
 "The <filename>Packages</filename> file is normally found in the directory "
 "<filename>.../dists/<replaceable>dist-name</replaceable>/"
@@ -6344,27 +6356,27 @@ msgstr ""
 "de APT:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:409
+#: apt_preferences.5.xml:403
 msgid "the <literal>Package:</literal> line"
 msgstr "La línea <literal>Package:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:410
+#: apt_preferences.5.xml:404
 msgid "gives the package name"
 msgstr "indica el nombre del paquete."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:413 apt_preferences.5.xml:463
+#: apt_preferences.5.xml:407 apt_preferences.5.xml:457
 msgid "the <literal>Version:</literal> line"
 msgstr "La línea <literal>Version:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:414
+#: apt_preferences.5.xml:408
 msgid "gives the version number for the named package"
 msgstr "indica el número de versión del paquete."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:419
+#: apt_preferences.5.xml:413
 msgid ""
 "The <filename>Release</filename> file is normally found in the directory "
 "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
@@ -6385,12 +6397,12 @@ msgstr ""
 "son relevantes para las prioridades de APT:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:430
+#: apt_preferences.5.xml:424
 msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
 msgstr "Las líneas <literal>Archive:</literal> o <literal>Suite:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:431
+#: apt_preferences.5.xml:425
 msgid ""
 "names the archive to which all the packages in the directory tree belong.  "
 "For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@ -6408,18 +6420,18 @@ msgstr ""
 "línea en el fichero de preferencias de APT:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:441
+#: apt_preferences.5.xml:435
 #, no-wrap
 msgid "Pin: release a=stable\n"
 msgstr "Pin: release a=stable\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:447
+#: apt_preferences.5.xml:441
 msgid "the <literal>Codename:</literal> line"
 msgstr "La línea <literal>Codename:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:448
+#: apt_preferences.5.xml:442
 msgid ""
 "names the codename to which all the packages in the directory tree belong.  "
 "For example, the line \"Codename: &testing-codename;\" specifies that all of "
@@ -6438,13 +6450,13 @@ msgstr ""
 "de APT:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:457
+#: apt_preferences.5.xml:451
 #, no-wrap
 msgid "Pin: release n=&testing-codename;\n"
 msgstr "Pin: release n=&testing-codename;\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:464
+#: apt_preferences.5.xml:458
 msgid ""
 "names the release version.  For example, the packages in the tree might "
 "belong to Debian release version &stable-version;.  Note that there is "
@@ -6461,7 +6473,7 @@ msgstr ""
 "siguientes línea en el fichero de preferencias de APT:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:473
+#: apt_preferences.5.xml:467
 #, no-wrap
 msgid ""
 "Pin: release v=&stable-version;\n"
@@ -6473,12 +6485,12 @@ msgstr ""
 "Pin: release &stable-version;\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:482
+#: apt_preferences.5.xml:476
 msgid "the <literal>Component:</literal> line"
 msgstr "La línea <literal>Component:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:483
+#: apt_preferences.5.xml:477
 msgid ""
 "names the licensing component associated with the packages in the directory "
 "tree of the <filename>Release</filename> file.  For example, the line "
@@ -6497,18 +6509,18 @@ msgstr ""
 "de APT:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:492
+#: apt_preferences.5.xml:486
 #, no-wrap
 msgid "Pin: release c=main\n"
 msgstr "Pin: release c=main\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:498
+#: apt_preferences.5.xml:492
 msgid "the <literal>Origin:</literal> line"
 msgstr "La línea <literal>Origin:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:499
+#: apt_preferences.5.xml:493
 msgid ""
 "names the originator of the packages in the directory tree of the "
 "<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"
@@ -6521,18 +6533,18 @@ msgstr ""
 "mediante la siguiente línea:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:505
+#: apt_preferences.5.xml:499
 #, no-wrap
 msgid "Pin: release o=Debian\n"
 msgstr "Pin: release o=Debian\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:511
+#: apt_preferences.5.xml:505
 msgid "the <literal>Label:</literal> line"
 msgstr "La línea <literal>Label:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:512
+#: apt_preferences.5.xml:506
 msgid ""
 "names the label of the packages in the directory tree of the "
 "<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"
@@ -6545,13 +6557,13 @@ msgstr ""
 "siguiente línea:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:518
+#: apt_preferences.5.xml:512
 #, no-wrap
 msgid "Pin: release l=Debian\n"
 msgstr "Pin: release l=Debian\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:525
+#: apt_preferences.5.xml:519
 msgid ""
 "All of the <filename>Packages</filename> and <filename>Release</filename> "
 "files retrieved from locations listed in the &sources-list; file are stored "
@@ -6576,12 +6588,12 @@ msgstr ""
 "la distribución «<literal>unstable</literal>» (inestable)."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:538
+#: apt_preferences.5.xml:532
 msgid "Optional Lines in an APT Preferences Record"
 msgstr "Líneas opcionales en el registro de preferencias de APT"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:540
+#: apt_preferences.5.xml:534
 msgid ""
 "Each record in the APT preferences file can optionally begin with one or "
 "more lines beginning with the word <literal>Explanation:</literal>.  This "
@@ -6592,12 +6604,12 @@ msgstr ""
 "Útil para comentarios."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:549
+#: apt_preferences.5.xml:543
 msgid "Tracking Stable"
 msgstr "Seguir la distribución «stable» (estable)"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:557
+#: apt_preferences.5.xml:551
 #, no-wrap
 msgid ""
 "Explanation: Uninstall or do not install any Debian-originated\n"
@@ -6621,7 +6633,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:551
+#: apt_preferences.5.xml:545
 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 "
@@ -6636,8 +6648,8 @@ msgstr ""
 "<literal>Debian</literal>.  <placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:574 apt_preferences.5.xml:620
-#: apt_preferences.5.xml:678
+#: apt_preferences.5.xml:568 apt_preferences.5.xml:614
+#: apt_preferences.5.xml:672
 #, no-wrap
 msgid ""
 "apt-get install <replaceable>package-name</replaceable>\n"
@@ -6649,7 +6661,7 @@ msgstr ""
 "apt-get dist-upgrade\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:569
+#: apt_preferences.5.xml:563
 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 "
@@ -6663,13 +6675,13 @@ msgstr ""
 "\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:586
+#: apt_preferences.5.xml:580
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/testing\n"
 msgstr "apt-get install <replaceable>paquete</replaceable>/testing\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:580
+#: apt_preferences.5.xml:574
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>testing</literal> distribution; the package "
@@ -6682,12 +6694,12 @@ msgstr ""
 "\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:592
+#: apt_preferences.5.xml:586
 msgid "Tracking Testing or Unstable"
 msgstr "Seguir la distribución «testing» (en pruebas) o «unstable» (inestable)"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:601
+#: apt_preferences.5.xml:595
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -6715,7 +6727,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:594
+#: apt_preferences.5.xml:588
 msgid ""
 "The following APT preferences file will cause APT to assign a high priority "
 "to package versions from the <literal>testing</literal> distribution, a "
@@ -6732,7 +6744,7 @@ msgstr ""
 ">"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:615
+#: apt_preferences.5.xml:609
 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 "
@@ -6745,13 +6757,13 @@ msgstr ""
 "<placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:635
+#: apt_preferences.5.xml:629
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
 msgstr "apt-get install <replaceable>paquete</replaceable>/unstable\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:626
+#: apt_preferences.5.xml:620
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>unstable</literal> distribution.  "
@@ -6770,12 +6782,12 @@ msgstr ""
 "instalada.  <placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:642
+#: apt_preferences.5.xml:636
 msgid "Tracking the evolution of a codename release"
 msgstr "Seguir la evolución de una publicación por el nombre"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:656
+#: apt_preferences.5.xml:650
 #, no-wrap
 msgid ""
 "Explanation: Uninstall or do not install any Debian-originated package versions\n"
@@ -6809,7 +6821,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:644
+#: apt_preferences.5.xml:638
 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 "
@@ -6836,7 +6848,7 @@ msgstr ""
 "\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:673
+#: apt_preferences.5.xml:667
 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 "
@@ -6850,13 +6862,13 @@ msgstr ""
 "id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:693
+#: apt_preferences.5.xml:687
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/sid\n"
 msgstr "apt-get install <replaceable>paquete</replaceable>/sid\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:684
+#: apt_preferences.5.xml:678
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>sid</literal> distribution.  Thereafter, "
@@ -6875,17 +6887,17 @@ msgstr ""
 "instalada.  <placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:708
+#: apt_preferences.5.xml:702
 msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: sources.list.5.xml:35
+#: sources.list.5.xml:29
 msgid "List of configured APT data sources"
 msgstr "Lista de fuentes de datos de APT configurados"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:40
+#: sources.list.5.xml:34
 msgid ""
 "The source list <filename>/etc/apt/sources.list</filename> is designed to "
 "support any number of active sources and a variety of source media. The file "
@@ -6902,7 +6914,7 @@ msgstr ""
 "command> (o una orden equivalente de una interfaz de APT)."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:47
+#: sources.list.5.xml:41
 msgid ""
 "Each line specifying a source starts with type (e.g. <literal>deb-src</"
 "literal>)  followed by options and arguments for this type.  Individual "
@@ -6917,12 +6929,12 @@ msgstr ""
 "cualquier lugar de la línea marca los caracteres restantes como comentario."
 
 #. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:55
+#: sources.list.5.xml:49
 msgid "sources.list.d"
 msgstr "sources.list.d"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:56
+#: sources.list.5.xml:50
 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 "
@@ -6944,12 +6956,12 @@ msgstr ""
 "silenciosamente."
 
 #. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:67
+#: sources.list.5.xml:61
 msgid "The deb and deb-src types"
 msgstr "Los tipos «deb» y «deb-src»"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:68
+#: sources.list.5.xml:62
 msgid ""
 "The <literal>deb</literal> type references a typical two-level Debian "
 "archive, <filename>distribution/component</filename>. The "
@@ -6975,7 +6987,7 @@ msgstr ""
 "literal> para obtener los índices de fuentes."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:79
+#: sources.list.5.xml:73
 msgid ""
 "The format for a <filename>sources.list</filename> entry using the "
 "<literal>deb</literal> and <literal>deb-src</literal> types is:"
@@ -6984,14 +6996,14 @@ msgstr ""
 "usando los tipos <literal>deb</literal> y <literal>deb-src</literal> es:"
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:82
+#: sources.list.5.xml:76
 #, fuzzy, no-wrap
 #| msgid "deb [ options ] uri distribution [component1] [component2] [...]"
 msgid "deb [ options ] uri suite [component1] [component2] [...]"
 msgstr "deb [ opciones ] uri distribución [componente1] [componente2] [...]"
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:86
+#: sources.list.5.xml:80
 #, no-wrap
 msgid ""
 "     Types: deb deb-src\n"
@@ -7014,14 +7026,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:84
+#: sources.list.5.xml:78
 msgid ""
 "Alternatively a rfc822 style format is also supported: <placeholder type="
 "\"literallayout\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:105
+#: sources.list.5.xml:99
 #, fuzzy
 #| msgid ""
 #| "The URI for the <literal>deb</literal> type must specify the base of the "
@@ -7052,7 +7064,7 @@ msgstr ""
 "<literal>distribución</literal> no define una ruta exacta."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:114
+#: sources.list.5.xml:108
 #, fuzzy
 #| msgid ""
 #| "<literal>distribution</literal> may also contain a variable, <literal>"
@@ -7081,7 +7093,7 @@ msgstr ""
 "sistema."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:122
+#: sources.list.5.xml:116
 #, fuzzy
 #| msgid ""
 #| "Since only one distribution can be specified per line it may be necessary "
@@ -7121,7 +7133,7 @@ msgstr ""
 "aprovechar mejor el ancho de banda."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:136
+#: sources.list.5.xml:130
 msgid ""
 "<literal>options</literal> is always optional and needs to be surrounded by "
 "square brackets. It can consist of multiple settings in the form "
@@ -7138,7 +7150,7 @@ msgstr ""
 "ignoran silenciosamente):"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:142
+#: sources.list.5.xml:136
 msgid ""
 "<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
 "replaceable>,…</literal> can be used to specify for which architectures "
@@ -7153,7 +7165,7 @@ msgstr ""
 "arquitecturas definidas por la opción <literal>APT::Architectures</literal>."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:146
+#: sources.list.5.xml:140
 #, fuzzy
 #| msgid ""
 #| "<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
@@ -7174,7 +7186,7 @@ msgstr ""
 "arquitecturas definidas por la opción <literal>APT::Architectures</literal>."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:149
+#: sources.list.5.xml:143
 msgid ""
 "<literal>trusted=yes</literal> can be set to indicate that packages from "
 "this source are always authenticated even if the <filename>Release</"
@@ -7192,7 +7204,7 @@ msgstr ""
 "autenticadas no lo están."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:156
+#: sources.list.5.xml:150
 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 "
@@ -7205,12 +7217,12 @@ msgstr ""
 "seguidos por servidores de Internet distantes, por ejemplo)."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:161
+#: sources.list.5.xml:155
 msgid "Some examples:"
 msgstr "Algunos ejemplos:"
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:163
+#: sources.list.5.xml:157
 #, no-wrap
 msgid ""
 "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
@@ -7222,17 +7234,17 @@ msgstr ""
 "   "
 
 #. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:169
+#: sources.list.5.xml:163
 msgid "URI specification"
 msgstr "Especificación del URI"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:171
+#: sources.list.5.xml:165
 msgid "The currently recognized URI types are:"
 msgstr "Los tipos de URI permitidos actualmente son:"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:175
+#: sources.list.5.xml:169
 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 "
@@ -7243,7 +7255,7 @@ msgstr ""
 "particiones montadas mediante NFS y réplicas o archivos de paquetes locales."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:182
+#: sources.list.5.xml:176
 msgid ""
 "The cdrom scheme allows APT to use a local CD-ROM drive with media swapping. "
 "Use the &apt-cdrom; program to create cdrom entries in the source list."
@@ -7253,7 +7265,7 @@ msgstr ""
 "list»."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:189
+#: sources.list.5.xml:183
 msgid ""
 "The http scheme specifies an HTTP server for the archive. If an environment "
 "variable <envar>http_proxy</envar> is set with the format http://server:"
@@ -7271,7 +7283,7 @@ msgstr ""
 "autenticación no es seguro."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:200
+#: sources.list.5.xml:194
 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 page. "
@@ -7292,7 +7304,7 @@ msgstr ""
 "fichero de configuración."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:212
+#: sources.list.5.xml:206
 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.  "
@@ -7305,7 +7317,7 @@ msgstr ""
 "permite realizar la copia de ficheros con APT."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:219
+#: sources.list.5.xml:213
 msgid ""
 "The rsh/ssh method invokes RSH/SSH to connect to a remote host and access "
 "the files as a given user. Prior configuration of rhosts or RSA keys is "
@@ -7319,12 +7331,12 @@ msgstr ""
 "transferencia de ficheros desde la máquina remota."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:226
+#: sources.list.5.xml:220
 msgid "adding more recognizable URI types"
 msgstr "Añadir más tipos de URI reconocidos."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:228
+#: sources.list.5.xml:222
 msgid ""
 "APT can be extended with more methods shipped in other optional packages, "
 "which should follow the naming scheme <package>apt-transport-"
@@ -7343,7 +7355,7 @@ msgstr ""
 "debtorrent, consulte &apt-transport-debtorrent;."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:240
+#: sources.list.5.xml:234
 msgid ""
 "Uses the archive stored locally (or NFS mounted) at /home/jason/debian for "
 "stable/main, stable/contrib, and stable/non-free."
@@ -7352,36 +7364,36 @@ msgstr ""
 "para «stable/main», «stable/contrib», y «stable/non-free»."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:242
+#: sources.list.5.xml:236
 #, no-wrap
 msgid "deb file:/home/jason/debian stable main contrib non-free"
 msgstr "deb file:/home/jason/debian stable main contrib non-free"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:244
+#: sources.list.5.xml:238
 msgid "As above, except this uses the unstable (development) distribution."
 msgstr ""
 "Como arriba, excepto que usa la distribución «unstable» (en desarrollo)."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:245
+#: sources.list.5.xml:239
 #, no-wrap
 msgid "deb file:/home/jason/debian unstable main contrib non-free"
 msgstr "deb file:/home/jason/debian unstable main contrib non-free"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:247
+#: sources.list.5.xml:241
 msgid "Source line for the above"
 msgstr "Línea para obtener el código fuente desde la ubicación anterior."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:248
+#: sources.list.5.xml:242
 #, no-wrap
 msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
 msgstr "deb-src file:/home/jason/debian unstable main contrib non-free"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:250
+#: sources.list.5.xml:244
 msgid ""
 "The first line gets package information for the architectures in "
 "<literal>APT::Architectures</literal> while the second always retrieves "
@@ -7392,7 +7404,7 @@ msgstr ""
 "obtiene <literal>amd64</literal> y <literal>armel</literal>."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:252
+#: sources.list.5.xml:246
 #, no-wrap
 msgid ""
 "deb http://ftp.debian.org/debian &stable-codename; main\n"
@@ -7402,7 +7414,7 @@ msgstr ""
 "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:255
+#: sources.list.5.xml:249
 msgid ""
 "Uses HTTP to access the archive at archive.debian.org, and uses only the "
 "hamm/main area."
@@ -7411,13 +7423,13 @@ msgstr ""
 "usa sólo la sección «hamm/main»."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:257
+#: sources.list.5.xml:251
 #, no-wrap
 msgid "deb http://archive.debian.org/debian-archive hamm main"
 msgstr "deb http://archive.debian.org/debian-archive hamm main"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:259
+#: sources.list.5.xml:253
 msgid ""
 "Uses FTP to access the archive at ftp.debian.org, under the debian "
 "directory, and uses only the &stable-codename;/contrib area."
@@ -7426,13 +7438,13 @@ msgstr ""
 "del directorio «debian», y usa sólo la sección «&stable-codename;/contrib»."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:261
+#: sources.list.5.xml:255
 #, no-wrap
 msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
 msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:263
+#: sources.list.5.xml:257
 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 "
@@ -7445,19 +7457,19 @@ msgstr ""
 "filename>, se usará sólo una sesión FTP para ambas."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:267
+#: sources.list.5.xml:261
 #, no-wrap
 msgid "deb ftp://ftp.debian.org/debian unstable contrib"
 msgstr "deb ftp://ftp.debian.org/debian unstable contrib"
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:276
+#: sources.list.5.xml:270
 #, no-wrap
 msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
 msgstr "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:269
+#: sources.list.5.xml:263
 msgid ""
 "Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe "
 "directory, and uses only files found under <filename>unstable/binary-i386</"
@@ -7476,17 +7488,17 @@ msgstr ""
 "tiene esta estructura.) <placeholder type=\"literallayout\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:281
+#: sources.list.5.xml:275
 msgid "&apt-cache; &apt-conf;"
 msgstr "&apt-cache; &apt-conf;"
 
 #. type: Content of: <refentry><refmeta><manvolnum>
-#: apt-extracttemplates.1.xml:28 apt-sortpkgs.1.xml:28 apt-ftparchive.1.xml:28
+#: apt-extracttemplates.1.xml:22 apt-sortpkgs.1.xml:22 apt-ftparchive.1.xml:22
 msgid "1"
 msgstr "1"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-extracttemplates.1.xml:35
+#: apt-extracttemplates.1.xml:29
 msgid ""
 "Utility to extract <command>debconf</command> config and templates from "
 "Debian packages"
@@ -7495,7 +7507,7 @@ msgstr ""
 "plantillas de paquetes de Debian"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:41
+#: apt-extracttemplates.1.xml:35
 msgid ""
 "<command>apt-extracttemplates</command> will take one or more Debian package "
 "files as input and write out (to a temporary directory) all associated "
@@ -7510,12 +7522,12 @@ msgstr ""
 "plantillas, se generará una salida de una línea con el formato:"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:46
+#: apt-extracttemplates.1.xml:40
 msgid "package version template-file config-script"
 msgstr "paquete versión fichero-de-plantilla script-de-configuración"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:47
+#: apt-extracttemplates.1.xml:41
 msgid ""
 "template-file and config-script are written to the temporary directory "
 "specified by the <option>-t</option> or <option>--tempdir</option> "
@@ -7530,7 +7542,7 @@ msgstr ""
 "XXXXXX</filename> y <filename>paquete.config.XXXXXX</filename>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-extracttemplates.1.xml:60
+#: apt-extracttemplates.1.xml:54
 msgid ""
 "Temporary directory in which to write extracted <command>debconf</command> "
 "template files and config scripts.  Configuration Item: <literal>APT::"
@@ -7541,7 +7553,7 @@ msgstr ""
 "de configuración: <literal>APT::ExtractTemplates::TempDir</literal>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:77
+#: apt-extracttemplates.1.xml:71
 msgid ""
 "<command>apt-extracttemplates</command> returns zero on normal operation, "
 "decimal 100 on error."
@@ -7550,12 +7562,12 @@ msgstr ""
 "error, y el valor 100 en caso de error."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-sortpkgs.1.xml:35
+#: apt-sortpkgs.1.xml:29
 msgid "Utility to sort package index files"
 msgstr "Herramienta para ordenar los ficheros de índice de paquetes"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-sortpkgs.1.xml:41
+#: apt-sortpkgs.1.xml:35
 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 "
@@ -7568,7 +7580,7 @@ msgstr ""
 "ordenación internas."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-sortpkgs.1.xml:47
+#: apt-sortpkgs.1.xml:41
 msgid ""
 "All output is sent to standard output; the input must be a seekable file."
 msgstr ""
@@ -7576,7 +7588,7 @@ msgstr ""
 "fichero ubicable."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-sortpkgs.1.xml:56
+#: apt-sortpkgs.1.xml:50
 msgid ""
 "Use source index field ordering.  Configuration Item: <literal>APT::"
 "SortPkgs::Source</literal>."
@@ -7585,7 +7597,7 @@ msgstr ""
 "configuración: <literal>APT::SortPkgs::Source</literal>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-sortpkgs.1.xml:70
+#: apt-sortpkgs.1.xml:64
 msgid ""
 "<command>apt-sortpkgs</command> returns zero on normal operation, decimal "
 "100 on error."
@@ -7594,12 +7606,12 @@ msgstr ""
 "valor 100 en caso de error."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-ftparchive.1.xml:35
+#: apt-ftparchive.1.xml:29
 msgid "Utility to generate index files"
 msgstr "Herramienta para generar ficheros de índice"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:41
+#: apt-ftparchive.1.xml:35
 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 "
@@ -7612,7 +7624,7 @@ msgstr ""
 "de origen basado en el contenido de ese sitio."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:45
+#: apt-ftparchive.1.xml:39
 msgid ""
 "<command>apt-ftparchive</command> is a superset of the &dpkg-scanpackages; "
 "program, incorporating its entire functionality via the <literal>packages</"
@@ -7627,7 +7639,7 @@ msgstr ""
 "«script» para el proceso de generación de un archivo completo."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:51
+#: apt-ftparchive.1.xml:45
 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 "
@@ -7642,7 +7654,7 @@ msgstr ""
 "los ficheros y genera los ficheros de salida comprimidos deseados."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:62
+#: apt-ftparchive.1.xml:56
 msgid ""
 "The packages command generates a package file from a directory tree. It "
 "takes the given directory and recursively searches it for .deb files, "
@@ -7655,7 +7667,7 @@ msgstr ""
 "orden es casi un equivalente de &dpkg-scanpackages;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:67 apt-ftparchive.1.xml:91
+#: apt-ftparchive.1.xml:61 apt-ftparchive.1.xml:85
 msgid ""
 "The option <option>--db</option> can be used to specify a binary caching DB."
 msgstr ""
@@ -7663,7 +7675,7 @@ msgstr ""
 "datos binaria para la caché (registro de paquetes)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:72
+#: apt-ftparchive.1.xml:66
 msgid ""
 "The <literal>sources</literal> command generates a source index file from a "
 "directory tree.  It takes the given directory and recursively searches it "
@@ -7677,7 +7689,7 @@ msgstr ""
 "scansources;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:77
+#: apt-ftparchive.1.xml:71
 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 "
@@ -7688,7 +7700,7 @@ msgstr ""
 "para cambiar el fichero de fuentes alternativo que se usará."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:84
+#: apt-ftparchive.1.xml:78
 msgid ""
 "The <literal>contents</literal> command generates a contents file from a "
 "directory tree. It takes the given directory and recursively searches it "
@@ -7706,7 +7718,7 @@ msgstr ""
 "por una coma en la salida."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:96
+#: apt-ftparchive.1.xml:90
 msgid ""
 "The <literal>release</literal> command generates a Release file from a "
 "directory tree. It recursively searches the given directory for uncompressed "
@@ -7732,7 +7744,7 @@ msgstr ""
 "contiene una suma de control MD5, SHA1 y SHA256 para cada fichero."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:106
+#: apt-ftparchive.1.xml:100
 msgid ""
 "Values for the additional metadata fields in the Release file are taken from "
 "the corresponding variables under <literal>APT::FTPArchive::Release</"
@@ -7753,7 +7765,7 @@ msgstr ""
 "<literal>Components</literal> y <literal>Description</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:119
+#: apt-ftparchive.1.xml:113
 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 "
@@ -7769,7 +7781,7 @@ msgstr ""
 "configuración necesaria."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:128
+#: apt-ftparchive.1.xml:122
 msgid ""
 "The <literal>clean</literal> command tidies the databases used by the given "
 "configuration file by removing any records that are no longer necessary."
@@ -7779,12 +7791,12 @@ msgstr ""
 "necesarios."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:134
+#: apt-ftparchive.1.xml:128
 msgid "The Generate Configuration"
 msgstr "La configuración de «generate»"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:136
+#: apt-ftparchive.1.xml:130
 msgid ""
 "The <literal>generate</literal> command uses a configuration file to "
 "describe the archives that are going to be generated. It follows the typical "
@@ -7802,7 +7814,7 @@ msgstr ""
 "etiqueta."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:144
+#: apt-ftparchive.1.xml:138
 msgid ""
 "The generate configuration has four separate sections, each described below."
 msgstr ""
@@ -7810,12 +7822,12 @@ msgstr ""
 "a continuación."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:146
+#: apt-ftparchive.1.xml:140
 msgid "<literal>Dir</literal> Section"
 msgstr "Sección <literal>Dir</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:148
+#: apt-ftparchive.1.xml:142
 msgid ""
 "The <literal>Dir</literal> section defines the standard directories needed "
 "to locate the files required during the generation process. These "
@@ -7828,7 +7840,7 @@ msgstr ""
 "secciones posteriores para producir una ruta absoluta."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:155
+#: apt-ftparchive.1.xml:149
 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 "
@@ -7839,17 +7851,17 @@ msgstr ""
 "«dist»."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:162
+#: apt-ftparchive.1.xml:156
 msgid "Specifies the location of the override files."
 msgstr "Define la ubicación de los ficheros alternativos."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:167
+#: apt-ftparchive.1.xml:161
 msgid "Specifies the location of the cache files."
 msgstr "Define la ubicación de los ficheros almacenados."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:172
+#: apt-ftparchive.1.xml:166
 msgid ""
 "Specifies the location of the file list files, if the <literal>FileList</"
 "literal> setting is used below."
@@ -7858,12 +7870,12 @@ msgstr ""
 "posteriormente el valor <literal>FileList</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:178
+#: apt-ftparchive.1.xml:172
 msgid "<literal>Default</literal> Section"
 msgstr "Sección <literal>Default</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:180
+#: apt-ftparchive.1.xml:174
 msgid ""
 "The <literal>Default</literal> section specifies default values, and "
 "settings that control the operation of the generator. Other sections may "
@@ -7874,7 +7886,7 @@ msgstr ""
 "sobrescribir estos valores predeterminados con un valor de la sección."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:186
+#: apt-ftparchive.1.xml:180
 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 "
@@ -7888,7 +7900,7 @@ msgstr ""
 "compresión es «. gzip»."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:194
+#: apt-ftparchive.1.xml:188
 msgid ""
 "Sets the default list of file extensions that are package files.  This "
 "defaults to '.deb'."
@@ -7897,7 +7909,7 @@ msgstr ""
 "paquete. El valor predeterminado es «.deb»."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:200
+#: apt-ftparchive.1.xml:194
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Sources files."
@@ -7906,7 +7918,7 @@ msgstr ""
 "controla la compresión para los ficheros «Sources»."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:206
+#: apt-ftparchive.1.xml:200
 msgid ""
 "Sets the default list of file extensions that are source files.  This "
 "defaults to '.dsc'."
@@ -7915,7 +7927,7 @@ msgstr ""
 "ficheros de fuentes. El valor predeterminado es «.dsc»."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:212
+#: apt-ftparchive.1.xml:206
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Contents files."
@@ -7924,7 +7936,7 @@ msgstr ""
 "controla la compresión para los ficheros «Contents»."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:218
+#: apt-ftparchive.1.xml:212
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Translation-en master file."
@@ -7933,7 +7945,7 @@ msgstr ""
 "controla la compresión para el fichero maestro Translation-en."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:224
+#: apt-ftparchive.1.xml:218
 msgid ""
 "Specifies the number of kilobytes to delink (and replace with hard links) "
 "per run. This is used in conjunction with the per-section <literal>External-"
@@ -7944,7 +7956,7 @@ msgstr ""
 "cada sección."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:231
+#: apt-ftparchive.1.xml:225
 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."
@@ -7954,7 +7966,7 @@ msgstr ""
 "sin tener en cuenta la máscara de usuario («umask»)."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:238 apt-ftparchive.1.xml:384
+#: apt-ftparchive.1.xml:232 apt-ftparchive.1.xml:378
 msgid ""
 "Specifies whether long descriptions should be included in the "
 "<filename>Packages</filename> file or split out into a master "
@@ -7965,12 +7977,12 @@ msgstr ""
 "maestro."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:244
+#: apt-ftparchive.1.xml:238
 msgid "<literal>TreeDefault</literal> Section"
 msgstr "Sección <literal>TreeDefault</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:246
+#: apt-ftparchive.1.xml:240
 msgid ""
 "Sets defaults specific to <literal>Tree</literal> sections. All of these "
 "variables are substitution variables and have the strings $(DIST), "
@@ -7981,7 +7993,7 @@ msgstr ""
 "$(DIST), $(SECTION) y $(ARCH) con sus valores respectivos."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:253
+#: apt-ftparchive.1.xml:247
 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 will all "
@@ -7992,7 +8004,7 @@ msgstr ""
 "que durante varios días todos se regenerarán."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:260
+#: apt-ftparchive.1.xml:254
 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 updated. "
@@ -8011,7 +8023,7 @@ msgstr ""
 "unidades usadas son días."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:271
+#: apt-ftparchive.1.xml:265
 msgid ""
 "Sets the top of the .deb directory tree. Defaults to <filename>$(DIST)/"
 "$(SECTION)/binary-$(ARCH)/</filename>"
@@ -8020,7 +8032,7 @@ msgstr ""
 "$(DIST)/$(SECTION)/binary-$(ARCH)/</filename>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:277
+#: apt-ftparchive.1.xml:271
 msgid ""
 "Sets the top of the source package directory tree. Defaults to <filename>"
 "$(DIST)/$(SECTION)/source/</filename>"
@@ -8029,7 +8041,7 @@ msgstr ""
 "predeterminado es <filename>$(DIST)/$(SECTION)/source/</filename>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:283
+#: apt-ftparchive.1.xml:277
 msgid ""
 "Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
 "binary-$(ARCH)/Packages</filename>"
@@ -8038,7 +8050,7 @@ msgstr ""
 "$(DIST)/$(SECTION)/binary-$(ARCH)/Packages</filename>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:289
+#: apt-ftparchive.1.xml:283
 msgid ""
 "Sets the output Sources file. Defaults to <filename>$(DIST)/$(SECTION)/"
 "source/Sources</filename>"
@@ -8047,7 +8059,7 @@ msgstr ""
 "$(DIST)/$(SECTION)/source/Sources</filename>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:295
+#: apt-ftparchive.1.xml:289
 msgid ""
 "Sets the output Translation-en master file with the long descriptions if "
 "they should be not included in the Packages file. Defaults to <filename>"
@@ -8058,7 +8070,7 @@ msgstr ""
 "predeterminado es <filename>$(DIST)/$(SECTION)/i18n/Translation-en</filename>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:302
+#: apt-ftparchive.1.xml:296
 msgid ""
 "Sets the path prefix that causes a symlink to be considered an internal link "
 "instead of an external link. Defaults to <filename>$(DIST)/$(SECTION)/</"
@@ -8069,7 +8081,7 @@ msgstr ""
 "<filename>$(DIST)/$(SECTION)/</filename>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:309
+#: apt-ftparchive.1.xml:303
 msgid ""
 "Sets the output Contents file. Defaults to <filename>$(DIST)/$(SECTION)/"
 "Contents-$(ARCH)</filename>. If this setting causes multiple Packages files "
@@ -8084,13 +8096,13 @@ msgstr ""
 "automáticamente esos ficheros de paquete."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:318
+#: apt-ftparchive.1.xml:312
 msgid "Sets header file to prepend to the contents output."
 msgstr ""
 "Define el fichero de cabecera a añadir al fichero «Contents» de salida."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:323
+#: apt-ftparchive.1.xml:317
 msgid ""
 "Sets the binary cache database to use for this section. Multiple sections "
 "can share the same database."
@@ -8099,7 +8111,7 @@ msgstr ""
 "Varias secciones pueden compartir la misma base de datos."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:329
+#: apt-ftparchive.1.xml:323
 msgid ""
 "Specifies that instead of walking the directory tree, <command>apt-"
 "ftparchive</command> should read the list of files from the given file. "
@@ -8111,7 +8123,7 @@ msgstr ""
 "como prefijo el directorio del archivo."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:336
+#: apt-ftparchive.1.xml:330
 msgid ""
 "Specifies that instead of walking the directory tree, <command>apt-"
 "ftparchive</command> should read the list of files from the given file. "
@@ -8125,12 +8137,12 @@ msgstr ""
 "índices de fuentes."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:344
+#: apt-ftparchive.1.xml:338
 msgid "<literal>Tree</literal> Section"
 msgstr "Sección <literal>Tree</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:346
+#: apt-ftparchive.1.xml:340
 msgid ""
 "The <literal>Tree</literal> section defines a standard Debian file tree "
 "which consists of a base directory, then multiple sections in that base "
@@ -8145,7 +8157,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:351
+#: apt-ftparchive.1.xml:345
 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 "
@@ -8158,7 +8170,7 @@ msgstr ""
 "valor como <filename>dists/&stable-codename;</filename>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:356
+#: apt-ftparchive.1.xml:350
 msgid ""
 "All of the settings defined in the <literal>TreeDefault</literal> section "
 "can be used in a <literal>Tree</literal> section as well as three new "
@@ -8169,7 +8181,7 @@ msgstr ""
 "variables."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt-ftparchive.1.xml:362
+#: apt-ftparchive.1.xml:356
 #, no-wrap
 msgid ""
 "for i in Sections do \n"
@@ -8183,7 +8195,7 @@ msgstr ""
 "     "
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:359
+#: apt-ftparchive.1.xml:353
 msgid ""
 "When processing a <literal>Tree</literal> section <command>apt-ftparchive</"
 "command> performs an operation similar to: <placeholder type=\"programlisting"
@@ -8194,7 +8206,7 @@ msgstr ""
 "<placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:370
+#: apt-ftparchive.1.xml:364
 msgid ""
 "This is a space separated list of sections which appear under the "
 "distribution; typically this is something like <literal>main contrib non-"
@@ -8205,7 +8217,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:377
+#: apt-ftparchive.1.xml:371
 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 "
@@ -8216,7 +8228,7 @@ msgstr ""
 "indicar que este árbol tiene un fichero de fuentes."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:390
+#: apt-ftparchive.1.xml:384
 msgid ""
 "Sets the binary override file. The override file contains section, priority "
 "and maintainer address information."
@@ -8225,7 +8237,7 @@ msgstr ""
 "sección, la prioridad y la dirección del mantenedor."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:396
+#: apt-ftparchive.1.xml:390
 msgid ""
 "Sets the source override file. The override file contains section "
 "information."
@@ -8234,22 +8246,22 @@ msgstr ""
 "la sección."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:402 apt-ftparchive.1.xml:448
+#: apt-ftparchive.1.xml:396 apt-ftparchive.1.xml:442
 msgid "Sets the binary extra override file."
 msgstr "Define el fichero binario alternativo adicional."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:407 apt-ftparchive.1.xml:453
+#: apt-ftparchive.1.xml:401 apt-ftparchive.1.xml:447
 msgid "Sets the source extra override file."
 msgstr "Define el fichero de fuentes alternativo adicional."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:412
+#: apt-ftparchive.1.xml:406
 msgid "<literal>BinDirectory</literal> Section"
 msgstr "Sección <literal>BinDirectory</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:414
+#: apt-ftparchive.1.xml:408
 msgid ""
 "The <literal>bindirectory</literal> section defines a binary directory tree "
 "with no special structure. The scope tag specifies the location of the "
@@ -8264,12 +8276,12 @@ msgstr ""
 "<literal>Section</literal><literal>Architecture</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:422
+#: apt-ftparchive.1.xml:416
 msgid "Sets the Packages file output."
 msgstr "Define el fichero «Packages» de salida."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:427
+#: apt-ftparchive.1.xml:421
 msgid ""
 "Sets the Sources file output. At least one of <literal>Packages</literal> or "
 "<literal>Sources</literal> is required."
@@ -8278,42 +8290,42 @@ msgstr ""
 "<literal>Packages</literal> o <literal>Sources</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:433
+#: apt-ftparchive.1.xml:427
 msgid "Sets the Contents file output (optional)."
 msgstr "Define el fichero «Contents» de salida (opcional)"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:438
+#: apt-ftparchive.1.xml:432
 msgid "Sets the binary override file."
 msgstr "Define el fichero binario alternativo."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:443
+#: apt-ftparchive.1.xml:437
 msgid "Sets the source override file."
 msgstr "Define el fichero de fuentes alternativo."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:458
+#: apt-ftparchive.1.xml:452
 msgid "Sets the cache DB."
 msgstr "Define la base de datos de la caché."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:463
+#: apt-ftparchive.1.xml:457
 msgid "Appends a path to all the output paths."
 msgstr "Añade una ruta a todas las rutas de salida."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:468
+#: apt-ftparchive.1.xml:462
 msgid "Specifies the file list file."
 msgstr "Define el fichero de la lista de ficheros."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:475
+#: apt-ftparchive.1.xml:469
 msgid "The Binary Override File"
 msgstr "El fichero binario alternativo"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:476
+#: apt-ftparchive.1.xml:470
 msgid ""
 "The binary override file is fully compatible with &dpkg-scanpackages;. It "
 "contains four fields separated by spaces. The first field is the package "
@@ -8328,19 +8340,19 @@ msgstr ""
 "de permutación del mantenedor."
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:482
+#: apt-ftparchive.1.xml:476
 #, no-wrap
 msgid "old [// oldn]* => new"
 msgstr "antigua [// antigua-n]* => nueva"
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:484
+#: apt-ftparchive.1.xml:478
 #, no-wrap
 msgid "new"
 msgstr "nueva"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:481
+#: apt-ftparchive.1.xml:475
 msgid ""
 "The general form of the maintainer field is: <placeholder type="
 "\"literallayout\" id=\"0\"/> or simply, <placeholder type=\"literallayout\" "
@@ -8357,12 +8369,12 @@ msgstr ""
 "segunda forma sustituye de forma incondicional el campo del mantenedor."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:492
+#: apt-ftparchive.1.xml:486
 msgid "The Source Override File"
 msgstr "El fichero de fuentes alternativo"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:494
+#: apt-ftparchive.1.xml:488
 msgid ""
 "The source override file is fully compatible with &dpkg-scansources;. It "
 "contains two fields separated by spaces. The first field is the source "
@@ -8373,12 +8385,12 @@ msgstr ""
 "nombre del paquete fuente, el segundo es la sección a la que se asignará."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:499
+#: apt-ftparchive.1.xml:493
 msgid "The Extra Override File"
 msgstr "El fichero alternativo adicional"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:501
+#: apt-ftparchive.1.xml:495
 msgid ""
 "The extra override file allows any arbitrary tag to be added or replaced in "
 "the output. It has three columns, the first is the package, the second is "
@@ -8389,7 +8401,7 @@ msgstr ""
 "paquete, la segunda es la etiqueta y el resto de la línea es el nuevo valor."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:512
+#: apt-ftparchive.1.xml:506
 msgid ""
 "Generate the given checksum. These options default to on, when turned off "
 "the generated index files will not have the checksum fields where possible.  "
@@ -8413,7 +8425,7 @@ msgstr ""
 "<literal>MD5</literal>, <literal>SHA1</literal> o <literal>SHA256</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:523
+#: apt-ftparchive.1.xml:517
 msgid ""
 "Use a binary caching DB. This has no effect on the generate command.  "
 "Configuration Item: <literal>APT::FTPArchive::DB</literal>."
@@ -8422,7 +8434,7 @@ msgstr ""
 "«generate». Opción de configuración: <literal>APT::FTPArchive::DB</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:529
+#: apt-ftparchive.1.xml:523
 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 "
@@ -8436,7 +8448,7 @@ msgstr ""
 "configuración. Opción de configuración: <literal>quiet</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:537
+#: apt-ftparchive.1.xml:531
 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 "
@@ -8449,7 +8461,7 @@ msgstr ""
 "Opción de configuración: <literal>APT::FTPArchive::DeLinkAct</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:545
+#: apt-ftparchive.1.xml:539
 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 "
@@ -8466,7 +8478,7 @@ msgstr ""
 "Contents</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:555
+#: apt-ftparchive.1.xml:549
 msgid ""
 "Select the source override file to use with the <literal>sources</literal> "
 "command.  Configuration Item: <literal>APT::FTPArchive::SourceOverride</"
@@ -8477,7 +8489,7 @@ msgstr ""
 "FTPArchive::SourceOverride</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:561
+#: apt-ftparchive.1.xml:555
 msgid ""
 "Make the caching databases read only.  Configuration Item: <literal>APT::"
 "FTPArchive::ReadOnlyDB</literal>."
@@ -8486,7 +8498,7 @@ msgstr ""
 "Opción de configuración: <literal>APT::FTPArchive::ReadOnlyDB</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:566
+#: apt-ftparchive.1.xml:560
 msgid ""
 "Accept in the <literal>packages</literal> and <literal>contents</literal> "
 "commands only package files matching <literal>*_arch.deb</literal> or "
@@ -8500,7 +8512,7 @@ msgstr ""
 "FTPArchive::Architecture</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:574
+#: apt-ftparchive.1.xml:568
 msgid ""
 "&apt-ftparchive; caches as much as possible of metadata in a cachedb. If "
 "packages are recompiled and/or republished with the same version again, this "
@@ -8524,7 +8536,7 @@ msgstr ""
 "comprobaciones adicionales son innecesarias."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:586
+#: apt-ftparchive.1.xml:580
 msgid ""
 "This configuration option defaults to \"<literal>true</literal>\" and should "
 "only be set to <literal>\"false\"</literal> if the Archive generated with "
@@ -8540,13 +8552,13 @@ msgstr ""
 "con la orden «generate»."
 
 #. type: Content of: <refentry><refsect1><para><programlisting>
-#: apt-ftparchive.1.xml:604
+#: apt-ftparchive.1.xml:598
 #, no-wrap
 msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
 msgstr "<command>apt-ftparchive</command> packages <replaceable>directorio</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:600
+#: apt-ftparchive.1.xml:594
 msgid ""
 "To create a compressed Packages file for a directory containing binary "
 "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
@@ -8555,7 +8567,7 @@ msgstr ""
 "paquetes binarios («.deb»): <placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:614
+#: apt-ftparchive.1.xml:608
 msgid ""
 "<command>apt-ftparchive</command> returns zero on normal operation, decimal "
 "100 on error."
@@ -8563,36 +8575,53 @@ msgstr ""
 "<command>apt-ftparchive</command> devuelve cero si no hay ningún error, y el "
 "valor 100 en caso de error."
 
-#. type: <title></title>
-#: guide.sgml:4
+#. type: Attribute 'lang' of: <book>
+#: guide.dbk:9 offline.dbk:9
+msgid "en"
+msgstr "es"
+
+#. type: Content of: <book><title>
+#: guide.dbk:11
 msgid "APT User's Guide"
 msgstr "Guía de usuario de APT"
 
-#. type: <author></author>
-#: guide.sgml:6 offline.sgml:6
-msgid "<name>Jason Gunthorpe </name><email>jgg@debian.org</email>"
-msgstr "<name>Jason Gunthorpe </name><email>jgg@debian.org</email>"
+#. type: Content of: <book><bookinfo><authorgroup><author><personname>
+#: guide.dbk:17 offline.dbk:17
+msgid "Jason Gunthorpe"
+msgstr "Jason Gunthorpe"
 
-#. type: <version></version>
-#: guide.sgml:7
-msgid "$Id: guide.sgml,v 1.7 2003/04/26 23:26:13 doogie Exp $"
-msgstr "$Id: guide.sgml,v 1.7 2003/04/26 23:26:13 doogie Exp $"
+#. type: Content of: <book><bookinfo><authorgroup><author><email>
+#: guide.dbk:17 offline.dbk:17
+msgid "jgg@debian.org"
+msgstr "jgg@debian.org"
 
-#. type: <abstract></abstract>
-#: guide.sgml:11
+#. type: Content of: <book><bookinfo><releaseinfo>
+#: guide.dbk:21 offline.dbk:21
+msgid "Version &apt-product-version;"
+msgstr ""
+
+#. type: Content of: <book><bookinfo><abstract><para>
+#: guide.dbk:25
 msgid ""
 "This document provides an overview of how to use the the APT package manager."
 msgstr ""
 "Este documento ofrece una introducción sobre cómo usar el gestor de paquetes "
 "APT."
 
-#. type: <copyrightsummary></copyrightsummary>
-#: guide.sgml:15
-msgid "Copyright &copy; Jason Gunthorpe, 1998."
-msgstr "Copyright &copy; Jason Gunthorpe, 1998."
+#. type: Content of: <book><bookinfo>
+#: guide.dbk:29
+msgid ""
+"<copyright><year>1998</year><holder>Jason Gunthorpe</holder></copyright>"
+msgstr ""
+"<copyright><year>1998</year><holder>Jason Gunthorpe</holder></copyright>"
+
+#. type: Content of: <book><bookinfo><legalnotice><title>
+#: guide.dbk:32 offline.dbk:33
+msgid "License Notice"
+msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:21 offline.sgml:22
+#. type: Content of: <book><bookinfo><legalnotice><para>
+#: guide.dbk:34 offline.dbk:35
 msgid ""
 "\"APT\" and this document are free software; you can redistribute them and/"
 "or modify them under the terms of the GNU General Public License as "
@@ -8604,8 +8633,8 @@ msgstr ""
 "Public License publicada por la Free Software Foundation, ya sea en su "
 "versión 2 o (a su elección) cualquier versión posterior."
 
-#. type: <p></p>
-#: guide.sgml:24 offline.sgml:25
+#. type: Content of: <book><bookinfo><legalnotice><para>
+#: guide.dbk:43 offline.dbk:41
 msgid ""
 "For more details, on Debian systems, see the file /usr/share/common-licenses/"
 "GPL for the full license."
@@ -8613,31 +8642,31 @@ msgstr ""
 "Para más detalles acerca de sistemas Debian y la licencia completa, consulte "
 "el fichero «/usr/share/common-licenses/GPL»."
 
-#. type: <heading></heading>
-#: guide.sgml:32
+#. type: Content of: <book><chapter><title>
+#: guide.dbk:50
 msgid "General"
 msgstr "General"
 
-#. type: <p></p>
-#: guide.sgml:38
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:52
 msgid ""
-"The APT package currently contains two sections, the APT <prgn>dselect</"
-"prgn> method and the <prgn>apt-get</prgn> command line user interface. Both "
-"provide a way to install and remove packages as well as download new "
-"packages from the Internet."
+"The APT package currently contains two sections, the APT <command>dselect</"
+"command> method and the <command>apt-get</command> command line user "
+"interface. Both provide a way to install and remove packages as well as "
+"download new packages from the Internet."
 msgstr ""
-"El paquete APT contiene a día de hoy dos secciones, el método <prgn>dselect</"
-"prgn> y la interfaz de usuario para la línea de órdenes <prgn>apt-get</"
-"prgn>. Ambos ofrecen una manera de instalar y desinstalar paquetes, así como "
-"descargar paquetes nuevos de Internet."
+"El paquete APT contiene a día de hoy dos secciones, el método "
+"<command>dselect</command> y la interfaz de usuario para la línea de órdenes "
+"<command>apt-get</command>. Ambos ofrecen una manera de instalar y "
+"desinstalar paquetes, así como descargar paquetes nuevos de Internet."
 
-#. type: <heading></heading>
-#: guide.sgml:39
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:58
 msgid "Anatomy of the Package System"
 msgstr "Anatomía del sistema de paquetes"
 
-#. type: <p></p>
-#: guide.sgml:44
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:60
 msgid ""
 "The Debian packaging system has a large amount of information associated "
 "with each package to help assure that it integrates cleanly and easily into "
@@ -8647,8 +8676,8 @@ msgstr ""
 "asociada a cada paquete para asegurar una integración sencilla y limpia en "
 "el sistema. La característica más importante es el sistema de dependencias."
 
-#. type: <p></p>
-#: guide.sgml:52
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:65
 msgid ""
 "The dependency system allows individual programs to make use of shared "
 "elements in the system such as libraries. It simplifies placing infrequently "
@@ -8663,8 +8692,8 @@ msgstr ""
 "permite elegir el agente de transporte del correo electrónico, el servidor "
 "de X y demás."
 
-#. type: <p></p>
-#: guide.sgml:57
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:72
 msgid ""
 "The first step to understanding the dependency system is to grasp the "
 "concept of a simple dependency. The meaning of a simple dependency is that a "
@@ -8676,8 +8705,8 @@ msgstr ""
 "simple es que un paquete requiere que otro también esté instalado para poder "
 "funcionar correctamente."
 
-#. type: <p></p>
-#: guide.sgml:63
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:77
 msgid ""
 "For instance, mailcrypt is an emacs extension that aids in encrypting email "
 "with GPG. Without GPGP installed mailcrypt is useless, so mailcrypt has a "
@@ -8689,8 +8718,8 @@ msgstr ""
 "una dependencia simple con GPG. Como también es una extensión de emacs tiene "
 "una dependencia simple con emacs, ya que sin él mailcrypt es inservible."
 
-#. type: <p></p>
-#: guide.sgml:73
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:83
 msgid ""
 "The other important dependency to understand is a conflicting dependency. It "
 "means that a package, when installed with another package, will not work and "
@@ -8711,8 +8740,8 @@ msgstr ""
 "sistema, y por ello todos los agentes de transporte de correo tienen una "
 "dependencia de conflicto con todos los demás."
 
-#. type: <p></p>
-#: guide.sgml:83
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:93
 msgid ""
 "As an added complication there is the possibility for a package to pretend "
 "to be another package. Consider that exim and sendmail for many intents are "
@@ -8732,8 +8761,8 @@ msgstr ""
 "dependerán de «mail-transport-agent». Esto puede añadir confusión al "
 "intentar arreglar paquetes manualmente."
 
-#. type: <p></p>
-#: guide.sgml:88
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:103
 msgid ""
 "At any given time a single dependency may be met by packages that are "
 "already installed or it may not be. APT attempts to help resolve dependency "
@@ -8745,94 +8774,102 @@ msgstr ""
 "asistir en la resolución de problemas de dependencias mediante un número de "
 "algoritmos automáticos que ayudan en la selección de paquetes a instalar."
 
-#. type: <heading></heading>
-#: guide.sgml:96
+#. type: Content of: <book><chapter><title>
+#: guide.dbk:112
 msgid "apt-get"
 msgstr "apt-get"
 
-#. type: <p></p>
-#: guide.sgml:102
-msgid ""
-"<prgn>apt-get</prgn> provides a simple way to install packages from the "
-"command line. Unlike <prgn>dpkg</prgn>, <prgn>apt-get</prgn> does not "
-"understand .deb files, it works with the package's proper name and can only "
-"install .deb archives from a <em>Source</em>."
-msgstr ""
-"<prgn>apt-get</prgn> ofrece una forma sencilla de instalar paquetes desde la "
-"línea de órdenes. A diferencia de <prgn>dpkg</prgn>, <prgn>apt-get</prgn> no "
-"intenta comprender los ficheros «.deb», sino que funciona con el nombre real "
-"del paquete y sólo puede instalar ficheros «.deb» desde una <em>fuente</em>."
-
-#. type: <p></p>
-#: guide.sgml:109
-msgid ""
-"The first <footnote><p>If you are using an http proxy server you must set "
-"the http_proxy environment variable first, see sources.list(5)</p></"
-"footnote> thing that should be done before using <prgn>apt-get</prgn> is to "
-"fetch the package lists from the <em>Sources</em> so that it knows what "
-"packages are available. This is done with <tt>apt-get update</tt>. For "
-"instance,"
-msgstr ""
-"La primera <footnote><p>Si está usando un servidor proxy primero debe "
-"definir la variable de entorno http_proxy, consulte sources.list (5).</p></"
-"footnote> cosa que debería hacer antes de usar <prgn>apt-get</prgn> es "
-"obtener las listas de paquetes desde las <em>fuentes</em> para así conocer "
-"los paquetes disponibles. Puede hacer esto mediante <tt>apt-get update</tt>. "
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:114
+msgid ""
+"<command>apt-get</command> provides a simple way to install packages from "
+"the command line. Unlike <command>dpkg</command>, <command>apt-get</command> "
+"does not understand .deb files, it works with the package's proper name and "
+"can only install .deb archives from a <emphasis>Source</emphasis>."
+msgstr ""
+"<command>apt-get</command> ofrece una forma sencilla de instalar paquetes "
+"desde la línea de órdenes. A diferencia de <command>dpkg</command>, "
+"<command>apt-get</command> no intenta comprender los ficheros «.deb», sino "
+"que funciona con el nombre real del paquete y sólo puede instalar ficheros «."
+"deb» desde una <emphasis>fuente</emphasis>."
+
+#. type: Content of: <book><chapter><para><footnote><para>
+#: guide.dbk:120
+msgid ""
+"If you are using an http proxy server you must set the http_proxy "
+"environment variable first, see sources.list(5)"
+msgstr ""
+"Si está usando un servidor proxy primero debe definir la variable de entorno "
+"http_proxy, consulte sources.list (5)."
+
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:120
+msgid ""
+"The first <placeholder type=\"footnote\" id=\"0\"/> thing that should be "
+"done before using <command>apt-get</command> is to fetch the package lists "
+"from the <emphasis>Sources</emphasis> so that it knows what packages are "
+"available. This is done with <literal>apt-get update</literal>. For instance,"
+msgstr ""
+"La primera <placeholder type=\"footnote\" id=\"0\"/> cosa que debería hacer "
+"antes de usar <command>apt-get</command> es obtener las listas de paquetes "
+"desde las <emphasis>fuentes</emphasis> para así conocer los paquetes "
+"disponibles. Puede hacer esto mediante <literal>apt-get update</literal>. "
 "Por ejemplo,"
 
-#. type: <example></example>
-#: guide.sgml:116
+#. type: Content of: <book><chapter><screen>
+#: guide.dbk:128
 #, no-wrap
 msgid ""
 "# apt-get update\n"
 "Get http://ftp.de.debian.org/debian-non-US/ stable/binary-i386/ Packages\n"
 "Get http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n"
 "Reading Package Lists... Done\n"
-"Building Dependency Tree... Done"
+"Building Dependency Tree... Done\n"
 msgstr ""
 "# apt-get update\n"
 "Des http://ftp.de.debian.org/debian-non-US/ stable/binary-i386/ Packages\n"
 "Des http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n"
 "Leyendo lista de paquetes... Hecho\n"
-"Creando árbol de dependencias... Hecho"
+"Creando árbol de dependencias... Hecho\n"
 
-#. type: <p><taglist>
-#: guide.sgml:120
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:135
 msgid "Once updated there are several commands that can be used:"
 msgstr "Puede usar varias órdenes después de actualizar:"
 
-#. type: <tag></tag>
-#: guide.sgml:121
+#. type: Content of: <book><chapter><variablelist><varlistentry><term>
+#: guide.dbk:139
 msgid "upgrade"
 msgstr "upgrade"
 
-#. type: <p></p>
-#: guide.sgml:131
+#. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
+#: guide.dbk:142
 msgid ""
 "Upgrade will attempt to gently upgrade the whole system. Upgrade will never "
 "install a new package or remove an existing package, nor will it ever "
 "upgrade a package that might cause some other package to break. This can be "
 "used daily to relatively safely upgrade the system. Upgrade will list all of "
 "the packages that it could not upgrade, this usually means that they depend "
-"on new packages or conflict with some other package. <prgn>dselect</prgn> or "
-"<tt>apt-get install</tt> can be used to force these packages to install."
+"on new packages or conflict with some other package. <command>dselect</"
+"command> or <literal>apt-get install</literal> can be used to force these "
+"packages to install."
 msgstr ""
 "«upgrade» intentará actualizar con cuidado todo el sistema. «upgrade» nunca "
 "intentará instalar un paquete nuevo o eliminar un paquete existente, y en "
 "ningún caso actualizará un paquete que pueda causar un problema de "
 "dependencias rotas a otro paquete. «upgrade» mostrará todos los paquetes que "
 "no pudo actualizar, lo cual generalmente significa que dependen de paquetes "
-"nuevos o que entran en conflicto con otro paquete. Puede usar <prgn>dselect</"
-"prgn> o <tt>apt-get install</tt> para forzar la instalación de tales "
-"paquetes."
+"nuevos o que entran en conflicto con otro paquete. Puede usar "
+"<command>dselect</command> o <literal>apt-get install</literal> para forzar "
+"la instalación de tales paquetes."
 
-#. type: <tag></tag>
-#: guide.sgml:131
+#. type: Content of: <book><chapter><variablelist><varlistentry><term>
+#: guide.dbk:154
 msgid "install"
 msgstr "install"
 
-#. type: <p></p>
-#: guide.sgml:140
+#. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
+#: guide.dbk:157
 msgid ""
 "Install is used to install packages by name. The package is automatically "
 "fetched and installed. This can be useful if you already know the name of "
@@ -8850,33 +8887,34 @@ msgstr ""
 "dependencias con los paquetes listados, y mostrará un resumen al pedir una "
 "confirmación en caso de modificar cualquiera de los argumentos introducidos."
 
-#. type: <tag></tag>
-#: guide.sgml:140
+#. type: Content of: <book><chapter><variablelist><varlistentry><term>
+#: guide.dbk:168
 msgid "dist-upgrade"
 msgstr "dist-upgrade"
 
-#. type: <p></p>
-#: guide.sgml:149
+#. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
+#: guide.dbk:171
 msgid ""
 "Dist-upgrade is a complete upgrader designed to simplify upgrading between "
 "releases of Debian. It uses a sophisticated algorithm to determine the best "
 "set of packages to install, upgrade and remove to get as much of the system "
 "to the newest release. In some situations it may be desired to use dist-"
 "upgrade rather than spend the time manually resolving dependencies in "
-"<prgn>dselect</prgn>. Once dist-upgrade has completed then <prgn>dselect</"
-"prgn> can be used to install any packages that may have been left out."
+"<command>dselect</command>. Once dist-upgrade has completed then "
+"<command>dselect</command> can be used to install any packages that may have "
+"been left out."
 msgstr ""
 "«dist-upgrade» es una actualizador completo diseñado para simplificar la "
 "actualización entre publicaciones de Debian. Utiliza un sofisticado "
 "algoritmo para diseñar el mejor conjunto de paquetes a instalar, actualizar "
 "y eliminar para así obtener cuanto sea posible de la última publicación. "
 "Puede que en algunas situaciones desee usar «dist-upgrade» en lugar de pasar "
-"tiempo resolviendo dependencias con <prgn>dselect</prgn>. Puede usar "
-"<prgn>dselect</prgn> para instalar cualquier paquete que se haya quedado "
-"atrás."
+"tiempo resolviendo dependencias con <command>dselect</command>. Puede usar "
+"<command>dselect</command> para instalar cualquier paquete que se haya "
+"quedado atrás."
 
-#. type: <p></p>
-#: guide.sgml:152
+#. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
+#: guide.dbk:181
 msgid ""
 "It is important to closely look at what dist-upgrade is going to do, its "
 "decisions may sometimes be quite surprising."
@@ -8884,167 +8922,163 @@ msgstr ""
 "Es importante revisar lo que «dist-upgrade» planea hacer, ya que sus "
 "decisiones a veces pueden resultar sorprendentes."
 
-#. type: <p></p>
-#: guide.sgml:163
-#, fuzzy
-#| msgid ""
-#| "<prgn>apt-get</prgn> has several command line options that are detailed "
-#| "in its man page, <manref section=\"8\" name=\"apt-get\">. The most useful "
-#| "option is <tt>-d</tt> which does not install the fetched files. If the "
-#| "system has to download a large number of package it would be undesired to "
-#| "start installing them in case something goes wrong. When <tt>-d</tt> is "
-#| "used the downloaded archives can be installed by simply running the "
-#| "command that caused them to be downloaded again without <tt>-d</tt>."
-msgid ""
-"<prgn>apt-get</prgn> has several command line options that are detailed in "
-"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful "
-"option is <tt>-d</tt> which does not install the fetched files. If the "
-"system has to download a large number of package it would be undesired to "
-"start installing them in case something goes wrong. When <tt>-d</tt> is used "
-"the downloaded archives can be installed by simply running the command that "
-"caused them to be downloaded again without <tt>-d</tt>."
-msgstr ""
-"<prgn>apt-get</prgn> ofrece varias opciones de línea de órdenes detalladas "
-"en su página de manual, <manref section=\"8\" name=\"apt-get\">. La opción "
-"más útil es <tt>-d</tt>, que no instala los ficheros obtenidos. Puede que no "
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:188
+msgid ""
+"<command>apt-get</command> has several command line options that are "
+"detailed in its man page, <citerefentry><refentrytitle>apt-get</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>. The most useful "
+"option is <literal>-d</literal> which does not install the fetched files. If "
+"the system has to download a large number of package it would be undesired "
+"to start installing them in case something goes wrong. When <literal>-d</"
+"literal> is used the downloaded archives can be installed by simply running "
+"the command that caused them to be downloaded again without <literal>-d</"
+"literal>."
+msgstr ""
+"<command>apt-get</command> ofrece varias opciones de línea de órdenes "
+"detalladas en su página de manual, <citerefentry><refentrytitle>apt-get</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>. La opción más útil es "
+"<literal>-d</literal>, que no instala los ficheros obtenidos. Puede que no "
 "desee instalar los paquetes de inicio si el sistema se tiene que descargar "
-"un gran número de éstos, en caso de que algo vaya mal. Cuando usa <tt>-d</"
-"tt> puede instalar los ficheros descargados simplemente ejecutando la orden "
-"que provocó su descarga, sin <tt>-d</tt>."
+"un gran número de éstos, en caso de que algo vaya mal. Cuando usa <literal>-"
+"d</literal> puede instalar los ficheros descargados simplemente ejecutando "
+"la orden que provocó su descarga, sin <literal>-d</literal>."
 
-#. type: <heading></heading>
-#: guide.sgml:168
+#. type: Content of: <book><chapter><title>
+#: guide.dbk:200
 msgid "DSelect"
 msgstr "DSelect"
 
-#. type: <p></p>
-#: guide.sgml:173
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:202
 msgid ""
-"The APT <prgn>dselect</prgn> method provides the complete APT system with "
-"the <prgn>dselect</prgn> package selection GUI. <prgn>dselect</prgn> is used "
-"to select the packages to be installed or removed and APT actually installs "
-"them."
+"The APT <command>dselect</command> method provides the complete APT system "
+"with the <command>dselect</command> package selection GUI. <command>dselect</"
+"command> is used to select the packages to be installed or removed and APT "
+"actually installs them."
 msgstr ""
-"El método <prgn>dselect</prgn> de APT ofrece el sistema completo de APT con "
-"la interfaz gráfica de selección de paquetes <prgn>dselect</prgn>. "
-"<prgn>dselect</prgn> se usa para seleccionar los paquetes a instalar o "
-"desinstalar que en realidad instalará APT."
+"El método <command>dselect</command> de APT ofrece el sistema completo de "
+"APT con la interfaz gráfica de selección de paquetes <command>dselect</"
+"command>. <command>dselect</command> se usa para seleccionar los paquetes a "
+"instalar o desinstalar que en realidad instalará APT."
 
-#. type: <p></p>
-#: guide.sgml:184
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:208
 msgid ""
-"To enable the APT method you need to select [A]ccess in <prgn>dselect</prgn> "
-"and then choose the APT method. You will be prompted for a set of "
-"<em>Sources</em> which are places to fetch archives from. These can be "
-"remote Internet sites, local Debian mirrors or CD-ROMs. Each source can "
-"provide a fragment of the total Debian archive, APT will automatically "
+"To enable the APT method you need to select [A]ccess in <command>dselect</"
+"command> and then choose the APT method. You will be prompted for a set of "
+"<emphasis>Sources</emphasis> which are places to fetch archives from. These "
+"can be remote Internet sites, local Debian mirrors or CD-ROMs. Each source "
+"can provide a fragment of the total Debian archive, APT will automatically "
 "combine them to form a complete set of packages. If you have a CD-ROM then "
 "it is a good idea to specify it first and then specify a mirror so that you "
 "have access to the latest bug fixes. APT will automatically use packages on "
 "your CD-ROM before downloading from the Internet."
 msgstr ""
 "Para habilitar el método APT tiene que seleccionar [M]étodo en "
-"<prgn>dselect</prgn>, y después seleccionar el método APT. Se le pedirá un "
-"conjunto de <em>fuentes</em>, ubicaciones de donde obtener los ficheros. "
-"Pueden ser sitios remotos de Internet, replicas locales de Debian o discos "
-"ópticos. Cada fuente puede proporcionar un fragmento del total del archivo "
-"Debian, los cuales APT combinará automáticamente para formar un conjunto "
-"completo de paquetes. Si tiene un disco óptico es una buena idea definirlo "
-"primero en el fichero de configuración y después especificar una replica "
-"para así tener acceso a los últimos arreglos de fallos. APT usará "
-"automáticamente los paquetes del disco óptico en lugar de descargarlos de "
-"Internet."
-
-#. type: <example></example>
-#: guide.sgml:198
+"<command>dselect</command>, y después seleccionar el método APT. Se le "
+"pedirá un conjunto de <emphasis>fuentes</emphasis>, ubicaciones de donde "
+"obtener los ficheros. Pueden ser sitios remotos de Internet, replicas "
+"locales de Debian o discos ópticos. Cada fuente puede proporcionar un "
+"fragmento del total del archivo Debian, los cuales APT combinará "
+"automáticamente para formar un conjunto completo de paquetes. Si tiene un "
+"disco óptico es una buena idea definirlo primero en el fichero de "
+"configuración y después especificar una replica para así tener acceso a los "
+"últimos arreglos de fallos. APT usará automáticamente los paquetes del disco "
+"óptico en lugar de descargarlos de Internet."
+
+#. type: Content of: <book><chapter><screen>
+#: guide.dbk:219
 #, no-wrap
 msgid ""
 "   Set up a list of distribution source locations\n"
-"\t \n"
+"\n"
 " Please give the base URL of the debian distribution.\n"
 " The access schemes I know about are: http file\n"
-"\t   \n"
+"\n"
 " For example:\n"
 "      file:/mnt/debian,\n"
 "      ftp://ftp.debian.org/debian,\n"
 "      http://ftp.de.debian.org/debian,\n"
-"      \n"
-"      \n"
-" URL [http://llug.sep.bnl.gov/debian]:"
+"\n"
+"\n"
+" URL [http://llug.sep.bnl.gov/debian]:\n"
 msgstr ""
 "   Set up a list of distribution source locations\n"
-"\t \n"
+"\n"
 " Please give the base URL of the debian distribution.\n"
 " The access schemes I know about are: http file\n"
-"\t   \n"
+"\n"
 " For example:\n"
 "      file:/mnt/debian,\n"
 "      ftp://ftp.debian.org/debian,\n"
 "      http://ftp.de.debian.org/debian,\n"
-"      \n"
-"      \n"
-" URL [http://llug.sep.bnl.gov/debian]:"
+"\n"
+"\n"
+" URL [http://llug.sep.bnl.gov/debian]:\n"
 
-#. type: <p></p>
-#: guide.sgml:205
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:233
 msgid ""
-"The <em>Sources</em> setup starts by asking for the base of the Debian "
-"archive, defaulting to a HTTP mirror. Next it asks for the distribution to "
-"get."
+"The <emphasis>Sources</emphasis> setup starts by asking for the base of the "
+"Debian archive, defaulting to a HTTP mirror. Next it asks for the "
+"distribution to get."
 msgstr ""
-"La configuración de las <em>fuentes</em> comienza preguntando la base del "
-"archivo de Debian, cuyo valor predeterminado es una réplica HTTP. A "
+"La configuración de las <emphasis>fuentes</emphasis> comienza preguntando la "
+"base del archivo de Debian, cuyo valor predeterminado es una réplica HTTP. A "
 "continuación, preguntará la distribución a obtener."
 
-#. type: <example></example>
-#: guide.sgml:212
+#. type: Content of: <book><chapter><screen>
+#: guide.dbk:238
 #, no-wrap
 msgid ""
 " Please give the distribution tag to get or a path to the\n"
 " package file ending in a /. The distribution\n"
 " tags are typically something like: stable unstable testing non-US\n"
-"   \n"
-" Distribution [stable]:"
+"\n"
+" Distribution [stable]:\n"
 msgstr ""
 " Please give the distribution tag to get or a path to the\n"
 " package file ending in a /. The distribution\n"
 " tags are typically something like: stable unstable testing non-US\n"
-"   \n"
-" Distribution [stable]:"
-
-#. type: <p></p>
-#: guide.sgml:222
-msgid ""
-"The distribution refers to the Debian version in the archive, <em>stable</"
-"em> refers to the latest released version and <em>unstable</em> refers to "
-"the developmental version. <em>non-US</em> is only available on some mirrors "
-"and refers to packages that contain encryption technology or other things "
-"that cannot be exported from the United States. Importing these packages "
-"into the US is legal however."
-msgstr ""
-"La distribución se refiere a la versión de Debian en el archivo, <em>stable</"
-"em> (estable) se refiere a la última versión publicada, y <em>unstable</em> "
-"(inestable) se refiere a la versión en desarrollo. <em>non-US</em> sólo está "
-"disponible en algunas réplicas, aquellos paquetes que contienen tecnología "
-"cifrada y otras cosas que no se pueden exportar desde los Estados Unidos. "
-"Aun así, importar estos paquetes a E.E.U.U es ilegal."
-
-#. type: <example></example>
-#: guide.sgml:228
+"\n"
+" Distribution [stable]:\n"
+
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:245
+msgid ""
+"The distribution refers to the Debian version in the archive, "
+"<emphasis>stable</emphasis> refers to the latest released version and "
+"<emphasis>unstable</emphasis> refers to the developmental version. "
+"<emphasis>non-US</emphasis> is only available on some mirrors and refers to "
+"packages that contain encryption technology or other things that cannot be "
+"exported from the United States. Importing these packages into the US is "
+"legal however."
+msgstr ""
+"La distribución se refiere a la versión de Debian en el archivo, "
+"<emphasis>stable</emphasis> (estable) se refiere a la última versión "
+"publicada, y <emphasis>unstable</emphasis> (inestable) se refiere a la "
+"versión en desarrollo. <emphasis>non-US</emphasis> sólo está disponible en "
+"algunas réplicas, aquellos paquetes que contienen tecnología cifrada y otras "
+"cosas que no se pueden exportar desde los Estados Unidos. Aun así, importar "
+"estos paquetes a E.E.U.U es ilegal."
+
+#. type: Content of: <book><chapter><screen>
+#: guide.dbk:254
 #, no-wrap
 msgid ""
 " Please give the components to get\n"
 " The components are typically something like: main contrib non-free\n"
-"  \n"
-" Components [main contrib non-free]:"
+"\n"
+" Components [main contrib non-free]:\n"
 msgstr ""
 " Please give the components to get\n"
 " The components are typically something like: main contrib non-free\n"
-"  \n"
-" Components [main contrib non-free]:"
+"\n"
+" Components [main contrib non-free]:\n"
 
-#. type: <p></p>
-#: guide.sgml:236
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:260
 msgid ""
 "The components list refers to the list of sub distributions to fetch. The "
 "distribution is split up based on software licenses, main being DFSG free "
@@ -9057,8 +9091,8 @@ msgstr ""
 "«non-free» contienen paquetes con restricciones en cuanto a su uso y "
 "distribución."
 
-#. type: <p></p>
-#: guide.sgml:240
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:266
 msgid ""
 "Any number of sources can be added, the setup script will continue to prompt "
 "until you have specified all that you want."
@@ -9066,23 +9100,24 @@ msgstr ""
 "Puede añadir cualquier número de fuentes, el script de configuración le "
 "preguntará por fuentes hasta que el usuario defina todo lo que quiera."
 
-#. type: <p></p>
-#: guide.sgml:247
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:270
 msgid ""
-"Before starting to use <prgn>dselect</prgn> it is necessary to update the "
-"available list by selecting [U]pdate from the menu. This is a superset of "
-"<tt>apt-get update</tt> that makes the fetched information available to "
-"<prgn>dselect</prgn>. [U]pdate must be performed even if <tt>apt-get update</"
-"tt> has been run before."
+"Before starting to use <command>dselect</command> it is necessary to update "
+"the available list by selecting [U]pdate from the menu. This is a superset "
+"of <literal>apt-get update</literal> that makes the fetched information "
+"available to <command>dselect</command>. [U]pdate must be performed even if "
+"<literal>apt-get update</literal> has been run before."
 msgstr ""
 "Es necesario actualizar la lista disponible mediante el elemento de menú "
-"[A]ctualizar antes de iniciar <prgn>dselect</prgn>. Éste es un superconjunto "
-"de <tt>apt-get update</tt> que permite a <prgn>dselect</prgn> disponer de la "
-"información obtenida. Debe ejecutar [A]ctualizar aunque haya ejecutado "
-"<tt>apt-get update</tt> con anterioridad."
+"[A]ctualizar antes de iniciar <command>dselect</command>. Éste es un "
+"superconjunto de <literal>apt-get update</literal> que permite a "
+"<command>dselect</command> disponer de la información obtenida. Debe "
+"ejecutar [A]ctualizar aunque haya ejecutado <literal>apt-get update</"
+"literal> con anterioridad."
 
-#. type: <p></p>
-#: guide.sgml:253
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:277
 msgid ""
 "You can then go on and make your selections using [S]elect and then perform "
 "the installation using [I]nstall. When using the APT method the [C]onfig and "
@@ -9094,77 +9129,83 @@ msgstr ""
 "[C]onfig y [R]emove carecen de significado ya que la orden [I]nstall ejecuta "
 "ambos a la vez."
 
-#. type: <p></p>
-#: guide.sgml:258
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:283
 msgid ""
 "By default APT will automatically remove the package (.deb) files once they "
-"have been successfully installed. To change this behavior place <tt>Dselect::"
-"clean \"prompt\";</tt> in /etc/apt/apt.conf."
+"have been successfully installed. To change this behavior place "
+"<literal>Dselect::clean \"prompt\";</literal> in /etc/apt/apt.conf."
 msgstr ""
 "Por omisión, APT eliminará automáticamente los ficheros de paquete («.deb») "
 "una vez que se hayan instalado con éxito. Para modificar este "
-"comportamiento, inserte <tt>Dselect::clean \"prompt\";</tt> en «/etc/apt/apt."
-"conf»."
+"comportamiento, inserte <literal>Dselect::clean \"prompt\";</literal> en «/"
+"etc/apt/apt.conf»."
 
-#. type: <heading></heading>
-#: guide.sgml:264
+#. type: Content of: <book><chapter><title>
+#: guide.dbk:289
 msgid "The Interface"
 msgstr "La interfaz"
 
-#. type: <p></p>
-#: guide.sgml:278
+#. type: Content of: <book><chapter><para><footnote><para>
+#: guide.dbk:293
+msgid ""
+"The <command>dselect</command> method actually is a set of wrapper scripts "
+"to <command>apt-get</command>. The method actually provides more "
+"functionality than is present in <command>apt-get</command> alone."
+msgstr ""
+"El método <command>dselect</command> es en realidad un conjunto de scripts "
+"en torno a <command>apt-get</command>. En realidad, el método ofrece más "
+"funcionalidad que la presente en <command>apt-get</command> por si mismo."
+
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:291
 msgid ""
-"Both that APT <prgn>dselect</prgn> method and <prgn>apt-get</prgn> share the "
-"same interface. It is a simple system that generally tells you what it will "
-"do and then goes and does it. <footnote><p>The <prgn>dselect</prgn> method "
-"actually is a set of wrapper scripts to <prgn>apt-get</prgn>. The method "
-"actually provides more functionality than is present in <prgn>apt-get</prgn> "
-"alone.</p></footnote> After printing out a summary of what will happen APT "
+"Both that APT <command>dselect</command> method and <command>apt-get</"
+"command> share the same interface. It is a simple system that generally "
+"tells you what it will do and then goes and does it. <placeholder type="
+"\"footnote\" id=\"0\"/> After printing out a summary of what will happen APT "
 "then will print out some informative status messages so that you can "
 "estimate how far along it is and how much is left to do."
 msgstr ""
-"El método <prgn>dselect</prgn> de APT y <prgn>apt-get</prgn> comparten la "
-"misma interfaz. Es un sencillo programa que le informa de lo que va a hacer, "
-"para después llevarlo a cabo. <footnote><p> El método <prgn>dselect</prgn> "
-"es en realidad un conjunto de scripts en torno a <prgn>apt-get</prgn>. En "
-"realidad, el método ofrece más funcionalidad que la presente en <prgn>apt-"
-"get</prgn> por si mismo. </p></footnote> Después de mostrar el resumen de lo "
-"que va a pasar APT mostrará mensajes de estado informativos para ofrecer una "
-"estimación de cuánto queda por hacer."
-
-#. type: <heading></heading>
-#: guide.sgml:280
+"El método <command>dselect</command> de APT y <command>apt-get</command> "
+"comparten la misma interfaz. Es un sencillo programa que le informa de lo "
+"que va a hacer, para después llevarlo a cabo. <placeholder type=\"footnote\" "
+"id=\"0\"/> Después de mostrar el resumen de lo que va a pasar APT mostrará "
+"mensajes de estado informativos para ofrecer una estimación de cuánto queda "
+"por hacer."
+
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:302
 msgid "Startup"
 msgstr "Arranque"
 
-#. type: <p></p>
-#: guide.sgml:284
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:304
 msgid ""
 "Before all operations except update, APT performs a number of actions to "
 "prepare its internal state. It also does some checks of the system's state. "
-"At any time these operations can be performed by running <tt>apt-get check</"
-"tt>."
+"At any time these operations can be performed by running <literal>apt-get "
+"check</literal>."
 msgstr ""
 "APT realiza un número de acciones para preparar su estado interno antes de "
 "cualquier operación, a excepción de «update». También realiza algunas "
 "revisiones del estado del sistema. Puede llevar a cabo estas acciones en "
-"cualquier momento ejecutando <tt>apt-get check</tt>."
+"cualquier momento ejecutando <literal>apt-get check</literal>."
 
-#. type: <example></example>
-#: guide.sgml:289
+#. type: Content of: <book><chapter><section><screen>
+#: guide.dbk:310
 #, no-wrap
 msgid ""
 "# apt-get check\n"
 "Reading Package Lists... Done\n"
-"Building Dependency Tree... Done"
+"Building Dependency Tree... Done\n"
 msgstr ""
 "# apt-get check\n"
 "Leyendo lista de paquetes... Hecho\n"
-"Creando árbol de dependencias       \n"
-"Leyendo la información de estado... Hecho"
+"Creando árbol de dependencias... Hecho\n"
 
-#. type: <p></p>
-#: guide.sgml:297
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:315
 msgid ""
 "The first thing it does is read all the package files into memory. APT uses "
 "a caching scheme so this operation will be faster the second time it is run. "
@@ -9176,21 +9217,21 @@ msgstr ""
 "más rápida la segunda vez que la ejecute. De no encontrar algún fichero de "
 "paquete, éstos se ignorarán y verá una advertencia al finalizar apt-get."
 
-#. type: <p></p>
-#: guide.sgml:303
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:321
 msgid ""
 "The final operation performs a detailed analysis of the system's "
 "dependencies. It checks every dependency of every installed or unpacked "
 "package and considers if it is OK. Should this find a problem then a report "
-"will be printed out and <prgn>apt-get</prgn> will refuse to run."
+"will be printed out and <command>apt-get</command> will refuse to run."
 msgstr ""
 "La última acción realiza un detallado análisis de las dependencias del "
 "sistema. Revisa cada dependencia de cada paquete instalado o sin "
 "desempaquetar analiza su validación. En caso de error aparecerá un informe, "
-"y <prgn>apt-get</prgn> se negará a ejecutarse."
+"y <command>apt-get</command> se negará a ejecutarse."
 
-#. type: <example></example>
-#: guide.sgml:320
+#. type: Content of: <book><chapter><section><screen>
+#: guide.dbk:327
 #, no-wrap
 msgid ""
 "# apt-get check\n"
@@ -9200,34 +9241,33 @@ msgid ""
 "Sorry, but the following packages have unmet dependencies:\n"
 "  9fonts: Depends: xlib6g but it is not installed\n"
 "  uucp: Depends: mailx but it is not installed\n"
-"  blast: Depends: xlib6g (>= 3.3-5) but it is not installed\n"
+"  blast: Depends: xlib6g (&gt;= 3.3-5) but it is not installed\n"
 "  adduser: Depends: perl-base but it is not installed\n"
 "  aumix: Depends: libgpmg1 but it is not installed\n"
 "  debiandoc-sgml: Depends: sgml-base but it is not installed\n"
-"  bash-builtins: Depends: bash (>= 2.01) but 2.0-3 is installed\n"
+"  bash-builtins: Depends: bash (&gt;= 2.01) but 2.0-3 is installed\n"
 "  cthugha: Depends: svgalibg1 but it is not installed\n"
-"           Depends: xlib6g (>= 3.3-5) but it is not installed\n"
-"  libreadlineg2: Conflicts:libreadline2 (<< 2.1-2.1)"
+"           Depends: xlib6g (&gt;= 3.3-5) but it is not installed\n"
+"  libreadlineg2: Conflicts:libreadline2 (&lt;&lt; 2.1-2.1)\n"
 msgstr ""
 "# apt-get check\n"
 "Leyendo lista de paquetes... Hecho\n"
-"Creando árbol de dependencias       \n"
-"Leyendo la información de estado... Hecho\n"
-"Tal vez quiera ejecutar `apt-get -f install' para corregirlo.\n"
+"Creando árbol de dependencias... Hecho\n"
+"Tal vez quiera ejecutar 'apt-get -f install' para corregirlo.\n"
 "Los siguientes paquetes tienen dependencias incumplidas:\n"
 "  9fonts: Depende: xlib6g pero no está instalado\n"
 "  uucp: Depende: mailx pero no está instalado\n"
-"  blast: Depende: xlib6g (>= 3.3-5) pero no está instalado\n"
+"  blast: Depende: xlib6g (&gt;= 3.3-5) pero no está instalado\n"
 "  adduser: Depende: perl-base pero no está instalado\n"
 "  aumix: Depende: libgpmg1 pero no está instalado\n"
 "  debiandoc-sgml: Depende: sgml-base pero no está instalado\n"
-"  bash-builtins: Depende: bash (>= 2.01) pero 2.0-3 está instalado\n"
+"  bash-builtins: Depende: bash (&gt;= 2.01) pero 2.0-3 está instalado\n"
 "  cthugha: Depende: svgalibg1 pero no está instalado\n"
-"           Depende: xlib6g (>= 3.3-5) pero no está instalado\n"
-"  libreadlineg2: Entra en conflicto:libreadline2 (<< 2.1-2.1)"
+"           Depende: xlib6g (&gt;= 3.3-5) pero no está instalado\n"
+"  libreadlineg2: Entra en conflicto:libreadline2 (&lt;&lt; 2.1-2.1)\n"
 
-#. type: <p></p>
-#: guide.sgml:329
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:344
 msgid ""
 "In this example the system has many problems, including a serious problem "
 "with libreadlineg2. For each package that has unmet dependencies a line is "
@@ -9241,86 +9281,95 @@ msgstr ""
 "dependencias no satisfechas. También incluye una explicación de porqué el "
 "paquete tiene un problema de dependencias."
 
-#. type: <p></p>
-#: guide.sgml:337
+#. type: Content of: <book><chapter><section><para><footnote><para>
+#: guide.dbk:353
+msgid ""
+"APT however considers all known dependencies and attempts to prevent broken "
+"packages"
+msgstr ""
+"APT, de todas formas, considera todas las dependencias conocidas e intenta "
+"prevenir paquetes rotos"
+
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:351
 msgid ""
 "There are two ways a system can get into a broken state like this. The first "
-"is caused by <prgn>dpkg</prgn> missing some subtle relationships between "
-"packages when performing upgrades. <footnote><p>APT however considers all "
-"known dependencies and attempts to prevent broken packages</p></footnote>. "
-"The second is if a package installation fails during an operation. In this "
-"situation a package may have been unpacked without its dependents being "
-"installed."
+"is caused by <command>dpkg</command> missing some subtle relationships "
+"between packages when performing upgrades. <placeholder type=\"footnote\" id="
+"\"0\"/>. The second is if a package installation fails during an operation. "
+"In this situation a package may have been unpacked without its dependents "
+"being installed."
 msgstr ""
 "Hay dos formas de que el sistema tenga un estado roto como éste. El primero "
-"es causado por la omisión de <prgn>dpkg</prgn> de ciertas relaciones "
-"delicadas entre paquetes al realizar una actualización. <footnote><p>APT, de "
-"todas formas, considera todas las dependencias conocidas e intenta prevenir "
-"paquetes rotos</p></footnote>. El segundo ocurre se la instalación de un "
-"paquete falla durante la operación. En esta situación puede que un paquete "
-"se haya desempaquetado sin que sus dependencias estuviesen instaladas "
-"previamente."
+"es causado por la omisión de <command>dpkg</command> de ciertas relaciones "
+"delicadas entre paquetes al realizar una actualización. <placeholder type="
+"\"footnote\" id=\"0\"/>. El segundo ocurre se la instalación de un paquete "
+"falla durante la operación. En esta situación puede que un paquete se haya "
+"desempaquetado sin que sus dependencias estuviesen instaladas previamente."
 
-#. type: <p></p>
-#: guide.sgml:345
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:360
 msgid ""
 "The second situation is much less serious than the first because APT places "
 "certain constraints on the order that packages are installed. In both cases "
-"supplying the <tt>-f</tt> option to <prgn>apt-get</prgn> will cause APT to "
-"deduce a possible solution to the problem and then continue on. The APT "
-"<prgn>dselect</prgn> method always supplies the <tt>-f</tt> option to allow "
-"for easy continuation of failed maintainer scripts."
+"supplying the <literal>-f</literal> option to <command>apt-get</command> "
+"will cause APT to deduce a possible solution to the problem and then "
+"continue on. The APT <command>dselect</command> method always supplies the "
+"<literal>-f</literal> option to allow for easy continuation of failed "
+"maintainer scripts."
 msgstr ""
 "La segunda situación es mucho menos grave que la primera ya que APT define "
 "ciertos límites en el orden de instalación de los paquetes. En ambos casos, "
-"introducir la opción <tt>-f</tt> a <prgn>apt-get</prgn> causará que APT "
-"deduzca una posible solución al problema para después continuar. El método "
-"<prgn>dselect</prgn> de APT siempre ofrece la opción <tt>-f</tt> para "
-"permitir una fácil continuación cuando existen scripts fallidos del "
-"mantenedor."
-
-#. type: <p></p>
-#: guide.sgml:351
-msgid ""
-"However, if the <tt>-f</tt> option is used to correct a seriously broken "
-"system caused by the first case then it is possible that it will either fail "
-"immediately or the installation sequence will fail. In either case it is "
-"necessary to manually use dpkg (possibly with forcing options) to correct "
-"the situation enough to allow APT to proceed."
-msgstr ""
-"Aún así, de usar la opción <tt>-f</tt> para corregir un sistema gravemente "
-"roto por el primer caso cabe que la acción falle inmediatamente o que la "
-"secuencia de instalación se interrumpa. En cualquier caso es necesario usar "
-"dpkg manualmente (puede que con opciones de forzado) para corregir la "
-"situación lo suficiente como para que APT pueda continuar."
-
-#. type: <heading></heading>
-#: guide.sgml:356
+"introducir la opción <literal>-f</literal> a <command>apt-get</command> "
+"causará que APT deduzca una posible solución al problema para después "
+"continuar. El método <command>dselect</command> de APT siempre ofrece la "
+"opción <literal>-f</literal> para permitir una fácil continuación cuando "
+"existen scripts fallidos del mantenedor."
+
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:369
+msgid ""
+"However, if the <literal>-f</literal> option is used to correct a seriously "
+"broken system caused by the first case then it is possible that it will "
+"either fail immediately or the installation sequence will fail. In either "
+"case it is necessary to manually use dpkg (possibly with forcing options) to "
+"correct the situation enough to allow APT to proceed."
+msgstr ""
+"Aún así, de usar la opción <literal>-f</literal> para corregir un sistema "
+"gravemente roto por el primer caso cabe que la acción falle inmediatamente o "
+"que la secuencia de instalación se interrumpa. En cualquier caso es "
+"necesario usar dpkg manualmente (puede que con opciones de forzado) para "
+"corregir la situación lo suficiente como para que APT pueda continuar."
+
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:377
 msgid "The Status Report"
 msgstr "El informe de estado"
 
-#. type: <p></p>
-#: guide.sgml:363
-msgid ""
-"Before proceeding <prgn>apt-get</prgn> will present a report on what will "
-"happen. Generally the report reflects the type of operation being performed "
-"but there are several common elements. In all cases the lists reflect the "
-"final state of things, taking into account the <tt>-f</tt> option and any "
-"other relevant activities to the command being executed."
-msgstr ""
-"Antes de proceder <prgn>apt-get</prgn> presentará un informe de lo que va a "
-"ocurrir. Generalmente el informe refleja el tipo de operación a realizar, "
-"pero hay ciertos elementos comunes. La lista refleja el estado final de las "
-"cosas en todos los casos, teniendo en cuenta la opción <tt>-f</tt> y "
-"cualquier otra actividad relevante a la orden ejecutada."
-
-#. type: <heading></heading>
-#: guide.sgml:364
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:379
+msgid ""
+"Before proceeding <command>apt-get</command> will present a report on what "
+"will happen. Generally the report reflects the type of operation being "
+"performed but there are several common elements. In all cases the lists "
+"reflect the final state of things, taking into account the <literal>-f</"
+"literal> option and any other relevant activities to the command being "
+"executed."
+msgstr ""
+"Antes de proceder <command>apt-get</command> presentará un informe de lo que "
+"va a ocurrir. Generalmente el informe refleja el tipo de operación a "
+"realizar, pero hay ciertos elementos comunes. La lista refleja el estado "
+"final de las cosas en todos los casos, teniendo en cuenta la opción "
+"<literal>-f</literal> y cualquier otra actividad relevante a la orden "
+"ejecutada."
+
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:386
 msgid "The Extra Package list"
 msgstr "La lista de paquetes extras"
 
-#. type: <example></example>
-#: guide.sgml:372
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:388
 #, no-wrap
 msgid ""
 "The following extra packages will be installed:\n"
@@ -9328,85 +9377,85 @@ msgid ""
 "  mailpgp xdpkg fileutils pinepgp zlib1g xlib6g perl-base\n"
 "  bin86 libgdbm1 libgdbmg1 quake-lib gmp2 bcc xbuffy\n"
 "  squake pgp-i python-base debmake ldso perl libreadlineg2\n"
-"  ssh"
+"  ssh\n"
 msgstr ""
 "Se instalarán los siguientes paquetes extras:\n"
 "  libdbd-mysql-perl xlib6 zlib1 xzx libreadline2 libdbd-msql-perl\n"
 "  mailpgp xdpkg fileutils pinepgp zlib1g xlib6g perl-base\n"
 "  bin86 libgdbm1 libgdbmg1 quake-lib gmp2 bcc xbuffy\n"
 "  squake pgp-i python-base debmake ldso perl libreadlineg2\n"
-"  ssh"
+"  ssh\n"
 
-#. type: <p></p>
-#: guide.sgml:379
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:396
 msgid ""
 "The Extra Package list shows all of the packages that will be installed or "
 "upgraded in excess of the ones mentioned on the command line. It is only "
-"generated for an <tt>install</tt> command. The listed packages are often the "
-"result of an Auto Install."
+"generated for an <literal>install</literal> command. The listed packages are "
+"often the result of an Auto Install."
 msgstr ""
 "La lista de paquetes extras muestra todos los paquetes que se van a instalar "
 "o actualizar en adición a aquellos mencionados en la línea de órdenes. Sólo "
-"se genera para la orden <tt>install</tt>. Generalmente, los paquetes "
-"listados son el resultado de una instalación automática."
+"se genera para la orden <literal>install</literal>. Generalmente, los "
+"paquetes listados son el resultado de una instalación automática."
 
-#. type: <heading></heading>
-#: guide.sgml:382
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:403
 msgid "The Packages to Remove"
 msgstr "Los paquetes a eliminar"
 
-#. type: <example></example>
-#: guide.sgml:389
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:405
 #, no-wrap
 msgid ""
 "The following packages will be REMOVED:\n"
 "  xlib6-dev xpat2 tk40-dev xkeycaps xbattle xonix\n"
 "  xdaliclock tk40 tk41 xforms0.86 ghostview xloadimage xcolorsel\n"
 "  xadmin xboard perl-debug tkined xtetris libreadline2-dev perl-suid\n"
-"  nas xpilot xfig"
+"  nas xpilot xfig\n"
 msgstr ""
 "Los siguientes paquetes se ELIMINARÁN:\n"
 "  xlib6-dev xpat2 tk40-dev xkeycaps xbattle xonix\n"
 "  xdaliclock tk40 tk41 xforms0.86 ghostview xloadimage xcolorsel\n"
 "  xadmin xboard perl-debug tkined xtetris libreadline2-dev perl-suid\n"
-"  nas xpilot xfig"
+"  nas xpilot xfig\n"
 
-#. type: <p></p>
-#: guide.sgml:399
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:412
 msgid ""
 "The Packages to Remove list shows all of the packages that will be removed "
 "from the system. It can be shown for any of the operations and should be "
 "given a careful inspection to ensure nothing important is to be taken off. "
-"The <tt>-f</tt> option is especially good at generating packages to remove "
-"so extreme care should be used in that case. The list may contain packages "
-"that are going to be removed because they are only partially installed, "
-"possibly due to an aborted installation."
+"The <literal>-f</literal> option is especially good at generating packages "
+"to remove so extreme care should be used in that case. The list may contain "
+"packages that are going to be removed because they are only partially "
+"installed, possibly due to an aborted installation."
 msgstr ""
 "La lista de paquetes a eliminar muestra todos los paquetes que se van a "
 "eliminar del sistema. Puede aparecer durante cualquier operación, y se "
 "debería revisar cuidadosamente para asegurar que no se va a eliminar nada "
-"importante. La opción <tt>-f</tt> puede generar varios paquetes a eliminar "
-"así que se debe utilizar con precaución. La lista puede contener paquetes a "
-"eliminar porque están parcialmente instalados, posiblemente debido a una "
-"instalación interrumpida."
+"importante. La opción <literal>-f</literal> puede generar varios paquetes a "
+"eliminar así que se debe utilizar con precaución. La lista puede contener "
+"paquetes a eliminar porque están parcialmente instalados, posiblemente "
+"debido a una instalación interrumpida."
 
-#. type: <heading></heading>
-#: guide.sgml:402
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:422
 msgid "The New Packages list"
 msgstr "La lista de paquetes nuevos"
 
-#. type: <example></example>
-#: guide.sgml:406
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:424
 #, no-wrap
 msgid ""
 "The following NEW packages will installed:\n"
-"  zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base"
+"  zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base\n"
 msgstr ""
 "Se instalarán los siguientes paquetes NUEVOS:\n"
-"  zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base"
+"  zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base\n"
 
-#. type: <p></p>
-#: guide.sgml:411
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:428
 msgid ""
 "The New Packages list is simply a reminder of what will happen. The packages "
 "listed are not presently installed in the system but will be when APT is "
@@ -9416,57 +9465,57 @@ msgstr ""
 "Los paquetes listados no se encuentran instalados en el sistema pero lo "
 "estarán cuando APT finalice."
 
-#. type: <heading></heading>
-#: guide.sgml:414
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:433
 msgid "The Kept Back list"
 msgstr "La lista de paquetes retenidos"
 
-#. type: <example></example>
-#: guide.sgml:419
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:435
 #, no-wrap
 msgid ""
 "The following packages have been kept back\n"
 "  compface man-db tetex-base msql libpaper svgalib1\n"
-"  gs snmp arena lynx xpat2 groff xscreensaver"
+"  gs snmp arena lynx xpat2 groff xscreensaver\n"
 msgstr ""
 "Los siguientes paquetes se han retenido:\n"
 "  compface man-db tetex-base msql libpaper svgalib1\n"
-"  gs snmp arena lynx xpat2 groff xscreensaver"
+"  gs snmp arena lynx xpat2 groff xscreensaver\n"
 
-#. type: <p></p>
-#: guide.sgml:428
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:440
 msgid ""
 "Whenever the whole system is being upgraded there is the possibility that "
 "new versions of packages cannot be installed because they require new things "
 "or conflict with already installed things. In this case the package will "
 "appear in the Kept Back list. The best way to convince packages listed there "
-"to install is with <tt>apt-get install</tt> or by using <prgn>dselect</prgn> "
-"to resolve their problems."
+"to install is with <literal>apt-get install</literal> or by using "
+"<command>dselect</command> to resolve their problems."
 msgstr ""
 "Puede que al actualizar el sistema por completo no se puedan instalar "
 "versiones nuevas de paquetes porque requieren nuevos elementos que entran en "
 "conflicto con paquetes ya instalados. En este caso, el paquete aparecerá en "
 "la lista de paquetes retenidos. La mejor manera de instalar paquetes "
-"listados aquí es mediante <tt>apt-get install</tt> o mediante <prgn>dselect</"
-"prgn> para así resolver esos problemas."
+"listados aquí es mediante <literal>apt-get install</literal> o mediante "
+"<command>dselect</command> para así resolver esos problemas."
 
-#. type: <heading></heading>
-#: guide.sgml:431
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:449
 msgid "Held Packages warning"
 msgstr "Advertencia de paquetes retenidos"
 
-#. type: <example></example>
-#: guide.sgml:435
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:451
 #, no-wrap
 msgid ""
 "The following held packages will be changed:\n"
-"  cvs"
+"  cvs\n"
 msgstr ""
 "Se cambiarán los siguientes paquetes retenidos:\n"
-"  cvs"
+"  cvs\n"
 
-#. type: <p></p>
-#: guide.sgml:441
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:455
 msgid ""
 "Sometimes you can ask APT to install a package that is on hold, in such a "
 "case it prints out a warning that the held package is going to be changed. "
@@ -9476,33 +9525,33 @@ msgstr ""
 "verá una advertencia de que el paquete retenido se va a modificar. Esto sólo "
 "debería ocurrir durante un «dist-upgrade» o un «install»."
 
-#. type: <heading></heading>
-#: guide.sgml:444
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:461
 msgid "Final summary"
 msgstr "Resumen final"
 
-#. type: <p></p>
-#: guide.sgml:447
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:463
 msgid ""
 "Finally, APT will print out a summary of all the changes that will occur."
 msgstr ""
 "Por último, APT mostrará un resumen de los cambios que se llevarán a cabo."
 
-#. type: <example></example>
-#: guide.sgml:452
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:466
 #, no-wrap
 msgid ""
 "206 packages upgraded, 8 newly installed, 23 to remove and 51 not upgraded.\n"
 "12 packages not fully installed or removed.\n"
-"Need to get 65.7M/66.7M of archives. After unpacking 26.5M will be used."
+"Need to get 65.7M/66.7M of archives. After unpacking 26.5M will be used.\n"
 msgstr ""
 "206 paquetes actualizados, 8 se instalarán, 23 para eliminar y 51 no\n"
 "actualizados.\n"
 "12 paquetes no instalados del todo o eliminados.\n"
-"Se necesita descargar 65.7M/66.7M de archivos. Se usarán 26.5M después de desempaquetar."
+"Se necesita descargar 65.7M/66.7M de archivos. Se usarán 26.5M después de desempaquetar.\n"
 
-#. type: <p></p>
-#: guide.sgml:470
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:471
 msgid ""
 "The first line of the summary simply is a reduced version of all of the "
 "lists and includes the number of upgrades - that is packages already "
@@ -9533,8 +9582,8 @@ msgstr ""
 "paquetes a eliminar el valor puede indicar la cantidad de espacio que se va "
 "a liberar."
 
-#. type: <p></p>
-#: guide.sgml:473
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:485
 msgid ""
 "Some other reports can be generated by using the -u option to show packages "
 "to upgrade, they are similar to the previous examples."
@@ -9542,13 +9591,13 @@ msgstr ""
 "Puede generar otros informes con la opción «-u» para mostrar los paquetes a "
 "actualizar, similar a los ejemplos anteriores."
 
-#. type: <heading></heading>
-#: guide.sgml:477
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:492
 msgid "The Status Display"
 msgstr "La pantalla de estado"
 
-#. type: <p></p>
-#: guide.sgml:481
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:494
 msgid ""
 "During the download of archives and package files APT prints out a series of "
 "status messages."
@@ -9556,8 +9605,8 @@ msgstr ""
 "APT muestra una serie de mensajes de estado en el transcurso de descargar "
 "ficheros de paquete y archivo."
 
-#. type: <example></example>
-#: guide.sgml:490
+#. type: Content of: <book><chapter><section><screen>
+#: guide.dbk:498
 #, no-wrap
 msgid ""
 "# apt-get update\n"
@@ -9566,7 +9615,7 @@ msgid ""
 "Hit http://llug.sep.bnl.gov/debian/ testing/main Packages\n"
 "Get:4 http://ftp.de.debian.org/debian-non-US/ unstable/binary-i386/ Packages\n"
 "Get:5 http://llug.sep.bnl.gov/debian/ testing/non-free Packages\n"
-"11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s"
+"11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s\n"
 msgstr ""
 "# apt-get update\n"
 "Des:1 http://ftp.de.debian.org/debian-non-US/ stable/non-US/ Packages\n"
@@ -9574,70 +9623,73 @@ msgstr ""
 "Obj http://llug.sep.bnl.gov/debian/ testing/main Packages\n"
 "Des:4 http://ftp.de.debian.org/debian-non-US/ unstable/binary-i386/ Packages\n"
 "es:5 http://llug.sep.bnl.gov/debian/ testing/non-free Packages\n"
-"11% [5 testing/non-free Esperando las cabeceras 0/32.1k 0%] 2203b/s 1m52s"
+"11% [5 testing/non-free Esperando las cabeceras 0/32.1k 0%] 2203b/s 1m52s\n"
 
-#. type: <p></p>
-#: guide.sgml:500
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:507
 msgid ""
-"The lines starting with <em>Get</em> are printed out when APT begins to "
-"fetch a file while the last line indicates the progress of the download. The "
-"first percent value on the progress line indicates the total percent done of "
-"all files. Unfortunately since the size of the Package files is unknown "
-"<tt>apt-get update</tt> estimates the percent done which causes some "
-"inaccuracies."
+"The lines starting with <emphasis>Get</emphasis> are printed out when APT "
+"begins to fetch a file while the last line indicates the progress of the "
+"download. The first percent value on the progress line indicates the total "
+"percent done of all files. Unfortunately since the size of the Package files "
+"is unknown <literal>apt-get update</literal> estimates the percent done "
+"which causes some inaccuracies."
 msgstr ""
-"Las líneas comenzando con <em>Des</em> aparecen cuando APT inicia la "
-"obtención de un fichero, mientras que la última línea indica el progreso de "
-"la descarga. El primer valor porcentual en la barra de progreso indica el "
-"porcentaje total de los ficheros ya descargados. Desafortunadamente, <tt>apt-"
-"get update</tt> desconoce el tamaño de los ficheros de paquete y por ello "
-"genera una estimación que puede ser inexacta."
+"Las líneas comenzando con <emphasis>Des</emphasis> aparecen cuando APT "
+"inicia la obtención de un fichero, mientras que la última línea indica el "
+"progreso de la descarga. El primer valor porcentual en la barra de progreso "
+"indica el porcentaje total de los ficheros ya descargados. "
+"Desafortunadamente, <literal>apt-get update</literal> desconoce el tamaño de "
+"los ficheros de paquete y por ello genera una estimación que puede ser "
+"inexacta."
 
-#. type: <p></p>
-#: guide.sgml:509
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:515
 msgid ""
 "The next section of the status line is repeated once for each download "
 "thread and indicates the operation being performed and some useful "
 "information about what is happening. Sometimes this section will simply read "
-"<em>Forking</em> which means the OS is loading the download module. The "
-"first word after the [ is the fetch number as shown on the history lines. "
-"The next word is the short form name of the object being downloaded. For "
-"archives it will contain the name of the package that is being fetched."
+"<emphasis>Forking</emphasis> which means the OS is loading the download "
+"module. The first word after the [ is the fetch number as shown on the "
+"history lines. The next word is the short form name of the object being "
+"downloaded. For archives it will contain the name of the package that is "
+"being fetched."
 msgstr ""
 "La siguiente sección de la línea de estado se repite por cada instancia de "
 "descarga e indica la operación realizada, así como información útil relativa "
-"a lo que está pasando. Puede que esta sección sólo muestre <em>Forking</em>, "
-"lo cual significa que el sistema operativo está cargando el módulo de "
-"descargas. La primera palabra después de «[» es el número de obtención tal y "
-"como se muestra en la línea del histórico. La siguiente palabra es la forma "
-"corta del nombre del objeto en descarga. Al conectarse con los archivos, "
-"contendrá el nombre del paquete obtenido."
+"a lo que está pasando. Puede que esta sección sólo muestre "
+"<emphasis>Forking</emphasis>, lo cual significa que el sistema operativo "
+"está cargando el módulo de descargas. La primera palabra después de «[» es "
+"el número de obtención tal y como se muestra en la línea del histórico. La "
+"siguiente palabra es la forma corta del nombre del objeto en descarga. Al "
+"conectarse con los archivos, contendrá el nombre del paquete obtenido."
 
-#. type: <p></p>
-#: guide.sgml:524
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:525
 msgid ""
 "Inside of the single quote is an informative string indicating the progress "
 "of the negotiation phase of the download. Typically it progresses from "
-"<em>Connecting</em> to <em>Waiting for file</em> to <em>Downloading</em> or "
-"<em>Resuming</em>. The final value is the number of bytes downloaded from "
-"the remote site. Once the download begins this is represented as "
-"<tt>102/10.2k</tt> indicating that 102 bytes have been fetched and 10.2 "
-"kilobytes is expected. The total size is always shown in 4 figure notation "
-"to preserve space. After the size display is a percent meter for the file "
-"itself. The second last element is the instantaneous average speed. This "
-"values is updated every 5 seconds and reflects the rate of data transfer for "
-"that period. Finally is shown the estimated transfer time. This is updated "
-"regularly and reflects the time to complete everything at the shown transfer "
-"rate."
+"<emphasis>Connecting</emphasis> to <emphasis>Waiting for file</emphasis> to "
+"<emphasis>Downloading</emphasis> or <emphasis>Resuming</emphasis>. The final "
+"value is the number of bytes downloaded from the remote site. Once the "
+"download begins this is represented as <literal>102/10.2k</literal> "
+"indicating that 102 bytes have been fetched and 10.2 kilobytes is expected. "
+"The total size is always shown in 4 figure notation to preserve space. After "
+"the size display is a percent meter for the file itself. The second last "
+"element is the instantaneous average speed. This values is updated every 5 "
+"seconds and reflects the rate of data transfer for that period. Finally is "
+"shown the estimated transfer time. This is updated regularly and reflects "
+"the time to complete everything at the shown transfer rate."
 msgstr ""
 "Una cadena informativa aparecerá entre comillas simples indicando el "
 "progreso de la fase de negociación de la descarga. Generalmente progresa de "
-"<em>Conectando</em> a <em>Esperando fichero</em>, finalizando con "
-"<em>Descargando</em> o <em>Continuando</em>. El último valor es el número de "
-"bytes descargados desde el sitio remoto. Una vez que la descarga arranque se "
-"representará como <tt>102/10.2k</tt> indicando que ya se han obtenido 102 "
-"bytes y que se esperan 10.2 kilobytes. El tamaño total siempre aparece con "
-"la notación de la figura 4 para conservar espacio. A continuación aparece un "
+"<emphasis>Conectando</emphasis> a <emphasis>Esperando fichero</emphasis>, "
+"finalizando con <emphasis>Descargando</emphasis> o <emphasis>Continuando</"
+"emphasis>. El último valor es el número de bytes descargados desde el sitio "
+"remoto. Una vez que la descarga arranque se representará como "
+"<literal>102/10.2k</literal> indicando que ya se han obtenido 102 bytes y "
+"que se esperan 10.2 kilobytes. El tamaño total siempre aparece con la "
+"notación de la figura 4 para conservar espacio. A continuación aparece un "
 "medidor porcentual del fichero. El penúltimo elemento es la media "
 "instantánea de velocidad. Estos valores se actualizan cada 5 segundos y "
 "reflejan la tasa de descarga de datos de ese periodo. Por último puede ver "
@@ -9645,56 +9697,51 @@ msgstr ""
 "refleja el tiempo restante para completar todo tal y como se ve en la tasa "
 "de transferencia visible."
 
-#. type: <p></p>
-#: guide.sgml:530
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:540
 msgid ""
 "The status display updates every half second to provide a constant feedback "
 "on the download progress while the Get lines scroll back whenever a new file "
 "is started. Since the status display is constantly updated it is unsuitable "
-"for logging to a file, use the <tt>-q</tt> option to remove the status "
-"display."
+"for logging to a file, use the <literal>-q</literal> option to remove the "
+"status display."
 msgstr ""
 "La pantalla de estado se actualiza cada medio segundo para ofrecer una "
 "constante información del progreso de la descarga, mientras que las líneas "
 "«Des» se desplazan hacia atrás cuando se inicia la descarga de otro fichero. "
 "Ya que la pantalla de estado se actualiza constantemente carece de utilidad "
-"para su registro en un fichero. Puede usar la opción <tt>-q</tt> para omitir "
-"la pantalla de estado."
+"para su registro en un fichero. Puede usar la opción <literal>-q</literal> "
+"para omitir la pantalla de estado."
 
-#. type: <heading></heading>
-#: guide.sgml:535
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:548
 msgid "Dpkg"
 msgstr "Dpkg"
 
-#. type: <p></p>
-#: guide.sgml:542
-msgid ""
-"APT uses <prgn>dpkg</prgn> for installing the archives and will switch over "
-"to the <prgn>dpkg</prgn> interface once downloading is completed. "
-"<prgn>dpkg</prgn> will also ask a number of questions as it processes the "
-"packages and the packages themselves may also ask several questions. Before "
-"each question there is usually a description of what it is asking and the "
-"questions are too varied to discuss completely here."
-msgstr ""
-"APT usa <prgn>dpkg</prgn> para instalar ficheros, y pasará a interactuar con "
-"<prgn>dpkg</prgn> al finalizar la descarga. <prgn>dpkg</prgn> también "
-"planteará un número de preguntas a medida que procesa los paquetes, los "
-"cuales también pueden formular preguntas. A cada pregunta generalmente le "
-"precede una descripción de la pregunta en sí. Éstas son demasiado variadas "
-"como para poder tratarlas aquí en su totalidad."
-
-#. type: <title></title>
-#: offline.sgml:4
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:550
+msgid ""
+"APT uses <command>dpkg</command> for installing the archives and will switch "
+"over to the <command>dpkg</command> interface once downloading is completed. "
+"<command>dpkg</command> will also ask a number of questions as it processes "
+"the packages and the packages themselves may also ask several questions. "
+"Before each question there is usually a description of what it is asking and "
+"the questions are too varied to discuss completely here."
+msgstr ""
+"APT usa <command>dpkg</command> para instalar ficheros, y pasará a "
+"interactuar con <command>dpkg</command> al finalizar la descarga. "
+"<command>dpkg</command> también planteará un número de preguntas a medida "
+"que procesa los paquetes, los cuales también pueden formular preguntas. A "
+"cada pregunta generalmente le precede una descripción de la pregunta en sí. "
+"Éstas son demasiado variadas como para poder tratarlas aquí en su totalidad."
+
+#. type: Content of: <book><title>
+#: offline.dbk:11
 msgid "Using APT Offline"
 msgstr "Uso de APT Offline"
 
-#. type: <version></version>
-#: offline.sgml:7
-msgid "$Id: offline.sgml,v 1.8 2003/02/12 15:06:41 doogie Exp $"
-msgstr "$Id: offline.sgml,v 1.8 2003/02/12 15:06:41 doogie Exp $"
-
-#. type: <abstract></abstract>
-#: offline.sgml:12
+#. type: Content of: <book><bookinfo><abstract><para>
+#: offline.dbk:25
 msgid ""
 "This document describes how to use APT in a non-networked environment, "
 "specifically a 'sneaker-net' approach for performing upgrades."
@@ -9702,23 +9749,25 @@ msgstr ""
 "Este documento describe el uso de APT en un entorno sin conexión a red, "
 "específicamente una aproximación «sneaker-net» a la tarea de actualización."
 
-#. type: <copyrightsummary></copyrightsummary>
-#: offline.sgml:16
-msgid "Copyright &copy; Jason Gunthorpe, 1999."
-msgstr "Copyright &copy; Jason Gunthorpe, 1999."
+#. type: Content of: <book><bookinfo>
+#: offline.dbk:30
+msgid ""
+"<copyright><year>1999</year><holder>Jason Gunthorpe</holder></copyright>"
+msgstr ""
+"<copyright><year>1999</year><holder>Jason Gunthorpe</holder></copyright>"
 
-#. type: <heading></heading>
-#: offline.sgml:32
+#. type: Content of: <book><chapter><title>
+#: offline.dbk:48
 msgid "Introduction"
 msgstr "Introducción"
 
-#. type: <heading></heading>
-#: offline.sgml:34 offline.sgml:65 offline.sgml:180
+#. type: Content of: <book><chapter><section><title>
+#: offline.dbk:50 offline.dbk:80 offline.dbk:192
 msgid "Overview"
 msgstr "Resumen"
 
-#. type: <p></p>
-#: offline.sgml:40
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:52
 msgid ""
 "Normally APT requires direct access to a Debian archive, either from a local "
 "media or through a network. Another common complaint is that a Debian "
@@ -9731,8 +9780,8 @@ msgstr ""
 "de un módem, y otra máquina físicamente lejos dispone de una conexión muy "
 "rápida."
 
-#. type: <p></p>
-#: offline.sgml:51
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:58
 msgid ""
 "The solution to this is to use large removable media such as a Zip disc or a "
 "SuperDisk disc. These discs are not large enough to store the entire Debian "
@@ -9740,9 +9789,9 @@ msgid ""
 "to use APT to generate a list of packages that are required and then fetch "
 "them onto the disc using another machine with good connectivity. It is even "
 "possible to use another Debian machine with APT or to use a completely "
-"different OS and a download tool like wget. Let <em>remote host</em> mean "
-"the machine downloading the packages, and <em>target host</em> the one with "
-"bad or no connection."
+"different OS and a download tool like wget. Let <emphasis>remote host</"
+"emphasis> mean the machine downloading the packages, and <emphasis>target "
+"host</emphasis> the one with bad or no connection."
 msgstr ""
 "La solución a esto es usar dispositivos extraíbles de gran capacidad tales "
 "como un disco Zip o uno SuperDisk. Estos discos no tienen la suficiente "
@@ -9752,11 +9801,12 @@ msgstr ""
 "almacenarlos en un disco usando el sistema que tiene una conexión rápida. Es "
 "incluso posible usar otro sistema Debian con APT, o usar un sistema "
 "operativo totalmente distinto junto con una herramienta de descarga como "
-"wget. Digamos que el <em>sistema remoto</em> es aquél que descarga los "
-"paquetes, y <em>sistema destino</em> es aquél con poca o ninguna conexión."
+"wget. Digamos que el <emphasis>sistema remoto</emphasis> es aquél que "
+"descarga los paquetes, y <emphasis>sistema destino</emphasis> es aquél con "
+"poca o ninguna conexión."
 
-#. type: <p></p>
-#: offline.sgml:57
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:69
 msgid ""
 "This is achieved by creatively manipulating the APT configuration file. The "
 "essential premise to tell APT to look on a disc for it's archive files. Note "
@@ -9769,13 +9819,13 @@ msgstr ""
 "de un sistema de ficheros capaz de gestionar nombres largos de ficheros, "
 "tales como ext2, fat32 o vfat."
 
-#. type: <heading></heading>
-#: offline.sgml:63
+#. type: Content of: <book><chapter><title>
+#: offline.dbk:78
 msgid "Using APT on both machines"
 msgstr "Uso de APT en ambas máquinas"
 
-#. type: <p><example>
-#: offline.sgml:71
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:82
 msgid ""
 "APT being available on both machines gives the simplest configuration. The "
 "basic idea is to place a copy of the status file on the disc and use the "
@@ -9788,8 +9838,8 @@ msgstr ""
 "paquete y decidir qué paquetes descargar. La estructura de directorios del "
 "disco debería tener este aspecto:"
 
-#. type: <example></example>
-#: offline.sgml:80
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:88
 #, no-wrap
 msgid ""
 "  /disc/\n"
@@ -9799,7 +9849,7 @@ msgid ""
 "       partial/\n"
 "    status\n"
 "    sources.list\n"
-"    apt.conf"
+"    apt.conf\n"
 msgstr ""
 "  /disc/\n"
 "    archives/\n"
@@ -9808,42 +9858,43 @@ msgstr ""
 "       partial/\n"
 "    status\n"
 "    sources.list\n"
-"    apt.conf"
+"    apt.conf\n"
 
-#. type: <heading></heading>
-#: offline.sgml:88
+#. type: Content of: <book><chapter><section><title>
+#: offline.dbk:99
 msgid "The configuration file"
 msgstr "El fichero de configuración"
 
-#. type: <p></p>
-#: offline.sgml:96
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:101
 msgid ""
 "The configuration file should tell APT to store its files on the disc and to "
 "use the configuration files on the disc as well. The sources.list should "
 "contain the proper sites that you wish to use from the remote machine, and "
-"the status file should be a copy of <em>/var/lib/dpkg/status</em> from the "
-"<em>target host</em>. Please note, if you are using a local archive you must "
-"use copy URIs, the syntax is identical to file URIs."
+"the status file should be a copy of <emphasis>/var/lib/dpkg/status</"
+"emphasis> from the <emphasis>target host</emphasis>. Please note, if you are "
+"using a local archive you must use copy URIs, the syntax is identical to "
+"file URIs."
 msgstr ""
 "El fichero de configuración debería indicar a APT que guarde los ficheros en "
 "el disco, y también utilizar los ficheros de configuración en el disco. El "
 "fichero «sources.list» debería contener los sitios apropiados que desea "
 "utilizar desde el sistema remoto, y el fichero de estado debería ser una "
-"copia de <em>/var/lib/dpkg/status</em> del <em>sistema destino</em>. Tenga "
-"en cuenta que si usa un archivo local debe usar el URI «copy», de idéntica "
-"sintaxis al URI «file»."
+"copia de <emphasis>/var/lib/dpkg/status</emphasis> del <emphasis>sistema "
+"destino</emphasis>. Tenga en cuenta que si usa un archivo local debe usar el "
+"URI «copy», de idéntica sintaxis al URI «file»."
 
-#. type: <p><example>
-#: offline.sgml:100
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:109
 msgid ""
-"<em>apt.conf</em> must contain the necessary information to make APT use the "
-"disc:"
+"<emphasis>apt.conf</emphasis> must contain the necessary information to make "
+"APT use the disc:"
 msgstr ""
-"<em>apt-conf</em> debe contener toda la información necesaria para que APT "
-"use el disco:"
+"<emphasis>apt-conf</emphasis> debe contener toda la información necesaria "
+"para que APT use el disco:"
 
-#. type: <example></example>
-#: offline.sgml:124
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:113
 #, no-wrap
 msgid ""
 " APT\n"
@@ -9851,10 +9902,10 @@ msgid ""
 "   /* This is not necessary if the two machines are the same arch, it tells\n"
 "      the remote APT what architecture the target machine is */\n"
 "   Architecture \"i386\";\n"
-"   \n"
+"\n"
 "   Get::Download-Only \"true\";\n"
 " };\n"
-" \n"
+"\n"
 " Dir\n"
 " {\n"
 "   /* Use the disc for state information and redirect the status file from\n"
@@ -9865,20 +9916,20 @@ msgid ""
 "   // Binary caches will be stored locally\n"
 "   Cache::archives \"/disc/archives/\";\n"
 "   Cache \"/tmp/\";\n"
-"   \n"
+"\n"
 "   // Location of the source list.\n"
 "   Etc \"/disc/\";\n"
-" };"
+" };\n"
 msgstr ""
 " APT\n"
 " {\n"
 "   /* Esto no es necesario si ambos sistemas tienen la misma arquitectura,\n"
 "      informa al APT remoto la arquitectura del sistema destino */\n"
 "   Architecture \"i386\";\n"
-"   \n"
+"\n"
 "   Get::Download-Only \"true\";\n"
 " };\n"
-" \n"
+"\n"
 " Dir\n"
 " {\n"
 "   /* Use el disco para información de estado y redireccionar el fichero de\n"
@@ -9889,67 +9940,70 @@ msgstr ""
 "   // Los cachés binarios se guardan localmente\n"
 "   Cache::archives \"/disc/archives/\";\n"
 "   Cache \"/tmp/\";\n"
-"   \n"
+"\n"
 "   // Ubicación del fichero de fuentes.\n"
 "   Etc \"/disc/\";\n"
-" };"
+" };\n"
 
-#. type: </example></p>
-#: offline.sgml:129
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:138
 msgid ""
 "More details can be seen by examining the apt.conf man page and the sample "
-"configuration file in <em>/usr/share/doc/apt/examples/apt.conf</em>."
+"configuration file in <emphasis>/usr/share/doc/apt/examples/apt.conf</"
+"emphasis>."
 msgstr ""
 "Para más detalles consulte la página de manual y el fichero de configuración "
-"de ejemplo en <em>/usr/share/doc/apt/examples/apt.conf</em>."
+"de ejemplo en <emphasis>/usr/share/doc/apt/examples/apt.conf</emphasis>."
 
-#. type: <p><example>
-#: offline.sgml:136
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:143
 msgid ""
-"On the target machine the first thing to do is mount the disc and copy <em>/"
-"var/lib/dpkg/status</em> to it. You will also need to create the directories "
-"outlined in the Overview, <em>archives/partial/</em> and <em>lists/partial/</"
-"em>. Then take the disc to the remote machine and configure the sources."
-"list. On the remote machine execute the following:"
+"On the target machine the first thing to do is mount the disc and copy "
+"<emphasis>/var/lib/dpkg/status</emphasis> to it. You will also need to "
+"create the directories outlined in the Overview, <emphasis>archives/partial/"
+"</emphasis> and <emphasis>lists/partial/</emphasis>. Then take the disc to "
+"the remote machine and configure the sources.list. On the remote machine "
+"execute the following:"
 msgstr ""
 "Lo primero que debe hacer en el sistema destino es montar el disco y guardar "
-"en él una copia de <em>/var/lib/dpkg/status</em>. También debe crear los "
-"directorios definidos en el Resumen, <em>archives/partial/</em> y <em>lists/"
-"partial/</em>. Después, lleve el disco hasta el sistema remoto y configure "
-"«sources.list». Ejecute lo siguiente en el sistema remoto:"
-
-#. type: <example></example>
-#: offline.sgml:142
+"en él una copia de <emphasis>/var/lib/dpkg/status</emphasis>. También debe "
+"crear los directorios definidos en el Resumen, <emphasis>archives/partial/</"
+"emphasis> y <emphasis>lists/partial/</emphasis>. Después, lleve el disco "
+"hasta el sistema remoto y configure «sources.list». Ejecute lo siguiente en "
+"el sistema remoto:"
+
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:152
 #, no-wrap
 msgid ""
 " # export APT_CONFIG=\"/disc/apt.conf\"\n"
 " # apt-get update\n"
 " [ APT fetches the package files ]\n"
 " # apt-get dist-upgrade\n"
-" [ APT fetches all the packages needed to upgrade the target machine ]"
+" [ APT fetches all the packages needed to upgrade the target machine ]\n"
 msgstr ""
 " # export APT_CONFIG=\"/disc/apt.conf\"\n"
 " # apt-get update\n"
 " [ APT obtiene los ficheros de paquete ]\n"
 " # apt-get dist-upgrade\n"
 " [ APT obtiene todos los paquetes necesarios para actualizar el sistema\n"
-" destino ]"
+" destino ]\n"
 
-#. type: </example></p>
-#: offline.sgml:149
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:159
 msgid ""
 "The dist-upgrade command can be replaced with any other standard APT "
 "commands, particularly dselect-upgrade. You can even use an APT front end "
-"such as <em>dselect</em>. However this presents a problem in communicating "
-"your selections back to the local computer."
+"such as <emphasis>dselect</emphasis>. However this presents a problem in "
+"communicating your selections back to the local computer."
 msgstr ""
 "Puede reemplazar la orden «dist-upgrade» con cualquiera otra orden estándar "
 "de APT, en especial «dselect-upgrade». Incluso puede usar una interfaz de "
-"APT como <em>dselect</em>. Sin embargo, esto presenta un problema al "
-"informar después de sus selecciones al sistema remoto."
+"APT como <emphasis>dselect</emphasis>. Sin embargo, esto presenta un "
+"problema al informar después de sus selecciones al sistema remoto."
 
-#. type: <p><example>
-#: offline.sgml:153
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:165
 msgid ""
 "Now the disc contains all of the index files and archives needed to upgrade "
 "the target machine. Take the disc back and run:"
@@ -9957,24 +10011,24 @@ msgstr ""
 "Ahora el disco contiene todos los ficheros de índice y archivo necesarios "
 "para actualizar el sistema destino. Inserte el disco otra vez y ejecute:"
 
-#. type: <example></example>
-#: offline.sgml:159
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:169
 #, no-wrap
 msgid ""
 "  # export APT_CONFIG=\"/disc/apt.conf\"\n"
 "  # apt-get check\n"
 "  [ APT generates a local copy of the cache files ]\n"
 "  # apt-get --no-d -o dir::state::status=/var/lib/dpkg/status dist-upgrade\n"
-"  [ Or any other APT command ]"
+"  [ Or any other APT command ]\n"
 msgstr ""
 "  # export APT_CONFIG=\"/disc/apt.conf\"\n"
 "  # apt-get check\n"
 "  [ APT genera una copia local de los ficheros de caché ]\n"
 "  # apt-get --no-d -o dir::state::status=/var/lib/dpkg/status dist-upgrade\n"
-"  [ O cualquiera otra orden de APT ]"
+"  [ O cualquiera otra orden de APT ]\n"
 
-#. type: <p></p>
-#: offline.sgml:165
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:176
 msgid ""
 "It is necessary for proper function to re-specify the status file to be the "
 "local one. This is very important!"
@@ -9982,8 +10036,8 @@ msgstr ""
 "Para un correcto funcionamiento debe definir nuevamente el fichero de estado "
 "local. Tiene una importancia crucial."
 
-#. type: <p></p>
-#: offline.sgml:172
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:180
 msgid ""
 "If you are using dselect you can do the very risky operation of copying disc/"
 "status to /var/lib/dpkg/status so that any selections you made on the remote "
@@ -9997,24 +10051,25 @@ msgstr ""
 "en el sistema local, aunque puede que no sea posible. NO copie el fichero de "
 "estado si dpkg o APT se han ejecutado mientras tanto."
 
-#. type: <heading></heading>
-#: offline.sgml:178
+#. type: Content of: <book><chapter><title>
+#: offline.dbk:190
 msgid "Using APT and wget"
 msgstr "Uso de APT y wget"
 
-#. type: <p></p>
-#: offline.sgml:185
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:194
 msgid ""
-"<em>wget</em> is a popular and portable download tool that can run on nearly "
-"any machine. Unlike the method above this requires that the Debian machine "
-"already has a list of available packages."
+"<emphasis>wget</emphasis> is a popular and portable download tool that can "
+"run on nearly any machine. Unlike the method above this requires that the "
+"Debian machine already has a list of available packages."
 msgstr ""
-"<em>wget</em> es una herramienta de descarga muy popular que funciona "
-"prácticamente en cualquier sistema. A diferencia del método anterior, "
-"requiere que el sistema Debian tenga una lista de paquetes disponibles."
+"<emphasis>wget</emphasis> es una herramienta de descarga muy popular que "
+"funciona prácticamente en cualquier sistema. A diferencia del método "
+"anterior, requiere que el sistema Debian tenga una lista de paquetes "
+"disponibles."
 
-#. type: <p></p>
-#: offline.sgml:190
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:199
 msgid ""
 "The basic idea is to create a disc that has only the archive files "
 "downloaded from the remote site. This is done by using the --print-uris "
@@ -10026,13 +10081,13 @@ msgstr ""
 "get «--print-uris», para después preparar un script de wget que finalmente "
 "obtendrá los paquetes."
 
-#. type: <heading></heading>
-#: offline.sgml:196
+#. type: Content of: <book><chapter><section><title>
+#: offline.dbk:205
 msgid "Operation"
 msgstr "Operación"
 
-#. type: <p><example>
-#: offline.sgml:200
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:207
 msgid ""
 "Unlike the previous technique no special configuration files are required. "
 "We merely use the standard APT commands to generate the file list."
@@ -10041,23 +10096,23 @@ msgstr ""
 "configuración especial. Solo se utilizan órdenes estándar de APT para "
 "generar el fichero con la lista."
 
-#. type: <example></example>
-#: offline.sgml:205
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:211
 #, no-wrap
 msgid ""
-" # apt-get dist-upgrade \n"
+" # apt-get dist-upgrade\n"
 " [ Press no when prompted, make sure you are happy with the actions ]\n"
-" # apt-get -qq --print-uris dist-upgrade > uris\n"
-" # awk '{print \"wget -O \" $2 \" \" $1}' < uris > /disc/wget-script"
+" # apt-get -qq --print-uris dist-upgrade &gt; uris\n"
+" # awk '{print \"wget -O \" $2 \" \" $1}' &lt; uris &gt; /disc/wget-script\n"
 msgstr ""
 " # apt-get dist-upgrade \n"
 " [ Pulse no cuando se le pregunte, asegúrese de estar conforme con las\n"
 " acciones ]\n"
-" # apt-get -qq --print-uris dist-upgrade > uris\n"
-" # awk '{print \"wget -O \" $2 \" \" $1}' < uris > /disc/wget-script"
+" # apt-get -qq --print-uris dist-upgrade &gt; uris\n"
+" # awk '{print \"wget -O \" $2 \" \" $1}' &lt; uris &gt; /disc/wget-script\n"
 
-#. type: </example></p>
-#: offline.sgml:210
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:217
 msgid ""
 "Any command other than dist-upgrade could be used here, including dselect-"
 "upgrade."
@@ -10065,8 +10120,8 @@ msgstr ""
 "Se puede utilizar cualquier otra orden aparte de «dist-upgrade», incluyendo "
 "«dselect-upgrade»."
 
-#. type: <p></p>
-#: offline.sgml:216
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:221
 msgid ""
 "The /disc/wget-script file will now contain a list of wget commands to "
 "execute in order to fetch the necessary archives. This script should be run "
@@ -10078,25 +10133,25 @@ msgstr ""
 "ejecutar en el directorio del punto de montaje del disco para poder guardar "
 "la salida en el disco."
 
-#. type: <p><example>
-#: offline.sgml:219
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:227
 msgid "The remote machine would do something like"
 msgstr "El sistema remoto haría algo como"
 
-#. type: <example></example>
-#: offline.sgml:223
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:230
 #, no-wrap
 msgid ""
 "  # cd /disc\n"
 "  # sh -x ./wget-script\n"
-"  [ wait.. ]"
+"  [ wait.. ]\n"
 msgstr ""
 "  # cd /disc\n"
 "  # sh -x ./wget-script\n"
-"  [ wait.. ]"
+"  [ wait.. ]\n"
 
-#. type: </example><example>
-#: offline.sgml:228
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:235
 msgid ""
 "Once the archives are downloaded and the disc returned to the Debian machine "
 "installation can proceed using,"
@@ -10104,14 +10159,14 @@ msgstr ""
 "Una vez que los archivos se han descargado y el disco está finalmente "
 "conectado al sistema Debian, ejecute la instalación con lo siguiente."
 
-#. type: <example></example>
-#: offline.sgml:230
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:239
 #, no-wrap
-msgid "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade"
-msgstr "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade"
+msgid "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade\n"
+msgstr "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade\n"
 
-#. type: </example></p>
-#: offline.sgml:234
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:242
 msgid "Which will use the already fetched archives on the disc."
 msgstr "Esto utiliza los archivos del disco previamente obtenidos."
 
diff --git a/doc/po/fr.po b/doc/po/fr.po
index e0c251751..f94f0e07a 100644
--- a/doc/po/fr.po
+++ b/doc/po/fr.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-11 14:52+0200\n"
-"PO-Revision-Date: 2014-04-01 14:00+0200\n"
+"POT-Creation-Date: 2014-08-28 00:20+0000\n"
+"PO-Revision-Date: 2014-07-04 01:28+0200\n"
 "Last-Translator: Christian Perrier <bubulle@debian.org>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
 "Language: fr\n"
@@ -610,37 +610,37 @@ msgid ""
 msgstr "<!ENTITY synopsis-keyid \"id_de_clé\">"
 
 #. type: Content of: <refentry><refmeta><manvolnum>
-#: apt.8.xml:25 apt-get.8.xml:28 apt-cache.8.xml:28 apt-key.8.xml:27
-#: apt-mark.8.xml:28 apt-secure.8.xml:27 apt-cdrom.8.xml:27
-#: apt-config.8.xml:28
+#: apt.8.xml:21 apt-get.8.xml:22 apt-cache.8.xml:22 apt-key.8.xml:21
+#: apt-mark.8.xml:22 apt-secure.8.xml:21 apt-cdrom.8.xml:21
+#: apt-config.8.xml:22
 msgid "8"
 msgstr "8"
 
 #. type: Content of: <refentry><refmeta><refmiscinfo>
-#: apt.8.xml:26 apt-get.8.xml:29 apt-cache.8.xml:29 apt-key.8.xml:28
-#: apt-mark.8.xml:29 apt-secure.8.xml:28 apt-cdrom.8.xml:28
-#: apt-config.8.xml:29 apt.conf.5.xml:34 apt_preferences.5.xml:28
-#: sources.list.5.xml:29 apt-extracttemplates.1.xml:29 apt-sortpkgs.1.xml:29
-#: apt-ftparchive.1.xml:29
+#: apt.8.xml:22 apt-get.8.xml:23 apt-cache.8.xml:23 apt-key.8.xml:22
+#: apt-mark.8.xml:23 apt-secure.8.xml:22 apt-cdrom.8.xml:22
+#: apt-config.8.xml:23 apt.conf.5.xml:28 apt_preferences.5.xml:22
+#: sources.list.5.xml:23 apt-extracttemplates.1.xml:23 apt-sortpkgs.1.xml:23
+#: apt-ftparchive.1.xml:23
 msgid "APT"
 msgstr "APT"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt.8.xml:32
+#: apt.8.xml:28
 msgid "command-line interface"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:37 apt-get.8.xml:40 apt-cache.8.xml:40 apt-key.8.xml:39
-#: apt-mark.8.xml:40 apt-secure.8.xml:52 apt-cdrom.8.xml:39
-#: apt-config.8.xml:40 apt.conf.5.xml:43 apt_preferences.5.xml:38
-#: sources.list.5.xml:38 apt-extracttemplates.1.xml:40 apt-sortpkgs.1.xml:40
-#: apt-ftparchive.1.xml:40
+#: apt.8.xml:33 apt-get.8.xml:34 apt-cache.8.xml:34 apt-key.8.xml:33
+#: apt-mark.8.xml:34 apt-secure.8.xml:46 apt-cdrom.8.xml:33
+#: apt-config.8.xml:34 apt.conf.5.xml:37 apt_preferences.5.xml:32
+#: sources.list.5.xml:32 apt-extracttemplates.1.xml:34 apt-sortpkgs.1.xml:34
+#: apt-ftparchive.1.xml:34
 msgid "Description"
 msgstr "Description"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:38
+#: apt.8.xml:34
 msgid ""
 "<command>apt</command> (Advanced Package Tool) is the command-line tool for "
 "handling packages. It provides a commandline interface for the package "
@@ -649,7 +649,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:47
+#: apt.8.xml:43
 msgid ""
 "<literal>list</literal> is used to display a list of packages. It supports "
 "shell pattern for matching package names and the following options: "
@@ -658,14 +658,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:58
+#: apt.8.xml:54
 msgid ""
 "<literal>search</literal> searches for the given term(s) and display "
 "matching packages."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:64
+#: apt.8.xml:60
 #, fuzzy
 #| msgid ""
 #| "<literal>rdepends</literal> shows a listing of each reverse dependency a "
@@ -678,14 +678,14 @@ msgstr ""
 "dépendances inverses d'un paquet."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:71
+#: apt.8.xml:67
 msgid ""
 "<literal>install</literal> is followed by one or more package names desired "
 "for installation or upgrading."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:75 apt-get.8.xml:118
+#: apt.8.xml:71 apt-get.8.xml:112
 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 "
@@ -702,7 +702,7 @@ msgstr ""
 "unstable)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:85 apt-get.8.xml:153
+#: apt.8.xml:81 apt-get.8.xml:147
 msgid ""
 "<literal>remove</literal> is identical to <literal>install</literal> except "
 "that packages are removed instead of installed. Note that removing a package "
@@ -718,14 +718,14 @@ msgstr ""
 "d'être supprimé."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:93
+#: apt.8.xml:89
 msgid ""
 "<literal>edit-sources</literal> lets you edit your sources.list file and "
 "provides basic sanity checks."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:99
+#: apt.8.xml:95
 #, fuzzy
 #| msgid ""
 #| "<literal>showhold</literal> is used to print a list of packages on hold "
@@ -738,16 +738,16 @@ msgstr ""
 "de manière analogue aux commandes de même type."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:105
+#: apt.8.xml:101
 msgid ""
 "<literal>upgrade</literal> is used to install the newest versions of all "
 "packages currently installed on the system from the sources enumerated in "
-"<filename>/etc/apt/sources.list</filename>. New package will be installed, "
-"but existing package will never removed."
+"<filename>/etc/apt/sources.list</filename>. New packages will be installed, "
+"but existing packages will never be removed."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:114
+#: apt.8.xml:110
 msgid ""
 "<literal>full-upgrade</literal> performs the function of upgrade but may "
 "also remove installed packages if that is required in order to resolve a "
@@ -755,19 +755,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:124 apt-get.8.xml:257 apt-cache.8.xml:250 apt-mark.8.xml:110
-#: apt-config.8.xml:86 apt-extracttemplates.1.xml:54 apt-sortpkgs.1.xml:50
-#: apt-ftparchive.1.xml:506
+#: apt.8.xml:120 apt-get.8.xml:251 apt-cache.8.xml:244 apt-mark.8.xml:104
+#: apt-config.8.xml:80 apt-extracttemplates.1.xml:48 apt-sortpkgs.1.xml:44
+#: apt-ftparchive.1.xml:500
 msgid "options"
 msgstr "options"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:134
+#: apt.8.xml:130
 msgid "Script usage"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:136
+#: apt.8.xml:132
 msgid ""
 "The &apt; commandline is designed as a end-user tool and it may change the "
 "output between versions. While it tries to not break backward compatibility "
@@ -777,12 +777,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:144
+#: apt.8.xml:140
 msgid "Differences to &apt-get;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:145
+#: apt.8.xml:141
 msgid ""
 "The <command>apt</command> command is meant to be pleasant for end users and "
 "does not need to be backward compatible like &apt-get;. Therefore some "
@@ -790,28 +790,28 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml:151
+#: apt.8.xml:147
 #, fuzzy
 #| msgid "the <literal>Package:</literal> line"
 msgid "The option <literal>DPkg::Progress-Fancy</literal> is enabled."
 msgstr "la ligne <literal>Package:</literal>"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml:155
+#: apt.8.xml:151
 #, fuzzy
 #| msgid "the <literal>Component:</literal> line"
 msgid "The option <literal>APT::Color</literal> is enabled."
 msgstr "La ligne <literal>Component:</literal>"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml:159
+#: apt.8.xml:155
 msgid ""
 "A new <literal>list</literal> command is available similar to <literal>dpkg "
 "--list</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml:164
+#: apt.8.xml:160
 #, fuzzy
 #| msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
 msgid ""
@@ -820,16 +820,16 @@ msgid ""
 msgstr "La ligne <literal>Archive:</literal> ou <literal>Suite:</literal>"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:174 apt-get.8.xml:558 apt-cache.8.xml:352 apt-key.8.xml:197
-#: apt-mark.8.xml:133 apt-secure.8.xml:193 apt-cdrom.8.xml:154
-#: apt-config.8.xml:111 apt.conf.5.xml:1227 apt_preferences.5.xml:707
-#: sources.list.5.xml:280 apt-extracttemplates.1.xml:72 apt-sortpkgs.1.xml:65
-#: apt-ftparchive.1.xml:609
+#: apt.8.xml:170 apt-get.8.xml:552 apt-cache.8.xml:346 apt-key.8.xml:191
+#: apt-mark.8.xml:127 apt-secure.8.xml:187 apt-cdrom.8.xml:148
+#: apt-config.8.xml:105 apt.conf.5.xml:1222 apt_preferences.5.xml:701
+#: sources.list.5.xml:274 apt-extracttemplates.1.xml:66 apt-sortpkgs.1.xml:59
+#: apt-ftparchive.1.xml:603
 msgid "See Also"
 msgstr "Voir aussi"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:175
+#: apt.8.xml:171
 #, fuzzy
 #| msgid ""
 #| "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
@@ -844,14 +844,14 @@ msgstr ""
 "« HOWTO » d'APT."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:180 apt-get.8.xml:564 apt-cache.8.xml:357 apt-mark.8.xml:137
-#: apt-cdrom.8.xml:159 apt-config.8.xml:116 apt-extracttemplates.1.xml:76
-#: apt-sortpkgs.1.xml:69 apt-ftparchive.1.xml:613
+#: apt.8.xml:176 apt-get.8.xml:558 apt-cache.8.xml:351 apt-mark.8.xml:131
+#: apt-cdrom.8.xml:153 apt-config.8.xml:110 apt-extracttemplates.1.xml:70
+#: apt-sortpkgs.1.xml:63 apt-ftparchive.1.xml:607
 msgid "Diagnostics"
 msgstr "Diagnostics"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:181
+#: apt.8.xml:177
 #, fuzzy
 #| msgid ""
 #| "<command>apt-get</command> returns zero on normal operation, decimal 100 "
@@ -864,13 +864,13 @@ msgstr ""
 "décimal 100 en cas d'erreur."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-get.8.xml:35
+#: apt-get.8.xml:29
 msgid "APT package handling utility -- command-line interface"
 msgstr ""
 "Utilitaire APT pour la gestion des paquets -- interface en ligne de commande."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:41
+#: apt-get.8.xml:35
 #, fuzzy
 #| msgid ""
 #| "<command>apt-get</command> is the command-line tool for handling "
@@ -889,8 +889,8 @@ msgstr ""
 "existent, comme &dselect;, &aptitude;, &synaptic; and &wajig;."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:46 apt-cache.8.xml:46 apt-cdrom.8.xml:53 apt-config.8.xml:46
-#: apt-ftparchive.1.xml:56
+#: apt-get.8.xml:40 apt-cache.8.xml:40 apt-cdrom.8.xml:47 apt-config.8.xml:40
+#: apt-ftparchive.1.xml:50
 msgid ""
 "Unless the <option>-h</option>, or <option>--help</option> option is given, "
 "one of the commands below must be present."
@@ -899,7 +899,7 @@ msgstr ""
 "donnée, l'une des commandes suivantes doit être présente."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:51
+#: apt-get.8.xml:45
 msgid ""
 "<literal>update</literal> is used to resynchronize the package index files "
 "from their sources. The indexes of available packages are fetched from the "
@@ -924,7 +924,7 @@ msgstr ""
 "ne peut être connue à l'avance."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:63
+#: apt-get.8.xml:57
 msgid ""
 "<literal>upgrade</literal> is used to install the newest versions of all "
 "packages currently installed on the system from the sources enumerated in "
@@ -950,7 +950,7 @@ msgstr ""
 "l'existence de nouvelles versions des paquets."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:76
+#: apt-get.8.xml:70
 msgid ""
 "<literal>dist-upgrade</literal> in addition to performing the function of "
 "<literal>upgrade</literal>, also intelligently handles changing dependencies "
@@ -974,7 +974,7 @@ msgstr ""
 "un mécanisme de remplacement des paramètres généraux pour certains paquets."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:89
+#: apt-get.8.xml:83
 msgid ""
 "<literal>dselect-upgrade</literal> is used in conjunction with the "
 "traditional Debian packaging front-end, &dselect;. <literal>dselect-upgrade</"
@@ -992,7 +992,7 @@ msgstr ""
 "installation de nouveaux paquets)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:100
+#: apt-get.8.xml:94
 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 "
@@ -1021,7 +1021,7 @@ msgstr ""
 "prises par le système de résolution des conflits d'apt-get."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:125
+#: apt-get.8.xml:119
 msgid ""
 "Both of the version selection mechanisms can downgrade packages and must be "
 "used with care."
@@ -1031,7 +1031,7 @@ msgstr ""
 "avec précaution."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:128
+#: apt-get.8.xml:122
 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 system. "
@@ -1051,7 +1051,7 @@ msgstr ""
 "comme décrit plus haut) sera récupérée et installée."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:139
+#: apt-get.8.xml:133
 msgid ""
 "Finally, the &apt-preferences; mechanism allows you to create an alternative "
 "installation policy for individual packages."
@@ -1060,7 +1060,7 @@ msgstr ""
 "l'installation des paquets."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:143
+#: apt-get.8.xml:137
 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 "
@@ -1081,7 +1081,7 @@ msgstr ""
 "d'utiliser une expression plus précise."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:161
+#: apt-get.8.xml:155
 msgid ""
 "<literal>purge</literal> is identical to <literal>remove</literal> except "
 "that packages are removed and purged (any configuration files are deleted "
@@ -1092,7 +1092,7 @@ msgstr ""
 "de configuration sont également effacés)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:166
+#: apt-get.8.xml:160
 msgid ""
 "<literal>source</literal> causes <command>apt-get</command> to fetch source "
 "packages. APT will examine the available packages to decide which source "
@@ -1111,7 +1111,7 @@ msgstr ""
 "par paquet avec la syntaxe <literal>paquet/version</literal> si possible."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:174
+#: apt-get.8.xml:168
 msgid ""
 "Source packages are tracked separately from binary packages via <literal>deb-"
 "src</literal> lines in the &sources-list; file. This means that you will "
@@ -1127,7 +1127,7 @@ msgstr ""
 "installé ou que vous voulez installer."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:180
+#: apt-get.8.xml:174
 msgid ""
 "If the <option>--compile</option> option is specified then the package will "
 "be compiled to a binary .deb using <command>dpkg-buildpackage</command> for "
@@ -1142,7 +1142,7 @@ msgstr ""
 "décompacté."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:187
+#: apt-get.8.xml:181
 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 "
@@ -1157,7 +1157,7 @@ msgstr ""
 "Source</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:193
+#: apt-get.8.xml:187
 msgid ""
 "Note that source packages are not installed and tracked in the "
 "<command>dpkg</command> database like binary packages; they are simply "
@@ -1169,7 +1169,7 @@ msgstr ""
 "les archives tar."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:199
+#: apt-get.8.xml:193
 msgid ""
 "<literal>build-dep</literal> causes apt-get to install/remove packages in an "
 "attempt to satisfy the build dependencies for a source package. By default "
@@ -1184,7 +1184,7 @@ msgstr ""
 "indiquée avec l'option <option>--host-architecture</option>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:206
+#: apt-get.8.xml:200
 msgid ""
 "<literal>check</literal> is a diagnostic tool; it updates the package cache "
 "and checks for broken dependencies."
@@ -1193,7 +1193,7 @@ msgstr ""
 "jour le cache des paquets et cherche les dépendances défectueuses."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:211
+#: apt-get.8.xml:205
 msgid ""
 "<literal>download</literal> will download the given binary package into the "
 "current directory."
@@ -1202,7 +1202,7 @@ msgstr ""
 "répertoire courant."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:217
+#: apt-get.8.xml:211
 #, fuzzy
 #| msgid ""
 #| "<literal>clean</literal> clears out the local repository of retrieved "
@@ -1227,7 +1227,7 @@ msgstr ""
 "temps en temps si l'on veut libérer de l'espace disque."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:224
+#: apt-get.8.xml:218
 msgid ""
 "Like <literal>clean</literal>, <literal>autoclean</literal> clears out the "
 "local repository of retrieved package files. The difference is that it only "
@@ -1246,7 +1246,7 @@ msgstr ""
 "installés."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:234
+#: apt-get.8.xml:228
 msgid ""
 "<literal>autoremove</literal> is used to remove packages that were "
 "automatically installed to satisfy dependencies for other packages and are "
@@ -1257,7 +1257,7 @@ msgstr ""
 "ne sont plus nécessaires."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:239
+#: apt-get.8.xml:233
 msgid ""
 "<literal>changelog</literal> downloads a package changelog and displays it "
 "through <command>sensible-pager</command>. The server name and base "
@@ -1281,7 +1281,7 @@ msgstr ""
 "<option>install</option>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:262
+#: apt-get.8.xml:256
 msgid ""
 "Do not consider recommended packages as a dependency for installing.  "
 "Configuration Item: <literal>APT::Install-Recommends</literal>."
@@ -1290,7 +1290,7 @@ msgstr ""
 "Élément de configuration : <literal>APT::Install-Recommends</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:267
+#: apt-get.8.xml:261
 msgid ""
 "Consider suggested packages as a dependency for installing.  Configuration "
 "Item: <literal>APT::Install-Suggests</literal>."
@@ -1299,7 +1299,7 @@ msgstr ""
 "de configuration : <literal>APT::Install-Suggests</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:272
+#: apt-get.8.xml:266
 msgid ""
 "Download only; package files are only retrieved, not unpacked or installed.  "
 "Configuration Item: <literal>APT::Get::Download-Only</literal>."
@@ -1309,7 +1309,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:277
+#: apt-get.8.xml:271
 #, fuzzy
 #| msgid ""
 #| "Fix; attempt to correct a system with broken dependencies in place. This "
@@ -1350,7 +1350,7 @@ msgstr ""
 "configuration : <literal>APT::Get::Fix-Broken</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:292
+#: apt-get.8.xml:286
 msgid ""
 "Ignore missing packages; if packages cannot be retrieved or fail the "
 "integrity check after retrieval (corrupted package files), hold back those "
@@ -1370,7 +1370,7 @@ msgstr ""
 "<literal>APT::Get::Fix-Missing</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:303
+#: apt-get.8.xml:297
 msgid ""
 "Disables downloading of packages. This is best used with <option>--ignore-"
 "missing</option> to force APT to use only the .debs it has already "
@@ -1382,7 +1382,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:310
+#: apt-get.8.xml:304
 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 "
@@ -1404,7 +1404,7 @@ msgstr ""
 "configuration : <literal>quiet</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:325
+#: apt-get.8.xml:319
 msgid ""
 "No action; perform a simulation of events that would occur but do not "
 "actually change the system.  Configuration Item: <literal>APT::Get::"
@@ -1415,7 +1415,7 @@ msgstr ""
 "<literal>APT::Get::Simulate</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:329
+#: apt-get.8.xml:323
 msgid ""
 "Simulated runs performed as a user will automatically deactivate locking "
 "(<literal>Debug::NoLocking</literal>), and if the option <literal>APT::Get::"
@@ -1436,7 +1436,7 @@ msgstr ""
 "notifications)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:337
+#: apt-get.8.xml:331
 msgid ""
 "Simulated runs print out a series of lines, each representing a "
 "<command>dpkg</command> operation: configure (<literal>Conf</literal>), "
@@ -1451,7 +1451,7 @@ msgstr ""
 "que les dommages n'ont aucune conséquence (rare)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:345
+#: apt-get.8.xml:339
 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 "
@@ -1467,7 +1467,7 @@ msgstr ""
 "configuration : <literal>APT::Get::Assume-Yes</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:353
+#: apt-get.8.xml:347
 msgid ""
 "Automatic \"no\" to all prompts.  Configuration Item: <literal>APT::Get::"
 "Assume-No</literal>."
@@ -1476,7 +1476,7 @@ msgstr ""
 "configuration : <literal>APT::Get::Assume-No</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:358
+#: apt-get.8.xml:352
 msgid ""
 "Show upgraded packages; print out a list of all packages that are to be "
 "upgraded.  Configuration Item: <literal>APT::Get::Show-Upgraded</literal>."
@@ -1486,7 +1486,7 @@ msgstr ""
 "Upgraded</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:364
+#: apt-get.8.xml:358
 msgid ""
 "Show full versions for upgraded and installed packages.  Configuration Item: "
 "<literal>APT::Get::Show-Versions</literal>."
@@ -1495,7 +1495,7 @@ msgstr ""
 "Élément de configuration : <literal>APT::Get::Show-Versions</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:370
+#: apt-get.8.xml:364
 #, fuzzy
 #| msgid ""
 #| "This option controls the architecture packages are built for by "
@@ -1521,7 +1521,7 @@ msgstr ""
 "literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:380
+#: apt-get.8.xml:374
 #, fuzzy
 #| msgid ""
 #| "This option controls the architecture packages are built for by "
@@ -1546,7 +1546,7 @@ msgstr ""
 "literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:391
+#: apt-get.8.xml:385
 msgid ""
 "Compile source packages after downloading them.  Configuration Item: "
 "<literal>APT::Get::Compile</literal>."
@@ -1555,7 +1555,7 @@ msgstr ""
 "configuration : <literal>APT::Get::Compile</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:396
+#: apt-get.8.xml:390
 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 "
@@ -1569,7 +1569,7 @@ msgstr ""
 "<literal>APT::Ignore-Hold</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:403
+#: apt-get.8.xml:397
 msgid ""
 "Allow installing new packages when used in conjunction with "
 "<literal>upgrade</literal>.  This is useful if the update of a installed "
@@ -1581,7 +1581,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:415
+#: apt-get.8.xml:409
 msgid ""
 "Do not upgrade packages; when used in conjunction with <literal>install</"
 "literal>, <literal>no-upgrade</literal> will prevent packages on the command "
@@ -1594,7 +1594,7 @@ msgstr ""
 "Upgrade</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:422
+#: apt-get.8.xml:416
 msgid ""
 "Do not install new packages; when used in conjunction with <literal>install</"
 "literal>, <literal>only-upgrade</literal> will install upgrades for already "
@@ -1607,7 +1607,7 @@ msgstr ""
 "configuration : <literal>APT::Get::Only-Upgrade</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:430
+#: apt-get.8.xml:424
 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 "
@@ -1623,7 +1623,7 @@ msgstr ""
 "yes</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:438
+#: apt-get.8.xml:432
 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 "
@@ -1645,7 +1645,7 @@ msgstr ""
 "<literal>APT::Get::Print-URIs</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:449
+#: apt-get.8.xml:443
 msgid ""
 "Use purge instead of remove for anything that would be removed.  An asterisk "
 "(\"*\") will be displayed next to packages which are scheduled to be purged. "
@@ -1659,7 +1659,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:457
+#: apt-get.8.xml:451
 msgid ""
 "Re-install packages that are already installed and at the newest version.  "
 "Configuration Item: <literal>APT::Get::ReInstall</literal>."
@@ -1668,7 +1668,7 @@ msgstr ""
 "Élément de configuration : <literal>APT::Get::ReInstall</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:462
+#: apt-get.8.xml:456
 msgid ""
 "This option is on by default; use <literal>--no-list-cleanup</literal> to "
 "turn it off. When it is on, <command>apt-get</command> will automatically "
@@ -1686,7 +1686,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:472
+#: apt-get.8.xml:466
 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 "
@@ -1708,7 +1708,7 @@ msgstr ""
 "Release</literal>.  Voyez aussi la page de manuel d'&apt-preferences;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:487
+#: apt-get.8.xml:481
 msgid ""
 "Only perform operations that are 'trivial'. Logically this can be considered "
 "related to <option>--assume-yes</option>; where <option>--assume-yes</"
@@ -1722,7 +1722,7 @@ msgstr ""
 "Get::Trivial-Only</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:494
+#: apt-get.8.xml:488
 msgid ""
 "If any packages are to be removed apt-get immediately aborts without "
 "prompting.  Configuration Item: <literal>APT::Get::Remove</literal>."
@@ -1732,7 +1732,7 @@ msgstr ""
 "Remove</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:500
+#: apt-get.8.xml:494
 msgid ""
 "If the command is either <literal>install</literal> or <literal>remove</"
 "literal>, then this option acts like running the <literal>autoremove</"
@@ -1745,7 +1745,7 @@ msgstr ""
 "inutilisés. Élément de configuration : <literal>APT::Get::Upgrade</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:507
+#: apt-get.8.xml:501
 msgid ""
 "Only has meaning for the <literal>source</literal> and <literal>build-dep</"
 "literal> commands.  Indicates that the given source names are not to be "
@@ -1765,7 +1765,7 @@ msgstr ""
 "literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:518
+#: apt-get.8.xml:512
 msgid ""
 "Download only the diff, dsc, or tar file of a source archive.  Configuration "
 "Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</"
@@ -1777,7 +1777,7 @@ msgstr ""
 "literal>, "
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:524
+#: apt-get.8.xml:518
 msgid ""
 "Only process architecture-dependent build-dependencies.  Configuration Item: "
 "<literal>APT::Get::Arch-Only</literal>."
@@ -1787,7 +1787,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:529
+#: apt-get.8.xml:523
 msgid ""
 "Ignore if packages can't be authenticated and don't prompt about it.  This "
 "is useful for tools like pbuilder.  Configuration Item: <literal>APT::Get::"
@@ -1799,7 +1799,7 @@ msgstr ""
 "AllowUnauthenticated</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:535
+#: apt-get.8.xml:529
 msgid ""
 "Show user friendly progress information in the terminal window when packages "
 "are installed, upgraded or removed. For a machine parsable version of this "
@@ -1809,13 +1809,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:548 apt-cache.8.xml:345 apt-key.8.xml:176 apt-mark.8.xml:127
-#: apt.conf.5.xml:1221 apt_preferences.5.xml:700
+#: apt-get.8.xml:542 apt-cache.8.xml:339 apt-key.8.xml:170 apt-mark.8.xml:121
+#: apt.conf.5.xml:1216 apt_preferences.5.xml:694
 msgid "Files"
 msgstr "Fichiers"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:559
+#: apt-get.8.xml:553
 #, fuzzy
 #| msgid ""
 #| "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
@@ -1831,7 +1831,7 @@ msgstr ""
 "« HOWTO » d'APT."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:565
+#: apt-get.8.xml:559
 msgid ""
 "<command>apt-get</command> returns zero on normal operation, decimal 100 on "
 "error."
@@ -1840,12 +1840,12 @@ msgstr ""
 "décimal 100 en cas d'erreur."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-cache.8.xml:35
+#: apt-cache.8.xml:29
 msgid "query the APT cache"
 msgstr "recherche dans le cache d'APT"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:41
+#: apt-cache.8.xml:35
 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 "
@@ -1858,7 +1858,7 @@ msgstr ""
 "desquelles il extrait les informations intéressantes."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:51
+#: apt-cache.8.xml:45
 msgid ""
 "<literal>gencaches</literal> creates APT's package cache. This is done "
 "implicitly by all commands needing this cache if it is missing or outdated."
@@ -1868,14 +1868,14 @@ msgstr ""
 "ou obsolète."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
-#: apt-cache.8.xml:55 apt-cache.8.xml:144 apt-cache.8.xml:165
-#: apt-cache.8.xml:187 apt-cache.8.xml:192 apt-cache.8.xml:208
-#: apt-cache.8.xml:226 apt-cache.8.xml:238
+#: apt-cache.8.xml:49 apt-cache.8.xml:138 apt-cache.8.xml:159
+#: apt-cache.8.xml:181 apt-cache.8.xml:186 apt-cache.8.xml:202
+#: apt-cache.8.xml:220 apt-cache.8.xml:232
 msgid "&synopsis-pkg;"
 msgstr "&synopsis-pkg;"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:56
+#: apt-cache.8.xml:50
 msgid ""
 "<literal>showpkg</literal> displays information about the packages listed on "
 "the command line. Remaining arguments are package names. The available "
@@ -1899,7 +1899,7 @@ msgstr ""
 "résultat :"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
-#: apt-cache.8.xml:68
+#: apt-cache.8.xml:62
 #, no-wrap
 msgid ""
 "Package: libreadline2\n"
@@ -1925,7 +1925,7 @@ msgstr ""
 "Reverse Provides: \n"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:80
+#: apt-cache.8.xml:74
 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, "
@@ -1944,7 +1944,7 @@ msgstr ""
 "consulter le code source d'APT."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:89
+#: apt-cache.8.xml:83
 msgid ""
 "<literal>stats</literal> displays some statistics about the cache.  No "
 "further arguments are expected. Statistics reported are:"
@@ -1954,7 +1954,7 @@ msgstr ""
 "rapportées :"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:92
+#: apt-cache.8.xml:86
 msgid ""
 "<literal>Total package names</literal> is the number of package names found "
 "in the cache."
@@ -1963,7 +1963,7 @@ msgstr ""
 "le cache."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:96
+#: apt-cache.8.xml:90
 msgid ""
 "<literal>Normal packages</literal> is the number of regular, ordinary "
 "package names; these are packages that bear a one-to-one correspondence "
@@ -1976,7 +1976,7 @@ msgstr ""
 "dépendance. La majorité des paquets appartient à cette catégorie."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:102
+#: apt-cache.8.xml:96
 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 "
@@ -1994,7 +1994,7 @@ msgstr ""
 "n'existe aucun paquet nommé « mail-transport-agent »."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:110
+#: apt-cache.8.xml:104
 msgid ""
 "<literal>Single virtual packages</literal> is the number of packages with "
 "only one package providing a particular virtual package. For example, in the "
@@ -2007,7 +2007,7 @@ msgstr ""
 "« xless » remplit « X11-text-viewer »."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:116
+#: apt-cache.8.xml:110
 msgid ""
 "<literal>Mixed virtual packages</literal> is the number of packages that "
 "either provide a particular virtual package or have the virtual package name "
@@ -2020,7 +2020,7 @@ msgstr ""
 "paquet réel et il est aussi fourni par « debconf-tiny »."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:123
+#: apt-cache.8.xml:117
 msgid ""
 "<literal>Missing</literal> is the number of package names that were "
 "referenced in a dependency but were not provided by any package. Missing "
@@ -2035,7 +2035,7 @@ msgstr ""
 "Habituellement on les trouve dans les champs « Conflicts » ou « Breaks »."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:130
+#: apt-cache.8.xml:124
 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 "
@@ -2050,7 +2050,7 @@ msgstr ""
 "considérablement plus grande que le nombre total de paquets."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:137
+#: apt-cache.8.xml:131
 msgid ""
 "<literal>Total dependencies</literal> is the number of dependency "
 "relationships claimed by all of the packages in the cache."
@@ -2059,7 +2059,7 @@ msgstr ""
 "dépendances déclarées par tous les paquets présents dans le cache."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:145
+#: apt-cache.8.xml:139
 msgid ""
 "<literal>showsrc</literal> displays all the source package records that "
 "match the given package names. All versions are shown, as well as all "
@@ -2070,7 +2070,7 @@ msgstr ""
 "les entrées qui déclarent que ces noms correspondent à des paquets binaires."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:151
+#: apt-cache.8.xml:145
 msgid ""
 "<literal>dump</literal> shows a short listing of every package in the cache. "
 "It is primarily for debugging."
@@ -2079,7 +2079,7 @@ msgstr ""
 "paquet du cache. Elle est d'abord destinée au débogage."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:156
+#: apt-cache.8.xml:150
 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."
@@ -2089,7 +2089,7 @@ msgstr ""
 "et la méthode &dselect; s'en sert."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:161
+#: apt-cache.8.xml:155
 msgid ""
 "<literal>unmet</literal> displays a summary of all unmet dependencies in the "
 "package cache."
@@ -2098,7 +2098,7 @@ msgstr ""
 "dépendances absentes dans le cache de paquets."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:166
+#: apt-cache.8.xml:160
 msgid ""
 "<literal>show</literal> performs a function similar to <command>dpkg --print-"
 "avail</command>; it displays the package records for the named packages."
@@ -2108,12 +2108,12 @@ msgstr ""
 "argument."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
-#: apt-cache.8.xml:171
+#: apt-cache.8.xml:165
 msgid "&synopsis-regex;"
 msgstr "&synopsis-regex;"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:172
+#: apt-cache.8.xml:166
 msgid ""
 "<literal>search</literal> performs a full text search on all available "
 "package lists for the POSIX regex pattern given, see &regex;.  It searches "
@@ -2134,7 +2134,7 @@ msgstr ""
 "mais seulement dans les noms de paquets."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:183
+#: apt-cache.8.xml:177
 msgid ""
 "Separate arguments can be used to specify multiple search patterns that are "
 "and'ed together."
@@ -2143,7 +2143,7 @@ msgstr ""
 "rationnelles différentes sur lesquelles seront réalisées un « et » logique."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:188
+#: apt-cache.8.xml:182
 msgid ""
 "<literal>depends</literal> shows a listing of each dependency a package has "
 "and all the possible other packages that can fulfill that dependency."
@@ -2153,7 +2153,7 @@ msgstr ""
 "satisfont ces dépendances."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:193
+#: apt-cache.8.xml:187
 msgid ""
 "<literal>rdepends</literal> shows a listing of each reverse dependency a "
 "package has."
@@ -2162,12 +2162,12 @@ msgstr ""
 "dépendances inverses d'un paquet."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:197
+#: apt-cache.8.xml:191
 msgid "<optional><replaceable>&synopsis-prefix;</replaceable></optional>"
 msgstr "<optional><replaceable>&synopsis-prefix;</replaceable></optional>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:198
+#: apt-cache.8.xml:192
 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 "
@@ -2182,7 +2182,7 @@ msgstr ""
 "l'option <option>--generate</option>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:203
+#: apt-cache.8.xml:197
 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 "
@@ -2193,7 +2193,7 @@ msgstr ""
 "affichés dans la liste créée."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:209
+#: apt-cache.8.xml:203
 msgid ""
 "<literal>dotty</literal> takes a list of packages on the command line and "
 "generates output suitable for use by dotty from the <ulink url=\"http://www."
@@ -2215,7 +2215,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:218
+#: apt-cache.8.xml:212
 msgid ""
 "The resulting nodes will have several shapes; normal packages are boxes, "
 "pure virtual packages are triangles, mixed virtual packages are diamonds, "
@@ -2230,14 +2230,14 @@ msgstr ""
 "conflits."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:223
+#: apt-cache.8.xml:217
 msgid "Caution, dotty cannot graph larger sets of packages."
 msgstr ""
 "Attention, dotty ne peut pas représenter des ensembles très grands de "
 "paquets."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:227
+#: apt-cache.8.xml:221
 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 tool</ulink>."
@@ -2247,12 +2247,12 @@ msgstr ""
 "ulink>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:231
+#: apt-cache.8.xml:225
 msgid "<optional><replaceable>&synopsis-pkg;</replaceable>…</optional>"
 msgstr "<optional><replaceable>&synopsis-pkg;</replaceable>…</optional>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:232
+#: apt-cache.8.xml:226
 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 "
@@ -2265,7 +2265,7 @@ msgstr ""
 "paquet donné en argument."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:239
+#: apt-cache.8.xml:233
 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 "
@@ -2285,7 +2285,7 @@ msgstr ""
 "literal>)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:255
+#: apt-cache.8.xml:249
 msgid ""
 "Select the file to store the package cache. The package cache is the primary "
 "cache used by all operations.  Configuration Item: <literal>Dir::Cache::"
@@ -2296,7 +2296,7 @@ msgstr ""
 "<literal>Dir::Cache::pkgcache</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:261
+#: apt-cache.8.xml:255
 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 "
@@ -2312,7 +2312,7 @@ msgstr ""
 "<literal>Dir::Cache::srcpkgcache</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:269
+#: apt-cache.8.xml:263
 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 "
@@ -2327,7 +2327,7 @@ msgstr ""
 "<literal>quiet</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:276
+#: apt-cache.8.xml:270
 msgid ""
 "Print only important dependencies; for use with <literal>unmet</literal> and "
 "<literal>depends</literal>. Causes only Depends and Pre-Depends relations to "
@@ -2339,7 +2339,7 @@ msgstr ""
 "<literal>APT::Cache::Important</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:290
+#: apt-cache.8.xml:284
 msgid ""
 "Per default the <literal>depends</literal> and <literal>rdepends</literal> "
 "print all dependencies. This can be tweaked with these flags which will omit "
@@ -2354,7 +2354,7 @@ msgstr ""
 "replaceable></literal>, p. ex. <literal>APT::Cache::ShowRecommends</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:297
+#: apt-cache.8.xml:291
 msgid ""
 "Print full package records when searching.  Configuration Item: "
 "<literal>APT::Cache::ShowFull</literal>."
@@ -2364,7 +2364,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:302
+#: apt-cache.8.xml:296
 msgid ""
 "Print full records for all available versions. This is the default; to turn "
 "it off, use <option>--no-all-versions</option>.  If <option>--no-all-"
@@ -2382,7 +2382,7 @@ msgstr ""
 "<literal>APT::Cache::AllVersions</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:311
+#: apt-cache.8.xml:305
 msgid ""
 "Perform automatic package cache regeneration, rather than use the cache as "
 "it is. This is the default; to turn it off, use <option>--no-generate</"
@@ -2394,7 +2394,7 @@ msgstr ""
 "configuration : <literal>APT::Cache::Generate</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:317
+#: apt-cache.8.xml:311
 msgid ""
 "Only search on the package names, not the long descriptions.  Configuration "
 "Item: <literal>APT::Cache::NamesOnly</literal>."
@@ -2404,7 +2404,7 @@ msgstr ""
 "NamesOnly</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:322
+#: apt-cache.8.xml:316
 msgid ""
 "Make <literal>pkgnames</literal> print all names, including virtual packages "
 "and missing dependencies.  Configuration Item: <literal>APT::Cache::"
@@ -2415,7 +2415,7 @@ msgstr ""
 "configuration : <literal>APT::Cache::AllNames</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:328
+#: apt-cache.8.xml:322
 msgid ""
 "Make <literal>depends</literal> and <literal>rdepends</literal> recursive so "
 "that all packages mentioned are printed once.  Configuration Item: "
@@ -2427,7 +2427,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:335
+#: apt-cache.8.xml:329
 msgid ""
 "Limit the output of <literal>depends</literal> and <literal>rdepends</"
 "literal> to packages which are currently installed.  Configuration Item: "
@@ -2438,12 +2438,12 @@ msgstr ""
 "Élément de configuration : <literal>APT::Cache::Installed</literal>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:353
+#: apt-cache.8.xml:347
 msgid "&apt-conf;, &sources-list;, &apt-get;"
 msgstr "&apt-conf;, &sources-list;, &apt-get;."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:358
+#: apt-cache.8.xml:352
 msgid ""
 "<command>apt-cache</command> returns zero on normal operation, decimal 100 "
 "on error."
@@ -2452,12 +2452,12 @@ msgstr ""
 "nombre décimal 100 en cas d'erreur."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-key.8.xml:34
+#: apt-key.8.xml:28
 msgid "APT key management utility"
 msgstr "Utilitaire de gestion des clés d'APT"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:41
+#: apt-key.8.xml:35
 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 "
@@ -2467,12 +2467,12 @@ msgstr ""
 "les paquets. Les paquets authentifiés par ces clés seront réputés fiables."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-key.8.xml:47
+#: apt-key.8.xml:41
 msgid "Commands"
 msgstr "Commandes"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:52
+#: apt-key.8.xml:46
 msgid ""
 "Add a new key to the list of trusted keys.  The key is read from the "
 "filename given with the parameter &synopsis-param-filename; or if the "
@@ -2483,32 +2483,32 @@ msgstr ""
 "si le nom de fichier est <literal>-</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:65
+#: apt-key.8.xml:59
 msgid "Remove a key from the list of trusted keys."
 msgstr "Supprimer une clé de la liste des clés fiables."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:76
+#: apt-key.8.xml:70
 msgid "Output the key &synopsis-param-keyid; to standard output."
 msgstr "Afficher la clé &synopsis-param-keyid; sur la sortie standard."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:87
+#: apt-key.8.xml:81
 msgid "Output all trusted keys to standard output."
 msgstr "Afficher toutes les clés fiables sur la sortie standard."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:98
+#: apt-key.8.xml:92
 msgid "List trusted keys."
 msgstr "Afficher la liste des clés fiables."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:109
+#: apt-key.8.xml:103
 msgid "List fingerprints of trusted keys."
 msgstr "Afficher les empreintes des clés fiables."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:120
+#: apt-key.8.xml:114
 msgid ""
 "Pass advanced options to gpg. With adv --recv-key you can download the "
 "public key."
@@ -2517,7 +2517,7 @@ msgstr ""
 "possible de télécharger une clé publique."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:132
+#: apt-key.8.xml:126
 msgid ""
 "Update the local keyring with the archive keyring and remove from the local "
 "keyring the archive keys which are no longer valid.  The archive keyring is "
@@ -2531,7 +2531,7 @@ msgstr ""
 "&keyring-distro;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:146
+#: apt-key.8.xml:140
 msgid ""
 "Perform an update working similarly to the <command>update</command> command "
 "above, but get the archive keyring from a URI instead and validate it "
@@ -2549,12 +2549,12 @@ msgstr ""
 "place. Par contre, la version d'Ubuntu permet de l'utiliser."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-key.8.xml:162 apt-cdrom.8.xml:82
+#: apt-key.8.xml:156 apt-cdrom.8.xml:76
 msgid "Options"
 msgstr "Options"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:163
+#: apt-key.8.xml:157
 msgid ""
 "Note that options need to be defined before the commands described in the "
 "previous section."
@@ -2563,7 +2563,7 @@ msgstr ""
 "décrites dans la section suivante."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:166
+#: apt-key.8.xml:160
 msgid ""
 "With this option it is possible to specify a particular keyring file the "
 "command should operate on. The default is that a command is executed on the "
@@ -2580,47 +2580,47 @@ msgstr ""
 "les nouvelles clés y seront ajoutées."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:181
+#: apt-key.8.xml:175
 msgid "<filename>/etc/apt/trustdb.gpg</filename>"
 msgstr "<filename>/etc/apt/trustdb.gpg</filename>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:182
+#: apt-key.8.xml:176
 msgid "Local trust database of archive keys."
 msgstr "Base de données locale de fiabilité des clés de l'archive."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:185
+#: apt-key.8.xml:179
 msgid "&keyring-filename;"
 msgstr "&keyring-filename;"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:186
+#: apt-key.8.xml:180
 msgid "Keyring of &keyring-distro; archive trusted keys."
 msgstr "Trousseau des clés fiables de l'archive &keyring-distro;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:189
+#: apt-key.8.xml:183
 msgid "&keyring-removed-filename;"
 msgstr "&keyring-removed-filename;"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:190
+#: apt-key.8.xml:184
 msgid "Keyring of &keyring-distro; archive removed trusted keys."
 msgstr "Trousseau des clés fiables supprimées de l'archive &keyring-distro;."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:199
+#: apt-key.8.xml:193
 msgid "&apt-get;, &apt-secure;"
 msgstr "&apt-get;, &apt-secure;"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-mark.8.xml:35
+#: apt-mark.8.xml:29
 msgid "mark/unmark a package as being automatically-installed"
 msgstr "Indiquer si un paquet a été installé automatiquement ou non"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:41
+#: apt-mark.8.xml:35
 msgid ""
 "<command>apt-mark</command> will change whether a package has been marked as "
 "being automatically installed."
@@ -2629,7 +2629,7 @@ msgstr ""
 "a été automatiquement installé ou pas."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:45
+#: apt-mark.8.xml:39
 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 "
@@ -2645,7 +2645,7 @@ msgstr ""
 "command>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:54
+#: apt-mark.8.xml:48
 msgid ""
 "<literal>auto</literal> is used to mark a package as being automatically "
 "installed, which will cause the package to be removed when no more manually "
@@ -2656,7 +2656,7 @@ msgstr ""
 "aucun paquet installé manuellement ne dépend de lui."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:62
+#: apt-mark.8.xml:56
 msgid ""
 "<literal>manual</literal> is used to mark a package as being manually "
 "installed, which will prevent the package from being automatically removed "
@@ -2667,7 +2667,7 @@ msgstr ""
 "aucun autre paquet n'en dépend."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:70
+#: apt-mark.8.xml:64
 msgid ""
 "<literal>hold</literal> is used to mark a package as held back, which will "
 "prevent the package from being automatically installed, upgraded or "
@@ -2682,7 +2682,7 @@ msgstr ""
 "non affecté par l'option <option>--file</option>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:80
+#: apt-mark.8.xml:74
 msgid ""
 "<literal>unhold</literal> is used to cancel a previously set hold on a "
 "package to allow all actions again."
@@ -2692,7 +2692,7 @@ msgstr ""
 "liée."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:86
+#: apt-mark.8.xml:80
 msgid ""
 "<literal>showauto</literal> is used to print a list of automatically "
 "installed packages with each package on a new line.  All automatically "
@@ -2706,7 +2706,7 @@ msgstr ""
 "affichés."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:94
+#: apt-mark.8.xml:88
 msgid ""
 "<literal>showmanual</literal> can be used in the same way as "
 "<literal>showauto</literal> except that it will print a list of manually "
@@ -2717,7 +2717,7 @@ msgstr ""
 "manuellement."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:101
+#: apt-mark.8.xml:95
 msgid ""
 "<literal>showhold</literal> is used to print a list of packages on hold in "
 "the same way as for the other show commands."
@@ -2726,7 +2726,7 @@ msgstr ""
 "de manière analogue aux commandes de même type."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:117
+#: apt-mark.8.xml:111
 msgid ""
 "Read/Write package stats from the filename given with the parameter "
 "&synopsis-param-filename; instead of from the default location, which is "
@@ -2739,7 +2739,7 @@ msgstr ""
 "literal>)."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:138
+#: apt-mark.8.xml:132
 msgid ""
 "<command>apt-mark</command> returns zero on normal operation, non-zero on "
 "error."
@@ -2748,12 +2748,12 @@ msgstr ""
 "autre chiffre en cas d'erreur."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-secure.8.xml:49
+#: apt-secure.8.xml:43
 msgid "Archive authentication support for APT"
 msgstr "Gestion de l'authentification d'archive avec APT"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:54
+#: apt-secure.8.xml:48
 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 "
@@ -2766,7 +2766,7 @@ msgstr ""
 "la clé de la signature du fichier Release."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:62
+#: apt-secure.8.xml:56
 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 "
@@ -2782,7 +2782,7 @@ msgstr ""
 "vérification des sources avant tout téléchargement de paquet."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:71
+#: apt-secure.8.xml:65
 msgid ""
 "The package frontends &apt-get;, &aptitude; and &synaptic; support this new "
 "authentication feature."
@@ -2791,12 +2791,12 @@ msgstr ""
 "fonction de certification."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:76
+#: apt-secure.8.xml:70
 msgid "Trusted archives"
 msgstr "Trusted archives"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:79
+#: apt-secure.8.xml:73
 msgid ""
 "The chain of trust from an apt archive to the end user is made up of several "
 "steps. <command>apt-secure</command> is the last step in this chain; "
@@ -2813,7 +2813,7 @@ msgstr ""
 "en sorte que l'archive soit fiable."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:87
+#: apt-secure.8.xml:81
 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 "
@@ -2826,7 +2826,7 @@ msgstr ""
 "verify et devscripts."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:94
+#: apt-secure.8.xml:88
 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. In order to become "
@@ -2844,7 +2844,7 @@ msgstr ""
 "l'identité des propriétaires de la clé."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:104
+#: apt-secure.8.xml:98
 #, fuzzy
 msgid ""
 "Once the uploaded package is verified and included in the archive, the "
@@ -2865,7 +2865,7 @@ msgstr ""
 "miroirs. Les clés sont fournies par le paquet &keyring-package;."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:115
+#: apt-secure.8.xml:109
 msgid ""
 "End users can check the signature of the Release file, extract a checksum of "
 "a package from it and compare it with the checksum of the package they "
@@ -2877,7 +2877,7 @@ msgstr ""
 "automatiquement."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:120
+#: apt-secure.8.xml:114
 msgid ""
 "Notice that this is distinct from checking signatures on a per package "
 "basis. It is designed to prevent two possible attacks:"
@@ -2886,7 +2886,7 @@ msgstr ""
 "paquet. Elle vise à empêcher deux types d'attaque possibles :"
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:125
+#: apt-secure.8.xml:119
 msgid ""
 "<literal>Network \"man in the middle\" attacks</literal>. Without signature "
 "checking, malicious agents can introduce themselves into the package "
@@ -2901,7 +2901,7 @@ msgstr ""
 "trafic vers un serveur fourbe (par usurpation d'adresses)."
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:133
+#: apt-secure.8.xml:127
 msgid ""
 "<literal>Mirror network compromise</literal>.  Without signature checking, a "
 "malicious agent can compromise a mirror host and modify the files in it to "
@@ -2914,7 +2914,7 @@ msgstr ""
 "paquets de ce miroir propagent du code malveillant."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:140
+#: apt-secure.8.xml:134
 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 "
@@ -2927,12 +2927,12 @@ msgstr ""
 "signature des paquets."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:146
+#: apt-secure.8.xml:140
 msgid "User configuration"
 msgstr "Configuration utilisateur"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:148
+#: apt-secure.8.xml:142
 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 "
@@ -2945,7 +2945,7 @@ msgstr ""
 "Debian et les différents répertoires de paquets."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:155
+#: apt-secure.8.xml:149
 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 "
@@ -2962,12 +2962,12 @@ msgstr ""
 "l'archive que vous avez configurée."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:164
+#: apt-secure.8.xml:158
 msgid "Archive configuration"
 msgstr "Configuration d'une archive"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:166
+#: apt-secure.8.xml:160
 msgid ""
 "If you want to provide archive signatures in an archive under your "
 "maintenance you have to:"
@@ -2976,7 +2976,7 @@ msgstr ""
 "devez :"
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:171
+#: apt-secure.8.xml:165
 msgid ""
 "<emphasis>Create a toplevel Release file</emphasis>, if it does not exist "
 "already. You can do this by running <command>apt-ftparchive release</"
@@ -2987,7 +2987,7 @@ msgstr ""
 "ftparchive release</command> (fournie dans le paquet apt-utils)."
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:176
+#: apt-secure.8.xml:170
 msgid ""
 "<emphasis>Sign it</emphasis>. You can do this by running <command>gpg --"
 "clearsign -o InRelease Release</command> and <command>gpg -abs -o Release."
@@ -2998,7 +2998,7 @@ msgstr ""
 "command>."
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:180
+#: apt-secure.8.xml:174
 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 "
@@ -3009,7 +3009,7 @@ msgstr ""
 "authentifier les fichiers de l'archive."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:187
+#: apt-secure.8.xml:181
 msgid ""
 "Whenever the contents of the archive change (new packages are added or "
 "removed) the archive maintainer has to follow the first two steps outlined "
@@ -3019,16 +3019,16 @@ msgstr ""
 "les deux premières étapes."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:195
+#: apt-secure.8.xml:189
 msgid ""
 "&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, "
-"&debsign; &debsig-verify;, &gpg;"
+"&debsign;, &debsig-verify;, &gpg;"
 msgstr ""
 "&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, "
-"&debsign; &debsig-verify;, &gpg;"
+"&debsign;, &debsig-verify;, &gpg;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:199
+#: apt-secure.8.xml:193
 msgid ""
 "For more background information you might want to review the <ulink url="
 "\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "
@@ -3045,12 +3045,12 @@ msgstr ""
 "Distribution HOWTO</ulink> par V. Alex Brennen."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:212
+#: apt-secure.8.xml:206
 msgid "Manpage Authors"
 msgstr "Auteurs des pages de manuel"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:214
+#: apt-secure.8.xml:208
 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."
@@ -3059,12 +3059,12 @@ msgstr ""
 "Peña, Isaac Jones, Colin Walters, Florian Weimer et Michael Vogt."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-cdrom.8.xml:34
+#: apt-cdrom.8.xml:28
 msgid "APT CD-ROM management utility"
 msgstr "Utilitaire de gestion des CD d'APT"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:40
+#: apt-cdrom.8.xml:34
 msgid ""
 "<command>apt-cdrom</command> is used to add a new CD-ROM to APT's list of "
 "available sources. <command>apt-cdrom</command> takes care of determining "
@@ -3077,7 +3077,7 @@ msgstr ""
 "gravure et de vérifier les fichiers d'index."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:47
+#: apt-cdrom.8.xml:41
 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 disc in a multi-CD set "
@@ -3089,7 +3089,7 @@ msgstr ""
 "pour prendre en compte de possibles erreurs de gravure."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:58
+#: apt-cdrom.8.xml:52
 msgid ""
 "<literal>add</literal> is used to add a new disc to the source list. It will "
 "unmount the CD-ROM device, prompt for a disc to be inserted and then proceed "
@@ -3104,7 +3104,7 @@ msgstr ""
 "titre descriptif est demandé."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:66
+#: apt-cdrom.8.xml:60
 msgid ""
 "APT uses a CD-ROM ID to track which disc is currently in the drive and "
 "maintains a database of these IDs in <filename>&statedir;/cdroms.list</"
@@ -3115,7 +3115,7 @@ msgstr ""
 "identifiants dans <filename>&statedir;/cdroms.list</filename>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:74
+#: apt-cdrom.8.xml:68
 msgid ""
 "A debugging tool to report the identity of the current disc as well as the "
 "stored file name"
@@ -3124,7 +3124,7 @@ msgstr ""
 "le nom du fichier stocké."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:87
+#: apt-cdrom.8.xml:81
 #, fuzzy
 #| msgid ""
 #| "Mount point; specify the location to mount the CD-ROM. This mount point "
@@ -3141,7 +3141,7 @@ msgstr ""
 "mount</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:95
+#: apt-cdrom.8.xml:89
 msgid ""
 "Mount point; specify the location to mount the CD-ROM. This mount point must "
 "be listed in <filename>/etc/fstab</filename> and properly configured.  "
@@ -3153,7 +3153,7 @@ msgstr ""
 "mount</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:104
+#: apt-cdrom.8.xml:98
 msgid ""
 "Rename a disc; change the label of a disc or override the disc's given "
 "label. This option will cause <command>apt-cdrom</command> to prompt for a "
@@ -3165,7 +3165,7 @@ msgstr ""
 "<literal>APT::CDROM::Rename</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:113
+#: apt-cdrom.8.xml:107
 msgid ""
 "No mounting; prevent <command>apt-cdrom</command> from mounting and "
 "unmounting the mount point.  Configuration Item: <literal>APT::CDROM::"
@@ -3176,7 +3176,7 @@ msgstr ""
 "NoMount</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:121
+#: apt-cdrom.8.xml:115
 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 "
@@ -3190,7 +3190,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:131
+#: apt-cdrom.8.xml:125
 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 "
@@ -3202,7 +3202,7 @@ msgstr ""
 "le CD mais tous les paquets seront repérés."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:142
+#: apt-cdrom.8.xml:136
 msgid ""
 "No Changes; Do not change the &sources-list; file and do not write index "
 "files. Everything is still checked however.  Configuration Item: "
@@ -3213,12 +3213,12 @@ msgstr ""
 "<literal>APT::CDROM::NoAct</literal>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:155
+#: apt-cdrom.8.xml:149
 msgid "&apt-conf;, &apt-get;, &sources-list;"
 msgstr "&apt-conf;, &apt-get;, &sources-list;."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:160
+#: apt-cdrom.8.xml:154
 msgid ""
 "<command>apt-cdrom</command> returns zero on normal operation, decimal 100 "
 "on error."
@@ -3227,12 +3227,12 @@ msgstr ""
 "nombre décimal 100 en cas d'erreur."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-config.8.xml:35
+#: apt-config.8.xml:29
 msgid "APT Configuration Query program"
 msgstr "Programme d'interrogation de la configuration d'APT"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:41
+#: apt-config.8.xml:35
 msgid ""
 "<command>apt-config</command> is an internal program used by various "
 "portions of the APT suite to provide consistent configurability. It accesses "
@@ -3246,7 +3246,7 @@ msgstr ""
 "apt.conf</filename>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:53
+#: apt-config.8.xml:47
 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 the "
@@ -3262,7 +3262,7 @@ msgstr ""
 "cette commande devrait être utilisée comme suit :"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
-#: apt-config.8.xml:61
+#: apt-config.8.xml:55
 #, no-wrap
 msgid ""
 "OPTS=\"-f\"\n"
@@ -3274,7 +3274,7 @@ msgstr ""
 "eval $RES\n"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:66
+#: apt-config.8.xml:60
 msgid ""
 "This will set the shell environment variable $OPTS to the value of MyApp::"
 "options with a default of <option>-f</option>."
@@ -3283,7 +3283,7 @@ msgstr ""
 "MyApp::Options ou, par défaut, la valeur -f."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:70
+#: apt-config.8.xml:64
 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 "
@@ -3295,12 +3295,12 @@ msgstr ""
 "vérifiée."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:79
+#: apt-config.8.xml:73
 msgid "Just show the contents of the configuration space."
 msgstr "Affiche seulement le contenu de l'espace de configuration."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:92
+#: apt-config.8.xml:86
 msgid ""
 "Include options which have an empty value. This is the default, so use --no-"
 "empty to remove them from the output."
@@ -3310,12 +3310,12 @@ msgstr ""
 "ce qui est retourné."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
-#: apt-config.8.xml:97
+#: apt-config.8.xml:91
 msgid "&percnt;f &#x0022;&percnt;v&#x0022;;&percnt;n"
 msgstr "&percnt;f &#x0022;&percnt;v&#x0022;;&percnt;n"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:98
+#: apt-config.8.xml:92
 msgid ""
 "Defines the output of each config option. &percnt;t will be replaced with "
 "its individual name, &percnt;f with its full hierarchical name and &percnt;v "
@@ -3333,13 +3333,13 @@ msgstr ""
 "caractère &percnt; peut être affiché avec &percnt;&percnt; ."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:112 apt-extracttemplates.1.xml:73 apt-sortpkgs.1.xml:66
-#: apt-ftparchive.1.xml:610
+#: apt-config.8.xml:106 apt-extracttemplates.1.xml:67 apt-sortpkgs.1.xml:60
+#: apt-ftparchive.1.xml:604
 msgid "&apt-conf;"
 msgstr "&apt-conf;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:117
+#: apt-config.8.xml:111
 msgid ""
 "<command>apt-config</command> returns zero on normal operation, decimal 100 "
 "on error."
@@ -3348,27 +3348,27 @@ msgstr ""
 "le nombre 100 en cas d'erreur."
 
 #. type: Content of: <refentry><refentryinfo><author><contrib>
-#: apt.conf.5.xml:22
+#: apt.conf.5.xml:16
 msgid "Initial documentation of Debug::*."
 msgstr "Documentation initiale de Debug::*."
 
 #. type: Content of: <refentry><refentryinfo><author><email>
-#: apt.conf.5.xml:23
+#: apt.conf.5.xml:17
 msgid "dburrows@debian.org"
 msgstr "dburrows@debian.org"
 
 #. type: Content of: <refentry><refmeta><manvolnum>
-#: apt.conf.5.xml:33 apt_preferences.5.xml:27 sources.list.5.xml:28
+#: apt.conf.5.xml:27 apt_preferences.5.xml:21 sources.list.5.xml:22
 msgid "5"
 msgstr "5"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt.conf.5.xml:40
+#: apt.conf.5.xml:34
 msgid "Configuration file for APT"
 msgstr "Fichier de configuration pour APT"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:44
+#: apt.conf.5.xml:38
 msgid ""
 "<filename>/etc/apt/apt.conf</filename> is the main configuration file shared "
 "by all the tools in the APT suite of tools, though it is by no means the "
@@ -3382,7 +3382,7 @@ msgstr ""
 "environnement d'utilisation uniforme."
 
 #. type: Content of: <refentry><refsect1><orderedlist><para>
-#: apt.conf.5.xml:50
+#: apt.conf.5.xml:44
 msgid ""
 "When an APT tool starts up it will read the configuration files in the "
 "following order:"
@@ -3391,7 +3391,7 @@ msgstr ""
 "configuration dans l'ordre suivant :"
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:52
+#: apt.conf.5.xml:46
 msgid ""
 "the file specified by the <envar>APT_CONFIG</envar> environment variable (if "
 "any)"
@@ -3400,7 +3400,7 @@ msgstr ""
 "elle existe"
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:54
+#: apt.conf.5.xml:48
 msgid ""
 "all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending "
 "order which have either no or \"<literal>conf</literal>\" as filename "
@@ -3421,14 +3421,14 @@ msgstr ""
 "configuration étant, eux, ignorés silencieusemennt)."
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:61
+#: apt.conf.5.xml:55
 msgid ""
 "the main configuration file specified by <literal>Dir::Etc::main</literal>"
 msgstr ""
 "le fichier de configuration défini par <literal>Dir::Etc::Main</literal>"
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:63
+#: apt.conf.5.xml:57
 msgid ""
 "the command line options are applied to override the configuration "
 "directives or to load even more configuration files."
@@ -3438,12 +3438,12 @@ msgstr ""
 "configuration."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:67
+#: apt.conf.5.xml:61
 msgid "Syntax"
 msgstr "Syntaxe"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:68
+#: apt.conf.5.xml:62
 msgid ""
 "The configuration file is organized in a tree with options organized into "
 "functional groups. Option specification is given with a double colon "
@@ -3458,7 +3458,7 @@ msgstr ""
 "Get. Il n'y a pas d'héritage des options des groupes parents."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:74
+#: apt.conf.5.xml:68
 msgid ""
 "Syntactically the configuration language is modeled after what the ISC tools "
 "such as bind and dhcp use. Lines starting with <literal>//</literal> are "
@@ -3485,7 +3485,7 @@ msgstr ""
 "accolades, comme suit :"
 
 #. type: Content of: <refentry><refsect1><informalexample><programlisting>
-#: apt.conf.5.xml:87
+#: apt.conf.5.xml:81
 #, no-wrap
 msgid ""
 "APT {\n"
@@ -3503,7 +3503,7 @@ msgstr ""
 "};\n"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:95
+#: apt.conf.5.xml:89
 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 "
@@ -3515,13 +3515,13 @@ msgstr ""
 "incluses, séparées par des points-virgules."
 
 #. type: Content of: <refentry><refsect1><informalexample><programlisting>
-#: apt.conf.5.xml:100
+#: apt.conf.5.xml:94
 #, no-wrap
 msgid "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n"
 msgstr "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:103
+#: apt.conf.5.xml:97
 msgid ""
 "In general the sample configuration file &configureindex; is a good guide "
 "for how it should look."
@@ -3530,7 +3530,7 @@ msgstr ""
 "de configuration."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:106
+#: apt.conf.5.xml:100
 msgid ""
 "Case is not significant in names of configuration items, so in the previous "
 "example you could use <literal>dpkg::pre-install-pkgs</literal>."
@@ -3540,7 +3540,7 @@ msgstr ""
 "<literal>dpkg::pre-install-pkgs</literal>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:109
+#: apt.conf.5.xml:103
 msgid ""
 "Names for the configuration items are optional if a list is defined as can "
 "be seen in the <literal>DPkg::Pre-Install-Pkgs</literal> example above. If "
@@ -3556,7 +3556,7 @@ msgstr ""
 "réaffectant une valeur."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:114
+#: apt.conf.5.xml:108
 msgid ""
 "Two special commands are defined: <literal>#include</literal> (which is "
 "deprecated and not supported by alternative implementations) and "
@@ -3576,7 +3576,7 @@ msgstr ""
 "également se terminer avec un point-virgule."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:124
+#: apt.conf.5.xml:118
 msgid ""
 "The <literal>#clear</literal> command is the only way to delete a list or a "
 "complete scope. Reopening a scope (or using the syntax described below with "
@@ -3592,7 +3592,7 @@ msgstr ""
 "peuvent être remplacés mais seulement effacés."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:132
+#: apt.conf.5.xml:126
 msgid ""
 "All of the APT tools take an -o option which allows an arbitrary "
 "configuration directive to be specified on the command line. The syntax is a "
@@ -3611,7 +3611,7 @@ msgstr ""
 "champ d'action (« scope ») ne peut pas être indiquée à la ligne de commande."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:140
+#: apt.conf.5.xml:134
 msgid ""
 "Note that appending items to a list using <literal>::</literal> only works "
 "for one item per line, and that you should not use it in combination with "
@@ -3643,12 +3643,12 @@ msgstr ""
 "explicitement."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:155
+#: apt.conf.5.xml:149
 msgid "The APT Group"
 msgstr "Le groupe APT"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:156
+#: apt.conf.5.xml:150
 msgid ""
 "This group of options controls general APT behavior as well as holding the "
 "options for all of the tools."
@@ -3657,7 +3657,7 @@ msgstr ""
 "également des options communes à tous les outils."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:161
+#: apt.conf.5.xml:155
 msgid ""
 "System Architecture; sets the architecture to use when fetching files and "
 "parsing package lists. The internal default is the architecture apt was "
@@ -3668,7 +3668,7 @@ msgstr ""
 "valeur interne par défaut est l'architecture pour laquelle APT a été compilé."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:168
+#: apt.conf.5.xml:162
 msgid ""
 "All Architectures the system supports. For instance, CPUs implementing the "
 "<literal>amd64</literal> (also called <literal>x86-64</literal>)  "
@@ -3690,7 +3690,7 @@ msgstr ""
 "sont enregistrées avec <command>dpkg --add-architecture</command>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:182
+#: apt.conf.5.xml:176
 msgid ""
 "List of all build profiles enabled for build-dependency resolution, without "
 "the \"<literal>profile.</literal>\" namespace prefix.  By default this list "
@@ -3699,7 +3699,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:190
+#: apt.conf.5.xml:184
 msgid ""
 "Default release to install packages from if more than one version is "
 "available. Contains release name, codename or release version. Examples: "
@@ -3713,7 +3713,7 @@ msgstr ""
 "&apt-preferences;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:196
+#: apt.conf.5.xml:190
 msgid ""
 "Ignore held packages; this global option causes the problem resolver to "
 "ignore held packages in its decision making."
@@ -3723,7 +3723,7 @@ msgstr ""
 "décision."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:201
+#: apt.conf.5.xml:195
 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 "
@@ -3737,7 +3737,7 @@ msgstr ""
 "direct pour les réinstaller."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:209
+#: apt.conf.5.xml:203
 msgid ""
 "Defaults to on, which will cause APT to install essential and important "
 "packages as soon as possible in an install/upgrade operation, in order to "
@@ -3764,7 +3764,7 @@ msgstr ""
 "dépendances ne sont pas satisfaites."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:221
+#: apt.conf.5.xml:215
 msgid ""
 "The immediate configuration marker is also applied in the potentially "
 "problematic case of circular dependencies, since a dependency with the "
@@ -3793,7 +3793,7 @@ msgstr ""
 "le seul qu'elle permet d'éviter."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:234
+#: apt.conf.5.xml:228
 msgid ""
 "Before a big operation like <literal>dist-upgrade</literal> is run with this "
 "option disabled you should try to explicitly <literal>install</literal> the "
@@ -3811,7 +3811,7 @@ msgstr ""
 "corriger les processus de mise à jour."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:245
+#: apt.conf.5.xml:239
 msgid ""
 "Never enable this option unless you <emphasis>really</emphasis> know what "
 "you are doing. It permits APT to temporarily remove an essential package to "
@@ -3833,7 +3833,7 @@ msgstr ""
 "tous les paquets dont ces paquets dépendent."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:257
+#: apt.conf.5.xml:251
 msgid ""
 "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 of "
@@ -3873,14 +3873,14 @@ msgstr ""
 "l'augmentation automatique de la taille du cache est désactivée."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:273
+#: apt.conf.5.xml:267
 msgid "Defines which packages are considered essential build dependencies."
 msgstr ""
 "Cette option définit les paquets qui sont considérés comme faisant partie "
 "des dépendances essentielles pour la construction de paquets."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:277
+#: apt.conf.5.xml:271
 msgid ""
 "The Get subsection controls the &apt-get; tool; please see its documentation "
 "for more information about the options here."
@@ -3890,7 +3890,7 @@ msgstr ""
 "question."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:282
+#: apt.conf.5.xml:276
 msgid ""
 "The Cache subsection controls the &apt-cache; tool; please see its "
 "documentation for more information about the options here."
@@ -3900,7 +3900,7 @@ msgstr ""
 "options en question."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:287
+#: apt.conf.5.xml:281
 msgid ""
 "The CDROM subsection controls the &apt-cdrom; tool; please see its "
 "documentation for more information about the options here."
@@ -3910,12 +3910,12 @@ msgstr ""
 "options en question."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:293
+#: apt.conf.5.xml:287
 msgid "The Acquire Group"
 msgstr "Le groupe Acquire"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:294
+#: apt.conf.5.xml:288
 msgid ""
 "The <literal>Acquire</literal> group of options controls the download of "
 "packages as well as the various \"acquire methods\" responsible for the "
@@ -3926,7 +3926,7 @@ msgstr ""
 "effectuent ce téléchargement (voir aussi &sources-list;)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:301
+#: apt.conf.5.xml:295
 msgid ""
 "Security related option defaulting to true, as giving a Release file's "
 "validation an expiration date prevents replay attacks over a long timescale, "
@@ -3947,7 +3947,7 @@ msgstr ""
 "alors utilisée."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:314
+#: apt.conf.5.xml:308
 msgid ""
 "Maximum time (in seconds) after its creation (as indicated by the "
 "<literal>Date</literal> header) that the <filename>Release</filename> file "
@@ -3966,7 +3966,7 @@ msgstr ""
 "l'option."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:326
+#: apt.conf.5.xml:320
 msgid ""
 "Minimum time (in seconds) after its creation (as indicated by the "
 "<literal>Date</literal> header) that the <filename>Release</filename> file "
@@ -3986,7 +3986,7 @@ msgstr ""
 "nom de l'option."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:338
+#: apt.conf.5.xml:332
 msgid ""
 "Try to download deltas called <literal>PDiffs</literal> for indexes (like "
 "<filename>Packages</filename> files) instead of downloading whole ones. True "
@@ -3997,7 +3997,7 @@ msgstr ""
 "filename>), plutôt que de les télécharger entièrement. Par défaut à « true »."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:341
+#: apt.conf.5.xml:335
 msgid ""
 "Two sub-options to limit the use of PDiffs are also available: "
 "<literal>FileLimit</literal> can be used to specify a maximum number of "
@@ -4016,7 +4016,7 @@ msgstr ""
 "fichiers de différences."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:351
+#: apt.conf.5.xml:345
 msgid ""
 "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</"
 "literal> or <literal>access</literal> which determines how APT parallelizes "
@@ -4032,7 +4032,7 @@ msgstr ""
 "initiée."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:359
+#: apt.conf.5.xml:353
 msgid ""
 "Number of retries to perform. If this is non-zero APT will retry failed "
 "files the given number of times."
@@ -4042,7 +4042,7 @@ msgstr ""
 "échoué."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:364
+#: apt.conf.5.xml:358
 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."
@@ -4052,7 +4052,7 @@ msgstr ""
 "archives de sources au lieu de les copier.  Par défaut à « true »."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:369
+#: apt.conf.5.xml:363
 msgid ""
 "<literal>http::Proxy</literal> sets the default proxy to use for HTTP URIs. "
 "It is in the standard form of <literal>http://[[user][:pass]@]host[:port]/</"
@@ -4073,7 +4073,7 @@ msgstr ""
 "options de mandataire HTTP."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:377
+#: apt.conf.5.xml:371
 msgid ""
 "Three settings are provided for cache control with HTTP/1.1 compliant proxy "
 "caches.  <literal>No-Cache</literal> tells the proxy not to use its cached "
@@ -4093,7 +4093,7 @@ msgstr ""
 "fichiers .deb très grands."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:387 apt.conf.5.xml:475
+#: apt.conf.5.xml:381 apt.conf.5.xml:469
 msgid ""
 "The option <literal>timeout</literal> sets the timeout timer used by the "
 "method; this value applies to the connection as well as the data timeout."
@@ -4103,7 +4103,7 @@ msgstr ""
 "connexion qu'aux données."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:390
+#: apt.conf.5.xml:384
 msgid ""
 "The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to "
 "enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be beneficial e."
@@ -4123,7 +4123,7 @@ msgstr ""
 "qui ne respectent pas la norme HTTP/1.1."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:397
+#: apt.conf.5.xml:391
 msgid ""
 "<literal>Acquire::http::AllowRedirect</literal> controls whether APT will "
 "follow redirects, which is enabled by default."
@@ -4132,7 +4132,7 @@ msgstr ""
 "suive les redirections. Ce réglage est activé par défaut."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:400
+#: apt.conf.5.xml:394
 #, fuzzy
 #| msgid ""
 #| "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
@@ -4154,7 +4154,7 @@ msgstr ""
 "implicitement le téléchargement simultané depuis plusieurs serveurs."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:407
+#: apt.conf.5.xml:401
 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 "
@@ -4166,7 +4166,7 @@ msgstr ""
 "n'autorisent l'accès qu'aux client s'identifiant de manière spécifique.."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:411
+#: apt.conf.5.xml:405
 msgid ""
 "<literal>Acquire::http::Proxy-Auto-Detect</literal> can be used to specify "
 "an external command to discover the http proxy to use. Apt expects the "
@@ -4180,7 +4180,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:429
+#: apt.conf.5.xml:423
 msgid ""
 "The <literal>Cache-control</literal>, <literal>Timeout</literal>, "
 "<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> and "
@@ -4197,7 +4197,7 @@ msgstr ""
 "literal> n'est pas encore gérée."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:437
+#: apt.conf.5.xml:431
 msgid ""
 "<literal>CaInfo</literal> suboption specifies place of file that holds info "
 "about trusted certificates.  <literal>&lt;host&gt;::CaInfo</literal> is the "
@@ -4230,7 +4230,7 @@ msgstr ""
 "<literal>TLSv1</literal> ou <literal>SSLv3</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:458
+#: apt.conf.5.xml:452
 msgid ""
 "<literal>ftp::Proxy</literal> sets the default proxy to use for FTP URIs.  "
 "It is in the standard form of <literal>ftp://[[user][:pass]@]host[:port]/</"
@@ -4266,7 +4266,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:478
+#: apt.conf.5.xml:472
 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, "
@@ -4283,7 +4283,7 @@ msgstr ""
 "modèle de fichier de configuration)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:485
+#: apt.conf.5.xml:479
 msgid ""
 "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
 "envar> environment variable to an HTTP URL - see the discussion of the http "
@@ -4298,7 +4298,7 @@ msgstr ""
 "efficacité de cette méthode."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:490
+#: apt.conf.5.xml:484
 msgid ""
 "The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
 "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -4314,13 +4314,13 @@ msgstr ""
 "des serveurs FTP ne suivent pas la RFC 2428."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:504
+#: apt.conf.5.xml:498
 #, no-wrap
 msgid "/cdrom/::Mount \"foo\";"
 msgstr "/cdrom/::Mount \"foo\";"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:499
+#: apt.conf.5.xml:493
 msgid ""
 "For URIs using the <literal>cdrom</literal> method, the only configurable "
 "option is the mount point, <literal>cdrom::Mount</literal>, which must be "
@@ -4343,7 +4343,7 @@ msgstr ""
 "<literal>UMount</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:512
+#: apt.conf.5.xml:506
 msgid ""
 "For GPGV URIs the only configurable option is <literal>gpgv::Options</"
 "literal>, which passes additional parameters to gpgv."
@@ -4352,13 +4352,13 @@ msgstr ""
 "permet de passer des paramètres à gpgv"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:523
+#: apt.conf.5.xml:517
 #, no-wrap
 msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
 msgstr "Acquire::CompressionTypes::<replaceable>ExtensionFichier</replaceable> \"<replaceable>NomMethode</replaceable>\";"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:518
+#: apt.conf.5.xml:512
 msgid ""
 "List of compression types which are understood by the acquire methods.  "
 "Files like <filename>Packages</filename> can be available in various "
@@ -4378,19 +4378,19 @@ msgstr ""
 "type=\"synopsis\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:528
+#: apt.conf.5.xml:522
 #, no-wrap
 msgid "Acquire::CompressionTypes::Order:: \"gz\";"
 msgstr "Acquire::CompressionTypes::Order:: \"gz\";"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:531
+#: apt.conf.5.xml:525
 #, no-wrap
 msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
 msgstr "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:524
+#: apt.conf.5.xml:518
 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 "
@@ -4422,13 +4422,13 @@ msgstr ""
 "<literal>bz2</literal> à liste car il sera ajouté automatiquement."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:538
+#: apt.conf.5.xml:532
 #, no-wrap
 msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
 msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:533
+#: apt.conf.5.xml:527
 msgid ""
 "Note that the <literal>Dir::Bin::<replaceable>Methodname</replaceable></"
 "literal> will be checked at run time. If this option has been set, the "
@@ -4455,7 +4455,7 @@ msgstr ""
 "question."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:543
+#: apt.conf.5.xml:537
 msgid ""
 "The special type <literal>uncompressed</literal> can be used to give "
 "uncompressed files a preference, but note that most archives don't provide "
@@ -4467,7 +4467,7 @@ msgstr ""
 "surtout destiné aux miroirs locaux."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:550
+#: apt.conf.5.xml:544
 msgid ""
 "When downloading <literal>gzip</literal> compressed indexes (Packages, "
 "Sources, or Translations), keep them gzip compressed locally instead of "
@@ -4482,7 +4482,7 @@ msgstr ""
 "(« False »)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:558
+#: apt.conf.5.xml:552
 msgid ""
 "The Languages subsection controls which <filename>Translation</filename> "
 "files are downloaded and in which order APT tries to display the description-"
@@ -4502,13 +4502,13 @@ msgstr ""
 "langues étant particulièrement rares."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><programlisting>
-#: apt.conf.5.xml:575
+#: apt.conf.5.xml:569
 #, no-wrap
 msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
 msgstr "Acquire::Languages { \"environment\"; \"fr\"; \"en\"; \"none\"; \"de\"; };"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:563
+#: apt.conf.5.xml:557
 msgid ""
 "The default list includes \"environment\" and \"en\". "
 "\"<literal>environment</literal>\" has a special meaning here: it will be "
@@ -4548,7 +4548,7 @@ msgstr ""
 "alors « de, fr, en ». <placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:576
+#: apt.conf.5.xml:570
 msgid ""
 "Note: To prevent problems resulting from APT being executed in different "
 "environments (e.g. by different users or by other programs) all Translation "
@@ -4562,22 +4562,22 @@ msgstr ""
 "(après un « <literal>none</literal> » implicite)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:585
+#: apt.conf.5.xml:579
 msgid "When downloading, force to use only the IPv4 protocol."
 msgstr "Utilisation imposée du protocole IPv4 lors des téléchargements."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:591
+#: apt.conf.5.xml:585
 msgid "When downloading, force to use only the IPv6 protocol."
 msgstr "Utilisation imposée du protocole IPv6 lors des téléchargements."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:598
+#: apt.conf.5.xml:592
 msgid "Directories"
 msgstr "Les répertoires"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:600
+#: apt.conf.5.xml:594
 msgid ""
 "The <literal>Dir::State</literal> section has directories that pertain to "
 "local state information. <literal>lists</literal> is the directory to place "
@@ -4597,16 +4597,28 @@ msgstr ""
 "<filename>./</filename>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:607
+#: apt.conf.5.xml:601
+#, fuzzy
+#| msgid ""
+#| "<literal>Dir::Cache</literal> contains locations pertaining to local "
+#| "cache information, such as the two package caches <literal>srcpkgcache</"
+#| "literal> and <literal>pkgcache</literal> as well as the location to place "
+#| "downloaded archives, <literal>Dir::Cache::archives</literal>. Generation "
+#| "of caches can be turned off by setting their names to the empty string. "
+#| "This will slow down startup but save disk space. It is probably "
+#| "preferable to turn off the pkgcache rather than the srcpkgcache. Like "
+#| "<literal>Dir::State</literal> the default directory is contained in "
+#| "<literal>Dir::Cache</literal>"
 msgid ""
 "<literal>Dir::Cache</literal> contains locations pertaining to local cache "
 "information, such as the two package caches <literal>srcpkgcache</literal> "
 "and <literal>pkgcache</literal> as well as the location to place downloaded "
 "archives, <literal>Dir::Cache::archives</literal>. Generation of caches can "
-"be turned off by setting their names to the empty string. This will slow "
+"be turned off by setting <literal>pkgcache</literal> or "
+"<literal>srcpkgcache</literal> to <literal>\"\"</literal>.  This will slow "
 "down startup but save disk space. It is probably preferable to turn off the "
-"pkgcache rather than the srcpkgcache. Like <literal>Dir::State</literal> the "
-"default directory is contained in <literal>Dir::Cache</literal>"
+"pkgcache rather than the srcpkgcache.  Like <literal>Dir::State</literal> "
+"the default directory is contained in <literal>Dir::Cache</literal>"
 msgstr ""
 "<literal>Dir::Cache</literal> contient les emplacements qui renseignent sur "
 "le cache local : par exemple, les deux caches de paquets "
@@ -4620,7 +4632,7 @@ msgstr ""
 "Cache</literal>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:616
+#: apt.conf.5.xml:611
 msgid ""
 "<literal>Dir::Etc</literal> contains the location of configuration files, "
 "<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -4635,7 +4647,7 @@ msgstr ""
 "fichier de configuration indiqué par la variable <envar>APT_CONFIG</envar>)."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:622
+#: apt.conf.5.xml:617
 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 "
@@ -4646,7 +4658,7 @@ msgstr ""
 "configuration est chargé."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:626
+#: apt.conf.5.xml:621
 msgid ""
 "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
 "Bin::Methods</literal> specifies the location of the method handlers and "
@@ -4664,7 +4676,7 @@ msgstr ""
 "programmes correspondants."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:634
+#: apt.conf.5.xml:629
 msgid ""
 "The configuration item <literal>RootDir</literal> has a special meaning.  If "
 "set, all paths in <literal>Dir::</literal> will be relative to "
@@ -4686,7 +4698,7 @@ msgstr ""
 "staging/var/lib/dpkg/status</filename>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:647
+#: apt.conf.5.xml:642
 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 "
@@ -4704,12 +4716,12 @@ msgstr ""
 "est possible d'utiliser la syntaxe des expressions rationnelles."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:656
+#: apt.conf.5.xml:651
 msgid "APT in DSelect"
 msgstr "APT et DSelect"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:658
+#: apt.conf.5.xml:653
 msgid ""
 "When APT is used as a &dselect; method several configuration directives "
 "control the default behavior. These are in the <literal>DSelect</literal> "
@@ -4720,7 +4732,7 @@ msgstr ""
 "<literal>DSelect</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:663
+#: apt.conf.5.xml:658
 msgid ""
 "Cache Clean mode; this value may be one of <literal>always</literal>, "
 "<literal>prompt</literal>, <literal>auto</literal>, <literal>pre-auto</"
@@ -4743,7 +4755,7 @@ msgstr ""
 "avant de récupérer de nouveaux paquets."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:677
+#: apt.conf.5.xml:672
 msgid ""
 "The contents of this variable are passed to &apt-get; as command line "
 "options when it is run for the install phase."
@@ -4752,7 +4764,7 @@ msgstr ""
 "&apt-get; lors de la phase d'installation."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:682
+#: apt.conf.5.xml:677
 msgid ""
 "The contents of this variable are passed to &apt-get; as command line "
 "options when it is run for the update phase."
@@ -4761,7 +4773,7 @@ msgstr ""
 "&apt-get; lors de la phase de mise à jour."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:687
+#: apt.conf.5.xml:682
 msgid ""
 "If true the [U]pdate operation in &dselect; will always prompt to continue.  "
 "The default is to prompt only on error."
@@ -4771,12 +4783,12 @@ msgstr ""
 "d'erreur que l'on propose à l'utilisateur d'intervenir."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:693
+#: apt.conf.5.xml:688
 msgid "How APT calls &dpkg;"
 msgstr "Méthode d'appel de &dpkg; par APT"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:694
+#: apt.conf.5.xml:689
 msgid ""
 "Several configuration directives control how APT invokes &dpkg;. These are "
 "in the <literal>DPkg</literal> section."
@@ -4785,7 +4797,7 @@ msgstr ""
 "&dpkg; : elles figurent dans la section <literal>DPkg</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:699
+#: apt.conf.5.xml:694
 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 "
@@ -4796,7 +4808,7 @@ msgstr ""
 "est passé comme un seul paramètre à &dpkg;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:705
+#: apt.conf.5.xml:700
 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 "
@@ -4809,7 +4821,7 @@ msgstr ""
 "<filename>/bin/sh</filename> : APT s'arrête dès que l'une d'elles échoue."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:712
+#: apt.conf.5.xml:707
 #, fuzzy
 #| msgid ""
 #| "This is a list of shell commands to run before invoking &dpkg;. Like "
@@ -4833,7 +4845,7 @@ msgstr ""
 "qu'il va installer, à raison d'un par ligne."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:719
+#: apt.conf.5.xml:714
 #, fuzzy
 #| msgid ""
 #| "Version 2 of this protocol dumps more information, including the protocol "
@@ -4855,7 +4867,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:724
+#: apt.conf.5.xml:719
 msgid ""
 "The version of the protocol to be used for the command "
 "<literal><replaceable>cmd</replaceable></literal> can be chosen by setting "
@@ -4866,7 +4878,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:731
+#: apt.conf.5.xml:726
 msgid ""
 "The file descriptor to be used to send the information can be requested with "
 "<literal>DPkg::Tools::options::<replaceable>cmd</replaceable>::InfoFD</"
@@ -4877,7 +4889,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:741
+#: apt.conf.5.xml:736
 msgid ""
 "APT chdirs to this directory before invoking &dpkg;, the default is "
 "<filename>/</filename>."
@@ -4886,7 +4898,7 @@ msgstr ""
 "le répertoire <filename>/</filename>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:746
+#: apt.conf.5.xml:741
 msgid ""
 "These options are passed to &dpkg-buildpackage; when compiling packages; the "
 "default is to disable signing and produce all binaries."
@@ -4896,14 +4908,14 @@ msgstr ""
 "créés."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:751
+#: apt.conf.5.xml:746
 msgid "dpkg trigger usage (and related options)"
 msgstr ""
 "utilisation des actions différées (« triggers ») de dpkg (et options "
 "associées)"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:752
+#: apt.conf.5.xml:747
 msgid ""
 "APT can call &dpkg; in such a way as to let it make aggressive use of "
 "triggers over multiple calls of &dpkg;. Without further options &dpkg; will "
@@ -4930,7 +4942,7 @@ msgstr ""
 "pendant la configuration des paquets."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:767
+#: apt.conf.5.xml:762
 #, no-wrap
 msgid ""
 "DPkg::NoTriggers \"true\";\n"
@@ -4944,7 +4956,7 @@ msgstr ""
 "DPkg::TriggersPending \"true\";"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:761
+#: apt.conf.5.xml:756
 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 "
@@ -4968,7 +4980,7 @@ msgstr ""
 "<placeholder type=\"literallayout\" id=\"0\"/>."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:774
+#: apt.conf.5.xml:769
 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 "
@@ -4991,7 +5003,7 @@ msgstr ""
 "options « unpack » et « remove »."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:782
+#: apt.conf.5.xml:777
 msgid ""
 "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
 "and \"<literal>no</literal>\".  The default value is \"<literal>all</literal>"
@@ -5021,7 +5033,7 @@ msgstr ""
 "configuré et donc éventuellement non amorçable."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:797
+#: apt.conf.5.xml:792
 msgid ""
 "If this option is set APT will call <command>dpkg --configure --pending</"
 "command> to let &dpkg; handle all required configurations and triggers. This "
@@ -5040,7 +5052,7 @@ msgstr ""
 "peut conserver l'option active."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:804
+#: apt.conf.5.xml:799
 msgid ""
 "Useful for the <literal>smart</literal> configuration as a package which has "
 "pending triggers is not considered as <literal>installed</literal>, and "
@@ -5058,7 +5070,7 @@ msgstr ""
 "celles concernant le paquet en cours de traitement."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:817
+#: apt.conf.5.xml:812
 #, no-wrap
 msgid ""
 "OrderList::Score {\n"
@@ -5076,7 +5088,7 @@ msgstr ""
 "};"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:810
+#: apt.conf.5.xml:805
 msgid ""
 "Essential packages (and their dependencies) should be configured immediately "
 "after unpacking. It is a good idea to do this quite early in the upgrade "
@@ -5102,12 +5114,12 @@ msgstr ""
 "id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:830
+#: apt.conf.5.xml:825
 msgid "Periodic and Archives options"
 msgstr "Options « Periodic » et « Archive »"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:831
+#: apt.conf.5.xml:826
 msgid ""
 "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
 "of options configure behavior of apt periodic updates, which is done by the "
@@ -5119,12 +5131,12 @@ msgstr ""
 "script <literal>/etc/cron.daily/apt</literal>, lancé quotidiennement."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:839
+#: apt.conf.5.xml:834
 msgid "Debug options"
 msgstr "Les options de débogage"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:841
+#: apt.conf.5.xml:836
 msgid ""
 "Enabling options in the <literal>Debug::</literal> section will cause "
 "debugging information to be sent to the standard error stream of the program "
@@ -5142,7 +5154,7 @@ msgstr ""
 "peuvent tout de même être utiles :"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:852
+#: apt.conf.5.xml:847
 msgid ""
 "<literal>Debug::pkgProblemResolver</literal> enables output about the "
 "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -5153,7 +5165,7 @@ msgstr ""
 "upgrade, upgrade, install, remove et purge</literal>."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:860
+#: apt.conf.5.xml:855
 msgid ""
 "<literal>Debug::NoLocking</literal> disables all file locking.  This can be "
 "used to run some operations (for instance, <literal>apt-get -s install</"
@@ -5165,7 +5177,7 @@ msgstr ""
 "superutilisateur."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:869
+#: apt.conf.5.xml:864
 msgid ""
 "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
 "time that <literal>apt</literal> invokes &dpkg;."
@@ -5177,7 +5189,7 @@ 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:877
+#: apt.conf.5.xml:872
 msgid ""
 "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
 "in CD-ROM IDs."
@@ -5186,12 +5198,12 @@ msgstr ""
 "type statfs dans les identifiants de CD."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:887
+#: apt.conf.5.xml:882
 msgid "A full list of debugging options to apt follows."
 msgstr "Liste complète des options de débogage de APT :"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:896
+#: apt.conf.5.xml:891
 msgid ""
 "Print information related to accessing <literal>cdrom://</literal> sources."
 msgstr ""
@@ -5199,24 +5211,24 @@ msgstr ""
 "literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:907
+#: apt.conf.5.xml:902
 msgid "Print information related to downloading packages using FTP."
 msgstr ""
 "Affiche les informations concernant le téléchargement de paquets par FTP."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:918
+#: apt.conf.5.xml:913
 msgid "Print information related to downloading packages using HTTP."
 msgstr ""
 "Affiche les informations concernant le téléchargement de paquets par HTTP."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:929
+#: apt.conf.5.xml:924
 msgid "Print information related to downloading packages using HTTPS."
 msgstr "Print information related to downloading packages using HTTPS."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:940
+#: apt.conf.5.xml:935
 msgid ""
 "Print information related to verifying cryptographic signatures using "
 "<literal>gpg</literal>."
@@ -5225,7 +5237,7 @@ msgstr ""
 "cryptographiques avec <literal>gpg</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:951
+#: apt.conf.5.xml:946
 msgid ""
 "Output information about the process of accessing collections of packages "
 "stored on CD-ROMs."
@@ -5234,14 +5246,14 @@ msgstr ""
 "stockées sur CD."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:961
+#: apt.conf.5.xml:956
 msgid "Describes the process of resolving build-dependencies in &apt-get;."
 msgstr ""
 "Décrit le processus de résolution des dépendances pour la construction de "
 "paquets source ( « build-dependencies » ) par &apt-get;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:971
+#: apt.conf.5.xml:966
 msgid ""
 "Output each cryptographic hash that is generated by the <literal>apt</"
 "literal> libraries."
@@ -5250,7 +5262,7 @@ msgstr ""
 "librairies d'<literal>apt</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:981
+#: apt.conf.5.xml:976
 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 "
@@ -5261,7 +5273,7 @@ msgstr ""
 "utilisés sur le système de fichier du CD."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:992
+#: apt.conf.5.xml:987
 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."
@@ -5271,14 +5283,14 @@ msgstr ""
 "temps."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1004
+#: apt.conf.5.xml:999
 msgid "Log when items are added to or removed from the global download queue."
 msgstr ""
 "Trace les ajouts et suppressions d'éléments de la queue globale de "
 "téléchargement."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1014
+#: apt.conf.5.xml:1009
 msgid ""
 "Output status messages and errors related to verifying checksums and "
 "cryptographic signatures of downloaded files."
@@ -5288,7 +5300,7 @@ msgstr ""
 "éventuelles."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1024
+#: apt.conf.5.xml:1019
 msgid ""
 "Output information about downloading and applying package index list diffs, "
 "and errors relating to package index list diffs."
@@ -5298,7 +5310,7 @@ msgstr ""
 "éventuelles."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1036
+#: apt.conf.5.xml:1031
 msgid ""
 "Output information related to patching apt package lists when downloading "
 "index diffs instead of full indices."
@@ -5308,7 +5320,7 @@ msgstr ""
 "place des fichiers complets."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1047
+#: apt.conf.5.xml:1042
 msgid ""
 "Log all interactions with the sub-processes that actually perform downloads."
 msgstr ""
@@ -5316,7 +5328,7 @@ msgstr ""
 "effectivement des téléchargements."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1058
+#: apt.conf.5.xml:1053
 msgid ""
 "Log events related to the automatically-installed status of packages and to "
 "the removal of unused packages."
@@ -5325,7 +5337,7 @@ msgstr ""
 "automatiquement, et la suppression des paquets inutiles."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1068
+#: apt.conf.5.xml:1063
 msgid ""
 "Generate debug messages describing which packages are being automatically "
 "installed to resolve dependencies.  This corresponds to the initial auto-"
@@ -5340,7 +5352,7 @@ msgstr ""
 "de APT ; voir <literal>Debug::pkgProblemResolver</literal> pour ce dernier."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1082
+#: apt.conf.5.xml:1077
 msgid ""
 "Generate debug messages describing which packages are marked as keep/install/"
 "remove while the ProblemResolver does his work.  Each addition or deletion "
@@ -5376,7 +5388,7 @@ msgstr ""
 "de APT ; voir <literal>Debug::pkgProblemResolver</literal> pour ce dernier."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1103
+#: apt.conf.5.xml:1098
 msgid ""
 "When invoking &dpkg;, output the precise command line with which it is being "
 "invoked, with arguments separated by a single space character."
@@ -5385,7 +5397,7 @@ msgstr ""
 "paramètres sont séparés par des espaces."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1114
+#: apt.conf.5.xml:1109
 msgid ""
 "Output all the data received from &dpkg; on the status file descriptor and "
 "any errors encountered while parsing it."
@@ -5395,7 +5407,7 @@ msgstr ""
 "fichier."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1125
+#: apt.conf.5.xml:1120
 msgid ""
 "Generate a trace of the algorithm that decides the order in which "
 "<literal>apt</literal> should pass packages to &dpkg;."
@@ -5404,18 +5416,18 @@ msgstr ""
 "<literal>apt</literal> passe les paquets à &dpkg;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1137
+#: apt.conf.5.xml:1132
 msgid ""
 "Output status messages tracing the steps performed when invoking &dpkg;."
 msgstr "Affiche le détail des opérations liées à l'invocation de &dpkg;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1148
+#: apt.conf.5.xml:1143
 msgid "Output the priority of each package list on startup."
 msgstr "Affiche, au lancement, la priorité de chaque liste de paquets."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1158
+#: apt.conf.5.xml:1153
 msgid ""
 "Trace the execution of the dependency resolver (this applies only to what "
 "happens when a complex dependency problem is encountered)."
@@ -5424,7 +5436,7 @@ msgstr ""
 "concerne que les cas où un problème de dépendances complexe se présente)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1169
+#: apt.conf.5.xml:1164
 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 "
@@ -5435,7 +5447,7 @@ msgstr ""
 "est décrite dans <literal>Debug::pkgDepCache::Marker</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1181
+#: apt.conf.5.xml:1176
 msgid ""
 "Print information about the vendors read from <filename>/etc/apt/vendors."
 "list</filename>."
@@ -5444,7 +5456,7 @@ msgstr ""
 "list</filename>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1191
+#: apt.conf.5.xml:1186
 msgid ""
 "Display the external commands that are called by apt hooks.  This includes e."
 "g. the config options <literal>DPkg::{Pre,Post}-Invoke</literal> or "
@@ -5452,13 +5464,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1215 apt_preferences.5.xml:547 sources.list.5.xml:239
-#: apt-ftparchive.1.xml:598
+#: apt.conf.5.xml:1210 apt_preferences.5.xml:541 sources.list.5.xml:233
+#: apt-ftparchive.1.xml:592
 msgid "Examples"
 msgstr "Exemples"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1216
+#: apt.conf.5.xml:1211
 msgid ""
 "&configureindex; is a configuration file showing example values for all "
 "possible options."
@@ -5468,17 +5480,17 @@ msgstr ""
 
 #.  ? reading apt.conf 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1228
+#: apt.conf.5.xml:1223
 msgid "&apt-cache;, &apt-config;, &apt-preferences;."
 msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt_preferences.5.xml:34
+#: apt_preferences.5.xml:28
 msgid "Preference control file for APT"
 msgstr "Fichier de contrôle des préférences pour APT"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:39
+#: apt_preferences.5.xml:33
 msgid ""
 "The APT preferences file <filename>/etc/apt/preferences</filename> and the "
 "fragment files in the <filename>/etc/apt/preferences.d/</filename> folder "
@@ -5491,7 +5503,7 @@ msgstr ""
 "l'on veut installer."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:44
+#: apt_preferences.5.xml:38
 msgid ""
 "Several versions of a package may be available for installation when the "
 "&sources-list; file contains references to more than one distribution (for "
@@ -5513,7 +5525,7 @@ msgstr ""
 "veut installer."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:54
+#: apt_preferences.5.xml:48
 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 "
@@ -5529,7 +5541,7 @@ msgstr ""
 "le choix des exemplaires, seulement sur le choix de la version."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:61
+#: apt_preferences.5.xml:55
 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 "
@@ -5550,7 +5562,7 @@ msgstr ""
 "mélangées sans une bonne compréhension des paragraphes qui suivent."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:72
+#: apt_preferences.5.xml:66
 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 "
@@ -5572,24 +5584,24 @@ msgstr ""
 "étant, eux, ignorés silencieusemennt)."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:81
+#: apt_preferences.5.xml:75
 msgid "APT's Default Priority Assignments"
 msgstr "Priorités affectées par défaut"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:96
+#: apt_preferences.5.xml:90
 #, no-wrap
 msgid "<command>apt-get install -t testing <replaceable>some-package</replaceable></command>\n"
 msgstr "<command>apt-get install -t testing <replaceable>paquet</replaceable></command>\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:99
+#: apt_preferences.5.xml:93
 #, no-wrap
 msgid "APT::Default-Release \"stable\";\n"
 msgstr "APT::Default-Release \"stable\";\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:83
+#: apt_preferences.5.xml:77
 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 "
@@ -5614,7 +5626,7 @@ msgstr ""
 "\"programlisting\" id=\"0\"/> <placeholder type=\"programlisting\" id=\"1\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:103
+#: apt_preferences.5.xml:97
 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:"
@@ -5623,12 +5635,12 @@ msgstr ""
 "suivant pour déterminer la priorité des versions d'un paquet :"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:108
+#: apt_preferences.5.xml:102
 msgid "priority 1"
 msgstr "priorité 1"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:109
+#: apt_preferences.5.xml:103
 msgid ""
 "to the versions coming from archives which in their <filename>Release</"
 "filename> files are marked as \"NotAutomatic: yes\" but <emphasis>not</"
@@ -5641,12 +5653,12 @@ msgstr ""
 "<literal>experimental</literal> de Debian."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:115
+#: apt_preferences.5.xml:109
 msgid "priority 100"
 msgstr "une priorité égale à 100"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:116
+#: apt_preferences.5.xml:110
 msgid ""
 "to the version that is already installed (if any) and to the versions coming "
 "from archives which in their <filename>Release</filename> files are marked "
@@ -5659,12 +5671,12 @@ msgstr ""
 "depuis <literal>squeeze-backports</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:123
+#: apt_preferences.5.xml:117
 msgid "priority 500"
 msgstr "une priorité égale à 500"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:124
+#: apt_preferences.5.xml:118
 msgid ""
 "to the versions that are not installed and do not belong to the target "
 "release."
@@ -5673,12 +5685,12 @@ msgstr ""
 "pas à la distribution par défaut."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:128
+#: apt_preferences.5.xml:122
 msgid "priority 990"
 msgstr "une priorité égale à 990"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:129
+#: apt_preferences.5.xml:123
 msgid ""
 "to the versions that are not installed and belong to the target release."
 msgstr ""
@@ -5686,7 +5698,7 @@ msgstr ""
 "la distribution par défaut."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:134
+#: apt_preferences.5.xml:128
 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 "
@@ -5704,7 +5716,7 @@ msgstr ""
 "« ButAutomaticUpgrades: yes »."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:141
+#: apt_preferences.5.xml:135
 msgid ""
 "APT then applies the following rules, listed in order of precedence, to "
 "determine which version of a package to install."
@@ -5713,7 +5725,7 @@ msgstr ""
 "qu'il faut installer (par ordre de priorité) :"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:144
+#: apt_preferences.5.xml:138
 msgid ""
 "Never downgrade unless the priority of an available version exceeds 1000.  "
 "(\"Downgrading\" is installing a less recent version of a package in place "
@@ -5729,12 +5741,12 @@ msgstr ""
 "arrière."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:150
+#: apt_preferences.5.xml:144
 msgid "Install the highest priority version."
 msgstr "Installer la version qui possède la priorité la plus haute."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:151
+#: apt_preferences.5.xml:145
 msgid ""
 "If two or more versions have the same priority, install the most recent one "
 "(that is, the one with the higher version number)."
@@ -5743,7 +5755,7 @@ msgstr ""
 "plus récente (c.-à-d. celle dont le numéro de version est le plus grand)."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:154
+#: apt_preferences.5.xml:148
 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 <literal>--reinstall</"
@@ -5755,7 +5767,7 @@ msgstr ""
 "qui n'est pas installée."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:160
+#: apt_preferences.5.xml:154
 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 "
@@ -5770,7 +5782,7 @@ msgstr ""
 "replaceable></command> ou <command>apt-get dist-upgrade</command>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:167
+#: apt_preferences.5.xml:161
 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 "
@@ -5783,7 +5795,7 @@ msgstr ""
 "<command>apt-get upgrade</command> ne provoquent pas de retour en arrière."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:172
+#: apt_preferences.5.xml:166
 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 "
@@ -5802,12 +5814,12 @@ msgstr ""
 "priorité que celle de la version installée."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:181
+#: apt_preferences.5.xml:175
 msgid "The Effect of APT Preferences"
 msgstr "Conséquences des préférences"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:183
+#: apt_preferences.5.xml:177
 msgid ""
 "The APT preferences file allows the system administrator to control the "
 "assignment of priorities.  The file consists of one or more multi-line "
@@ -5820,7 +5832,7 @@ msgstr ""
 "formes, une forme particulière et une forme générale."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:189
+#: apt_preferences.5.xml:183
 msgid ""
 "The specific form assigns a priority (a \"Pin-Priority\") to one or more "
 "specified packages with a specified version or version range.  For example, "
@@ -5836,7 +5848,7 @@ msgstr ""
 "dont le numéro de version commence par <literal>&good-perl;</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:196
+#: apt_preferences.5.xml:190
 #, no-wrap
 msgid ""
 "Package: perl\n"
@@ -5848,7 +5860,7 @@ msgstr ""
 "Pin-Priority: 1001\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:202
+#: apt_preferences.5.xml:196
 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 "
@@ -5863,7 +5875,7 @@ msgstr ""
 "un nom complètement qualifié."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:208
+#: apt_preferences.5.xml:202
 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 "
@@ -5874,7 +5886,7 @@ msgstr ""
 "priorité haute à toutes les versions disponibles dans le site local."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:213
+#: apt_preferences.5.xml:207
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -5886,7 +5898,7 @@ msgstr ""
 "Pin-Priority: 999\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:218
+#: apt_preferences.5.xml:212
 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 "
@@ -5899,7 +5911,7 @@ msgstr ""
 "serveur identifié par l' nom d'hôte « ftp.de.debian.org »."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:222
+#: apt_preferences.5.xml:216
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -5911,7 +5923,7 @@ msgstr ""
 "Pin-Priority: 999\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:226
+#: apt_preferences.5.xml:220
 msgid ""
 "This should <emphasis>not</emphasis> be confused with the Origin of a "
 "distribution as specified in a <filename>Release</filename> file.  What "
@@ -5926,7 +5938,7 @@ msgstr ""
 "mais le nom d'un auteur ou d'un distributeur, comme « Debian » ou « Ximian »."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:231
+#: apt_preferences.5.xml:225
 msgid ""
 "The following record assigns a low priority to all package versions "
 "belonging to any distribution whose Archive name is \"<literal>unstable</"
@@ -5937,7 +5949,7 @@ msgstr ""
 "<literal>unstable</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:235
+#: apt_preferences.5.xml:229
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -5949,7 +5961,7 @@ msgstr ""
 "Pin-Priority: 50\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:240
+#: apt_preferences.5.xml:234
 msgid ""
 "The following record assigns a high priority to all package versions "
 "belonging to any distribution whose Codename is \"<literal>&testing-codename;"
@@ -5960,7 +5972,7 @@ msgstr ""
 "<literal>&testing-codename;</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:244
+#: apt_preferences.5.xml:238
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -5972,7 +5984,7 @@ msgstr ""
 "Pin-Priority: 900\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:249
+#: apt_preferences.5.xml:243
 msgid ""
 "The following record assigns a high priority to all package versions "
 "belonging to any release whose Archive name is \"<literal>stable</literal>\" "
@@ -5984,7 +5996,7 @@ msgstr ""
 "<literal>&stable-version;</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:254
+#: apt_preferences.5.xml:248
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -5996,12 +6008,12 @@ msgstr ""
 "Pin-Priority: 500\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:264
+#: apt_preferences.5.xml:258
 msgid "Regular expressions and &glob; syntax"
 msgstr "Expressions régulières et syntaxe &glob;"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:266
+#: apt_preferences.5.xml:260
 msgid ""
 "APT also supports pinning by &glob; expressions, and regular expressions "
 "surrounded by slashes. For example, the following example assigns the "
@@ -6017,7 +6029,7 @@ msgstr ""
 "POSIX étendue, entourée de barres obliques)."
 
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:275
+#: apt_preferences.5.xml:269
 #, no-wrap
 msgid ""
 "Package: gnome* /kde/\n"
@@ -6029,7 +6041,7 @@ msgstr ""
 "Pin-Priority: 500\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:281
+#: apt_preferences.5.xml:275
 msgid ""
 "The rule for those expressions is that they can occur anywhere where a "
 "string can occur. Thus, the following pin assigns the priority 990 to all "
@@ -6041,7 +6053,7 @@ msgstr ""
 "par &ubuntu-codename;."
 
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:287
+#: apt_preferences.5.xml:281
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -6053,7 +6065,7 @@ msgstr ""
 "Pin-Priority: 990\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:293
+#: apt_preferences.5.xml:287
 msgid ""
 "If a regular expression occurs in a <literal>Package</literal> field, the "
 "behavior is the same as if this regular expression were replaced with a list "
@@ -6072,12 +6084,12 @@ msgstr ""
 "expression &glob; en soi."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:309
+#: apt_preferences.5.xml:303
 msgid "How APT Interprets Priorities"
 msgstr "Méthode d'interprétation des priorités par APT"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:312
+#: apt_preferences.5.xml:306
 msgid ""
 "Priorities (P) assigned in the APT preferences file must be positive or "
 "negative integers.  They are interpreted as follows (roughly speaking):"
@@ -6086,12 +6098,12 @@ msgstr ""
 "entiers positifs ou négatifs. Ils sont interprétés à peu près comme suit :"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:317
+#: apt_preferences.5.xml:311
 msgid "P &gt;= 1000"
 msgstr "P &gt;= 1000"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:318
+#: apt_preferences.5.xml:312
 msgid ""
 "causes a version to be installed even if this constitutes a downgrade of the "
 "package"
@@ -6100,12 +6112,12 @@ msgstr ""
 "retour en arrière."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:322
+#: apt_preferences.5.xml:316
 msgid "990 &lt;= P &lt; 1000"
 msgstr "990 &lt;= P &lt; 1000"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:323
+#: apt_preferences.5.xml:317
 msgid ""
 "causes a version to be installed even if it does not come from the target "
 "release, unless the installed version is more recent"
@@ -6115,12 +6127,12 @@ msgstr ""
 "plus récente."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:328
+#: apt_preferences.5.xml:322
 msgid "500 &lt;= P &lt; 990"
 msgstr "500 &lt;= P &lt; 990"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:329
+#: apt_preferences.5.xml:323
 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"
@@ -6129,12 +6141,12 @@ msgstr ""
 "distribution par défaut ou si la version installée est plus récente."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:334
+#: apt_preferences.5.xml:328
 msgid "100 &lt;= P &lt; 500"
 msgstr "100 &lt;= P &lt; 500"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:335
+#: apt_preferences.5.xml:329
 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"
@@ -6143,29 +6155,29 @@ msgstr ""
 "autre distribution ou si la version installée est plus récente."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:340
+#: apt_preferences.5.xml:334
 msgid "0 &lt; P &lt; 100"
 msgstr "0 &lt; P &lt; 100"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:341
+#: apt_preferences.5.xml:335
 msgid ""
 "causes a version to be installed only if there is no installed version of "
 "the package"
 msgstr "la version sera installée si aucune version du paquet n'est installée."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:345
+#: apt_preferences.5.xml:339
 msgid "P &lt; 0"
 msgstr "P &lt; 0"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:346
+#: apt_preferences.5.xml:340
 msgid "prevents the version from being installed"
 msgstr "cette priorité empêche l'installation de la version."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:351
+#: apt_preferences.5.xml:345
 msgid ""
 "If any specific-form records match an available package version then the "
 "first such record determines the priority of the package version.  Failing "
@@ -6179,7 +6191,7 @@ msgstr ""
 "trouvée détermine la priorité."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:357
+#: apt_preferences.5.xml:351
 msgid ""
 "For example, suppose the APT preferences file contains the three records "
 "presented earlier:"
@@ -6188,7 +6200,7 @@ msgstr ""
 "entrées décrites ci-dessous :"
 
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:361
+#: apt_preferences.5.xml:355
 #, no-wrap
 msgid ""
 "Package: perl\n"
@@ -6216,12 +6228,12 @@ msgstr ""
 "Pin-Priority: 50\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:374
+#: apt_preferences.5.xml:368
 msgid "Then:"
 msgstr "Alors :"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:376
+#: apt_preferences.5.xml:370
 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 "
@@ -6236,7 +6248,7 @@ msgstr ""
 "arrière."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:381
+#: apt_preferences.5.xml:375
 msgid ""
 "A version of any package other than <literal>perl</literal> that is "
 "available from the local system has priority over other versions, even "
@@ -6247,7 +6259,7 @@ msgstr ""
 "appartenant à la distribution par défaut."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:385
+#: apt_preferences.5.xml:379
 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 <literal>unstable</"
@@ -6260,13 +6272,13 @@ msgstr ""
 "paquet n'est déjà installée."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:395
+#: apt_preferences.5.xml:389
 msgid "Determination of Package Version and Distribution Properties"
 msgstr ""
 "Détermination de la version des paquets et des propriétés des distributions"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:397
+#: apt_preferences.5.xml:391
 msgid ""
 "The locations listed in the &sources-list; file should provide "
 "<filename>Packages</filename> and <filename>Release</filename> files to "
@@ -6277,7 +6289,7 @@ msgstr ""
 "décrivent les paquets disponibles à cet endroit."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:401
+#: apt_preferences.5.xml:395
 msgid ""
 "The <filename>Packages</filename> file is normally found in the directory "
 "<filename>.../dists/<replaceable>dist-name</replaceable>/"
@@ -6296,27 +6308,27 @@ msgstr ""
 "sont pertinentes pour la détermination des priorités :"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:409
+#: apt_preferences.5.xml:403
 msgid "the <literal>Package:</literal> line"
 msgstr "la ligne <literal>Package:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:410
+#: apt_preferences.5.xml:404
 msgid "gives the package name"
 msgstr "donne le nom du paquet"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:413 apt_preferences.5.xml:463
+#: apt_preferences.5.xml:407 apt_preferences.5.xml:457
 msgid "the <literal>Version:</literal> line"
 msgstr "la ligne <literal>Version:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:414
+#: apt_preferences.5.xml:408
 msgid "gives the version number for the named package"
 msgstr "donne le numéro de version du paquet"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:419
+#: apt_preferences.5.xml:413
 msgid ""
 "The <filename>Release</filename> file is normally found in the directory "
 "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
@@ -6338,12 +6350,12 @@ msgstr ""
 "pertinentes pour déterminer les priorités :"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:430
+#: apt_preferences.5.xml:424
 msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
 msgstr "La ligne <literal>Archive:</literal> ou <literal>Suite:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:431
+#: apt_preferences.5.xml:425
 msgid ""
 "names the archive to which all the packages in the directory tree belong.  "
 "For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@ -6360,18 +6372,18 @@ msgstr ""
 "préférences demanderait cette ligne :"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:441
+#: apt_preferences.5.xml:435
 #, no-wrap
 msgid "Pin: release a=stable\n"
 msgstr "Pin: release a=stable\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:447
+#: apt_preferences.5.xml:441
 msgid "the <literal>Codename:</literal> line"
 msgstr "la ligne <literal>Codename:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:448
+#: apt_preferences.5.xml:442
 msgid ""
 "names the codename to which all the packages in the directory tree belong.  "
 "For example, the line \"Codename: &testing-codename;\" specifies that all of "
@@ -6389,13 +6401,13 @@ msgstr ""
 "ligne :"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:457
+#: apt_preferences.5.xml:451
 #, no-wrap
 msgid "Pin: release n=&testing-codename;\n"
 msgstr "Pin: release n=&testing-codename;\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:464
+#: apt_preferences.5.xml:458
 msgid ""
 "names the release version.  For example, the packages in the tree might "
 "belong to Debian release version &stable-version;.  Note that there is "
@@ -6412,7 +6424,7 @@ msgstr ""
 "préférences demanderait ces lignes :"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:473
+#: apt_preferences.5.xml:467
 #, no-wrap
 msgid ""
 "Pin: release v=&stable-version;\n"
@@ -6424,12 +6436,12 @@ msgstr ""
 "Pin: release &stable-version;\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:482
+#: apt_preferences.5.xml:476
 msgid "the <literal>Component:</literal> line"
 msgstr "La ligne <literal>Component:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:483
+#: apt_preferences.5.xml:477
 msgid ""
 "names the licensing component associated with the packages in the directory "
 "tree of the <filename>Release</filename> file.  For example, the line "
@@ -6447,18 +6459,18 @@ msgstr ""
 "fichier des préférences demanderait cette ligne :"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:492
+#: apt_preferences.5.xml:486
 #, no-wrap
 msgid "Pin: release c=main\n"
 msgstr "Pin: release c=main\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:498
+#: apt_preferences.5.xml:492
 msgid "the <literal>Origin:</literal> line"
 msgstr "La ligne <literal>Origin:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:499
+#: apt_preferences.5.xml:493
 msgid ""
 "names the originator of the packages in the directory tree of the "
 "<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"
@@ -6471,18 +6483,18 @@ msgstr ""
 "ligne :"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:505
+#: apt_preferences.5.xml:499
 #, no-wrap
 msgid "Pin: release o=Debian\n"
 msgstr "Pin: release o=Debian\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:511
+#: apt_preferences.5.xml:505
 msgid "the <literal>Label:</literal> line"
 msgstr "La ligne <literal>Label:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:512
+#: apt_preferences.5.xml:506
 msgid ""
 "names the label of the packages in the directory tree of the "
 "<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"
@@ -6495,13 +6507,13 @@ msgstr ""
 "préférences demanderait cette ligne :"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:518
+#: apt_preferences.5.xml:512
 #, no-wrap
 msgid "Pin: release l=Debian\n"
 msgstr "Pin: release l=Debian\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:525
+#: apt_preferences.5.xml:519
 msgid ""
 "All of the <filename>Packages</filename> and <filename>Release</filename> "
 "files retrieved from locations listed in the &sources-list; file are stored "
@@ -6526,12 +6538,12 @@ msgstr ""
 "<literal>unstable</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:538
+#: apt_preferences.5.xml:532
 msgid "Optional Lines in an APT Preferences Record"
 msgstr "Lignes facultatives dans le fichier des préférences"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:540
+#: apt_preferences.5.xml:534
 msgid ""
 "Each record in the APT preferences file can optionally begin with one or "
 "more lines beginning with the word <literal>Explanation:</literal>.  This "
@@ -6542,12 +6554,12 @@ msgstr ""
 "commentaires."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:549
+#: apt_preferences.5.xml:543
 msgid "Tracking Stable"
 msgstr "Méthode pour suivre Stable"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:557
+#: apt_preferences.5.xml:551
 #, no-wrap
 msgid ""
 "Explanation: Uninstall or do not install any Debian-originated\n"
@@ -6571,7 +6583,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:551
+#: apt_preferences.5.xml:545
 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 "
@@ -6586,8 +6598,8 @@ msgstr ""
 "literal>.  <placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:574 apt_preferences.5.xml:620
-#: apt_preferences.5.xml:678
+#: apt_preferences.5.xml:568 apt_preferences.5.xml:614
+#: apt_preferences.5.xml:672
 #, no-wrap
 msgid ""
 "apt-get install <replaceable>package-name</replaceable>\n"
@@ -6599,7 +6611,7 @@ msgstr ""
 "apt-get dist-upgrade\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:569
+#: apt_preferences.5.xml:563
 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 "
@@ -6612,13 +6624,13 @@ msgstr ""
 "\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:586
+#: apt_preferences.5.xml:580
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/testing\n"
 msgstr "apt-get install <replaceable>paquet</replaceable>/testing\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:580
+#: apt_preferences.5.xml:574
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>testing</literal> distribution; the package "
@@ -6631,12 +6643,12 @@ msgstr ""
 "de relancer la commande.  <placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:592
+#: apt_preferences.5.xml:586
 msgid "Tracking Testing or Unstable"
 msgstr "Méthode pour suivre Testing ou Unstable"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:601
+#: apt_preferences.5.xml:595
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -6664,7 +6676,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:594
+#: apt_preferences.5.xml:588
 msgid ""
 "The following APT preferences file will cause APT to assign a high priority "
 "to package versions from the <literal>testing</literal> distribution, a "
@@ -6681,7 +6693,7 @@ msgstr ""
 "<placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:615
+#: apt_preferences.5.xml:609
 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 "
@@ -6694,13 +6706,13 @@ msgstr ""
 "type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:635
+#: apt_preferences.5.xml:629
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
 msgstr "apt-get install <replaceable>paquet</replaceable>/unstable\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:626
+#: apt_preferences.5.xml:620
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>unstable</literal> distribution.  "
@@ -6719,12 +6731,12 @@ msgstr ""
 "installée.  <placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:642
+#: apt_preferences.5.xml:636
 msgid "Tracking the evolution of a codename release"
 msgstr "Suivre l'évolution d'une version par son nom de code"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:656
+#: apt_preferences.5.xml:650
 #, no-wrap
 msgid ""
 "Explanation: Uninstall or do not install any Debian-originated package versions\n"
@@ -6758,7 +6770,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:644
+#: apt_preferences.5.xml:638
 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 "
@@ -6782,7 +6794,7 @@ msgstr ""
 "exemples précédents.  <placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:673
+#: apt_preferences.5.xml:667
 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 "
@@ -6795,13 +6807,13 @@ msgstr ""
 "<placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:693
+#: apt_preferences.5.xml:687
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/sid\n"
 msgstr "apt-get install <replaceable>paquet</replaceable>/sid\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:684
+#: apt_preferences.5.xml:678
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>sid</literal> distribution.  Thereafter, "
@@ -6820,17 +6832,17 @@ msgstr ""
 "<placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:708
+#: apt_preferences.5.xml:702
 msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: sources.list.5.xml:35
+#: sources.list.5.xml:29
 msgid "List of configured APT data sources"
 msgstr "Liste des sources de données APT configurées"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:40
+#: sources.list.5.xml:34
 msgid ""
 "The source list <filename>/etc/apt/sources.list</filename> is designed to "
 "support any number of active sources and a variety of source media. The file "
@@ -6847,7 +6859,7 @@ msgstr ""
 "commande équivalent avec une autre interface à APT)."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:47
+#: sources.list.5.xml:41
 msgid ""
 "Each line specifying a source starts with type (e.g. <literal>deb-src</"
 "literal>)  followed by options and arguments for this type.  Individual "
@@ -6862,12 +6874,12 @@ msgstr ""
 "reste de la ligne est un commentaire."
 
 #. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:55
+#: sources.list.5.xml:49
 msgid "sources.list.d"
 msgstr "sources.list.d"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:56
+#: sources.list.5.xml:50
 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 "
@@ -6891,12 +6903,12 @@ msgstr ""
 "ignorés silencieusemennt)."
 
 #. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:67
+#: sources.list.5.xml:61
 msgid "The deb and deb-src types"
 msgstr "Les types deb et deb-src."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:68
+#: sources.list.5.xml:62
 msgid ""
 "The <literal>deb</literal> type references a typical two-level Debian "
 "archive, <filename>distribution/component</filename>. The "
@@ -6922,7 +6934,7 @@ msgstr ""
 "pour récupérer les index des sources."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:79
+#: sources.list.5.xml:73
 msgid ""
 "The format for a <filename>sources.list</filename> entry using the "
 "<literal>deb</literal> and <literal>deb-src</literal> types is:"
@@ -6931,14 +6943,14 @@ msgstr ""
 "types <literal>deb</literal> et <literal>deb-src</literal> est :"
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:82
+#: sources.list.5.xml:76
 #, fuzzy, no-wrap
 #| msgid "deb [ options ] uri distribution [component1] [component2] [...]"
 msgid "deb [ options ] uri suite [component1] [component2] [...]"
 msgstr "deb [ options ] uri distribution [composant1] [composant2] [...]"
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:86
+#: sources.list.5.xml:80
 #, no-wrap
 msgid ""
 "     Types: deb deb-src\n"
@@ -6961,14 +6973,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:84
+#: sources.list.5.xml:78
 msgid ""
 "Alternatively a rfc822 style format is also supported: <placeholder type="
 "\"literallayout\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:105
+#: sources.list.5.xml:99
 #, fuzzy
 #| msgid ""
 #| "The URI for the <literal>deb</literal> type must specify the base of the "
@@ -7000,7 +7012,7 @@ msgstr ""
 "être présent."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:114
+#: sources.list.5.xml:108
 #, fuzzy
 #| msgid ""
 #| "<literal>distribution</literal> may also contain a variable, <literal>"
@@ -7028,7 +7040,7 @@ msgstr ""
 "literal> crée automatiquement un URI en fonction de l'architecture effective."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:122
+#: sources.list.5.xml:116
 #, fuzzy
 #| msgid ""
 #| "Since only one distribution can be specified per line it may be necessary "
@@ -7068,7 +7080,7 @@ msgstr ""
 "tirer plus efficacement parti des sites à faible bande passante."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:136
+#: sources.list.5.xml:130
 msgid ""
 "<literal>options</literal> is always optional and needs to be surrounded by "
 "square brackets. It can consist of multiple settings in the form "
@@ -7085,7 +7097,7 @@ msgstr ""
 "ignorés silencieusement) :"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:142
+#: sources.list.5.xml:136
 msgid ""
 "<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
 "replaceable>,…</literal> can be used to specify for which architectures "
@@ -7100,7 +7112,7 @@ msgstr ""
 "Architectures</literal> sera téléchargée."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:146
+#: sources.list.5.xml:140
 #, fuzzy
 #| msgid ""
 #| "<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
@@ -7121,7 +7133,7 @@ msgstr ""
 "Architectures</literal> sera téléchargée."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:149
+#: sources.list.5.xml:143
 msgid ""
 "<literal>trusted=yes</literal> can be set to indicate that packages from "
 "this source are always authenticated even if the <filename>Release</"
@@ -7139,7 +7151,7 @@ msgstr ""
 "authentifiées comme non authentifiées."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:156
+#: sources.list.5.xml:150
 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 "
@@ -7152,12 +7164,12 @@ msgstr ""
 "les hôtes distants."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:161
+#: sources.list.5.xml:155
 msgid "Some examples:"
 msgstr "Exemples :"
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:163
+#: sources.list.5.xml:157
 #, no-wrap
 msgid ""
 "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
@@ -7169,17 +7181,17 @@ msgstr ""
 "   "
 
 #. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:169
+#: sources.list.5.xml:163
 msgid "URI specification"
 msgstr "Spécification des URI"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:171
+#: sources.list.5.xml:165
 msgid "The currently recognized URI types are:"
 msgstr "Les types d'URI actuellement reconnues sont :"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:175
+#: sources.list.5.xml:169
 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 "
@@ -7190,7 +7202,7 @@ msgstr ""
 "avec les montages NFS, les miroirs et les archives locaux."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:182
+#: sources.list.5.xml:176
 msgid ""
 "The cdrom scheme allows APT to use a local CD-ROM drive with media swapping. "
 "Use the &apt-cdrom; program to create cdrom entries in the source list."
@@ -7200,7 +7212,7 @@ msgstr ""
 "pour créer des entrées dans la liste des sources."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:189
+#: sources.list.5.xml:183
 msgid ""
 "The http scheme specifies an HTTP server for the archive. If an environment "
 "variable <envar>http_proxy</envar> is set with the format http://server:"
@@ -7217,7 +7229,7 @@ msgstr ""
 "Notez qu'il s'agit d'une méthode d'authentification peu sûre."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:200
+#: sources.list.5.xml:194
 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 page. "
@@ -7239,7 +7251,7 @@ msgstr ""
 "configuration seront ignorés."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:212
+#: sources.list.5.xml:206
 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.  "
@@ -7253,7 +7265,7 @@ msgstr ""
 "des fichiers avec APT."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:219
+#: sources.list.5.xml:213
 msgid ""
 "The rsh/ssh method invokes RSH/SSH to connect to a remote host and access "
 "the files as a given user. Prior configuration of rhosts or RSA keys is "
@@ -7267,12 +7279,12 @@ msgstr ""
 "sont utilisées pour l'accès aux fichiers de la machine distante."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:226
+#: sources.list.5.xml:220
 msgid "adding more recognizable URI types"
 msgstr "ajout de types d'URI supplémentaires reconnues"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:228
+#: sources.list.5.xml:222
 msgid ""
 "APT can be extended with more methods shipped in other optional packages, "
 "which should follow the naming scheme <package>apt-transport-"
@@ -7291,7 +7303,7 @@ msgstr ""
 "disponibles (voir &apt-transport-debtorrent;)."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:240
+#: sources.list.5.xml:234
 msgid ""
 "Uses the archive stored locally (or NFS mounted) at /home/jason/debian for "
 "stable/main, stable/contrib, and stable/non-free."
@@ -7300,37 +7312,37 @@ msgstr ""
 "debian pour stable/main, stable/contrib et stable/non-free."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:242
+#: sources.list.5.xml:236
 #, no-wrap
 msgid "deb file:/home/jason/debian stable main contrib non-free"
 msgstr "deb file:/home/jason/debian stable main contrib non-free"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:244
+#: sources.list.5.xml:238
 msgid "As above, except this uses the unstable (development) distribution."
 msgstr ""
 "Comme ci-dessus, excepté que cette ligne utilise la distribution "
 "« unstable » (développement)."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:245
+#: sources.list.5.xml:239
 #, no-wrap
 msgid "deb file:/home/jason/debian unstable main contrib non-free"
 msgstr "deb file:/home/jason/debian unstable main contrib non-free"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:247
+#: sources.list.5.xml:241
 msgid "Source line for the above"
 msgstr "La précédente ligne, mais pour les sources."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:248
+#: sources.list.5.xml:242
 #, no-wrap
 msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
 msgstr "deb-src file:/home/jason/debian unstable main contrib non-free"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:250
+#: sources.list.5.xml:244
 msgid ""
 "The first line gets package information for the architectures in "
 "<literal>APT::Architectures</literal> while the second always retrieves "
@@ -7341,7 +7353,7 @@ msgstr ""
 "<literal>amd64</literal> et <literal>armel</literal>."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:252
+#: sources.list.5.xml:246
 #, no-wrap
 msgid ""
 "deb http://ftp.debian.org/debian &stable-codename; main\n"
@@ -7351,7 +7363,7 @@ msgstr ""
 "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:255
+#: sources.list.5.xml:249
 msgid ""
 "Uses HTTP to access the archive at archive.debian.org, and uses only the "
 "hamm/main area."
@@ -7360,13 +7372,13 @@ msgstr ""
 "n'utiliser que la section hamm/main."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:257
+#: sources.list.5.xml:251
 #, no-wrap
 msgid "deb http://archive.debian.org/debian-archive hamm main"
 msgstr "deb http://archive.debian.org/debian-archive hamm main"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:259
+#: sources.list.5.xml:253
 msgid ""
 "Uses FTP to access the archive at ftp.debian.org, under the debian "
 "directory, and uses only the &stable-codename;/contrib area."
@@ -7375,13 +7387,13 @@ msgstr ""
 "répertoire debian, et n'utiliser que la section &stable-codename;/contrib."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:261
+#: sources.list.5.xml:255
 #, no-wrap
 msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
 msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:263
+#: sources.list.5.xml:257
 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 "
@@ -7394,19 +7406,19 @@ msgstr ""
 "apparaissent, une seule session FTP sera utilisée pour les deux lignes."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:267
+#: sources.list.5.xml:261
 #, no-wrap
 msgid "deb ftp://ftp.debian.org/debian unstable contrib"
 msgstr "deb ftp://ftp.debian.org/debian unstable contrib"
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:276
+#: sources.list.5.xml:270
 #, no-wrap
 msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
 msgstr "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:269
+#: sources.list.5.xml:263
 msgid ""
 "Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe "
 "directory, and uses only files found under <filename>unstable/binary-i386</"
@@ -7426,17 +7438,17 @@ msgstr ""
 "type=\"literallayout\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:281
+#: sources.list.5.xml:275
 msgid "&apt-cache; &apt-conf;"
 msgstr "&apt-cache; &apt-conf;"
 
 #. type: Content of: <refentry><refmeta><manvolnum>
-#: apt-extracttemplates.1.xml:28 apt-sortpkgs.1.xml:28 apt-ftparchive.1.xml:28
+#: apt-extracttemplates.1.xml:22 apt-sortpkgs.1.xml:22 apt-ftparchive.1.xml:22
 msgid "1"
 msgstr "1"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-extracttemplates.1.xml:35
+#: apt-extracttemplates.1.xml:29
 msgid ""
 "Utility to extract <command>debconf</command> config and templates from "
 "Debian packages"
@@ -7445,7 +7457,7 @@ msgstr ""
 "<command>debconf</command> contenu dans un paquet Debian"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:41
+#: apt-extracttemplates.1.xml:35
 msgid ""
 "<command>apt-extracttemplates</command> will take one or more Debian package "
 "files as input and write out (to a temporary directory) all associated "
@@ -7460,12 +7472,12 @@ msgstr ""
 "suivant :"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:46
+#: apt-extracttemplates.1.xml:40
 msgid "package version template-file config-script"
 msgstr "paquet version guide-de-configuration script-de-configuration"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:47
+#: apt-extracttemplates.1.xml:41
 msgid ""
 "template-file and config-script are written to the temporary directory "
 "specified by the <option>-t</option> or <option>--tempdir</option> "
@@ -7480,7 +7492,7 @@ msgstr ""
 "<filename>package.config.XXXXXX</filename>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-extracttemplates.1.xml:60
+#: apt-extracttemplates.1.xml:54
 msgid ""
 "Temporary directory in which to write extracted <command>debconf</command> "
 "template files and config scripts.  Configuration Item: <literal>APT::"
@@ -7491,7 +7503,7 @@ msgstr ""
 "<literal>APT::ExtractTemplates::TempDir</literal>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:77
+#: apt-extracttemplates.1.xml:71
 msgid ""
 "<command>apt-extracttemplates</command> returns zero on normal operation, "
 "decimal 100 on error."
@@ -7500,12 +7512,12 @@ msgstr ""
 "le nombre 100 en cas d'erreur."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-sortpkgs.1.xml:35
+#: apt-sortpkgs.1.xml:29
 msgid "Utility to sort package index files"
 msgstr "Outil de tri des index de paquets."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-sortpkgs.1.xml:41
+#: apt-sortpkgs.1.xml:35
 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 "
@@ -7518,7 +7530,7 @@ msgstr ""
 "internes."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-sortpkgs.1.xml:47
+#: apt-sortpkgs.1.xml:41
 msgid ""
 "All output is sent to standard output; the input must be a seekable file."
 msgstr ""
@@ -7526,7 +7538,7 @@ msgstr ""
 "fichier analysable."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-sortpkgs.1.xml:56
+#: apt-sortpkgs.1.xml:50
 msgid ""
 "Use source index field ordering.  Configuration Item: <literal>APT::"
 "SortPkgs::Source</literal>."
@@ -7535,7 +7547,7 @@ msgstr ""
 "configuration : <literal>APT::SortPkgs::Source</literal>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-sortpkgs.1.xml:70
+#: apt-sortpkgs.1.xml:64
 msgid ""
 "<command>apt-sortpkgs</command> returns zero on normal operation, decimal "
 "100 on error."
@@ -7544,12 +7556,12 @@ msgstr ""
 "en cas d'erreur."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-ftparchive.1.xml:35
+#: apt-ftparchive.1.xml:29
 msgid "Utility to generate index files"
 msgstr "Outil de création de fichiers d'index"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:41
+#: apt-ftparchive.1.xml:35
 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 "
@@ -7561,7 +7573,7 @@ msgstr ""
 "index doit être créé pour un site et basé sur le contenu de ce site."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:45
+#: apt-ftparchive.1.xml:39
 msgid ""
 "<command>apt-ftparchive</command> is a superset of the &dpkg-scanpackages; "
 "program, incorporating its entire functionality via the <literal>packages</"
@@ -7576,7 +7588,7 @@ msgstr ""
 "élaborée pour automatiser le processus de création d'une archive complète."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:51
+#: apt-ftparchive.1.xml:45
 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 "
@@ -7591,7 +7603,7 @@ msgstr ""
 "voulus."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:62
+#: apt-ftparchive.1.xml:56
 msgid ""
 "The packages command generates a package file from a directory tree. It "
 "takes the given directory and recursively searches it for .deb files, "
@@ -7605,7 +7617,7 @@ msgstr ""
 "équivalente à &dpkg-scanpackages;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:67 apt-ftparchive.1.xml:91
+#: apt-ftparchive.1.xml:61 apt-ftparchive.1.xml:85
 msgid ""
 "The option <option>--db</option> can be used to specify a binary caching DB."
 msgstr ""
@@ -7613,7 +7625,7 @@ msgstr ""
 "binaire."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:72
+#: apt-ftparchive.1.xml:66
 msgid ""
 "The <literal>sources</literal> command generates a source index file from a "
 "directory tree.  It takes the given directory and recursively searches it "
@@ -7627,7 +7639,7 @@ msgstr ""
 "équivalente à &dpkg-scansources;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:77
+#: apt-ftparchive.1.xml:71
 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 "
@@ -7638,7 +7650,7 @@ msgstr ""
 "override pour changer de fichier source d'« override »."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:84
+#: apt-ftparchive.1.xml:78
 msgid ""
 "The <literal>contents</literal> command generates a contents file from a "
 "directory tree. It takes the given directory and recursively searches it "
@@ -7656,7 +7668,7 @@ msgstr ""
 "virgule sépare les paquets."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:96
+#: apt-ftparchive.1.xml:90
 msgid ""
 "The <literal>release</literal> command generates a Release file from a "
 "directory tree. It recursively searches the given directory for uncompressed "
@@ -7682,7 +7694,7 @@ msgstr ""
 "sommes de contrôle MD5, SHA1 et SHA256 pour chaque fichier."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:106
+#: apt-ftparchive.1.xml:100
 msgid ""
 "Values for the additional metadata fields in the Release file are taken from "
 "the corresponding variables under <literal>APT::FTPArchive::Release</"
@@ -7703,7 +7715,7 @@ msgstr ""
 "<literal>Description</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:119
+#: apt-ftparchive.1.xml:113
 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 "
@@ -7717,7 +7729,7 @@ msgstr ""
 "préciser index et répertoires aussi bien que les paramètres requis."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:128
+#: apt-ftparchive.1.xml:122
 msgid ""
 "The <literal>clean</literal> command tidies the databases used by the given "
 "configuration file by removing any records that are no longer necessary."
@@ -7727,12 +7739,12 @@ msgstr ""
 "sont plus nécessaires."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:134
+#: apt-ftparchive.1.xml:128
 msgid "The Generate Configuration"
 msgstr "Configuration de la commande generate"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:136
+#: apt-ftparchive.1.xml:130
 msgid ""
 "The <literal>generate</literal> command uses a configuration file to "
 "describe the archives that are going to be generated. It follows the typical "
@@ -7749,19 +7761,19 @@ msgstr ""
 "arborescence. Cela n'affecte que l'usage de l'étiquette de visée (scope tag)."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:144
+#: apt-ftparchive.1.xml:138
 msgid ""
 "The generate configuration has four separate sections, each described below."
 msgstr ""
 "Ce fichier de configuration possède quatre sections, décrites ci-dessous."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:146
+#: apt-ftparchive.1.xml:140
 msgid "<literal>Dir</literal> Section"
 msgstr "La section <literal>Dir</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:148
+#: apt-ftparchive.1.xml:142
 msgid ""
 "The <literal>Dir</literal> section defines the standard directories needed "
 "to locate the files required during the generation process. These "
@@ -7774,7 +7786,7 @@ msgstr ""
 "manière à produire un chemin absolu et complet."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:155
+#: apt-ftparchive.1.xml:149
 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 "
@@ -7785,17 +7797,17 @@ msgstr ""
 "filename> et les noeuds des distributions."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:162
+#: apt-ftparchive.1.xml:156
 msgid "Specifies the location of the override files."
 msgstr "Indique l'emplacement des fichiers d'« override »."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:167
+#: apt-ftparchive.1.xml:161
 msgid "Specifies the location of the cache files."
 msgstr "Indique l'emplacement des fichiers de cache."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:172
+#: apt-ftparchive.1.xml:166
 msgid ""
 "Specifies the location of the file list files, if the <literal>FileList</"
 "literal> setting is used below."
@@ -7804,12 +7816,12 @@ msgstr ""
 "sert de la valeur <literal>FileList</literal> définie plus bas)."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:178
+#: apt-ftparchive.1.xml:172
 msgid "<literal>Default</literal> Section"
 msgstr "La section <literal>Default</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:180
+#: apt-ftparchive.1.xml:174
 msgid ""
 "The <literal>Default</literal> section specifies default values, and "
 "settings that control the operation of the generator. Other sections may "
@@ -7820,7 +7832,7 @@ msgstr ""
 "annulées dans d'autres sections (paramètrage par section)."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:186
+#: apt-ftparchive.1.xml:180
 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 "
@@ -7833,7 +7845,7 @@ msgstr ""
 "Par défaut, c'est la chaîne « . gzip »."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:194
+#: apt-ftparchive.1.xml:188
 msgid ""
 "Sets the default list of file extensions that are package files.  This "
 "defaults to '.deb'."
@@ -7842,7 +7854,7 @@ msgstr ""
 "paquets. Par défaut, c'est « .deb »."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:200
+#: apt-ftparchive.1.xml:194
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Sources files."
@@ -7851,7 +7863,7 @@ msgstr ""
 "compressés les fichiers sources."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:206
+#: apt-ftparchive.1.xml:200
 msgid ""
 "Sets the default list of file extensions that are source files.  This "
 "defaults to '.dsc'."
@@ -7860,7 +7872,7 @@ msgstr ""
 "fichiers sources. Par défaut, c'est « .dsc »."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:212
+#: apt-ftparchive.1.xml:206
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Contents files."
@@ -7869,7 +7881,7 @@ msgstr ""
 "compressés les fichiers « Contents »."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:218
+#: apt-ftparchive.1.xml:212
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Translation-en master file."
@@ -7878,7 +7890,7 @@ msgstr ""
 "compressé le fichier maître Translations-en."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:224
+#: apt-ftparchive.1.xml:218
 msgid ""
 "Specifies the number of kilobytes to delink (and replace with hard links) "
 "per run. This is used in conjunction with the per-section <literal>External-"
@@ -7889,7 +7901,7 @@ msgstr ""
 "paramètre <literal>External-Links</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:231
+#: apt-ftparchive.1.xml:225
 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."
@@ -7899,7 +7911,7 @@ msgstr ""
 "utilisateur (umasq) est ignoré."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:238 apt-ftparchive.1.xml:384
+#: apt-ftparchive.1.xml:232 apt-ftparchive.1.xml:378
 msgid ""
 "Specifies whether long descriptions should be included in the "
 "<filename>Packages</filename> file or split out into a master "
@@ -7910,12 +7922,12 @@ msgstr ""
 "<filename>Translation-en</filename>."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:244
+#: apt-ftparchive.1.xml:238
 msgid "<literal>TreeDefault</literal> Section"
 msgstr "La section <literal>TreeDefault</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:246
+#: apt-ftparchive.1.xml:240
 msgid ""
 "Sets defaults specific to <literal>Tree</literal> sections. All of these "
 "variables are substitution variables and have the strings $(DIST), "
@@ -7927,7 +7939,7 @@ msgstr ""
 "respective."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:253
+#: apt-ftparchive.1.xml:247
 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 will all "
@@ -7938,7 +7950,7 @@ msgstr ""
 "robin » de manière que, sur plusieurs jours, tous soient reconstruits."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:260
+#: apt-ftparchive.1.xml:254
 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 updated. "
@@ -7956,7 +7968,7 @@ msgstr ""
 "défaut ce nombre vaut 10, l'unité étant le jour."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:271
+#: apt-ftparchive.1.xml:265
 msgid ""
 "Sets the top of the .deb directory tree. Defaults to <filename>$(DIST)/"
 "$(SECTION)/binary-$(ARCH)/</filename>"
@@ -7965,7 +7977,7 @@ msgstr ""
 "<filename>$(DIST)/$(SECTION)/binary-$(ARCH)/</filename>."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:277
+#: apt-ftparchive.1.xml:271
 msgid ""
 "Sets the top of the source package directory tree. Defaults to <filename>"
 "$(DIST)/$(SECTION)/source/</filename>"
@@ -7974,7 +7986,7 @@ msgstr ""
 "<filename>$(DIST)/$(SECTION)/source/</filename>."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:283
+#: apt-ftparchive.1.xml:277
 msgid ""
 "Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
 "binary-$(ARCH)/Packages</filename>"
@@ -7983,7 +7995,7 @@ msgstr ""
 "$(SECTION)/binary-$(ARCH)/Packages</filename>."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:289
+#: apt-ftparchive.1.xml:283
 msgid ""
 "Sets the output Sources file. Defaults to <filename>$(DIST)/$(SECTION)/"
 "source/Sources</filename>"
@@ -7992,7 +8004,7 @@ msgstr ""
 "$(SECTION)/source/Sources</filename>."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:295
+#: apt-ftparchive.1.xml:289
 msgid ""
 "Sets the output Translation-en master file with the long descriptions if "
 "they should be not included in the Packages file. Defaults to <filename>"
@@ -8003,7 +8015,7 @@ msgstr ""
 "défaut : <filename>$(DIST)/$(SECTION)/i18n/Translation-en</filename>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:302
+#: apt-ftparchive.1.xml:296
 msgid ""
 "Sets the path prefix that causes a symlink to be considered an internal link "
 "instead of an external link. Defaults to <filename>$(DIST)/$(SECTION)/</"
@@ -8014,7 +8026,7 @@ msgstr ""
 "défaut, c'est <filename>$(DIST)/$(SECTION)/</filename>."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:309
+#: apt-ftparchive.1.xml:303
 msgid ""
 "Sets the output Contents file. Defaults to <filename>$(DIST)/$(SECTION)/"
 "Contents-$(ARCH)</filename>. If this setting causes multiple Packages files "
@@ -8028,12 +8040,12 @@ msgstr ""
 "<command>apt-ftparchive</command> les intègre automatiquement."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:318
+#: apt-ftparchive.1.xml:312
 msgid "Sets header file to prepend to the contents output."
 msgstr "Indique l'en-tête à préfixer au fichier « Contents » créé."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:323
+#: apt-ftparchive.1.xml:317
 msgid ""
 "Sets the binary cache database to use for this section. Multiple sections "
 "can share the same database."
@@ -8042,7 +8054,7 @@ msgstr ""
 "Différentes sections peuvent partager cette base de données."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:329
+#: apt-ftparchive.1.xml:323
 msgid ""
 "Specifies that instead of walking the directory tree, <command>apt-"
 "ftparchive</command> should read the list of files from the given file. "
@@ -8053,7 +8065,7 @@ msgstr ""
 "relatifs sont préfixés par le répertoire de l'archive."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:336
+#: apt-ftparchive.1.xml:330
 msgid ""
 "Specifies that instead of walking the directory tree, <command>apt-"
 "ftparchive</command> should read the list of files from the given file. "
@@ -8066,12 +8078,12 @@ msgstr ""
 "traiter les index de sources."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:344
+#: apt-ftparchive.1.xml:338
 msgid "<literal>Tree</literal> Section"
 msgstr "La section <literal>Tree</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:346
+#: apt-ftparchive.1.xml:340
 msgid ""
 "The <literal>Tree</literal> section defines a standard Debian file tree "
 "which consists of a base directory, then multiple sections in that base "
@@ -8085,7 +8097,7 @@ msgstr ""
 "par la variable de substitution <literal>Directory</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:351
+#: apt-ftparchive.1.xml:345
 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 "
@@ -8098,7 +8110,7 @@ msgstr ""
 "C'est par exemple : <filename>dists/&stable-codename;</filename>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:356
+#: apt-ftparchive.1.xml:350
 msgid ""
 "All of the settings defined in the <literal>TreeDefault</literal> section "
 "can be used in a <literal>Tree</literal> section as well as three new "
@@ -8109,7 +8121,7 @@ msgstr ""
 "trois nouvelles variables suivantes."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt-ftparchive.1.xml:362
+#: apt-ftparchive.1.xml:356
 #, no-wrap
 msgid ""
 "for i in Sections do \n"
@@ -8123,7 +8135,7 @@ msgstr ""
 "     "
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:359
+#: apt-ftparchive.1.xml:353
 msgid ""
 "When processing a <literal>Tree</literal> section <command>apt-ftparchive</"
 "command> performs an operation similar to: <placeholder type=\"programlisting"
@@ -8134,7 +8146,7 @@ msgstr ""
 "\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:370
+#: apt-ftparchive.1.xml:364
 msgid ""
 "This is a space separated list of sections which appear under the "
 "distribution; typically this is something like <literal>main contrib non-"
@@ -8145,7 +8157,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:377
+#: apt-ftparchive.1.xml:371
 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 "
@@ -8156,7 +8168,7 @@ msgstr ""
 "que l'arborescence est une arborescence de sources."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:390
+#: apt-ftparchive.1.xml:384
 msgid ""
 "Sets the binary override file. The override file contains section, priority "
 "and maintainer address information."
@@ -8165,7 +8177,7 @@ msgstr ""
 "informations sur la section, la priorité et le responsable du paquet."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:396
+#: apt-ftparchive.1.xml:390
 msgid ""
 "Sets the source override file. The override file contains section "
 "information."
@@ -8174,22 +8186,22 @@ msgstr ""
 "informations sur la section."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:402 apt-ftparchive.1.xml:448
+#: apt-ftparchive.1.xml:396 apt-ftparchive.1.xml:442
 msgid "Sets the binary extra override file."
 msgstr "Indique un autre fichier d'« override » pour les binaires."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:407 apt-ftparchive.1.xml:453
+#: apt-ftparchive.1.xml:401 apt-ftparchive.1.xml:447
 msgid "Sets the source extra override file."
 msgstr "Indique un autre fichier d'« override » pour les sources."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:412
+#: apt-ftparchive.1.xml:406
 msgid "<literal>BinDirectory</literal> Section"
 msgstr "La section <literal>BinDirectory</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:414
+#: apt-ftparchive.1.xml:408
 msgid ""
 "The <literal>bindirectory</literal> section defines a binary directory tree "
 "with no special structure. The scope tag specifies the location of the "
@@ -8204,12 +8216,12 @@ msgstr ""
 "paramètrage de <literal>Section</literal><literal>Architecture</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:422
+#: apt-ftparchive.1.xml:416
 msgid "Sets the Packages file output."
 msgstr "Définit le fichier « Packages » créé."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:427
+#: apt-ftparchive.1.xml:421
 msgid ""
 "Sets the Sources file output. At least one of <literal>Packages</literal> or "
 "<literal>Sources</literal> is required."
@@ -8218,42 +8230,42 @@ msgstr ""
 "<literal>Packages</literal> ou <literal>Sources</literal> est nécessaire."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:433
+#: apt-ftparchive.1.xml:427
 msgid "Sets the Contents file output (optional)."
 msgstr "Définit le fichier « Contents » créé."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:438
+#: apt-ftparchive.1.xml:432
 msgid "Sets the binary override file."
 msgstr "Définit le fichier d'« override » pour les binaires."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:443
+#: apt-ftparchive.1.xml:437
 msgid "Sets the source override file."
 msgstr "Définit le fichier d'« override » pour les sources."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:458
+#: apt-ftparchive.1.xml:452
 msgid "Sets the cache DB."
 msgstr "Définit la base de données cache."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:463
+#: apt-ftparchive.1.xml:457
 msgid "Appends a path to all the output paths."
 msgstr "Ajoute un chemin à tous les chemins créés."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:468
+#: apt-ftparchive.1.xml:462
 msgid "Specifies the file list file."
 msgstr "Définit le fichier contenant la liste des fichiers."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:475
+#: apt-ftparchive.1.xml:469
 msgid "The Binary Override File"
 msgstr "Le fichier d'« Override » pour les binaires."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:476
+#: apt-ftparchive.1.xml:470
 msgid ""
 "The binary override file is fully compatible with &dpkg-scanpackages;. It "
 "contains four fields separated by spaces. The first field is the package "
@@ -8268,19 +8280,19 @@ msgstr ""
 "nom du responsable de paquet."
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:482
+#: apt-ftparchive.1.xml:476
 #, no-wrap
 msgid "old [// oldn]* => new"
 msgstr "old [// oldn]* => new"
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:484
+#: apt-ftparchive.1.xml:478
 #, no-wrap
 msgid "new"
 msgstr "new"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:481
+#: apt-ftparchive.1.xml:475
 msgid ""
 "The general form of the maintainer field is: <placeholder type="
 "\"literallayout\" id=\"0\"/> or simply, <placeholder type=\"literallayout\" "
@@ -8297,12 +8309,12 @@ msgstr ""
 "deuxième forme remplace inconditionnellement le champ."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:492
+#: apt-ftparchive.1.xml:486
 msgid "The Source Override File"
 msgstr "Le fichier d'« Override » pour les sources"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:494
+#: apt-ftparchive.1.xml:488
 msgid ""
 "The source override file is fully compatible with &dpkg-scansources;. It "
 "contains two fields separated by spaces. The first field is the source "
@@ -8313,12 +8325,12 @@ msgstr ""
 "sa section."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:499
+#: apt-ftparchive.1.xml:493
 msgid "The Extra Override File"
 msgstr "Le fichier supplémentaire d'« Override »"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:501
+#: apt-ftparchive.1.xml:495
 msgid ""
 "The extra override file allows any arbitrary tag to be added or replaced in "
 "the output. It has three columns, the first is the package, the second is "
@@ -8330,7 +8342,7 @@ msgstr ""
 "ligne est la nouvelle valeur."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:512
+#: apt-ftparchive.1.xml:506
 msgid ""
 "Generate the given checksum. These options default to on, when turned off "
 "the generated index files will not have the checksum fields where possible.  "
@@ -8354,7 +8366,7 @@ msgstr ""
 "<literal>MD5</literal>, <literal>SHA1</literal> ou <literal>SHA256</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:523
+#: apt-ftparchive.1.xml:517
 msgid ""
 "Use a binary caching DB. This has no effect on the generate command.  "
 "Configuration Item: <literal>APT::FTPArchive::DB</literal>."
@@ -8364,7 +8376,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:529
+#: apt-ftparchive.1.xml:523
 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 "
@@ -8380,7 +8392,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:537
+#: apt-ftparchive.1.xml:531
 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 "
@@ -8394,7 +8406,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:545
+#: apt-ftparchive.1.xml:539
 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 "
@@ -8410,7 +8422,7 @@ msgstr ""
 "de configuration : <literal>APT::FTPArchive::Contents</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:555
+#: apt-ftparchive.1.xml:549
 msgid ""
 "Select the source override file to use with the <literal>sources</literal> "
 "command.  Configuration Item: <literal>APT::FTPArchive::SourceOverride</"
@@ -8421,7 +8433,7 @@ msgstr ""
 "FTPArchive::SourceOverride</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:561
+#: apt-ftparchive.1.xml:555
 msgid ""
 "Make the caching databases read only.  Configuration Item: <literal>APT::"
 "FTPArchive::ReadOnlyDB</literal>."
@@ -8430,7 +8442,7 @@ msgstr ""
 "configuration : <literal>APT::FTPArchive::ReadOnlyDB</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:566
+#: apt-ftparchive.1.xml:560
 msgid ""
 "Accept in the <literal>packages</literal> and <literal>contents</literal> "
 "commands only package files matching <literal>*_arch.deb</literal> or "
@@ -8444,7 +8456,7 @@ msgstr ""
 "<literal>APT::FTPArchive::Architecture</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:574
+#: apt-ftparchive.1.xml:568
 msgid ""
 "&apt-ftparchive; caches as much as possible of metadata in a cachedb. If "
 "packages are recompiled and/or republished with the same version again, this "
@@ -8467,7 +8479,7 @@ msgstr ""
 "survenir et l'ensemble de ces contrôles devient inutile."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:586
+#: apt-ftparchive.1.xml:580
 msgid ""
 "This configuration option defaults to \"<literal>true</literal>\" and should "
 "only be set to <literal>\"false\"</literal> if the Archive generated with "
@@ -8483,13 +8495,13 @@ msgstr ""
 "generate."
 
 #. type: Content of: <refentry><refsect1><para><programlisting>
-#: apt-ftparchive.1.xml:604
+#: apt-ftparchive.1.xml:598
 #, no-wrap
 msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
 msgstr "<command>apt-ftparchive</command> packages <replaceable>répertoire</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:600
+#: apt-ftparchive.1.xml:594
 msgid ""
 "To create a compressed Packages file for a directory containing binary "
 "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
@@ -8498,7 +8510,7 @@ msgstr ""
 "des paquets binaires (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:614
+#: apt-ftparchive.1.xml:608
 msgid ""
 "<command>apt-ftparchive</command> returns zero on normal operation, decimal "
 "100 on error."
@@ -8506,36 +8518,53 @@ msgstr ""
 "<command>apt-ftparchive</command> retourne zéro si tout se passe bien, le "
 "nombre 100 en cas d'erreur."
 
-#. type: <title></title>
-#: guide.sgml:4
+#. type: Attribute 'lang' of: <book>
+#: guide.dbk:9 offline.dbk:9
+msgid "en"
+msgstr "fr"
+
+#. type: Content of: <book><title>
+#: guide.dbk:11
 msgid "APT User's Guide"
 msgstr "Guide d'utilisation d'APT"
 
-#. type: <author></author>
-#: guide.sgml:6 offline.sgml:6
-msgid "<name>Jason Gunthorpe </name><email>jgg@debian.org</email>"
-msgstr "<name>Jason Gunthorpe </name><email>jgg@debian.org</email>"
+#. type: Content of: <book><bookinfo><authorgroup><author><personname>
+#: guide.dbk:17 offline.dbk:17
+msgid "Jason Gunthorpe"
+msgstr "Jason Gunthorpe"
+
+#. type: Content of: <book><bookinfo><authorgroup><author><email>
+#: guide.dbk:17 offline.dbk:17
+msgid "jgg@debian.org"
+msgstr "jgg@debian.org"
 
-#. type: <version></version>
-#: guide.sgml:7
-msgid "$Id: guide.sgml,v 1.7 2003/04/26 23:26:13 doogie Exp $"
-msgstr "$Id: guide.sgml,v 1.7 2003/04/26 23:26:13 doogie Exp $"
+#. type: Content of: <book><bookinfo><releaseinfo>
+#: guide.dbk:21 offline.dbk:21
+msgid "Version &apt-product-version;"
+msgstr ""
 
-#. type: <abstract></abstract>
-#: guide.sgml:11
+#. type: Content of: <book><bookinfo><abstract><para>
+#: guide.dbk:25
 msgid ""
 "This document provides an overview of how to use the the APT package manager."
 msgstr ""
 "Ce document fournit un aperçu des méthode d'utilisation du gestionnaire de "
 "paquets APT."
 
-#. type: <copyrightsummary></copyrightsummary>
-#: guide.sgml:15
-msgid "Copyright &copy; Jason Gunthorpe, 1998."
-msgstr "Copyright &copy; Jason Gunthorpe, 1998."
+#. type: Content of: <book><bookinfo>
+#: guide.dbk:29
+msgid ""
+"<copyright><year>1998</year><holder>Jason Gunthorpe</holder></copyright>"
+msgstr ""
+"<copyright><year>1998</year><holder>Jason Gunthorpe</holder></copyright>"
 
-#. type: <p></p>
-#: guide.sgml:21 offline.sgml:22
+#. type: Content of: <book><bookinfo><legalnotice><title>
+#: guide.dbk:32 offline.dbk:33
+msgid "License Notice"
+msgstr ""
+
+#. type: Content of: <book><bookinfo><legalnotice><para>
+#: guide.dbk:34 offline.dbk:35
 msgid ""
 "\"APT\" and this document are free software; you can redistribute them and/"
 "or modify them under the terms of the GNU General Public License as "
@@ -8547,8 +8576,8 @@ msgstr ""
 "telle que publiée par la Free Software Foundation, en version 2 ou "
 "ultérieure."
 
-#. type: <p></p>
-#: guide.sgml:24 offline.sgml:25
+#. type: Content of: <book><bookinfo><legalnotice><para>
+#: guide.dbk:43 offline.dbk:41
 msgid ""
 "For more details, on Debian systems, see the file /usr/share/common-licenses/"
 "GPL for the full license."
@@ -8556,31 +8585,32 @@ msgstr ""
 "Les détails complets de cette licence sont, sur les systèmes Debian GNU/"
 "Linux, consultables dans le fichier usr/share/common-licenses/GPL."
 
-#. type: <heading></heading>
-#: guide.sgml:32
+#. type: Content of: <book><chapter><title>
+#: guide.dbk:50
 msgid "General"
 msgstr "Généralités"
 
-#. type: <p></p>
-#: guide.sgml:38
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:52
 msgid ""
-"The APT package currently contains two sections, the APT <prgn>dselect</"
-"prgn> method and the <prgn>apt-get</prgn> command line user interface. Both "
-"provide a way to install and remove packages as well as download new "
-"packages from the Internet."
+"The APT package currently contains two sections, the APT <command>dselect</"
+"command> method and the <command>apt-get</command> command line user "
+"interface. Both provide a way to install and remove packages as well as "
+"download new packages from the Internet."
 msgstr ""
 "Le paquet APT comporte actuellement deux parties : la méthode APT pour "
-"<prgn>dselect</prgn> et l'interface en ligne de commande <prgn>apt-get</"
-"prgn>. Les deux fournissent des méthodes d'installation et de suppression de "
-"paquets ainsi que de téléchargement de nouveaux paquets par Internet."
+"<command>dselect</command> et l'interface en ligne de commande <command>apt-"
+"get</command>. Les deux fournissent des méthodes d'installation et de "
+"suppression de paquets ainsi que de téléchargement de nouveaux paquets par "
+"Internet."
 
-#. type: <heading></heading>
-#: guide.sgml:39
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:58
 msgid "Anatomy of the Package System"
 msgstr "Anatomie du système de gestion des paquets"
 
-#. type: <p></p>
-#: guide.sgml:44
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:60
 msgid ""
 "The Debian packaging system has a large amount of information associated "
 "with each package to help assure that it integrates cleanly and easily into "
@@ -8591,8 +8621,8 @@ msgstr ""
 "proprement et facilement sur le système. Une des fonctionnalités les plus "
 "immédiatement visibles est le système de gestion des dépendances."
 
-#. type: <p></p>
-#: guide.sgml:52
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:65
 msgid ""
 "The dependency system allows individual programs to make use of shared "
 "elements in the system such as libraries. It simplifies placing infrequently "
@@ -8608,8 +8638,8 @@ msgstr ""
 "d'effectuer des choix parmi les divers agents de transport de courrier "
 "électronique, les serveurs X et d'autres cxomposants du système."
 
-#. type: <p></p>
-#: guide.sgml:57
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:72
 msgid ""
 "The first step to understanding the dependency system is to grasp the "
 "concept of a simple dependency. The meaning of a simple dependency is that a "
@@ -8621,8 +8651,8 @@ msgstr ""
 "est le cas où un paquet donné a besoin qu'un autre paquet soit installé "
 "simultanément pour pouvoir fonctionner correctement."
 
-#. type: <p></p>
-#: guide.sgml:63
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:77
 msgid ""
 "For instance, mailcrypt is an emacs extension that aids in encrypting email "
 "with GPG. Without GPGP installed mailcrypt is useless, so mailcrypt has a "
@@ -8635,8 +8665,8 @@ msgstr ""
 "plus, étant une extension à Emacs sans lequel il est totalement inutile, il "
 "a une dépendance simple sur emacs."
 
-#. type: <p></p>
-#: guide.sgml:73
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:83
 msgid ""
 "The other important dependency to understand is a conflicting dependency. It "
 "means that a package, when installed with another package, will not work and "
@@ -8659,8 +8689,8 @@ msgstr ""
 "courrier électronique soient établis comme étant en conflit les uns avec les "
 "autres."
 
-#. type: <p></p>
-#: guide.sgml:83
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:93
 msgid ""
 "As an added complication there is the possibility for a package to pretend "
 "to be another package. Consider that exim and sendmail for many intents are "
@@ -8682,8 +8712,8 @@ msgstr ""
 "paquet « mail-transprot-agent ». Cette fonctionnalité utile peut toutefois "
 "rendre la correction de certains défauts des paquets plus complexe."
 
-#. type: <p></p>
-#: guide.sgml:88
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:103
 msgid ""
 "At any given time a single dependency may be met by packages that are "
 "already installed or it may not be. APT attempts to help resolve dependency "
@@ -8695,81 +8725,87 @@ msgstr ""
 "problèmes de dépendances par l'intermédiaire d'un certain nombre "
 "d'algorithmes automatiques qui simplifient le choix des paquets à installer."
 
-#. type: <heading></heading>
-#: guide.sgml:96
+#. type: Content of: <book><chapter><title>
+#: guide.dbk:112
 msgid "apt-get"
 msgstr "apt-get"
 
-#. type: <p></p>
-#: guide.sgml:102
-msgid ""
-"<prgn>apt-get</prgn> provides a simple way to install packages from the "
-"command line. Unlike <prgn>dpkg</prgn>, <prgn>apt-get</prgn> does not "
-"understand .deb files, it works with the package's proper name and can only "
-"install .deb archives from a <em>Source</em>."
-msgstr ""
-"Le programme <prgn>apt-get</prgn> offre une méthode simple pour installer "
-"des paquets à la ligne de commande. À la différence de <prgn>dpkg</prgn>, "
-"<prgn>apt-get</prgn> ne gère pas directement les fichiers .deb files. Il "
-"travaille avec le nom des paquets et ne peut installer les archives .deb que "
-"depuis une <em>Source</em>."
-
-#. type: <p></p>
-#: guide.sgml:109
-msgid ""
-"The first <footnote><p>If you are using an http proxy server you must set "
-"the http_proxy environment variable first, see sources.list(5)</p></"
-"footnote> thing that should be done before using <prgn>apt-get</prgn> is to "
-"fetch the package lists from the <em>Sources</em> so that it knows what "
-"packages are available. This is done with <tt>apt-get update</tt>. For "
-"instance,"
-msgstr ""
-"La première action <footnote><p>Si vous utilisez un serveur mandataire "
-"(« proxy ») HTTP, vous devez d'abord positionner la variable d'environnement "
-"http_proxy, voir sources.list(5)</p></footnote> à effectuer avant d'utiliser "
-"<prgn>apt-get</prgn> est de récupérer les listes de paquets depuis les "
-"<em>Sources</em> afin que le programme sache quels sont les paquets "
-"disponibles. Cela peut être effectué avec la commande <tt>apt-get update</"
-"tt>. Par exemple,"
-
-#. type: <example></example>
-#: guide.sgml:116
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:114
+msgid ""
+"<command>apt-get</command> provides a simple way to install packages from "
+"the command line. Unlike <command>dpkg</command>, <command>apt-get</command> "
+"does not understand .deb files, it works with the package's proper name and "
+"can only install .deb archives from a <emphasis>Source</emphasis>."
+msgstr ""
+"Le programme <command>apt-get</command> offre une méthode simple pour "
+"installer des paquets à la ligne de commande. À la différence de "
+"<command>dpkg</command>, <command>apt-get</command> ne gère pas directement "
+"les fichiers .deb files. Il travaille avec le nom des paquets et ne peut "
+"installer les archives .deb que depuis une <emphasis>Source</emphasis>."
+
+#. type: Content of: <book><chapter><para><footnote><para>
+#: guide.dbk:120
+msgid ""
+"If you are using an http proxy server you must set the http_proxy "
+"environment variable first, see sources.list(5)"
+msgstr ""
+"Si vous utilisez un serveur mandataire (« proxy ») HTTP, vous devez d'abord "
+"positionner la variable d'environnement http_proxy, voir sources.list(5)"
+
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:120
+msgid ""
+"The first <placeholder type=\"footnote\" id=\"0\"/> thing that should be "
+"done before using <command>apt-get</command> is to fetch the package lists "
+"from the <emphasis>Sources</emphasis> so that it knows what packages are "
+"available. This is done with <literal>apt-get update</literal>. For instance,"
+msgstr ""
+"La première action <placeholder type=\"footnote\" id=\"0\"/> à effectuer "
+"avant d'utiliser <command>apt-get</command> est de récupérer les listes de "
+"paquets depuis les <emphasis>Sources</emphasis> afin que le programme sache "
+"quels sont les paquets disponibles. Cela peut être effectué avec la commande "
+"<literal>apt-get update</literal>. Par exemple,"
+
+#. type: Content of: <book><chapter><screen>
+#: guide.dbk:128
 #, no-wrap
 msgid ""
 "# apt-get update\n"
 "Get http://ftp.de.debian.org/debian-non-US/ stable/binary-i386/ Packages\n"
 "Get http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n"
 "Reading Package Lists... Done\n"
-"Building Dependency Tree... Done"
+"Building Dependency Tree... Done\n"
 msgstr ""
 "# apt-get update\n"
 "Réception de http://ftp.de.debian.org/debian-non-US/ stable/binary-i386/ Packages\n"
 "Réception de http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n"
 "Lecture des listes de paquets... Fait\n"
-"Construction de l'arbre des dépendances... Fait"
+"Construction de l'arbre des dépendances... Fait\n"
 
-#. type: <p><taglist>
-#: guide.sgml:120
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:135
 msgid "Once updated there are several commands that can be used:"
 msgstr ""
 "Une fois cette mise à jour effectuée, plusieurs commandes peuvent être "
 "utilisées :"
 
-#. type: <tag></tag>
-#: guide.sgml:121
+#. type: Content of: <book><chapter><variablelist><varlistentry><term>
+#: guide.dbk:139
 msgid "upgrade"
 msgstr "upgrade"
 
-#. type: <p></p>
-#: guide.sgml:131
+#. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
+#: guide.dbk:142
 msgid ""
 "Upgrade will attempt to gently upgrade the whole system. Upgrade will never "
 "install a new package or remove an existing package, nor will it ever "
 "upgrade a package that might cause some other package to break. This can be "
 "used daily to relatively safely upgrade the system. Upgrade will list all of "
 "the packages that it could not upgrade, this usually means that they depend "
-"on new packages or conflict with some other package. <prgn>dselect</prgn> or "
-"<tt>apt-get install</tt> can be used to force these packages to install."
+"on new packages or conflict with some other package. <command>dselect</"
+"command> or <literal>apt-get install</literal> can be used to force these "
+"packages to install."
 msgstr ""
 "La commande « upgrade » permet de mettre à jour le système de manière non "
 "invasive. Cette commande ne provoquera jamais l'installation de nouveaux "
@@ -8779,17 +8815,17 @@ msgstr ""
 "pour mettre à jour le système de manière relativement sûre. Lorsqu'elle est "
 "utilisée, la liste des paquets qui ne peuvent être mis à jour sera affichée. "
 "Cela est en général du au fait qu'ils dépendent de nouveaux paquets ou "
-"qu'ils entrent en conflit avec d'autres paquets. Le programme <prgn>dselect</"
-"prgn> ou la commande <tt>apt-get install</tt> peuvet être utilisés pour "
-"forcer l'installation de tels paquets."
+"qu'ils entrent en conflit avec d'autres paquets. Le programme "
+"<command>dselect</command> ou la commande <literal>apt-get install</literal> "
+"peuvet être utilisés pour forcer l'installation de tels paquets."
 
-#. type: <tag></tag>
-#: guide.sgml:131
+#. type: Content of: <book><chapter><variablelist><varlistentry><term>
+#: guide.dbk:154
 msgid "install"
 msgstr "install"
 
-#. type: <p></p>
-#: guide.sgml:140
+#. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
+#: guide.dbk:157
 msgid ""
 "Install is used to install packages by name. The package is automatically "
 "fetched and installed. This can be useful if you already know the name of "
@@ -8809,21 +8845,22 @@ msgstr ""
 "demander une confirmation si des actions autres que ce qui est demandé à la "
 "ligne de commande sont nécessaires."
 
-#. type: <tag></tag>
-#: guide.sgml:140
+#. type: Content of: <book><chapter><variablelist><varlistentry><term>
+#: guide.dbk:168
 msgid "dist-upgrade"
 msgstr "dist-upgrade"
 
-#. type: <p></p>
-#: guide.sgml:149
+#. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
+#: guide.dbk:171
 msgid ""
 "Dist-upgrade is a complete upgrader designed to simplify upgrading between "
 "releases of Debian. It uses a sophisticated algorithm to determine the best "
 "set of packages to install, upgrade and remove to get as much of the system "
 "to the newest release. In some situations it may be desired to use dist-"
 "upgrade rather than spend the time manually resolving dependencies in "
-"<prgn>dselect</prgn>. Once dist-upgrade has completed then <prgn>dselect</"
-"prgn> can be used to install any packages that may have been left out."
+"<command>dselect</command>. Once dist-upgrade has completed then "
+"<command>dselect</command> can be used to install any packages that may have "
+"been left out."
 msgstr ""
 "La commande « dist-upgrade » est une commande de mise à jour complète "
 "d'abord destinés à permettre les mises à jour entre deux versions "
@@ -8831,12 +8868,13 @@ msgstr ""
 "de paquets à installer, mettre à jour ou supprimer est déterminé dans le but "
 "d'amener une majorité du système vers la nouvelle version. Dans certains "
 "cas, il peut être judicieux d'utiliser « dist-upgrade » plutôt que de "
-"chercher à résoudre manuellement les dépendances avec <prgn>dselect</prgn>. "
-"Une fois que « dist-upgrade » a été utilisé, <prgn>dselect</prgn> peut "
-"servir à installer les paquets qui auraient pu être laissés de côté."
+"chercher à résoudre manuellement les dépendances avec <command>dselect</"
+"command>. Une fois que « dist-upgrade » a été utilisé, <command>dselect</"
+"command> peut servir à installer les paquets qui auraient pu être laissés de "
+"côté."
 
-#. type: <p></p>
-#: guide.sgml:152
+#. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
+#: guide.dbk:181
 msgid ""
 "It is important to closely look at what dist-upgrade is going to do, its "
 "decisions may sometimes be quite surprising."
@@ -8844,174 +8882,179 @@ msgstr ""
 "Il est important de regarder de près ce que « dist-upgrade » car ses "
 "décisions peuvent parfois apparaître surprenantes."
 
-#. type: <p></p>
-#: guide.sgml:163
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:188
 #, fuzzy
 #| msgid ""
-#| "<prgn>apt-get</prgn> has several command line options that are detailed "
-#| "in its man page, <manref section=\"8\" name=\"apt-get\">. The most useful "
-#| "option is <tt>-d</tt> which does not install the fetched files. If the "
-#| "system has to download a large number of package it would be undesired to "
-#| "start installing them in case something goes wrong. When <tt>-d</tt> is "
-#| "used the downloaded archives can be installed by simply running the "
-#| "command that caused them to be downloaded again without <tt>-d</tt>."
-msgid ""
-"<prgn>apt-get</prgn> has several command line options that are detailed in "
-"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful "
-"option is <tt>-d</tt> which does not install the fetched files. If the "
-"system has to download a large number of package it would be undesired to "
-"start installing them in case something goes wrong. When <tt>-d</tt> is used "
-"the downloaded archives can be installed by simply running the command that "
-"caused them to be downloaded again without <tt>-d</tt>."
-msgstr ""
-"<prgn>apt-get</prgn> fournit de nombreuses options de ligne de commande qui "
-"sont expliquées en détail dans sa page de manuel, <manref section=\"8\" name="
-"\"apt-get\">. Une des plus utiles est l'option <tt>-d</tt> qui récupère sans "
-"les installer les fichiers nécessaires. Si le système a besoin de "
-"télécharger un grand nombre de paquets, il est par exemple souhaitable de "
-"pouvoir simplement les récupérer sans les installer immédiatement, au cas où "
-"quelque chose se passe mal. Une fois que <tt>-d</tt> a été utilisé, il est "
-"possible d'installer les archives téléchargées en exécutant simplement la "
-"commande qui a permis de les récupérer, sans l'option <tt>-d</tt>."
-
-#. type: <heading></heading>
-#: guide.sgml:168
+#| "<command>apt-get</command> has several command line options that are "
+#| "detailed in its man page, <manref section=\"8\" name=\"apt-get\">. The "
+#| "most useful option is <literal>-d</literal> which does not install the "
+#| "fetched files. If the system has to download a large number of package it "
+#| "would be undesired to start installing them in case something goes wrong. "
+#| "When <literal>-d</literal> is used the downloaded archives can be "
+#| "installed by simply running the command that caused them to be downloaded "
+#| "again without <literal>-d</literal>."
+msgid ""
+"<command>apt-get</command> has several command line options that are "
+"detailed in its man page, <citerefentry><refentrytitle>apt-get</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>. The most useful "
+"option is <literal>-d</literal> which does not install the fetched files. If "
+"the system has to download a large number of package it would be undesired "
+"to start installing them in case something goes wrong. When <literal>-d</"
+"literal> is used the downloaded archives can be installed by simply running "
+"the command that caused them to be downloaded again without <literal>-d</"
+"literal>."
+msgstr ""
+"<command>apt-get</command> fournit de nombreuses options de ligne de "
+"commande qui sont expliquées en détail dans sa page de manuel, <manref "
+"section=\"8\" name=\"apt-get\">. Une des plus utiles est l'option <literal>-"
+"d</literal> qui récupère sans les installer les fichiers nécessaires. Si le "
+"système a besoin de télécharger un grand nombre de paquets, il est par "
+"exemple souhaitable de pouvoir simplement les récupérer sans les installer "
+"immédiatement, au cas où quelque chose se passe mal. Une fois que <literal>-"
+"d</literal> a été utilisé, il est possible d'installer les archives "
+"téléchargées en exécutant simplement la commande qui a permis de les "
+"récupérer, sans l'option <literal>-d</literal>."
+
+#. type: Content of: <book><chapter><title>
+#: guide.dbk:200
 msgid "DSelect"
 msgstr "DSelect"
 
-#. type: <p></p>
-#: guide.sgml:173
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:202
 msgid ""
-"The APT <prgn>dselect</prgn> method provides the complete APT system with "
-"the <prgn>dselect</prgn> package selection GUI. <prgn>dselect</prgn> is used "
-"to select the packages to be installed or removed and APT actually installs "
-"them."
+"The APT <command>dselect</command> method provides the complete APT system "
+"with the <command>dselect</command> package selection GUI. <command>dselect</"
+"command> is used to select the packages to be installed or removed and APT "
+"actually installs them."
 msgstr ""
-"La méthode APT de <prgn>dselect</prgn> permet d'utiliser le système APT dans "
-"son ensemble depuis l'interface graphique de gestion des paquets "
-"<prgn>dselect</prgn>. L'interface est alors utilisée pour choisir les "
+"La méthode APT de <command>dselect</command> permet d'utiliser le système "
+"APT dans son ensemble depuis l'interface graphique de gestion des paquets "
+"<command>dselect</command>. L'interface est alors utilisée pour choisir les "
 "paquets à installer ou supprimer et c'est APT qui effectue les opérations "
 "individuelles d'installation ou suppression."
 
-#. type: <p></p>
-#: guide.sgml:184
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:208
 msgid ""
-"To enable the APT method you need to select [A]ccess in <prgn>dselect</prgn> "
-"and then choose the APT method. You will be prompted for a set of "
-"<em>Sources</em> which are places to fetch archives from. These can be "
-"remote Internet sites, local Debian mirrors or CD-ROMs. Each source can "
-"provide a fragment of the total Debian archive, APT will automatically "
+"To enable the APT method you need to select [A]ccess in <command>dselect</"
+"command> and then choose the APT method. You will be prompted for a set of "
+"<emphasis>Sources</emphasis> which are places to fetch archives from. These "
+"can be remote Internet sites, local Debian mirrors or CD-ROMs. Each source "
+"can provide a fragment of the total Debian archive, APT will automatically "
 "combine them to form a complete set of packages. If you have a CD-ROM then "
 "it is a good idea to specify it first and then specify a mirror so that you "
 "have access to the latest bug fixes. APT will automatically use packages on "
 "your CD-ROM before downloading from the Internet."
 msgstr ""
 "Pour activer la méthode APT, il est nécessaire de choisir [A]ccéder dans "
-"<prgn>dselect</prgn> puis utiliser le choix permettant d'activer APT. Des "
-"<em>Sources</em> d'installation seront demandées, qui sont les emplacements "
-"d'où les paquets seront récupérés. Cela peut être des sites Internet "
-"distants, des miroirs locaux ou des CD. Chaque source peut fournir un sous-"
-"ensemble de l'archive complète Debian. APT les combinera automatiquement "
-"pour créer un jeu complet de paquets. Avec des supports de type CD, il est "
-"conseillé de les indiquer en premier puis de les compléter avec un miroir "
-"distant qui permettra d'obtenir les versions les plus à jour s'il y en a. "
-"APT utilisera alors les paquets disponibles sur les CD avant de les "
-"télécharger via l'Internet."
-
-#. type: <example></example>
-#: guide.sgml:198
+"<command>dselect</command> puis utiliser le choix permettant d'activer APT. "
+"Des <emphasis>Sources</emphasis> d'installation seront demandées, qui sont "
+"les emplacements d'où les paquets seront récupérés. Cela peut être des sites "
+"Internet distants, des miroirs locaux ou des CD. Chaque source peut fournir "
+"un sous-ensemble de l'archive complète Debian. APT les combinera "
+"automatiquement pour créer un jeu complet de paquets. Avec des supports de "
+"type CD, il est conseillé de les indiquer en premier puis de les compléter "
+"avec un miroir distant qui permettra d'obtenir les versions les plus à jour "
+"s'il y en a. APT utilisera alors les paquets disponibles sur les CD avant de "
+"les télécharger via l'Internet."
+
+#. type: Content of: <book><chapter><screen>
+#: guide.dbk:219
 #, no-wrap
 msgid ""
 "   Set up a list of distribution source locations\n"
-"\t \n"
+"\n"
 " Please give the base URL of the debian distribution.\n"
 " The access schemes I know about are: http file\n"
-"\t   \n"
+"\n"
 " For example:\n"
 "      file:/mnt/debian,\n"
 "      ftp://ftp.debian.org/debian,\n"
 "      http://ftp.de.debian.org/debian,\n"
-"      \n"
-"      \n"
-" URL [http://llug.sep.bnl.gov/debian]:"
+"\n"
+"\n"
+" URL [http://llug.sep.bnl.gov/debian]:\n"
 msgstr ""
 "  Réglage de a liste des emplacements sources de distribution\n"
-"\t \n"
+"\n"
 " Veuillez indiquer l'URL de base de la  distribution Debian.\n"
 " Les schémas d'accès connus sont : http file\n"
-"\t   \n"
+"\n"
 " Exemple:\n"
 "      file:/mnt/debian,\n"
 "      ftp://ftp.debian.org/debian,\n"
 "      http://ftp.de.debian.org/debian,\n"
-"      \n"
-"      \n"
-" URL [http://llug.sep.bnl.gov/debian]:"
+"\n"
+"\n"
+" URL [http://llug.sep.bnl.gov/debian]:\n"
 
-#. type: <p></p>
-#: guide.sgml:205
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:233
 msgid ""
-"The <em>Sources</em> setup starts by asking for the base of the Debian "
-"archive, defaulting to a HTTP mirror. Next it asks for the distribution to "
-"get."
+"The <emphasis>Sources</emphasis> setup starts by asking for the base of the "
+"Debian archive, defaulting to a HTTP mirror. Next it asks for the "
+"distribution to get."
 msgstr ""
-"La configuration des <em>Sources</em> débute par l'indication de la base de "
-"l'archive Debian, par défaut un miroir HTTP. Puis la distribution est "
-"demandée."
+"La configuration des <emphasis>Sources</emphasis> débute par l'indication de "
+"la base de l'archive Debian, par défaut un miroir HTTP. Puis la distribution "
+"est demandée."
 
-#. type: <example></example>
-#: guide.sgml:212
+#. type: Content of: <book><chapter><screen>
+#: guide.dbk:238
 #, no-wrap
 msgid ""
 " Please give the distribution tag to get or a path to the\n"
 " package file ending in a /. The distribution\n"
 " tags are typically something like: stable unstable testing non-US\n"
-"   \n"
-" Distribution [stable]:"
+"\n"
+" Distribution [stable]:\n"
 msgstr ""
 " Veuillez indiquer le nom de la distribution à utiliser ou\n"
 " le chemin d'accès au fichier des paquets, terminé par un /.\n"
 " Les noms de distribution sont en général de la forme suivante :\n"
 " stable unstable testing non-US\n"
-"   \n"
-" Distribution [stable] :"
+"\n"
+" Distribution [stable] :\n"
 
-#. type: <p></p>
-#: guide.sgml:222
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:245
 msgid ""
-"The distribution refers to the Debian version in the archive, <em>stable</"
-"em> refers to the latest released version and <em>unstable</em> refers to "
-"the developmental version. <em>non-US</em> is only available on some mirrors "
-"and refers to packages that contain encryption technology or other things "
-"that cannot be exported from the United States. Importing these packages "
-"into the US is legal however."
+"The distribution refers to the Debian version in the archive, "
+"<emphasis>stable</emphasis> refers to the latest released version and "
+"<emphasis>unstable</emphasis> refers to the developmental version. "
+"<emphasis>non-US</emphasis> is only available on some mirrors and refers to "
+"packages that contain encryption technology or other things that cannot be "
+"exported from the United States. Importing these packages into the US is "
+"legal however."
 msgstr ""
 "La distribution fait référence à la version de Debian dans l'archive. "
-"<em>stable</em> est la dernière version publiée et <em>unstable</em> la "
-"version en développement. <em>non-US</em> n'est disponible que sur certains "
-"miroirs et fait référence à des paquets contenant des technologies de "
-"chiffrement et d'autres élements dont l'exportation est interdite depuis les "
-"États-Unis d'Amérique. Il est toutefois autorisé de les y importer. [Note du "
-"traducteur : à la date de cette traduction, 2010, cette notion est "
-"totalement obsolète]."
-
-#. type: <example></example>
-#: guide.sgml:228
+"<emphasis>stable</emphasis> est la dernière version publiée et "
+"<emphasis>unstable</emphasis> la version en développement. <emphasis>non-US</"
+"emphasis> n'est disponible que sur certains miroirs et fait référence à des "
+"paquets contenant des technologies de chiffrement et d'autres élements dont "
+"l'exportation est interdite depuis les États-Unis d'Amérique. Il est "
+"toutefois autorisé de les y importer. [Note du traducteur : à la date de "
+"cette traduction, 2010, cette notion est totalement obsolète]."
+
+#. type: Content of: <book><chapter><screen>
+#: guide.dbk:254
 #, no-wrap
 msgid ""
 " Please give the components to get\n"
 " The components are typically something like: main contrib non-free\n"
-"  \n"
-" Components [main contrib non-free]:"
+"\n"
+" Components [main contrib non-free]:\n"
 msgstr ""
 " Veuillez indiquer les composants à utiliser\n"
 " Les composants sont en général de la forme suivante :\n"
 " main contrib non-free\n"
-"  \n"
-" Composants [main contrib non-free] :"
+"\n"
+" Composants [main contrib non-free] :\n"
 
-#. type: <p></p>
-#: guide.sgml:236
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:260
 msgid ""
 "The components list refers to the list of sub distributions to fetch. The "
 "distribution is split up based on software licenses, main being DFSG free "
@@ -9025,8 +9068,8 @@ msgstr ""
 "Debian (DFSG) alors que contrib et non-free correspondent à des éléments qui "
 "comprennent des restrictions de distribution ou d'utilisation."
 
-#. type: <p></p>
-#: guide.sgml:240
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:266
 msgid ""
 "Any number of sources can be added, the setup script will continue to prompt "
 "until you have specified all that you want."
@@ -9035,24 +9078,24 @@ msgstr ""
 "configuration continuera à les demander tant que vous n'indiquerez pas que "
 "le processus est terminé."
 
-#. type: <p></p>
-#: guide.sgml:247
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:270
 msgid ""
-"Before starting to use <prgn>dselect</prgn> it is necessary to update the "
-"available list by selecting [U]pdate from the menu. This is a superset of "
-"<tt>apt-get update</tt> that makes the fetched information available to "
-"<prgn>dselect</prgn>. [U]pdate must be performed even if <tt>apt-get update</"
-"tt> has been run before."
+"Before starting to use <command>dselect</command> it is necessary to update "
+"the available list by selecting [U]pdate from the menu. This is a superset "
+"of <literal>apt-get update</literal> that makes the fetched information "
+"available to <command>dselect</command>. [U]pdate must be performed even if "
+"<literal>apt-get update</literal> has been run before."
 msgstr ""
-"Avant d'utiliser <prgn>dselect</prgn>, il est nécessaire de mettre à jour la "
-"liste de ce qui est disponible en choisissant « [M]ise à jour » depuis le "
-"menu. Cette action exécutera la commande « apt-get update », ce qui rendra "
-"les informations récupérées disponibles pour <prgn>dselect</prgn>. Elle doit "
-"être utilisée même si la commande « apt-get » a déjà été utilisée sur ce "
-"système."
+"Avant d'utiliser <command>dselect</command>, il est nécessaire de mettre à "
+"jour la liste de ce qui est disponible en choisissant « [M]ise à jour » "
+"depuis le menu. Cette action exécutera la commande « apt-get update », ce "
+"qui rendra les informations récupérées disponibles pour <command>dselect</"
+"command>. Elle doit être utilisée même si la commande « apt-get » a déjà été "
+"utilisée sur ce système."
 
-#. type: <p></p>
-#: guide.sgml:253
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:277
 msgid ""
 "You can then go on and make your selections using [S]elect and then perform "
 "the installation using [I]nstall. When using the APT method the [C]onfig and "
@@ -9065,77 +9108,84 @@ msgstr ""
 "« [C]onfigurer » et « [R]etirer » ne sont pas utilisées, car « [I]nstaller » "
 "fait l'ensemble des opérations."
 
-#. type: <p></p>
-#: guide.sgml:258
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:283
 msgid ""
 "By default APT will automatically remove the package (.deb) files once they "
-"have been successfully installed. To change this behavior place <tt>Dselect::"
-"clean \"prompt\";</tt> in /etc/apt/apt.conf."
+"have been successfully installed. To change this behavior place "
+"<literal>Dselect::clean \"prompt\";</literal> in /etc/apt/apt.conf."
 msgstr ""
 "Par défait, APT supprimera automatiquement les fichiers des paquets "
 "(fichiers .deb) une fois qu'ils ont été installés correctement. Pour "
-"modifier ce comportement, vous pouvez utiliser <tt>Dselect::clean \"prompt\";"
-"</tt> dans /etc/apt/apt.conf."
+"modifier ce comportement, vous pouvez utiliser <literal>Dselect::clean "
+"\"prompt\";</literal> dans /etc/apt/apt.conf."
 
-#. type: <heading></heading>
-#: guide.sgml:264
+#. type: Content of: <book><chapter><title>
+#: guide.dbk:289
 msgid "The Interface"
 msgstr "L'interface"
 
-#. type: <p></p>
-#: guide.sgml:278
+#. type: Content of: <book><chapter><para><footnote><para>
+#: guide.dbk:293
 msgid ""
-"Both that APT <prgn>dselect</prgn> method and <prgn>apt-get</prgn> share the "
-"same interface. It is a simple system that generally tells you what it will "
-"do and then goes and does it. <footnote><p>The <prgn>dselect</prgn> method "
-"actually is a set of wrapper scripts to <prgn>apt-get</prgn>. The method "
-"actually provides more functionality than is present in <prgn>apt-get</prgn> "
-"alone.</p></footnote> After printing out a summary of what will happen APT "
+"The <command>dselect</command> method actually is a set of wrapper scripts "
+"to <command>apt-get</command>. The method actually provides more "
+"functionality than is present in <command>apt-get</command> alone."
+msgstr ""
+"La méthode <command>dselect</command> consiste en fait en un jeu de scripts "
+"qui encapsulent <command>apt-get</command>. Cela approte des fonctionnalités "
+"supplémentaires à celles d'<command>apt-get</command> utilisé isolément."
+
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:291
+msgid ""
+"Both that APT <command>dselect</command> method and <command>apt-get</"
+"command> share the same interface. It is a simple system that generally "
+"tells you what it will do and then goes and does it. <placeholder type="
+"\"footnote\" id=\"0\"/> After printing out a summary of what will happen APT "
 "then will print out some informative status messages so that you can "
 "estimate how far along it is and how much is left to do."
 msgstr ""
-"La méthode APT de <prgn>dselect</prgn> et le programme <prgn>apt-get</prgn> "
-"utilisent la même interface. Elle consiste en un système simple qui indique "
-"les opérations qui seront effectuées puis les réalise.<footnote><p>La "
-"méthode <prgn>dselect</prgn> consiste en fait en un jeu de scripts qui "
-"encapsulent <prgn>apt-get</prgn>. Cela approte des fonctionnalités "
-"supplémentaires à celles d'<prgn>apt-get</prgn> utilisé isolément.</p></"
-"footnote> Après avoir indiqué un résumé des opérations qui seront "
-"effectuées, APT donnera un certain nombre d'informations permettant "
-"d'estimer sa progression, tout au long des actions qu'il effectue. "
-
-#. type: <heading></heading>
-#: guide.sgml:280
+"La méthode APT de <command>dselect</command> et le programme <command>apt-"
+"get</command> utilisent la même interface. Elle consiste en un système "
+"simple qui indique les opérations qui seront effectuées puis les réalise."
+"<placeholder type=\"footnote\" id=\"0\"/> Après avoir indiqué un résumé des "
+"opérations qui seront effectuées, APT donnera un certain nombre "
+"d'informations permettant d'estimer sa progression, tout au long des actions "
+"qu'il effectue. "
+
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:302
 msgid "Startup"
 msgstr "Démarrage"
 
-#. type: <p></p>
-#: guide.sgml:284
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:304
 msgid ""
 "Before all operations except update, APT performs a number of actions to "
 "prepare its internal state. It also does some checks of the system's state. "
-"At any time these operations can be performed by running <tt>apt-get check</"
-"tt>."
+"At any time these operations can be performed by running <literal>apt-get "
+"check</literal>."
 msgstr ""
 "Avant toute opération autre qu'une mise à jour, APT effectue un certain "
 "nombre d'actions pour préparer ses mécaismes internes de fonctionnement. Il "
 "vérifie également l'état du système. Ces opérations peuvent être effectuées "
-"isolément avec la commande  <tt>apt-get check</tt>."
+"isolément avec la commande  <literal>apt-get check</literal>."
 
-#. type: <example></example>
-#: guide.sgml:289
+#. type: Content of: <book><chapter><section><screen>
+#: guide.dbk:310
 #, no-wrap
 msgid ""
 "# apt-get check\n"
 "Reading Package Lists... Done\n"
-"Building Dependency Tree... Done"
+"Building Dependency Tree... Done\n"
 msgstr ""
 "# apt-get check\n"
 "Lecture de la liste des paquets... Fait\n"
-"Construction de l'arbre des dépendances... Fait"
+"Construction de l'arbre des dépendances... Fait\n"
 
-#. type: <p></p>
-#: guide.sgml:297
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:315
 msgid ""
 "The first thing it does is read all the package files into memory. APT uses "
 "a caching scheme so this operation will be faster the second time it is run. "
@@ -9148,21 +9198,21 @@ msgstr ""
 "pas trouvés, ils seront ignorés et une informatique sera affichée quand apt-"
 "get se terminera."
 
-#. type: <p></p>
-#: guide.sgml:303
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:321
 msgid ""
 "The final operation performs a detailed analysis of the system's "
 "dependencies. It checks every dependency of every installed or unpacked "
 "package and considers if it is OK. Should this find a problem then a report "
-"will be printed out and <prgn>apt-get</prgn> will refuse to run."
+"will be printed out and <command>apt-get</command> will refuse to run."
 msgstr ""
 "Ensuite, une analyse détaillée des dépendances du système est réalisée. Les "
 "dépendances de chaque paquet installé ou décompressé sont vérifiées. Si un "
-"problème est trouvé, il sera affiché et <prgn>apt-get</prgn> bloquera des "
-"opérations ultérieures."
+"problème est trouvé, il sera affiché et <command>apt-get</command> bloquera "
+"des opérations ultérieures."
 
-#. type: <example></example>
-#: guide.sgml:320
+#. type: Content of: <book><chapter><section><screen>
+#: guide.dbk:327
 #, no-wrap
 msgid ""
 "# apt-get check\n"
@@ -9172,33 +9222,33 @@ msgid ""
 "Sorry, but the following packages have unmet dependencies:\n"
 "  9fonts: Depends: xlib6g but it is not installed\n"
 "  uucp: Depends: mailx but it is not installed\n"
-"  blast: Depends: xlib6g (>= 3.3-5) but it is not installed\n"
+"  blast: Depends: xlib6g (&gt;= 3.3-5) but it is not installed\n"
 "  adduser: Depends: perl-base but it is not installed\n"
 "  aumix: Depends: libgpmg1 but it is not installed\n"
 "  debiandoc-sgml: Depends: sgml-base but it is not installed\n"
-"  bash-builtins: Depends: bash (>= 2.01) but 2.0-3 is installed\n"
+"  bash-builtins: Depends: bash (&gt;= 2.01) but 2.0-3 is installed\n"
 "  cthugha: Depends: svgalibg1 but it is not installed\n"
-"           Depends: xlib6g (>= 3.3-5) but it is not installed\n"
-"  libreadlineg2: Conflicts:libreadline2 (<< 2.1-2.1)"
+"           Depends: xlib6g (&gt;= 3.3-5) but it is not installed\n"
+"  libreadlineg2: Conflicts:libreadline2 (&lt;&lt; 2.1-2.1)\n"
 msgstr ""
 "# apt-get check\n"
 "Lecture de la liste des paquets... Fait\n"
-"Construction de l'arbre des dépendances.. Fait\n"
+"Construction de l'arbre des dépendances... Fait\n"
 "Vous pouvez lancer « apt-get -f install » pour corriger ces problèmes.\n"
 "Les paquets suivants contiennent des dépendances non satisfaites :\n"
 "  9fonts: Depends: xlib6g mais il n'est pas installé\n"
 "  uucp: Depends: mailx mais il n'est pas installé\n"
-"  blast: Depends: xlib6g (>= 3.3-5) mais il n'est pas installé\n"
+"  blast: Depends: xlib6g (&gt;= 3.3-5) mais il n'est pas installé\n"
 "  adduser: Depends: perl-base mais il n'est pas installé\n"
 "  aumix: Depends: libgpmg1 mais il n'est pas installé\n"
 "  debiandoc-sgml: Depends: sgml-base mais il n'est pas installé\n"
-"  bash-builtins: Depends: bash (>= 2.01) but 2.0-3 is installed\n"
+"  bash-builtins: Depends: bash (&gt;= 2.01) but 2.0-3 is installed\n"
 "  cthugha: Depends: svgalibg1 mais il n'est pas installé\n"
-"           Depends: xlib6g (>= 3.3-5) mais il n'est pas installé\n"
-"  libreadlineg2: Conflicts:libreadline2 (<< 2.1-2.1)"
+"           Depends: xlib6g (&gt;= 3.3-5) mais il n'est pas installé\n"
+"  libreadlineg2: Conflicts:libreadline2 (&lt;&lt; 2.1-2.1)\n"
 
-#. type: <p></p>
-#: guide.sgml:329
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:344
 msgid ""
 "In this example the system has many problems, including a serious problem "
 "with libreadlineg2. For each package that has unmet dependencies a line is "
@@ -9211,89 +9261,97 @@ msgstr ""
 "paquet dont les dépendances ne sont pas satisfaites, indiquant quel est le "
 "problème. Une explication simple du problème est donnée."
 
-#. type: <p></p>
-#: guide.sgml:337
+#. type: Content of: <book><chapter><section><para><footnote><para>
+#: guide.dbk:353
+msgid ""
+"APT however considers all known dependencies and attempts to prevent broken "
+"packages"
+msgstr ""
+"Cependant, APT prend en compte les dépendances connues et s'efforce d'éviter "
+"que cette situation ne se produise"
+
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:351
 msgid ""
 "There are two ways a system can get into a broken state like this. The first "
-"is caused by <prgn>dpkg</prgn> missing some subtle relationships between "
-"packages when performing upgrades. <footnote><p>APT however considers all "
-"known dependencies and attempts to prevent broken packages</p></footnote>. "
-"The second is if a package installation fails during an operation. In this "
-"situation a package may have been unpacked without its dependents being "
-"installed."
+"is caused by <command>dpkg</command> missing some subtle relationships "
+"between packages when performing upgrades. <placeholder type=\"footnote\" id="
+"\"0\"/>. The second is if a package installation fails during an operation. "
+"In this situation a package may have been unpacked without its dependents "
+"being installed."
 msgstr ""
 "Il existe deux façons pour le système d'aboutir à cet état. Cela peut "
 "d'abord être causé par des subtilités de relations entre les paquets que "
-"<prgn>dpkg</prgn> aurait manquées lors de mises à jour. "
-"<footnote><p>Cependant, APT prend en compte les dépendances connues et "
-"s'efforce d'éviter que cette situation ne se produise</p></footnote>. Cela "
-"peut également être dû à l'échec antérieur d'une installation de paquet. "
-"Dans le cas présent, un paquet a pu être décompressé sans que ses "
-"dépendances ne soient satisfaites."
+"<command>dpkg</command> aurait manquées lors de mises à jour. <placeholder "
+"type=\"footnote\" id=\"0\"/>. Cela peut également être dû à l'échec "
+"antérieur d'une installation de paquet. Dans le cas présent, un paquet a pu "
+"être décompressé sans que ses dépendances ne soient satisfaites."
 
-#. type: <p></p>
-#: guide.sgml:345
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:360
 msgid ""
 "The second situation is much less serious than the first because APT places "
 "certain constraints on the order that packages are installed. In both cases "
-"supplying the <tt>-f</tt> option to <prgn>apt-get</prgn> will cause APT to "
-"deduce a possible solution to the problem and then continue on. The APT "
-"<prgn>dselect</prgn> method always supplies the <tt>-f</tt> option to allow "
-"for easy continuation of failed maintainer scripts."
+"supplying the <literal>-f</literal> option to <command>apt-get</command> "
+"will cause APT to deduce a possible solution to the problem and then "
+"continue on. The APT <command>dselect</command> method always supplies the "
+"<literal>-f</literal> option to allow for easy continuation of failed "
+"maintainer scripts."
 msgstr ""
 "La seconde situation est moins grave que la première car APT met certaines "
 "contraintes sur l'ordre d'installation des paquets. Dans les deux cas, "
-"l'option  <tt>-f</tt> utilisée avec <prgn>apt-get</prgn> conduira APT à "
-"rechercher une solution possible puis à continuer. La méthode APT de "
-"<prgn>dselect</prgn> utilise toujours cette option <tt>-f</tt> afin de "
-"pouvoir poursuivre plus facilement ses opérations si un script de mainteneur "
-"échoue de manière inopinée."
-
-#. type: <p></p>
-#: guide.sgml:351
-msgid ""
-"However, if the <tt>-f</tt> option is used to correct a seriously broken "
-"system caused by the first case then it is possible that it will either fail "
-"immediately or the installation sequence will fail. In either case it is "
-"necessary to manually use dpkg (possibly with forcing options) to correct "
-"the situation enough to allow APT to proceed."
-msgstr ""
-"Cependant, si l'option <tt>-f</tt> est utilisée pour corriger un système "
-"fortement corrompu qui est dans le premier cas, il est possible que "
+"l'option  <literal>-f</literal> utilisée avec <command>apt-get</command> "
+"conduira APT à rechercher une solution possible puis à continuer. La méthode "
+"APT de <command>dselect</command> utilise toujours cette option <literal>-f</"
+"literal> afin de pouvoir poursuivre plus facilement ses opérations si un "
+"script de mainteneur échoue de manière inopinée."
+
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:369
+msgid ""
+"However, if the <literal>-f</literal> option is used to correct a seriously "
+"broken system caused by the first case then it is possible that it will "
+"either fail immediately or the installation sequence will fail. In either "
+"case it is necessary to manually use dpkg (possibly with forcing options) to "
+"correct the situation enough to allow APT to proceed."
+msgstr ""
+"Cependant, si l'option <literal>-f</literal> est utilisée pour corriger un "
+"système fortement corrompu qui est dans le premier cas, il est possible que "
 "l'opération échoue immédiatement ou au cours des diverses tentatives de "
 "réparation effectuées. Dans tous les cas, il peut être nécessaire de "
 "corriger la situation manuellement avec dpkg (éventuellement en utilisant "
 "des options pour forcer certains opérations) avant de pouvoir utiliser à "
 "nouveau APT."
 
-#. type: <heading></heading>
-#: guide.sgml:356
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:377
 msgid "The Status Report"
 msgstr "Le rapport d'état"
 
-#. type: <p></p>
-#: guide.sgml:363
-msgid ""
-"Before proceeding <prgn>apt-get</prgn> will present a report on what will "
-"happen. Generally the report reflects the type of operation being performed "
-"but there are several common elements. In all cases the lists reflect the "
-"final state of things, taking into account the <tt>-f</tt> option and any "
-"other relevant activities to the command being executed."
-msgstr ""
-"Avant de démarrer ses actions, <prgn>apt-get</prgn> en affiche un résumé. En "
-"général, ce rapport dépend du type d'opération qui est entreprise, mais de "
-"nombreux éléments sont communs aux différents types de rapports. Ainsi, dans "
-"tous les cas, les listes reflètent l'état final du système, en tenant compte "
-"de l'option <tt>-f</tt> et des autres opérations découlant du type de "
-"commande utilisée."
-
-#. type: <heading></heading>
-#: guide.sgml:364
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:379
+msgid ""
+"Before proceeding <command>apt-get</command> will present a report on what "
+"will happen. Generally the report reflects the type of operation being "
+"performed but there are several common elements. In all cases the lists "
+"reflect the final state of things, taking into account the <literal>-f</"
+"literal> option and any other relevant activities to the command being "
+"executed."
+msgstr ""
+"Avant de démarrer ses actions, <command>apt-get</command> en affiche un "
+"résumé. En général, ce rapport dépend du type d'opération qui est "
+"entreprise, mais de nombreux éléments sont communs aux différents types de "
+"rapports. Ainsi, dans tous les cas, les listes reflètent l'état final du "
+"système, en tenant compte de l'option <literal>-f</literal> et des autres "
+"opérations découlant du type de commande utilisée."
+
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:386
 msgid "The Extra Package list"
 msgstr "La liste des paquets supplémentaires"
 
-#. type: <example></example>
-#: guide.sgml:372
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:388
 #, no-wrap
 msgid ""
 "The following extra packages will be installed:\n"
@@ -9301,86 +9359,86 @@ msgid ""
 "  mailpgp xdpkg fileutils pinepgp zlib1g xlib6g perl-base\n"
 "  bin86 libgdbm1 libgdbmg1 quake-lib gmp2 bcc xbuffy\n"
 "  squake pgp-i python-base debmake ldso perl libreadlineg2\n"
-"  ssh"
+"  ssh\n"
 msgstr ""
 "Les paquets supplémentaires suivants seront installés :\n"
 "  libdbd-mysql-perl xlib6 zlib1 xzx libreadline2 libdbd-msql-perl\n"
 "  mailpgp xdpkg fileutils pinepgp zlib1g xlib6g perl-base\n"
 "  bin86 libgdbm1 libgdbmg1 quake-lib gmp2 bcc xbuffy\n"
 "  squake pgp-i python-base debmake ldso perl libreadlineg2\n"
-"  ssh"
+"  ssh\n"
 
-#. type: <p></p>
-#: guide.sgml:379
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:396
 msgid ""
 "The Extra Package list shows all of the packages that will be installed or "
 "upgraded in excess of the ones mentioned on the command line. It is only "
-"generated for an <tt>install</tt> command. The listed packages are often the "
-"result of an Auto Install."
+"generated for an <literal>install</literal> command. The listed packages are "
+"often the result of an Auto Install."
 msgstr ""
 "La liste des paquets supplémentaires montre tous les paquets installés ou "
 "mis à jour en plus de ceux indiqués à la ligne de commande. Elle n'apparaît "
-"qu'avec la commande <tt>install</tt>. Le plus souvent, les paquets concernés "
-"sont le résultat d'une installation automatique."
+"qu'avec la commande <literal>install</literal>. Le plus souvent, les paquets "
+"concernés sont le résultat d'une installation automatique."
 
-#. type: <heading></heading>
-#: guide.sgml:382
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:403
 msgid "The Packages to Remove"
 msgstr "Les paquets à supprimer"
 
-#. type: <example></example>
-#: guide.sgml:389
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:405
 #, no-wrap
 msgid ""
 "The following packages will be REMOVED:\n"
 "  xlib6-dev xpat2 tk40-dev xkeycaps xbattle xonix\n"
 "  xdaliclock tk40 tk41 xforms0.86 ghostview xloadimage xcolorsel\n"
 "  xadmin xboard perl-debug tkined xtetris libreadline2-dev perl-suid\n"
-"  nas xpilot xfig"
+"  nas xpilot xfig\n"
 msgstr ""
 "Les paquets suivants seront ENLEVÉS :\n"
 "  xlib6-dev xpat2 tk40-dev xkeycaps xbattle xonix\n"
 "  xdaliclock tk40 tk41 xforms0.86 ghostview xloadimage xcolorsel\n"
 "  xadmin xboard perl-debug tkined xtetris libreadline2-dev perl-suid\n"
-"  nas xpilot xfig"
+"  nas xpilot xfig\n"
 
-#. type: <p></p>
-#: guide.sgml:399
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:412
 msgid ""
 "The Packages to Remove list shows all of the packages that will be removed "
 "from the system. It can be shown for any of the operations and should be "
 "given a careful inspection to ensure nothing important is to be taken off. "
-"The <tt>-f</tt> option is especially good at generating packages to remove "
-"so extreme care should be used in that case. The list may contain packages "
-"that are going to be removed because they are only partially installed, "
-"possibly due to an aborted installation."
+"The <literal>-f</literal> option is especially good at generating packages "
+"to remove so extreme care should be used in that case. The list may contain "
+"packages that are going to be removed because they are only partially "
+"installed, possibly due to an aborted installation."
 msgstr ""
 "La liste des paquets à enlever montre tous les paquets qui seront supprimés "
 "du système. Elle peut apparaître pour tout type d'opération. Il est "
 "conseillé de l'inspecter en détail afin de vérifier qu'aucun paquet "
-"important ne va être supprimé. L'option  <tt>-f</tt> provoque notamment "
-"souvent des suppressions de paquets et il est déconseillé d'être "
+"important ne va être supprimé. L'option  <literal>-f</literal> provoque "
+"notamment souvent des suppressions de paquets et il est déconseillé d'être "
 "particulièrement attentif dans ce genre de cas. La liste peut comporter des "
 "paquets qui seront supprimés parce qu'ils sont seulement partiellement "
 "installés, par exemple après l'interruption d'une opération d'installation."
 
-#. type: <heading></heading>
-#: guide.sgml:402
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:422
 msgid "The New Packages list"
 msgstr "La liste des nouveaux paquets"
 
-#. type: <example></example>
-#: guide.sgml:406
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:424
 #, no-wrap
 msgid ""
 "The following NEW packages will installed:\n"
-"  zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base"
+"  zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base\n"
 msgstr ""
 "Les NOUVEAUX paquets suivants seront installés :\n"
-"  zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base"
+"  zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base\n"
 
-#. type: <p></p>
-#: guide.sgml:411
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:428
 msgid ""
 "The New Packages list is simply a reminder of what will happen. The packages "
 "listed are not presently installed in the system but will be when APT is "
@@ -9390,58 +9448,58 @@ msgstr ""
 "avoir lieu. Les paquets affichés ne sont pas encore présents sur le système "
 "mais le seront une fois qu'APT aura terminé."
 
-#. type: <heading></heading>
-#: guide.sgml:414
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:433
 msgid "The Kept Back list"
 msgstr "La liste des paquets conservés"
 
-#. type: <example></example>
-#: guide.sgml:419
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:435
 #, no-wrap
 msgid ""
 "The following packages have been kept back\n"
 "  compface man-db tetex-base msql libpaper svgalib1\n"
-"  gs snmp arena lynx xpat2 groff xscreensaver"
+"  gs snmp arena lynx xpat2 groff xscreensaver\n"
 msgstr ""
 "Les paquets suivants ont été conservés :\n"
 "  compface man-db tetex-base msql libpaper svgalib1\n"
-"  gs snmp arena lynx xpat2 groff xscreensaver"
+"  gs snmp arena lynx xpat2 groff xscreensaver\n"
 
-#. type: <p></p>
-#: guide.sgml:428
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:440
 msgid ""
 "Whenever the whole system is being upgraded there is the possibility that "
 "new versions of packages cannot be installed because they require new things "
 "or conflict with already installed things. In this case the package will "
 "appear in the Kept Back list. The best way to convince packages listed there "
-"to install is with <tt>apt-get install</tt> or by using <prgn>dselect</prgn> "
-"to resolve their problems."
+"to install is with <literal>apt-get install</literal> or by using "
+"<command>dselect</command> to resolve their problems."
 msgstr ""
 "À chaque fois que le système entier est mis à jour, il est possible que de "
 "nouvelles versions de paquets ne puissent pas être installées car elles ont "
 "besoins ne nouveaux paquets ou qu'elles entrent en conflit avec des paquets "
 "existants. Ces paquets apparaîtront alors dans la liste des paquets "
 "conservés. Le meilleure méthode pour effectivement installer ces paquets est "
-"souvent de le faire explicitement avec la commande <tt>apt-get install</tt> "
-"ou avec <prgn>dselect</prgn>."
+"souvent de le faire explicitement avec la commande <literal>apt-get install</"
+"literal> ou avec <command>dselect</command>."
 
-#. type: <heading></heading>
-#: guide.sgml:431
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:449
 msgid "Held Packages warning"
 msgstr "L'avertissement pour paquets retenus"
 
-#. type: <example></example>
-#: guide.sgml:435
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:451
 #, no-wrap
 msgid ""
 "The following held packages will be changed:\n"
-"  cvs"
+"  cvs\n"
 msgstr ""
 "Les paquets retenus suivants seront changés :\n"
-"  cvs"
+"  cvs\n"
 
-#. type: <p></p>
-#: guide.sgml:441
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:455
 msgid ""
 "Sometimes you can ask APT to install a package that is on hold, in such a "
 "case it prints out a warning that the held package is going to be changed. "
@@ -9452,32 +9510,32 @@ msgstr ""
 "que le paquet retenu va être modifié. Cela ne se produira que lors de "
 "l'utilisation des commandes dist-upgrade ou install."
 
-#. type: <heading></heading>
-#: guide.sgml:444
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:461
 msgid "Final summary"
 msgstr "Résumé final"
 
-#. type: <p></p>
-#: guide.sgml:447
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:463
 msgid ""
 "Finally, APT will print out a summary of all the changes that will occur."
 msgstr ""
 "Enfin, APT affichera un résumé de toutes les opérations qui prendront place."
 
-#. type: <example></example>
-#: guide.sgml:452
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:466
 #, no-wrap
 msgid ""
 "206 packages upgraded, 8 newly installed, 23 to remove and 51 not upgraded.\n"
 "12 packages not fully installed or removed.\n"
-"Need to get 65.7M/66.7M of archives. After unpacking 26.5M will be used."
+"Need to get 65.7M/66.7M of archives. After unpacking 26.5M will be used.\n"
 msgstr ""
 "206 paquets mis à jour, 8 nouvellement installés, 23 à enlever et 51 non mis à jour.\n"
 "12 paquets partiellement installés ou enlevés.\n"
-"Il est nécessaire de prendre 65,7Mo/66,7Mo dans les archives. Après cette opération, 26,5Mo d'espace disque supplémentaires seront utilisés."
+"Il est nécessaire de prendre 65,7Mo/66,7Mo dans les archives. Après cette opération, 26,5Mo d'espace disque supplémentaires seront utilisés.\n"
 
-#. type: <p></p>
-#: guide.sgml:470
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:471
 msgid ""
 "The first line of the summary simply is a reduced version of all of the "
 "lists and includes the number of upgrades - that is packages already "
@@ -9508,8 +9566,8 @@ msgstr ""
 "opérations. Si de nombreux paquets sont supprimés, cette valeur peut "
 "représenter l'espace qui est alors libéré."
 
-#. type: <p></p>
-#: guide.sgml:473
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:485
 msgid ""
 "Some other reports can be generated by using the -u option to show packages "
 "to upgrade, they are similar to the previous examples."
@@ -9517,13 +9575,13 @@ msgstr ""
 "D'autres rapports peuvent être créés avec l'option -u qui affiche les "
 "paquets à mettre à jour. Il sont analogues aux exemples précédents."
 
-#. type: <heading></heading>
-#: guide.sgml:477
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:492
 msgid "The Status Display"
 msgstr "L'affichage d'état"
 
-#. type: <p></p>
-#: guide.sgml:481
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:494
 msgid ""
 "During the download of archives and package files APT prints out a series of "
 "status messages."
@@ -9531,8 +9589,8 @@ msgstr ""
 "Pendant le téléchargement des fichiers des paquets, APT affiche un certain "
 "nombre de messages d'avancement."
 
-#. type: <example></example>
-#: guide.sgml:490
+#. type: Content of: <book><chapter><section><screen>
+#: guide.dbk:498
 #, no-wrap
 msgid ""
 "# apt-get update\n"
@@ -9541,7 +9599,7 @@ msgid ""
 "Hit http://llug.sep.bnl.gov/debian/ testing/main Packages\n"
 "Get:4 http://ftp.de.debian.org/debian-non-US/ unstable/binary-i386/ Packages\n"
 "Get:5 http://llug.sep.bnl.gov/debian/ testing/non-free Packages\n"
-"11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s"
+"11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s\n"
 msgstr ""
 "# apt-get update\n"
 "Réception de :1 http://ftp.de.debian.org/debian-non-US/ stable/non-US/ Packages\n"
@@ -9549,71 +9607,73 @@ msgstr ""
 "Atteint http://llug.sep.bnl.gov/debian/ testing/main Packages\n"
 "Réception de :4 http://ftp.de.debian.org/debian-non-US/ unstable/binary-i386/ Packages\n"
 "Réception de :5 http://llug.sep.bnl.gov/debian/ testing/non-free Packages\n"
-"11% [5 testing/non-free `Attente du fichier' 0/32.1k 0%] 2203b/s 1m52s"
+"11% [5 testing/non-free `Attente du fichier' 0/32.1k 0%] 2203b/s 1m52s\n"
 
-#. type: <p></p>
-#: guide.sgml:500
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:507
 msgid ""
-"The lines starting with <em>Get</em> are printed out when APT begins to "
-"fetch a file while the last line indicates the progress of the download. The "
-"first percent value on the progress line indicates the total percent done of "
-"all files. Unfortunately since the size of the Package files is unknown "
-"<tt>apt-get update</tt> estimates the percent done which causes some "
-"inaccuracies."
+"The lines starting with <emphasis>Get</emphasis> are printed out when APT "
+"begins to fetch a file while the last line indicates the progress of the "
+"download. The first percent value on the progress line indicates the total "
+"percent done of all files. Unfortunately since the size of the Package files "
+"is unknown <literal>apt-get update</literal> estimates the percent done "
+"which causes some inaccuracies."
 msgstr ""
 "Les lignes qui débutent par « Réception de » sont affichées quand APT "
 "démarre la récupération d'un fichier alors que la dernière ligne indique la "
 "progression du téléchargement. La première valeur de pourcentage de la ligne "
 "est le pourcentage de téléchargement déjà effectué, pour l'ensemble des "
 "fichiers. Il faut noter que, comme la taille des fichiers de paquets n'est "
-"pas connue, <tt>apt-get update</tt> estime le pourcentage effectué ce qui "
-"peut conduire à des imprécisions."
+"pas connue, <literal>apt-get update</literal> estime le pourcentage effectué "
+"ce qui peut conduire à des imprécisions."
 
-#. type: <p></p>
-#: guide.sgml:509
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:515
 msgid ""
 "The next section of the status line is repeated once for each download "
 "thread and indicates the operation being performed and some useful "
 "information about what is happening. Sometimes this section will simply read "
-"<em>Forking</em> which means the OS is loading the download module. The "
-"first word after the [ is the fetch number as shown on the history lines. "
-"The next word is the short form name of the object being downloaded. For "
-"archives it will contain the name of the package that is being fetched."
+"<emphasis>Forking</emphasis> which means the OS is loading the download "
+"module. The first word after the [ is the fetch number as shown on the "
+"history lines. The next word is the short form name of the object being "
+"downloaded. For archives it will contain the name of the package that is "
+"being fetched."
 msgstr ""
 "La section suivante de la ligne d'état est répétée pour chaque sous-tâche de "
 "téléchargement. Elle indique l'opération effectuée et d'autres informations "
-"utiles sur ce qui est en cours. Cette section indiquera parfois <em>Forking</"
-"em> ce qui indique que le système charge le module de téléchargement. Le "
-"premier mot après le crochet ouvrant ([) est le numéro d'ordre de "
-"téléchargement comme indiqué dans les lignes d'historique. Le mot suivant "
-"est le nom court de l'objet téléchargé. Pour les archives, il s'agit du nom "
-"du paquet en cours de récupération."
+"utiles sur ce qui est en cours. Cette section indiquera parfois "
+"<emphasis>Forking</emphasis> ce qui indique que le système charge le module "
+"de téléchargement. Le premier mot après le crochet ouvrant ([) est le numéro "
+"d'ordre de téléchargement comme indiqué dans les lignes d'historique. Le mot "
+"suivant est le nom court de l'objet téléchargé. Pour les archives, il s'agit "
+"du nom du paquet en cours de récupération."
 
-#. type: <p></p>
-#: guide.sgml:524
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:525
 msgid ""
 "Inside of the single quote is an informative string indicating the progress "
 "of the negotiation phase of the download. Typically it progresses from "
-"<em>Connecting</em> to <em>Waiting for file</em> to <em>Downloading</em> or "
-"<em>Resuming</em>. The final value is the number of bytes downloaded from "
-"the remote site. Once the download begins this is represented as "
-"<tt>102/10.2k</tt> indicating that 102 bytes have been fetched and 10.2 "
-"kilobytes is expected. The total size is always shown in 4 figure notation "
-"to preserve space. After the size display is a percent meter for the file "
-"itself. The second last element is the instantaneous average speed. This "
-"values is updated every 5 seconds and reflects the rate of data transfer for "
-"that period. Finally is shown the estimated transfer time. This is updated "
-"regularly and reflects the time to complete everything at the shown transfer "
-"rate."
+"<emphasis>Connecting</emphasis> to <emphasis>Waiting for file</emphasis> to "
+"<emphasis>Downloading</emphasis> or <emphasis>Resuming</emphasis>. The final "
+"value is the number of bytes downloaded from the remote site. Once the "
+"download begins this is represented as <literal>102/10.2k</literal> "
+"indicating that 102 bytes have been fetched and 10.2 kilobytes is expected. "
+"The total size is always shown in 4 figure notation to preserve space. After "
+"the size display is a percent meter for the file itself. The second last "
+"element is the instantaneous average speed. This values is updated every 5 "
+"seconds and reflects the rate of data transfer for that period. Finally is "
+"shown the estimated transfer time. This is updated regularly and reflects "
+"the time to complete everything at the shown transfer rate."
 msgstr ""
 "À l'intérieur des guillemets, on trouve une information sur la progression "
 "de la phase de négociation du téléchargement. Usuellement, elle évolue de "
-"<em>Connexion</em> à <em>Attente du fichier</em>, puis <em>Téléchargement</"
-"em> ou <em>Reprise</em>. La valeur finale est le nombre d'octets téléchargés "
-"depuis le site distant. Une fois le téléchargement commencé, cette "
-"indication prend la forme <tt>102/10,2ko</tt>, ce qui indique que 102 octets "
-"ont été téléchargés et que 10,2 kilo-octets sont attendus. La taille totale "
-"est toujours représentées sur 4 digits pour des raisons de place disponible. "
+"<emphasis>Connexion</emphasis> à <emphasis>Attente du fichier</emphasis>, "
+"puis <emphasis>Téléchargement</emphasis> ou <emphasis>Reprise</emphasis>. La "
+"valeur finale est le nombre d'octets téléchargés depuis le site distant. Une "
+"fois le téléchargement commencé, cette indication prend la forme "
+"<literal>102/10,2ko</literal>, ce qui indique que 102 octets ont été "
+"téléchargés et que 10,2 kilo-octets sont attendus. La taille totale est "
+"toujours représentées sur 4 digits pour des raisons de place disponible. "
 "Après cet affichage de taille, se trouve une barre de progression pour le "
 "téléchargement du fichier lui-même. L'élément suivant est la vitesse "
 "instantanée de téléchargement. Elle est mise à jour toutes les 5 secondes et "
@@ -9622,57 +9682,52 @@ msgstr ""
 "régulièrement à jour et représete la durée estimée de téléchargement de "
 "toute ce qui est nécessaire, à la vitesse affichée."
 
-#. type: <p></p>
-#: guide.sgml:530
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:540
 msgid ""
 "The status display updates every half second to provide a constant feedback "
 "on the download progress while the Get lines scroll back whenever a new file "
 "is started. Since the status display is constantly updated it is unsuitable "
-"for logging to a file, use the <tt>-q</tt> option to remove the status "
-"display."
+"for logging to a file, use the <literal>-q</literal> option to remove the "
+"status display."
 msgstr ""
 "La ligne d'état est mise à jour chaque demi-seconde afin de fournir un "
 "retour régulier sur la progression du téléchargement alors que les lignes "
 "« Réception de » reculent d'une unité à chaque fois qu'un nouveau fichier "
 "est démarré. Comme l'état est mis à jour régulièrement, il ne peut pas "
 "servir pour la journalisation dans un fichier. Il est nécessaire d'utiliser "
-"l'option <tt>-q</tt> pour supprimer cet affichage."
+"l'option <literal>-q</literal> pour supprimer cet affichage."
 
-#. type: <heading></heading>
-#: guide.sgml:535
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:548
 msgid "Dpkg"
 msgstr "Dpkg"
 
-#. type: <p></p>
-#: guide.sgml:542
-msgid ""
-"APT uses <prgn>dpkg</prgn> for installing the archives and will switch over "
-"to the <prgn>dpkg</prgn> interface once downloading is completed. "
-"<prgn>dpkg</prgn> will also ask a number of questions as it processes the "
-"packages and the packages themselves may also ask several questions. Before "
-"each question there is usually a description of what it is asking and the "
-"questions are too varied to discuss completely here."
-msgstr ""
-"APT utilise <prgn>dpkg</prgn> pour installer les archives et bascule vers "
-"l'interface de ce programme une fois le téléchargement terminé. <prgn>dpkg</"
-"prgn> peut poser un certain nombre de questions pendant le traitement des "
-"paquets, qui peuvent eux-même être amener à poser des questions. Chacune de "
-"ces questions comporte un description de ce qui est attendu et elles sont "
-"trop variables d'un paquet à l'autre pour qu'une description détaillée soit "
-"donnée dans ce document."
-
-#. type: <title></title>
-#: offline.sgml:4
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:550
+msgid ""
+"APT uses <command>dpkg</command> for installing the archives and will switch "
+"over to the <command>dpkg</command> interface once downloading is completed. "
+"<command>dpkg</command> will also ask a number of questions as it processes "
+"the packages and the packages themselves may also ask several questions. "
+"Before each question there is usually a description of what it is asking and "
+"the questions are too varied to discuss completely here."
+msgstr ""
+"APT utilise <command>dpkg</command> pour installer les archives et bascule "
+"vers l'interface de ce programme une fois le téléchargement terminé. "
+"<command>dpkg</command> peut poser un certain nombre de questions pendant le "
+"traitement des paquets, qui peuvent eux-même être amener à poser des "
+"questions. Chacune de ces questions comporte un description de ce qui est "
+"attendu et elles sont trop variables d'un paquet à l'autre pour qu'une "
+"description détaillée soit donnée dans ce document."
+
+#. type: Content of: <book><title>
+#: offline.dbk:11
 msgid "Using APT Offline"
 msgstr "Utilisation d'APT hors ligne"
 
-#. type: <version></version>
-#: offline.sgml:7
-msgid "$Id: offline.sgml,v 1.8 2003/02/12 15:06:41 doogie Exp $"
-msgstr "$Id: offline.sgml,v 1.8 2003/02/12 15:06:41 doogie Exp $"
-
-#. type: <abstract></abstract>
-#: offline.sgml:12
+#. type: Content of: <book><bookinfo><abstract><para>
+#: offline.dbk:25
 msgid ""
 "This document describes how to use APT in a non-networked environment, "
 "specifically a 'sneaker-net' approach for performing upgrades."
@@ -9681,23 +9736,25 @@ msgstr ""
 "réseau, et plus particulièrement une approche « sneaker-net » pour les mises "
 "à jour."
 
-#. type: <copyrightsummary></copyrightsummary>
-#: offline.sgml:16
-msgid "Copyright &copy; Jason Gunthorpe, 1999."
-msgstr "Copyright &copy; Jason Gunthorpe, 1999."
+#. type: Content of: <book><bookinfo>
+#: offline.dbk:30
+msgid ""
+"<copyright><year>1999</year><holder>Jason Gunthorpe</holder></copyright>"
+msgstr ""
+"<copyright><year>1999</year><holder>Jason Gunthorpe</holder></copyright>"
 
-#. type: <heading></heading>
-#: offline.sgml:32
+#. type: Content of: <book><chapter><title>
+#: offline.dbk:48
 msgid "Introduction"
 msgstr "Introduction"
 
-#. type: <heading></heading>
-#: offline.sgml:34 offline.sgml:65 offline.sgml:180
+#. type: Content of: <book><chapter><section><title>
+#: offline.dbk:50 offline.dbk:80 offline.dbk:192
 msgid "Overview"
 msgstr "Aperçu"
 
-#. type: <p></p>
-#: offline.sgml:40
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:52
 msgid ""
 "Normally APT requires direct access to a Debian archive, either from a local "
 "media or through a network. Another common complaint is that a Debian "
@@ -9709,8 +9766,8 @@ msgstr ""
 "est celui d'une machine dotée d'une liaison peu rapide (comme un modem) avec "
 "une autre possédant une connexion à haut débit mais située à distance."
 
-#. type: <p></p>
-#: offline.sgml:51
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:58
 msgid ""
 "The solution to this is to use large removable media such as a Zip disc or a "
 "SuperDisk disc. These discs are not large enough to store the entire Debian "
@@ -9718,9 +9775,9 @@ msgid ""
 "to use APT to generate a list of packages that are required and then fetch "
 "them onto the disc using another machine with good connectivity. It is even "
 "possible to use another Debian machine with APT or to use a completely "
-"different OS and a download tool like wget. Let <em>remote host</em> mean "
-"the machine downloading the packages, and <em>target host</em> the one with "
-"bad or no connection."
+"different OS and a download tool like wget. Let <emphasis>remote host</"
+"emphasis> mean the machine downloading the packages, and <emphasis>target "
+"host</emphasis> the one with bad or no connection."
 msgstr ""
 "Une solution est d'utiliser un support amovible de grande taille tel qu'un "
 "disque Zip ou un disque Superdisk (NdT : ce document est daté..:-)). Bien "
@@ -9731,11 +9788,12 @@ msgstr ""
 "récupérer avec une machine disposant d'une bonne connectivité. Il est même "
 "possible d'utiliser soit une autre machine Debian avec APT soit un autre "
 "système d'exploitation et un outil de téléchargement tel que wget. Dans ce "
-"qui suit, <em>machine distante</em> désignera la machine qui télécharge les "
-"paquets et <em>machine cible</em>, celle qui a une connectivité limitée."
+"qui suit, <emphasis>machine distante</emphasis> désignera la machine qui "
+"télécharge les paquets et <emphasis>machine cible</emphasis>, celle qui a "
+"une connectivité limitée."
 
-#. type: <p></p>
-#: offline.sgml:57
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:69
 msgid ""
 "This is achieved by creatively manipulating the APT configuration file. The "
 "essential premise to tell APT to look on a disc for it's archive files. Note "
@@ -9748,13 +9806,13 @@ msgstr ""
 "système de fichier autorisant les noms longs, par exemple ext2, fat32 ou "
 "vfat."
 
-#. type: <heading></heading>
-#: offline.sgml:63
+#. type: Content of: <book><chapter><title>
+#: offline.dbk:78
 msgid "Using APT on both machines"
 msgstr "Utilisation d'APT sur les deux machines"
 
-#. type: <p><example>
-#: offline.sgml:71
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:82
 msgid ""
 "APT being available on both machines gives the simplest configuration. The "
 "basic idea is to place a copy of the status file on the disc and use the "
@@ -9767,8 +9825,8 @@ msgstr ""
 "et choisir ceux à télécharger. La structure des répertoires du disque "
 "devraient ressembler à :"
 
-#. type: <example></example>
-#: offline.sgml:80
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:88
 #, no-wrap
 msgid ""
 "  /disc/\n"
@@ -9778,7 +9836,7 @@ msgid ""
 "       partial/\n"
 "    status\n"
 "    sources.list\n"
-"    apt.conf"
+"    apt.conf\n"
 msgstr ""
 "  /disc/\n"
 "    archives/\n"
@@ -9787,42 +9845,44 @@ msgstr ""
 "       partial/\n"
 "    status\n"
 "    sources.list\n"
-"    apt.conf"
+"    apt.conf\n"
 
-#. type: <heading></heading>
-#: offline.sgml:88
+#. type: Content of: <book><chapter><section><title>
+#: offline.dbk:99
 msgid "The configuration file"
 msgstr "Le fichier de configuration"
 
-#. type: <p></p>
-#: offline.sgml:96
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:101
 msgid ""
 "The configuration file should tell APT to store its files on the disc and to "
 "use the configuration files on the disc as well. The sources.list should "
 "contain the proper sites that you wish to use from the remote machine, and "
-"the status file should be a copy of <em>/var/lib/dpkg/status</em> from the "
-"<em>target host</em>. Please note, if you are using a local archive you must "
-"use copy URIs, the syntax is identical to file URIs."
+"the status file should be a copy of <emphasis>/var/lib/dpkg/status</"
+"emphasis> from the <emphasis>target host</emphasis>. Please note, if you are "
+"using a local archive you must use copy URIs, the syntax is identical to "
+"file URIs."
 msgstr ""
 "Le fichier de configuration indique à APT où conserver ses fichiers sur le "
 "disque et d'utiliser également les fichiers de configuration du disque. Le "
 "fichier sources.list devrait référencer les sites que vous souhaitez "
 "utiliser depuis la machine distante et le fichier d'état doit être une copie "
-"de <em>/var/lib/dpkg/status</em> de l'<em>ordinateur cible</em>. Veuillez "
-"noter que si sous utilisez une archive locale, les URI doivent en être "
-"copiés. La syntaxe est la même que celle des URI fichiers."
+"de <emphasis>/var/lib/dpkg/status</emphasis> de l'<emphasis>ordinateur "
+"cible</emphasis>. Veuillez noter que si sous utilisez une archive locale, "
+"les URI doivent en être copiés. La syntaxe est la même que celle des URI "
+"fichiers."
 
-#. type: <p><example>
-#: offline.sgml:100
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:109
 msgid ""
-"<em>apt.conf</em> must contain the necessary information to make APT use the "
-"disc:"
+"<emphasis>apt.conf</emphasis> must contain the necessary information to make "
+"APT use the disc:"
 msgstr ""
-"<em>apt.conf</em> doit avoir les informations nécessaires pour qu'APT "
-"utilise le disque.disc:"
+"<emphasis>apt.conf</emphasis> doit avoir les informations nécessaires pour "
+"qu'APT utilise le disque.disc:"
 
-#. type: <example></example>
-#: offline.sgml:124
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:113
 #, no-wrap
 msgid ""
 " APT\n"
@@ -9830,10 +9890,10 @@ msgid ""
 "   /* This is not necessary if the two machines are the same arch, it tells\n"
 "      the remote APT what architecture the target machine is */\n"
 "   Architecture \"i386\";\n"
-"   \n"
+"\n"
 "   Get::Download-Only \"true\";\n"
 " };\n"
-" \n"
+"\n"
 " Dir\n"
 " {\n"
 "   /* Use the disc for state information and redirect the status file from\n"
@@ -9844,20 +9904,20 @@ msgid ""
 "   // Binary caches will be stored locally\n"
 "   Cache::archives \"/disc/archives/\";\n"
 "   Cache \"/tmp/\";\n"
-"   \n"
+"\n"
 "   // Location of the source list.\n"
 "   Etc \"/disc/\";\n"
-" };"
+" };\n"
 msgstr ""
 " APT\n"
 " {\n"
 "   /* This is not necessary if the two machines are the same arch, it tells\n"
 "      the remote APT what architecture the target machine is */\n"
 "   Architecture \"i386\";\n"
-"   \n"
+"\n"
 "   Get::Download-Only \"true\";\n"
 " };\n"
-" \n"
+"\n"
 " Dir\n"
 " {\n"
 "   /* Use the disc for state information and redirect the status file from\n"
@@ -9868,68 +9928,71 @@ msgstr ""
 "   // Binary caches will be stored locally\n"
 "   Cache::archives \"/disc/archives/\";\n"
 "   Cache \"/tmp/\";\n"
-"   \n"
+"\n"
 "   // Location of the source list.\n"
 "   Etc \"/disc/\";\n"
-" };"
+" };\n"
 
-#. type: </example></p>
-#: offline.sgml:129
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:138
 msgid ""
 "More details can be seen by examining the apt.conf man page and the sample "
-"configuration file in <em>/usr/share/doc/apt/examples/apt.conf</em>."
+"configuration file in <emphasis>/usr/share/doc/apt/examples/apt.conf</"
+"emphasis>."
 msgstr ""
 "Plus d'informations peuvent être trouvées dans la page de manuel du fichier "
 "apt.conf et dans l'exemple de fichier de configuration que l'on peut trouver "
-"dans <em>/usr/share/doc/apt/examples/apt.conf</em>."
+"dans <emphasis>/usr/share/doc/apt/examples/apt.conf</emphasis>."
 
-#. type: <p><example>
-#: offline.sgml:136
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:143
 msgid ""
-"On the target machine the first thing to do is mount the disc and copy <em>/"
-"var/lib/dpkg/status</em> to it. You will also need to create the directories "
-"outlined in the Overview, <em>archives/partial/</em> and <em>lists/partial/</"
-"em>. Then take the disc to the remote machine and configure the sources."
-"list. On the remote machine execute the following:"
+"On the target machine the first thing to do is mount the disc and copy "
+"<emphasis>/var/lib/dpkg/status</emphasis> to it. You will also need to "
+"create the directories outlined in the Overview, <emphasis>archives/partial/"
+"</emphasis> and <emphasis>lists/partial/</emphasis>. Then take the disc to "
+"the remote machine and configure the sources.list. On the remote machine "
+"execute the following:"
 msgstr ""
 "Sur la machine cible, il est d'abord nécessaire de monter le disque et y "
-"copier le fichier <em>/var/lib/dpkg/status</em>. Il sera aussi nécessaire de "
-"créer les répertoires dans l'aperçu (Overview), <em>archives/partial/</em> "
-"and <em>lists/partial/</em>. Connecter ensuite le disque à la machine "
-"distante et configurer le fichier sources.list. Sur la machine distante, "
-"exécuter la séquence de commandes suivante :"
-
-#. type: <example></example>
-#: offline.sgml:142
+"copier le fichier <emphasis>/var/lib/dpkg/status</emphasis>. Il sera aussi "
+"nécessaire de créer les répertoires dans l'aperçu (Overview), "
+"<emphasis>archives/partial/</emphasis> and <emphasis>lists/partial/</"
+"emphasis>. Connecter ensuite le disque à la machine distante et configurer "
+"le fichier sources.list. Sur la machine distante, exécuter la séquence de "
+"commandes suivante :"
+
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:152
 #, no-wrap
 msgid ""
 " # export APT_CONFIG=\"/disc/apt.conf\"\n"
 " # apt-get update\n"
 " [ APT fetches the package files ]\n"
 " # apt-get dist-upgrade\n"
-" [ APT fetches all the packages needed to upgrade the target machine ]"
+" [ APT fetches all the packages needed to upgrade the target machine ]\n"
 msgstr ""
 " # export APT_CONFIG=\"/disc/apt.conf\"\n"
 " # apt-get update\n"
 " [ APT récupère les fichiers des paquets ]\n"
 " # apt-get dist-upgrade\n"
-" [ APT récupère tous les fichiers nécessaires à la mise à jour de la machine distante ]"
+" [ APT récupère tous les fichiers nécessaires à la mise à jour de la machine distante ]\n"
 
-#. type: </example></p>
-#: offline.sgml:149
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:159
 msgid ""
 "The dist-upgrade command can be replaced with any other standard APT "
 "commands, particularly dselect-upgrade. You can even use an APT front end "
-"such as <em>dselect</em>. However this presents a problem in communicating "
-"your selections back to the local computer."
+"such as <emphasis>dselect</emphasis>. However this presents a problem in "
+"communicating your selections back to the local computer."
 msgstr ""
 "La commande dist-upgrade peut être remplacée par toute autres commande "
 "usuelle d'APT, notamment dselect-upgrade. Il est même possible d'utiliser "
-"une interface comme <em>dselect</em>. Cependant, cela complique la "
-"communication des choix vers l'ordinateur local."
+"une interface comme <emphasis>dselect</emphasis>. Cependant, cela complique "
+"la communication des choix vers l'ordinateur local."
 
-#. type: <p><example>
-#: offline.sgml:153
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:165
 msgid ""
 "Now the disc contains all of the index files and archives needed to upgrade "
 "the target machine. Take the disc back and run:"
@@ -9938,24 +10001,24 @@ msgstr ""
 "archives nécessaires pour mettr eà jour la machine cible. Il est alors "
 "possible d'y ramener le disque et exécuter :"
 
-#. type: <example></example>
-#: offline.sgml:159
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:169
 #, no-wrap
 msgid ""
 "  # export APT_CONFIG=\"/disc/apt.conf\"\n"
 "  # apt-get check\n"
 "  [ APT generates a local copy of the cache files ]\n"
 "  # apt-get --no-d -o dir::state::status=/var/lib/dpkg/status dist-upgrade\n"
-"  [ Or any other APT command ]"
+"  [ Or any other APT command ]\n"
 msgstr ""
 "  # export APT_CONFIG=\"/disc/apt.conf\"\n"
 "  # apt-get check\n"
 "  [ APT crée la copie locale des fichiers de cache ]\n"
 "  # apt-get --no-d -o dir::state::status=/var/lib/dpkg/status dist-upgrade\n"
-"  [ Ou toute autre commande APT ]"
+"  [ Ou toute autre commande APT ]\n"
 
-#. type: <p></p>
-#: offline.sgml:165
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:176
 msgid ""
 "It is necessary for proper function to re-specify the status file to be the "
 "local one. This is very important!"
@@ -9963,8 +10026,8 @@ msgstr ""
 "Pour un fonctionnement correct, il est indispensable de ré-indiquer que le "
 "fichier d'état est le fichier local. Cela est très important."
 
-#. type: <p></p>
-#: offline.sgml:172
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:180
 msgid ""
 "If you are using dselect you can do the very risky operation of copying disc/"
 "status to /var/lib/dpkg/status so that any selections you made on the remote "
@@ -9979,25 +10042,25 @@ msgstr ""
 "possible. NE COPIEZ PAS le fichier d'état si dpkg ou APT ont été exécutés "
 "dans l'intervalle."
 
-#. type: <heading></heading>
-#: offline.sgml:178
+#. type: Content of: <book><chapter><title>
+#: offline.dbk:190
 msgid "Using APT and wget"
 msgstr "Utilisation d'APT et wget"
 
-#. type: <p></p>
-#: offline.sgml:185
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:194
 msgid ""
-"<em>wget</em> is a popular and portable download tool that can run on nearly "
-"any machine. Unlike the method above this requires that the Debian machine "
-"already has a list of available packages."
+"<emphasis>wget</emphasis> is a popular and portable download tool that can "
+"run on nearly any machine. Unlike the method above this requires that the "
+"Debian machine already has a list of available packages."
 msgstr ""
-"<em>wget</em> est un outil classique de téléchargement qui peut être exécuté "
-"sur à peu près tout type de machine. À la différence de la méthode "
-"précédente, cela impose que la machine Debian a déjà une liste des paquets "
-"disponibles."
+"<emphasis>wget</emphasis> est un outil classique de téléchargement qui peut "
+"être exécuté sur à peu près tout type de machine. À la différence de la "
+"méthode précédente, cela impose que la machine Debian a déjà une liste des "
+"paquets disponibles."
 
-#. type: <p></p>
-#: offline.sgml:190
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:199
 msgid ""
 "The basic idea is to create a disc that has only the archive files "
 "downloaded from the remote site. This is done by using the --print-uris "
@@ -10009,13 +10072,13 @@ msgstr ""
 "l'option --print-uris d'apt-get puis de la préparation d'un script wget "
 "permettant de récupérer les paquets/"
 
-#. type: <heading></heading>
-#: offline.sgml:196
+#. type: Content of: <book><chapter><section><title>
+#: offline.dbk:205
 msgid "Operation"
 msgstr "Fonctionnement"
 
-#. type: <p><example>
-#: offline.sgml:200
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:207
 msgid ""
 "Unlike the previous technique no special configuration files are required. "
 "We merely use the standard APT commands to generate the file list."
@@ -10024,22 +10087,22 @@ msgstr ""
 "spécifique n'est nécessaire. Seules les commandes standard d'APT seront "
 "utilisées pour créer la liste de ficheirs."
 
-#. type: <example></example>
-#: offline.sgml:205
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:211
 #, no-wrap
 msgid ""
-" # apt-get dist-upgrade \n"
+" # apt-get dist-upgrade\n"
 " [ Press no when prompted, make sure you are happy with the actions ]\n"
-" # apt-get -qq --print-uris dist-upgrade > uris\n"
-" # awk '{print \"wget -O \" $2 \" \" $1}' < uris > /disc/wget-script"
+" # apt-get -qq --print-uris dist-upgrade &gt; uris\n"
+" # awk '{print \"wget -O \" $2 \" \" $1}' &lt; uris &gt; /disc/wget-script\n"
 msgstr ""
 " # apt-get dist-upgrade \n"
 " [ Répondre négativement à la question, pour être sûr(e) que les actions vous conviennent ]\n"
-" # apt-get -qq --print-uris dist-upgrade > uris\n"
-" # awk '{print \"wget -O \" $2 \" \" $1}' < uris > /disc/wget-script"
+" # apt-get -qq --print-uris dist-upgrade &gt; uris\n"
+" # awk '{print \"wget -O \" $2 \" \" $1}' &lt; uris &gt; /disc/wget-script\n"
 
-#. type: </example></p>
-#: offline.sgml:210
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:217
 msgid ""
 "Any command other than dist-upgrade could be used here, including dselect-"
 "upgrade."
@@ -10047,8 +10110,8 @@ msgstr ""
 "Toute autre commande que dist-upgrade peut être utilisée, y compris dselect-"
 "upgrade."
 
-#. type: <p></p>
-#: offline.sgml:216
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:221
 msgid ""
 "The /disc/wget-script file will now contain a list of wget commands to "
 "execute in order to fetch the necessary archives. This script should be run "
@@ -10060,25 +10123,25 @@ msgstr ""
 "exécuté depuis le point de montage du disque afin que les fichiers soient "
 "écrits sur le disque."
 
-#. type: <p><example>
-#: offline.sgml:219
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:227
 msgid "The remote machine would do something like"
 msgstr "Sur la machine distante, il faudra alors exécuter l'équivalent de :"
 
-#. type: <example></example>
-#: offline.sgml:223
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:230
 #, no-wrap
 msgid ""
 "  # cd /disc\n"
 "  # sh -x ./wget-script\n"
-"  [ wait.. ]"
+"  [ wait.. ]\n"
 msgstr ""
 "  # cd /disc\n"
 "  # sh -x ./wget-script\n"
-"  [ attendre.. ]"
+"  [ attendre.. ]\n"
 
-#. type: </example><example>
-#: offline.sgml:228
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:235
 msgid ""
 "Once the archives are downloaded and the disc returned to the Debian machine "
 "installation can proceed using,"
@@ -10086,14 +10149,14 @@ msgstr ""
 "Une fois les fichiers téléchargés et le disque reconnecté à la machine "
 "Debian, l'installation peut se poursuivre avec :"
 
-#. type: <example></example>
-#: offline.sgml:230
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:239
 #, no-wrap
-msgid "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade"
-msgstr "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade"
+msgid "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade\n"
+msgstr "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade\n"
 
-#. type: </example></p>
-#: offline.sgml:234
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:242
 msgid "Which will use the already fetched archives on the disc."
 msgstr "Cette commande utilisera les fichiers récupérés sur le disque."
 
diff --git a/doc/po/it.po b/doc/po/it.po
index f2a64ea7a..76d428272 100644
--- a/doc/po/it.po
+++ b/doc/po/it.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-11 14:52+0200\n"
-"PO-Revision-Date: 2014-04-01 14:00+0200\n"
+"POT-Creation-Date: 2014-08-28 00:20+0000\n"
+"PO-Revision-Date: 2014-07-04 00:45+0200\n"
 "Last-Translator: Beatrice Torracca <beatricet@libero.it>\n"
 "Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n"
 "Language: it\n"
@@ -662,37 +662,37 @@ msgstr ""
 "473041FA --> <!ENTITY synopsis-keyid \"IDchiave\">"
 
 #. type: Content of: <refentry><refmeta><manvolnum>
-#: apt.8.xml:25 apt-get.8.xml:28 apt-cache.8.xml:28 apt-key.8.xml:27
-#: apt-mark.8.xml:28 apt-secure.8.xml:27 apt-cdrom.8.xml:27
-#: apt-config.8.xml:28
+#: apt.8.xml:21 apt-get.8.xml:22 apt-cache.8.xml:22 apt-key.8.xml:21
+#: apt-mark.8.xml:22 apt-secure.8.xml:21 apt-cdrom.8.xml:21
+#: apt-config.8.xml:22
 msgid "8"
 msgstr "8"
 
 #. type: Content of: <refentry><refmeta><refmiscinfo>
-#: apt.8.xml:26 apt-get.8.xml:29 apt-cache.8.xml:29 apt-key.8.xml:28
-#: apt-mark.8.xml:29 apt-secure.8.xml:28 apt-cdrom.8.xml:28
-#: apt-config.8.xml:29 apt.conf.5.xml:34 apt_preferences.5.xml:28
-#: sources.list.5.xml:29 apt-extracttemplates.1.xml:29 apt-sortpkgs.1.xml:29
-#: apt-ftparchive.1.xml:29
+#: apt.8.xml:22 apt-get.8.xml:23 apt-cache.8.xml:23 apt-key.8.xml:22
+#: apt-mark.8.xml:23 apt-secure.8.xml:22 apt-cdrom.8.xml:22
+#: apt-config.8.xml:23 apt.conf.5.xml:28 apt_preferences.5.xml:22
+#: sources.list.5.xml:23 apt-extracttemplates.1.xml:23 apt-sortpkgs.1.xml:23
+#: apt-ftparchive.1.xml:23
 msgid "APT"
 msgstr "APT"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt.8.xml:32
+#: apt.8.xml:28
 msgid "command-line interface"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:37 apt-get.8.xml:40 apt-cache.8.xml:40 apt-key.8.xml:39
-#: apt-mark.8.xml:40 apt-secure.8.xml:52 apt-cdrom.8.xml:39
-#: apt-config.8.xml:40 apt.conf.5.xml:43 apt_preferences.5.xml:38
-#: sources.list.5.xml:38 apt-extracttemplates.1.xml:40 apt-sortpkgs.1.xml:40
-#: apt-ftparchive.1.xml:40
+#: apt.8.xml:33 apt-get.8.xml:34 apt-cache.8.xml:34 apt-key.8.xml:33
+#: apt-mark.8.xml:34 apt-secure.8.xml:46 apt-cdrom.8.xml:33
+#: apt-config.8.xml:34 apt.conf.5.xml:37 apt_preferences.5.xml:32
+#: sources.list.5.xml:32 apt-extracttemplates.1.xml:34 apt-sortpkgs.1.xml:34
+#: apt-ftparchive.1.xml:34
 msgid "Description"
 msgstr "Descrizione"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:38
+#: apt.8.xml:34
 msgid ""
 "<command>apt</command> (Advanced Package Tool) is the command-line tool for "
 "handling packages. It provides a commandline interface for the package "
@@ -701,7 +701,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:47
+#: apt.8.xml:43
 msgid ""
 "<literal>list</literal> is used to display a list of packages. It supports "
 "shell pattern for matching package names and the following options: "
@@ -710,14 +710,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:58
+#: apt.8.xml:54
 msgid ""
 "<literal>search</literal> searches for the given term(s) and display "
 "matching packages."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:64
+#: apt.8.xml:60
 #, fuzzy
 #| msgid ""
 #| "<literal>rdepends</literal> shows a listing of each reverse dependency a "
@@ -730,14 +730,14 @@ msgstr ""
 "di un pacchetto."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:71
+#: apt.8.xml:67
 msgid ""
 "<literal>install</literal> is followed by one or more package names desired "
 "for installation or upgrading."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:75 apt-get.8.xml:118
+#: apt.8.xml:71 apt-get.8.xml:112
 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 "
@@ -755,7 +755,7 @@ msgstr ""
 "(stable, testing, unstable)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:85 apt-get.8.xml:153
+#: apt.8.xml:81 apt-get.8.xml:147
 msgid ""
 "<literal>remove</literal> is identical to <literal>install</literal> except "
 "that packages are removed instead of installed. Note that removing a package "
@@ -770,14 +770,14 @@ msgstr ""
 "in mezzo), il pacchetto specificato viene installato invece che rimosso."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:93
+#: apt.8.xml:89
 msgid ""
 "<literal>edit-sources</literal> lets you edit your sources.list file and "
 "provides basic sanity checks."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:99
+#: apt.8.xml:95
 #, fuzzy
 #| msgid ""
 #| "<literal>showhold</literal> is used to print a list of packages on hold "
@@ -790,16 +790,16 @@ msgstr ""
 "bloccati in modo uguale a ciò che fanno gli altri comandi «show»."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:105
+#: apt.8.xml:101
 msgid ""
 "<literal>upgrade</literal> is used to install the newest versions of all "
 "packages currently installed on the system from the sources enumerated in "
-"<filename>/etc/apt/sources.list</filename>. New package will be installed, "
-"but existing package will never removed."
+"<filename>/etc/apt/sources.list</filename>. New packages will be installed, "
+"but existing packages will never be removed."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:114
+#: apt.8.xml:110
 msgid ""
 "<literal>full-upgrade</literal> performs the function of upgrade but may "
 "also remove installed packages if that is required in order to resolve a "
@@ -807,19 +807,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:124 apt-get.8.xml:257 apt-cache.8.xml:250 apt-mark.8.xml:110
-#: apt-config.8.xml:86 apt-extracttemplates.1.xml:54 apt-sortpkgs.1.xml:50
-#: apt-ftparchive.1.xml:506
+#: apt.8.xml:120 apt-get.8.xml:251 apt-cache.8.xml:244 apt-mark.8.xml:104
+#: apt-config.8.xml:80 apt-extracttemplates.1.xml:48 apt-sortpkgs.1.xml:44
+#: apt-ftparchive.1.xml:500
 msgid "options"
 msgstr "opzioni"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:134
+#: apt.8.xml:130
 msgid "Script usage"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:136
+#: apt.8.xml:132
 msgid ""
 "The &apt; commandline is designed as a end-user tool and it may change the "
 "output between versions. While it tries to not break backward compatibility "
@@ -829,12 +829,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:144
+#: apt.8.xml:140
 msgid "Differences to &apt-get;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:145
+#: apt.8.xml:141
 msgid ""
 "The <command>apt</command> command is meant to be pleasant for end users and "
 "does not need to be backward compatible like &apt-get;. Therefore some "
@@ -842,28 +842,28 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml:151
+#: apt.8.xml:147
 #, fuzzy
 #| msgid "the <literal>Package:</literal> line"
 msgid "The option <literal>DPkg::Progress-Fancy</literal> is enabled."
 msgstr "la riga <literal>Package:</literal>"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml:155
+#: apt.8.xml:151
 #, fuzzy
 #| msgid "the <literal>Component:</literal> line"
 msgid "The option <literal>APT::Color</literal> is enabled."
 msgstr "la riga<literal>Component:</literal>"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml:159
+#: apt.8.xml:155
 msgid ""
 "A new <literal>list</literal> command is available similar to <literal>dpkg "
 "--list</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml:164
+#: apt.8.xml:160
 #, fuzzy
 #| msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
 msgid ""
@@ -872,16 +872,16 @@ msgid ""
 msgstr "la riga <literal>Archive:</literal> o <literal>Suite:</literal>"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:174 apt-get.8.xml:558 apt-cache.8.xml:352 apt-key.8.xml:197
-#: apt-mark.8.xml:133 apt-secure.8.xml:193 apt-cdrom.8.xml:154
-#: apt-config.8.xml:111 apt.conf.5.xml:1227 apt_preferences.5.xml:707
-#: sources.list.5.xml:280 apt-extracttemplates.1.xml:72 apt-sortpkgs.1.xml:65
-#: apt-ftparchive.1.xml:609
+#: apt.8.xml:170 apt-get.8.xml:552 apt-cache.8.xml:346 apt-key.8.xml:191
+#: apt-mark.8.xml:127 apt-secure.8.xml:187 apt-cdrom.8.xml:148
+#: apt-config.8.xml:105 apt.conf.5.xml:1222 apt_preferences.5.xml:701
+#: sources.list.5.xml:274 apt-extracttemplates.1.xml:66 apt-sortpkgs.1.xml:59
+#: apt-ftparchive.1.xml:603
 msgid "See Also"
 msgstr "Vedere anche"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:175
+#: apt.8.xml:171
 #, fuzzy
 #| msgid ""
 #| "&apt-cache;, &apt-cdrom;, &dpkg;, &sources-list;, &apt-conf;, &apt-"
@@ -896,14 +896,14 @@ msgstr ""
 "l'APT Howto."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:180 apt-get.8.xml:564 apt-cache.8.xml:357 apt-mark.8.xml:137
-#: apt-cdrom.8.xml:159 apt-config.8.xml:116 apt-extracttemplates.1.xml:76
-#: apt-sortpkgs.1.xml:69 apt-ftparchive.1.xml:613
+#: apt.8.xml:176 apt-get.8.xml:558 apt-cache.8.xml:351 apt-mark.8.xml:131
+#: apt-cdrom.8.xml:153 apt-config.8.xml:110 apt-extracttemplates.1.xml:70
+#: apt-sortpkgs.1.xml:63 apt-ftparchive.1.xml:607
 msgid "Diagnostics"
 msgstr "Diagnostica"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:181
+#: apt.8.xml:177
 #, fuzzy
 #| msgid ""
 #| "<command>apt-get</command> returns zero on normal operation, decimal 100 "
@@ -916,13 +916,13 @@ msgstr ""
 "e il valore decimale 100 in caso di errore."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-get.8.xml:35
+#: apt-get.8.xml:29
 msgid "APT package handling utility -- command-line interface"
 msgstr ""
 "strumento APT per la gestione dei pacchetti, interfaccia a riga di comando"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:41
+#: apt-get.8.xml:35
 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 "
@@ -935,8 +935,8 @@ msgstr ""
 "interfaccia, come &aptitude;, &synaptic; e &wajig;."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:46 apt-cache.8.xml:46 apt-cdrom.8.xml:53 apt-config.8.xml:46
-#: apt-ftparchive.1.xml:56
+#: apt-get.8.xml:40 apt-cache.8.xml:40 apt-cdrom.8.xml:47 apt-config.8.xml:40
+#: apt-ftparchive.1.xml:50
 msgid ""
 "Unless the <option>-h</option>, or <option>--help</option> option is given, "
 "one of the commands below must be present."
@@ -945,7 +945,7 @@ msgstr ""
 "option>, deve essere presente uno dei comandi seguenti."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:51
+#: apt-get.8.xml:45
 msgid ""
 "<literal>update</literal> is used to resynchronize the package index files "
 "from their sources. The indexes of available packages are fetched from the "
@@ -969,7 +969,7 @@ msgstr ""
 "conoscere in anticipo la dimensione dei file degli indici dei pacchetti."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:63
+#: apt-get.8.xml:57
 msgid ""
 "<literal>upgrade</literal> is used to install the newest versions of all "
 "packages currently installed on the system from the sources enumerated in "
@@ -995,7 +995,7 @@ msgstr ""
 "command> sappia se sono disponibili nuove versioni dei pacchetti."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:76
+#: apt-get.8.xml:70
 msgid ""
 "<literal>dist-upgrade</literal> in addition to performing the function of "
 "<literal>upgrade</literal>, also intelligently handles changing dependencies "
@@ -1020,7 +1020,7 @@ msgstr ""
 "scavalcare le impostazioni generali per singoli pacchetti."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:89
+#: apt-get.8.xml:83
 msgid ""
 "<literal>dselect-upgrade</literal> is used in conjunction with the "
 "traditional Debian packaging front-end, &dselect;. <literal>dselect-upgrade</"
@@ -1037,7 +1037,7 @@ msgstr ""
 "l'installazione di nuovi)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:100
+#: apt-get.8.xml:94
 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 "
@@ -1067,7 +1067,7 @@ msgstr ""
 "conflitti di apt-get."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:125
+#: apt-get.8.xml:119
 msgid ""
 "Both of the version selection mechanisms can downgrade packages and must be "
 "used with care."
@@ -1076,7 +1076,7 @@ msgstr ""
 "pacchetti e devono essere usati con cautela."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:128
+#: apt-get.8.xml:122
 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 system. "
@@ -1096,7 +1096,7 @@ msgstr ""
 "installata."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:139
+#: apt-get.8.xml:133
 msgid ""
 "Finally, the &apt-preferences; mechanism allows you to create an alternative "
 "installation policy for individual packages."
@@ -1105,7 +1105,7 @@ msgstr ""
 "di installazione alternativa per i singoli pacchetti."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:143
+#: apt-get.8.xml:137
 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 "
@@ -1125,7 +1125,7 @@ msgstr ""
 "o «$», oppure creare un'espressione regolare più specifica."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:161
+#: apt-get.8.xml:155
 msgid ""
 "<literal>purge</literal> is identical to <literal>remove</literal> except "
 "that packages are removed and purged (any configuration files are deleted "
@@ -1136,7 +1136,7 @@ msgstr ""
 "eliminato anche ogni file di configurazione)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:166
+#: apt-get.8.xml:160
 msgid ""
 "<literal>source</literal> causes <command>apt-get</command> to fetch source "
 "packages. APT will examine the available packages to decide which source "
@@ -1155,7 +1155,7 @@ msgstr ""
 "i singoli pacchetti con la sintassi <literal>pacch/rilascio</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:174
+#: apt-get.8.xml:168
 msgid ""
 "Source packages are tracked separately from binary packages via <literal>deb-"
 "src</literal> lines in the &sources-list; file. This means that you will "
@@ -1171,7 +1171,7 @@ msgstr ""
 "(troppo vecchia o troppo nuova) oppure nessuna versione."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:180
+#: apt-get.8.xml:174
 msgid ""
 "If the <option>--compile</option> option is specified then the package will "
 "be compiled to a binary .deb using <command>dpkg-buildpackage</command> for "
@@ -1186,7 +1186,7 @@ msgstr ""
 "download-only</option>, allora il pacchetto sorgente non verrà spacchettato."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:187
+#: apt-get.8.xml:181
 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 "
@@ -1201,7 +1201,7 @@ msgstr ""
 "abilitando implicitamente l'opzione <literal>APT::Get::Only-Source</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:193
+#: apt-get.8.xml:187
 msgid ""
 "Note that source packages are not installed and tracked in the "
 "<command>dpkg</command> database like binary packages; they are simply "
@@ -1213,7 +1213,7 @@ msgstr ""
 "tar dei sorgenti."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:199
+#: apt-get.8.xml:193
 msgid ""
 "<literal>build-dep</literal> causes apt-get to install/remove packages in an "
 "attempt to satisfy the build dependencies for a source package. By default "
@@ -1229,7 +1229,7 @@ msgstr ""
 "architecture</option>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:206
+#: apt-get.8.xml:200
 msgid ""
 "<literal>check</literal> is a diagnostic tool; it updates the package cache "
 "and checks for broken dependencies."
@@ -1238,7 +1238,7 @@ msgstr ""
 "pacchetti e controlla la presenza di dipendenze non soddisfatte."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:211
+#: apt-get.8.xml:205
 msgid ""
 "<literal>download</literal> will download the given binary package into the "
 "current directory."
@@ -1247,7 +1247,7 @@ msgstr ""
 "directory corrente."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:217
+#: apt-get.8.xml:211
 msgid ""
 "<literal>clean</literal> clears out the local repository of retrieved "
 "package files. It removes everything but the lock file from "
@@ -1260,7 +1260,7 @@ msgstr ""
 "file di lock."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:224
+#: apt-get.8.xml:218
 msgid ""
 "Like <literal>clean</literal>, <literal>autoclean</literal> clears out the "
 "local repository of retrieved package files. The difference is that it only "
@@ -1279,7 +1279,7 @@ msgstr ""
 "impedisce che vengano eliminati i pacchetti installati."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:234
+#: apt-get.8.xml:228
 msgid ""
 "<literal>autoremove</literal> is used to remove packages that were "
 "automatically installed to satisfy dependencies for other packages and are "
@@ -1290,7 +1290,7 @@ msgstr ""
 "pacchetti e che non sono più necessari."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:239
+#: apt-get.8.xml:233
 msgid ""
 "<literal>changelog</literal> downloads a package changelog and displays it "
 "through <command>sensible-pager</command>. The server name and base "
@@ -1313,7 +1313,7 @@ msgstr ""
 "opzioni del comando <option>install</option>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:262
+#: apt-get.8.xml:256
 msgid ""
 "Do not consider recommended packages as a dependency for installing.  "
 "Configuration Item: <literal>APT::Install-Recommends</literal>."
@@ -1323,7 +1323,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:267
+#: apt-get.8.xml:261
 msgid ""
 "Consider suggested packages as a dependency for installing.  Configuration "
 "Item: <literal>APT::Install-Suggests</literal>."
@@ -1332,7 +1332,7 @@ msgstr ""
 "Voce di configurazione:<literal>APT::Install-Suggests</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:272
+#: apt-get.8.xml:266
 msgid ""
 "Download only; package files are only retrieved, not unpacked or installed.  "
 "Configuration Item: <literal>APT::Get::Download-Only</literal>."
@@ -1342,7 +1342,7 @@ msgstr ""
 "Download-Only</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:277
+#: apt-get.8.xml:271
 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 "
@@ -1370,7 +1370,7 @@ msgstr ""
 "configurazione: <literal>APT::Get::Fix-Broken</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:292
+#: apt-get.8.xml:286
 msgid ""
 "Ignore missing packages; if packages cannot be retrieved or fail the "
 "integrity check after retrieval (corrupted package files), hold back those "
@@ -1390,7 +1390,7 @@ msgstr ""
 "configurazione: <literal>APT::Get::Fix-Missing</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:303
+#: apt-get.8.xml:297
 msgid ""
 "Disables downloading of packages. This is best used with <option>--ignore-"
 "missing</option> to force APT to use only the .debs it has already "
@@ -1401,7 +1401,7 @@ msgstr ""
 "scaricato. Voce di configurazione: <literal>APT::Get::Download</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:310
+#: apt-get.8.xml:304
 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 "
@@ -1421,7 +1421,7 @@ msgstr ""
 "qualcosa di inatteso. Voce di configurazione: <literal>quiet</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:325
+#: apt-get.8.xml:319
 msgid ""
 "No action; perform a simulation of events that would occur but do not "
 "actually change the system.  Configuration Item: <literal>APT::Get::"
@@ -1432,7 +1432,7 @@ msgstr ""
 "configurazione: <literal>APT::Get::Simulate</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:329
+#: apt-get.8.xml:323
 msgid ""
 "Simulated runs performed as a user will automatically deactivate locking "
 "(<literal>Debug::NoLocking</literal>), and if the option <literal>APT::Get::"
@@ -1451,7 +1451,7 @@ msgstr ""
 "bisogno di ulteriori avvertimenti da <literal>apt-get</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:337
+#: apt-get.8.xml:331
 msgid ""
 "Simulated runs print out a series of lines, each representing a "
 "<command>dpkg</command> operation: configure (<literal>Conf</literal>), "
@@ -1467,7 +1467,7 @@ msgstr ""
 "hanno conseguenze (rari)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:345
+#: apt-get.8.xml:339
 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 "
@@ -1484,7 +1484,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:353
+#: apt-get.8.xml:347
 msgid ""
 "Automatic \"no\" to all prompts.  Configuration Item: <literal>APT::Get::"
 "Assume-No</literal>."
@@ -1493,7 +1493,7 @@ msgstr ""
 "<literal>APT::Get::Assume-No</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:358
+#: apt-get.8.xml:352
 msgid ""
 "Show upgraded packages; print out a list of all packages that are to be "
 "upgraded.  Configuration Item: <literal>APT::Get::Show-Upgraded</literal>."
@@ -1503,7 +1503,7 @@ msgstr ""
 "Upgraded</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:364
+#: apt-get.8.xml:358
 msgid ""
 "Show full versions for upgraded and installed packages.  Configuration Item: "
 "<literal>APT::Get::Show-Versions</literal>."
@@ -1512,7 +1512,7 @@ msgstr ""
 "configurazione: <literal>APT::Get::Show-Versions</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:370
+#: apt-get.8.xml:364
 msgid ""
 "This option controls the architecture packages are built for by <command>apt-"
 "get source --compile</command> and how cross-builddependencies are "
@@ -1529,7 +1529,7 @@ msgstr ""
 "di configurazione: <literal>APT::Get::Host-Architecture</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:380
+#: apt-get.8.xml:374
 msgid ""
 "This option controls the activated build profiles for which a source package "
 "is built by <command>apt-get source --compile</command> and how build "
@@ -1545,7 +1545,7 @@ msgstr ""
 "configurazione: <literal>APT::Build-Profiles</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:391
+#: apt-get.8.xml:385
 msgid ""
 "Compile source packages after downloading them.  Configuration Item: "
 "<literal>APT::Get::Compile</literal>."
@@ -1554,7 +1554,7 @@ msgstr ""
 "<literal>APT::Get::Compile</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:396
+#: apt-get.8.xml:390
 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 "
@@ -1567,7 +1567,7 @@ msgstr ""
 "non desiderati. Voce di configurazione: <literal>APT::Ignore-Hold</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:403
+#: apt-get.8.xml:397
 msgid ""
 "Allow installing new packages when used in conjunction with "
 "<literal>upgrade</literal>.  This is useful if the update of a installed "
@@ -1586,7 +1586,7 @@ msgstr ""
 "Voce di configurazione: <literal>APT::Get::Upgrade-Allow-New</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:415
+#: apt-get.8.xml:409
 msgid ""
 "Do not upgrade packages; when used in conjunction with <literal>install</"
 "literal>, <literal>no-upgrade</literal> will prevent packages on the command "
@@ -1599,7 +1599,7 @@ msgstr ""
 "configurazione: <literal>APT::Get::Upgrade</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:422
+#: apt-get.8.xml:416
 msgid ""
 "Do not install new packages; when used in conjunction with <literal>install</"
 "literal>, <literal>only-upgrade</literal> will install upgrades for already "
@@ -1613,7 +1613,7 @@ msgstr ""
 "Upgrade</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:430
+#: apt-get.8.xml:424
 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 "
@@ -1629,7 +1629,7 @@ msgstr ""
 "yes</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:438
+#: apt-get.8.xml:432
 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 "
@@ -1650,7 +1650,7 @@ msgstr ""
 "configurazione: <literal>APT::Get::Print-URIs</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:449
+#: apt-get.8.xml:443
 msgid ""
 "Use purge instead of remove for anything that would be removed.  An asterisk "
 "(\"*\") will be displayed next to packages which are scheduled to be purged. "
@@ -1663,7 +1663,7 @@ msgstr ""
 "option>. Voce di configurazione: <literal>APT::Get::Purge</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:457
+#: apt-get.8.xml:451
 msgid ""
 "Re-install packages that are already installed and at the newest version.  "
 "Configuration Item: <literal>APT::Get::ReInstall</literal>."
@@ -1672,7 +1672,7 @@ msgstr ""
 "configurazione: <literal>APT::Get::ReInstall</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:462
+#: apt-get.8.xml:456
 msgid ""
 "This option is on by default; use <literal>--no-list-cleanup</literal> to "
 "turn it off. When it is on, <command>apt-get</command> will automatically "
@@ -1689,7 +1689,7 @@ msgstr ""
 "fonti. Voce di configurazione: <literal>APT::Get::List-Cleanup</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:472
+#: apt-get.8.xml:466
 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 "
@@ -1713,7 +1713,7 @@ msgstr ""
 "pagina di manuale di &apt-preferences;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:487
+#: apt-get.8.xml:481
 msgid ""
 "Only perform operations that are 'trivial'. Logically this can be considered "
 "related to <option>--assume-yes</option>; where <option>--assume-yes</"
@@ -1727,7 +1727,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:494
+#: apt-get.8.xml:488
 msgid ""
 "If any packages are to be removed apt-get immediately aborts without "
 "prompting.  Configuration Item: <literal>APT::Get::Remove</literal>."
@@ -1737,7 +1737,7 @@ msgstr ""
 "Get::Remove</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:500
+#: apt-get.8.xml:494
 msgid ""
 "If the command is either <literal>install</literal> or <literal>remove</"
 "literal>, then this option acts like running the <literal>autoremove</"
@@ -1751,7 +1751,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:507
+#: apt-get.8.xml:501
 msgid ""
 "Only has meaning for the <literal>source</literal> and <literal>build-dep</"
 "literal> commands.  Indicates that the given source names are not to be "
@@ -1770,7 +1770,7 @@ msgstr ""
 "configurazione: <literal>APT::Get::Only-Source</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:518
+#: apt-get.8.xml:512
 msgid ""
 "Download only the diff, dsc, or tar file of a source archive.  Configuration "
 "Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</"
@@ -1781,7 +1781,7 @@ msgstr ""
 "Dsc-Only</literal> e <literal>APT::Get::Tar-Only</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:524
+#: apt-get.8.xml:518
 msgid ""
 "Only process architecture-dependent build-dependencies.  Configuration Item: "
 "<literal>APT::Get::Arch-Only</literal>."
@@ -1790,7 +1790,7 @@ msgstr ""
 "Voce di configurazione: <literal>APT::Get::Arch-Only</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:529
+#: apt-get.8.xml:523
 msgid ""
 "Ignore if packages can't be authenticated and don't prompt about it.  This "
 "is useful for tools like pbuilder.  Configuration Item: <literal>APT::Get::"
@@ -1801,7 +1801,7 @@ msgstr ""
 "configurazione: <literal>APT::Get::AllowUnauthenticated</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:535
+#: apt-get.8.xml:529
 #, fuzzy
 #| msgid ""
 #| "Show user friendly progress information in the terminal window when "
@@ -1824,13 +1824,13 @@ msgstr ""
 "Progress-Fancy</literal>."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:548 apt-cache.8.xml:345 apt-key.8.xml:176 apt-mark.8.xml:127
-#: apt.conf.5.xml:1221 apt_preferences.5.xml:700
+#: apt-get.8.xml:542 apt-cache.8.xml:339 apt-key.8.xml:170 apt-mark.8.xml:121
+#: apt.conf.5.xml:1216 apt_preferences.5.xml:694
 msgid "Files"
 msgstr "File"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:559
+#: apt-get.8.xml:553
 msgid ""
 "&apt-cache;, &apt-cdrom;, &dpkg;, &sources-list;, &apt-conf;, &apt-config;, "
 "&apt-secure;, The APT User's guide in &guidesdir;, &apt-preferences;, the "
@@ -1841,7 +1841,7 @@ msgstr ""
 "l'APT Howto."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:565
+#: apt-get.8.xml:559
 msgid ""
 "<command>apt-get</command> returns zero on normal operation, decimal 100 on "
 "error."
@@ -1850,12 +1850,12 @@ msgstr ""
 "e il valore decimale 100 in caso di errore."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-cache.8.xml:35
+#: apt-cache.8.xml:29
 msgid "query the APT cache"
 msgstr "interroga la cache di APT"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:41
+#: apt-cache.8.xml:35
 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 "
@@ -1868,7 +1868,7 @@ msgstr ""
 "interessanti partendo dai metadati dei pacchetti."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:51
+#: apt-cache.8.xml:45
 msgid ""
 "<literal>gencaches</literal> creates APT's package cache. This is done "
 "implicitly by all commands needing this cache if it is missing or outdated."
@@ -1878,14 +1878,14 @@ msgstr ""
 "essa manca o non è aggiornata."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
-#: apt-cache.8.xml:55 apt-cache.8.xml:144 apt-cache.8.xml:165
-#: apt-cache.8.xml:187 apt-cache.8.xml:192 apt-cache.8.xml:208
-#: apt-cache.8.xml:226 apt-cache.8.xml:238
+#: apt-cache.8.xml:49 apt-cache.8.xml:138 apt-cache.8.xml:159
+#: apt-cache.8.xml:181 apt-cache.8.xml:186 apt-cache.8.xml:202
+#: apt-cache.8.xml:220 apt-cache.8.xml:232
 msgid "&synopsis-pkg;"
 msgstr "&synopsis-pkg;"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:56
+#: apt-cache.8.xml:50
 msgid ""
 "<literal>showpkg</literal> displays information about the packages listed on "
 "the command line. Remaining arguments are package names. The available "
@@ -1908,7 +1908,7 @@ msgstr ""
 "showpkg libreadline2</command> produce un risultato simile al seguente:"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
-#: apt-cache.8.xml:68
+#: apt-cache.8.xml:62
 #, no-wrap
 msgid ""
 "Package: libreadline2\n"
@@ -1934,7 +1934,7 @@ msgstr ""
 "Reverse Provides: \n"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:80
+#: apt-cache.8.xml:74
 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, "
@@ -1953,7 +1953,7 @@ msgstr ""
 "consultare il codice sorgente di apt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:89
+#: apt-cache.8.xml:83
 msgid ""
 "<literal>stats</literal> displays some statistics about the cache.  No "
 "further arguments are expected. Statistics reported are:"
@@ -1962,7 +1962,7 @@ msgstr ""
 "previsti ulteriori argomenti. Le statistiche riportate sono:"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:92
+#: apt-cache.8.xml:86
 msgid ""
 "<literal>Total package names</literal> is the number of package names found "
 "in the cache."
@@ -1971,7 +1971,7 @@ msgstr ""
 "pacchetto trovati nella cache."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:96
+#: apt-cache.8.xml:90
 msgid ""
 "<literal>Normal packages</literal> is the number of regular, ordinary "
 "package names; these are packages that bear a one-to-one correspondence "
@@ -1984,7 +1984,7 @@ msgstr ""
 "dipendenze. La maggioranza dei pacchetti ricade in questa categoria."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:102
+#: apt-cache.8.xml:96
 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 "
@@ -2001,7 +2001,7 @@ msgstr ""
 "agent», ma non c'è alcun pacchetto chiamato «mail-transport-agent»."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:110
+#: apt-cache.8.xml:104
 msgid ""
 "<literal>Single virtual packages</literal> is the number of packages with "
 "only one package providing a particular virtual package. For example, in the "
@@ -2014,7 +2014,7 @@ msgstr ""
 "pacchetto, xless, fornisce «X11-text-viewer»."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:116
+#: apt-cache.8.xml:110
 msgid ""
 "<literal>Mixed virtual packages</literal> is the number of packages that "
 "either provide a particular virtual package or have the virtual package name "
@@ -2027,7 +2027,7 @@ msgstr ""
 "sia un pacchetto vero e proprio, sia è fornito dal pacchetto debconf-tiny."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:123
+#: apt-cache.8.xml:117
 msgid ""
 "<literal>Missing</literal> is the number of package names that were "
 "referenced in a dependency but were not provided by any package. Missing "
@@ -2043,7 +2043,7 @@ msgstr ""
 "Conflicts o Breaks."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:130
+#: apt-cache.8.xml:124
 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 "
@@ -2058,7 +2058,7 @@ msgstr ""
 "essere decisamente più grande del numero dei nomi totali di pacchetto."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:137
+#: apt-cache.8.xml:131
 msgid ""
 "<literal>Total dependencies</literal> is the number of dependency "
 "relationships claimed by all of the packages in the cache."
@@ -2067,7 +2067,7 @@ msgstr ""
 "dichiarate da tutti i pacchetti nella cache."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:145
+#: apt-cache.8.xml:139
 msgid ""
 "<literal>showsrc</literal> displays all the source package records that "
 "match the given package names. All versions are shown, as well as all "
@@ -2079,7 +2079,7 @@ msgstr ""
 "pacchetto binario."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:151
+#: apt-cache.8.xml:145
 msgid ""
 "<literal>dump</literal> shows a short listing of every package in the cache. "
 "It is primarily for debugging."
@@ -2088,7 +2088,7 @@ msgstr ""
 "cache. Serve soprattutto a scopo di debug."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:156
+#: apt-cache.8.xml:150
 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."
@@ -2097,7 +2097,7 @@ msgstr ""
 "stdout. Questa è adatta all'uso con &dpkg; ed è usata dal metodo &dselect;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:161
+#: apt-cache.8.xml:155
 msgid ""
 "<literal>unmet</literal> displays a summary of all unmet dependencies in the "
 "package cache."
@@ -2106,7 +2106,7 @@ msgstr ""
 "soddisfatte nella cache dei pacchetti."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:166
+#: apt-cache.8.xml:160
 msgid ""
 "<literal>show</literal> performs a function similar to <command>dpkg --print-"
 "avail</command>; it displays the package records for the named packages."
@@ -2115,12 +2115,12 @@ msgstr ""
 "avail</command>; mostra i record dei pacchetti per i pacchetti specificati."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
-#: apt-cache.8.xml:171
+#: apt-cache.8.xml:165
 msgid "&synopsis-regex;"
 msgstr "&synopsis-regex;"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:172
+#: apt-cache.8.xml:166
 msgid ""
 "<literal>search</literal> performs a full text search on all available "
 "package lists for the POSIX regex pattern given, see &regex;.  It searches "
@@ -2143,7 +2143,7 @@ msgstr ""
 "descrizione lunga."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:183
+#: apt-cache.8.xml:177
 msgid ""
 "Separate arguments can be used to specify multiple search patterns that are "
 "and'ed together."
@@ -2152,7 +2152,7 @@ msgstr ""
 "che vengono combinati con un AND."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:188
+#: apt-cache.8.xml:182
 msgid ""
 "<literal>depends</literal> shows a listing of each dependency a package has "
 "and all the possible other packages that can fulfill that dependency."
@@ -2162,7 +2162,7 @@ msgstr ""
 "dipendenza."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:193
+#: apt-cache.8.xml:187
 msgid ""
 "<literal>rdepends</literal> shows a listing of each reverse dependency a "
 "package has."
@@ -2171,12 +2171,12 @@ msgstr ""
 "di un pacchetto."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:197
+#: apt-cache.8.xml:191
 msgid "<optional><replaceable>&synopsis-prefix;</replaceable></optional>"
 msgstr "<optional><replaceable>&synopsis-prefix;</replaceable></optional>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:198
+#: apt-cache.8.xml:192
 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 "
@@ -2191,7 +2191,7 @@ msgstr ""
 "viene usato al meglio con l'opzione <option>--generate</option>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:203
+#: apt-cache.8.xml:197
 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 "
@@ -2202,7 +2202,7 @@ msgstr ""
 "virtuali sono anch'essi compresi nell'elenco generato."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:209
+#: apt-cache.8.xml:203
 msgid ""
 "<literal>dotty</literal> takes a list of packages on the command line and "
 "generates output suitable for use by dotty from the <ulink url=\"http://www."
@@ -2224,7 +2224,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:218
+#: apt-cache.8.xml:212
 msgid ""
 "The resulting nodes will have several shapes; normal packages are boxes, "
 "pure virtual packages are triangles, mixed virtual packages are diamonds, "
@@ -2238,14 +2238,14 @@ msgstr ""
 "blu sono pre-dipendenze, le linee verdi sono conflitti."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:223
+#: apt-cache.8.xml:217
 msgid "Caution, dotty cannot graph larger sets of packages."
 msgstr ""
 "Attenzione: dotty non può creare i grafi degli insiemi più grandi di "
 "pacchetti."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:227
+#: apt-cache.8.xml:221
 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 tool</ulink>."
@@ -2255,12 +2255,12 @@ msgstr ""
 "ulink>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:231
+#: apt-cache.8.xml:225
 msgid "<optional><replaceable>&synopsis-pkg;</replaceable>…</optional>"
 msgstr "<optional><replaceable>&synopsis-pkg;</replaceable>…</optional>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:232
+#: apt-cache.8.xml:226
 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 "
@@ -2273,7 +2273,7 @@ msgstr ""
 "di priorità del pacchetto indicato."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:239
+#: apt-cache.8.xml:233
 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 "
@@ -2292,7 +2292,7 @@ msgstr ""
 "elenchi dei pacchetti (<literal>APT::Architecture</literal>)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:255
+#: apt-cache.8.xml:249
 msgid ""
 "Select the file to store the package cache. The package cache is the primary "
 "cache used by all operations.  Configuration Item: <literal>Dir::Cache::"
@@ -2303,7 +2303,7 @@ msgstr ""
 "<literal>Dir::Cache::pkgcache</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:261
+#: apt-cache.8.xml:255
 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 "
@@ -2319,7 +2319,7 @@ msgstr ""
 "configurazione: <literal>Dir::Cache::srcpkgcache</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:269
+#: apt-cache.8.xml:263
 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 "
@@ -2333,7 +2333,7 @@ msgstr ""
 "configurazione. Voce di configurazione: <literal>quiet</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:276
+#: apt-cache.8.xml:270
 msgid ""
 "Print only important dependencies; for use with <literal>unmet</literal> and "
 "<literal>depends</literal>. Causes only Depends and Pre-Depends relations to "
@@ -2345,7 +2345,7 @@ msgstr ""
 "Important</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:290
+#: apt-cache.8.xml:284
 msgid ""
 "Per default the <literal>depends</literal> and <literal>rdepends</literal> "
 "print all dependencies. This can be tweaked with these flags which will omit "
@@ -2360,7 +2360,7 @@ msgstr ""
 "literal>, ad es. <literal>APT::Cache::ShowRecommends</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:297
+#: apt-cache.8.xml:291
 msgid ""
 "Print full package records when searching.  Configuration Item: "
 "<literal>APT::Cache::ShowFull</literal>."
@@ -2369,7 +2369,7 @@ msgstr ""
 "configurazione: <literal>APT::Cache::ShowFull</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:302
+#: apt-cache.8.xml:296
 msgid ""
 "Print full records for all available versions. This is the default; to turn "
 "it off, use <option>--no-all-versions</option>.  If <option>--no-all-"
@@ -2387,7 +2387,7 @@ msgstr ""
 "AllVersions</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:311
+#: apt-cache.8.xml:305
 msgid ""
 "Perform automatic package cache regeneration, rather than use the cache as "
 "it is. This is the default; to turn it off, use <option>--no-generate</"
@@ -2399,7 +2399,7 @@ msgstr ""
 "<literal>APT::Cache::Generate</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:317
+#: apt-cache.8.xml:311
 msgid ""
 "Only search on the package names, not the long descriptions.  Configuration "
 "Item: <literal>APT::Cache::NamesOnly</literal>."
@@ -2408,7 +2408,7 @@ msgstr ""
 "configurazione: <literal>APT::Cache::NamesOnly</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:322
+#: apt-cache.8.xml:316
 msgid ""
 "Make <literal>pkgnames</literal> print all names, including virtual packages "
 "and missing dependencies.  Configuration Item: <literal>APT::Cache::"
@@ -2419,7 +2419,7 @@ msgstr ""
 "<literal>APT::Cache::AllNames</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:328
+#: apt-cache.8.xml:322
 msgid ""
 "Make <literal>depends</literal> and <literal>rdepends</literal> recursive so "
 "that all packages mentioned are printed once.  Configuration Item: "
@@ -2430,7 +2430,7 @@ msgstr ""
 "configurazione: <literal>APT::Cache::RecurseDepends</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:335
+#: apt-cache.8.xml:329
 msgid ""
 "Limit the output of <literal>depends</literal> and <literal>rdepends</"
 "literal> to packages which are currently installed.  Configuration Item: "
@@ -2441,12 +2441,12 @@ msgstr ""
 "Cache::Installed</literal>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:353
+#: apt-cache.8.xml:347
 msgid "&apt-conf;, &sources-list;, &apt-get;"
 msgstr "&apt-conf;, &sources-list;, &apt-get;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:358
+#: apt-cache.8.xml:352
 msgid ""
 "<command>apt-cache</command> returns zero on normal operation, decimal 100 "
 "on error."
@@ -2455,12 +2455,12 @@ msgstr ""
 "normale e il valore decimale 100 in caso di errore."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-key.8.xml:34
+#: apt-key.8.xml:28
 msgid "APT key management utility"
 msgstr "strumento APT per la gestione delle chiavi"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:41
+#: apt-key.8.xml:35
 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 "
@@ -2471,12 +2471,12 @@ msgstr ""
 "autenticati usando queste chiavi verranno considerati fidati."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-key.8.xml:47
+#: apt-key.8.xml:41
 msgid "Commands"
 msgstr "Comandi"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:52
+#: apt-key.8.xml:46
 msgid ""
 "Add a new key to the list of trusted keys.  The key is read from the "
 "filename given with the parameter &synopsis-param-filename; or if the "
@@ -2487,33 +2487,33 @@ msgstr ""
 "il nome file è <literal>-</literal>, dallo standard input."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:65
+#: apt-key.8.xml:59
 msgid "Remove a key from the list of trusted keys."
 msgstr "Rimuove una chiave dall'elenco delle chiavi fidate."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:76
+#: apt-key.8.xml:70
 msgid "Output the key &synopsis-param-keyid; to standard output."
 msgstr ""
 "Visualizza sullo standard output l'&synopsis-param-keyid; della chiave."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:87
+#: apt-key.8.xml:81
 msgid "Output all trusted keys to standard output."
 msgstr "Visualizza sullo standard output tutte le chiavi fidate."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:98
+#: apt-key.8.xml:92
 msgid "List trusted keys."
 msgstr "Elenca le chiavi fidate."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:109
+#: apt-key.8.xml:103
 msgid "List fingerprints of trusted keys."
 msgstr "Elenca le impronte digitali delle chiavi fidate."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:120
+#: apt-key.8.xml:114
 msgid ""
 "Pass advanced options to gpg. With adv --recv-key you can download the "
 "public key."
@@ -2522,7 +2522,7 @@ msgstr ""
 "chiave pubblica."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:132
+#: apt-key.8.xml:126
 msgid ""
 "Update the local keyring with the archive keyring and remove from the local "
 "keyring the archive keys which are no longer valid.  The archive keyring is "
@@ -2536,7 +2536,7 @@ msgstr ""
 "package; in &keyring-distro;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:146
+#: apt-key.8.xml:140
 msgid ""
 "Perform an update working similarly to the <command>update</command> command "
 "above, but get the archive keyring from a URI instead and validate it "
@@ -2554,12 +2554,12 @@ msgstr ""
 "<command>update</command>; APT in Ubuntu invece lo fa."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-key.8.xml:162 apt-cdrom.8.xml:82
+#: apt-key.8.xml:156 apt-cdrom.8.xml:76
 msgid "Options"
 msgstr "Opzioni"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:163
+#: apt-key.8.xml:157
 msgid ""
 "Note that options need to be defined before the commands described in the "
 "previous section."
@@ -2568,7 +2568,7 @@ msgstr ""
 "nella sezione precedente."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:166
+#: apt-key.8.xml:160
 msgid ""
 "With this option it is possible to specify a particular keyring file the "
 "command should operate on. The default is that a command is executed on the "
@@ -2585,49 +2585,49 @@ msgstr ""
 "che le nuove chiavi sono aggiunte ad esso."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:181
+#: apt-key.8.xml:175
 msgid "<filename>/etc/apt/trustdb.gpg</filename>"
 msgstr "<filename>/etc/apt/trustdb.gpg</filename>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:182
+#: apt-key.8.xml:176
 msgid "Local trust database of archive keys."
 msgstr "Database locale di fiducia delle chiavi archiviate."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:185
+#: apt-key.8.xml:179
 msgid "&keyring-filename;"
 msgstr "&keyring-filename;"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:186
+#: apt-key.8.xml:180
 msgid "Keyring of &keyring-distro; archive trusted keys."
 msgstr "Portachiavi delle chiavi fidate degli archivi &keyring-distro;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:189
+#: apt-key.8.xml:183
 msgid "&keyring-removed-filename;"
 msgstr "&keyring-removed-filename;"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:190
+#: apt-key.8.xml:184
 msgid "Keyring of &keyring-distro; archive removed trusted keys."
 msgstr ""
 "Portachiavi delle chiavi fidate rimosse degli archivi &keyring-distro;."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:199
+#: apt-key.8.xml:193
 msgid "&apt-get;, &apt-secure;"
 msgstr "&apt-get;, &apt-secure;"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-mark.8.xml:35
+#: apt-mark.8.xml:29
 msgid "mark/unmark a package as being automatically-installed"
 msgstr ""
 "mette/toglie il contrassegno di automaticamente installato ai pacchetti"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:41
+#: apt-mark.8.xml:35
 msgid ""
 "<command>apt-mark</command> will change whether a package has been marked as "
 "being automatically installed."
@@ -2636,7 +2636,7 @@ msgstr ""
 "indica se è stato installato automaticamente."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:45
+#: apt-mark.8.xml:39
 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 "
@@ -2652,7 +2652,7 @@ msgstr ""
 "get</command> o <command>aptitude</command>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:54
+#: apt-mark.8.xml:48
 msgid ""
 "<literal>auto</literal> is used to mark a package as being automatically "
 "installed, which will cause the package to be removed when no more manually "
@@ -2664,7 +2664,7 @@ msgstr ""
 "esso."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:62
+#: apt-mark.8.xml:56
 msgid ""
 "<literal>manual</literal> is used to mark a package as being manually "
 "installed, which will prevent the package from being automatically removed "
@@ -2675,7 +2675,7 @@ msgstr ""
 "automaticamente se nessun altro dipende da esso."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:70
+#: apt-mark.8.xml:64
 msgid ""
 "<literal>hold</literal> is used to mark a package as held back, which will "
 "prevent the package from being automatically installed, upgraded or "
@@ -2690,7 +2690,7 @@ msgstr ""
 "&dpkg; e non è influenzato dall'opzione <option>--file</option>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:80
+#: apt-mark.8.xml:74
 msgid ""
 "<literal>unhold</literal> is used to cancel a previously set hold on a "
 "package to allow all actions again."
@@ -2699,7 +2699,7 @@ msgstr ""
 "precedenza, per permettere nuovamente tutte le azioni."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:86
+#: apt-mark.8.xml:80
 msgid ""
 "<literal>showauto</literal> is used to print a list of automatically "
 "installed packages with each package on a new line.  All automatically "
@@ -2713,7 +2713,7 @@ msgstr ""
 "solo quelli automaticamente installati."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:94
+#: apt-mark.8.xml:88
 msgid ""
 "<literal>showmanual</literal> can be used in the same way as "
 "<literal>showauto</literal> except that it will print a list of manually "
@@ -2724,7 +2724,7 @@ msgstr ""
 "dei pacchetti installati manualmente"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:101
+#: apt-mark.8.xml:95
 msgid ""
 "<literal>showhold</literal> is used to print a list of packages on hold in "
 "the same way as for the other show commands."
@@ -2733,7 +2733,7 @@ msgstr ""
 "bloccati in modo uguale a ciò che fanno gli altri comandi «show»."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:117
+#: apt-mark.8.xml:111
 msgid ""
 "Read/Write package stats from the filename given with the parameter "
 "&synopsis-param-filename; instead of from the default location, which is "
@@ -2746,7 +2746,7 @@ msgstr ""
 "voce di configurazione <literal>Dir::State</literal>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:138
+#: apt-mark.8.xml:132
 msgid ""
 "<command>apt-mark</command> returns zero on normal operation, non-zero on "
 "error."
@@ -2755,12 +2755,12 @@ msgstr ""
 "normale e un valore diverso da zero in caso di errore."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-secure.8.xml:49
+#: apt-secure.8.xml:43
 msgid "Archive authentication support for APT"
 msgstr "supporto per l'autenticazione degli archivi per APT"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:54
+#: apt-secure.8.xml:48
 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 "
@@ -2773,7 +2773,7 @@ msgstr ""
 "non hanno accesso alla chiave di firma dei file Release."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:62
+#: apt-secure.8.xml:56
 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 "
@@ -2789,7 +2789,7 @@ msgstr ""
 "scaricare pacchetti da esse."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:71
+#: apt-secure.8.xml:65
 msgid ""
 "The package frontends &apt-get;, &aptitude; and &synaptic; support this new "
 "authentication feature."
@@ -2798,12 +2798,12 @@ msgstr ""
 "questa nuova funzionalità di autenticazione."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:76
+#: apt-secure.8.xml:70
 msgid "Trusted archives"
 msgstr "Archivi fidati"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:79
+#: apt-secure.8.xml:73
 msgid ""
 "The chain of trust from an apt archive to the end user is made up of several "
 "steps. <command>apt-secure</command> is the last step in this chain; "
@@ -2821,7 +2821,7 @@ msgstr ""
 "dell'archivio."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:87
+#: apt-secure.8.xml:81
 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 "
@@ -2834,7 +2834,7 @@ msgstr ""
 "verify e devscripts)."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:94
+#: apt-secure.8.xml:88
 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. In order to become "
@@ -2852,7 +2852,7 @@ msgstr ""
 "del proprietario della chiave."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:104
+#: apt-secure.8.xml:98
 msgid ""
 "Once the uploaded package is verified and included in the archive, the "
 "maintainer signature is stripped off, and checksums of the package are "
@@ -2874,7 +2874,7 @@ msgstr ""
 "&keyring-package;."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:115
+#: apt-secure.8.xml:109
 msgid ""
 "End users can check the signature of the Release file, extract a checksum of "
 "a package from it and compare it with the checksum of the package they "
@@ -2886,7 +2886,7 @@ msgstr ""
 "ad APT che lo fa automaticamente."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:120
+#: apt-secure.8.xml:114
 msgid ""
 "Notice that this is distinct from checking signatures on a per package "
 "basis. It is designed to prevent two possible attacks:"
@@ -2895,7 +2895,7 @@ msgstr ""
 "È progettato per prevenire due possibili attacchi:"
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:125
+#: apt-secure.8.xml:119
 msgid ""
 "<literal>Network \"man in the middle\" attacks</literal>. Without signature "
 "checking, malicious agents can introduce themselves into the package "
@@ -2910,7 +2910,7 @@ msgstr ""
 "server cattivo (attraverso attacchi di falsificazione di DNS e ARP)."
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:133
+#: apt-secure.8.xml:127
 msgid ""
 "<literal>Mirror network compromise</literal>.  Without signature checking, a "
 "malicious agent can compromise a mirror host and modify the files in it to "
@@ -2923,7 +2923,7 @@ msgstr ""
 "gli utenti che scaricano i pacchetti da quell'host."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:140
+#: apt-secure.8.xml:134
 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 "
@@ -2936,12 +2936,12 @@ msgstr ""
 "firme a livello di singolo pacchetto."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:146
+#: apt-secure.8.xml:140
 msgid "User configuration"
 msgstr "Configurazione utente"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:148
+#: apt-secure.8.xml:142
 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 "
@@ -2955,7 +2955,7 @@ msgstr ""
 "pacchetti Debian."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:155
+#: apt-secure.8.xml:149
 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 "
@@ -2972,12 +2972,12 @@ msgstr ""
 "filename> dagli archivi che sono configurati."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:164
+#: apt-secure.8.xml:158
 msgid "Archive configuration"
 msgstr "Configurazione dell'archivio"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:166
+#: apt-secure.8.xml:160
 msgid ""
 "If you want to provide archive signatures in an archive under your "
 "maintenance you have to:"
@@ -2986,7 +2986,7 @@ msgstr ""
 "si deve:"
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:171
+#: apt-secure.8.xml:165
 msgid ""
 "<emphasis>Create a toplevel Release file</emphasis>, if it does not exist "
 "already. You can do this by running <command>apt-ftparchive release</"
@@ -2997,7 +2997,7 @@ msgstr ""
 "command> (fornito in apt-utils)."
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:176
+#: apt-secure.8.xml:170
 msgid ""
 "<emphasis>Sign it</emphasis>. You can do this by running <command>gpg --"
 "clearsign -o InRelease Release</command> and <command>gpg -abs -o Release."
@@ -3008,7 +3008,7 @@ msgstr ""
 "Release</command>."
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:180
+#: apt-secure.8.xml:174
 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 "
@@ -3019,7 +3019,7 @@ msgstr ""
 "i file nell'archivio."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:187
+#: apt-secure.8.xml:181
 msgid ""
 "Whenever the contents of the archive change (new packages are added or "
 "removed) the archive maintainer has to follow the first two steps outlined "
@@ -3030,16 +3030,16 @@ msgstr ""
 "primi due passi descritti sopra."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:195
+#: apt-secure.8.xml:189
 msgid ""
 "&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, "
-"&debsign; &debsig-verify;, &gpg;"
+"&debsign;, &debsig-verify;, &gpg;"
 msgstr ""
 "&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, "
-"&debsign; &debsig-verify;, &gpg;"
+"&debsign;, &debsig-verify;, &gpg;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:199
+#: apt-secure.8.xml:193
 msgid ""
 "For more background information you might want to review the <ulink url="
 "\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "
@@ -3056,12 +3056,12 @@ msgstr ""
 "Distribution HOWTO</ulink> di V. Alex Brennen."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:212
+#: apt-secure.8.xml:206
 msgid "Manpage Authors"
 msgstr "Autori della pagina di manuale"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:214
+#: apt-secure.8.xml:208
 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."
@@ -3070,12 +3070,12 @@ msgstr ""
 "Peña, Isaac Jones, Colin Walters, Florian Weimer e Michael Vogt."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-cdrom.8.xml:34
+#: apt-cdrom.8.xml:28
 msgid "APT CD-ROM management utility"
 msgstr "strumento APT per la gestione dei CD-ROM"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:40
+#: apt-cdrom.8.xml:34
 msgid ""
 "<command>apt-cdrom</command> is used to add a new CD-ROM to APT's list of "
 "available sources. <command>apt-cdrom</command> takes care of determining "
@@ -3088,7 +3088,7 @@ msgstr ""
 "possibili errori di masterizzazione e di verificare i file indice."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:47
+#: apt-cdrom.8.xml:41
 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 disc in a multi-CD set "
@@ -3100,7 +3100,7 @@ msgstr ""
 "tenere conto di possibili errori di masterizzazione."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:58
+#: apt-cdrom.8.xml:52
 msgid ""
 "<literal>add</literal> is used to add a new disc to the source list. It will "
 "unmount the CD-ROM device, prompt for a disc to be inserted and then proceed "
@@ -3115,7 +3115,7 @@ msgstr ""
 "descrittivo."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:66
+#: apt-cdrom.8.xml:60
 msgid ""
 "APT uses a CD-ROM ID to track which disc is currently in the drive and "
 "maintains a database of these IDs in <filename>&statedir;/cdroms.list</"
@@ -3126,7 +3126,7 @@ msgstr ""
 "file <filename>&statedir;/cdroms.list</filename>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:74
+#: apt-cdrom.8.xml:68
 msgid ""
 "A debugging tool to report the identity of the current disc as well as the "
 "stored file name"
@@ -3135,7 +3135,7 @@ msgstr ""
 "il nome dei file memorizzato."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:87
+#: apt-cdrom.8.xml:81
 msgid ""
 "Do not try to auto-detect the CD-ROM path. Usually combined with the "
 "<option>--cdrom</option> option.  Configuration Item: <literal>Acquire::"
@@ -3146,7 +3146,7 @@ msgstr ""
 "<literal>Acquire::cdrom::AutoDetect</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:95
+#: apt-cdrom.8.xml:89
 msgid ""
 "Mount point; specify the location to mount the CD-ROM. This mount point must "
 "be listed in <filename>/etc/fstab</filename> and properly configured.  "
@@ -3158,7 +3158,7 @@ msgstr ""
 "cdrom::mount</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:104
+#: apt-cdrom.8.xml:98
 msgid ""
 "Rename a disc; change the label of a disc or override the disc's given "
 "label. This option will cause <command>apt-cdrom</command> to prompt for a "
@@ -3170,7 +3170,7 @@ msgstr ""
 "Rename</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:113
+#: apt-cdrom.8.xml:107
 msgid ""
 "No mounting; prevent <command>apt-cdrom</command> from mounting and "
 "unmounting the mount point.  Configuration Item: <literal>APT::CDROM::"
@@ -3181,7 +3181,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:121
+#: apt-cdrom.8.xml:115
 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 "
@@ -3194,7 +3194,7 @@ msgstr ""
 "errore. Voce di configurazione: <literal>APT::CDROM::Fast</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:131
+#: apt-cdrom.8.xml:125
 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 "
@@ -3206,7 +3206,7 @@ msgstr ""
 "più tempo, ma troverà tutti i file."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:142
+#: apt-cdrom.8.xml:136
 msgid ""
 "No Changes; Do not change the &sources-list; file and do not write index "
 "files. Everything is still checked however.  Configuration Item: "
@@ -3217,12 +3217,12 @@ msgstr ""
 "<literal>APT::CDROM::NoAct</literal>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:155
+#: apt-cdrom.8.xml:149
 msgid "&apt-conf;, &apt-get;, &sources-list;"
 msgstr "&apt-conf;, &apt-get;, &sources-list;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:160
+#: apt-cdrom.8.xml:154
 msgid ""
 "<command>apt-cdrom</command> returns zero on normal operation, decimal 100 "
 "on error."
@@ -3231,12 +3231,12 @@ msgstr ""
 "normale e il valore decimale 100 in caso di errore."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-config.8.xml:35
+#: apt-config.8.xml:29
 msgid "APT Configuration Query program"
 msgstr "programma di interrogazione della configurazione di APT"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:41
+#: apt-config.8.xml:35
 msgid ""
 "<command>apt-config</command> is an internal program used by various "
 "portions of the APT suite to provide consistent configurability. It accesses "
@@ -3249,7 +3249,7 @@ msgstr ""
 "modo facile da usare da parte di applicazioni che usano script."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:53
+#: apt-config.8.xml:47
 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 the "
@@ -3265,7 +3265,7 @@ msgstr ""
 "modo simile a:"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
-#: apt-config.8.xml:61
+#: apt-config.8.xml:55
 #, no-wrap
 msgid ""
 "OPTS=\"-f\"\n"
@@ -3277,7 +3277,7 @@ msgstr ""
 "eval $RES\n"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:66
+#: apt-config.8.xml:60
 msgid ""
 "This will set the shell environment variable $OPTS to the value of MyApp::"
 "options with a default of <option>-f</option>."
@@ -3287,7 +3287,7 @@ msgstr ""
 "option>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:70
+#: apt-config.8.xml:64
 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 "
@@ -3298,12 +3298,12 @@ msgstr ""
 "un intero. Ogni valore restituito è normalizzato e verificato internamente."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:79
+#: apt-config.8.xml:73
 msgid "Just show the contents of the configuration space."
 msgstr "Mostra soltanto i contenuti dello spazio di configurazione."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:92
+#: apt-config.8.xml:86
 msgid ""
 "Include options which have an empty value. This is the default, so use --no-"
 "empty to remove them from the output."
@@ -3312,12 +3312,12 @@ msgstr ""
 "predefinito, perciò usare --no-empty per rimuoverle dall'output."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
-#: apt-config.8.xml:97
+#: apt-config.8.xml:91
 msgid "&percnt;f &#x0022;&percnt;v&#x0022;;&percnt;n"
 msgstr "&percnt;f &#x0022;&percnt;v&#x0022;;&percnt;n"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:98
+#: apt-config.8.xml:92
 msgid ""
 "Defines the output of each config option. &percnt;t will be replaced with "
 "its individual name, &percnt;f with its full hierarchical name and &percnt;v "
@@ -3336,13 +3336,13 @@ msgstr ""
 "&percnt;. "
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:112 apt-extracttemplates.1.xml:73 apt-sortpkgs.1.xml:66
-#: apt-ftparchive.1.xml:610
+#: apt-config.8.xml:106 apt-extracttemplates.1.xml:67 apt-sortpkgs.1.xml:60
+#: apt-ftparchive.1.xml:604
 msgid "&apt-conf;"
 msgstr "&apt-conf;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:117
+#: apt-config.8.xml:111
 msgid ""
 "<command>apt-config</command> returns zero on normal operation, decimal 100 "
 "on error."
@@ -3351,27 +3351,27 @@ msgstr ""
 "normale e il valore decimale 100 in caso di errore."
 
 #. type: Content of: <refentry><refentryinfo><author><contrib>
-#: apt.conf.5.xml:22
+#: apt.conf.5.xml:16
 msgid "Initial documentation of Debug::*."
 msgstr "Documentazione iniziale di Debug::*."
 
 #. type: Content of: <refentry><refentryinfo><author><email>
-#: apt.conf.5.xml:23
+#: apt.conf.5.xml:17
 msgid "dburrows@debian.org"
 msgstr "dburrows@debian.org"
 
 #. type: Content of: <refentry><refmeta><manvolnum>
-#: apt.conf.5.xml:33 apt_preferences.5.xml:27 sources.list.5.xml:28
+#: apt.conf.5.xml:27 apt_preferences.5.xml:21 sources.list.5.xml:22
 msgid "5"
 msgstr "5"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt.conf.5.xml:40
+#: apt.conf.5.xml:34
 msgid "Configuration file for APT"
 msgstr "file di configurazione di APT"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:44
+#: apt.conf.5.xml:38
 msgid ""
 "<filename>/etc/apt/apt.conf</filename> is the main configuration file shared "
 "by all the tools in the APT suite of tools, though it is by no means the "
@@ -3385,7 +3385,7 @@ msgstr ""
 "ambiente uniforme."
 
 #. type: Content of: <refentry><refsect1><orderedlist><para>
-#: apt.conf.5.xml:50
+#: apt.conf.5.xml:44
 msgid ""
 "When an APT tool starts up it will read the configuration files in the "
 "following order:"
@@ -3394,7 +3394,7 @@ msgstr ""
 "seguente ordine:"
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:52
+#: apt.conf.5.xml:46
 msgid ""
 "the file specified by the <envar>APT_CONFIG</envar> environment variable (if "
 "any)"
@@ -3403,7 +3403,7 @@ msgstr ""
 "presente)"
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:54
+#: apt.conf.5.xml:48
 msgid ""
 "all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending "
 "order which have either no or \"<literal>conf</literal>\" as filename "
@@ -3423,7 +3423,7 @@ msgstr ""
 "silenziosamente."
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:61
+#: apt.conf.5.xml:55
 msgid ""
 "the main configuration file specified by <literal>Dir::Etc::main</literal>"
 msgstr ""
@@ -3431,7 +3431,7 @@ msgstr ""
 "literal>"
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:63
+#: apt.conf.5.xml:57
 msgid ""
 "the command line options are applied to override the configuration "
 "directives or to load even more configuration files."
@@ -3440,12 +3440,12 @@ msgstr ""
 "di configurazione o per caricare ulteriori file di configurazione."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:67
+#: apt.conf.5.xml:61
 msgid "Syntax"
 msgstr "Sintassi"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:68
+#: apt.conf.5.xml:62
 msgid ""
 "The configuration file is organized in a tree with options organized into "
 "functional groups. Option specification is given with a double colon "
@@ -3460,7 +3460,7 @@ msgstr ""
 "Le opzioni non ereditano dai gruppi genitori."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:74
+#: apt.conf.5.xml:68
 msgid ""
 "Syntactically the configuration language is modeled after what the ISC tools "
 "such as bind and dhcp use. Lines starting with <literal>//</literal> are "
@@ -3485,7 +3485,7 @@ msgstr ""
 "parentesi graffe come in:"
 
 #. type: Content of: <refentry><refsect1><informalexample><programlisting>
-#: apt.conf.5.xml:87
+#: apt.conf.5.xml:81
 #, no-wrap
 msgid ""
 "APT {\n"
@@ -3503,7 +3503,7 @@ msgstr ""
 "};\n"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:95
+#: apt.conf.5.xml:89
 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 "
@@ -3515,13 +3515,13 @@ msgstr ""
 "voci, separate da un punto e virgola."
 
 #. type: Content of: <refentry><refsect1><informalexample><programlisting>
-#: apt.conf.5.xml:100
+#: apt.conf.5.xml:94
 #, no-wrap
 msgid "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n"
 msgstr "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:103
+#: apt.conf.5.xml:97
 msgid ""
 "In general the sample configuration file &configureindex; is a good guide "
 "for how it should look."
@@ -3530,7 +3530,7 @@ msgstr ""
 "buona guida su come debba essere un file di configurazione."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:106
+#: apt.conf.5.xml:100
 msgid ""
 "Case is not significant in names of configuration items, so in the previous "
 "example you could use <literal>dpkg::pre-install-pkgs</literal>."
@@ -3540,7 +3540,7 @@ msgstr ""
 "<literal>dpkg::pre-install-pkgs</literal>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:109
+#: apt.conf.5.xml:103
 msgid ""
 "Names for the configuration items are optional if a list is defined as can "
 "be seen in the <literal>DPkg::Pre-Install-Pkgs</literal> example above. If "
@@ -3555,7 +3555,7 @@ msgstr ""
 "sovrascrivere l'opzione come per ogni altra, assegnandole un nuovo valore."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:114
+#: apt.conf.5.xml:108
 msgid ""
 "Two special commands are defined: <literal>#include</literal> (which is "
 "deprecated and not supported by alternative implementations) and "
@@ -3575,7 +3575,7 @@ msgstr ""
 "queste righe devono terminare con un punto e virgola.)"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:124
+#: apt.conf.5.xml:118
 msgid ""
 "The <literal>#clear</literal> command is the only way to delete a list or a "
 "complete scope. Reopening a scope (or using the syntax described below with "
@@ -3591,7 +3591,7 @@ msgstr ""
 "ambiti non possono essere sovrascritti, solo cancellati."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:132
+#: apt.conf.5.xml:126
 msgid ""
 "All of the APT tools take an -o option which allows an arbitrary "
 "configuration directive to be specified on the command line. The syntax is a "
@@ -3611,7 +3611,7 @@ msgstr ""
 "di comando.)"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:140
+#: apt.conf.5.xml:134
 msgid ""
 "Note that appending items to a list using <literal>::</literal> only works "
 "for one item per line, and that you should not use it in combination with "
@@ -3641,12 +3641,12 @@ msgstr ""
 "ora, quando APT ancora non si lamenta esplicitamente."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:155
+#: apt.conf.5.xml:149
 msgid "The APT Group"
 msgstr "Il gruppo APT"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:156
+#: apt.conf.5.xml:150
 msgid ""
 "This group of options controls general APT behavior as well as holding the "
 "options for all of the tools."
@@ -3655,7 +3655,7 @@ msgstr ""
 "contenere le opzioni per tutti gli strumenti."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:161
+#: apt.conf.5.xml:155
 msgid ""
 "System Architecture; sets the architecture to use when fetching files and "
 "parsing package lists. The internal default is the architecture apt was "
@@ -3666,7 +3666,7 @@ msgstr ""
 "predefinito interno è l'architettura per la quale apt è stato compilato."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:168
+#: apt.conf.5.xml:162
 msgid ""
 "All Architectures the system supports. For instance, CPUs implementing the "
 "<literal>amd64</literal> (also called <literal>x86-64</literal>)  "
@@ -3688,7 +3688,7 @@ msgstr ""
 "quando sono registrate con <command>dpkg --add-architecture</command>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:182
+#: apt.conf.5.xml:176
 msgid ""
 "List of all build profiles enabled for build-dependency resolution, without "
 "the \"<literal>profile.</literal>\" namespace prefix.  By default this list "
@@ -3702,7 +3702,7 @@ msgstr ""
 "precedenza sulla notazione della lista."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:190
+#: apt.conf.5.xml:184
 msgid ""
 "Default release to install packages from if more than one version is "
 "available. Contains release name, codename or release version. Examples: "
@@ -3716,7 +3716,7 @@ msgstr ""
 "preferences;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:196
+#: apt.conf.5.xml:190
 msgid ""
 "Ignore held packages; this global option causes the problem resolver to "
 "ignore held packages in its decision making."
@@ -3725,7 +3725,7 @@ msgstr ""
 "di problemi ignori i pacchetti bloccati nel suo processo decisionale."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:201
+#: apt.conf.5.xml:195
 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 "
@@ -3739,7 +3739,7 @@ msgstr ""
 "reinstallarli."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:209
+#: apt.conf.5.xml:203
 msgid ""
 "Defaults to on, which will cause APT to install essential and important "
 "packages as soon as possible in an install/upgrade operation, in order to "
@@ -3766,7 +3766,7 @@ msgstr ""
 "che dipende da A, dato che la dipendenza da A non è più soddisfatta."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:221
+#: apt.conf.5.xml:215
 msgid ""
 "The immediate configuration marker is also applied in the potentially "
 "problematic case of circular dependencies, since a dependency with the "
@@ -3796,7 +3796,7 @@ msgstr ""
 "l'unico problema che può aiutare a prevenire."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:234
+#: apt.conf.5.xml:228
 msgid ""
 "Before a big operation like <literal>dist-upgrade</literal> is run with this "
 "option disabled you should try to explicitly <literal>install</literal> the "
@@ -3814,7 +3814,7 @@ msgstr ""
 "il processo di aggiornamento."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:245
+#: apt.conf.5.xml:239
 msgid ""
 "Never enable this option unless you <emphasis>really</emphasis> know what "
 "you are doing. It permits APT to temporarily remove an essential package to "
@@ -3835,7 +3835,7 @@ msgstr ""
 "<command>dash</command> o qualsiasi altro da cui dipendono tali pacchetti."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:257
+#: apt.conf.5.xml:251
 msgid ""
 "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 of "
@@ -3873,14 +3873,14 @@ msgstr ""
 "della cache è disabilitata."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:273
+#: apt.conf.5.xml:267
 msgid "Defines which packages are considered essential build dependencies."
 msgstr ""
 "Definisce quali pacchetti sono considerati dipendenze di compilazione "
 "essenziali."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:277
+#: apt.conf.5.xml:271
 msgid ""
 "The Get subsection controls the &apt-get; tool; please see its documentation "
 "for more information about the options here."
@@ -3889,7 +3889,7 @@ msgstr ""
 "documentazione per maggiori informazioni su queste opzioni."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:282
+#: apt.conf.5.xml:276
 msgid ""
 "The Cache subsection controls the &apt-cache; tool; please see its "
 "documentation for more information about the options here."
@@ -3898,7 +3898,7 @@ msgstr ""
 "documentazione per maggiori informazioni su queste opzioni."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:287
+#: apt.conf.5.xml:281
 msgid ""
 "The CDROM subsection controls the &apt-cdrom; tool; please see its "
 "documentation for more information about the options here."
@@ -3907,12 +3907,12 @@ msgstr ""
 "documentazione per maggiori informazioni su queste opzioni."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:293
+#: apt.conf.5.xml:287
 msgid "The Acquire Group"
 msgstr "Il gruppo Acquire"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:294
+#: apt.conf.5.xml:288
 msgid ""
 "The <literal>Acquire</literal> group of options controls the download of "
 "packages as well as the various \"acquire methods\" responsible for the "
@@ -3923,7 +3923,7 @@ msgstr ""
 "scaricamento stesso (vedere anche &sources-list;)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:301
+#: apt.conf.5.xml:295
 msgid ""
 "Security related option defaulting to true, as giving a Release file's "
 "validation an expiration date prevents replay attacks over a long timescale, "
@@ -3945,7 +3945,7 @@ msgstr ""
 "ValidTime</literal> seguente."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:314
+#: apt.conf.5.xml:308
 msgid ""
 "Maximum time (in seconds) after its creation (as indicated by the "
 "<literal>Date</literal> header) that the <filename>Release</filename> file "
@@ -3965,7 +3965,7 @@ msgstr ""
 "dell'archivio in fondo al nome dell'opzione."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:326
+#: apt.conf.5.xml:320
 msgid ""
 "Minimum time (in seconds) after its creation (as indicated by the "
 "<literal>Date</literal> header) that the <filename>Release</filename> file "
@@ -3985,7 +3985,7 @@ msgstr ""
 "archivio aggiungendo l'etichetta dell'archivio in fondo al nome dell'opzione."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:338
+#: apt.conf.5.xml:332
 msgid ""
 "Try to download deltas called <literal>PDiffs</literal> for indexes (like "
 "<filename>Packages</filename> files) instead of downloading whole ones. True "
@@ -3996,7 +3996,7 @@ msgstr ""
 "interamente i nuovi. Attiva in modo predefinito."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:341
+#: apt.conf.5.xml:335
 msgid ""
 "Two sub-options to limit the use of PDiffs are also available: "
 "<literal>FileLimit</literal> can be used to specify a maximum number of "
@@ -4014,7 +4014,7 @@ msgstr ""
 "completo invece delle patch."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:351
+#: apt.conf.5.xml:345
 msgid ""
 "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</"
 "literal> or <literal>access</literal> which determines how APT parallelizes "
@@ -4029,7 +4029,7 @@ msgstr ""
 "literal> significa che viene aperta una connessione per ogni tipo di URI."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:359
+#: apt.conf.5.xml:353
 msgid ""
 "Number of retries to perform. If this is non-zero APT will retry failed "
 "files the given number of times."
@@ -4039,7 +4039,7 @@ msgstr ""
 "ha avuto successo."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:364
+#: apt.conf.5.xml:358
 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."
@@ -4050,7 +4050,7 @@ msgstr ""
 "vero."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:369
+#: apt.conf.5.xml:363
 msgid ""
 "<literal>http::Proxy</literal> sets the default proxy to use for HTTP URIs. "
 "It is in the standard form of <literal>http://[[user][:pass]@]host[:port]/</"
@@ -4069,7 +4069,7 @@ msgstr ""
 "la variabile d'ambiente <envar>http_proxy</envar>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:377
+#: apt.conf.5.xml:371
 msgid ""
 "Three settings are provided for cache control with HTTP/1.1 compliant proxy "
 "caches.  <literal>No-Cache</literal> tells the proxy not to use its cached "
@@ -4089,7 +4089,7 @@ msgstr ""
 "file .deb."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:387 apt.conf.5.xml:475
+#: apt.conf.5.xml:381 apt.conf.5.xml:469
 msgid ""
 "The option <literal>timeout</literal> sets the timeout timer used by the "
 "method; this value applies to the connection as well as the data timeout."
@@ -4099,7 +4099,7 @@ msgstr ""
 "quello per i dati."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:390
+#: apt.conf.5.xml:384
 msgid ""
 "The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to "
 "enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be beneficial e."
@@ -4119,7 +4119,7 @@ msgstr ""
 "con la specifica HTTP/1.1."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:397
+#: apt.conf.5.xml:391
 msgid ""
 "<literal>Acquire::http::AllowRedirect</literal> controls whether APT will "
 "follow redirects, which is enabled by default."
@@ -4128,7 +4128,7 @@ msgstr ""
 "meno le ridirezioni che sono abilitate in modo predefinito."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:400
+#: apt.conf.5.xml:394
 msgid ""
 "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
 "literal> which accepts integer values in kilobytes per second. The default "
@@ -4143,7 +4143,7 @@ msgstr ""
 "scaricamento da più server contemporaneamente."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:407
+#: apt.conf.5.xml:401
 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 "
@@ -4155,7 +4155,7 @@ msgstr ""
 "conosciuto."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:411
+#: apt.conf.5.xml:405
 msgid ""
 "<literal>Acquire::http::Proxy-Auto-Detect</literal> can be used to specify "
 "an external command to discover the http proxy to use. Apt expects the "
@@ -4178,7 +4178,7 @@ msgstr ""
 "sull'opzione col nome obsoleto <literal>ProxyAutoDetect</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:429
+#: apt.conf.5.xml:423
 msgid ""
 "The <literal>Cache-control</literal>, <literal>Timeout</literal>, "
 "<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> and "
@@ -4195,7 +4195,7 @@ msgstr ""
 "<literal>Pipeline-Depth</literal> non è ancora supportata."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:437
+#: apt.conf.5.xml:431
 msgid ""
 "<literal>CaInfo</literal> suboption specifies place of file that holds info "
 "about trusted certificates.  <literal>&lt;host&gt;::CaInfo</literal> is the "
@@ -4236,7 +4236,7 @@ msgstr ""
 "literal> è la corrispondente opzione specifica per ciascun host."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:458
+#: apt.conf.5.xml:452
 msgid ""
 "<literal>ftp::Proxy</literal> sets the default proxy to use for FTP URIs.  "
 "It is in the standard form of <literal>ftp://[[user][:pass]@]host[:port]/</"
@@ -4270,7 +4270,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:478
+#: apt.conf.5.xml:472
 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, "
@@ -4286,7 +4286,7 @@ msgstr ""
 "uno specifico host (vedere il file di configurazione d'esempio)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:485
+#: apt.conf.5.xml:479
 msgid ""
 "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
 "envar> environment variable to an HTTP URL - see the discussion of the http "
@@ -4300,7 +4300,7 @@ msgstr ""
 "a causa della sua bassa efficienza."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:490
+#: apt.conf.5.xml:484
 msgid ""
 "The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
 "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -4316,13 +4316,13 @@ msgstr ""
 "parte dei server FTP non supporta la RFC 2428."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:504
+#: apt.conf.5.xml:498
 #, no-wrap
 msgid "/cdrom/::Mount \"foo\";"
 msgstr "/cdrom/::Mount \"pippo\";"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:499
+#: apt.conf.5.xml:493
 msgid ""
 "For URIs using the <literal>cdrom</literal> method, the only configurable "
 "option is the mount point, <literal>cdrom::Mount</literal>, which must be "
@@ -4344,7 +4344,7 @@ msgstr ""
 "comandi per lo smontaggio possono essere specificati usando UMount."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:512
+#: apt.conf.5.xml:506
 msgid ""
 "For GPGV URIs the only configurable option is <literal>gpgv::Options</"
 "literal>, which passes additional parameters to gpgv."
@@ -4353,13 +4353,13 @@ msgstr ""
 "literal>, che passa parametri aggiuntivi a gpgv."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:523
+#: apt.conf.5.xml:517
 #, no-wrap
 msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
 msgstr "Acquire::CompressionTypes::<replaceable>EstensioneFile</replaceable> \"<replaceable>NomeMetodo</replaceable>\";"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:518
+#: apt.conf.5.xml:512
 msgid ""
 "List of compression types which are understood by the acquire methods.  "
 "Files like <filename>Packages</filename> can be available in various "
@@ -4378,19 +4378,19 @@ msgstr ""
 "metodo usato. La sintassi è: <placeholder type=\"synopsis\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:528
+#: apt.conf.5.xml:522
 #, no-wrap
 msgid "Acquire::CompressionTypes::Order:: \"gz\";"
 msgstr "Acquire::CompressionTypes::Order:: \"gz\";"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:531
+#: apt.conf.5.xml:525
 #, no-wrap
 msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
 msgstr "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:524
+#: apt.conf.5.xml:518
 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 "
@@ -4421,13 +4421,13 @@ msgstr ""
 "all'elenco, dato che verrà aggiunto automaticamente."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:538
+#: apt.conf.5.xml:532
 #, no-wrap
 msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
 msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:533
+#: apt.conf.5.xml:527
 msgid ""
 "Note that the <literal>Dir::Bin::<replaceable>Methodname</replaceable></"
 "literal> will be checked at run time. If this option has been set, the "
@@ -4453,7 +4453,7 @@ msgstr ""
 "definito; aggiunge solamente il tipo indicato all'inizio dell'elenco."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:543
+#: apt.conf.5.xml:537
 msgid ""
 "The special type <literal>uncompressed</literal> can be used to give "
 "uncompressed files a preference, but note that most archives don't provide "
@@ -4465,7 +4465,7 @@ msgstr ""
 "soprattutto per i mirror locali."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:550
+#: apt.conf.5.xml:544
 msgid ""
 "When downloading <literal>gzip</literal> compressed indexes (Packages, "
 "Sources, or Translations), keep them gzip compressed locally instead of "
@@ -4479,7 +4479,7 @@ msgstr ""
 "modo predefinito è disabilitato."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:558
+#: apt.conf.5.xml:552
 msgid ""
 "The Languages subsection controls which <filename>Translation</filename> "
 "files are downloaded and in which order APT tries to display the description-"
@@ -4498,13 +4498,13 @@ msgstr ""
 "codici di lingua lunghi sono particolarmente rari."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><programlisting>
-#: apt.conf.5.xml:575
+#: apt.conf.5.xml:569
 #, no-wrap
 msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
 msgstr "Acquire::Languages { \"environment\"; \"it\"; \"en\"; \"none\"; \"fr\"; };"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:563
+#: apt.conf.5.xml:557
 msgid ""
 "The default list includes \"environment\" and \"en\". "
 "\"<literal>environment</literal>\" has a special meaning here: it will be "
@@ -4543,7 +4543,7 @@ msgstr ""
 "<placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:576
+#: apt.conf.5.xml:570
 msgid ""
 "Note: To prevent problems resulting from APT being executed in different "
 "environments (e.g. by different users or by other programs) all Translation "
@@ -4557,22 +4557,22 @@ msgstr ""
 "implicito)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:585
+#: apt.conf.5.xml:579
 msgid "When downloading, force to use only the IPv4 protocol."
 msgstr "Durante gli scaricamenti, forza l'uso del solo protocollo IPv4."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:591
+#: apt.conf.5.xml:585
 msgid "When downloading, force to use only the IPv6 protocol."
 msgstr "Durante gli scaricamenti, forza l'uso del solo protocollo IPv6."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:598
+#: apt.conf.5.xml:592
 msgid "Directories"
 msgstr "Directory"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:600
+#: apt.conf.5.xml:594
 msgid ""
 "The <literal>Dir::State</literal> section has directories that pertain to "
 "local state information. <literal>lists</literal> is the directory to place "
@@ -4592,16 +4592,28 @@ msgstr ""
 "<filename>/</filename> o <filename>./</filename>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:607
+#: apt.conf.5.xml:601
+#, fuzzy
+#| msgid ""
+#| "<literal>Dir::Cache</literal> contains locations pertaining to local "
+#| "cache information, such as the two package caches <literal>srcpkgcache</"
+#| "literal> and <literal>pkgcache</literal> as well as the location to place "
+#| "downloaded archives, <literal>Dir::Cache::archives</literal>. Generation "
+#| "of caches can be turned off by setting their names to the empty string. "
+#| "This will slow down startup but save disk space. It is probably "
+#| "preferable to turn off the pkgcache rather than the srcpkgcache. Like "
+#| "<literal>Dir::State</literal> the default directory is contained in "
+#| "<literal>Dir::Cache</literal>"
 msgid ""
 "<literal>Dir::Cache</literal> contains locations pertaining to local cache "
 "information, such as the two package caches <literal>srcpkgcache</literal> "
 "and <literal>pkgcache</literal> as well as the location to place downloaded "
 "archives, <literal>Dir::Cache::archives</literal>. Generation of caches can "
-"be turned off by setting their names to the empty string. This will slow "
+"be turned off by setting <literal>pkgcache</literal> or "
+"<literal>srcpkgcache</literal> to <literal>\"\"</literal>.  This will slow "
 "down startup but save disk space. It is probably preferable to turn off the "
-"pkgcache rather than the srcpkgcache. Like <literal>Dir::State</literal> the "
-"default directory is contained in <literal>Dir::Cache</literal>"
+"pkgcache rather than the srcpkgcache.  Like <literal>Dir::State</literal> "
+"the default directory is contained in <literal>Dir::Cache</literal>"
 msgstr ""
 "<literal>Dir::Cache</literal> contiene le posizioni relative alle "
 "informazioni della cache locale, come le due cache dei pacchetti "
@@ -4614,7 +4626,7 @@ msgstr ""
 "la directory predefinita è contenuta in <literal>Dir::Cache</literal>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:616
+#: apt.conf.5.xml:611
 msgid ""
 "<literal>Dir::Etc</literal> contains the location of configuration files, "
 "<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -4629,7 +4641,7 @@ msgstr ""
 "configurazione specificato da <envar>APT_CONFIG</envar>)."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:622
+#: apt.conf.5.xml:617
 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 "
@@ -4640,7 +4652,7 @@ msgstr ""
 "termine viene caricato il file di configurazione principale."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:626
+#: apt.conf.5.xml:621
 msgid ""
 "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
 "Bin::Methods</literal> specifies the location of the method handlers and "
@@ -4657,7 +4669,7 @@ msgstr ""
 "specificano la posizione dei rispettivi programmi."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:634
+#: apt.conf.5.xml:629
 msgid ""
 "The configuration item <literal>RootDir</literal> has a special meaning.  If "
 "set, all paths in <literal>Dir::</literal> will be relative to "
@@ -4678,7 +4690,7 @@ msgstr ""
 "staging/var/lib/dpkg/status</filename>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:647
+#: apt.conf.5.xml:642
 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 "
@@ -4696,12 +4708,12 @@ msgstr ""
 "questi modelli possono usare una sintassi con espressioni regolari."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:656
+#: apt.conf.5.xml:651
 msgid "APT in DSelect"
 msgstr "APT in DSelect"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:658
+#: apt.conf.5.xml:653
 msgid ""
 "When APT is used as a &dselect; method several configuration directives "
 "control the default behavior. These are in the <literal>DSelect</literal> "
@@ -4712,7 +4724,7 @@ msgstr ""
 "sezione <literal>DSelect</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:663
+#: apt.conf.5.xml:658
 msgid ""
 "Cache Clean mode; this value may be one of <literal>always</literal>, "
 "<literal>prompt</literal>, <literal>auto</literal>, <literal>pre-auto</"
@@ -4734,7 +4746,7 @@ msgstr ""
 "scaricare i nuovi pacchetti."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:677
+#: apt.conf.5.xml:672
 msgid ""
 "The contents of this variable are passed to &apt-get; as command line "
 "options when it is run for the install phase."
@@ -4744,7 +4756,7 @@ msgstr ""
 "installazione."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:682
+#: apt.conf.5.xml:677
 msgid ""
 "The contents of this variable are passed to &apt-get; as command line "
 "options when it is run for the update phase."
@@ -4754,7 +4766,7 @@ msgstr ""
 "aggiornamento."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:687
+#: apt.conf.5.xml:682
 msgid ""
 "If true the [U]pdate operation in &dselect; will always prompt to continue.  "
 "The default is to prompt only on error."
@@ -4764,12 +4776,12 @@ msgstr ""
 "solo in caso di errore."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:693
+#: apt.conf.5.xml:688
 msgid "How APT calls &dpkg;"
 msgstr "Come APT invoca &dpkg;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:694
+#: apt.conf.5.xml:689
 msgid ""
 "Several configuration directives control how APT invokes &dpkg;. These are "
 "in the <literal>DPkg</literal> section."
@@ -4778,7 +4790,7 @@ msgstr ""
 "&dpkg;; sono nella sezione <literal>DPkg</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:699
+#: apt.conf.5.xml:694
 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 "
@@ -4789,7 +4801,7 @@ msgstr ""
 "passata a &dpkg; come un singolo argomento."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:705
+#: apt.conf.5.xml:700
 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 "
@@ -4802,7 +4814,7 @@ msgstr ""
 "bin/sh</filename>; se qualcuno dei comandi fallisce APT terminerà annullando."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:712
+#: apt.conf.5.xml:707
 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 "
@@ -4820,7 +4832,7 @@ msgstr ""
 "lo standard input."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:719
+#: apt.conf.5.xml:714
 msgid ""
 "Version 2 of this protocol dumps more information, including the protocol "
 "version, the APT configuration space and the packages, files and versions "
@@ -4834,7 +4846,7 @@ msgstr ""
 "versione di cui viene fatto il dump."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:724
+#: apt.conf.5.xml:719
 msgid ""
 "The version of the protocol to be used for the command "
 "<literal><replaceable>cmd</replaceable></literal> can be chosen by setting "
@@ -4851,7 +4863,7 @@ msgstr ""
 "l'informazione nella versione più alta per cui ha il supporto."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:731
+#: apt.conf.5.xml:726
 msgid ""
 "The file descriptor to be used to send the information can be requested with "
 "<literal>DPkg::Tools::options::<replaceable>cmd</replaceable>::InfoFD</"
@@ -4869,7 +4881,7 @@ msgstr ""
 "file usato per conferma."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:741
+#: apt.conf.5.xml:736
 msgid ""
 "APT chdirs to this directory before invoking &dpkg;, the default is "
 "<filename>/</filename>."
@@ -4878,7 +4890,7 @@ msgstr ""
 "valore predefinito è <filename>/</filename>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:746
+#: apt.conf.5.xml:741
 msgid ""
 "These options are passed to &dpkg-buildpackage; when compiling packages; the "
 "default is to disable signing and produce all binaries."
@@ -4888,12 +4900,12 @@ msgstr ""
 "binari."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:751
+#: apt.conf.5.xml:746
 msgid "dpkg trigger usage (and related options)"
 msgstr "Uso dei trigger di dpkg (e relative opzioni)"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:752
+#: apt.conf.5.xml:747
 msgid ""
 "APT can call &dpkg; in such a way as to let it make aggressive use of "
 "triggers over multiple calls of &dpkg;. Without further options &dpkg; will "
@@ -4921,7 +4933,7 @@ msgstr ""
 "pacchetti."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:767
+#: apt.conf.5.xml:762
 #, no-wrap
 msgid ""
 "DPkg::NoTriggers \"true\";\n"
@@ -4935,7 +4947,7 @@ msgstr ""
 "DPkg::TriggersPending \"true\";"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:761
+#: apt.conf.5.xml:756
 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 "
@@ -4959,7 +4971,7 @@ msgstr ""
 "\"literallayout\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:774
+#: apt.conf.5.xml:769
 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 "
@@ -4981,7 +4993,7 @@ msgstr ""
 "questa opzione anche alle chiamate per lo spacchettamento e la rimozione."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:782
+#: apt.conf.5.xml:777
 msgid ""
 "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
 "and \"<literal>no</literal>\".  The default value is \"<literal>all</literal>"
@@ -5011,7 +5023,7 @@ msgstr ""
 "potrebbe finire in uno stato non configurato e potenzialmente non avviabile."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:797
+#: apt.conf.5.xml:792
 msgid ""
 "If this option is set APT will call <command>dpkg --configure --pending</"
 "command> to let &dpkg; handle all required configurations and triggers. This "
@@ -5029,7 +5041,7 @@ msgstr ""
 "si può disattivare questa opzione in tutte le esecuzioni tranne l'ultima."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:804
+#: apt.conf.5.xml:799
 msgid ""
 "Useful for the <literal>smart</literal> configuration as a package which has "
 "pending triggers is not considered as <literal>installed</literal>, and "
@@ -5045,7 +5057,7 @@ msgstr ""
 "necessari per configurare il pacchetto in questione."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:817
+#: apt.conf.5.xml:812
 #, no-wrap
 msgid ""
 "OrderList::Score {\n"
@@ -5063,7 +5075,7 @@ msgstr ""
 "};"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:810
+#: apt.conf.5.xml:805
 msgid ""
 "Essential packages (and their dependencies) should be configured immediately "
 "after unpacking. It is a good idea to do this quite early in the upgrade "
@@ -5088,12 +5100,12 @@ msgstr ""
 "con i loro valori predefiniti. <placeholder type=\"literallayout\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:830
+#: apt.conf.5.xml:825
 msgid "Periodic and Archives options"
 msgstr "Opzioni Periodic e Archives"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:831
+#: apt.conf.5.xml:826
 msgid ""
 "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
 "of options configure behavior of apt periodic updates, which is done by the "
@@ -5107,12 +5119,12 @@ msgstr ""
 "all'inizio dello script."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:839
+#: apt.conf.5.xml:834
 msgid "Debug options"
 msgstr "Opzioni di debug"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:841
+#: apt.conf.5.xml:836
 msgid ""
 "Enabling options in the <literal>Debug::</literal> section will cause "
 "debugging information to be sent to the standard error stream of the program "
@@ -5130,7 +5142,7 @@ msgstr ""
 "esserlo:"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:852
+#: apt.conf.5.xml:847
 msgid ""
 "<literal>Debug::pkgProblemResolver</literal> enables output about the "
 "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -5141,7 +5153,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:860
+#: apt.conf.5.xml:855
 msgid ""
 "<literal>Debug::NoLocking</literal> disables all file locking.  This can be "
 "used to run some operations (for instance, <literal>apt-get -s install</"
@@ -5152,7 +5164,7 @@ msgstr ""
 "install</literal>) come utente non root."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:869
+#: apt.conf.5.xml:864
 msgid ""
 "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
 "time that <literal>apt</literal> invokes &dpkg;."
@@ -5164,7 +5176,7 @@ 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:877
+#: apt.conf.5.xml:872
 msgid ""
 "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
 "in CD-ROM IDs."
@@ -5173,37 +5185,37 @@ msgstr ""
 "negli ID dei CD-ROM."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:887
+#: apt.conf.5.xml:882
 msgid "A full list of debugging options to apt follows."
 msgstr "Segue un elenco completo delle opzioni di debug per apt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:896
+#: apt.conf.5.xml:891
 msgid ""
 "Print information related to accessing <literal>cdrom://</literal> sources."
 msgstr ""
 "Stampa informazioni relative all'accesso a fonti <literal>cdrom://</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:907
+#: apt.conf.5.xml:902
 msgid "Print information related to downloading packages using FTP."
 msgstr ""
 "Stampa informazioni relative allo scaricamento dei pacchetti usando FTP."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:918
+#: apt.conf.5.xml:913
 msgid "Print information related to downloading packages using HTTP."
 msgstr ""
 "Stampa informazioni relative allo scaricamento dei pacchetti usando HTTP."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:929
+#: apt.conf.5.xml:924
 msgid "Print information related to downloading packages using HTTPS."
 msgstr ""
 "Stampa informazioni relative allo scaricamento dei pacchetti usando HTTPS."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:940
+#: apt.conf.5.xml:935
 msgid ""
 "Print information related to verifying cryptographic signatures using "
 "<literal>gpg</literal>."
@@ -5212,7 +5224,7 @@ msgstr ""
 "usando <literal>gpg</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:951
+#: apt.conf.5.xml:946
 msgid ""
 "Output information about the process of accessing collections of packages "
 "stored on CD-ROMs."
@@ -5221,14 +5233,14 @@ msgstr ""
 "pacchetti memorizzati su CD-ROM."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:961
+#: apt.conf.5.xml:956
 msgid "Describes the process of resolving build-dependencies in &apt-get;."
 msgstr ""
 "Descrive il processo di risoluzione delle dipendenze di compilazione in &apt-"
 "get;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:971
+#: apt.conf.5.xml:966
 msgid ""
 "Output each cryptographic hash that is generated by the <literal>apt</"
 "literal> libraries."
@@ -5237,7 +5249,7 @@ msgstr ""
 "<literal>apt</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:981
+#: apt.conf.5.xml:976
 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 "
@@ -5248,7 +5260,7 @@ msgstr ""
 "system del CD-ROM."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:992
+#: apt.conf.5.xml:987
 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."
@@ -5258,14 +5270,14 @@ msgstr ""
 "contemporaneamente."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1004
+#: apt.conf.5.xml:999
 msgid "Log when items are added to or removed from the global download queue."
 msgstr ""
 "Registra nel log quando vengono aggiunte o rimosse voci dalla coda globale "
 "degli scaricamenti."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1014
+#: apt.conf.5.xml:1009
 msgid ""
 "Output status messages and errors related to verifying checksums and "
 "cryptographic signatures of downloaded files."
@@ -5274,7 +5286,7 @@ msgstr ""
 "codici di controllo e delle firme di cifratura dei file scaricati."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1024
+#: apt.conf.5.xml:1019
 msgid ""
 "Output information about downloading and applying package index list diffs, "
 "and errors relating to package index list diffs."
@@ -5284,7 +5296,7 @@ msgstr ""
 "diff."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1036
+#: apt.conf.5.xml:1031
 msgid ""
 "Output information related to patching apt package lists when downloading "
 "index diffs instead of full indices."
@@ -5294,7 +5306,7 @@ msgstr ""
 "invece degli indici completi."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1047
+#: apt.conf.5.xml:1042
 msgid ""
 "Log all interactions with the sub-processes that actually perform downloads."
 msgstr ""
@@ -5302,7 +5314,7 @@ msgstr ""
 "realmente gli scaricamenti."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1058
+#: apt.conf.5.xml:1053
 msgid ""
 "Log events related to the automatically-installed status of packages and to "
 "the removal of unused packages."
@@ -5311,7 +5323,7 @@ msgstr ""
 "installato dei pacchetti e alla rimozione dei pacchetti non utilizzati."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1068
+#: apt.conf.5.xml:1063
 msgid ""
 "Generate debug messages describing which packages are being automatically "
 "installed to resolve dependencies.  This corresponds to the initial auto-"
@@ -5327,7 +5339,7 @@ msgstr ""
 "pkgProblemResolver</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1082
+#: apt.conf.5.xml:1077
 msgid ""
 "Generate debug messages describing which packages are marked as keep/install/"
 "remove while the ProblemResolver does his work.  Each addition or deletion "
@@ -5359,7 +5371,7 @@ msgstr ""
 "sezione in cui compare il pacchetto."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1103
+#: apt.conf.5.xml:1098
 msgid ""
 "When invoking &dpkg;, output the precise command line with which it is being "
 "invoked, with arguments separated by a single space character."
@@ -5368,7 +5380,7 @@ msgstr ""
 "gli argomenti separati da un singolo carattere di spazio."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1114
+#: apt.conf.5.xml:1109
 msgid ""
 "Output all the data received from &dpkg; on the status file descriptor and "
 "any errors encountered while parsing it."
@@ -5377,7 +5389,7 @@ msgstr ""
 "di stato ed ogni errore incontrato durante la sua analisi."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1125
+#: apt.conf.5.xml:1120
 msgid ""
 "Generate a trace of the algorithm that decides the order in which "
 "<literal>apt</literal> should pass packages to &dpkg;."
@@ -5386,7 +5398,7 @@ msgstr ""
 "literal> deve passare i pacchetti a &dpkg;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1137
+#: apt.conf.5.xml:1132
 msgid ""
 "Output status messages tracing the steps performed when invoking &dpkg;."
 msgstr ""
@@ -5394,12 +5406,12 @@ msgstr ""
 "nell'invocazione di &dpkg;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1148
+#: apt.conf.5.xml:1143
 msgid "Output the priority of each package list on startup."
 msgstr "Produce in output la priorità di ogni elenco di pacchetti all'avvio."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1158
+#: apt.conf.5.xml:1153
 msgid ""
 "Trace the execution of the dependency resolver (this applies only to what "
 "happens when a complex dependency problem is encountered)."
@@ -5409,7 +5421,7 @@ msgstr ""
 "dipendenze)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1169
+#: apt.conf.5.xml:1164
 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 "
@@ -5420,7 +5432,7 @@ msgstr ""
 "la stessa descritta in <literal>Debug::pkgDepCache::Marker</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1181
+#: apt.conf.5.xml:1176
 msgid ""
 "Print information about the vendors read from <filename>/etc/apt/vendors."
 "list</filename>."
@@ -5429,7 +5441,7 @@ msgstr ""
 "filename>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1191
+#: apt.conf.5.xml:1186
 msgid ""
 "Display the external commands that are called by apt hooks.  This includes e."
 "g. the config options <literal>DPkg::{Pre,Post}-Invoke</literal> or "
@@ -5437,13 +5449,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1215 apt_preferences.5.xml:547 sources.list.5.xml:239
-#: apt-ftparchive.1.xml:598
+#: apt.conf.5.xml:1210 apt_preferences.5.xml:541 sources.list.5.xml:233
+#: apt-ftparchive.1.xml:592
 msgid "Examples"
 msgstr "Esempi"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1216
+#: apt.conf.5.xml:1211
 msgid ""
 "&configureindex; is a configuration file showing example values for all "
 "possible options."
@@ -5453,17 +5465,17 @@ msgstr ""
 
 #.  ? reading apt.conf 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1228
+#: apt.conf.5.xml:1223
 msgid "&apt-cache;, &apt-config;, &apt-preferences;."
 msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt_preferences.5.xml:34
+#: apt_preferences.5.xml:28
 msgid "Preference control file for APT"
 msgstr "file di controllo delle preferenze per APT"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:39
+#: apt_preferences.5.xml:33
 msgid ""
 "The APT preferences file <filename>/etc/apt/preferences</filename> and the "
 "fragment files in the <filename>/etc/apt/preferences.d/</filename> folder "
@@ -5476,7 +5488,7 @@ msgstr ""
 "selezionata per l'installazione."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:44
+#: apt_preferences.5.xml:38
 msgid ""
 "Several versions of a package may be available for installation when the "
 "&sources-list; file contains references to more than one distribution (for "
@@ -5499,7 +5511,7 @@ msgstr ""
 "l'installazione."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:54
+#: apt_preferences.5.xml:48
 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 "
@@ -5514,7 +5526,7 @@ msgstr ""
 "effetto sulla scelta dell'istanza, ma solo sulla scelta della versione."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:61
+#: apt_preferences.5.xml:55
 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 "
@@ -5539,7 +5551,7 @@ msgstr ""
 "avvertiti."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:72
+#: apt_preferences.5.xml:66
 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 "
@@ -5561,24 +5573,24 @@ msgstr ""
 "viene ignorato in modo silenzioso."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:81
+#: apt_preferences.5.xml:75
 msgid "APT's Default Priority Assignments"
 msgstr "Assegnazioni della priorità predefinite di APT"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:96
+#: apt_preferences.5.xml:90
 #, no-wrap
 msgid "<command>apt-get install -t testing <replaceable>some-package</replaceable></command>\n"
 msgstr "<command>apt-get install -t testing <replaceable>un-pacchetto</replaceable></command>\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:99
+#: apt_preferences.5.xml:93
 #, no-wrap
 msgid "APT::Default-Release \"stable\";\n"
 msgstr "APT::Default-Release \"stable\";\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:83
+#: apt_preferences.5.xml:77
 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 "
@@ -5606,7 +5618,7 @@ msgstr ""
 "\"programlisting\" id=\"0\"/> <placeholder type=\"programlisting\" id=\"1\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:103
+#: apt_preferences.5.xml:97
 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:"
@@ -5615,12 +5627,12 @@ msgstr ""
 "algoritmo per impostare le priorità delle versioni di un pacchetto. Assegna:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:108
+#: apt_preferences.5.xml:102
 msgid "priority 1"
 msgstr "priorità 1"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:109
+#: apt_preferences.5.xml:103
 msgid ""
 "to the versions coming from archives which in their <filename>Release</"
 "filename> files are marked as \"NotAutomatic: yes\" but <emphasis>not</"
@@ -5633,12 +5645,12 @@ msgstr ""
 "<literal>experimental</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:115
+#: apt_preferences.5.xml:109
 msgid "priority 100"
 msgstr "priorità 100"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:116
+#: apt_preferences.5.xml:110
 msgid ""
 "to the version that is already installed (if any) and to the versions coming "
 "from archives which in their <filename>Release</filename> files are marked "
@@ -5652,12 +5664,12 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:123
+#: apt_preferences.5.xml:117
 msgid "priority 500"
 msgstr "priorità 500"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:124
+#: apt_preferences.5.xml:118
 msgid ""
 "to the versions that are not installed and do not belong to the target "
 "release."
@@ -5666,19 +5678,19 @@ msgstr ""
 "obiettivo."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:128
+#: apt_preferences.5.xml:122
 msgid "priority 990"
 msgstr "priorità 990"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:129
+#: apt_preferences.5.xml:123
 msgid ""
 "to the versions that are not installed and belong to the target release."
 msgstr ""
 "alle versioni che non sono installate e appartengono al rilascio obiettivo."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:134
+#: apt_preferences.5.xml:128
 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 "
@@ -5696,7 +5708,7 @@ msgstr ""
 "contrassegnate come «ButAutomaticUpgrades: yes»."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:141
+#: apt_preferences.5.xml:135
 msgid ""
 "APT then applies the following rules, listed in order of precedence, to "
 "determine which version of a package to install."
@@ -5705,7 +5717,7 @@ msgstr ""
 "seguenti regole, elencate in ordine di precedenza."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:144
+#: apt_preferences.5.xml:138
 msgid ""
 "Never downgrade unless the priority of an available version exceeds 1000.  "
 "(\"Downgrading\" is installing a less recent version of a package in place "
@@ -5722,12 +5734,12 @@ msgstr ""
 "rischioso.)"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:150
+#: apt_preferences.5.xml:144
 msgid "Install the highest priority version."
 msgstr "Installa la versione con la priorità più alta."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:151
+#: apt_preferences.5.xml:145
 msgid ""
 "If two or more versions have the same priority, install the most recent one "
 "(that is, the one with the higher version number)."
@@ -5736,7 +5748,7 @@ msgstr ""
 "recente (cioè quella con il numero di versione più alto)."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:154
+#: apt_preferences.5.xml:148
 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 <literal>--reinstall</"
@@ -5748,7 +5760,7 @@ msgstr ""
 "non installata."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:160
+#: apt_preferences.5.xml:154
 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 "
@@ -5764,7 +5776,7 @@ msgstr ""
 "upgrade</command>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:167
+#: apt_preferences.5.xml:161
 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 "
@@ -5778,7 +5790,7 @@ msgstr ""
 "upgrade</command>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:172
+#: apt_preferences.5.xml:166
 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 "
@@ -5797,12 +5809,12 @@ msgstr ""
 "priorità più alta di quella installata."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:181
+#: apt_preferences.5.xml:175
 msgid "The Effect of APT Preferences"
 msgstr "L'effetto delle preferenze di APT"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:183
+#: apt_preferences.5.xml:177
 msgid ""
 "The APT preferences file allows the system administrator to control the "
 "assignment of priorities.  The file consists of one or more multi-line "
@@ -5815,7 +5827,7 @@ msgstr ""
 "due forme: una forma specifica e una forma generica."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:189
+#: apt_preferences.5.xml:183
 msgid ""
 "The specific form assigns a priority (a \"Pin-Priority\") to one or more "
 "specified packages with a specified version or version range.  For example, "
@@ -5832,7 +5844,7 @@ msgstr ""
 "spazi."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:196
+#: apt_preferences.5.xml:190
 #, no-wrap
 msgid ""
 "Package: perl\n"
@@ -5844,7 +5856,7 @@ msgstr ""
 "Pin-Priority: 1001\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:202
+#: apt_preferences.5.xml:196
 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 "
@@ -5859,7 +5871,7 @@ msgstr ""
 "identificato in base al suo nome di dominio pienamente qualificato."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:208
+#: apt_preferences.5.xml:202
 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 "
@@ -5870,7 +5882,7 @@ msgstr ""
 "priorità alta a tutte le versioni di pacchetto disponibili dal sito locale."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:213
+#: apt_preferences.5.xml:207
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -5882,7 +5894,7 @@ msgstr ""
 "Pin-Priority: 999\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:218
+#: apt_preferences.5.xml:212
 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 "
@@ -5895,7 +5907,7 @@ msgstr ""
 "identificato dal nome host «ftp.de.debian.org»"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:222
+#: apt_preferences.5.xml:216
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -5907,7 +5919,7 @@ msgstr ""
 "Pin-Priority: 999\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:226
+#: apt_preferences.5.xml:220
 msgid ""
 "This should <emphasis>not</emphasis> be confused with the Origin of a "
 "distribution as specified in a <filename>Release</filename> file.  What "
@@ -5922,7 +5934,7 @@ msgstr ""
 "«Ximian»."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:231
+#: apt_preferences.5.xml:225
 msgid ""
 "The following record assigns a low priority to all package versions "
 "belonging to any distribution whose Archive name is \"<literal>unstable</"
@@ -5933,7 +5945,7 @@ msgstr ""
 "archivio è «<literal>unstable</literal>»."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:235
+#: apt_preferences.5.xml:229
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -5945,7 +5957,7 @@ msgstr ""
 "Pin-Priority: 50\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:240
+#: apt_preferences.5.xml:234
 msgid ""
 "The following record assigns a high priority to all package versions "
 "belonging to any distribution whose Codename is \"<literal>&testing-codename;"
@@ -5956,7 +5968,7 @@ msgstr ""
 "codice è «<literal>&testing-codename;</literal>»."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:244
+#: apt_preferences.5.xml:238
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -5968,7 +5980,7 @@ msgstr ""
 "Pin-Priority: 900\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:249
+#: apt_preferences.5.xml:243
 msgid ""
 "The following record assigns a high priority to all package versions "
 "belonging to any release whose Archive name is \"<literal>stable</literal>\" "
@@ -5980,7 +5992,7 @@ msgstr ""
 "«<literal>&stable-version;</literal>»."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:254
+#: apt_preferences.5.xml:248
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -5993,12 +6005,12 @@ msgstr ""
 
 # &glob; è rimpiazzato da "glob(7)"
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:264
+#: apt_preferences.5.xml:258
 msgid "Regular expressions and &glob; syntax"
 msgstr "Sintassi per le espressioni regolari e &glob;"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:266
+#: apt_preferences.5.xml:260
 msgid ""
 "APT also supports pinning by &glob; expressions, and regular expressions "
 "surrounded by slashes. For example, the following example assigns the "
@@ -6014,7 +6026,7 @@ msgstr ""
 "POSIX racchiusa tra sbarre)."
 
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:275
+#: apt_preferences.5.xml:269
 #, no-wrap
 msgid ""
 "Package: gnome* /kde/\n"
@@ -6026,7 +6038,7 @@ msgstr ""
 "Pin-Priority: 500\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:281
+#: apt_preferences.5.xml:275
 msgid ""
 "The rule for those expressions is that they can occur anywhere where a "
 "string can occur. Thus, the following pin assigns the priority 990 to all "
@@ -6037,7 +6049,7 @@ msgstr ""
 "provenienti da un rilascio il cui nome inizia con &ubuntu-codename;."
 
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:287
+#: apt_preferences.5.xml:281
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -6049,7 +6061,7 @@ msgstr ""
 "Pin-Priority: 990\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:293
+#: apt_preferences.5.xml:287
 msgid ""
 "If a regular expression occurs in a <literal>Package</literal> field, the "
 "behavior is the same as if this regular expression were replaced with a list "
@@ -6068,12 +6080,12 @@ msgstr ""
 "non viene considerato come un'espressione &glob;."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:309
+#: apt_preferences.5.xml:303
 msgid "How APT Interprets Priorities"
 msgstr "Come APT interpreta le priorità"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:312
+#: apt_preferences.5.xml:306
 msgid ""
 "Priorities (P) assigned in the APT preferences file must be positive or "
 "negative integers.  They are interpreted as follows (roughly speaking):"
@@ -6083,12 +6095,12 @@ msgstr ""
 "seguente (semplificando le cose):"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:317
+#: apt_preferences.5.xml:311
 msgid "P &gt;= 1000"
 msgstr "P &gt;= 1000"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:318
+#: apt_preferences.5.xml:312
 msgid ""
 "causes a version to be installed even if this constitutes a downgrade of the "
 "package"
@@ -6097,12 +6109,12 @@ msgstr ""
 "retrocessione del pacchetto"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:322
+#: apt_preferences.5.xml:316
 msgid "990 &lt;= P &lt; 1000"
 msgstr "990 &lt;= P &lt; 1000"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:323
+#: apt_preferences.5.xml:317
 msgid ""
 "causes a version to be installed even if it does not come from the target "
 "release, unless the installed version is more recent"
@@ -6111,12 +6123,12 @@ msgstr ""
 "obiettivo, a meno che la versione installata non sia più recente"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:328
+#: apt_preferences.5.xml:322
 msgid "500 &lt;= P &lt; 990"
 msgstr "500 &lt;= P &lt; 990"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:329
+#: apt_preferences.5.xml:323
 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"
@@ -6126,12 +6138,12 @@ msgstr ""
 "sia più recente"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:334
+#: apt_preferences.5.xml:328
 msgid "100 &lt;= P &lt; 500"
 msgstr "100 &lt;= P &lt; 500"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:335
+#: apt_preferences.5.xml:329
 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"
@@ -6141,12 +6153,12 @@ msgstr ""
 "installata non sia più recente"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:340
+#: apt_preferences.5.xml:334
 msgid "0 &lt; P &lt; 100"
 msgstr "0 &lt; P &lt; 100"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:341
+#: apt_preferences.5.xml:335
 msgid ""
 "causes a version to be installed only if there is no installed version of "
 "the package"
@@ -6155,17 +6167,17 @@ msgstr ""
 "è installata"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:345
+#: apt_preferences.5.xml:339
 msgid "P &lt; 0"
 msgstr "P &lt; 0"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:346
+#: apt_preferences.5.xml:340
 msgid "prevents the version from being installed"
 msgstr "impedisce l'installazione della versione"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:351
+#: apt_preferences.5.xml:345
 msgid ""
 "If any specific-form records match an available package version then the "
 "first such record determines the priority of the package version.  Failing "
@@ -6180,7 +6192,7 @@ msgstr ""
 "versione del pacchetto."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:357
+#: apt_preferences.5.xml:351
 msgid ""
 "For example, suppose the APT preferences file contains the three records "
 "presented earlier:"
@@ -6189,7 +6201,7 @@ msgstr ""
 "record descritti in precedenza:"
 
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:361
+#: apt_preferences.5.xml:355
 #, no-wrap
 msgid ""
 "Package: perl\n"
@@ -6217,12 +6229,12 @@ msgstr ""
 "Pin-Priority: 50\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:374
+#: apt_preferences.5.xml:368
 msgid "Then:"
 msgstr "Allora:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:376
+#: apt_preferences.5.xml:370
 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 "
@@ -6237,7 +6249,7 @@ msgstr ""
 "installata è &bad-perl;*, allora <literal>perl</literal> verrà retrocesso."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:381
+#: apt_preferences.5.xml:375
 msgid ""
 "A version of any package other than <literal>perl</literal> that is "
 "available from the local system has priority over other versions, even "
@@ -6248,7 +6260,7 @@ msgstr ""
 "versioni, incluse quelle che appartengono al rilascio obiettivo."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:385
+#: apt_preferences.5.xml:379
 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 <literal>unstable</"
@@ -6262,13 +6274,13 @@ msgstr ""
 "installata."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:395
+#: apt_preferences.5.xml:389
 msgid "Determination of Package Version and Distribution Properties"
 msgstr ""
 "Determinazione delle proprietà di versione del pacchetto e di distribuzione"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:397
+#: apt_preferences.5.xml:391
 msgid ""
 "The locations listed in the &sources-list; file should provide "
 "<filename>Packages</filename> and <filename>Release</filename> files to "
@@ -6279,7 +6291,7 @@ msgstr ""
 "i pacchetti disponibili in quelle posizioni."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:401
+#: apt_preferences.5.xml:395
 msgid ""
 "The <filename>Packages</filename> file is normally found in the directory "
 "<filename>.../dists/<replaceable>dist-name</replaceable>/"
@@ -6298,27 +6310,27 @@ msgstr ""
 "righe sono rilevanti per l'impostazione delle priorità di APT:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:409
+#: apt_preferences.5.xml:403
 msgid "the <literal>Package:</literal> line"
 msgstr "la riga <literal>Package:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:410
+#: apt_preferences.5.xml:404
 msgid "gives the package name"
 msgstr "indica il nome del pacchetto"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:413 apt_preferences.5.xml:463
+#: apt_preferences.5.xml:407 apt_preferences.5.xml:457
 msgid "the <literal>Version:</literal> line"
 msgstr "la riga <literal>Version:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:414
+#: apt_preferences.5.xml:408
 msgid "gives the version number for the named package"
 msgstr "indica il numero di versione per il pacchetto indicato"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:419
+#: apt_preferences.5.xml:413
 msgid ""
 "The <filename>Release</filename> file is normally found in the directory "
 "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
@@ -6340,12 +6352,12 @@ msgstr ""
 "priorità di APT:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:430
+#: apt_preferences.5.xml:424
 msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
 msgstr "la riga <literal>Archive:</literal> o <literal>Suite:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:431
+#: apt_preferences.5.xml:425
 msgid ""
 "names the archive to which all the packages in the directory tree belong.  "
 "For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@ -6362,18 +6374,18 @@ msgstr ""
 "preferenze di APT si deve usare la riga:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:441
+#: apt_preferences.5.xml:435
 #, no-wrap
 msgid "Pin: release a=stable\n"
 msgstr "Pin: release a=stable\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:447
+#: apt_preferences.5.xml:441
 msgid "the <literal>Codename:</literal> line"
 msgstr "la riga <literal>Codename:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:448
+#: apt_preferences.5.xml:442
 msgid ""
 "names the codename to which all the packages in the directory tree belong.  "
 "For example, the line \"Codename: &testing-codename;\" specifies that all of "
@@ -6390,13 +6402,13 @@ msgstr ""
 "valore nelle preferenze di APT si deve usare la riga:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:457
+#: apt_preferences.5.xml:451
 #, no-wrap
 msgid "Pin: release n=&testing-codename;\n"
 msgstr "Pin: release n=&testing-codename;\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:464
+#: apt_preferences.5.xml:458
 msgid ""
 "names the release version.  For example, the packages in the tree might "
 "belong to Debian release version &stable-version;.  Note that there is "
@@ -6413,7 +6425,7 @@ msgstr ""
 "APT si deve usare una delle seguenti righe:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:473
+#: apt_preferences.5.xml:467
 #, no-wrap
 msgid ""
 "Pin: release v=&stable-version;\n"
@@ -6425,12 +6437,12 @@ msgstr ""
 "Pin: release &stable-version;\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:482
+#: apt_preferences.5.xml:476
 msgid "the <literal>Component:</literal> line"
 msgstr "la riga<literal>Component:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:483
+#: apt_preferences.5.xml:477
 msgid ""
 "names the licensing component associated with the packages in the directory "
 "tree of the <filename>Release</filename> file.  For example, the line "
@@ -6448,18 +6460,18 @@ msgstr ""
 "usare la riga:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:492
+#: apt_preferences.5.xml:486
 #, no-wrap
 msgid "Pin: release c=main\n"
 msgstr "Pin: release c=main\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:498
+#: apt_preferences.5.xml:492
 msgid "the <literal>Origin:</literal> line"
 msgstr "la riga <literal>Origin:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:499
+#: apt_preferences.5.xml:493
 msgid ""
 "names the originator of the packages in the directory tree of the "
 "<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"
@@ -6471,18 +6483,18 @@ msgstr ""
 "specificare questa origine nelle preferenze di APT si deve usare la riga:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:505
+#: apt_preferences.5.xml:499
 #, no-wrap
 msgid "Pin: release o=Debian\n"
 msgstr "Pin: release o=Debian\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:511
+#: apt_preferences.5.xml:505
 msgid "the <literal>Label:</literal> line"
 msgstr "la riga <literal>Label:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:512
+#: apt_preferences.5.xml:506
 msgid ""
 "names the label of the packages in the directory tree of the "
 "<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"
@@ -6494,13 +6506,13 @@ msgstr ""
 "specificare questa etichetta nelle preferenze di APT si deve usare la riga:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:518
+#: apt_preferences.5.xml:512
 #, no-wrap
 msgid "Pin: release l=Debian\n"
 msgstr "Pin: release l=Debian\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:525
+#: apt_preferences.5.xml:519
 msgid ""
 "All of the <filename>Packages</filename> and <filename>Release</filename> "
 "files retrieved from locations listed in the &sources-list; file are stored "
@@ -6525,12 +6537,12 @@ msgstr ""
 "<literal>unstable</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:538
+#: apt_preferences.5.xml:532
 msgid "Optional Lines in an APT Preferences Record"
 msgstr "Righe opzionali in un record delle preferenze di APT"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:540
+#: apt_preferences.5.xml:534
 msgid ""
 "Each record in the APT preferences file can optionally begin with one or "
 "more lines beginning with the word <literal>Explanation:</literal>.  This "
@@ -6541,12 +6553,12 @@ msgstr ""
 "literal>. Ciò fornisce un posto dove mettere commenti."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:549
+#: apt_preferences.5.xml:543
 msgid "Tracking Stable"
 msgstr "Seguire Stable in modo continuativo"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:557
+#: apt_preferences.5.xml:551
 #, no-wrap
 msgid ""
 "Explanation: Uninstall or do not install any Debian-originated\n"
@@ -6571,7 +6583,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:551
+#: apt_preferences.5.xml:545
 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 "
@@ -6587,8 +6599,8 @@ msgstr ""
 "\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:574 apt_preferences.5.xml:620
-#: apt_preferences.5.xml:678
+#: apt_preferences.5.xml:568 apt_preferences.5.xml:614
+#: apt_preferences.5.xml:672
 #, no-wrap
 msgid ""
 "apt-get install <replaceable>package-name</replaceable>\n"
@@ -6600,7 +6612,7 @@ msgstr ""
 "apt-get dist-upgrade\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:569
+#: apt_preferences.5.xml:563
 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 "
@@ -6613,13 +6625,13 @@ msgstr ""
 "\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:586
+#: apt_preferences.5.xml:580
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/testing\n"
 msgstr "apt-get install <replaceable>pacchetto</replaceable>/testing\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:580
+#: apt_preferences.5.xml:574
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>testing</literal> distribution; the package "
@@ -6632,12 +6644,12 @@ msgstr ""
 "nuovamente questo comando. <placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:592
+#: apt_preferences.5.xml:586
 msgid "Tracking Testing or Unstable"
 msgstr "Seguire Testing o Unstable in modo continuativo"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:601
+#: apt_preferences.5.xml:595
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -6665,7 +6677,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:594
+#: apt_preferences.5.xml:588
 msgid ""
 "The following APT preferences file will cause APT to assign a high priority "
 "to package versions from the <literal>testing</literal> distribution, a "
@@ -6682,7 +6694,7 @@ msgstr ""
 "literal>. <placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:615
+#: apt_preferences.5.xml:609
 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 "
@@ -6695,13 +6707,13 @@ msgstr ""
 "\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:635
+#: apt_preferences.5.xml:629
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
 msgstr "apt-get install <replaceable>pacchetto</replaceable>/unstable\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:626
+#: apt_preferences.5.xml:620
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>unstable</literal> distribution.  "
@@ -6720,12 +6732,12 @@ msgstr ""
 "<placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:642
+#: apt_preferences.5.xml:636
 msgid "Tracking the evolution of a codename release"
 msgstr "Seguire l'evoluzione di un rilascio in base al nome in codice"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:656
+#: apt_preferences.5.xml:650
 #, no-wrap
 msgid ""
 "Explanation: Uninstall or do not install any Debian-originated package versions\n"
@@ -6760,7 +6772,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:644
+#: apt_preferences.5.xml:638
 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 "
@@ -6787,7 +6799,7 @@ msgstr ""
 "id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:673
+#: apt_preferences.5.xml:667
 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 "
@@ -6800,13 +6812,13 @@ msgstr ""
 "codename;</literal>. <placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:693
+#: apt_preferences.5.xml:687
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/sid\n"
 msgstr "apt-get install <replaceable>pacchetto</replaceable>/sid\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:684
+#: apt_preferences.5.xml:678
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>sid</literal> distribution.  Thereafter, "
@@ -6825,17 +6837,17 @@ msgstr ""
 "type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:708
+#: apt_preferences.5.xml:702
 msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: sources.list.5.xml:35
+#: sources.list.5.xml:29
 msgid "List of configured APT data sources"
 msgstr "elenco delle fonti di dati configurate per APT"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:40
+#: sources.list.5.xml:34
 msgid ""
 "The source list <filename>/etc/apt/sources.list</filename> is designed to "
 "support any number of active sources and a variety of source media. The file "
@@ -6852,7 +6864,7 @@ msgstr ""
 "interfaccia per APT)."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:47
+#: sources.list.5.xml:41
 msgid ""
 "Each line specifying a source starts with type (e.g. <literal>deb-src</"
 "literal>)  followed by options and arguments for this type.  Individual "
@@ -6867,12 +6879,12 @@ msgstr ""
 "punto di una riga contrassegna come commento la parte rimanente della riga."
 
 #. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:55
+#: sources.list.5.xml:49
 msgid "sources.list.d"
 msgstr "sources.list.d"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:56
+#: sources.list.5.xml:50
 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 "
@@ -6894,12 +6906,12 @@ msgstr ""
 "caso viene ignorato in modo silenzioso."
 
 #. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:67
+#: sources.list.5.xml:61
 msgid "The deb and deb-src types"
 msgstr "I tipi deb e deb-src"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:68
+#: sources.list.5.xml:62
 msgid ""
 "The <literal>deb</literal> type references a typical two-level Debian "
 "archive, <filename>distribution/component</filename>. The "
@@ -6925,7 +6937,7 @@ msgstr ""
 "riga <literal>deb-src</literal>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:79
+#: sources.list.5.xml:73
 msgid ""
 "The format for a <filename>sources.list</filename> entry using the "
 "<literal>deb</literal> and <literal>deb-src</literal> types is:"
@@ -6934,13 +6946,13 @@ msgstr ""
 "<literal>deb</literal> o <literal>deb-src</literal> è:"
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:82
+#: sources.list.5.xml:76
 #, no-wrap
 msgid "deb [ options ] uri suite [component1] [component2] [...]"
 msgstr "deb [ opzioni ] uri suite [componente1] [componente2] [...]"
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:86
+#: sources.list.5.xml:80
 #, no-wrap
 msgid ""
 "     Types: deb deb-src\n"
@@ -6980,7 +6992,7 @@ msgstr ""
 "   "
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:84
+#: sources.list.5.xml:78
 msgid ""
 "Alternatively a rfc822 style format is also supported: <placeholder type="
 "\"literallayout\" id=\"0\"/>"
@@ -6989,7 +7001,7 @@ msgstr ""
 "\"literallayout\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:105
+#: sources.list.5.xml:99
 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.  "
@@ -7010,7 +7022,7 @@ msgstr ""
 "esatto, deve essere presente almeno una <literal>componente</literal>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:114
+#: sources.list.5.xml:108
 msgid ""
 "<literal>suite</literal> may also contain a variable, <literal>$(ARCH)</"
 "literal> which expands to the Debian architecture (such as <literal>amd64</"
@@ -7029,7 +7041,7 @@ msgstr ""
 "automaticamente un URI con l'architettura corrente."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:122
+#: sources.list.5.xml:116
 msgid ""
 "In the traditional style sources.list format since only one distribution can "
 "be specified per line it may be necessary to have multiple lines for the "
@@ -7058,7 +7070,7 @@ msgstr ""
 "larghezza di banda."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:136
+#: sources.list.5.xml:130
 msgid ""
 "<literal>options</literal> is always optional and needs to be surrounded by "
 "square brackets. It can consist of multiple settings in the form "
@@ -7075,7 +7087,7 @@ msgstr ""
 "supportate verranno ignorate in modo silenzioso):"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:142
+#: sources.list.5.xml:136
 msgid ""
 "<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
 "replaceable>,…</literal> can be used to specify for which architectures "
@@ -7090,7 +7102,7 @@ msgstr ""
 "Architectures</literal>."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:146
+#: sources.list.5.xml:140
 msgid ""
 "<literal>arch+=<replaceable>arch1</replaceable>,<replaceable>arch2</"
 "replaceable>,…</literal> and <literal>arch-=<replaceable>arch1</replaceable>,"
@@ -7104,7 +7116,7 @@ msgstr ""
 "scaricate."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:149
+#: sources.list.5.xml:143
 msgid ""
 "<literal>trusted=yes</literal> can be set to indicate that packages from "
 "this source are always authenticated even if the <filename>Release</"
@@ -7121,7 +7133,7 @@ msgstr ""
 "tratta anche le fonti correttamente autenticate come non autenticate."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:156
+#: sources.list.5.xml:150
 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 "
@@ -7134,12 +7146,12 @@ msgstr ""
 "in una rete locale, seguiti da host Internet distanti)."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:161
+#: sources.list.5.xml:155
 msgid "Some examples:"
 msgstr "Alcuni esempi:"
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:163
+#: sources.list.5.xml:157
 #, no-wrap
 msgid ""
 "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
@@ -7151,17 +7163,17 @@ msgstr ""
 "   "
 
 #. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:169
+#: sources.list.5.xml:163
 msgid "URI specification"
 msgstr "Specificare URI"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:171
+#: sources.list.5.xml:165
 msgid "The currently recognized URI types are:"
 msgstr "I tipi di URI attualmente riconosciuti sono:"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:175
+#: sources.list.5.xml:169
 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 "
@@ -7172,7 +7184,7 @@ msgstr ""
 "archivi locali."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:182
+#: sources.list.5.xml:176
 msgid ""
 "The cdrom scheme allows APT to use a local CD-ROM drive with media swapping. "
 "Use the &apt-cdrom; program to create cdrom entries in the source list."
@@ -7182,7 +7194,7 @@ msgstr ""
 "delle fonti."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:189
+#: sources.list.5.xml:183
 msgid ""
 "The http scheme specifies an HTTP server for the archive. If an environment "
 "variable <envar>http_proxy</envar> is set with the format http://server:"
@@ -7199,7 +7211,7 @@ msgstr ""
 "è un metodo di autenticazione non sicuro."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:200
+#: sources.list.5.xml:194
 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 page. "
@@ -7219,7 +7231,7 @@ msgstr ""
 "HTTP specificati nel file di configurazione verranno ignorati."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:212
+#: sources.list.5.xml:206
 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.  "
@@ -7232,7 +7244,7 @@ msgstr ""
 "rimovibili, per copiare i file nelle varie posizioni con APT."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:219
+#: sources.list.5.xml:213
 msgid ""
 "The rsh/ssh method invokes RSH/SSH to connect to a remote host and access "
 "the files as a given user. Prior configuration of rhosts or RSA keys is "
@@ -7246,12 +7258,12 @@ msgstr ""
 "command> e <command>dd</command>."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:226
+#: sources.list.5.xml:220
 msgid "adding more recognizable URI types"
 msgstr "aggiungere ulteriori tipi di URI riconoscibili"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:228
+#: sources.list.5.xml:222
 msgid ""
 "APT can be extended with more methods shipped in other optional packages, "
 "which should follow the naming scheme <package>apt-transport-"
@@ -7270,7 +7282,7 @@ msgstr ""
 "debtorrrent; vedere &apt-transport-debtorrent;."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:240
+#: sources.list.5.xml:234
 msgid ""
 "Uses the archive stored locally (or NFS mounted) at /home/jason/debian for "
 "stable/main, stable/contrib, and stable/non-free."
@@ -7279,37 +7291,37 @@ msgstr ""
 "debian per stable/main, stable/contrib e stable/non-free."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:242
+#: sources.list.5.xml:236
 #, no-wrap
 msgid "deb file:/home/jason/debian stable main contrib non-free"
 msgstr "deb file:/home/gianni/debian stable main contrib non-free"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:244
+#: sources.list.5.xml:238
 msgid "As above, except this uses the unstable (development) distribution."
 msgstr ""
 "Come sopra, tranne per il fatto che usa la distribuzione unstable (di "
 "sviluppo)"
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:245
+#: sources.list.5.xml:239
 #, no-wrap
 msgid "deb file:/home/jason/debian unstable main contrib non-free"
 msgstr "deb file:/home/gianni/debian unstable main contrib non-free"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:247
+#: sources.list.5.xml:241
 msgid "Source line for the above"
 msgstr "Riga per i sorgenti corrispondente alla precedente"
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:248
+#: sources.list.5.xml:242
 #, no-wrap
 msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
 msgstr "deb-src file:/home/gianni/debian unstable main contrib non-free"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:250
+#: sources.list.5.xml:244
 msgid ""
 "The first line gets package information for the architectures in "
 "<literal>APT::Architectures</literal> while the second always retrieves "
@@ -7320,7 +7332,7 @@ msgstr ""
 "<literal>amd64</literal> e <literal>armel</literal>."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:252
+#: sources.list.5.xml:246
 #, no-wrap
 msgid ""
 "deb http://ftp.debian.org/debian &stable-codename; main\n"
@@ -7330,7 +7342,7 @@ msgstr ""
 "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:255
+#: sources.list.5.xml:249
 msgid ""
 "Uses HTTP to access the archive at archive.debian.org, and uses only the "
 "hamm/main area."
@@ -7339,13 +7351,13 @@ msgstr ""
 "hamm/main."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:257
+#: sources.list.5.xml:251
 #, no-wrap
 msgid "deb http://archive.debian.org/debian-archive hamm main"
 msgstr "deb http://archive.debian.org/debian-archive hamm main"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:259
+#: sources.list.5.xml:253
 msgid ""
 "Uses FTP to access the archive at ftp.debian.org, under the debian "
 "directory, and uses only the &stable-codename;/contrib area."
@@ -7354,13 +7366,13 @@ msgstr ""
 "e usa solo l'area &stable-codename;/contrib."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:261
+#: sources.list.5.xml:255
 #, no-wrap
 msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
 msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:263
+#: sources.list.5.xml:257
 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 "
@@ -7373,19 +7385,19 @@ msgstr ""
 "usata una sola sessione FTP per entrambe le righe."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:267
+#: sources.list.5.xml:261
 #, no-wrap
 msgid "deb ftp://ftp.debian.org/debian unstable contrib"
 msgstr "deb ftp://ftp.debian.org/debian unstable contrib"
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:276
+#: sources.list.5.xml:270
 #, no-wrap
 msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
 msgstr "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:269
+#: sources.list.5.xml:263
 msgid ""
 "Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe "
 "directory, and uses only files found under <filename>unstable/binary-i386</"
@@ -7404,17 +7416,17 @@ msgstr ""
 "modo.] <placeholder type=\"literallayout\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:281
+#: sources.list.5.xml:275
 msgid "&apt-cache; &apt-conf;"
 msgstr "&apt-cache; &apt-conf;"
 
 #. type: Content of: <refentry><refmeta><manvolnum>
-#: apt-extracttemplates.1.xml:28 apt-sortpkgs.1.xml:28 apt-ftparchive.1.xml:28
+#: apt-extracttemplates.1.xml:22 apt-sortpkgs.1.xml:22 apt-ftparchive.1.xml:22
 msgid "1"
 msgstr "1"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-extracttemplates.1.xml:35
+#: apt-extracttemplates.1.xml:29
 msgid ""
 "Utility to extract <command>debconf</command> config and templates from "
 "Debian packages"
@@ -7423,7 +7435,7 @@ msgstr ""
 "pacchetti Debian"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:41
+#: apt-extracttemplates.1.xml:35
 msgid ""
 "<command>apt-extracttemplates</command> will take one or more Debian package "
 "files as input and write out (to a temporary directory) all associated "
@@ -7438,12 +7450,12 @@ msgstr ""
 "output nel formato:"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:46
+#: apt-extracttemplates.1.xml:40
 msgid "package version template-file config-script"
 msgstr "pacchetto versione file-template script-di-configurazione"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:47
+#: apt-extracttemplates.1.xml:41
 msgid ""
 "template-file and config-script are written to the temporary directory "
 "specified by the <option>-t</option> or <option>--tempdir</option> "
@@ -7458,7 +7470,7 @@ msgstr ""
 "<filename>pacchetto.config.XXXXXX</filename>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-extracttemplates.1.xml:60
+#: apt-extracttemplates.1.xml:54
 msgid ""
 "Temporary directory in which to write extracted <command>debconf</command> "
 "template files and config scripts.  Configuration Item: <literal>APT::"
@@ -7469,7 +7481,7 @@ msgstr ""
 "<literal>APT::ExtractTemplates::TempDir</literal>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:77
+#: apt-extracttemplates.1.xml:71
 msgid ""
 "<command>apt-extracttemplates</command> returns zero on normal operation, "
 "decimal 100 on error."
@@ -7478,12 +7490,12 @@ msgstr ""
 "funzionamento normale e il valore decimale 100 in caso di errore."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-sortpkgs.1.xml:35
+#: apt-sortpkgs.1.xml:29
 msgid "Utility to sort package index files"
 msgstr "utilità per ordinare i file indice dei pacchetti"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-sortpkgs.1.xml:41
+#: apt-sortpkgs.1.xml:35
 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 "
@@ -7495,7 +7507,7 @@ msgstr ""
 "i campi interni ad ogni record in base alle regole di ordinamento interne."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-sortpkgs.1.xml:47
+#: apt-sortpkgs.1.xml:41
 msgid ""
 "All output is sent to standard output; the input must be a seekable file."
 msgstr ""
@@ -7503,7 +7515,7 @@ msgstr ""
 "file leggibile con seek."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-sortpkgs.1.xml:56
+#: apt-sortpkgs.1.xml:50
 msgid ""
 "Use source index field ordering.  Configuration Item: <literal>APT::"
 "SortPkgs::Source</literal>."
@@ -7512,7 +7524,7 @@ msgstr ""
 "configurazione: <literal>APT::SortPkgs::Source</literal>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-sortpkgs.1.xml:70
+#: apt-sortpkgs.1.xml:64
 msgid ""
 "<command>apt-sortpkgs</command> returns zero on normal operation, decimal "
 "100 on error."
@@ -7521,12 +7533,12 @@ msgstr ""
 "normale e il valore decimale 100 in caso di errore."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-ftparchive.1.xml:35
+#: apt-ftparchive.1.xml:29
 msgid "Utility to generate index files"
 msgstr "strumento per generare file indice"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:41
+#: apt-ftparchive.1.xml:35
 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 "
@@ -7539,7 +7551,7 @@ msgstr ""
 "di tale sito."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:45
+#: apt-ftparchive.1.xml:39
 msgid ""
 "<command>apt-ftparchive</command> is a superset of the &dpkg-scanpackages; "
 "program, incorporating its entire functionality via the <literal>packages</"
@@ -7554,7 +7566,7 @@ msgstr ""
 "tramite script il processo di generazione per un archivio completo."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:51
+#: apt-ftparchive.1.xml:45
 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 "
@@ -7569,7 +7581,7 @@ msgstr ""
 "compressi desiderati in uscita."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:62
+#: apt-ftparchive.1.xml:56
 msgid ""
 "The packages command generates a package file from a directory tree. It "
 "takes the given directory and recursively searches it for .deb files, "
@@ -7582,7 +7594,7 @@ msgstr ""
 "equivalente a &dpkg-scanpackages;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:67 apt-ftparchive.1.xml:91
+#: apt-ftparchive.1.xml:61 apt-ftparchive.1.xml:85
 msgid ""
 "The option <option>--db</option> can be used to specify a binary caching DB."
 msgstr ""
@@ -7590,7 +7602,7 @@ msgstr ""
 "binario da usare come cache."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:72
+#: apt-ftparchive.1.xml:66
 msgid ""
 "The <literal>sources</literal> command generates a source index file from a "
 "directory tree.  It takes the given directory and recursively searches it "
@@ -7603,7 +7615,7 @@ msgstr ""
 "comando è più o meno equivalente a &dpkg-scansources;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:77
+#: apt-ftparchive.1.xml:71
 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 "
@@ -7614,7 +7626,7 @@ msgstr ""
 "per cambiare il file override sorgente da usare."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:84
+#: apt-ftparchive.1.xml:78
 msgid ""
 "The <literal>contents</literal> command generates a contents file from a "
 "directory tree. It takes the given directory and recursively searches it "
@@ -7631,7 +7643,7 @@ msgstr ""
 "stesso file, ciascun pacchetto è separato da una virgola nell'output."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:96
+#: apt-ftparchive.1.xml:90
 msgid ""
 "The <literal>release</literal> command generates a Release file from a "
 "directory tree. It recursively searches the given directory for uncompressed "
@@ -7656,7 +7668,7 @@ msgstr ""
 "filename> contenente per ogni file un digest MD5, SHA1 e SHA256."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:106
+#: apt-ftparchive.1.xml:100
 msgid ""
 "Values for the additional metadata fields in the Release file are taken from "
 "the corresponding variables under <literal>APT::FTPArchive::Release</"
@@ -7677,7 +7689,7 @@ msgstr ""
 "<literal>Description</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:119
+#: apt-ftparchive.1.xml:113
 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 "
@@ -7693,7 +7705,7 @@ msgstr ""
 "impostazioni desiderate."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:128
+#: apt-ftparchive.1.xml:122
 msgid ""
 "The <literal>clean</literal> command tidies the databases used by the given "
 "configuration file by removing any records that are no longer necessary."
@@ -7702,12 +7714,12 @@ msgstr ""
 "configurazione dato, rimuovendo tutti i record non più necessari."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:134
+#: apt-ftparchive.1.xml:128
 msgid "The Generate Configuration"
 msgstr "La configurazione di generate"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:136
+#: apt-ftparchive.1.xml:130
 msgid ""
 "The <literal>generate</literal> command uses a configuration file to "
 "describe the archives that are going to be generated. It follows the typical "
@@ -7724,7 +7736,7 @@ msgstr ""
 "Ciò ha effetto soltanto sulla gestione del tag di ambito."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:144
+#: apt-ftparchive.1.xml:138
 msgid ""
 "The generate configuration has four separate sections, each described below."
 msgstr ""
@@ -7732,12 +7744,12 @@ msgstr ""
 "quali è descritta in seguito."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:146
+#: apt-ftparchive.1.xml:140
 msgid "<literal>Dir</literal> Section"
 msgstr "Sezione <literal>Dir</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:148
+#: apt-ftparchive.1.xml:142
 msgid ""
 "The <literal>Dir</literal> section defines the standard directories needed "
 "to locate the files required during the generation process. These "
@@ -7750,7 +7762,7 @@ msgstr ""
 "sezioni successive, per produrre un percorso assoluto completo."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:155
+#: apt-ftparchive.1.xml:149
 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 "
@@ -7760,17 +7772,17 @@ msgstr ""
 "questa è la directory che contiene i nodi <filename>ls-LR</filename> e dist."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:162
+#: apt-ftparchive.1.xml:156
 msgid "Specifies the location of the override files."
 msgstr "Specifica la posizione dei file override."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:167
+#: apt-ftparchive.1.xml:161
 msgid "Specifies the location of the cache files."
 msgstr "Specifica la posizione dei file cache."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:172
+#: apt-ftparchive.1.xml:166
 msgid ""
 "Specifies the location of the file list files, if the <literal>FileList</"
 "literal> setting is used below."
@@ -7779,12 +7791,12 @@ msgstr ""
 "l'impostazione <literal>FileList</literal> sotto."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:178
+#: apt-ftparchive.1.xml:172
 msgid "<literal>Default</literal> Section"
 msgstr "Sezione <literal>Default</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:180
+#: apt-ftparchive.1.xml:174
 msgid ""
 "The <literal>Default</literal> section specifies default values, and "
 "settings that control the operation of the generator. Other sections may "
@@ -7795,7 +7807,7 @@ msgstr ""
 "possono scavalcare questi valori tramite impostazioni definite per sezione."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:186
+#: apt-ftparchive.1.xml:180
 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 "
@@ -7808,7 +7820,7 @@ msgstr ""
 "predefinito per tutti gli schemi di compressione è «. gzip»."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:194
+#: apt-ftparchive.1.xml:188
 msgid ""
 "Sets the default list of file extensions that are package files.  This "
 "defaults to '.deb'."
@@ -7817,7 +7829,7 @@ msgstr ""
 "file dei pacchetti. Il valore predefinito è «.deb»."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:200
+#: apt-ftparchive.1.xml:194
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Sources files."
@@ -7826,7 +7838,7 @@ msgstr ""
 "controlla la compressione dei file Sources."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:206
+#: apt-ftparchive.1.xml:200
 msgid ""
 "Sets the default list of file extensions that are source files.  This "
 "defaults to '.dsc'."
@@ -7835,7 +7847,7 @@ msgstr ""
 "sorgenti. Il valore predefinito è «.dsc»."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:212
+#: apt-ftparchive.1.xml:206
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Contents files."
@@ -7844,7 +7856,7 @@ msgstr ""
 "controlla la compressione dei file Contents."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:218
+#: apt-ftparchive.1.xml:212
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Translation-en master file."
@@ -7853,7 +7865,7 @@ msgstr ""
 "controlla la compressione del file principale Translation-en."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:224
+#: apt-ftparchive.1.xml:218
 msgid ""
 "Specifies the number of kilobytes to delink (and replace with hard links) "
 "per run. This is used in conjunction with the per-section <literal>External-"
@@ -7864,7 +7876,7 @@ msgstr ""
 "per sezione <literal>External-Links</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:231
+#: apt-ftparchive.1.xml:225
 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."
@@ -7874,7 +7886,7 @@ msgstr ""
 "dall'umask."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:238 apt-ftparchive.1.xml:384
+#: apt-ftparchive.1.xml:232 apt-ftparchive.1.xml:378
 msgid ""
 "Specifies whether long descriptions should be included in the "
 "<filename>Packages</filename> file or split out into a master "
@@ -7885,12 +7897,12 @@ msgstr ""
 "en</filename> principale."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:244
+#: apt-ftparchive.1.xml:238
 msgid "<literal>TreeDefault</literal> Section"
 msgstr "Sezione <literal>TreeDefault</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:246
+#: apt-ftparchive.1.xml:240
 msgid ""
 "Sets defaults specific to <literal>Tree</literal> sections. All of these "
 "variables are substitution variables and have the strings $(DIST), "
@@ -7901,7 +7913,7 @@ msgstr ""
 "$(DIST), $(SECTION) e $(ARCH) verranno sostituite dai loro rispettivi valori."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:253
+#: apt-ftparchive.1.xml:247
 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 will all "
@@ -7912,7 +7924,7 @@ msgstr ""
 "tutti nel giro di alcuni giorni."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:260
+#: apt-ftparchive.1.xml:254
 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 updated. "
@@ -7931,7 +7943,7 @@ msgstr ""
 "sono espressi in giorni."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:271
+#: apt-ftparchive.1.xml:265
 msgid ""
 "Sets the top of the .deb directory tree. Defaults to <filename>$(DIST)/"
 "$(SECTION)/binary-$(ARCH)/</filename>"
@@ -7940,7 +7952,7 @@ msgstr ""
 "predefinito è <filename>$(DIST)/$(SECTION)/binary-$(ARCH)/</filename>."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:277
+#: apt-ftparchive.1.xml:271
 msgid ""
 "Sets the top of the source package directory tree. Defaults to <filename>"
 "$(DIST)/$(SECTION)/source/</filename>"
@@ -7949,7 +7961,7 @@ msgstr ""
 "valore predefinito è <filename>$(DIST)/$(SECTION)/source/</filename>."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:283
+#: apt-ftparchive.1.xml:277
 msgid ""
 "Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
 "binary-$(ARCH)/Packages</filename>"
@@ -7958,7 +7970,7 @@ msgstr ""
 "$(DIST)/$(SECTION)/binary-$(ARCH)/Packages</filename>."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:289
+#: apt-ftparchive.1.xml:283
 msgid ""
 "Sets the output Sources file. Defaults to <filename>$(DIST)/$(SECTION)/"
 "source/Sources</filename>"
@@ -7967,7 +7979,7 @@ msgstr ""
 "$(SECTION)/source/Sources</filename>."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:295
+#: apt-ftparchive.1.xml:289
 msgid ""
 "Sets the output Translation-en master file with the long descriptions if "
 "they should be not included in the Packages file. Defaults to <filename>"
@@ -7978,7 +7990,7 @@ msgstr ""
 "predefinito è <filename>$(DIST)/$(SECTION)/i18n/Translation-en</filename>."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:302
+#: apt-ftparchive.1.xml:296
 msgid ""
 "Sets the path prefix that causes a symlink to be considered an internal link "
 "instead of an external link. Defaults to <filename>$(DIST)/$(SECTION)/</"
@@ -7989,7 +8001,7 @@ msgstr ""
 "predefinito è <filename>$(DIST)/$(SECTION)/</filename>."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:309
+#: apt-ftparchive.1.xml:303
 msgid ""
 "Sets the output Contents file. Defaults to <filename>$(DIST)/$(SECTION)/"
 "Contents-$(ARCH)</filename>. If this setting causes multiple Packages files "
@@ -8004,12 +8016,12 @@ msgstr ""
 "automaticamente insieme questi file dei pacchetti."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:318
+#: apt-ftparchive.1.xml:312
 msgid "Sets header file to prepend to the contents output."
 msgstr "Imposta il file di intestazione da anteporre all'output dei contenuti."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:323
+#: apt-ftparchive.1.xml:317
 msgid ""
 "Sets the binary cache database to use for this section. Multiple sections "
 "can share the same database."
@@ -8018,7 +8030,7 @@ msgstr ""
 "stesso database può essere condiviso da più sezioni."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:329
+#: apt-ftparchive.1.xml:323
 msgid ""
 "Specifies that instead of walking the directory tree, <command>apt-"
 "ftparchive</command> should read the list of files from the given file. "
@@ -8029,7 +8041,7 @@ msgstr ""
 "relativi dei file vengono fatti precedere dalla directory archivio."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:336
+#: apt-ftparchive.1.xml:330
 msgid ""
 "Specifies that instead of walking the directory tree, <command>apt-"
 "ftparchive</command> should read the list of files from the given file. "
@@ -8042,12 +8054,12 @@ msgstr ""
 "opzione viene usata quando si elaborano gli indici dei sorgenti."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:344
+#: apt-ftparchive.1.xml:338
 msgid "<literal>Tree</literal> Section"
 msgstr "Sezione <literal>Tree</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:346
+#: apt-ftparchive.1.xml:340
 msgid ""
 "The <literal>Tree</literal> section defines a standard Debian file tree "
 "which consists of a base directory, then multiple sections in that base "
@@ -8062,7 +8074,7 @@ msgstr ""
 "<literal>Directory</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:351
+#: apt-ftparchive.1.xml:345
 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 "
@@ -8075,7 +8087,7 @@ msgstr ""
 "è un'impostazione simile a <filename>dists/&stable-codename;</filename>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:356
+#: apt-ftparchive.1.xml:350
 msgid ""
 "All of the settings defined in the <literal>TreeDefault</literal> section "
 "can be used in a <literal>Tree</literal> section as well as three new "
@@ -8086,7 +8098,7 @@ msgstr ""
 "nuove variabili."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt-ftparchive.1.xml:362
+#: apt-ftparchive.1.xml:356
 #, no-wrap
 msgid ""
 "for i in Sections do \n"
@@ -8100,7 +8112,7 @@ msgstr ""
 "     "
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:359
+#: apt-ftparchive.1.xml:353
 msgid ""
 "When processing a <literal>Tree</literal> section <command>apt-ftparchive</"
 "command> performs an operation similar to: <placeholder type=\"programlisting"
@@ -8111,7 +8123,7 @@ msgstr ""
 "id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:370
+#: apt-ftparchive.1.xml:364
 msgid ""
 "This is a space separated list of sections which appear under the "
 "distribution; typically this is something like <literal>main contrib non-"
@@ -8121,7 +8133,7 @@ msgstr ""
 "da spazi; tipicamente è simile a <literal>main contrib non-free</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:377
+#: apt-ftparchive.1.xml:371
 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 "
@@ -8132,7 +8144,7 @@ msgstr ""
 "questo albero ha un archivio sorgente."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:390
+#: apt-ftparchive.1.xml:384
 msgid ""
 "Sets the binary override file. The override file contains section, priority "
 "and maintainer address information."
@@ -8141,7 +8153,7 @@ msgstr ""
 "sulla sezione, la priorità e l'indirizzo del manutentore."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:396
+#: apt-ftparchive.1.xml:390
 msgid ""
 "Sets the source override file. The override file contains section "
 "information."
@@ -8150,22 +8162,22 @@ msgstr ""
 "sulla sezione."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:402 apt-ftparchive.1.xml:448
+#: apt-ftparchive.1.xml:396 apt-ftparchive.1.xml:442
 msgid "Sets the binary extra override file."
 msgstr "Imposta il file override binario extra."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:407 apt-ftparchive.1.xml:453
+#: apt-ftparchive.1.xml:401 apt-ftparchive.1.xml:447
 msgid "Sets the source extra override file."
 msgstr "Imposta il file override sorgente extra."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:412
+#: apt-ftparchive.1.xml:406
 msgid "<literal>BinDirectory</literal> Section"
 msgstr "Sezione <literal>BinDirectory</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:414
+#: apt-ftparchive.1.xml:408
 msgid ""
 "The <literal>bindirectory</literal> section defines a binary directory tree "
 "with no special structure. The scope tag specifies the location of the "
@@ -8180,12 +8192,12 @@ msgstr ""
 "impostazioni <literal>Section</literal><literal>Architecture</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:422
+#: apt-ftparchive.1.xml:416
 msgid "Sets the Packages file output."
 msgstr "Imposta l'output del file Packages."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:427
+#: apt-ftparchive.1.xml:421
 msgid ""
 "Sets the Sources file output. At least one of <literal>Packages</literal> or "
 "<literal>Sources</literal> is required."
@@ -8194,42 +8206,42 @@ msgstr ""
 "<literal>Packages</literal> e <literal>Sources</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:433
+#: apt-ftparchive.1.xml:427
 msgid "Sets the Contents file output (optional)."
 msgstr "Imposta l'output del file Contents (opzionale)."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:438
+#: apt-ftparchive.1.xml:432
 msgid "Sets the binary override file."
 msgstr "Imposta il file override binario."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:443
+#: apt-ftparchive.1.xml:437
 msgid "Sets the source override file."
 msgstr "Imposta il file override sorgente."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:458
+#: apt-ftparchive.1.xml:452
 msgid "Sets the cache DB."
 msgstr "Imposta il DB della cache."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:463
+#: apt-ftparchive.1.xml:457
 msgid "Appends a path to all the output paths."
 msgstr "Aggiunge un percorso a tutti i percorsi di uscita."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:468
+#: apt-ftparchive.1.xml:462
 msgid "Specifies the file list file."
 msgstr "Specifica il file con l'elenco dei file."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:475
+#: apt-ftparchive.1.xml:469
 msgid "The Binary Override File"
 msgstr "Il file override binario"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:476
+#: apt-ftparchive.1.xml:470
 msgid ""
 "The binary override file is fully compatible with &dpkg-scanpackages;. It "
 "contains four fields separated by spaces. The first field is the package "
@@ -8244,19 +8256,19 @@ msgstr ""
 "campo di permutazione del manutentore."
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:482
+#: apt-ftparchive.1.xml:476
 #, no-wrap
 msgid "old [// oldn]* => new"
 msgstr "vecchio [// vecchio...]* => nuovo"
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:484
+#: apt-ftparchive.1.xml:478
 #, no-wrap
 msgid "new"
 msgstr "nuovo"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:481
+#: apt-ftparchive.1.xml:475
 msgid ""
 "The general form of the maintainer field is: <placeholder type="
 "\"literallayout\" id=\"0\"/> or simply, <placeholder type=\"literallayout\" "
@@ -8273,12 +8285,12 @@ msgstr ""
 "seconda forma sostituisce invariabilmente il campo manutentore."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:492
+#: apt-ftparchive.1.xml:486
 msgid "The Source Override File"
 msgstr "Il file override sorgente"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:494
+#: apt-ftparchive.1.xml:488
 msgid ""
 "The source override file is fully compatible with &dpkg-scansources;. It "
 "contains two fields separated by spaces. The first field is the source "
@@ -8289,12 +8301,12 @@ msgstr ""
 "del pacchetto sorgente, il secondo è la sezione a cui assegnarlo."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:499
+#: apt-ftparchive.1.xml:493
 msgid "The Extra Override File"
 msgstr "Il file override extra"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:501
+#: apt-ftparchive.1.xml:495
 msgid ""
 "The extra override file allows any arbitrary tag to be added or replaced in "
 "the output. It has three columns, the first is the package, the second is "
@@ -8305,7 +8317,7 @@ msgstr ""
 "tag e il resto della riga è il nuovo valore."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:512
+#: apt-ftparchive.1.xml:506
 msgid ""
 "Generate the given checksum. These options default to on, when turned off "
 "the generated index files will not have the checksum fields where possible.  "
@@ -8330,7 +8342,7 @@ msgstr ""
 "<literal>SHA256</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:523
+#: apt-ftparchive.1.xml:517
 msgid ""
 "Use a binary caching DB. This has no effect on the generate command.  "
 "Configuration Item: <literal>APT::FTPArchive::DB</literal>."
@@ -8339,7 +8351,7 @@ msgstr ""
 "Voce di configurazione: <literal>APT::FTPArchive::DB</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:529
+#: apt-ftparchive.1.xml:523
 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 "
@@ -8353,7 +8365,7 @@ msgstr ""
 "configurazione. Voce di configurazione: <literal>quiet</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:537
+#: apt-ftparchive.1.xml:531
 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 "
@@ -8367,7 +8379,7 @@ msgstr ""
 "FTPArchive::DeLinkAct</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:545
+#: apt-ftparchive.1.xml:539
 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 "
@@ -8383,7 +8395,7 @@ msgstr ""
 "configurazione: <literal>APT::FTPArchive::Contents</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:555
+#: apt-ftparchive.1.xml:549
 msgid ""
 "Select the source override file to use with the <literal>sources</literal> "
 "command.  Configuration Item: <literal>APT::FTPArchive::SourceOverride</"
@@ -8394,7 +8406,7 @@ msgstr ""
 "SourceOverride</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:561
+#: apt-ftparchive.1.xml:555
 msgid ""
 "Make the caching databases read only.  Configuration Item: <literal>APT::"
 "FTPArchive::ReadOnlyDB</literal>."
@@ -8403,7 +8415,7 @@ msgstr ""
 "<literal>APT::FTPArchive::ReadOnlyDB</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:566
+#: apt-ftparchive.1.xml:560
 msgid ""
 "Accept in the <literal>packages</literal> and <literal>contents</literal> "
 "commands only package files matching <literal>*_arch.deb</literal> or "
@@ -8417,7 +8429,7 @@ msgstr ""
 "Architecture</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:574
+#: apt-ftparchive.1.xml:568
 msgid ""
 "&apt-ftparchive; caches as much as possible of metadata in a cachedb. If "
 "packages are recompiled and/or republished with the same version again, this "
@@ -8440,7 +8452,7 @@ msgstr ""
 "tutti questi controlli aggiuntivi sono inutili."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:586
+#: apt-ftparchive.1.xml:580
 msgid ""
 "This configuration option defaults to \"<literal>true</literal>\" and should "
 "only be set to <literal>\"false\"</literal> if the Archive generated with "
@@ -8456,13 +8468,13 @@ msgstr ""
 "comando generate."
 
 #. type: Content of: <refentry><refsect1><para><programlisting>
-#: apt-ftparchive.1.xml:604
+#: apt-ftparchive.1.xml:598
 #, no-wrap
 msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
 msgstr "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:600
+#: apt-ftparchive.1.xml:594
 msgid ""
 "To create a compressed Packages file for a directory containing binary "
 "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
@@ -8471,7 +8483,7 @@ msgstr ""
 "binari (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:614
+#: apt-ftparchive.1.xml:608
 msgid ""
 "<command>apt-ftparchive</command> returns zero on normal operation, decimal "
 "100 on error."
@@ -8479,36 +8491,53 @@ msgstr ""
 "<command>apt-ftparchive</command> restituisce zero in caso di funzionamento "
 "normale e il valore decimale 100 in caso di errore."
 
-#. type: <title></title>
-#: guide.sgml:4
+#. type: Attribute 'lang' of: <book>
+#: guide.dbk:9 offline.dbk:9
+msgid "en"
+msgstr "it"
+
+#. type: Content of: <book><title>
+#: guide.dbk:11
 msgid "APT User's Guide"
 msgstr "Guida dell'utente di APT"
 
-#. type: <author></author>
-#: guide.sgml:6 offline.sgml:6
-msgid "<name>Jason Gunthorpe </name><email>jgg@debian.org</email>"
-msgstr "<name>Jason Gunthorpe </name><email>jgg@debian.org</email>"
+#. type: Content of: <book><bookinfo><authorgroup><author><personname>
+#: guide.dbk:17 offline.dbk:17
+msgid "Jason Gunthorpe"
+msgstr "Jason Gunthorpe"
 
-#. type: <version></version>
-#: guide.sgml:7
-msgid "$Id: guide.sgml,v 1.7 2003/04/26 23:26:13 doogie Exp $"
-msgstr "$Id: guide.sgml,v 1.7 2003/04/26 23:26:13 doogie Exp $"
+#. type: Content of: <book><bookinfo><authorgroup><author><email>
+#: guide.dbk:17 offline.dbk:17
+msgid "jgg@debian.org"
+msgstr "jgg@debian.org"
+
+#. type: Content of: <book><bookinfo><releaseinfo>
+#: guide.dbk:21 offline.dbk:21
+msgid "Version &apt-product-version;"
+msgstr ""
 
-#. type: <abstract></abstract>
-#: guide.sgml:11
+#. type: Content of: <book><bookinfo><abstract><para>
+#: guide.dbk:25
 msgid ""
 "This document provides an overview of how to use the the APT package manager."
 msgstr ""
 "Questo documento fornisce una panoramica su come usare il gestore di "
 "pacchetti APT."
 
-#. type: <copyrightsummary></copyrightsummary>
-#: guide.sgml:15
-msgid "Copyright &copy; Jason Gunthorpe, 1998."
-msgstr "Copyright &copy; Jason Gunthorpe, 1998."
+#. type: Content of: <book><bookinfo>
+#: guide.dbk:29
+msgid ""
+"<copyright><year>1998</year><holder>Jason Gunthorpe</holder></copyright>"
+msgstr ""
+"<copyright><year>1998</year><holder>Jason Gunthorpe</holder></copyright>"
 
-#. type: <p></p>
-#: guide.sgml:21 offline.sgml:22
+#. type: Content of: <book><bookinfo><legalnotice><title>
+#: guide.dbk:32 offline.dbk:33
+msgid "License Notice"
+msgstr ""
+
+#. type: Content of: <book><bookinfo><legalnotice><para>
+#: guide.dbk:34 offline.dbk:35
 msgid ""
 "\"APT\" and this document are free software; you can redistribute them and/"
 "or modify them under the terms of the GNU General Public License as "
@@ -8520,8 +8549,8 @@ msgstr ""
 "pubblicata dalla Free Software Foundation, nella versione 2 o (a propria "
 "scelta) qualsiasi versione successiva."
 
-#. type: <p></p>
-#: guide.sgml:24 offline.sgml:25
+#. type: Content of: <book><bookinfo><legalnotice><para>
+#: guide.dbk:43 offline.dbk:41
 msgid ""
 "For more details, on Debian systems, see the file /usr/share/common-licenses/"
 "GPL for the full license."
@@ -8529,31 +8558,31 @@ msgstr ""
 "Per ulteriori dettagli, sui sistemi Debian, si veda il testo completo della "
 "licenza nel file /usr/share/common-licenses/GPL."
 
-#. type: <heading></heading>
-#: guide.sgml:32
+#. type: Content of: <book><chapter><title>
+#: guide.dbk:50
 msgid "General"
 msgstr "Descrizione generale"
 
-#. type: <p></p>
-#: guide.sgml:38
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:52
 msgid ""
-"The APT package currently contains two sections, the APT <prgn>dselect</"
-"prgn> method and the <prgn>apt-get</prgn> command line user interface. Both "
-"provide a way to install and remove packages as well as download new "
-"packages from the Internet."
+"The APT package currently contains two sections, the APT <command>dselect</"
+"command> method and the <command>apt-get</command> command line user "
+"interface. Both provide a way to install and remove packages as well as "
+"download new packages from the Internet."
 msgstr ""
 "Il pacchetto APT al momento contiene due sezioni, il metodo APT per "
-"<prgn>dselect</prgn> e l'interfaccia utente a riga di comando <prgn>apt-get</"
-"prgn>; entrambi forniscono un modo per installare e rimuovere pacchetti, "
-"così come per scaricarne di nuovi da Internet."
+"<command>dselect</command> e l'interfaccia utente a riga di comando "
+"<command>apt-get</command>; entrambi forniscono un modo per installare e "
+"rimuovere pacchetti, così come per scaricarne di nuovi da Internet."
 
-#. type: <heading></heading>
-#: guide.sgml:39
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:58
 msgid "Anatomy of the Package System"
 msgstr "Anatomia del sistema dei pacchetti"
 
-#. type: <p></p>
-#: guide.sgml:44
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:60
 msgid ""
 "The Debian packaging system has a large amount of information associated "
 "with each package to help assure that it integrates cleanly and easily into "
@@ -8564,8 +8593,8 @@ msgstr ""
 "maniera pulita nel sistema. La sua caratteristica più importante è il "
 "sistema di dipendenze."
 
-#. type: <p></p>
-#: guide.sgml:52
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:65
 msgid ""
 "The dependency system allows individual programs to make use of shared "
 "elements in the system such as libraries. It simplifies placing infrequently "
@@ -8580,8 +8609,8 @@ msgstr ""
 "possibile avere più di una scelta per cose quali i programmi di "
 "trasferimento della posta elettronica, i server X e così via."
 
-#. type: <p></p>
-#: guide.sgml:57
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:72
 msgid ""
 "The first step to understanding the dependency system is to grasp the "
 "concept of a simple dependency. The meaning of a simple dependency is that a "
@@ -8592,8 +8621,8 @@ msgstr ""
 "concetto di dipendenza semplice: un pacchetto richiede che un altro sia "
 "installato insieme ad esso per poter funzionare."
 
-#. type: <p></p>
-#: guide.sgml:63
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:77
 msgid ""
 "For instance, mailcrypt is an emacs extension that aids in encrypting email "
 "with GPG. Without GPGP installed mailcrypt is useless, so mailcrypt has a "
@@ -8606,8 +8635,8 @@ msgstr ""
 "che si tratta di un'estensione di emacs, mailcrypt ha anche una dipendenza "
 "semplice da emacs, senza il quale è totalmente inutile."
 
-#. type: <p></p>
-#: guide.sgml:73
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:83
 msgid ""
 "The other important dependency to understand is a conflicting dependency. It "
 "means that a package, when installed with another package, will not work and "
@@ -8628,8 +8657,8 @@ msgstr ""
 "seriamente il sistema, quindi ciascun programma di trasporto della posta ha "
 "una dipendenza di conflitto verso tutti gli altri."
 
-#. type: <p></p>
-#: guide.sgml:83
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:93
 msgid ""
 "As an added complication there is the possibility for a package to pretend "
 "to be another package. Consider that exim and sendmail for many intents are "
@@ -8650,8 +8679,8 @@ msgstr ""
 "dipendere da mail-transport-agent. Quando si cerca di modificare a mano i "
 "pacchetti, questo può portare a moltissima confusione."
 
-#. type: <p></p>
-#: guide.sgml:88
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:103
 msgid ""
 "At any given time a single dependency may be met by packages that are "
 "already installed or it may not be. APT attempts to help resolve dependency "
@@ -8663,77 +8692,84 @@ msgstr ""
 "problemi di dipendenze fornendo svariati algoritmi automatici, che aiutano a "
 "selezionare i pacchetti da installare."
 
-#. type: <heading></heading>
-#: guide.sgml:96
+#. type: Content of: <book><chapter><title>
+#: guide.dbk:112
 msgid "apt-get"
 msgstr "apt-get"
 
-#. type: <p></p>
-#: guide.sgml:102
-msgid ""
-"<prgn>apt-get</prgn> provides a simple way to install packages from the "
-"command line. Unlike <prgn>dpkg</prgn>, <prgn>apt-get</prgn> does not "
-"understand .deb files, it works with the package's proper name and can only "
-"install .deb archives from a <em>Source</em>."
-msgstr ""
-"<prgn>apt-get</prgn> fornisce un modo semplice di installare i pacchetti "
-"dalla riga di comando. Diversamente da <prgn>dpkg</prgn>, <prgn>apt-get</"
-"prgn> non tratta i file .deb, ma utilizza il vero nome dei pacchetti e può "
-"installare archivi .deb solo da una <em>fonte</em>."
-
-#. type: <p></p>
-#: guide.sgml:109
-msgid ""
-"The first <footnote><p>If you are using an http proxy server you must set "
-"the http_proxy environment variable first, see sources.list(5)</p></"
-"footnote> thing that should be done before using <prgn>apt-get</prgn> is to "
-"fetch the package lists from the <em>Sources</em> so that it knows what "
-"packages are available. This is done with <tt>apt-get update</tt>. For "
-"instance,"
-msgstr ""
-"La prima <footnote><p>Se si sta usando un server proxy http, si deve prima "
-"ancora impostare la variabile d'ambiente http_proxy; vedere sources.list(5)."
-"</p></footnote> cosa da fare prima di usare <prgn>apt-get</prgn> è scaricare "
-"gli elenchi dei pacchetti dalle <em>fonti</em> in modo che il programma "
-"sappia quali pacchetti sono disponibili. Lo si fa con <tt>apt-get update</"
-"tt>. Ad esempio,"
-
-#. type: <example></example>
-#: guide.sgml:116
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:114
+msgid ""
+"<command>apt-get</command> provides a simple way to install packages from "
+"the command line. Unlike <command>dpkg</command>, <command>apt-get</command> "
+"does not understand .deb files, it works with the package's proper name and "
+"can only install .deb archives from a <emphasis>Source</emphasis>."
+msgstr ""
+"<command>apt-get</command> fornisce un modo semplice di installare i "
+"pacchetti dalla riga di comando. Diversamente da <command>dpkg</command>, "
+"<command>apt-get</command> non tratta i file .deb, ma utilizza il vero nome "
+"dei pacchetti e può installare archivi .deb solo da una <emphasis>fonte</"
+"emphasis>."
+
+#. type: Content of: <book><chapter><para><footnote><para>
+#: guide.dbk:120
+msgid ""
+"If you are using an http proxy server you must set the http_proxy "
+"environment variable first, see sources.list(5)"
+msgstr ""
+"Se si sta usando un server proxy http, si deve prima ancora impostare la "
+"variabile d'ambiente http_proxy; vedere sources.list(5)."
+
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:120
+msgid ""
+"The first <placeholder type=\"footnote\" id=\"0\"/> thing that should be "
+"done before using <command>apt-get</command> is to fetch the package lists "
+"from the <emphasis>Sources</emphasis> so that it knows what packages are "
+"available. This is done with <literal>apt-get update</literal>. For instance,"
+msgstr ""
+"La prima <placeholder type=\"footnote\" id=\"0\"/> cosa da fare prima di "
+"usare <command>apt-get</command> è scaricare gli elenchi dei pacchetti dalle "
+"<emphasis>fonti</emphasis> in modo che il programma sappia quali pacchetti "
+"sono disponibili. Lo si fa con <literal>apt-get update</literal>. Ad esempio,"
+
+#. type: Content of: <book><chapter><screen>
+#: guide.dbk:128
 #, no-wrap
 msgid ""
 "# apt-get update\n"
 "Get http://ftp.de.debian.org/debian-non-US/ stable/binary-i386/ Packages\n"
 "Get http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n"
 "Reading Package Lists... Done\n"
-"Building Dependency Tree... Done"
+"Building Dependency Tree... Done\n"
 msgstr ""
 "# apt-get update\n"
 "Scaricamento di: http://ftp.de.debian.org/debian-non-US/ stable/binary-i386/ Packages\n"
 "Scaricamento di: http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n"
 "Lettura elenco dei pacchetti... Fatto\n"
-"Generazione albero delle dipendenze... Fatto"
+"Generazione albero delle dipendenze... Fatto\n"
 
-#. type: <p><taglist>
-#: guide.sgml:120
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:135
 msgid "Once updated there are several commands that can be used:"
 msgstr "Una volta aggiornato l'elenco, si possono usare svariati comandi:"
 
-#. type: <tag></tag>
-#: guide.sgml:121
+#. type: Content of: <book><chapter><variablelist><varlistentry><term>
+#: guide.dbk:139
 msgid "upgrade"
 msgstr "upgrade"
 
-#. type: <p></p>
-#: guide.sgml:131
+#. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
+#: guide.dbk:142
 msgid ""
 "Upgrade will attempt to gently upgrade the whole system. Upgrade will never "
 "install a new package or remove an existing package, nor will it ever "
 "upgrade a package that might cause some other package to break. This can be "
 "used daily to relatively safely upgrade the system. Upgrade will list all of "
 "the packages that it could not upgrade, this usually means that they depend "
-"on new packages or conflict with some other package. <prgn>dselect</prgn> or "
-"<tt>apt-get install</tt> can be used to force these packages to install."
+"on new packages or conflict with some other package. <command>dselect</"
+"command> or <literal>apt-get install</literal> can be used to force these "
+"packages to install."
 msgstr ""
 "Upgrade tenterà di fare un aggiornamento indolore del sistema completo, "
 "senza installare mai nuovi pacchetti o rimuoverne di esistenti, e senza mai "
@@ -8742,15 +8778,15 @@ msgstr ""
 "Upgrade elencherà tutti i pacchetti che non avrà potuto aggiornare, cosa che "
 "in genere significa che questi dipendono da nuovi pacchetti o che vanno in "
 "conflitto con altri. Per forzare la loro installazione si può usare "
-"<prgn>dselect</prgn> o <tt>apt-get install</tt>."
+"<command>dselect</command> o <literal>apt-get install</literal>."
 
-#. type: <tag></tag>
-#: guide.sgml:131
+#. type: Content of: <book><chapter><variablelist><varlistentry><term>
+#: guide.dbk:154
 msgid "install"
 msgstr "install"
 
-#. type: <p></p>
-#: guide.sgml:140
+#. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
+#: guide.dbk:157
 msgid ""
 "Install is used to install packages by name. The package is automatically "
 "fetched and installed. This can be useful if you already know the name of "
@@ -8769,21 +8805,22 @@ msgstr ""
 "devono essere modificati altri pacchetti che non siano quelli sulla riga di "
 "comando."
 
-#. type: <tag></tag>
-#: guide.sgml:140
+#. type: Content of: <book><chapter><variablelist><varlistentry><term>
+#: guide.dbk:168
 msgid "dist-upgrade"
 msgstr "dist-upgrade"
 
-#. type: <p></p>
-#: guide.sgml:149
+#. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
+#: guide.dbk:171
 msgid ""
 "Dist-upgrade is a complete upgrader designed to simplify upgrading between "
 "releases of Debian. It uses a sophisticated algorithm to determine the best "
 "set of packages to install, upgrade and remove to get as much of the system "
 "to the newest release. In some situations it may be desired to use dist-"
 "upgrade rather than spend the time manually resolving dependencies in "
-"<prgn>dselect</prgn>. Once dist-upgrade has completed then <prgn>dselect</"
-"prgn> can be used to install any packages that may have been left out."
+"<command>dselect</command>. Once dist-upgrade has completed then "
+"<command>dselect</command> can be used to install any packages that may have "
+"been left out."
 msgstr ""
 "Dist-upgrade fa un aggiornamento completo ed è progettato in modo da rendere "
 "semplici gli aggiornamenti tra i rilasci di Debian. Usa un algoritmo "
@@ -8791,12 +8828,12 @@ msgstr ""
 "aggiornare e rimuovere per migrare alla versione più recente la maggior "
 "parte del sistema possibile. In alcune situazioni può essere vantaggioso "
 "usare dist-upgrade invece di dedicare tempo a risolvere manualmente le "
-"dipendenze con <prgn>dselect</prgn>. Una volta completato il lavoro di dist-"
-"upgrade, si può usare <prgn>dselect</prgn> per installare eventuali "
-"pacchetti che sono stati tralasciati."
+"dipendenze con <command>dselect</command>. Una volta completato il lavoro di "
+"dist-upgrade, si può usare <command>dselect</command> per installare "
+"eventuali pacchetti che sono stati tralasciati."
 
-#. type: <p></p>
-#: guide.sgml:152
+#. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
+#: guide.dbk:181
 msgid ""
 "It is important to closely look at what dist-upgrade is going to do, its "
 "decisions may sometimes be quite surprising."
@@ -8804,167 +8841,172 @@ msgstr ""
 "È importante controllare attentamente cosa intende fare dist-upgrade, dato "
 "che le sue decisioni a volte possono essere abbastanza sorprendenti."
 
-#. type: <p></p>
-#: guide.sgml:163
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:188
 #, fuzzy
 #| msgid ""
-#| "<prgn>apt-get</prgn> has several command line options that are detailed "
-#| "in its man page, <manref section=\"8\" name=\"apt-get\">. The most useful "
-#| "option is <tt>-d</tt> which does not install the fetched files. If the "
-#| "system has to download a large number of package it would be undesired to "
-#| "start installing them in case something goes wrong. When <tt>-d</tt> is "
-#| "used the downloaded archives can be installed by simply running the "
-#| "command that caused them to be downloaded again without <tt>-d</tt>."
-msgid ""
-"<prgn>apt-get</prgn> has several command line options that are detailed in "
-"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful "
-"option is <tt>-d</tt> which does not install the fetched files. If the "
-"system has to download a large number of package it would be undesired to "
-"start installing them in case something goes wrong. When <tt>-d</tt> is used "
-"the downloaded archives can be installed by simply running the command that "
-"caused them to be downloaded again without <tt>-d</tt>."
-msgstr ""
-"<prgn>apt-get</prgn> ha diverse opzioni per la riga di comando, che sono "
-"documentate dettagliatamente nella sua pagina di manuale, <manref section="
-"\"8\" name=\"apt-get\">. L'opzione più utile è <tt>-d</tt>, che non installa "
-"i file scaricati; se il sistema deve scaricare un gran numero di pacchetti, "
-"non è bene iniziare ad installarli nel caso qualcosa dovesse andare storto. "
-"Quando si usa <tt>-d</tt>, gli archivi scaricati possono essere installati "
-"semplicemente eseguendo di nuovo lo stesso comando senza l'opzione <tt>-d</"
-"tt>."
-
-#. type: <heading></heading>
-#: guide.sgml:168
+#| "<command>apt-get</command> has several command line options that are "
+#| "detailed in its man page, <manref section=\"8\" name=\"apt-get\">. The "
+#| "most useful option is <literal>-d</literal> which does not install the "
+#| "fetched files. If the system has to download a large number of package it "
+#| "would be undesired to start installing them in case something goes wrong. "
+#| "When <literal>-d</literal> is used the downloaded archives can be "
+#| "installed by simply running the command that caused them to be downloaded "
+#| "again without <literal>-d</literal>."
+msgid ""
+"<command>apt-get</command> has several command line options that are "
+"detailed in its man page, <citerefentry><refentrytitle>apt-get</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>. The most useful "
+"option is <literal>-d</literal> which does not install the fetched files. If "
+"the system has to download a large number of package it would be undesired "
+"to start installing them in case something goes wrong. When <literal>-d</"
+"literal> is used the downloaded archives can be installed by simply running "
+"the command that caused them to be downloaded again without <literal>-d</"
+"literal>."
+msgstr ""
+"<command>apt-get</command> ha diverse opzioni per la riga di comando, che "
+"sono documentate dettagliatamente nella sua pagina di manuale, <manref "
+"section=\"8\" name=\"apt-get\">. L'opzione più utile è <literal>-d</"
+"literal>, che non installa i file scaricati; se il sistema deve scaricare un "
+"gran numero di pacchetti, non è bene iniziare ad installarli nel caso "
+"qualcosa dovesse andare storto. Quando si usa <literal>-d</literal>, gli "
+"archivi scaricati possono essere installati semplicemente eseguendo di nuovo "
+"lo stesso comando senza l'opzione <literal>-d</literal>."
+
+#. type: Content of: <book><chapter><title>
+#: guide.dbk:200
 msgid "DSelect"
 msgstr "DSelect"
 
-#. type: <p></p>
-#: guide.sgml:173
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:202
 msgid ""
-"The APT <prgn>dselect</prgn> method provides the complete APT system with "
-"the <prgn>dselect</prgn> package selection GUI. <prgn>dselect</prgn> is used "
-"to select the packages to be installed or removed and APT actually installs "
-"them."
+"The APT <command>dselect</command> method provides the complete APT system "
+"with the <command>dselect</command> package selection GUI. <command>dselect</"
+"command> is used to select the packages to be installed or removed and APT "
+"actually installs them."
 msgstr ""
-"Il metodo APT di <prgn>dselect</prgn> fornisce tutte le funzionalità del "
-"sistema APT con l'interfaccia grafica di selezione dei pacchetti "
-"<prgn>dselect</prgn>. <prgn>dselect</prgn> viene usato per selezionare i "
-"pacchetti da installare o rimuovere, ed APT fa l'effettiva installazione."
+"Il metodo APT di <command>dselect</command> fornisce tutte le funzionalità "
+"del sistema APT con l'interfaccia grafica di selezione dei pacchetti "
+"<command>dselect</command>. <command>dselect</command> viene usato per "
+"selezionare i pacchetti da installare o rimuovere, ed APT fa l'effettiva "
+"installazione."
 
-#. type: <p></p>
-#: guide.sgml:184
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:208
 msgid ""
-"To enable the APT method you need to select [A]ccess in <prgn>dselect</prgn> "
-"and then choose the APT method. You will be prompted for a set of "
-"<em>Sources</em> which are places to fetch archives from. These can be "
-"remote Internet sites, local Debian mirrors or CD-ROMs. Each source can "
-"provide a fragment of the total Debian archive, APT will automatically "
+"To enable the APT method you need to select [A]ccess in <command>dselect</"
+"command> and then choose the APT method. You will be prompted for a set of "
+"<emphasis>Sources</emphasis> which are places to fetch archives from. These "
+"can be remote Internet sites, local Debian mirrors or CD-ROMs. Each source "
+"can provide a fragment of the total Debian archive, APT will automatically "
 "combine them to form a complete set of packages. If you have a CD-ROM then "
 "it is a good idea to specify it first and then specify a mirror so that you "
 "have access to the latest bug fixes. APT will automatically use packages on "
 "your CD-ROM before downloading from the Internet."
 msgstr ""
-"Per abilitare il metodo APT si deve selezionare [A]ccess in <prgn>dselect</"
-"prgn> e scegliere il metodo APT; verrà chiesto un insieme di fonti "
-"(<em>Sources</em>), cioè di posti da cui scaricare gli archivi. Possono "
-"essere siti Internet remoti, mirror locali di Debian o CD-ROM; ogni fonte "
-"può fornire una parte dell'intero archivio Debian, ed APT le combinerà "
-"automaticamente insieme per formare un insieme completo di pacchetti. Se si "
-"ha un CD-ROM allora è una buona idea indicarlo per primo e poi specificare "
-"un mirror, in modo da avere accesso alle ultime versioni con le soluzioni "
-"dei bug. APT in questo modo userà automaticamente i pacchetti sul CD-ROM "
-"prima di scaricarli da Internet."
-
-#. type: <example></example>
-#: guide.sgml:198
+"Per abilitare il metodo APT si deve selezionare [A]ccess in "
+"<command>dselect</command> e scegliere il metodo APT; verrà chiesto un "
+"insieme di fonti (<emphasis>Sources</emphasis>), cioè di posti da cui "
+"scaricare gli archivi. Possono essere siti Internet remoti, mirror locali di "
+"Debian o CD-ROM; ogni fonte può fornire una parte dell'intero archivio "
+"Debian, ed APT le combinerà automaticamente insieme per formare un insieme "
+"completo di pacchetti. Se si ha un CD-ROM allora è una buona idea indicarlo "
+"per primo e poi specificare un mirror, in modo da avere accesso alle ultime "
+"versioni con le soluzioni dei bug. APT in questo modo userà automaticamente "
+"i pacchetti sul CD-ROM prima di scaricarli da Internet."
+
+#. type: Content of: <book><chapter><screen>
+#: guide.dbk:219
 #, no-wrap
 msgid ""
 "   Set up a list of distribution source locations\n"
-"\t \n"
+"\n"
 " Please give the base URL of the debian distribution.\n"
 " The access schemes I know about are: http file\n"
-"\t   \n"
+"\n"
 " For example:\n"
 "      file:/mnt/debian,\n"
 "      ftp://ftp.debian.org/debian,\n"
 "      http://ftp.de.debian.org/debian,\n"
-"      \n"
-"      \n"
-" URL [http://llug.sep.bnl.gov/debian]:"
+"\n"
+"\n"
+" URL [http://llug.sep.bnl.gov/debian]:\n"
 msgstr ""
 "   Set up a list of distribution source locations\n"
-"\t \n"
+"\n"
 " Please give the base URL of the debian distribution.\n"
 " The access schemes I know about are: http file\n"
-"\t   \n"
+"\n"
 " For example:\n"
 "      file:/mnt/debian,\n"
 "      ftp://ftp.debian.org/debian,\n"
 "      http://ftp.de.debian.org/debian,\n"
-"      \n"
-"      \n"
-" URL [http://llug.sep.bnl.gov/debian]:"
+"\n"
+"\n"
+" URL [http://llug.sep.bnl.gov/debian]:\n"
 
-#. type: <p></p>
-#: guide.sgml:205
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:233
 msgid ""
-"The <em>Sources</em> setup starts by asking for the base of the Debian "
-"archive, defaulting to a HTTP mirror. Next it asks for the distribution to "
-"get."
+"The <emphasis>Sources</emphasis> setup starts by asking for the base of the "
+"Debian archive, defaulting to a HTTP mirror. Next it asks for the "
+"distribution to get."
 msgstr ""
-"La configurazione delle <em>fonti</em> inizia chiedendo la base "
+"La configurazione delle <emphasis>fonti</emphasis> inizia chiedendo la base "
 "dell'archivio Debian, proponendo in modo predefinito un mirror HTTP; "
 "successivamente viene chiesta la distribuzione da scaricare."
 
-#. type: <example></example>
-#: guide.sgml:212
+#. type: Content of: <book><chapter><screen>
+#: guide.dbk:238
 #, no-wrap
 msgid ""
 " Please give the distribution tag to get or a path to the\n"
 " package file ending in a /. The distribution\n"
 " tags are typically something like: stable unstable testing non-US\n"
-"   \n"
-" Distribution [stable]:"
+"\n"
+" Distribution [stable]:\n"
 msgstr ""
 " Please give the distribution tag to get or a path to the\n"
 " package file ending in a /. The distribution\n"
 " tags are typically something like: stable unstable testing non-US\n"
-"   \n"
-" Distribution [stable]:"
-
-#. type: <p></p>
-#: guide.sgml:222
-msgid ""
-"The distribution refers to the Debian version in the archive, <em>stable</"
-"em> refers to the latest released version and <em>unstable</em> refers to "
-"the developmental version. <em>non-US</em> is only available on some mirrors "
-"and refers to packages that contain encryption technology or other things "
-"that cannot be exported from the United States. Importing these packages "
-"into the US is legal however."
-msgstr ""
-"La distribuzione indica la versione Debian dell'archivio: <em>stable</em> è "
-"l'ultima versione rilasciata e <em>unstable</em> è quella di sviluppo. "
-"<em>non-US</em> è disponibile solo su alcuni mirror e contiene dei pacchetti "
-"in cui viene usata della tecnologia di cifratura o altre cose che non "
-"possono essere esportate dagli Stati Uniti; importare questi pacchetti negli "
-"USA è però legale."
-
-#. type: <example></example>
-#: guide.sgml:228
+"\n"
+" Distribution [stable]:\n"
+
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:245
+msgid ""
+"The distribution refers to the Debian version in the archive, "
+"<emphasis>stable</emphasis> refers to the latest released version and "
+"<emphasis>unstable</emphasis> refers to the developmental version. "
+"<emphasis>non-US</emphasis> is only available on some mirrors and refers to "
+"packages that contain encryption technology or other things that cannot be "
+"exported from the United States. Importing these packages into the US is "
+"legal however."
+msgstr ""
+"La distribuzione indica la versione Debian dell'archivio: <emphasis>stable</"
+"emphasis> è l'ultima versione rilasciata e <emphasis>unstable</emphasis> è "
+"quella di sviluppo. <emphasis>non-US</emphasis> è disponibile solo su alcuni "
+"mirror e contiene dei pacchetti in cui viene usata della tecnologia di "
+"cifratura o altre cose che non possono essere esportate dagli Stati Uniti; "
+"importare questi pacchetti negli USA è però legale."
+
+#. type: Content of: <book><chapter><screen>
+#: guide.dbk:254
 #, no-wrap
 msgid ""
 " Please give the components to get\n"
 " The components are typically something like: main contrib non-free\n"
-"  \n"
-" Components [main contrib non-free]:"
+"\n"
+" Components [main contrib non-free]:\n"
 msgstr ""
 " Please give the components to get\n"
 " The components are typically something like: main contrib non-free\n"
-"  \n"
-" Components [main contrib non-free]:"
+"\n"
+" Components [main contrib non-free]:\n"
 
-#. type: <p></p>
-#: guide.sgml:236
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:260
 msgid ""
 "The components list refers to the list of sub distributions to fetch. The "
 "distribution is split up based on software licenses, main being DFSG free "
@@ -8977,8 +9019,8 @@ msgstr ""
 "mentre contrib e non-free contengono software che ha diverse restrizioni "
 "sull'uso e sulla distribuzione."
 
-#. type: <p></p>
-#: guide.sgml:240
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:266
 msgid ""
 "Any number of sources can be added, the setup script will continue to prompt "
 "until you have specified all that you want."
@@ -8987,23 +9029,24 @@ msgstr ""
 "configurazione continuerà a chiedere fino a che non sono state specificate "
 "tutte quelle desiderate."
 
-#. type: <p></p>
-#: guide.sgml:247
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:270
 msgid ""
-"Before starting to use <prgn>dselect</prgn> it is necessary to update the "
-"available list by selecting [U]pdate from the menu. This is a superset of "
-"<tt>apt-get update</tt> that makes the fetched information available to "
-"<prgn>dselect</prgn>. [U]pdate must be performed even if <tt>apt-get update</"
-"tt> has been run before."
+"Before starting to use <command>dselect</command> it is necessary to update "
+"the available list by selecting [U]pdate from the menu. This is a superset "
+"of <literal>apt-get update</literal> that makes the fetched information "
+"available to <command>dselect</command>. [U]pdate must be performed even if "
+"<literal>apt-get update</literal> has been run before."
 msgstr ""
-"Prima di cominciare a usare <prgn>dselect</prgn> è necessario aggiornare "
-"l'elenco dei pacchetti disponibili selezionando [U]pdate dal menù: si tratta "
-"di un sovrainsieme di ciò che fa <tt>apt-get update</tt>, che rende le "
-"informazioni scaricate disponibili a <prgn>dselect</prgn>. [U]pdate deve "
-"essere usato anche se prima è stato eseguito <tt>apt-get update</tt>."
+"Prima di cominciare a usare <command>dselect</command> è necessario "
+"aggiornare l'elenco dei pacchetti disponibili selezionando [U]pdate dal "
+"menù: si tratta di un sovrainsieme di ciò che fa <literal>apt-get update</"
+"literal>, che rende le informazioni scaricate disponibili a "
+"<command>dselect</command>. [U]pdate deve essere usato anche se prima è "
+"stato eseguito <literal>apt-get update</literal>."
 
-#. type: <p></p>
-#: guide.sgml:253
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:277
 msgid ""
 "You can then go on and make your selections using [S]elect and then perform "
 "the installation using [I]nstall. When using the APT method the [C]onfig and "
@@ -9015,77 +9058,94 @@ msgstr ""
 "[C]onfig e [R]emove non hanno significato, dato che entrambe le fasi sono "
 "contenute in [I]nstall."
 
-#. type: <p></p>
-#: guide.sgml:258
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:283
 msgid ""
 "By default APT will automatically remove the package (.deb) files once they "
-"have been successfully installed. To change this behavior place <tt>Dselect::"
-"clean \"prompt\";</tt> in /etc/apt/apt.conf."
+"have been successfully installed. To change this behavior place "
+"<literal>Dselect::clean \"prompt\";</literal> in /etc/apt/apt.conf."
 msgstr ""
 "In modo predefinito APT rimuoverà automaticamente i file (.deb) dei "
 "pacchetti che sono stati installati con successo. Per modificare questo "
-"comportamento, inserire <tt>Dselect::clean \"prompt\";</tt> in /etc/apt/apt."
-"conf."
+"comportamento, inserire <literal>Dselect::clean \"prompt\";</literal> in /"
+"etc/apt/apt.conf."
 
-#. type: <heading></heading>
-#: guide.sgml:264
+#. type: Content of: <book><chapter><title>
+#: guide.dbk:289
 msgid "The Interface"
 msgstr "L'interfaccia"
 
-#. type: <p></p>
-#: guide.sgml:278
+#. type: Content of: <book><chapter><para><footnote><para>
+#: guide.dbk:293
 msgid ""
-"Both that APT <prgn>dselect</prgn> method and <prgn>apt-get</prgn> share the "
-"same interface. It is a simple system that generally tells you what it will "
-"do and then goes and does it. <footnote><p>The <prgn>dselect</prgn> method "
-"actually is a set of wrapper scripts to <prgn>apt-get</prgn>. The method "
-"actually provides more functionality than is present in <prgn>apt-get</prgn> "
-"alone.</p></footnote> After printing out a summary of what will happen APT "
+"The <command>dselect</command> method actually is a set of wrapper scripts "
+"to <command>apt-get</command>. The method actually provides more "
+"functionality than is present in <command>apt-get</command> alone."
+msgstr ""
+
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:291
+#, fuzzy
+#| msgid ""
+#| "Both that APT <command>dselect</command> method and <command>apt-get</"
+#| "command> share the same interface. It is a simple system that generally "
+#| "tells you what it will do and then goes and does it. <footnote><para>The "
+#| "<command>dselect</command> method actually is a set of wrapper scripts to "
+#| "<command>apt-get</command>. The method actually provides more "
+#| "functionality than is present in <command>apt-get</command> alone.</"
+#| "para></footnote> After printing out a summary of what will happen APT "
+#| "then will print out some informative status messages so that you can "
+#| "estimate how far along it is and how much is left to do."
+msgid ""
+"Both that APT <command>dselect</command> method and <command>apt-get</"
+"command> share the same interface. It is a simple system that generally "
+"tells you what it will do and then goes and does it. <placeholder type="
+"\"footnote\" id=\"0\"/> After printing out a summary of what will happen APT "
 "then will print out some informative status messages so that you can "
 "estimate how far along it is and how much is left to do."
 msgstr ""
-"Sia il metodo APT per <prgn>dselect</prgn> sia <prgn>apt-get</prgn> "
-"condividono la stessa interfaccia; si tratta di un sistema semplice che "
-"indica in genere cosa sta per fare, e poi lo fa. <footnote><p>Il metodo "
-"<prgn>dselect</prgn> è in realtà un insieme di script di wrapper per "
-"<prgn>apt-get</prgn>. Il metodo di fatto fornisce delle funzionalità "
-"maggiori del solo <prgn>apt-get</prgn>.</p></footnote> Dopo la stampa di un "
-"riassunto delle operazioni che saranno fatte, APT stampa dei messaggi "
-"informativi sullo stato, in modo da poter avere un'idea del punto a cui "
-"arrivato e di quanto ci sia ancora da fare."
-
-#. type: <heading></heading>
-#: guide.sgml:280
+"Sia il metodo APT per <command>dselect</command> sia <command>apt-get</"
+"command> condividono la stessa interfaccia; si tratta di un sistema semplice "
+"che indica in genere cosa sta per fare, e poi lo fa. <footnote><para>Il "
+"metodo <command>dselect</command> è in realtà un insieme di script di "
+"wrapper per <command>apt-get</command>. Il metodo di fatto fornisce delle "
+"funzionalità maggiori del solo <command>apt-get</command>.</para></footnote> "
+"Dopo la stampa di un riassunto delle operazioni che saranno fatte, APT "
+"stampa dei messaggi informativi sullo stato, in modo da poter avere un'idea "
+"del punto a cui arrivato e di quanto ci sia ancora da fare."
+
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:302
 msgid "Startup"
 msgstr "Avvio"
 
-#. type: <p></p>
-#: guide.sgml:284
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:304
 msgid ""
 "Before all operations except update, APT performs a number of actions to "
 "prepare its internal state. It also does some checks of the system's state. "
-"At any time these operations can be performed by running <tt>apt-get check</"
-"tt>."
+"At any time these operations can be performed by running <literal>apt-get "
+"check</literal>."
 msgstr ""
 "Prima di ogni operazione, eccetto update, APT compie alcune operazioni per "
 "preparare il suo stato interno; fa inoltre dei controlli sullo stato del "
 "sistema. In qualsiasi momento le stesse operazioni possono essere fatte con "
-"<tt>apt-get check</tt>."
+"<literal>apt-get check</literal>."
 
-#. type: <example></example>
-#: guide.sgml:289
+#. type: Content of: <book><chapter><section><screen>
+#: guide.dbk:310
 #, no-wrap
 msgid ""
 "# apt-get check\n"
 "Reading Package Lists... Done\n"
-"Building Dependency Tree... Done"
+"Building Dependency Tree... Done\n"
 msgstr ""
 "# apt-get check\n"
 "Lettura elenco pacchetti... Fatto\n"
-"Generazione albero delle dipendenze... Fatto"
+"Generazione albero delle dipendenze... Fatto\n"
 
-#. type: <p></p>
-#: guide.sgml:297
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:315
 msgid ""
 "The first thing it does is read all the package files into memory. APT uses "
 "a caching scheme so this operation will be faster the second time it is run. "
@@ -9098,22 +9158,22 @@ msgstr ""
 "trovati, sono ignorati e viene stampato un avvertimento all'uscita di apt-"
 "get."
 
-#. type: <p></p>
-#: guide.sgml:303
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:321
 msgid ""
 "The final operation performs a detailed analysis of the system's "
 "dependencies. It checks every dependency of every installed or unpacked "
 "package and considers if it is OK. Should this find a problem then a report "
-"will be printed out and <prgn>apt-get</prgn> will refuse to run."
+"will be printed out and <command>apt-get</command> will refuse to run."
 msgstr ""
 "L'operazione finale consiste in un'analisi dettagliata delle dipendenze del "
 "sistema: viene controllato che tutte le dipendenze dei singoli pacchetti "
 "installati o non scompattati siano soddisfatte. Se vengono individuati dei "
-"problemi, viene stampato un resoconto, e <prgn>apt-get</prgn> esce senza "
-"eseguire alcuna operazione."
+"problemi, viene stampato un resoconto, e <command>apt-get</command> esce "
+"senza eseguire alcuna operazione."
 
-#. type: <example></example>
-#: guide.sgml:320
+#. type: Content of: <book><chapter><section><screen>
+#: guide.dbk:327
 #, no-wrap
 msgid ""
 "# apt-get check\n"
@@ -9123,14 +9183,14 @@ msgid ""
 "Sorry, but the following packages have unmet dependencies:\n"
 "  9fonts: Depends: xlib6g but it is not installed\n"
 "  uucp: Depends: mailx but it is not installed\n"
-"  blast: Depends: xlib6g (>= 3.3-5) but it is not installed\n"
+"  blast: Depends: xlib6g (&gt;= 3.3-5) but it is not installed\n"
 "  adduser: Depends: perl-base but it is not installed\n"
 "  aumix: Depends: libgpmg1 but it is not installed\n"
 "  debiandoc-sgml: Depends: sgml-base but it is not installed\n"
-"  bash-builtins: Depends: bash (>= 2.01) but 2.0-3 is installed\n"
+"  bash-builtins: Depends: bash (&gt;= 2.01) but 2.0-3 is installed\n"
 "  cthugha: Depends: svgalibg1 but it is not installed\n"
-"           Depends: xlib6g (>= 3.3-5) but it is not installed\n"
-"  libreadlineg2: Conflicts:libreadline2 (<< 2.1-2.1)"
+"           Depends: xlib6g (&gt;= 3.3-5) but it is not installed\n"
+"  libreadlineg2: Conflicts:libreadline2 (&lt;&lt; 2.1-2.1)\n"
 msgstr ""
 "# apt-get check\n"
 "Lettura elenco pacchetti... Fatto\n"
@@ -9139,17 +9199,17 @@ msgstr ""
 "I seguenti pacchetti hanno dipendenze non soddisfatte:\n"
 "  9fonts: Dipende: xlib6g ma non è installato\n"
 "  uucp: Dipende: mailx ma non è installato\n"
-"  blast: Dipende: xlib6g (>= 3.3-5) ma non è installato\n"
+"  blast: Dipende: xlib6g (&gt;= 3.3-5) ma non è installato\n"
 "  adduser: Dipende: perl-base ma non è installato\n"
 "  aumix: Dipende: libgpmg1 ma non è installato\n"
 "  debiandoc-sgml: Dipende: sgml-base ma non è installato\n"
-"  bash-builtins: Dipende: bash (>= 2.01) ma la versione 2.0-3 è installata\n"
+"  bash-builtins: Dipende: bash (&gt;= 2.01) ma la versione 2.0-3 è installata\n"
 "  cthugha: Dipende: svgalibg1 ma non è installato\n"
-"           Dipende: xlib6g (>= 3.3-5) ma non è installato\n"
-"  libreadlineg2: Va in conflitto: libreadline2 (<< 2.1-2.1)"
+"           Dipende: xlib6g (&gt;= 3.3-5) ma non è installato\n"
+"  libreadlineg2: Va in conflitto: libreadline2 (&lt;&lt; 2.1-2.1)\n"
 
-#. type: <p></p>
-#: guide.sgml:329
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:344
 msgid ""
 "In this example the system has many problems, including a serious problem "
 "with libreadlineg2. For each package that has unmet dependencies a line is "
@@ -9163,86 +9223,105 @@ msgstr ""
 "dipendenze non sono soddisfatte. Viene inclusa inoltre una breve spiegazione "
 "del perché il pacchetto ha un problema di dipendenze."
 
-#. type: <p></p>
-#: guide.sgml:337
+#. type: Content of: <book><chapter><section><para><footnote><para>
+#: guide.dbk:353
+msgid ""
+"APT however considers all known dependencies and attempts to prevent broken "
+"packages"
+msgstr ""
+
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:351
+#, fuzzy
+#| msgid ""
+#| "There are two ways a system can get into a broken state like this. The "
+#| "first is caused by <command>dpkg</command> missing some subtle "
+#| "relationships between packages when performing upgrades. "
+#| "<footnote><para>APT however considers all known dependencies and attempts "
+#| "to prevent broken packages</para></footnote>. The second is if a package "
+#| "installation fails during an operation. In this situation a package may "
+#| "have been unpacked without its dependents being installed."
 msgid ""
 "There are two ways a system can get into a broken state like this. The first "
-"is caused by <prgn>dpkg</prgn> missing some subtle relationships between "
-"packages when performing upgrades. <footnote><p>APT however considers all "
-"known dependencies and attempts to prevent broken packages</p></footnote>. "
-"The second is if a package installation fails during an operation. In this "
-"situation a package may have been unpacked without its dependents being "
-"installed."
+"is caused by <command>dpkg</command> missing some subtle relationships "
+"between packages when performing upgrades. <placeholder type=\"footnote\" id="
+"\"0\"/>. The second is if a package installation fails during an operation. "
+"In this situation a package may have been unpacked without its dependents "
+"being installed."
 msgstr ""
 "Ci sono due modi in cui un sistema può arrivare in uno stato problematico di "
-"questo genere: il primo avviene se <prgn>dpkg</prgn> non ha ravvisato alcune "
-"relazioni delicate tra i pacchetti durante un aggiornamento. "
-"<footnote><p>APT invece considera tutte le dipendenze note e cerca di "
-"evitare la presenza di pacchetti difettosi.</p></footnote> Il secondo è "
+"questo genere: il primo avviene se <command>dpkg</command> non ha ravvisato "
+"alcune relazioni delicate tra i pacchetti durante un aggiornamento. "
+"<footnote><para>APT invece considera tutte le dipendenze note e cerca di "
+"evitare la presenza di pacchetti difettosi.</para></footnote> Il secondo è "
 "possibile se l'installazione di un pacchetto fallisce; in questo caso è "
 "possibile che un pacchetto venga scompattato senza che tutti quelli da cui "
 "dipende siano stati installati."
 
-#. type: <p></p>
-#: guide.sgml:345
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:360
 msgid ""
 "The second situation is much less serious than the first because APT places "
 "certain constraints on the order that packages are installed. In both cases "
-"supplying the <tt>-f</tt> option to <prgn>apt-get</prgn> will cause APT to "
-"deduce a possible solution to the problem and then continue on. The APT "
-"<prgn>dselect</prgn> method always supplies the <tt>-f</tt> option to allow "
-"for easy continuation of failed maintainer scripts."
+"supplying the <literal>-f</literal> option to <command>apt-get</command> "
+"will cause APT to deduce a possible solution to the problem and then "
+"continue on. The APT <command>dselect</command> method always supplies the "
+"<literal>-f</literal> option to allow for easy continuation of failed "
+"maintainer scripts."
 msgstr ""
 "La seconda situazione è molto meno seria della prima, dato che APT pone "
 "alcune restrizioni sull'ordine di installazione dei pacchetti. In entrambi i "
-"casi l'opzione <tt>-f</tt> di <prgn>apt-get</prgn> farà sì che APT trovi una "
-"soluzione possibile e possa continuare. Il metodo APT di <prgn>dselect</"
-"prgn> comprende sempre l'opzione <tt>-f</tt> per permettere di continuare "
-"facilmente anche in caso di script dei manutentori errati."
-
-#. type: <p></p>
-#: guide.sgml:351
-msgid ""
-"However, if the <tt>-f</tt> option is used to correct a seriously broken "
-"system caused by the first case then it is possible that it will either fail "
-"immediately or the installation sequence will fail. In either case it is "
-"necessary to manually use dpkg (possibly with forcing options) to correct "
-"the situation enough to allow APT to proceed."
-msgstr ""
-"Tuttavia, se l'opzione <tt>-f</tt> viene usata per correggere un sistema in "
-"uno stato molto problematico causato da una situazione del primo tipo, è "
-"possibile che l'operazione fallisca subito o che fallisca durante la "
+"casi l'opzione <literal>-f</literal> di <command>apt-get</command> farà sì "
+"che APT trovi una soluzione possibile e possa continuare. Il metodo APT di "
+"<command>dselect</command> comprende sempre l'opzione <literal>-f</literal> "
+"per permettere di continuare facilmente anche in caso di script dei "
+"manutentori errati."
+
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:369
+msgid ""
+"However, if the <literal>-f</literal> option is used to correct a seriously "
+"broken system caused by the first case then it is possible that it will "
+"either fail immediately or the installation sequence will fail. In either "
+"case it is necessary to manually use dpkg (possibly with forcing options) to "
+"correct the situation enough to allow APT to proceed."
+msgstr ""
+"Tuttavia, se l'opzione <literal>-f</literal> viene usata per correggere un "
+"sistema in uno stato molto problematico causato da una situazione del primo "
+"tipo, è possibile che l'operazione fallisca subito o che fallisca durante la "
 "sequenza di installazione. In entrambi i casi è necessario usare dpkg a mano "
 "(probabilmente usando delle opzioni di forzatura) per correggere quanto "
 "basta per poter fare continuare APT."
 
-#. type: <heading></heading>
-#: guide.sgml:356
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:377
 msgid "The Status Report"
 msgstr "Il resoconto sullo stato"
 
-#. type: <p></p>
-#: guide.sgml:363
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:379
 msgid ""
-"Before proceeding <prgn>apt-get</prgn> will present a report on what will "
-"happen. Generally the report reflects the type of operation being performed "
-"but there are several common elements. In all cases the lists reflect the "
-"final state of things, taking into account the <tt>-f</tt> option and any "
-"other relevant activities to the command being executed."
+"Before proceeding <command>apt-get</command> will present a report on what "
+"will happen. Generally the report reflects the type of operation being "
+"performed but there are several common elements. In all cases the lists "
+"reflect the final state of things, taking into account the <literal>-f</"
+"literal> option and any other relevant activities to the command being "
+"executed."
 msgstr ""
-"Prima di procedere, <prgn>apt-get</prgn> presenterà un resoconto delle "
+"Prima di procedere, <command>apt-get</command> presenterà un resoconto delle "
 "operazioni che sta per fare. In genere tale resoconto varierà con il tipo di "
 "operazione da fare, ma ci sono svariati elementi comuni: in tutti i casi gli "
 "elenchi riflettono lo stato finale delle cose, e tengono conto dell'opzione "
-"<tt>-f</tt> e di altre attività rilevanti per il comando da eseguire."
+"<literal>-f</literal> e di altre attività rilevanti per il comando da "
+"eseguire."
 
-#. type: <heading></heading>
-#: guide.sgml:364
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:386
 msgid "The Extra Package list"
 msgstr "L'elenco dei pacchetti extra"
 
-#. type: <example></example>
-#: guide.sgml:372
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:388
 #, no-wrap
 msgid ""
 "The following extra packages will be installed:\n"
@@ -9250,86 +9329,87 @@ msgid ""
 "  mailpgp xdpkg fileutils pinepgp zlib1g xlib6g perl-base\n"
 "  bin86 libgdbm1 libgdbmg1 quake-lib gmp2 bcc xbuffy\n"
 "  squake pgp-i python-base debmake ldso perl libreadlineg2\n"
-"  ssh"
+"  ssh\n"
 msgstr ""
 "I seguenti pacchetti saranno inoltre installati:\n"
 "  libdbd-mysql-perl xlib6 zlib1 xzx libreadline2 libdbd-msql-perl\n"
 "  mailpgp xdpkg fileutils pinepgp zlib1g xlib6g perl-base\n"
 "  bin86 libgdbm1 libgdbmg1 quake-lib gmp2 bcc xbuffy\n"
 "  squake pgp-i python-base debmake ldso perl libreadlineg2\n"
-"  ssh"
+"  ssh\n"
 
-#. type: <p></p>
-#: guide.sgml:379
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:396
 msgid ""
 "The Extra Package list shows all of the packages that will be installed or "
 "upgraded in excess of the ones mentioned on the command line. It is only "
-"generated for an <tt>install</tt> command. The listed packages are often the "
-"result of an Auto Install."
+"generated for an <literal>install</literal> command. The listed packages are "
+"often the result of an Auto Install."
 msgstr ""
 "L'elenco dei pacchetti extra mostra tutti i pacchetti che verranno "
 "installati o aggiornati oltre a quelli indicati sulla riga di comando. Viene "
-"generato solo per il comando <tt>install</tt>. I pacchetti elencati sono "
-"spesso il risultato di un'operazione di installazione automatica."
+"generato solo per il comando <literal>install</literal>. I pacchetti "
+"elencati sono spesso il risultato di un'operazione di installazione "
+"automatica."
 
-#. type: <heading></heading>
-#: guide.sgml:382
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:403
 msgid "The Packages to Remove"
 msgstr "I pacchetti da rimuovere"
 
-#. type: <example></example>
-#: guide.sgml:389
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:405
 #, no-wrap
 msgid ""
 "The following packages will be REMOVED:\n"
 "  xlib6-dev xpat2 tk40-dev xkeycaps xbattle xonix\n"
 "  xdaliclock tk40 tk41 xforms0.86 ghostview xloadimage xcolorsel\n"
 "  xadmin xboard perl-debug tkined xtetris libreadline2-dev perl-suid\n"
-"  nas xpilot xfig"
+"  nas xpilot xfig\n"
 msgstr ""
 "I seguenti pacchetti saranno RIMOSSI:\n"
 "  xlib6-dev xpat2 tk40-dev xkeycaps xbattle xonix\n"
 "  xdaliclock tk40 tk41 xforms0.86 ghostview xloadimage xcolorsel\n"
 "  xadmin xboard perl-debug tkined xtetris libreadline2-dev perl-suid\n"
-"  nas xpilot xfig"
+"  nas xpilot xfig\n"
 
-#. type: <p></p>
-#: guide.sgml:399
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:412
 msgid ""
 "The Packages to Remove list shows all of the packages that will be removed "
 "from the system. It can be shown for any of the operations and should be "
 "given a careful inspection to ensure nothing important is to be taken off. "
-"The <tt>-f</tt> option is especially good at generating packages to remove "
-"so extreme care should be used in that case. The list may contain packages "
-"that are going to be removed because they are only partially installed, "
-"possibly due to an aborted installation."
+"The <literal>-f</literal> option is especially good at generating packages "
+"to remove so extreme care should be used in that case. The list may contain "
+"packages that are going to be removed because they are only partially "
+"installed, possibly due to an aborted installation."
 msgstr ""
 "L'elenco dei pacchetti da rimuovere indica tutti i pacchetti che verranno "
 "rimossi dal sistema. Può essere mostrato per una qualsiasi delle operazioni, "
 "e deve sempre essere esaminato attentamente per assicurarsi che non venga "
-"eliminato qualcosa di importante. Con l'opzione <tt>-f</tt> è "
+"eliminato qualcosa di importante. Con l'opzione <literal>-f</literal> è "
 "particolarmente probabile che vengano eliminati dei pacchetti, perciò in "
 "questo caso va fatta particolare attenzione. L'elenco può contenere dei "
 "pacchetti che verranno rimossi perché sono solo parzialmente installati, "
 "forse a causa di un'installazione non terminata correttamente."
 
-#. type: <heading></heading>
-#: guide.sgml:402
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:422
 msgid "The New Packages list"
 msgstr "L'elenco dei nuovi pacchetti installati"
 
-#. type: <example></example>
-#: guide.sgml:406
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:424
 #, no-wrap
 msgid ""
 "The following NEW packages will installed:\n"
-"  zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base"
+"  zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base\n"
 msgstr ""
 "I seguenti pacchetti NUOVI saranno installati:\n"
-"  zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base"
+"  zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base\n"
 
-#. type: <p></p>
-#: guide.sgml:411
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:428
 msgid ""
 "The New Packages list is simply a reminder of what will happen. The packages "
 "listed are not presently installed in the system but will be when APT is "
@@ -9339,32 +9419,32 @@ msgstr ""
 "quello che accadrà. I pacchetti nell'elenco non sono al momento installati "
 "nel sistema, ma lo saranno alla fine delle operazioni di APT."
 
-#. type: <heading></heading>
-#: guide.sgml:414
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:433
 msgid "The Kept Back list"
 msgstr "L'elenco dei pacchetti bloccati"
 
-#. type: <example></example>
-#: guide.sgml:419
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:435
 #, no-wrap
 msgid ""
 "The following packages have been kept back\n"
 "  compface man-db tetex-base msql libpaper svgalib1\n"
-"  gs snmp arena lynx xpat2 groff xscreensaver"
+"  gs snmp arena lynx xpat2 groff xscreensaver\n"
 msgstr ""
 "I seguenti pacchetti sono stati mantenuti alla versione attuale:\n"
 "  compface man-db tetex-base msql libpaper svgalib1\n"
-"  gs snmp arena lynx xpat2 groff xscreensaver"
+"  gs snmp arena lynx xpat2 groff xscreensaver\n"
 
-#. type: <p></p>
-#: guide.sgml:428
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:440
 msgid ""
 "Whenever the whole system is being upgraded there is the possibility that "
 "new versions of packages cannot be installed because they require new things "
 "or conflict with already installed things. In this case the package will "
 "appear in the Kept Back list. The best way to convince packages listed there "
-"to install is with <tt>apt-get install</tt> or by using <prgn>dselect</prgn> "
-"to resolve their problems."
+"to install is with <literal>apt-get install</literal> or by using "
+"<command>dselect</command> to resolve their problems."
 msgstr ""
 "In ogni caso in cui il sistema viene aggiornato nel suo insieme, c'è la "
 "possibilità che non possano venire installate nuove versioni di alcuni "
@@ -9372,26 +9452,27 @@ msgstr ""
 "presenti nel sistema o entrare in conflitto con altri già presenti. In "
 "questo caso, il pacchetto viene elencato nella lista di quelli mantenuti "
 "alla versione attuale. Il miglior modo per forzare l'installazione dei "
-"pacchetti elencati in questa lista è installarli con <tt>apt-get install</"
-"tt> o usare <prgn>dselect</prgn> per risolvere i problemi."
+"pacchetti elencati in questa lista è installarli con <literal>apt-get "
+"install</literal> o usare <command>dselect</command> per risolvere i "
+"problemi."
 
-#. type: <heading></heading>
-#: guide.sgml:431
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:449
 msgid "Held Packages warning"
 msgstr "Messaggi di avvertimento sui pacchetti bloccati"
 
-#. type: <example></example>
-#: guide.sgml:435
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:451
 #, no-wrap
 msgid ""
 "The following held packages will be changed:\n"
-"  cvs"
+"  cvs\n"
 msgstr ""
 "I seguenti pacchetti bloccati saranno cambiati:\n"
-"  cvs"
+"  cvs\n"
 
-#. type: <p></p>
-#: guide.sgml:441
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:455
 msgid ""
 "Sometimes you can ask APT to install a package that is on hold, in such a "
 "case it prints out a warning that the held package is going to be changed. "
@@ -9402,32 +9483,32 @@ msgstr ""
 "pacchetto verrà modificato. Questo dovrebbe accadere solo durante operazioni "
 "di dist-upgrade o di install."
 
-#. type: <heading></heading>
-#: guide.sgml:444
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:461
 msgid "Final summary"
 msgstr "Resoconto finale"
 
-#. type: <p></p>
-#: guide.sgml:447
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:463
 msgid ""
 "Finally, APT will print out a summary of all the changes that will occur."
 msgstr ""
 "Infine, APT stamperà un riassunto di tutte le modifiche che accadranno."
 
-#. type: <example></example>
-#: guide.sgml:452
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:466
 #, no-wrap
 msgid ""
 "206 packages upgraded, 8 newly installed, 23 to remove and 51 not upgraded.\n"
 "12 packages not fully installed or removed.\n"
-"Need to get 65.7M/66.7M of archives. After unpacking 26.5M will be used."
+"Need to get 65.7M/66.7M of archives. After unpacking 26.5M will be used.\n"
 msgstr ""
 "206 aggiornati, 8 installati, 23 da rimuovere e 51 non aggiornati.\n"
 "12 non completamente installati o rimossi..\n"
-"È necessario scaricare 65.7M/66.7M di archivi. Dopo quest'operazione, verranno occupati 26.5M di spazio su disco."
+"È necessario scaricare 65.7M/66.7M di archivi. Dopo quest'operazione, verranno occupati 26.5M di spazio su disco.\n"
 
-#. type: <p></p>
-#: guide.sgml:470
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:471
 msgid ""
 "The first line of the summary simply is a reduced version of all of the "
 "lists and includes the number of upgrades - that is packages already "
@@ -9457,8 +9538,8 @@ msgstr ""
 "in /usr dopo l'installazione. Se si stanno rimuovendo molti pacchetti, "
 "allora il valore può indicare lo spazio che verrà liberato."
 
-#. type: <p></p>
-#: guide.sgml:473
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:485
 msgid ""
 "Some other reports can be generated by using the -u option to show packages "
 "to upgrade, they are similar to the previous examples."
@@ -9466,13 +9547,13 @@ msgstr ""
 "Si possono generare altri resoconti usando l'opzione -u per mostrare i "
 "pacchetti da aggiornare, ma sono simili all'esempio precedente."
 
-#. type: <heading></heading>
-#: guide.sgml:477
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:492
 msgid "The Status Display"
 msgstr "La visualizzazione dello stato"
 
-#. type: <p></p>
-#: guide.sgml:481
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:494
 msgid ""
 "During the download of archives and package files APT prints out a series of "
 "status messages."
@@ -9480,8 +9561,8 @@ msgstr ""
 "Durante lo scaricamento degli archivi e dei file dei pacchetti APT stampa "
 "una serie di messaggi di stato."
 
-#. type: <example></example>
-#: guide.sgml:490
+#. type: Content of: <book><chapter><section><screen>
+#: guide.dbk:498
 #, no-wrap
 msgid ""
 "# apt-get update\n"
@@ -9490,7 +9571,7 @@ msgid ""
 "Hit http://llug.sep.bnl.gov/debian/ testing/main Packages\n"
 "Get:4 http://ftp.de.debian.org/debian-non-US/ unstable/binary-i386/ Packages\n"
 "Get:5 http://llug.sep.bnl.gov/debian/ testing/non-free Packages\n"
-"11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s"
+"11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s\n"
 msgstr ""
 "# apt-get update\n"
 "Scaricamento di:1 http://ftp.de.debian.org/debian-non-US/ stable/non-US/ Packages\n"
@@ -9498,129 +9579,127 @@ msgstr ""
 "Trovato http://llug.sep.bnl.gov/debian/ testing/main Packages\n"
 "Scaricamento di:4 http://ftp.de.debian.org/debian-non-US/ unstable/binary-i386/ Packages\n"
 "Scaricamento di:5 http://llug.sep.bnl.gov/debian/ testing/non-free Packages\n"
-"11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s"
+"11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s\n"
 
-#. type: <p></p>
-#: guide.sgml:500
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:507
 msgid ""
-"The lines starting with <em>Get</em> are printed out when APT begins to "
-"fetch a file while the last line indicates the progress of the download. The "
-"first percent value on the progress line indicates the total percent done of "
-"all files. Unfortunately since the size of the Package files is unknown "
-"<tt>apt-get update</tt> estimates the percent done which causes some "
-"inaccuracies."
+"The lines starting with <emphasis>Get</emphasis> are printed out when APT "
+"begins to fetch a file while the last line indicates the progress of the "
+"download. The first percent value on the progress line indicates the total "
+"percent done of all files. Unfortunately since the size of the Package files "
+"is unknown <literal>apt-get update</literal> estimates the percent done "
+"which causes some inaccuracies."
 msgstr ""
-"Le righe che cominciano con <em>Scaricamento di</em> vengono stampate quando "
-"APT inizia a scaricare un file, mentre l'ultima riga indica il progresso "
-"dell'operazione. Il primo valore in percentuale nella riga di progresso "
-"indica la percentuale totale scaricata di tutti i file; dato che la "
-"dimensione dei file Package non è nota, purtroppo a volte <tt>apt-get "
-"update</tt> fa una stima poco accurata."
+"Le righe che cominciano con <emphasis>Scaricamento di</emphasis> vengono "
+"stampate quando APT inizia a scaricare un file, mentre l'ultima riga indica "
+"il progresso dell'operazione. Il primo valore in percentuale nella riga di "
+"progresso indica la percentuale totale scaricata di tutti i file; dato che "
+"la dimensione dei file Package non è nota, purtroppo a volte <literal>apt-"
+"get update</literal> fa una stima poco accurata."
 
-#. type: <p></p>
-#: guide.sgml:509
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:515
 msgid ""
 "The next section of the status line is repeated once for each download "
 "thread and indicates the operation being performed and some useful "
 "information about what is happening. Sometimes this section will simply read "
-"<em>Forking</em> which means the OS is loading the download module. The "
-"first word after the [ is the fetch number as shown on the history lines. "
-"The next word is the short form name of the object being downloaded. For "
-"archives it will contain the name of the package that is being fetched."
+"<emphasis>Forking</emphasis> which means the OS is loading the download "
+"module. The first word after the [ is the fetch number as shown on the "
+"history lines. The next word is the short form name of the object being "
+"downloaded. For archives it will contain the name of the package that is "
+"being fetched."
 msgstr ""
 "La sezione successiva della riga di stato viene ripetuta una volta per "
 "ciascuna istanza di scaricamento, ed indica l'operazione in corso, insieme "
 "ad alcune informazioni utili su cosa stia accadendo. A volte questa sezione "
-"contiene solamente <em>Forking</em>, che significa che il sistema operativo "
-"sta caricando il modulo per lo scaricamento. La prima parola dopo la "
-"parentesi quadra aperta è il numero dello scaricamento come mostrato nelle "
-"righe della cronologia. La parola successiva è il nome breve dell'oggetto "
-"che si sta scaricando, che per gli archivi è il nome del pacchetto."
+"contiene solamente <emphasis>Forking</emphasis>, che significa che il "
+"sistema operativo sta caricando il modulo per lo scaricamento. La prima "
+"parola dopo la parentesi quadra aperta è il numero dello scaricamento come "
+"mostrato nelle righe della cronologia. La parola successiva è il nome breve "
+"dell'oggetto che si sta scaricando, che per gli archivi è il nome del "
+"pacchetto."
 
-#. type: <p></p>
-#: guide.sgml:524
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:525
 msgid ""
 "Inside of the single quote is an informative string indicating the progress "
 "of the negotiation phase of the download. Typically it progresses from "
-"<em>Connecting</em> to <em>Waiting for file</em> to <em>Downloading</em> or "
-"<em>Resuming</em>. The final value is the number of bytes downloaded from "
-"the remote site. Once the download begins this is represented as "
-"<tt>102/10.2k</tt> indicating that 102 bytes have been fetched and 10.2 "
-"kilobytes is expected. The total size is always shown in 4 figure notation "
-"to preserve space. After the size display is a percent meter for the file "
-"itself. The second last element is the instantaneous average speed. This "
-"values is updated every 5 seconds and reflects the rate of data transfer for "
-"that period. Finally is shown the estimated transfer time. This is updated "
-"regularly and reflects the time to complete everything at the shown transfer "
-"rate."
+"<emphasis>Connecting</emphasis> to <emphasis>Waiting for file</emphasis> to "
+"<emphasis>Downloading</emphasis> or <emphasis>Resuming</emphasis>. The final "
+"value is the number of bytes downloaded from the remote site. Once the "
+"download begins this is represented as <literal>102/10.2k</literal> "
+"indicating that 102 bytes have been fetched and 10.2 kilobytes is expected. "
+"The total size is always shown in 4 figure notation to preserve space. After "
+"the size display is a percent meter for the file itself. The second last "
+"element is the instantaneous average speed. This values is updated every 5 "
+"seconds and reflects the rate of data transfer for that period. Finally is "
+"shown the estimated transfer time. This is updated regularly and reflects "
+"the time to complete everything at the shown transfer rate."
 msgstr ""
 "All'interno delle virgolette singole c'è una stringa informativa, che indica "
 "il progresso della fase di negoziazione dello scaricamento. Tipicamente "
-"comincia con <em>Connecting</em>, procede con <em>Waiting for file</em> e "
-"poi con <em>Downloading</em> o <em>Resuming</em>; il valore finale è il "
-"numero di byte che sono stati scaricati dal sito remoto. Una volta "
-"cominciato lo scaricamento, viene rappresentato come <tt>102/10.2k</tt>, che "
-"indica che sono stati scaricati 102 byte su 10,2 kilobyte attesi. La "
-"dimensione totale viene sempre espressa in notazione a quattro cifre, per "
-"risparmiare spazio. Dopo la dimensione viene indicato un indicatore "
-"progressivo della percentuale del file. Il penultimo elemento è la velocità "
-"istantanea media, che viene aggiornata ogni 5 secondi e riflette la velocità "
-"di trasferimento dei dati in quel periodo. Infine, viene visualizzato il "
-"tempo stimato per il trasferimento, che viene aggiornato periodicamente e "
-"riflette il tempo necessario per completare tutte le operazioni alla "
-"velocità di trasferimento mostrata."
-
-#. type: <p></p>
-#: guide.sgml:530
+"comincia con <emphasis>Connecting</emphasis>, procede con <emphasis>Waiting "
+"for file</emphasis> e poi con <emphasis>Downloading</emphasis> o "
+"<emphasis>Resuming</emphasis>; il valore finale è il numero di byte che sono "
+"stati scaricati dal sito remoto. Una volta cominciato lo scaricamento, viene "
+"rappresentato come <literal>102/10.2k</literal>, che indica che sono stati "
+"scaricati 102 byte su 10,2 kilobyte attesi. La dimensione totale viene "
+"sempre espressa in notazione a quattro cifre, per risparmiare spazio. Dopo "
+"la dimensione viene indicato un indicatore progressivo della percentuale del "
+"file. Il penultimo elemento è la velocità istantanea media, che viene "
+"aggiornata ogni 5 secondi e riflette la velocità di trasferimento dei dati "
+"in quel periodo. Infine, viene visualizzato il tempo stimato per il "
+"trasferimento, che viene aggiornato periodicamente e riflette il tempo "
+"necessario per completare tutte le operazioni alla velocità di trasferimento "
+"mostrata."
+
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:540
 msgid ""
 "The status display updates every half second to provide a constant feedback "
 "on the download progress while the Get lines scroll back whenever a new file "
 "is started. Since the status display is constantly updated it is unsuitable "
-"for logging to a file, use the <tt>-q</tt> option to remove the status "
-"display."
+"for logging to a file, use the <literal>-q</literal> option to remove the "
+"status display."
 msgstr ""
 "La visualizzazione dello stato viene aggiornata ogni mezzo secondo per "
 "fornire un feedback costante sul processo di scaricamento, e le righe Get "
 "scorrono in alto quando viene avviato lo scaricamento di un nuovo file. Dato "
 "che la visualizzazione dello stato viene costantemente aggiornata, non è "
 "adatta per essere registrata in un file; per non visualizzarla si può usare "
-"l'opzione <tt>-q</tt>."
+"l'opzione <literal>-q</literal>."
 
-#. type: <heading></heading>
-#: guide.sgml:535
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:548
 msgid "Dpkg"
 msgstr "Dpkg"
 
-#. type: <p></p>
-#: guide.sgml:542
-msgid ""
-"APT uses <prgn>dpkg</prgn> for installing the archives and will switch over "
-"to the <prgn>dpkg</prgn> interface once downloading is completed. "
-"<prgn>dpkg</prgn> will also ask a number of questions as it processes the "
-"packages and the packages themselves may also ask several questions. Before "
-"each question there is usually a description of what it is asking and the "
-"questions are too varied to discuss completely here."
-msgstr ""
-"APT usa <prgn>dpkg</prgn> per installare gli archivi e passerà "
-"all'interfaccia di <prgn>dpkg</prgn> una volta completati gli scaricamenti. "
-"<prgn>dpkg</prgn> porrà anche alcune domande durante l'elaborazione dei "
-"pacchetti, ed i pacchetti stessi potranno farne altre. Prima di ciascuna "
-"domanda viene proposta di solito una descrizione di ciò che viene chiesto, e "
-"le domande sono troppo diverse per poter essere discusse in maniera completa "
-"in questa occasione."
-
-#. type: <title></title>
-#: offline.sgml:4
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:550
+msgid ""
+"APT uses <command>dpkg</command> for installing the archives and will switch "
+"over to the <command>dpkg</command> interface once downloading is completed. "
+"<command>dpkg</command> will also ask a number of questions as it processes "
+"the packages and the packages themselves may also ask several questions. "
+"Before each question there is usually a description of what it is asking and "
+"the questions are too varied to discuss completely here."
+msgstr ""
+"APT usa <command>dpkg</command> per installare gli archivi e passerà "
+"all'interfaccia di <command>dpkg</command> una volta completati gli "
+"scaricamenti. <command>dpkg</command> porrà anche alcune domande durante "
+"l'elaborazione dei pacchetti, ed i pacchetti stessi potranno farne altre. "
+"Prima di ciascuna domanda viene proposta di solito una descrizione di ciò "
+"che viene chiesto, e le domande sono troppo diverse per poter essere "
+"discusse in maniera completa in questa occasione."
+
+#. type: Content of: <book><title>
+#: offline.dbk:11
 msgid "Using APT Offline"
 msgstr "Usare APT offline"
 
-#. type: <version></version>
-#: offline.sgml:7
-msgid "$Id: offline.sgml,v 1.8 2003/02/12 15:06:41 doogie Exp $"
-msgstr "$Id: offline.sgml,v 1.8 2003/02/12 15:06:41 doogie Exp $"
-
-#. type: <abstract></abstract>
-#: offline.sgml:12
+#. type: Content of: <book><bookinfo><abstract><para>
+#: offline.dbk:25
 msgid ""
 "This document describes how to use APT in a non-networked environment, "
 "specifically a 'sneaker-net' approach for performing upgrades."
@@ -9629,23 +9708,24 @@ msgstr ""
 "rete, specificatamente un approccio «sfrutta-altra-rete» per fare gli "
 "aggiornamenti."
 
-#. type: <copyrightsummary></copyrightsummary>
-#: offline.sgml:16
-msgid "Copyright &copy; Jason Gunthorpe, 1999."
-msgstr "Copyright &copy; Jason Gunthorpe, 1999."
+#. type: Content of: <book><bookinfo>
+#: offline.dbk:30
+msgid ""
+"<copyright><year>1999</year><holder>Jason Gunthorpe</holder></copyright>"
+msgstr ""
 
-#. type: <heading></heading>
-#: offline.sgml:32
+#. type: Content of: <book><chapter><title>
+#: offline.dbk:48
 msgid "Introduction"
 msgstr "Introduzione"
 
-#. type: <heading></heading>
-#: offline.sgml:34 offline.sgml:65 offline.sgml:180
+#. type: Content of: <book><chapter><section><title>
+#: offline.dbk:50 offline.dbk:80 offline.dbk:192
 msgid "Overview"
 msgstr "Panoramica"
 
-#. type: <p></p>
-#: offline.sgml:40
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:52
 msgid ""
 "Normally APT requires direct access to a Debian archive, either from a local "
 "media or through a network. Another common complaint is that a Debian "
@@ -9657,8 +9737,8 @@ msgstr ""
 "ha un collegamento lento, come un modem, e un'altra macchina ha una "
 "connessione veloce, ma le due sono fisicamente distanti."
 
-#. type: <p></p>
-#: offline.sgml:51
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:58
 msgid ""
 "The solution to this is to use large removable media such as a Zip disc or a "
 "SuperDisk disc. These discs are not large enough to store the entire Debian "
@@ -9666,9 +9746,9 @@ msgid ""
 "to use APT to generate a list of packages that are required and then fetch "
 "them onto the disc using another machine with good connectivity. It is even "
 "possible to use another Debian machine with APT or to use a completely "
-"different OS and a download tool like wget. Let <em>remote host</em> mean "
-"the machine downloading the packages, and <em>target host</em> the one with "
-"bad or no connection."
+"different OS and a download tool like wget. Let <emphasis>remote host</"
+"emphasis> mean the machine downloading the packages, and <emphasis>target "
+"host</emphasis> the one with bad or no connection."
 msgstr ""
 "La soluzione è usare supporti rimovibili grandi come un disco Zip o uno "
 "SuperDisk. Questi dischi non sono grandi abbastanza per memorizzare l'intero "
@@ -9678,12 +9758,12 @@ msgstr ""
 "nel disco usando un'altra macchina con una buona connettività. È possibile "
 "anche usare un'altra macchina Debian con APT o usare un sistema operativo "
 "completamente diverso e uno strumento per scaricare file come wget. In "
-"questo documento con <em>host remoto</em> viene indicata la macchina che "
-"scarica i pacchetti, e <em>host di destinazione</em> è quella senza "
-"connessione o con una connessione non buona."
+"questo documento con <emphasis>host remoto</emphasis> viene indicata la "
+"macchina che scarica i pacchetti, e <emphasis>host di destinazione</"
+"emphasis> è quella senza connessione o con una connessione non buona."
 
-#. type: <p></p>
-#: offline.sgml:57
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:69
 msgid ""
 "This is achieved by creatively manipulating the APT configuration file. The "
 "essential premise to tell APT to look on a disc for it's archive files. Note "
@@ -9696,13 +9776,13 @@ msgstr ""
 "essere formattato con un file system che può gestire i nomi di file lunghi, "
 "come ext2, fat32 o vfat."
 
-#. type: <heading></heading>
-#: offline.sgml:63
+#. type: Content of: <book><chapter><title>
+#: offline.dbk:78
 msgid "Using APT on both machines"
 msgstr "Usare APT su entrambe le macchine"
 
-#. type: <p><example>
-#: offline.sgml:71
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:82
 msgid ""
 "APT being available on both machines gives the simplest configuration. The "
 "basic idea is to place a copy of the status file on the disc and use the "
@@ -9715,8 +9795,8 @@ msgstr ""
 "per decidere quali pacchetti scaricare. La struttura delle directory sul "
 "disco deve essere simile a:"
 
-#. type: <example></example>
-#: offline.sgml:80
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:88
 #, no-wrap
 msgid ""
 "  /disc/\n"
@@ -9726,7 +9806,7 @@ msgid ""
 "       partial/\n"
 "    status\n"
 "    sources.list\n"
-"    apt.conf"
+"    apt.conf\n"
 msgstr ""
 "  /disc/\n"
 "    archives/\n"
@@ -9735,42 +9815,43 @@ msgstr ""
 "       partial/\n"
 "    status\n"
 "    sources.list\n"
-"    apt.conf"
+"    apt.conf\n"
 
-#. type: <heading></heading>
-#: offline.sgml:88
+#. type: Content of: <book><chapter><section><title>
+#: offline.dbk:99
 msgid "The configuration file"
 msgstr "Il file di configurazione"
 
-#. type: <p></p>
-#: offline.sgml:96
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:101
 msgid ""
 "The configuration file should tell APT to store its files on the disc and to "
 "use the configuration files on the disc as well. The sources.list should "
 "contain the proper sites that you wish to use from the remote machine, and "
-"the status file should be a copy of <em>/var/lib/dpkg/status</em> from the "
-"<em>target host</em>. Please note, if you are using a local archive you must "
-"use copy URIs, the syntax is identical to file URIs."
+"the status file should be a copy of <emphasis>/var/lib/dpkg/status</"
+"emphasis> from the <emphasis>target host</emphasis>. Please note, if you are "
+"using a local archive you must use copy URIs, the syntax is identical to "
+"file URIs."
 msgstr ""
 "Il file di configurazione deve indicare ad APT di memorizzare i suoi file "
 "sul disco e di usare i file di configurazione anch'essi sul disco. Il file "
 "sources.list deve contenere i siti appropriati che si desiderano usare dalla "
-"macchina remota e il file di stato dovrebbe essere una copia di <em>/var/lib/"
-"dpkg/status</em> della <em>macchina di destinazione</em>. Notare che, se si "
-"sta usando un archivio locale, si devono usare URI «copy» la cui sintassi è "
-"identica a quella degli URI «file»."
+"macchina remota e il file di stato dovrebbe essere una copia di <emphasis>/"
+"var/lib/dpkg/status</emphasis> della <emphasis>macchina di destinazione</"
+"emphasis>. Notare che, se si sta usando un archivio locale, si devono usare "
+"URI «copy» la cui sintassi è identica a quella degli URI «file»."
 
-#. type: <p><example>
-#: offline.sgml:100
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:109
 msgid ""
-"<em>apt.conf</em> must contain the necessary information to make APT use the "
-"disc:"
+"<emphasis>apt.conf</emphasis> must contain the necessary information to make "
+"APT use the disc:"
 msgstr ""
-"<em>apt.conf</em> deve contenere le informazioni necessarie per far sì che "
-"APT usi il disco:"
+"<emphasis>apt.conf</emphasis> deve contenere le informazioni necessarie per "
+"far sì che APT usi il disco:"
 
-#. type: <example></example>
-#: offline.sgml:124
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:113
 #, no-wrap
 msgid ""
 " APT\n"
@@ -9778,10 +9859,10 @@ msgid ""
 "   /* This is not necessary if the two machines are the same arch, it tells\n"
 "      the remote APT what architecture the target machine is */\n"
 "   Architecture \"i386\";\n"
-"   \n"
+"\n"
 "   Get::Download-Only \"true\";\n"
 " };\n"
-" \n"
+"\n"
 " Dir\n"
 " {\n"
 "   /* Use the disc for state information and redirect the status file from\n"
@@ -9792,20 +9873,20 @@ msgid ""
 "   // Binary caches will be stored locally\n"
 "   Cache::archives \"/disc/archives/\";\n"
 "   Cache \"/tmp/\";\n"
-"   \n"
+"\n"
 "   // Location of the source list.\n"
 "   Etc \"/disc/\";\n"
-" };"
+" };\n"
 msgstr ""
 " APT\n"
 " {\n"
 "   /* Questo non è necessario se le due macchine hanno la stessa architettura,\n"
 "      dice ad APT remoto qual è l'architettura della macchina di destinazione */\n"
 "   Architecture \"i386\";\n"
-"   \n"
+"\n"
 "   Get::Download-Only \"true\";\n"
 " };\n"
-" \n"
+"\n"
 " Dir\n"
 " {\n"
 "   /* Usa il disco per le informazioni sullo stato e ridirige il file di stato\n"
@@ -9816,67 +9897,70 @@ msgstr ""
 "   // Le cache binarie saranno memorizzate in locale\n"
 "   Cache::archives \"/disc/archives/\";\n"
 "   Cache \"/tmp/\";\n"
-"   \n"
+"\n"
 "   // Posizione dell'elenco di fonti.\n"
 "   Etc \"/disc/\";\n"
-" };"
+" };\n"
 
-#. type: </example></p>
-#: offline.sgml:129
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:138
 msgid ""
 "More details can be seen by examining the apt.conf man page and the sample "
-"configuration file in <em>/usr/share/doc/apt/examples/apt.conf</em>."
+"configuration file in <emphasis>/usr/share/doc/apt/examples/apt.conf</"
+"emphasis>."
 msgstr ""
 "Si possono vedere informazioni più dettagliate nella pagina di manuale di "
-"apt.conf e nel file di configurazione d'esempio in <em>/usr/share/doc/apt/"
-"examples/apt.conf</em>."
+"apt.conf e nel file di configurazione d'esempio in <emphasis>/usr/share/doc/"
+"apt/examples/apt.conf</emphasis>."
 
-#. type: <p><example>
-#: offline.sgml:136
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:143
 msgid ""
-"On the target machine the first thing to do is mount the disc and copy <em>/"
-"var/lib/dpkg/status</em> to it. You will also need to create the directories "
-"outlined in the Overview, <em>archives/partial/</em> and <em>lists/partial/</"
-"em>. Then take the disc to the remote machine and configure the sources."
-"list. On the remote machine execute the following:"
+"On the target machine the first thing to do is mount the disc and copy "
+"<emphasis>/var/lib/dpkg/status</emphasis> to it. You will also need to "
+"create the directories outlined in the Overview, <emphasis>archives/partial/"
+"</emphasis> and <emphasis>lists/partial/</emphasis>. Then take the disc to "
+"the remote machine and configure the sources.list. On the remote machine "
+"execute the following:"
 msgstr ""
 "Nella macchina di destinazione, la prima cosa da fare è montare il disco e "
-"copiarvi <em>/var/lib/dpkg/status</em>. Sarà anche necessario creare le "
-"directory elencate nella panoramica: <em>archives/partial/</em> e <em>lists/"
-"partial/</em>. Poi portare il disco nella macchina remota e configurare il "
-"file sources.list; in tale macchina eseguire:"
+"copiarvi <emphasis>/var/lib/dpkg/status</emphasis>. Sarà anche necessario "
+"creare le directory elencate nella panoramica: <emphasis>archives/partial/</"
+"emphasis> e <emphasis>lists/partial/</emphasis>. Poi portare il disco nella "
+"macchina remota e configurare il file sources.list; in tale macchina "
+"eseguire:"
 
-#. type: <example></example>
-#: offline.sgml:142
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:152
 #, no-wrap
 msgid ""
 " # export APT_CONFIG=\"/disc/apt.conf\"\n"
 " # apt-get update\n"
 " [ APT fetches the package files ]\n"
 " # apt-get dist-upgrade\n"
-" [ APT fetches all the packages needed to upgrade the target machine ]"
+" [ APT fetches all the packages needed to upgrade the target machine ]\n"
 msgstr ""
 " # export APT_CONFIG=\"/disc/apt.conf\"\n"
 " # apt-get update\n"
 " [ APT scarica i file degli elenchi dei pacchetti ]\n"
 " # apt-get dist-upgrade\n"
-" [ APT scarica tutti i pacchetti necessari per aggiornare la macchina di destinazione ]"
+" [ APT scarica tutti i pacchetti necessari per aggiornare la macchina di destinazione ]\n"
 
-#. type: </example></p>
-#: offline.sgml:149
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:159
 msgid ""
 "The dist-upgrade command can be replaced with any other standard APT "
 "commands, particularly dselect-upgrade. You can even use an APT front end "
-"such as <em>dselect</em>. However this presents a problem in communicating "
-"your selections back to the local computer."
+"such as <emphasis>dselect</emphasis>. However this presents a problem in "
+"communicating your selections back to the local computer."
 msgstr ""
 "Il comando dist-upgrade può essere sostituito con qualsiasi altro comando "
 "APT standard, in particolare dselect-upgrade. Si può persino usare un "
-"frontend per APT come <em>dselect</em>; questo tuttavia pone alcuni problemi "
-"nel comunicare le selezioni fatte al computer locale."
+"frontend per APT come <emphasis>dselect</emphasis>; questo tuttavia pone "
+"alcuni problemi nel comunicare le selezioni fatte al computer locale."
 
-#. type: <p><example>
-#: offline.sgml:153
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:165
 msgid ""
 "Now the disc contains all of the index files and archives needed to upgrade "
 "the target machine. Take the disc back and run:"
@@ -9885,24 +9969,24 @@ msgstr ""
 "la macchina di destinazione. Riportare il disco alla macchina locale ed "
 "eseguire:"
 
-#. type: <example></example>
-#: offline.sgml:159
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:169
 #, no-wrap
 msgid ""
 "  # export APT_CONFIG=\"/disc/apt.conf\"\n"
 "  # apt-get check\n"
 "  [ APT generates a local copy of the cache files ]\n"
 "  # apt-get --no-d -o dir::state::status=/var/lib/dpkg/status dist-upgrade\n"
-"  [ Or any other APT command ]"
+"  [ Or any other APT command ]\n"
 msgstr ""
 "  # export APT_CONFIG=\"/disc/apt.conf\"\n"
 "  # apt-get check\n"
 "  [ APT genera una copia locale dei file di cache ]\n"
 "  # apt-get --no-d -o dir::state::status=/var/lib/dpkg/status dist-upgrade\n"
-"  [ O qualsiasi altro comando APT ]"
+"  [ O qualsiasi altro comando APT ]\n"
 
-#. type: <p></p>
-#: offline.sgml:165
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:176
 msgid ""
 "It is necessary for proper function to re-specify the status file to be the "
 "local one. This is very important!"
@@ -9910,8 +9994,8 @@ msgstr ""
 "Per il corretto funzionamento è necessario rispecificare il fatto che il "
 "file di stato è quello locale. Questo è molto importante!"
 
-#. type: <p></p>
-#: offline.sgml:172
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:180
 msgid ""
 "If you are using dselect you can do the very risky operation of copying disc/"
 "status to /var/lib/dpkg/status so that any selections you made on the remote "
@@ -9925,25 +10009,25 @@ msgstr ""
 "solamente nella macchina locale, ma ciò non è sempre possibile. NON copiare "
 "il file di stato se nel frattempo sono stati eseguiti dpkg o APT!"
 
-#. type: <heading></heading>
-#: offline.sgml:178
+#. type: Content of: <book><chapter><title>
+#: offline.dbk:190
 msgid "Using APT and wget"
 msgstr "Usare APT e wget"
 
-#. type: <p></p>
-#: offline.sgml:185
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:194
 msgid ""
-"<em>wget</em> is a popular and portable download tool that can run on nearly "
-"any machine. Unlike the method above this requires that the Debian machine "
-"already has a list of available packages."
+"<emphasis>wget</emphasis> is a popular and portable download tool that can "
+"run on nearly any machine. Unlike the method above this requires that the "
+"Debian machine already has a list of available packages."
 msgstr ""
-"<em>wget</em> è uno strumento popolare e portabile per scaricare file che "
-"può essere eseguito quasi su qualsiasi macchina. A differenza del metodo "
-"descritto sopra, questo richiede che la macchina Debian abbia già un elenco "
-"dei pacchetti disponibili."
+"<emphasis>wget</emphasis> è uno strumento popolare e portabile per scaricare "
+"file che può essere eseguito quasi su qualsiasi macchina. A differenza del "
+"metodo descritto sopra, questo richiede che la macchina Debian abbia già un "
+"elenco dei pacchetti disponibili."
 
-#. type: <p></p>
-#: offline.sgml:190
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:199
 msgid ""
 "The basic idea is to create a disc that has only the archive files "
 "downloaded from the remote site. This is done by using the --print-uris "
@@ -9955,13 +10039,13 @@ msgstr ""
 "print-uris di apt-get e poi preparando uno script che usa wget per scaricare "
 "effettivamente i pacchetti."
 
-#. type: <heading></heading>
-#: offline.sgml:196
+#. type: Content of: <book><chapter><section><title>
+#: offline.dbk:205
 msgid "Operation"
 msgstr "Funzionamento"
 
-#. type: <p><example>
-#: offline.sgml:200
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:207
 msgid ""
 "Unlike the previous technique no special configuration files are required. "
 "We merely use the standard APT commands to generate the file list."
@@ -9970,22 +10054,22 @@ msgstr ""
 "configurazione speciali; vengono semplicemente usati i comandi APT standard "
 "per generare l'elenco dei file."
 
-#. type: <example></example>
-#: offline.sgml:205
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:211
 #, no-wrap
 msgid ""
-" # apt-get dist-upgrade \n"
+" # apt-get dist-upgrade\n"
 " [ Press no when prompted, make sure you are happy with the actions ]\n"
-" # apt-get -qq --print-uris dist-upgrade > uris\n"
-" # awk '{print \"wget -O \" $2 \" \" $1}' < uris > /disc/wget-script"
+" # apt-get -qq --print-uris dist-upgrade &gt; uris\n"
+" # awk '{print \"wget -O \" $2 \" \" $1}' &lt; uris &gt; /disc/wget-script\n"
 msgstr ""
 " # apt-get dist-upgrade \n"
 " [ Inserire no alla domanda, assicurarsi di approvare le azioni proposte ]\n"
-" # apt-get -qq --print-uris dist-upgrade > uris\n"
-" # awk '{print \"wget -O \" $2 \" \" $1}' < uris > /disc/wget-script"
+" # apt-get -qq --print-uris dist-upgrade &gt; uris\n"
+" # awk '{print \"wget -O \" $2 \" \" $1}' &lt; uris &gt; /disc/wget-script\n"
 
-#. type: </example></p>
-#: offline.sgml:210
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:217
 msgid ""
 "Any command other than dist-upgrade could be used here, including dselect-"
 "upgrade."
@@ -9993,8 +10077,8 @@ msgstr ""
 "Si può usare qualsiasi comando che non sia dist-upgrade, incluso dselect-"
 "upgrade."
 
-#. type: <p></p>
-#: offline.sgml:216
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:221
 msgid ""
 "The /disc/wget-script file will now contain a list of wget commands to "
 "execute in order to fetch the necessary archives. This script should be run "
@@ -10006,25 +10090,25 @@ msgstr ""
 "essere eseguito con il punto di mount del disco come directory attuale di "
 "lavoro, in modo che l'output venga salvato sul disco."
 
-#. type: <p><example>
-#: offline.sgml:219
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:227
 msgid "The remote machine would do something like"
 msgstr "Nella macchina remota fare qualcosa come:"
 
-#. type: <example></example>
-#: offline.sgml:223
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:230
 #, no-wrap
 msgid ""
 "  # cd /disc\n"
 "  # sh -x ./wget-script\n"
-"  [ wait.. ]"
+"  [ wait.. ]\n"
 msgstr ""
 "  # cd /disc\n"
 "  # sh -x ./wget-script\n"
-"  [ attendere... ]"
+"  [ attendere... ]\n"
 
-#. type: </example><example>
-#: offline.sgml:228
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:235
 msgid ""
 "Once the archives are downloaded and the disc returned to the Debian machine "
 "installation can proceed using,"
@@ -10032,14 +10116,14 @@ msgstr ""
 "Una volta che gli archivi sono stati scaricati e il disco è stato riportato "
 "alla macchina Debian, si può procedere con l'installazione usando"
 
-#. type: <example></example>
-#: offline.sgml:230
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:239
 #, no-wrap
-msgid "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade"
-msgstr "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade"
+msgid "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade\n"
+msgstr "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade\n"
 
-#. type: </example></p>
-#: offline.sgml:234
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:242
 msgid "Which will use the already fetched archives on the disc."
 msgstr "che userà gli archivi già scaricati e presenti sul disco."
 
@@ -10140,9 +10224,6 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco."
 #~ msgid "FILES"
 #~ msgstr "FILE"
 
-#~ msgid "<!-- -*- mode: sgml; mode: fold -*- -->"
-#~ msgstr "<!-- -*- mode: sgml; mode: fold -*- -->"
-
 #~ msgid ""
 #~ "<!-- Some common paths.. --> <!ENTITY docdir \"/usr/share/doc/apt/\"> <!"
 #~ "ENTITY guidesdir \"/usr/share/doc/apt-doc/\"> <!ENTITY configureindex "
@@ -11572,22 +11653,24 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco."
 
 #, fuzzy
 #~ msgid ""
-#~ "To enable the APT method you need to select [A]ccess in <prgn>dselect</"
-#~ "prgn> and then choose the APT method. You will be prompted for a set of "
-#~ "<em>Sources</em> which are places to fetch archives from. These can be "
-#~ "remote Internet sites, local Debian mirrors or CDROMs. Each source can "
-#~ "provide a fragment of the total Debian archive, APT will automatically "
-#~ "combine them to form a complete set of packages. If you have a CDROM then "
-#~ "it is a good idea to specify it first and then specify a mirror so that "
-#~ "you have access to the latest bug fixes. APT will automatically use "
-#~ "packages on your CDROM before downloading from the Internet."
+#~ "To enable the APT method you need to select [A]ccess in <command>dselect</"
+#~ "command> and then choose the APT method. You will be prompted for a set "
+#~ "of <emphasis>Sources</emphasis> which are places to fetch archives from. "
+#~ "These can be remote Internet sites, local Debian mirrors or CDROMs. Each "
+#~ "source can provide a fragment of the total Debian archive, APT will "
+#~ "automatically combine them to form a complete set of packages. If you "
+#~ "have a CDROM then it is a good idea to specify it first and then specify "
+#~ "a mirror so that you have access to the latest bug fixes. APT will "
+#~ "automatically use packages on your CDROM before downloading from the "
+#~ "Internet."
 #~ msgstr ""
-#~ "Per abilitare il metodo APT dovete selezionare [A]ccess in <prgn>dselect</"
-#~ "prgn> e scegliere il metodo APT; vi verrà chiesto un insieme di fonti "
-#~ "(<em>Sources</em>), cioè di posti da cui scaricare gli archivi. Tali "
-#~ "fonti possono essere siti Internet remoti, mirror locali di Debian o "
-#~ "CDROM; ciascuna di esse può fornire una parte dell'archivio Debian, ed "
-#~ "APT le combinerà insieme in un set completo di pacchetti. Se avete un "
-#~ "CDROM è una buona idea indicare quello per primo, e poi i mirror, in modo "
-#~ "da avere accesso alle ultime versioni; APT userà in questo modo "
-#~ "automaticamente i pacchetti sul CDROM prima di scaricarli da Internet."
+#~ "Per abilitare il metodo APT dovete selezionare [A]ccess in "
+#~ "<command>dselect</command> e scegliere il metodo APT; vi verrà chiesto un "
+#~ "insieme di fonti (<emphasis>Sources</emphasis>), cioè di posti da cui "
+#~ "scaricare gli archivi. Tali fonti possono essere siti Internet remoti, "
+#~ "mirror locali di Debian o CDROM; ciascuna di esse può fornire una parte "
+#~ "dell'archivio Debian, ed APT le combinerà insieme in un set completo di "
+#~ "pacchetti. Se avete un CDROM è una buona idea indicare quello per primo, "
+#~ "e poi i mirror, in modo da avere accesso alle ultime versioni; APT userà "
+#~ "in questo modo automaticamente i pacchetti sul CDROM prima di scaricarli "
+#~ "da Internet."
diff --git a/doc/po/ja.po b/doc/po/ja.po
index 4185c0bfc..0a2984d96 100644
--- a/doc/po/ja.po
+++ b/doc/po/ja.po
@@ -6,13 +6,13 @@
 # KURASAWA Nozomu, 2003-2006, 2009-2012.
 msgid ""
 msgstr ""
-"Project-Id-Version: apt 0.7.25.3\n"
+"Project-Id-Version: apt 1.0.6\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-11 14:52+0200\n"
-"PO-Revision-Date: 2014-04-01 14:00+0200\n"
+"POT-Creation-Date: 2014-08-28 00:20+0000\n"
+"PO-Revision-Date: 2014-07-10 19:52+0900\n"
 "Last-Translator: KURASAWA Nozomu <nabetaro@debian.or.jp>\n"
 "Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n"
-"Language: \n"
+"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -657,81 +657,90 @@ msgstr ""
 "473041FA --> <!ENTITY synopsis-keyid \"キーID\">"
 
 #. type: Content of: <refentry><refmeta><manvolnum>
-#: apt.8.xml:25 apt-get.8.xml:28 apt-cache.8.xml:28 apt-key.8.xml:27
-#: apt-mark.8.xml:28 apt-secure.8.xml:27 apt-cdrom.8.xml:27
-#: apt-config.8.xml:28
+#: apt.8.xml:21 apt-get.8.xml:22 apt-cache.8.xml:22 apt-key.8.xml:21
+#: apt-mark.8.xml:22 apt-secure.8.xml:21 apt-cdrom.8.xml:21
+#: apt-config.8.xml:22
 msgid "8"
 msgstr "8"
 
 #. type: Content of: <refentry><refmeta><refmiscinfo>
-#: apt.8.xml:26 apt-get.8.xml:29 apt-cache.8.xml:29 apt-key.8.xml:28
-#: apt-mark.8.xml:29 apt-secure.8.xml:28 apt-cdrom.8.xml:28
-#: apt-config.8.xml:29 apt.conf.5.xml:34 apt_preferences.5.xml:28
-#: sources.list.5.xml:29 apt-extracttemplates.1.xml:29 apt-sortpkgs.1.xml:29
-#: apt-ftparchive.1.xml:29
+#: apt.8.xml:22 apt-get.8.xml:23 apt-cache.8.xml:23 apt-key.8.xml:22
+#: apt-mark.8.xml:23 apt-secure.8.xml:22 apt-cdrom.8.xml:22
+#: apt-config.8.xml:23 apt.conf.5.xml:28 apt_preferences.5.xml:22
+#: sources.list.5.xml:23 apt-extracttemplates.1.xml:23 apt-sortpkgs.1.xml:23
+#: apt-ftparchive.1.xml:23
 msgid "APT"
 msgstr "APT"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt.8.xml:32
+#: apt.8.xml:28
 msgid "command-line interface"
-msgstr ""
+msgstr "コマンドラインインターフェイス"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:37 apt-get.8.xml:40 apt-cache.8.xml:40 apt-key.8.xml:39
-#: apt-mark.8.xml:40 apt-secure.8.xml:52 apt-cdrom.8.xml:39
-#: apt-config.8.xml:40 apt.conf.5.xml:43 apt_preferences.5.xml:38
-#: sources.list.5.xml:38 apt-extracttemplates.1.xml:40 apt-sortpkgs.1.xml:40
-#: apt-ftparchive.1.xml:40
+#: apt.8.xml:33 apt-get.8.xml:34 apt-cache.8.xml:34 apt-key.8.xml:33
+#: apt-mark.8.xml:34 apt-secure.8.xml:46 apt-cdrom.8.xml:33
+#: apt-config.8.xml:34 apt.conf.5.xml:37 apt_preferences.5.xml:32
+#: sources.list.5.xml:32 apt-extracttemplates.1.xml:34 apt-sortpkgs.1.xml:34
+#: apt-ftparchive.1.xml:34
 msgid "Description"
 msgstr "説明"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:38
+#: apt.8.xml:34
 msgid ""
 "<command>apt</command> (Advanced Package Tool) is the command-line tool for "
 "handling packages. It provides a commandline interface for the package "
 "management of the system.  See also &apt-get; and &apt-cache; for more low-"
 "level command options."
 msgstr ""
+"<command>apt</command> (Advanced Package Tool、高度パッケージツール) はパッ"
+"ケージ処理用のコマンドラインツールです。システムのパッケージ管理用コマンドラ"
+"インインターフェイスを提供します。さらなる低レベルコマンドオプションについて"
+"は &apt-get; 及び &apt-cache; も参照してください。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:47
+#: apt.8.xml:43
 msgid ""
 "<literal>list</literal> is used to display a list of packages. It supports "
 "shell pattern for matching package names and the following options: "
 "<option>--installed</option>, <option>--upgradable</option>, <option>--all-"
 "versions</option> are supported."
 msgstr ""
+"パッケージ一覧を表示するには <literal>list</literal> を使います。パッケージ名"
+"のマッチングにシェルパターン、そしてオプション <option>--installed</"
+"option>、 <option>--upgradable</option>、 <option>--all-versions</option> を"
+"サポートしています。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:58
+#: apt.8.xml:54
 msgid ""
 "<literal>search</literal> searches for the given term(s) and display "
 "matching packages."
 msgstr ""
+"<literal>search</literal> では指定した語を検索して該当するパッケージを表示し"
+"ます。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:64
-#, fuzzy
-#| msgid ""
-#| "<literal>rdepends</literal> shows a listing of each reverse dependency a "
-#| "package has."
+#: apt.8.xml:60
 msgid ""
 "<literal>show</literal> shows the package information for the given "
 "package(s)."
 msgstr ""
-"<literal>rdepends</literal> は、パッケージが持つ被依存関係を一覧表示します。"
+"<literal>show</literal> では指定したパッケージについてのパッケージ情報を表示"
+"します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:71
+#: apt.8.xml:67
 msgid ""
 "<literal>install</literal> is followed by one or more package names desired "
 "for installation or upgrading."
 msgstr ""
+"<literal>install</literal> に続けてインストールやアップグレードしたいパッケー"
+"ジの名前を指定します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:75 apt-get.8.xml:118
+#: apt.8.xml:71 apt-get.8.xml:112
 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 "
@@ -748,7 +757,7 @@ msgstr ""
 "ます。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:85 apt-get.8.xml:153
+#: apt.8.xml:81 apt-get.8.xml:147
 msgid ""
 "<literal>remove</literal> is identical to <literal>install</literal> except "
 "that packages are removed instead of installed. Note that removing a package "
@@ -763,56 +772,67 @@ msgstr ""
 "トールします。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:93
+#: apt.8.xml:89
 msgid ""
 "<literal>edit-sources</literal> lets you edit your sources.list file and "
 "provides basic sanity checks."
 msgstr ""
+"<literal>edit-sources</literal> では sources.list ファイルを編集させ、基礎的"
+"な健全性確認を行います。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:99
-#, fuzzy
-#| msgid ""
-#| "<literal>showhold</literal> is used to print a list of packages on hold "
-#| "in the same way as for the other show commands."
+#: apt.8.xml:95
 msgid ""
 "<literal>update</literal> is used to resynchronize the package index files "
 "from their sources."
 msgstr ""
-"<literal>showhold</literal> は、他の show コマンドと同様に、保留されている"
-"パッケージを出力します。"
+"<literal>update</literal> を使うとパッケージ索引ファイルをそれぞれのソースと"
+"再同期します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:105
+#: apt.8.xml:101
+#, fuzzy
+#| msgid ""
+#| "<literal>upgrade</literal> is used to install the newest versions of all "
+#| "packages currently installed on the system from the sources enumerated in "
+#| "<filename>/etc/apt/sources.list</filename>. New package will be "
+#| "installed, but existing package will never removed."
 msgid ""
 "<literal>upgrade</literal> is used to install the newest versions of all "
 "packages currently installed on the system from the sources enumerated in "
-"<filename>/etc/apt/sources.list</filename>. New package will be installed, "
-"but existing package will never removed."
+"<filename>/etc/apt/sources.list</filename>. New packages will be installed, "
+"but existing packages will never be removed."
 msgstr ""
+"<literal>upgrade</literal> を使うとシステムに現在インストールされている全パッ"
+"ケージの最新版を <filename>/etc/apt/sources.list</filename> に記載されている"
+"ソースからインストールします。新しいパッケージはインストールされますが既存の"
+"パッケージが削除されることはありません。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:114
+#: apt.8.xml:110
 msgid ""
 "<literal>full-upgrade</literal> performs the function of upgrade but may "
 "also remove installed packages if that is required in order to resolve a "
 "package conflict."
 msgstr ""
+"<literal>full-upgrade</literal> はアップグレードの機能を実行しますが、パッ"
+"ケージの衝突を解決するために必要であればインストールされているパッケージの削"
+"除も行います。"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:124 apt-get.8.xml:257 apt-cache.8.xml:250 apt-mark.8.xml:110
-#: apt-config.8.xml:86 apt-extracttemplates.1.xml:54 apt-sortpkgs.1.xml:50
-#: apt-ftparchive.1.xml:506
+#: apt.8.xml:120 apt-get.8.xml:251 apt-cache.8.xml:244 apt-mark.8.xml:104
+#: apt-config.8.xml:80 apt-extracttemplates.1.xml:48 apt-sortpkgs.1.xml:44
+#: apt-ftparchive.1.xml:500
 msgid "options"
 msgstr "オプション"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:134
+#: apt.8.xml:130
 msgid "Script usage"
-msgstr ""
+msgstr "スクリプトでの利用"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:136
+#: apt.8.xml:132
 msgid ""
 "The &apt; commandline is designed as a end-user tool and it may change the "
 "output between versions. While it tries to not break backward compatibility "
@@ -820,107 +840,98 @@ msgid ""
 "&apt-cache; and &apt-get; via APT options. Please prefer using these "
 "commands in your scripts."
 msgstr ""
+"&apt; コマンドラインはエンドユーザ向けツールとして設計されており、出力はバー"
+"ジョン間で変更される可能性があります。後方互換性を損なうことのないようには努"
+"めますが、その保証はありません。&apt; の機能は全てAPTオプションを経由して "
+"&apt-cache; や &apt-get; で利用可能です。スクリプトでは各コマンドの利用を選択"
+"するようにしてください。"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:144
+#: apt.8.xml:140
 msgid "Differences to &apt-get;"
-msgstr ""
+msgstr "&apt-get; との違い"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:145
+#: apt.8.xml:141
 msgid ""
 "The <command>apt</command> command is meant to be pleasant for end users and "
 "does not need to be backward compatible like &apt-get;. Therefore some "
 "options are different:"
 msgstr ""
+"<command>apt</command> コマンドはエンドユーザにとって使いやすいように意図して"
+"作られているため &apt-get; のように後方互換性が必ずしもあるとは限りません。し"
+"たがって、一部のオプションに異なる点があります:"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml:151
-#, fuzzy
-#| msgid "the <literal>Package:</literal> line"
+#: apt.8.xml:147
 msgid "The option <literal>DPkg::Progress-Fancy</literal> is enabled."
-msgstr "<literal>Package:</literal> 行"
+msgstr ""
+"オプション <literal>DPkg::Progress-Fancy</literal> が有効になっています。"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml:155
-#, fuzzy
-#| msgid "the <literal>Component:</literal> line"
+#: apt.8.xml:151
 msgid "The option <literal>APT::Color</literal> is enabled."
-msgstr "<literal>Component:</literal> 行"
+msgstr "オプション <literal>APT::Color</literal> が有効になっています。"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml:159
+#: apt.8.xml:155
 msgid ""
 "A new <literal>list</literal> command is available similar to <literal>dpkg "
 "--list</literal>."
 msgstr ""
+"新しい <literal>list</literal> コマンドは <literal>dpkg --list</literal> と同"
+"じように利用できます。"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml:164
-#, fuzzy
-#| msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
+#: apt.8.xml:160
 msgid ""
 "The option <literal>upgrade</literal> has <literal>--with-new-pkgs</literal> "
 "enabled by default."
-msgstr "<literal>Archive:</literal> 行や <literal>Suite:</literal> 行"
+msgstr ""
+"オプション <literal>upgrade</literal> では <literal>--with-new-pkgs</"
+"literal> がデフォルトで有効になっています。"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:174 apt-get.8.xml:558 apt-cache.8.xml:352 apt-key.8.xml:197
-#: apt-mark.8.xml:133 apt-secure.8.xml:193 apt-cdrom.8.xml:154
-#: apt-config.8.xml:111 apt.conf.5.xml:1227 apt_preferences.5.xml:707
-#: sources.list.5.xml:280 apt-extracttemplates.1.xml:72 apt-sortpkgs.1.xml:65
-#: apt-ftparchive.1.xml:609
+#: apt.8.xml:170 apt-get.8.xml:552 apt-cache.8.xml:346 apt-key.8.xml:191
+#: apt-mark.8.xml:127 apt-secure.8.xml:187 apt-cdrom.8.xml:148
+#: apt-config.8.xml:105 apt.conf.5.xml:1222 apt_preferences.5.xml:701
+#: sources.list.5.xml:274 apt-extracttemplates.1.xml:66 apt-sortpkgs.1.xml:59
+#: apt-ftparchive.1.xml:603
 msgid "See Also"
 msgstr "関連項目"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:175
-#, fuzzy
-#| msgid ""
-#| "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
-#| "&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-"
-#| "preferences;, the APT Howto."
+#: apt.8.xml:171
 msgid ""
 "&apt-get;, &apt-cache;, &sources-list;, &apt-conf;, &apt-config;, The APT "
 "User's guide in &guidesdir;, &apt-preferences;, the APT Howto."
 msgstr ""
-"&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
-"&apt-config;, &apt-secure;, &guidesdir; にある APT ユーザガイド, &apt-"
-"preferences;, APT Howto"
+"&apt-get;、 &apt-cache;、 &sources-list;、 &apt-conf;、 &apt-config;、 "
+"&guidesdir; にあるAPTユーザガイド、 &apt-preferences;、 APT Howto."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:180 apt-get.8.xml:564 apt-cache.8.xml:357 apt-mark.8.xml:137
-#: apt-cdrom.8.xml:159 apt-config.8.xml:116 apt-extracttemplates.1.xml:76
-#: apt-sortpkgs.1.xml:69 apt-ftparchive.1.xml:613
+#: apt.8.xml:176 apt-get.8.xml:558 apt-cache.8.xml:351 apt-mark.8.xml:131
+#: apt-cdrom.8.xml:153 apt-config.8.xml:110 apt-extracttemplates.1.xml:70
+#: apt-sortpkgs.1.xml:63 apt-ftparchive.1.xml:607
 msgid "Diagnostics"
 msgstr "診断メッセージ"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:181
-#, fuzzy
-#| msgid ""
-#| "<command>apt-get</command> returns zero on normal operation, decimal 100 "
-#| "on error."
+#: apt.8.xml:177
 msgid ""
 "<command>apt</command> returns zero on normal operation, decimal 100 on "
 "error."
 msgstr ""
-"<command>apt-get</command> は正常終了時に 0 を返します。エラー時には十進の "
-"100 を返します。"
+"<command>apt</command> は正常終了時に 0 を返します。エラー時には十進の 100 を"
+"返します。"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-get.8.xml:35
+#: apt-get.8.xml:29
 msgid "APT package handling utility -- command-line interface"
 msgstr "APT パッケージ操作ユーティリティ -- コマンドラインインターフェース"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:41
-#, fuzzy
-#| 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; and &wajig;."
+#: apt-get.8.xml:35
 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 "
@@ -929,12 +940,12 @@ msgid ""
 msgstr ""
 "<command>apt-get</command> は、パッケージを操作するコマンドラインツールで、"
 "APT ライブラリを用いる他のツールのユーザ側「バックエンド」といえるものです。"
-"「フロントエンド」インターフェースには、&dselect;, &aptitude;, &synaptic;, "
-"&wajig; などがあります。"
+"「フロントエンド」インターフェースには、&aptitude;, &synaptic;, &wajig; など"
+"があります。"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:46 apt-cache.8.xml:46 apt-cdrom.8.xml:53 apt-config.8.xml:46
-#: apt-ftparchive.1.xml:56
+#: apt-get.8.xml:40 apt-cache.8.xml:40 apt-cdrom.8.xml:47 apt-config.8.xml:40
+#: apt-ftparchive.1.xml:50
 msgid ""
 "Unless the <option>-h</option>, or <option>--help</option> option is given, "
 "one of the commands below must be present."
@@ -943,7 +954,7 @@ msgstr ""
 "下に挙げるコマンドが必要です。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:51
+#: apt-get.8.xml:45
 msgid ""
 "<literal>update</literal> is used to resynchronize the package index files "
 "from their sources. The indexes of available packages are fetched from the "
@@ -965,7 +976,7 @@ msgstr ""
 "のサイズを知ることができないため、全体の進捗メータは正しく表示されません。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:63
+#: apt-get.8.xml:57
 msgid ""
 "<literal>upgrade</literal> is used to install the newest versions of all "
 "packages currently installed on the system from the sources enumerated in "
@@ -989,7 +1000,7 @@ msgstr ""
 "ケージの新しいバージョンがあることを知らせる必要があります。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:76
+#: apt-get.8.xml:70
 msgid ""
 "<literal>dist-upgrade</literal> in addition to performing the function of "
 "<literal>upgrade</literal>, also intelligently handles changing dependencies "
@@ -1013,7 +1024,7 @@ msgstr ""
 "さい。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:89
+#: apt-get.8.xml:83
 msgid ""
 "<literal>dselect-upgrade</literal> is used in conjunction with the "
 "traditional Debian packaging front-end, &dselect;. <literal>dselect-upgrade</"
@@ -1030,7 +1041,7 @@ msgstr ""
 "ど)"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:100
+#: apt-get.8.xml:94
 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 "
@@ -1058,7 +1069,7 @@ msgstr ""
 "断を上書きするのに利用される可能性があります。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:125
+#: apt-get.8.xml:119
 msgid ""
 "Both of the version selection mechanisms can downgrade packages and must be "
 "used with care."
@@ -1067,7 +1078,7 @@ msgstr ""
 "なりません。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:128
+#: apt-get.8.xml:122
 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 system. "
@@ -1086,7 +1097,7 @@ msgstr ""
 "あるパッケージ) をダウンロード・インストールします。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:139
+#: apt-get.8.xml:133
 msgid ""
 "Finally, the &apt-preferences; mechanism allows you to create an alternative "
 "installation policy for individual packages."
@@ -1095,7 +1106,7 @@ msgstr ""
 "リシーを作成できます。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:143
+#: apt-get.8.xml:137
 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 "
@@ -1112,7 +1123,7 @@ msgstr ""
 "ば、'^' や '$' を付けるか、もっと詳しい正規表現を指定してください。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:161
+#: apt-get.8.xml:155
 msgid ""
 "<literal>purge</literal> is identical to <literal>remove</literal> except "
 "that packages are removed and purged (any configuration files are deleted "
@@ -1122,7 +1133,7 @@ msgstr ""
 "<literal>purge</literal> は <literal>remove</literal> と同じです。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:166
+#: apt-get.8.xml:160
 msgid ""
 "<literal>source</literal> causes <command>apt-get</command> to fetch source "
 "packages. APT will examine the available packages to decide which source "
@@ -1141,7 +1152,7 @@ msgstr ""
 "literal> 構文で指定します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:174
+#: apt-get.8.xml:168
 msgid ""
 "Source packages are tracked separately from binary packages via <literal>deb-"
 "src</literal> lines in the &sources-list; file. This means that you will "
@@ -1155,7 +1166,7 @@ msgstr ""
 "すぎ・新しすぎな) ソースバージョンを取得したり、何も取得できなくなります。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:180
+#: apt-get.8.xml:174
 msgid ""
 "If the <option>--compile</option> option is specified then the package will "
 "be compiled to a binary .deb using <command>dpkg-buildpackage</command> for "
@@ -1170,7 +1181,7 @@ msgstr ""
 "ん。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:187
+#: apt-get.8.xml:181
 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 "
@@ -1184,7 +1195,7 @@ msgstr ""
 "バージョンに厳密に一致させています。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:193
+#: apt-get.8.xml:187
 msgid ""
 "Note that source packages are not installed and tracked in the "
 "<command>dpkg</command> database like binary packages; they are simply "
@@ -1195,7 +1206,7 @@ msgstr ""
 "ソースの tarball のように、単にカレントディレクトリにダウンロードします。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:199
+#: apt-get.8.xml:193
 msgid ""
 "<literal>build-dep</literal> causes apt-get to install/remove packages in an "
 "attempt to satisfy the build dependencies for a source package. By default "
@@ -1210,7 +1221,7 @@ msgstr ""
 "す。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:206
+#: apt-get.8.xml:200
 msgid ""
 "<literal>check</literal> is a diagnostic tool; it updates the package cache "
 "and checks for broken dependencies."
@@ -1219,7 +1230,7 @@ msgstr ""
 "チェックする診断ツールです。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:211
+#: apt-get.8.xml:205
 msgid ""
 "<literal>download</literal> will download the given binary package into the "
 "current directory."
@@ -1228,16 +1239,7 @@ msgstr ""
 "トリにダウンロードします。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:217
-#, fuzzy
-#| msgid ""
-#| "<literal>clean</literal> clears out the local repository of retrieved "
-#| "package files. It removes everything but the lock file from "
-#| "<filename>&cachedir;/archives/</filename> and <filename>&cachedir;/"
-#| "archives/partial/</filename>. When APT is used as a &dselect; method, "
-#| "<literal>clean</literal> is run automatically.  Those who do not use "
-#| "dselect will likely want to run <literal>apt-get clean</literal> from "
-#| "time to time to free up disk space."
+#: apt-get.8.xml:211
 msgid ""
 "<literal>clean</literal> clears out the local repository of retrieved "
 "package files. It removes everything but the lock file from "
@@ -1246,13 +1248,10 @@ msgid ""
 msgstr ""
 "<literal>clean</literal> は、取得したパッケージのローカルリポジトリを掃除しま"
 "す。<filename>&cachedir;/archives/</filename> と <filename>&cachedir;/"
-"archives/partial/</filename> からロックファイル以外すべて削除します。APT が "
-"&dselect; から呼ばれるときには、自動的に <literal>clean</literal> が実行され"
-"ます。dselectを使用しない場合は、ディスクスペースを解放するため、時々 "
-"<literal>apt-get clean</literal> を実行したくなるでしょう。"
+"archives/partial/</filename> からロックファイル以外すべて削除します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:224
+#: apt-get.8.xml:218
 msgid ""
 "Like <literal>clean</literal>, <literal>autoclean</literal> clears out the "
 "local repository of retrieved package files. The difference is that it only "
@@ -1271,7 +1270,7 @@ msgstr ""
 "防げます。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:234
+#: apt-get.8.xml:228
 msgid ""
 "<literal>autoremove</literal> is used to remove packages that were "
 "automatically installed to satisfy dependencies for other packages and are "
@@ -1281,7 +1280,7 @@ msgstr ""
 "的にインストールされ、もう必要なくなったパッケージを削除するのに使用します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:239
+#: apt-get.8.xml:233
 msgid ""
 "<literal>changelog</literal> downloads a package changelog and displays it "
 "through <command>sensible-pager</command>. The server name and base "
@@ -1303,7 +1302,7 @@ msgstr ""
 "option> コマンドと同じオプションを使用できます。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:262
+#: apt-get.8.xml:256
 msgid ""
 "Do not consider recommended packages as a dependency for installing.  "
 "Configuration Item: <literal>APT::Install-Recommends</literal>."
@@ -1312,7 +1311,7 @@ msgstr ""
 "<literal>APT::Install-Recommends</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:267
+#: apt-get.8.xml:261
 msgid ""
 "Consider suggested packages as a dependency for installing.  Configuration "
 "Item: <literal>APT::Install-Suggests</literal>."
@@ -1321,7 +1320,7 @@ msgstr ""
 "<literal>APT::Install-Suggests</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:272
+#: apt-get.8.xml:266
 msgid ""
 "Download only; package files are only retrieved, not unpacked or installed.  "
 "Configuration Item: <literal>APT::Get::Download-Only</literal>."
@@ -1330,20 +1329,7 @@ msgstr ""
 "いません。設定項目: <literal>APT::Get::Download-Only</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:277
-#, fuzzy
-#| msgid ""
-#| "Fix; attempt to correct a system with broken dependencies in place. This "
-#| "option, when used with install/remove, can omit any packages to permit "
-#| "APT to deduce a likely solution. If packages are specified, these have to "
-#| "completely correct the problem. The option is sometimes necessary when "
-#| "running APT for the first time; APT itself does not allow broken package "
-#| "dependencies to exist on a system. It is possible that a system's "
-#| "dependency structure can be so corrupt as to require manual intervention "
-#| "(which usually means using &dselect; or <command>dpkg --remove</command> "
-#| "to eliminate some of the offending packages). Use of this option together "
-#| "with <option>-m</option> may produce an error in some situations.  "
-#| "Configuration Item: <literal>APT::Get::Fix-Broken</literal>."
+#: apt-get.8.xml:271
 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 "
@@ -1363,13 +1349,13 @@ msgstr ""
 "体は、システムに存在する破損したパッケージ依存関係を許すことができないので、"
 "初めて APT を実行する場合、このオプションが必要になることがあります。システム"
 "の依存関係構造にかなり問題がある場合は、手動で修正するよう要求することもあり"
-"ます。(通常は、問題のあるパッケージを取り除くのに &dselect; や <command>dpkg "
-"--remove</command> を使用します) このオプションを <option>-m</option> オプ"
-"ションと同時に使用すると、エラーになる状況があるかもしれません。設定項目: "
-"<literal>APT::Get::Fix-Broken</literal>"
+"ます。(通常は、問題のあるパッケージを取り除くのに <command>dpkg --remove</"
+"command> を使用します) このオプションを <option>-m</option> オプションと同時"
+"に使用すると、エラーになる状況があるかもしれません。設定項目: <literal>APT::"
+"Get::Fix-Broken</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:292
+#: apt-get.8.xml:286
 msgid ""
 "Ignore missing packages; if packages cannot be retrieved or fail the "
 "integrity check after retrieval (corrupted package files), hold back those "
@@ -1388,7 +1374,7 @@ msgstr ""
 "Get::Fix-Missing</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:303
+#: apt-get.8.xml:297
 msgid ""
 "Disables downloading of packages. This is best used with <option>--ignore-"
 "missing</option> to force APT to use only the .debs it has already "
@@ -1399,7 +1385,7 @@ msgstr ""
 "がよいでしょう。設定項目: <literal>APT::Get::Download</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:310
+#: apt-get.8.xml:304
 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 "
@@ -1418,7 +1404,7 @@ msgstr ""
 "literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:325
+#: apt-get.8.xml:319
 msgid ""
 "No action; perform a simulation of events that would occur but do not "
 "actually change the system.  Configuration Item: <literal>APT::Get::"
@@ -1428,7 +1414,7 @@ msgstr ""
 "行いません。設定項目: <literal>APT::Get::Simulate</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:329
+#: apt-get.8.xml:323
 msgid ""
 "Simulated runs performed as a user will automatically deactivate locking "
 "(<literal>Debug::NoLocking</literal>), and if the option <literal>APT::Get::"
@@ -1446,7 +1432,7 @@ msgstr ""
 "による警告などなくても、何をしているのか知っていなければなりません)。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:337
+#: apt-get.8.xml:331
 msgid ""
 "Simulated runs print out a series of lines, each representing a "
 "<command>dpkg</command> operation: configure (<literal>Conf</literal>), "
@@ -1460,7 +1446,7 @@ msgstr ""
 "れに) 空の角カッコは大した問題ではないことを表します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:345
+#: apt-get.8.xml:339
 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 "
@@ -1474,7 +1460,7 @@ msgstr ""
 "定項目: <literal>APT::Get::Assume-Yes</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:353
+#: apt-get.8.xml:347
 msgid ""
 "Automatic \"no\" to all prompts.  Configuration Item: <literal>APT::Get::"
 "Assume-No</literal>."
@@ -1483,7 +1469,7 @@ msgstr ""
 "Assume-No</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:358
+#: apt-get.8.xml:352
 msgid ""
 "Show upgraded packages; print out a list of all packages that are to be "
 "upgraded.  Configuration Item: <literal>APT::Get::Show-Upgraded</literal>."
@@ -1492,7 +1478,7 @@ msgstr ""
 "<literal>APT::Get::Show-Upgraded</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:364
+#: apt-get.8.xml:358
 msgid ""
 "Show full versions for upgraded and installed packages.  Configuration Item: "
 "<literal>APT::Get::Show-Versions</literal>."
@@ -1501,15 +1487,7 @@ msgstr ""
 "<literal>APT::Get::Show-Versions</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:370
-#, fuzzy
-#| msgid ""
-#| "This option controls the architecture packages are built for by "
-#| "<command>apt-get source --compile</command> and how cross-"
-#| "builddependencies are satisfied. By default is it not set which means "
-#| "that the host architecture is the same as the build architecture (which "
-#| "is defined by <literal>APT::Architecture</literal>).  Configuration Item: "
-#| "<literal>APT::Get::Host-Architecture</literal>"
+#: apt-get.8.xml:364
 msgid ""
 "This option controls the architecture packages are built for by <command>apt-"
 "get source --compile</command> and how cross-builddependencies are "
@@ -1522,18 +1500,10 @@ msgstr ""
 "ケージのアーキテクチャや、どのようにクロス依存関係を解決するかを制御します。"
 "デフォルトでは未定義で、これはホストアーキテクチャは、(<literal>APT::"
 "Architecture</literal> で定義した) ビルドアーキテクチャと同じという意味になり"
-"ます。設定項目: <literal>APT::Get::Host-Architecture</literal>"
+"ます。設定項目: <literal>APT::Get::Host-Architecture</literal>。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:380
-#, fuzzy
-#| msgid ""
-#| "This option controls the architecture packages are built for by "
-#| "<command>apt-get source --compile</command> and how cross-"
-#| "builddependencies are satisfied. By default is it not set which means "
-#| "that the host architecture is the same as the build architecture (which "
-#| "is defined by <literal>APT::Architecture</literal>).  Configuration Item: "
-#| "<literal>APT::Get::Host-Architecture</literal>"
+#: apt-get.8.xml:374
 msgid ""
 "This option controls the activated build profiles for which a source package "
 "is built by <command>apt-get source --compile</command> and how build "
@@ -1541,14 +1511,14 @@ msgid ""
 "than one build profile can be activated at a time by concatenating them with "
 "a comma.  Configuration Item: <literal>APT::Build-Profiles</literal>."
 msgstr ""
-"このオプションは、<command>apt-get source --compile</command> で構築するパッ"
-"ケージのアーキテクチャや、どのようにクロス依存関係を解決するかを制御します。"
-"デフォルトでは未定義で、これはホストアーキテクチャは、(<literal>APT::"
-"Architecture</literal> で定義した) ビルドアーキテクチャと同じという意味になり"
-"ます。設定項目: <literal>APT::Get::Host-Architecture</literal>"
+"このオプションは、<command>apt-get source --compile</command> でパッケージを"
+"ビルドする際に有効化するビルドプロファイルや、どのようにクロス依存関係を解決"
+"するかを制御します。デフォルトでは有効化するビルドプロファイルはありません。"
+"コンマで連結することで複数のビルドプロファイルを有効化できます。設定項目: "
+"<literal>APT::Get::Host-Architecture</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:391
+#: apt-get.8.xml:385
 msgid ""
 "Compile source packages after downloading them.  Configuration Item: "
 "<literal>APT::Get::Compile</literal>."
@@ -1557,7 +1527,7 @@ msgstr ""
 "Get::Compile</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:396
+#: apt-get.8.xml:390
 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 "
@@ -1570,7 +1540,7 @@ msgstr ""
 "literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:403
+#: apt-get.8.xml:397
 msgid ""
 "Allow installing new packages when used in conjunction with "
 "<literal>upgrade</literal>.  This is useful if the update of a installed "
@@ -1580,9 +1550,16 @@ msgid ""
 "will never remove packages, only allow adding new ones.  Configuration Item: "
 "<literal>APT::Get::Upgrade-Allow-New</literal>."
 msgstr ""
+"<literal>upgrade</literal> と併せて使った場合に新しいパッケージのインストール"
+"を許可します。これは新しい依存をインストールするために既にインストールされて"
+"いるパッケージを更新する必要がある場合に有用です。パッケージを保留する代わり"
+"に <literal>upgrade</literal> がパッケージをアップグレードして新しい依存をイ"
+"ンストールします。このオプションと併せて使った場合、<literal>upgrade</"
+"literal> がパッケージを削除することはなく、新規追加を許可するだけであることに"
+"注意してください。設定項目: <literal>APT::Get::Upgrade-Allow-New</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:415
+#: apt-get.8.xml:409
 msgid ""
 "Do not upgrade packages; when used in conjunction with <literal>install</"
 "literal>, <literal>no-upgrade</literal> will prevent packages on the command "
@@ -1595,7 +1572,7 @@ msgstr ""
 "Upgrade</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:422
+#: apt-get.8.xml:416
 msgid ""
 "Do not install new packages; when used in conjunction with <literal>install</"
 "literal>, <literal>only-upgrade</literal> will install upgrades for already "
@@ -1608,7 +1585,7 @@ msgstr ""
 "定項目: <literal>APT::Get::Only-Upgrade</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:430
+#: apt-get.8.xml:424
 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 "
@@ -1622,7 +1599,7 @@ msgstr ""
 "ん! 設定項目: <literal>APT::Get::force-yes</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:438
+#: apt-get.8.xml:432
 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 "
@@ -1643,7 +1620,7 @@ msgstr ""
 "Print-URIs</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:449
+#: apt-get.8.xml:443
 msgid ""
 "Use purge instead of remove for anything that would be removed.  An asterisk "
 "(\"*\") will be displayed next to packages which are scheduled to be purged. "
@@ -1656,7 +1633,7 @@ msgstr ""
 "<literal>APT::Get::Purge</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:457
+#: apt-get.8.xml:451
 msgid ""
 "Re-install packages that are already installed and at the newest version.  "
 "Configuration Item: <literal>APT::Get::ReInstall</literal>."
@@ -1665,7 +1642,7 @@ msgstr ""
 "定項目: <literal>APT::Get::ReInstall</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:462
+#: apt-get.8.xml:456
 msgid ""
 "This option is on by default; use <literal>--no-list-cleanup</literal> to "
 "turn it off. When it is on, <command>apt-get</command> will automatically "
@@ -1681,7 +1658,7 @@ msgstr ""
 "する時ぐらいでしょう。設定項目: <literal>APT::Get::List-Cleanup</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:472
+#: apt-get.8.xml:466
 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 "
@@ -1704,7 +1681,7 @@ msgstr ""
 "さい。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:487
+#: apt-get.8.xml:481
 msgid ""
 "Only perform operations that are 'trivial'. Logically this can be considered "
 "related to <option>--assume-yes</option>; where <option>--assume-yes</"
@@ -1717,7 +1694,7 @@ msgstr ""
 "目: <literal>APT::Get::Trivial-Only</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:494
+#: apt-get.8.xml:488
 msgid ""
 "If any packages are to be removed apt-get immediately aborts without "
 "prompting.  Configuration Item: <literal>APT::Get::Remove</literal>."
@@ -1726,7 +1703,7 @@ msgstr ""
 "項目: <literal>APT::Get::Remove</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:500
+#: apt-get.8.xml:494
 msgid ""
 "If the command is either <literal>install</literal> or <literal>remove</"
 "literal>, then this option acts like running the <literal>autoremove</"
@@ -1739,7 +1716,7 @@ msgstr ""
 "<literal>APT::Get::AutomaticRemove</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:507
+#: apt-get.8.xml:501
 msgid ""
 "Only has meaning for the <literal>source</literal> and <literal>build-dep</"
 "literal> commands.  Indicates that the given source names are not to be "
@@ -1757,7 +1734,7 @@ msgstr ""
 "literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:518
+#: apt-get.8.xml:512
 msgid ""
 "Download only the diff, dsc, or tar file of a source archive.  Configuration "
 "Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</"
@@ -1768,7 +1745,7 @@ msgstr ""
 "<literal>APT::Get::Dsc-Only</literal>, <literal>APT::Get::Tar-Only</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:524
+#: apt-get.8.xml:518
 msgid ""
 "Only process architecture-dependent build-dependencies.  Configuration Item: "
 "<literal>APT::Get::Arch-Only</literal>."
@@ -1777,7 +1754,7 @@ msgstr ""
 "<literal>APT::Get::Arch-Only</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:529
+#: apt-get.8.xml:523
 msgid ""
 "Ignore if packages can't be authenticated and don't prompt about it.  This "
 "is useful for tools like pbuilder.  Configuration Item: <literal>APT::Get::"
@@ -1788,7 +1765,7 @@ msgstr ""
 "literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:535
+#: apt-get.8.xml:529
 msgid ""
 "Show user friendly progress information in the terminal window when packages "
 "are installed, upgraded or removed. For a machine parsable version of this "
@@ -1796,31 +1773,31 @@ msgid ""
 "Item: <literal>Dpkg::Progress</literal> and <literal>Dpkg::Progress-Fancy</"
 "literal>."
 msgstr ""
+"パッケージのインストール、アップグレード、削除時にユーザにとってわかりやすい"
+"形で進捗情報をターミナルウィンドウ内に表示します。このデータの機械的に解析で"
+"きるバージョンについては apt の doc ディレクトリにある README.progress-"
+"reporting を見てください。設定項目: <literal>Dpkg::Progress</literal>、 "
+"<literal>Dpkg::Progress-Fancy</literal>"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:548 apt-cache.8.xml:345 apt-key.8.xml:176 apt-mark.8.xml:127
-#: apt.conf.5.xml:1221 apt_preferences.5.xml:700
+#: apt-get.8.xml:542 apt-cache.8.xml:339 apt-key.8.xml:170 apt-mark.8.xml:121
+#: apt.conf.5.xml:1216 apt_preferences.5.xml:694
 msgid "Files"
 msgstr "ファイル"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:559
-#, fuzzy
-#| msgid ""
-#| "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
-#| "&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-"
-#| "preferences;, the APT Howto."
+#: apt-get.8.xml:553
 msgid ""
 "&apt-cache;, &apt-cdrom;, &dpkg;, &sources-list;, &apt-conf;, &apt-config;, "
 "&apt-secure;, The APT User's guide in &guidesdir;, &apt-preferences;, the "
 "APT Howto."
 msgstr ""
-"&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
-"&apt-config;, &apt-secure;, &guidesdir; にある APT ユーザガイド, &apt-"
-"preferences;, APT Howto"
+"&apt-cache;, &apt-cdrom;, &dpkg;, &sources-list;, &apt-conf;, &apt-config;, "
+"&apt-secure;, &guidesdir; にある APT ユーザガイド, &apt-preferences;, APT "
+"Howto"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:565
+#: apt-get.8.xml:559
 msgid ""
 "<command>apt-get</command> returns zero on normal operation, decimal 100 on "
 "error."
@@ -1829,12 +1806,12 @@ msgstr ""
 "100 を返します。"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-cache.8.xml:35
+#: apt-cache.8.xml:29
 msgid "query the APT cache"
 msgstr "APT キャッシュへの問い合わせ"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:41
+#: apt-cache.8.xml:35
 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 "
@@ -1847,7 +1824,7 @@ msgstr ""
 "操作を提供します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:51
+#: apt-cache.8.xml:45
 msgid ""
 "<literal>gencaches</literal> creates APT's package cache. This is done "
 "implicitly by all commands needing this cache if it is missing or outdated."
@@ -1857,14 +1834,14 @@ msgstr ""
 "べてのコマンドによって、暗黙で実行されます。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
-#: apt-cache.8.xml:55 apt-cache.8.xml:144 apt-cache.8.xml:165
-#: apt-cache.8.xml:187 apt-cache.8.xml:192 apt-cache.8.xml:208
-#: apt-cache.8.xml:226 apt-cache.8.xml:238
+#: apt-cache.8.xml:49 apt-cache.8.xml:138 apt-cache.8.xml:159
+#: apt-cache.8.xml:181 apt-cache.8.xml:186 apt-cache.8.xml:202
+#: apt-cache.8.xml:220 apt-cache.8.xml:232
 msgid "&synopsis-pkg;"
 msgstr "&synopsis-pkg;"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:56
+#: apt-cache.8.xml:50
 msgid ""
 "<literal>showpkg</literal> displays information about the packages listed on "
 "the command line. Remaining arguments are package names. The available "
@@ -1886,7 +1863,7 @@ msgstr ""
 "libreadline2</command> の出力を掲げます。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
-#: apt-cache.8.xml:68
+#: apt-cache.8.xml:62
 #, no-wrap
 msgid ""
 "Package: libreadline2\n"
@@ -1912,7 +1889,7 @@ msgstr ""
 "Reverse Provides: \n"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:80
+#: apt-cache.8.xml:74
 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, "
@@ -1931,7 +1908,7 @@ msgstr ""
 "apt のソースコードを調べるのが最良でしょう。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:89
+#: apt-cache.8.xml:83
 msgid ""
 "<literal>stats</literal> displays some statistics about the cache.  No "
 "further arguments are expected. Statistics reported are:"
@@ -1940,7 +1917,7 @@ msgstr ""
 "上、引数は必要ありません。以下の統計情報を表示します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:92
+#: apt-cache.8.xml:86
 msgid ""
 "<literal>Total package names</literal> is the number of package names found "
 "in the cache."
@@ -1949,7 +1926,7 @@ msgstr ""
 "ます。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:96
+#: apt-cache.8.xml:90
 msgid ""
 "<literal>Normal packages</literal> is the number of regular, ordinary "
 "package names; these are packages that bear a one-to-one correspondence "
@@ -1961,7 +1938,7 @@ msgstr ""
 "ケージです。大多数のパッケージはこのカテゴリに入ります。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:102
+#: apt-cache.8.xml:96
 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 "
@@ -1978,7 +1955,7 @@ msgstr ""
 "ケージはありません。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:110
+#: apt-cache.8.xml:104
 msgid ""
 "<literal>Single virtual packages</literal> is the number of packages with "
 "only one package providing a particular virtual package. For example, in the "
@@ -1991,7 +1968,7 @@ msgstr ""
 "ジは、xless パッケージのみということです。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:116
+#: apt-cache.8.xml:110
 msgid ""
 "<literal>Mixed virtual packages</literal> is the number of packages that "
 "either provide a particular virtual package or have the virtual package name "
@@ -2004,7 +1981,7 @@ msgstr ""
 "もありますが、debconf-tiny によって提供もされています。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:123
+#: apt-cache.8.xml:117
 msgid ""
 "<literal>Missing</literal> is the number of package names that were "
 "referenced in a dependency but were not provided by any package. Missing "
@@ -2019,7 +1996,7 @@ msgstr ""
 "のようになります。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:130
+#: apt-cache.8.xml:124
 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 "
@@ -2033,7 +2010,7 @@ msgstr ""
 "スする場合、この値はパッケージ名総数よりもかなり大きい数になります。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:137
+#: apt-cache.8.xml:131
 msgid ""
 "<literal>Total dependencies</literal> is the number of dependency "
 "relationships claimed by all of the packages in the cache."
@@ -2042,7 +2019,7 @@ msgstr ""
 "れた依存関係の数です。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:145
+#: apt-cache.8.xml:139
 msgid ""
 "<literal>showsrc</literal> displays all the source package records that "
 "match the given package names. All versions are shown, as well as all "
@@ -2053,7 +2030,7 @@ msgstr ""
 "ともに、すべてのバージョンについて表示します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:151
+#: apt-cache.8.xml:145
 msgid ""
 "<literal>dump</literal> shows a short listing of every package in the cache. "
 "It is primarily for debugging."
@@ -2062,7 +2039,7 @@ msgstr ""
 "覧を表示します。主にデバッグ用です。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:156
+#: apt-cache.8.xml:150
 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."
@@ -2071,7 +2048,7 @@ msgstr ""
 "す。 &dpkg; と共に使用すると便利ですし、&dselect; でも使用されます。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:161
+#: apt-cache.8.xml:155
 msgid ""
 "<literal>unmet</literal> displays a summary of all unmet dependencies in the "
 "package cache."
@@ -2080,7 +2057,7 @@ msgstr ""
 "概要を表示します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:166
+#: apt-cache.8.xml:160
 msgid ""
 "<literal>show</literal> performs a function similar to <command>dpkg --print-"
 "avail</command>; it displays the package records for the named packages."
@@ -2089,12 +2066,12 @@ msgstr ""
 "能を実行します。これは、指定したパッケージのパッケージレコードの表示です。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
-#: apt-cache.8.xml:171
+#: apt-cache.8.xml:165
 msgid "&synopsis-regex;"
 msgstr "&synopsis-regex;"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:172
+#: apt-cache.8.xml:166
 msgid ""
 "<literal>search</literal> performs a full text search on all available "
 "package lists for the POSIX regex pattern given, see &regex;.  It searches "
@@ -2114,14 +2091,14 @@ msgstr ""
 "ケージ名に対してのみ対象とします。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:183
+#: apt-cache.8.xml:177
 msgid ""
 "Separate arguments can be used to specify multiple search patterns that are "
 "and'ed together."
 msgstr "空白で区切った引数で、複数の検索パターンの and をとることができます。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:188
+#: apt-cache.8.xml:182
 msgid ""
 "<literal>depends</literal> shows a listing of each dependency a package has "
 "and all the possible other packages that can fulfill that dependency."
@@ -2130,7 +2107,7 @@ msgstr ""
 "を満たす他のパッケージの一覧を表示します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:193
+#: apt-cache.8.xml:187
 msgid ""
 "<literal>rdepends</literal> shows a listing of each reverse dependency a "
 "package has."
@@ -2138,12 +2115,12 @@ msgstr ""
 "<literal>rdepends</literal> は、パッケージが持つ被依存関係を一覧表示します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:197
+#: apt-cache.8.xml:191
 msgid "<optional><replaceable>&synopsis-prefix;</replaceable></optional>"
 msgstr "<optional><replaceable>&synopsis-prefix;</replaceable></optional>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:198
+#: apt-cache.8.xml:192
 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 "
@@ -2157,7 +2134,7 @@ msgstr ""
 "generate</option> オプションと共に使用すると非常に便利です。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:203
+#: apt-cache.8.xml:197
 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 "
@@ -2168,7 +2145,7 @@ msgstr ""
 "た一覧にあります。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:209
+#: apt-cache.8.xml:203
 msgid ""
 "<literal>dotty</literal> takes a list of packages on the command line and "
 "generates output suitable for use by dotty from the <ulink url=\"http://www."
@@ -2188,7 +2165,7 @@ msgstr ""
 "GivenOnly</literal> をセットしてください。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:218
+#: apt-cache.8.xml:212
 msgid ""
 "The resulting nodes will have several shapes; normal packages are boxes, "
 "pure virtual packages are triangles, mixed virtual packages are diamonds, "
@@ -2201,12 +2178,12 @@ msgstr ""
 "表します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:223
+#: apt-cache.8.xml:217
 msgid "Caution, dotty cannot graph larger sets of packages."
 msgstr "注意) dotty は、パッケージのより大きなセットのグラフは描けません。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:227
+#: apt-cache.8.xml:221
 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 tool</ulink>."
@@ -2215,12 +2192,12 @@ msgstr ""
 "users/sander/html/gsvcg1.html\">VCG tool</ulink> の xvcg 専用です。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:231
+#: apt-cache.8.xml:225
 msgid "<optional><replaceable>&synopsis-pkg;</replaceable>…</optional>"
 msgstr "<optional><replaceable>&synopsis-pkg;</replaceable>…</optional>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:232
+#: apt-cache.8.xml:226
 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 "
@@ -2232,7 +2209,7 @@ msgstr ""
 "す。一方、パッケージ名を指定した場合、優先順の詳細情報を表示します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:239
+#: apt-cache.8.xml:233
 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 "
@@ -2250,7 +2227,7 @@ msgstr ""
 "表示するだけです。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:255
+#: apt-cache.8.xml:249
 msgid ""
 "Select the file to store the package cache. The package cache is the primary "
 "cache used by all operations.  Configuration Item: <literal>Dir::Cache::"
@@ -2261,7 +2238,7 @@ msgstr ""
 "pkgcache</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:261
+#: apt-cache.8.xml:255
 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 "
@@ -2276,7 +2253,7 @@ msgstr ""
 "<literal>Dir::Cache::srcpkgcache</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:269
+#: apt-cache.8.xml:263
 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 "
@@ -2289,7 +2266,7 @@ msgstr ""
 "<literal>quiet</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:276
+#: apt-cache.8.xml:270
 msgid ""
 "Print only important dependencies; for use with <literal>unmet</literal> and "
 "<literal>depends</literal>. Causes only Depends and Pre-Depends relations to "
@@ -2300,7 +2277,7 @@ msgstr ""
 "目: <literal>APT::Cache::Important</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:290
+#: apt-cache.8.xml:284
 msgid ""
 "Per default the <literal>depends</literal> and <literal>rdepends</literal> "
 "print all dependencies. This can be tweaked with these flags which will omit "
@@ -2314,7 +2291,7 @@ msgstr ""
 "replaceable></literal> 例: <literal>APT::Cache::ShowRecommends</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:297
+#: apt-cache.8.xml:291
 msgid ""
 "Print full package records when searching.  Configuration Item: "
 "<literal>APT::Cache::ShowFull</literal>."
@@ -2323,7 +2300,7 @@ msgstr ""
 "ShowFull</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:302
+#: apt-cache.8.xml:296
 msgid ""
 "Print full records for all available versions. This is the default; to turn "
 "it off, use <option>--no-all-versions</option>.  If <option>--no-all-"
@@ -2340,7 +2317,7 @@ msgstr ""
 "AllVersions</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:311
+#: apt-cache.8.xml:305
 msgid ""
 "Perform automatic package cache regeneration, rather than use the cache as "
 "it is. This is the default; to turn it off, use <option>--no-generate</"
@@ -2351,7 +2328,7 @@ msgstr ""
 "option> を使用してください。設定項目: <literal>APT::Cache::Generate</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:317
+#: apt-cache.8.xml:311
 msgid ""
 "Only search on the package names, not the long descriptions.  Configuration "
 "Item: <literal>APT::Cache::NamesOnly</literal>."
@@ -2360,7 +2337,7 @@ msgstr ""
 "Cache::NamesOnly</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:322
+#: apt-cache.8.xml:316
 msgid ""
 "Make <literal>pkgnames</literal> print all names, including virtual packages "
 "and missing dependencies.  Configuration Item: <literal>APT::Cache::"
@@ -2370,7 +2347,7 @@ msgstr ""
 "表示します。設定項目: <literal>APT::Cache::AllNames</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:328
+#: apt-cache.8.xml:322
 msgid ""
 "Make <literal>depends</literal> and <literal>rdepends</literal> recursive so "
 "that all packages mentioned are printed once.  Configuration Item: "
@@ -2381,7 +2358,7 @@ msgstr ""
 "RecurseDepends</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:335
+#: apt-cache.8.xml:329
 msgid ""
 "Limit the output of <literal>depends</literal> and <literal>rdepends</"
 "literal> to packages which are currently installed.  Configuration Item: "
@@ -2392,12 +2369,12 @@ msgstr ""
 "Installed</literal>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:353
+#: apt-cache.8.xml:347
 msgid "&apt-conf;, &sources-list;, &apt-get;"
 msgstr "&apt-conf;, &sources-list;, &apt-get;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:358
+#: apt-cache.8.xml:352
 msgid ""
 "<command>apt-cache</command> returns zero on normal operation, decimal 100 "
 "on error."
@@ -2406,12 +2383,12 @@ msgstr ""
 "100 を返します。"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-key.8.xml:34
+#: apt-key.8.xml:28
 msgid "APT key management utility"
 msgstr "APT キー管理ユーティリティ"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:41
+#: apt-key.8.xml:35
 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 "
@@ -2422,12 +2399,12 @@ msgstr ""
 "ると見なせるでしょう。"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-key.8.xml:47
+#: apt-key.8.xml:41
 msgid "Commands"
 msgstr "コマンド"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:52
+#: apt-key.8.xml:46
 msgid ""
 "Add a new key to the list of trusted keys.  The key is read from the "
 "filename given with the parameter &synopsis-param-filename; or if the "
@@ -2438,32 +2415,32 @@ msgstr ""
 "<literal>-</literal> とすると、標準入力から読み込みます。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:65
+#: apt-key.8.xml:59
 msgid "Remove a key from the list of trusted keys."
 msgstr "信頼キー一覧からキーを削除します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:76
+#: apt-key.8.xml:70
 msgid "Output the key &synopsis-param-keyid; to standard output."
 msgstr "キー &synopsis-param-keyid; を標準出力に出力します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:87
+#: apt-key.8.xml:81
 msgid "Output all trusted keys to standard output."
 msgstr "信頼するキーをすべて標準出力に出力します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:98
+#: apt-key.8.xml:92
 msgid "List trusted keys."
 msgstr "信頼キーを一覧表示します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:109
+#: apt-key.8.xml:103
 msgid "List fingerprints of trusted keys."
 msgstr "信頼キーのフィンガープリントを一覧表示します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:120
+#: apt-key.8.xml:114
 msgid ""
 "Pass advanced options to gpg. With adv --recv-key you can download the "
 "public key."
@@ -2472,7 +2449,7 @@ msgstr ""
 "できます。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:132
+#: apt-key.8.xml:126
 msgid ""
 "Update the local keyring with the archive keyring and remove from the local "
 "keyring the archive keys which are no longer valid.  The archive keyring is "
@@ -2482,10 +2459,11 @@ msgstr ""
 "ローカルキーリングをアーカイブキーリングで更新し、もう有効でなくなったアーカ"
 "イブキーをローカルキーリングから削除します。アーカイブキーリングは、使用中の"
 "ディストリビューションにある <literal>archive-keyring</literal> パッケージ "
-"(例: &keyring-distro; では &keyring-package; パッケージ) で提供されています。"
+"(例えば &keyring-distro; では &keyring-package; パッケージ) で提供されていま"
+"す。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:146
+#: apt-key.8.xml:140
 msgid ""
 "Perform an update working similarly to the <command>update</command> command "
 "above, but get the archive keyring from a URI instead and validate it "
@@ -2502,12 +2480,12 @@ msgstr ""
 "有効です。"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-key.8.xml:162 apt-cdrom.8.xml:82
+#: apt-key.8.xml:156 apt-cdrom.8.xml:76
 msgid "Options"
 msgstr "オプション"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:163
+#: apt-key.8.xml:157
 msgid ""
 "Note that options need to be defined before the commands described in the "
 "previous section."
@@ -2516,7 +2494,7 @@ msgstr ""
 "てください。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:166
+#: apt-key.8.xml:160
 msgid ""
 "With this option it is possible to specify a particular keyring file the "
 "command should operate on. The default is that a command is executed on the "
@@ -2532,47 +2510,47 @@ msgstr ""
 "ます。つまり新しいキーはこのファイルに追加されます。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:181
+#: apt-key.8.xml:175
 msgid "<filename>/etc/apt/trustdb.gpg</filename>"
 msgstr "<filename>/etc/apt/trustdb.gpg</filename>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:182
+#: apt-key.8.xml:176
 msgid "Local trust database of archive keys."
 msgstr "アーカイブキーのローカル信頼データベースです。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:185
+#: apt-key.8.xml:179
 msgid "&keyring-filename;"
 msgstr "&keyring-filename;"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:186
+#: apt-key.8.xml:180
 msgid "Keyring of &keyring-distro; archive trusted keys."
 msgstr "&keyring-distro; アーカイブ信頼キーのキーリングです。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:189
+#: apt-key.8.xml:183
 msgid "&keyring-removed-filename;"
 msgstr "&keyring-removed-filename;"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:190
+#: apt-key.8.xml:184
 msgid "Keyring of &keyring-distro; archive removed trusted keys."
 msgstr "削除された &keyring-distro; アーカイブ信頼キーのキーリングです。"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:199
+#: apt-key.8.xml:193
 msgid "&apt-get;, &apt-secure;"
 msgstr "&apt-get;, &apt-secure;"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-mark.8.xml:35
+#: apt-mark.8.xml:29
 msgid "mark/unmark a package as being automatically-installed"
 msgstr "パッケージが自動的にインストールされたかどうかのマークを変更します。"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:41
+#: apt-mark.8.xml:35
 msgid ""
 "<command>apt-mark</command> will change whether a package has been marked as "
 "being automatically installed."
@@ -2581,7 +2559,7 @@ msgstr ""
 "かのマークを変更します。"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:45
+#: apt-mark.8.xml:39
 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 "
@@ -2596,7 +2574,7 @@ msgstr ""
 "command> や <command>aptitude</command> により削除されます。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:54
+#: apt-mark.8.xml:48
 msgid ""
 "<literal>auto</literal> is used to mark a package as being automatically "
 "installed, which will cause the package to be removed when no more manually "
@@ -2607,7 +2585,7 @@ msgstr ""
 "ると、このパッケージを削除します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:62
+#: apt-mark.8.xml:56
 msgid ""
 "<literal>manual</literal> is used to mark a package as being manually "
 "installed, which will prevent the package from being automatically removed "
@@ -2618,7 +2596,7 @@ msgstr ""
 "を自動的に削除するのを防ぎます。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:70
+#: apt-mark.8.xml:64
 msgid ""
 "<literal>hold</literal> is used to mark a package as held back, which will "
 "prevent the package from being automatically installed, upgraded or "
@@ -2633,7 +2611,7 @@ msgstr ""
 "ありません。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:80
+#: apt-mark.8.xml:74
 msgid ""
 "<literal>unhold</literal> is used to cancel a previously set hold on a "
 "package to allow all actions again."
@@ -2642,7 +2620,7 @@ msgstr ""
 "キャンセルするのに使用します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:86
+#: apt-mark.8.xml:80
 msgid ""
 "<literal>showauto</literal> is used to print a list of automatically "
 "installed packages with each package on a new line.  All automatically "
@@ -2655,7 +2633,7 @@ msgstr ""
 "ケージが自動的にインストールされている場合にのみ、表示します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:94
+#: apt-mark.8.xml:88
 msgid ""
 "<literal>showmanual</literal> can be used in the same way as "
 "<literal>showauto</literal> except that it will print a list of manually "
@@ -2665,7 +2643,7 @@ msgstr ""
 "ますが、手動でインストールしたパッケージの一覧を表示します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:101
+#: apt-mark.8.xml:95
 msgid ""
 "<literal>showhold</literal> is used to print a list of packages on hold in "
 "the same way as for the other show commands."
@@ -2674,7 +2652,7 @@ msgstr ""
 "パッケージを出力します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:117
+#: apt-mark.8.xml:111
 msgid ""
 "Read/Write package stats from the filename given with the parameter "
 "&synopsis-param-filename; instead of from the default location, which is "
@@ -2686,7 +2664,7 @@ msgstr ""
 "param-filename; からパッケージの状態を読み書きします。"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:138
+#: apt-mark.8.xml:132
 msgid ""
 "<command>apt-mark</command> returns zero on normal operation, non-zero on "
 "error."
@@ -2695,12 +2673,12 @@ msgstr ""
 "を返します。"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-secure.8.xml:49
+#: apt-secure.8.xml:43
 msgid "Archive authentication support for APT"
 msgstr "APT アーカイブ認証サポート"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:54
+#: apt-secure.8.xml:48
 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 "
@@ -2713,7 +2691,7 @@ msgstr ""
 "を保証します。"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:62
+#: apt-secure.8.xml:56
 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 "
@@ -2728,7 +2706,7 @@ msgstr ""
 "前に、すべてのソースに対して、強制的に検証される可能性があります。"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:71
+#: apt-secure.8.xml:65
 msgid ""
 "The package frontends &apt-get;, &aptitude; and &synaptic; support this new "
 "authentication feature."
@@ -2737,12 +2715,12 @@ msgstr ""
 "認証機能をサポートしています。"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:76
+#: apt-secure.8.xml:70
 msgid "Trusted archives"
 msgstr "信頼済アーカイブ"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:79
+#: apt-secure.8.xml:73
 msgid ""
 "The chain of trust from an apt archive to the end user is made up of several "
 "steps. <command>apt-secure</command> is the last step in this chain; "
@@ -2759,7 +2737,7 @@ msgstr ""
 "イブメンテナの責任だということです。"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:87
+#: apt-secure.8.xml:81
 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 "
@@ -2772,7 +2750,7 @@ msgstr ""
 "を確認してください。"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:94
+#: apt-secure.8.xml:88
 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. In order to become "
@@ -2789,7 +2767,7 @@ msgstr ""
 "ナに署名されています。"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:104
+#: apt-secure.8.xml:98
 msgid ""
 "Once the uploaded package is verified and included in the archive, the "
 "maintainer signature is stripped off, and checksums of the package are "
@@ -2802,14 +2780,15 @@ msgid ""
 msgstr ""
 "アップロードされたパッケージが検証されてアーカイブに格納されると、メンテナの"
 "署名を取り外し、パッケージのチェックサムを計算して、Packages ファイルに格納し"
-"ます。その後、全パッケージファイルのチェックサムを計算して、Release ファイル"
+"ます。その後、全 Packages ファイルのチェックサムを計算して、Release ファイル"
 "に格納します。Release ファイルは、その &keyring-distro; リリースのアーカイブ"
 "キーで署名され、&keyring-distro; ミラーサイトでパッケージや Packages ファイル"
-"とともに配布されます。このキーは、&keyring-package; パッケージに収録されてい"
-"る、&keyring-distro; アーカイブキーリングに含まれます。"
+"とともに配布されます。このキーは、<package>debian-archive-keyring</package> "
+"パッケージに収録されている、&keyring-distro; アーカイブキーリングに含まれま"
+"す。"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:115
+#: apt-secure.8.xml:109
 msgid ""
 "End users can check the signature of the Release file, extract a checksum of "
 "a package from it and compare it with the checksum of the package they "
@@ -2820,7 +2799,7 @@ msgstr ""
 "す。また、APT が自動的に行うのに任せることもできます。"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:120
+#: apt-secure.8.xml:114
 msgid ""
 "Notice that this is distinct from checking signatures on a per package "
 "basis. It is designed to prevent two possible attacks:"
@@ -2829,7 +2808,7 @@ msgstr ""
 "うに考えられる 2 種類の攻撃を防ぐよう設計されています。"
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:125
+#: apt-secure.8.xml:119
 msgid ""
 "<literal>Network \"man in the middle\" attacks</literal>. Without signature "
 "checking, malicious agents can introduce themselves into the package "
@@ -2844,7 +2823,7 @@ msgstr ""
 "あるソフトウェアを掴まされたりします。"
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:133
+#: apt-secure.8.xml:127
 msgid ""
 "<literal>Mirror network compromise</literal>.  Without signature checking, a "
 "malicious agent can compromise a mirror host and modify the files in it to "
@@ -2856,7 +2835,7 @@ msgstr ""
 "てに、悪意あるソフトウェアが伝播するようにファイルを変更できます。"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:140
+#: apt-secure.8.xml:134
 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 "
@@ -2868,12 +2847,12 @@ msgstr ""
 "この機構はパッケージごとの署名を補完することができます。"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:146
+#: apt-secure.8.xml:140
 msgid "User configuration"
 msgstr "ユーザの設定"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:148
+#: apt-secure.8.xml:142
 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 "
@@ -2886,7 +2865,7 @@ msgstr ""
 "key</command> でキーの追加・削除が行えます。"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:155
+#: apt-secure.8.xml:149
 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 "
@@ -2903,12 +2882,12 @@ msgstr ""
 "ファイルをダウンロード・検証できるようになります。"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:164
+#: apt-secure.8.xml:158
 msgid "Archive configuration"
 msgstr "アーカイブの設定"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:166
+#: apt-secure.8.xml:160
 msgid ""
 "If you want to provide archive signatures in an archive under your "
 "maintenance you have to:"
@@ -2917,7 +2896,7 @@ msgstr ""
 "下のようにしてください。"
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:171
+#: apt-secure.8.xml:165
 msgid ""
 "<emphasis>Create a toplevel Release file</emphasis>, if it does not exist "
 "already. You can do this by running <command>apt-ftparchive release</"
@@ -2928,7 +2907,7 @@ msgstr ""
 "供) を実行すると、作成できます。"
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:176
+#: apt-secure.8.xml:170
 msgid ""
 "<emphasis>Sign it</emphasis>. You can do this by running <command>gpg --"
 "clearsign -o InRelease Release</command> and <command>gpg -abs -o Release."
@@ -2939,7 +2918,7 @@ msgstr ""
 "行して、署名してください。"
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:180
+#: apt-secure.8.xml:174
 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 "
@@ -2950,7 +2929,7 @@ msgstr ""
 "ます。"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:187
+#: apt-secure.8.xml:181
 msgid ""
 "Whenever the contents of the archive change (new packages are added or "
 "removed) the archive maintainer has to follow the first two steps outlined "
@@ -2960,16 +2939,16 @@ msgstr ""
 "ンテナは前述の最初の 2 ステップに従わなければなりません。"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:195
+#: apt-secure.8.xml:189
 msgid ""
 "&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, "
-"&debsign; &debsig-verify;, &gpg;"
+"&debsign;, &debsig-verify;, &gpg;"
 msgstr ""
 "&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, "
-"&debsign; &debsig-verify;, &gpg;"
+"&debsign;, &debsig-verify;, &gpg;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:199
+#: apt-secure.8.xml:193
 msgid ""
 "For more background information you might want to review the <ulink url="
 "\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "
@@ -2985,12 +2964,12 @@ msgstr ""
 ">Strong Distribution HOWTO</ulink> をご覧ください。"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:212
+#: apt-secure.8.xml:206
 msgid "Manpage Authors"
 msgstr "マニュアルページ作者"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:214
+#: apt-secure.8.xml:208
 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."
@@ -2999,12 +2978,12 @@ msgstr ""
 "Walters, Florian Weimer, Michael Vogt の作業を元にしています。"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-cdrom.8.xml:34
+#: apt-cdrom.8.xml:28
 msgid "APT CD-ROM management utility"
 msgstr "APT CD-ROM 管理ユーティリティ"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:40
+#: apt-cdrom.8.xml:34
 msgid ""
 "<command>apt-cdrom</command> is used to add a new CD-ROM to APT's list of "
 "available sources. <command>apt-cdrom</command> takes care of determining "
@@ -3017,7 +2996,7 @@ msgstr ""
 "認を行います。"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:47
+#: apt-cdrom.8.xml:41
 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 disc in a multi-CD set "
@@ -3028,7 +3007,7 @@ msgstr ""
 "を補正できるか評価しなければなりません。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:58
+#: apt-cdrom.8.xml:52
 msgid ""
 "<literal>add</literal> is used to add a new disc to the source list. It will "
 "unmount the CD-ROM device, prompt for a disc to be inserted and then proceed "
@@ -3043,7 +3022,7 @@ msgstr ""
 "す。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:66
+#: apt-cdrom.8.xml:60
 msgid ""
 "APT uses a CD-ROM ID to track which disc is currently in the drive and "
 "maintains a database of these IDs in <filename>&statedir;/cdroms.list</"
@@ -3054,7 +3033,7 @@ msgstr ""
 "ベースで管理します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:74
+#: apt-cdrom.8.xml:68
 msgid ""
 "A debugging tool to report the identity of the current disc as well as the "
 "stored file name"
@@ -3063,23 +3042,18 @@ msgstr ""
 "グツールです。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:87
-#, fuzzy
-#| msgid ""
-#| "Mount point; specify the location to mount the CD-ROM. This mount point "
-#| "must be listed in <filename>/etc/fstab</filename> and properly "
-#| "configured.  Configuration Item: <literal>Acquire::cdrom::mount</literal>."
+#: apt-cdrom.8.xml:81
 msgid ""
 "Do not try to auto-detect the CD-ROM path. Usually combined with the "
 "<option>--cdrom</option> option.  Configuration Item: <literal>Acquire::"
 "cdrom::AutoDetect</literal>."
 msgstr ""
-"マウントポイント - CD-ROM をマウントする場所を指定します。このマウントポイン"
-"トは、<filename>/etc/fstab</filename> に正しく設定されている必要があります。"
-"設定項目: <literal>Acquire::cdrom::mount</literal>"
+"CD-ROM パスの自動検出を試行しません。通常、<option>--cdrom</option> オプショ"
+"ンと組み合わせて使います。設定項目: <literal>Acquire::cdrom::AutoDetect</"
+"literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:95
+#: apt-cdrom.8.xml:89
 msgid ""
 "Mount point; specify the location to mount the CD-ROM. This mount point must "
 "be listed in <filename>/etc/fstab</filename> and properly configured.  "
@@ -3090,7 +3064,7 @@ msgstr ""
 "設定項目: <literal>Acquire::cdrom::mount</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:104
+#: apt-cdrom.8.xml:98
 msgid ""
 "Rename a disc; change the label of a disc or override the disc's given "
 "label. This option will cause <command>apt-cdrom</command> to prompt for a "
@@ -3101,7 +3075,7 @@ msgstr ""
 "を入力するよう促します。設定項目: <literal>APT::CDROM::Rename</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:113
+#: apt-cdrom.8.xml:107
 msgid ""
 "No mounting; prevent <command>apt-cdrom</command> from mounting and "
 "unmounting the mount point.  Configuration Item: <literal>APT::CDROM::"
@@ -3112,7 +3086,7 @@ msgstr ""
 "literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:121
+#: apt-cdrom.8.xml:115
 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 "
@@ -3125,7 +3099,7 @@ msgstr ""
 "<literal>APT::CDROM::Fast</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:131
+#: apt-cdrom.8.xml:125
 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 "
@@ -3137,7 +3111,7 @@ msgstr ""
 "できます。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:142
+#: apt-cdrom.8.xml:136
 msgid ""
 "No Changes; Do not change the &sources-list; file and do not write index "
 "files. Everything is still checked however.  Configuration Item: "
@@ -3148,12 +3122,12 @@ msgstr ""
 "CDROM::NoAct</literal>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:155
+#: apt-cdrom.8.xml:149
 msgid "&apt-conf;, &apt-get;, &sources-list;"
 msgstr "&apt-conf;, &apt-get;, &sources-list;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:160
+#: apt-cdrom.8.xml:154
 msgid ""
 "<command>apt-cdrom</command> returns zero on normal operation, decimal 100 "
 "on error."
@@ -3162,12 +3136,12 @@ msgstr ""
 "100 を返します。"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-config.8.xml:35
+#: apt-config.8.xml:29
 msgid "APT Configuration Query program"
 msgstr "APT 設定取得プログラム"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:41
+#: apt-config.8.xml:35
 msgid ""
 "<command>apt-config</command> is an internal program used by various "
 "portions of the APT suite to provide consistent configurability. It accesses "
@@ -3180,7 +3154,7 @@ msgstr ""
 "ます。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:53
+#: apt-config.8.xml:47
 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 the "
@@ -3194,7 +3168,7 @@ msgstr ""
 "してください。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
-#: apt-config.8.xml:61
+#: apt-config.8.xml:55
 #, no-wrap
 msgid ""
 "OPTS=\"-f\"\n"
@@ -3206,7 +3180,7 @@ msgstr ""
 "eval $RES\n"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:66
+#: apt-config.8.xml:60
 msgid ""
 "This will set the shell environment variable $OPTS to the value of MyApp::"
 "options with a default of <option>-f</option>."
@@ -3215,7 +3189,7 @@ msgstr ""
 "値は <option>-f</option> となります。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:70
+#: apt-config.8.xml:64
 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 "
@@ -3226,12 +3200,12 @@ msgstr ""
 "を行います。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:79
+#: apt-config.8.xml:73
 msgid "Just show the contents of the configuration space."
 msgstr "設定箇所の内容を表示するだけです。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:92
+#: apt-config.8.xml:86
 msgid ""
 "Include options which have an empty value. This is the default, so use --no-"
 "empty to remove them from the output."
@@ -3240,12 +3214,12 @@ msgstr ""
 "--no-empty としてください。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
-#: apt-config.8.xml:97
+#: apt-config.8.xml:91
 msgid "&percnt;f &#x0022;&percnt;v&#x0022;;&percnt;n"
 msgstr "&percnt;f &#x0022;&percnt;v&#x0022;;&percnt;n"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:98
+#: apt-config.8.xml:92
 msgid ""
 "Defines the output of each config option. &percnt;t will be replaced with "
 "its individual name, &percnt;f with its full hierarchical name and &percnt;v "
@@ -3262,13 +3236,13 @@ msgstr ""
 "さい。"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:112 apt-extracttemplates.1.xml:73 apt-sortpkgs.1.xml:66
-#: apt-ftparchive.1.xml:610
+#: apt-config.8.xml:106 apt-extracttemplates.1.xml:67 apt-sortpkgs.1.xml:60
+#: apt-ftparchive.1.xml:604
 msgid "&apt-conf;"
 msgstr "&apt-conf;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:117
+#: apt-config.8.xml:111
 msgid ""
 "<command>apt-config</command> returns zero on normal operation, decimal 100 "
 "on error."
@@ -3277,27 +3251,27 @@ msgstr ""
 "の 100 を返します。"
 
 #. type: Content of: <refentry><refentryinfo><author><contrib>
-#: apt.conf.5.xml:22
+#: apt.conf.5.xml:16
 msgid "Initial documentation of Debug::*."
 msgstr "Debug::* に関する最初のドキュメント"
 
 #. type: Content of: <refentry><refentryinfo><author><email>
-#: apt.conf.5.xml:23
+#: apt.conf.5.xml:17
 msgid "dburrows@debian.org"
 msgstr "dburrows@debian.org"
 
 #. type: Content of: <refentry><refmeta><manvolnum>
-#: apt.conf.5.xml:33 apt_preferences.5.xml:27 sources.list.5.xml:28
+#: apt.conf.5.xml:27 apt_preferences.5.xml:21 sources.list.5.xml:22
 msgid "5"
 msgstr "5"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt.conf.5.xml:40
+#: apt.conf.5.xml:34
 msgid "Configuration file for APT"
 msgstr "APT の設定ファイル"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:44
+#: apt.conf.5.xml:38
 msgid ""
 "<filename>/etc/apt/apt.conf</filename> is the main configuration file shared "
 "by all the tools in the APT suite of tools, though it is by no means the "
@@ -3310,21 +3284,21 @@ msgstr ""
 "ンドラインパーサを共有しています。"
 
 #. type: Content of: <refentry><refsect1><orderedlist><para>
-#: apt.conf.5.xml:50
+#: apt.conf.5.xml:44
 msgid ""
 "When an APT tool starts up it will read the configuration files in the "
 "following order:"
 msgstr "APT ツールの起動時に、設定ファイルを以下の順番で読み込みます。"
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:52
+#: apt.conf.5.xml:46
 msgid ""
 "the file specified by the <envar>APT_CONFIG</envar> environment variable (if "
 "any)"
 msgstr "<envar>APT_CONFIG</envar> 環境変数で指定したファイル (存在する場合)"
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:54
+#: apt.conf.5.xml:48
 msgid ""
 "all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending "
 "order which have either no or \"<literal>conf</literal>\" as filename "
@@ -3342,13 +3316,13 @@ msgstr ""
 "力します。一致する場合は黙って無視します。"
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:61
+#: apt.conf.5.xml:55
 msgid ""
 "the main configuration file specified by <literal>Dir::Etc::main</literal>"
 msgstr "<literal>Dir::Etc::Main</literal> で指定される、メイン設定ファイル"
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:63
+#: apt.conf.5.xml:57
 msgid ""
 "the command line options are applied to override the configuration "
 "directives or to load even more configuration files."
@@ -3357,12 +3331,12 @@ msgstr ""
 "加読み込みができます。"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:67
+#: apt.conf.5.xml:61
 msgid "Syntax"
 msgstr "構文"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:68
+#: apt.conf.5.xml:62
 msgid ""
 "The configuration file is organized in a tree with options organized into "
 "functional groups. Option specification is given with a double colon "
@@ -3376,7 +3350,7 @@ msgstr ""
 "プションは、親グループからは継承しません。"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:74
+#: apt.conf.5.xml:68
 msgid ""
 "Syntactically the configuration language is modeled after what the ISC tools "
 "such as bind and dhcp use. Lines starting with <literal>//</literal> are "
@@ -3399,7 +3373,7 @@ msgstr ""
 "のように波カッコを使うと、新しいスコープを開くことができます。"
 
 #. type: Content of: <refentry><refsect1><informalexample><programlisting>
-#: apt.conf.5.xml:87
+#: apt.conf.5.xml:81
 #, no-wrap
 msgid ""
 "APT {\n"
@@ -3417,7 +3391,7 @@ msgstr ""
 "};\n"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:95
+#: apt.conf.5.xml:89
 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 "
@@ -3428,13 +3402,13 @@ msgstr ""
 "ロンで区切って、複数のエントリを表せます。"
 
 #. type: Content of: <refentry><refsect1><informalexample><programlisting>
-#: apt.conf.5.xml:100
+#: apt.conf.5.xml:94
 #, no-wrap
 msgid "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n"
 msgstr "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:103
+#: apt.conf.5.xml:97
 msgid ""
 "In general the sample configuration file &configureindex; is a good guide "
 "for how it should look."
@@ -3443,7 +3417,7 @@ msgstr ""
 "考になるでしょう。"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:106
+#: apt.conf.5.xml:100
 msgid ""
 "Case is not significant in names of configuration items, so in the previous "
 "example you could use <literal>dpkg::pre-install-pkgs</literal>."
@@ -3452,7 +3426,7 @@ msgstr ""
 "<literal>dpkg::pre-install-pkgs</literal> とすることもできます。"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:109
+#: apt.conf.5.xml:103
 msgid ""
 "Names for the configuration items are optional if a list is defined as can "
 "be seen in the <literal>DPkg::Pre-Install-Pkgs</literal> example above. If "
@@ -3467,7 +3441,7 @@ msgstr ""
 "できます。"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:114
+#: apt.conf.5.xml:108
 msgid ""
 "Two special commands are defined: <literal>#include</literal> (which is "
 "deprecated and not supported by alternative implementations) and "
@@ -3486,7 +3460,7 @@ msgstr ""
 "があることに注意してください)。"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:124
+#: apt.conf.5.xml:118
 msgid ""
 "The <literal>#clear</literal> command is the only way to delete a list or a "
 "complete scope. Reopening a scope (or using the syntax described below with "
@@ -3501,7 +3475,7 @@ msgstr ""
 "せん。クリアされるだけです。"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:132
+#: apt.conf.5.xml:126
 msgid ""
 "All of the APT tools take an -o option which allows an arbitrary "
 "configuration directive to be specified on the command line. The syntax is a "
@@ -3519,7 +3493,7 @@ msgstr ""
 "ん)。"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:140
+#: apt.conf.5.xml:134
 msgid ""
 "Note that appending items to a list using <literal>::</literal> only works "
 "for one item per line, and that you should not use it in combination with "
@@ -3547,12 +3521,12 @@ msgstr ""
 "かない限りは、自分でそのような構文を修正してください。"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:155
+#: apt.conf.5.xml:149
 msgid "The APT Group"
 msgstr "APT グループ"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:156
+#: apt.conf.5.xml:150
 msgid ""
 "This group of options controls general APT behavior as well as holding the "
 "options for all of the tools."
@@ -3561,7 +3535,7 @@ msgstr ""
 "御します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:161
+#: apt.conf.5.xml:155
 msgid ""
 "System Architecture; sets the architecture to use when fetching files and "
 "parsing package lists. The internal default is the architecture apt was "
@@ -3572,7 +3546,7 @@ msgstr ""
 "ルしたアーキテクチャです。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:168
+#: apt.conf.5.xml:162
 msgid ""
 "All Architectures the system supports. For instance, CPUs implementing the "
 "<literal>amd64</literal> (also called <literal>x86-64</literal>)  "
@@ -3593,16 +3567,20 @@ msgstr ""
 "加します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:182
+#: apt.conf.5.xml:176
 msgid ""
 "List of all build profiles enabled for build-dependency resolution, without "
 "the \"<literal>profile.</literal>\" namespace prefix.  By default this list "
 "is empty. The <envar>DEB_BUILD_PROFILES</envar> as used by &dpkg-"
 "buildpackage; overrides the list notation."
 msgstr ""
+"構築依存の解決にあたって有効になっているビルドプロファイルを名前空間の"
+"「<literal>profile.</literal>」接頭辞を取り除いたもの全ての一覧です。デフォル"
+"トではこの一覧は空です。&dpkg-buildpackage; で利用される "
+"<envar>DEB_BUILD_PROFILES</envar> はこの一覧よりも優先されます。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:190
+#: apt.conf.5.xml:184
 msgid ""
 "Default release to install packages from if more than one version is "
 "available. Contains release name, codename or release version. Examples: "
@@ -3615,7 +3593,7 @@ msgstr ""
 "'4.0', '5.0*'  となります。&apt-preferences; も参照してください。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:196
+#: apt.conf.5.xml:190
 msgid ""
 "Ignore held packages; this global option causes the problem resolver to "
 "ignore held packages in its decision making."
@@ -3624,7 +3602,7 @@ msgstr ""
 "パッケージを無視します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:201
+#: apt.conf.5.xml:195
 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 "
@@ -3638,7 +3616,7 @@ msgstr ""
 "注意してください。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:209
+#: apt.conf.5.xml:203
 msgid ""
 "Defaults to on, which will cause APT to install essential and important "
 "packages as soon as possible in an install/upgrade operation, in order to "
@@ -3662,7 +3640,7 @@ msgstr ""
 "なり、A への依存関係は、もう満たせません。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:221
+#: apt.conf.5.xml:215
 msgid ""
 "The immediate configuration marker is also applied in the potentially "
 "problematic case of circular dependencies, since a dependency with the "
@@ -3687,7 +3665,7 @@ msgstr ""
 "述のシナリオを解決する方法の、1つにしかすぎないのです。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:234
+#: apt.conf.5.xml:228
 msgid ""
 "Before a big operation like <literal>dist-upgrade</literal> is run with this "
 "option disabled you should try to explicitly <literal>install</literal> the "
@@ -3703,7 +3681,7 @@ msgstr ""
 "も報告していただきたいです。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:245
+#: apt.conf.5.xml:239
 msgid ""
 "Never enable this option unless you <emphasis>really</emphasis> know what "
 "you are doing. It permits APT to temporarily remove an essential package to "
@@ -3724,7 +3702,7 @@ msgstr ""
 "それらが依存しているパッケージ以外の不可欠パッケージで動作します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:257
+#: apt.conf.5.xml:251
 msgid ""
 "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 of "
@@ -3758,12 +3736,12 @@ msgstr ""
 "の自動増加を無効にします。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:273
+#: apt.conf.5.xml:267
 msgid "Defines which packages are considered essential build dependencies."
 msgstr "構築依存関係で不可欠なパッケージを定義します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:277
+#: apt.conf.5.xml:271
 msgid ""
 "The Get subsection controls the &apt-get; tool; please see its documentation "
 "for more information about the options here."
@@ -3772,7 +3750,7 @@ msgstr ""
 "&apt-get; の文書を参照してください。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:282
+#: apt.conf.5.xml:276
 msgid ""
 "The Cache subsection controls the &apt-cache; tool; please see its "
 "documentation for more information about the options here."
@@ -3781,7 +3759,7 @@ msgstr ""
 "は &apt-cache; の文書を参照してください。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:287
+#: apt.conf.5.xml:281
 msgid ""
 "The CDROM subsection controls the &apt-cdrom; tool; please see its "
 "documentation for more information about the options here."
@@ -3790,12 +3768,12 @@ msgstr ""
 "は &apt-cdrom; の文書を参照してください。"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:293
+#: apt.conf.5.xml:287
 msgid "The Acquire Group"
 msgstr "Acquire グループ"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:294
+#: apt.conf.5.xml:288
 msgid ""
 "The <literal>Acquire</literal> group of options controls the download of "
 "packages as well as the various \"acquire methods\" responsible for the "
@@ -3806,7 +3784,7 @@ msgstr ""
 "(&sources-list; も参照)。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:301
+#: apt.conf.5.xml:295
 msgid ""
 "Security related option defaulting to true, as giving a Release file's "
 "validation an expiration date prevents replay attacks over a long timescale, "
@@ -3826,7 +3804,7 @@ msgstr ""
 "下の <literal>Max-ValidTime</literal> オプションを使用できます。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:314
+#: apt.conf.5.xml:308
 msgid ""
 "Maximum time (in seconds) after its creation (as indicated by the "
 "<literal>Date</literal> header) that the <filename>Release</filename> file "
@@ -3844,7 +3822,7 @@ msgstr ""
 "固有の設定を作成できます。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:326
+#: apt.conf.5.xml:320
 msgid ""
 "Minimum time (in seconds) after its creation (as indicated by the "
 "<literal>Date</literal> header) that the <filename>Release</filename> file "
@@ -3862,7 +3840,7 @@ msgstr ""
 "定を作成できます。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:338
+#: apt.conf.5.xml:332
 msgid ""
 "Try to download deltas called <literal>PDiffs</literal> for indexes (like "
 "<filename>Packages</filename> files) instead of downloading whole ones. True "
@@ -3873,7 +3851,7 @@ msgstr ""
 "す。デフォルトでは True です。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:341
+#: apt.conf.5.xml:335
 msgid ""
 "Two sub-options to limit the use of PDiffs are also available: "
 "<literal>FileLimit</literal> can be used to specify a maximum number of "
@@ -3889,7 +3867,7 @@ msgstr ""
 "も、パッチをダウンロードする代わりに、完全なファイルをダウンロードします。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:351
+#: apt.conf.5.xml:345
 msgid ""
 "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</"
 "literal> or <literal>access</literal> which determines how APT parallelizes "
@@ -3903,7 +3881,7 @@ msgstr ""
 "<literal>access</literal> は、URI タイプごとに 1 接続を開きます。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:359
+#: apt.conf.5.xml:353
 msgid ""
 "Number of retries to perform. If this is non-zero APT will retry failed "
 "files the given number of times."
@@ -3912,7 +3890,7 @@ msgstr ""
 "えられた回数だけリトライを行います。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:364
+#: apt.conf.5.xml:358
 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."
@@ -3922,7 +3900,7 @@ msgstr ""
 "す。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:369
+#: apt.conf.5.xml:363
 msgid ""
 "<literal>http::Proxy</literal> sets the default proxy to use for HTTP URIs. "
 "It is in the standard form of <literal>http://[[user][:pass]@]host[:port]/</"
@@ -3940,7 +3918,7 @@ msgstr ""
 "ないと、環境変数 <envar>http_proxy</envar> を使用します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:377
+#: apt.conf.5.xml:371
 msgid ""
 "Three settings are provided for cache control with HTTP/1.1 compliant proxy "
 "caches.  <literal>No-Cache</literal> tells the proxy not to use its cached "
@@ -3959,7 +3937,7 @@ msgstr ""
 "が汚れるのを防げます。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:387 apt.conf.5.xml:475
+#: apt.conf.5.xml:381 apt.conf.5.xml:469
 msgid ""
 "The option <literal>timeout</literal> sets the timeout timer used by the "
 "method; this value applies to the connection as well as the data timeout."
@@ -3969,7 +3947,7 @@ msgstr ""
 "す。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:390
+#: apt.conf.5.xml:384
 msgid ""
 "The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to "
 "enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be beneficial e."
@@ -3987,7 +3965,7 @@ msgstr ""
 "フォルト値は 0 (= 無効) です。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:397
+#: apt.conf.5.xml:391
 msgid ""
 "<literal>Acquire::http::AllowRedirect</literal> controls whether APT will "
 "follow redirects, which is enabled by default."
@@ -3996,14 +3974,7 @@ msgstr ""
 "かどうかを制御します。デフォルトでは有効です。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:400
-#, fuzzy
-#| msgid ""
-#| "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
-#| "literal> which accepts integer values in kilobytes. The default value is "
-#| "0 which deactivates the limit and tries to use all available bandwidth "
-#| "(note that this option implicitly disables downloading from multiple "
-#| "servers at the same time.)"
+#: apt.conf.5.xml:394
 msgid ""
 "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
 "literal> which accepts integer values in kilobytes per second. The default "
@@ -4011,13 +3982,13 @@ msgid ""
 "bandwidth.  Note that this option implicitly disables downloading from "
 "multiple servers at the same time."
 msgstr ""
-"使用する帯域を制限するには、<literal>Acquire::http::Dl-Limit</literal> にキロ"
-"バイトで整数値を与えます。デフォルト値は 0 で、制限を解除し、使用できる帯域を"
-"すべて使おうとします (このオプションは暗黙的に、同時に複数のサーバからダウン"
-"ロードしなくなることに注意してください)。"
+"使用する帯域を制限するには、<literal>Acquire::http::Dl-Limit</literal> に秒あ"
+"たりのキロバイトで整数値を与えます。デフォルト値は 0 で、制限を解除し、使用で"
+"きる帯域をすべて使おうとします。このオプションは暗黙的に、同時に複数のサーバ"
+"からダウンロードしなくなることに注意してください。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:407
+#: apt.conf.5.xml:401
 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 "
@@ -4028,7 +3999,7 @@ msgstr ""
 "ロードするための、異なる User-Agent を設定できます。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:411
+#: apt.conf.5.xml:405
 msgid ""
 "<literal>Acquire::http::Proxy-Auto-Detect</literal> can be used to specify "
 "an external command to discover the http proxy to use. Apt expects the "
@@ -4040,9 +4011,17 @@ msgid ""
 "takes precedence over the legacy option name <literal>ProxyAutoDetect</"
 "literal>."
 msgstr ""
+"<literal>Acquire::http::Proxy-Auto-Detect</literal> を使って利用する http プ"
+"ロキシを検出するための外部コマンドを指定できます。APT はコマンドが標準出力に "
+"<literal>http://proxy:port/</literal> 形式でプロキシを出力することを期待して"
+"います。これは全体を指定する <literal>Acquire::http::Proxy</literal> よりも優"
+"先されますが <literal>Acquire::http::Proxy::$HOST</literal> 経由でセットした"
+"特定のホストのプロキシ設定はこれよりも優先されます。avahi を利用する実装例に"
+"ついては &squid-deb-proxy-client; パッケージを見てください。このオプションは"
+"古い <literal>ProxyAutoDetect</literal> よりも優先されます。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:429
+#: apt.conf.5.xml:423
 msgid ""
 "The <literal>Cache-control</literal>, <literal>Timeout</literal>, "
 "<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> and "
@@ -4059,7 +4038,7 @@ msgstr ""
 "していません。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:437
+#: apt.conf.5.xml:431
 msgid ""
 "<literal>CaInfo</literal> suboption specifies place of file that holds info "
 "about trusted certificates.  <literal>&lt;host&gt;::CaInfo</literal> is the "
@@ -4097,7 +4076,7 @@ msgstr ""
 "ごとのオプションです。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:458
+#: apt.conf.5.xml:452
 msgid ""
 "<literal>ftp::Proxy</literal> sets the default proxy to use for FTP URIs.  "
 "It is in the standard form of <literal>ftp://[[user][:pass]@]host[:port]/</"
@@ -4129,7 +4108,7 @@ msgstr ""
 "literal>, <literal>$(SITE_PORT)</literal> です。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:478
+#: apt.conf.5.xml:472
 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, "
@@ -4144,7 +4123,7 @@ msgstr ""
 "定例はサンプル設定ファイルを参照してください)。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:485
+#: apt.conf.5.xml:479
 msgid ""
 "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
 "envar> environment variable to an HTTP URL - see the discussion of the http "
@@ -4157,7 +4136,7 @@ msgstr ""
 "FTP over HTTP を使用するのは推奨しません。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:490
+#: apt.conf.5.xml:484
 msgid ""
 "The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
 "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -4173,13 +4152,13 @@ msgstr ""
 "いことに注意してください。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:504
+#: apt.conf.5.xml:498
 #, no-wrap
 msgid "/cdrom/::Mount \"foo\";"
 msgstr "/cdrom/::Mount \"foo\";"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:499
+#: apt.conf.5.xml:493
 msgid ""
 "For URIs using the <literal>cdrom</literal> method, the only configurable "
 "option is the mount point, <literal>cdrom::Mount</literal>, which must be "
@@ -4200,7 +4179,7 @@ msgstr ""
 "マンドは UMount で指定することができます。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:512
+#: apt.conf.5.xml:506
 msgid ""
 "For GPGV URIs the only configurable option is <literal>gpgv::Options</"
 "literal>, which passes additional parameters to gpgv."
@@ -4209,13 +4188,13 @@ msgstr ""
 "る、<literal>gpgv::Options</literal> です。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:523
+#: apt.conf.5.xml:517
 #, no-wrap
 msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
 msgstr "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:518
+#: apt.conf.5.xml:512
 msgid ""
 "List of compression types which are understood by the acquire methods.  "
 "Files like <filename>Packages</filename> can be available in various "
@@ -4233,19 +4212,19 @@ msgstr ""
 "す。構文は以下のようになります。<placeholder type=\"synopsis\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:528
+#: apt.conf.5.xml:522
 #, no-wrap
 msgid "Acquire::CompressionTypes::Order:: \"gz\";"
 msgstr "Acquire::CompressionTypes::Order:: \"gz\";"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:531
+#: apt.conf.5.xml:525
 #, no-wrap
 msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
 msgstr "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:524
+#: apt.conf.5.xml:518
 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 "
@@ -4274,13 +4253,13 @@ msgstr ""
 "<literal>bz2</literal> は自動的に追加されるため、明示する必要はありません。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:538
+#: apt.conf.5.xml:532
 #, no-wrap
 msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
 msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:533
+#: apt.conf.5.xml:527
 msgid ""
 "Note that the <literal>Dir::Bin::<replaceable>Methodname</replaceable></"
 "literal> will be checked at run time. If this option has been set, the "
@@ -4304,7 +4283,7 @@ msgstr ""
 "のみ定義されます。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:543
+#: apt.conf.5.xml:537
 msgid ""
 "The special type <literal>uncompressed</literal> can be used to give "
 "uncompressed files a preference, but note that most archives don't provide "
@@ -4315,7 +4294,7 @@ msgstr ""
 "んどローカルミラーでのみ有効になることに注意してください。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:550
+#: apt.conf.5.xml:544
 msgid ""
 "When downloading <literal>gzip</literal> compressed indexes (Packages, "
 "Sources, or Translations), keep them gzip compressed locally instead of "
@@ -4328,7 +4307,7 @@ msgstr ""
 "する際に、CPU の能力を余計に消費します。デフォルトでは false です。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:558
+#: apt.conf.5.xml:552
 msgid ""
 "The Languages subsection controls which <filename>Translation</filename> "
 "files are downloaded and in which order APT tries to display the description-"
@@ -4346,13 +4325,13 @@ msgstr ""
 "意してください。長い言語コードは特に見かけません。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><programlisting>
-#: apt.conf.5.xml:575
+#: apt.conf.5.xml:569
 #, no-wrap
 msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
 msgstr "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:563
+#: apt.conf.5.xml:557
 msgid ""
 "The default list includes \"environment\" and \"en\". "
 "\"<literal>environment</literal>\" has a special meaning here: it will be "
@@ -4389,7 +4368,7 @@ msgstr ""
 "ことに注意してください。<placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:576
+#: apt.conf.5.xml:570
 msgid ""
 "Note: To prevent problems resulting from APT being executed in different "
 "environments (e.g. by different users or by other programs) all Translation "
@@ -4402,22 +4381,22 @@ msgstr ""
 "後) に追加します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:585
+#: apt.conf.5.xml:579
 msgid "When downloading, force to use only the IPv4 protocol."
-msgstr ""
+msgstr "ダウンロード時に IPv4 プロトコルだけを使うように強制します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:591
+#: apt.conf.5.xml:585
 msgid "When downloading, force to use only the IPv6 protocol."
-msgstr ""
+msgstr "ダウンロード時に IPv6 プロトコルだけを使うように強制します。"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:598
+#: apt.conf.5.xml:592
 msgid "Directories"
 msgstr "ディレクトリ"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:600
+#: apt.conf.5.xml:594
 msgid ""
 "The <literal>Dir::State</literal> section has directories that pertain to "
 "local state information. <literal>lists</literal> is the directory to place "
@@ -4436,28 +4415,31 @@ msgstr ""
 "サブアイテムすべてに、前に付加するデフォルトディレクトリを含んでいます。"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:607
+#: apt.conf.5.xml:601
 msgid ""
 "<literal>Dir::Cache</literal> contains locations pertaining to local cache "
 "information, such as the two package caches <literal>srcpkgcache</literal> "
 "and <literal>pkgcache</literal> as well as the location to place downloaded "
 "archives, <literal>Dir::Cache::archives</literal>. Generation of caches can "
-"be turned off by setting their names to the empty string. This will slow "
+"be turned off by setting <literal>pkgcache</literal> or "
+"<literal>srcpkgcache</literal> to <literal>\"\"</literal>.  This will slow "
 "down startup but save disk space. It is probably preferable to turn off the "
-"pkgcache rather than the srcpkgcache. Like <literal>Dir::State</literal> the "
-"default directory is contained in <literal>Dir::Cache</literal>"
+"pkgcache rather than the srcpkgcache.  Like <literal>Dir::State</literal> "
+"the default directory is contained in <literal>Dir::Cache</literal>"
 msgstr ""
 "<literal>Dir::Cache</literal> は、ローカルキャッシュ情報に関する場所を格納し"
 "ています。これは、ダウンロード済アーカイブの場所を示す <literal>Dir::Cache::"
 "archives</literal> と同様に、<literal>srcpkgcache</literal> と "
-"<literal>pkgcache</literal> のパッケージキャッシュの場所になります。それぞれ"
-"に空文字をセットすることで、キャッシュの生成を無効にできます。これにより起動"
-"時に遅くなりますが、ディスク容量を節約できます。おそらく、srcpkgcache よりも "
-"pkgcache を無効にすることが多いと思います。<literal>Dir::State</literal> と同"
-"様、<literal>Dir::Cache</literal> はデフォルトディレクトリを含んでいます。"
+"<literal>pkgcache</literal> のパッケージキャッシュの場所になります。"
+"<literal>pkgcache</literal> や <literal>srcpkgcache</literal> に <literal>"
+"\"\"</literal> をセットすることで、キャッシュの生成を無効にできます。これによ"
+"り起動時に遅くなりますが、ディスク容量を節約できます。おそらく、srcpkgcache "
+"よりも pkgcache を無効にすることが多いと思います。<literal>Dir::State</"
+"literal> と同様、<literal>Dir::Cache</literal> はデフォルトディレクトリを含ん"
+"でいます。"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:616
+#: apt.conf.5.xml:611
 msgid ""
 "<literal>Dir::Etc</literal> contains the location of configuration files, "
 "<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -4471,7 +4453,7 @@ msgstr ""
 "ファイルを指定された場合のみ、この設定の効果があります)"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:622
+#: apt.conf.5.xml:617
 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 "
@@ -4482,7 +4464,7 @@ msgstr ""
 "します。"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:626
+#: apt.conf.5.xml:621
 msgid ""
 "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
 "Bin::Methods</literal> specifies the location of the method handlers and "
@@ -4499,7 +4481,7 @@ msgstr ""
 "プログラムの場所を指定します。"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:634
+#: apt.conf.5.xml:629
 msgid ""
 "The configuration item <literal>RootDir</literal> has a special meaning.  If "
 "set, all paths in <literal>Dir::</literal> will be relative to "
@@ -4519,7 +4501,7 @@ msgstr ""
 "<filename>/tmp/staging/var/lib/dpkg/status</filename> から探します。"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:647
+#: apt.conf.5.xml:642
 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 "
@@ -4535,12 +4517,12 @@ msgstr ""
 "フォルト値を見ればわかる通り、このパターンには正規表現を使用できます。"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:656
+#: apt.conf.5.xml:651
 msgid "APT in DSelect"
 msgstr "DSelect での APT"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:658
+#: apt.conf.5.xml:653
 msgid ""
 "When APT is used as a &dselect; method several configuration directives "
 "control the default behavior. These are in the <literal>DSelect</literal> "
@@ -4551,7 +4533,7 @@ msgstr ""
 "ます。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:663
+#: apt.conf.5.xml:658
 msgid ""
 "Cache Clean mode; this value may be one of <literal>always</literal>, "
 "<literal>prompt</literal>, <literal>auto</literal>, <literal>pre-auto</"
@@ -4572,7 +4554,7 @@ msgstr ""
 "パッケージをダウンロードする直前に行います。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:677
+#: apt.conf.5.xml:672
 msgid ""
 "The contents of this variable are passed to &apt-get; as command line "
 "options when it is run for the install phase."
@@ -4581,7 +4563,7 @@ msgstr ""
 "されます。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:682
+#: apt.conf.5.xml:677
 msgid ""
 "The contents of this variable are passed to &apt-get; as command line "
 "options when it is run for the update phase."
@@ -4590,7 +4572,7 @@ msgstr ""
 "されます。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:687
+#: apt.conf.5.xml:682
 msgid ""
 "If true the [U]pdate operation in &dselect; will always prompt to continue.  "
 "The default is to prompt only on error."
@@ -4599,12 +4581,12 @@ msgstr ""
 "します。デフォルトはエラーが発生した場合のみです。"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:693
+#: apt.conf.5.xml:688
 msgid "How APT calls &dpkg;"
 msgstr "APT が &dpkg; を呼ぶ方法"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:694
+#: apt.conf.5.xml:689
 msgid ""
 "Several configuration directives control how APT invokes &dpkg;. These are "
 "in the <literal>DPkg</literal> section."
@@ -4613,7 +4595,7 @@ msgstr ""
 "<literal>DPkg</literal> セクションにあります。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:699
+#: apt.conf.5.xml:694
 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 "
@@ -4623,7 +4605,7 @@ msgstr ""
 "なければなりません。また、各リストは単一の引数として &dpkg; に渡されます。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:705
+#: apt.conf.5.xml:700
 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 "
@@ -4635,14 +4617,7 @@ msgstr ""
 "bin/sh</filename> を通して呼び出され、何か問題があれば APT が異常終了します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:712
-#, fuzzy
-#| 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 "
-#| "commands are invoked in order using <filename>/bin/sh</filename>; should "
-#| "any fail APT will abort. APT will pass the filenames of all .deb files it "
-#| "is going to install to the commands, one per line on standard input."
+#: apt.conf.5.xml:707
 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 "
@@ -4654,18 +4629,12 @@ msgstr ""
 "&dpkg; を呼び出す前に実行するシェルコマンドのリストです。<literal>options</"
 "literal> のようにリスト記法で指定しなければなりません。コマンドは <filename>/"
 "bin/sh</filename> を通して呼び出され、何か問題があれば、APT は異常終了しま"
-"す。APT はインストールしようとする全 .deb ファイルのファイル名を、1 行ずつコ"
-"マンドの標準入力に送ります。"
+"す。APT はインストールしようとする全 .deb ファイルのファイル名を、要求した"
+"ファイルディスクリプタについて1 行ずつ、デフォルトではコマンドの標準入力に送"
+"ります。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:719
-#, fuzzy
-#| msgid ""
-#| "Version 2 of this protocol dumps more information, including the protocol "
-#| "version, the APT configuration space and the packages, files and versions "
-#| "being changed. Version 2 is enabled by setting <literal>DPkg::Tools::"
-#| "options::cmd::Version</literal> to 2. <literal>cmd</literal> is a command "
-#| "given to <literal>Pre-Install-Pkgs</literal>."
+#: apt.conf.5.xml:714
 msgid ""
 "Version 2 of this protocol dumps more information, including the protocol "
 "version, the APT configuration space and the packages, files and versions "
@@ -4674,12 +4643,11 @@ msgid ""
 msgstr ""
 "このプロトコルのバージョン 2 では、(プロトコルのバージョンや APT 設定スペー"
 "ス、パッケージを含む) 詳細情報やファイル、変更されているバージョンを出力しま"
-"す。<literal>DPkg::Tools::options::cmd::Version</literal> に 2 を設定すると、"
-"バージョン 2 を有効にできます。<literal>cmd</literal> は <literal>Pre-"
-"Install-Pkgs</literal> で与えられるコマンドです。"
+"す。バージョン 3 では出力の各バージョンにアーキテクチャと "
+"<literal>MultiArch</literal> フラグが追加されています。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:724
+#: apt.conf.5.xml:719
 msgid ""
 "The version of the protocol to be used for the command "
 "<literal><replaceable>cmd</replaceable></literal> can be chosen by setting "
@@ -4688,9 +4656,14 @@ msgid ""
 "the requested version it will send the information in the highest version it "
 "has support for instead."
 msgstr ""
+"コマンド <literal><replaceable>cmd</replaceable></literal> で利用するプロトコ"
+"ルのバージョンは <literal>DPkg::Tools::options::<replaceable>cmd</"
+"replaceable>::Version</literal> の設定により選択でき、デフォルトはバージョン "
+"1 となっています。リクエストしたバージョンを APT がサポートしていない場合はサ"
+"ポートしている最大のバージョンの情報を代わりに送ります。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:731
+#: apt.conf.5.xml:726
 msgid ""
 "The file descriptor to be used to send the information can be requested with "
 "<literal>DPkg::Tools::options::<replaceable>cmd</replaceable>::InfoFD</"
@@ -4699,9 +4672,15 @@ msgid ""
 "looking for the environment variable <envar>APT_HOOK_INFO_FD</envar> which "
 "contains the number of the used file descriptor as a confirmation."
 msgstr ""
+"情報の送信に利用するファイルディスクリプタは <literal>DPkg::Tools::options::"
+"<replaceable>cmd</replaceable>::InfoFD</literal> によりリクエストでき、デフォ"
+"ルトは <literal>0</literal> で標準入力を指定します。バージョン 0.9.11 から利"
+"用可能となりました。環境変数 <envar>APT_HOOK_INFO_FD</envar> を見ることでこの"
+"オプションに対応していることを検出でき、それには確認として利用しているファイ"
+"ルディスクリプタの番号が収録されています。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:741
+#: apt.conf.5.xml:736
 msgid ""
 "APT chdirs to this directory before invoking &dpkg;, the default is "
 "<filename>/</filename>."
@@ -4710,7 +4689,7 @@ msgstr ""
 "<filename>/</filename> です。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:746
+#: apt.conf.5.xml:741
 msgid ""
 "These options are passed to &dpkg-buildpackage; when compiling packages; the "
 "default is to disable signing and produce all binaries."
@@ -4719,12 +4698,12 @@ msgstr ""
 "ます。デフォルトでは署名を無効にし、全バイナリを生成します。"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:751
+#: apt.conf.5.xml:746
 msgid "dpkg trigger usage (and related options)"
 msgstr "dpkg トリガの使い方 (および関連オプション)"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:752
+#: apt.conf.5.xml:747
 msgid ""
 "APT can call &dpkg; in such a way as to let it make aggressive use of "
 "triggers over multiple calls of &dpkg;. Without further options &dpkg; will "
@@ -4748,7 +4727,7 @@ msgstr ""
 "(もしくはそれ以上) の時間 100% のままとなり、進捗レポートを壊してしまいます。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:767
+#: apt.conf.5.xml:762
 #, no-wrap
 msgid ""
 "DPkg::NoTriggers \"true\";\n"
@@ -4762,7 +4741,7 @@ msgstr ""
 "DPkg::TriggersPending \"true\";"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:761
+#: apt.conf.5.xml:756
 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 "
@@ -4785,7 +4764,7 @@ msgstr ""
 "\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:774
+#: apt.conf.5.xml:769
 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 "
@@ -4805,7 +4784,7 @@ msgstr ""
 "在 APT は、このフラグを、展開呼び出しや削除呼び出しにも追加します。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:782
+#: apt.conf.5.xml:777
 msgid ""
 "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
 "and \"<literal>no</literal>\".  The default value is \"<literal>all</literal>"
@@ -4832,7 +4811,7 @@ msgstr ""
 "能性があるからです。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:797
+#: apt.conf.5.xml:792
 msgid ""
 "If this option is set APT will call <command>dpkg --configure --pending</"
 "command> to let &dpkg; handle all required configurations and triggers. This "
@@ -4849,7 +4828,7 @@ msgstr ""
 "では、最後以外のすべての実行で、無効にできます。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:804
+#: apt.conf.5.xml:799
 msgid ""
 "Useful for the <literal>smart</literal> configuration as a package which has "
 "pending triggers is not considered as <literal>installed</literal>, and "
@@ -4864,7 +4843,7 @@ msgstr ""
 "ことに注意してください。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:817
+#: apt.conf.5.xml:812
 #, no-wrap
 msgid ""
 "OrderList::Score {\n"
@@ -4882,7 +4861,7 @@ msgstr ""
 "};"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:810
+#: apt.conf.5.xml:805
 msgid ""
 "Essential packages (and their dependencies) should be configured immediately "
 "after unpacking. It is a good idea to do this quite early in the upgrade "
@@ -4905,12 +4884,12 @@ msgstr ""
 "\"literallayout\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:830
+#: apt.conf.5.xml:825
 msgid "Periodic and Archives options"
 msgstr "Periodic オプションと Archives オプション"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:831
+#: apt.conf.5.xml:826
 msgid ""
 "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
 "of options configure behavior of apt periodic updates, which is done by the "
@@ -4923,12 +4902,12 @@ msgstr ""
 "トは、このスクリプトの先頭を参照してください。"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:839
+#: apt.conf.5.xml:834
 msgid "Debug options"
 msgstr "デバッグオプション"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:841
+#: apt.conf.5.xml:836
 msgid ""
 "Enabling options in the <literal>Debug::</literal> section will cause "
 "debugging information to be sent to the standard error stream of the program "
@@ -4944,7 +4923,7 @@ msgstr ""
 "のオプションは興味がないでしょうが、以下のものは興味を引くかもしれません。"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:852
+#: apt.conf.5.xml:847
 msgid ""
 "<literal>Debug::pkgProblemResolver</literal> enables output about the "
 "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -4955,7 +4934,7 @@ msgstr ""
 "にします。"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:860
+#: apt.conf.5.xml:855
 msgid ""
 "<literal>Debug::NoLocking</literal> disables all file locking.  This can be "
 "used to run some operations (for instance, <literal>apt-get -s install</"
@@ -4966,7 +4945,7 @@ msgstr ""
 "literal>) を行う場合に使用します。"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:869
+#: apt.conf.5.xml:864
 msgid ""
 "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
 "time that <literal>apt</literal> invokes &dpkg;."
@@ -4978,7 +4957,7 @@ 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:877
+#: apt.conf.5.xml:872
 msgid ""
 "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
 "in CD-ROM IDs."
@@ -4987,34 +4966,34 @@ msgstr ""
 "ないようにします。"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:887
+#: apt.conf.5.xml:882
 msgid "A full list of debugging options to apt follows."
 msgstr "以下は apt に対するデバッグオプションのすべてです。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:896
+#: apt.conf.5.xml:891
 msgid ""
 "Print information related to accessing <literal>cdrom://</literal> sources."
 msgstr ""
 "<literal>cdrom://</literal> ソースへのアクセスに関する情報を出力します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:907
+#: apt.conf.5.xml:902
 msgid "Print information related to downloading packages using FTP."
 msgstr "FTP を用いたパッケージのダウンロードに関する情報を出力します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:918
+#: apt.conf.5.xml:913
 msgid "Print information related to downloading packages using HTTP."
 msgstr "HTTP を用いたパッケージのダウンロードに関する情報を出力します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:929
+#: apt.conf.5.xml:924
 msgid "Print information related to downloading packages using HTTPS."
 msgstr "HTTPS を用いたパッケージのダウンロードに関する情報を出力します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:940
+#: apt.conf.5.xml:935
 msgid ""
 "Print information related to verifying cryptographic signatures using "
 "<literal>gpg</literal>."
@@ -5022,7 +5001,7 @@ msgstr ""
 "<literal>gpg</literal> を用いた暗号署名の検証に関する情報を出力します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:951
+#: apt.conf.5.xml:946
 msgid ""
 "Output information about the process of accessing collections of packages "
 "stored on CD-ROMs."
@@ -5031,12 +5010,12 @@ msgstr ""
 "します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:961
+#: apt.conf.5.xml:956
 msgid "Describes the process of resolving build-dependencies in &apt-get;."
 msgstr "&apt-get; での構築依存関係解決のプロセスを説明します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:971
+#: apt.conf.5.xml:966
 msgid ""
 "Output each cryptographic hash that is generated by the <literal>apt</"
 "literal> libraries."
@@ -5044,7 +5023,7 @@ msgstr ""
 "<literal>apt</literal> ライブラリが生成した、暗号化ハッシュを出力します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:981
+#: apt.conf.5.xml:976
 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 "
@@ -5054,7 +5033,7 @@ msgstr ""
 "システムにある使用済・未使用ブロックの数からの情報を含めないようにします。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:992
+#: apt.conf.5.xml:987
 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."
@@ -5063,13 +5042,13 @@ msgstr ""
 "<quote><literal>apt-get update</literal></quote> を実行できるようになります。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1004
+#: apt.conf.5.xml:999
 msgid "Log when items are added to or removed from the global download queue."
 msgstr ""
 "グローバルダウンロードキューに対する項目の追加・削除の際にログを出力します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1014
+#: apt.conf.5.xml:1009
 msgid ""
 "Output status messages and errors related to verifying checksums and "
 "cryptographic signatures of downloaded files."
@@ -5078,7 +5057,7 @@ msgstr ""
 "ジやエラーを出力します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1024
+#: apt.conf.5.xml:1019
 msgid ""
 "Output information about downloading and applying package index list diffs, "
 "and errors relating to package index list diffs."
@@ -5087,7 +5066,7 @@ msgstr ""
 "します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1036
+#: apt.conf.5.xml:1031
 msgid ""
 "Output information related to patching apt package lists when downloading "
 "index diffs instead of full indices."
@@ -5096,14 +5075,14 @@ msgstr ""
 "リストへのパッチ適用に関する情報を出力します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1047
+#: apt.conf.5.xml:1042
 msgid ""
 "Log all interactions with the sub-processes that actually perform downloads."
 msgstr ""
 "実際のダウンロードを行う際の、サブプロセスとのやりとりをログに出力します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1058
+#: apt.conf.5.xml:1053
 msgid ""
 "Log events related to the automatically-installed status of packages and to "
 "the removal of unused packages."
@@ -5112,7 +5091,7 @@ msgstr ""
 "に出力します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1068
+#: apt.conf.5.xml:1063
 msgid ""
 "Generate debug messages describing which packages are being automatically "
 "installed to resolve dependencies.  This corresponds to the initial auto-"
@@ -5127,7 +5106,7 @@ msgstr ""
 "路に対応しています。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1082
+#: apt.conf.5.xml:1077
 msgid ""
 "Generate debug messages describing which packages are marked as keep/install/"
 "remove while the ProblemResolver does his work.  Each addition or deletion "
@@ -5156,7 +5135,7 @@ msgstr ""
 "ます。<literal>section</literal> はパッケージが現れるセクション名です。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1103
+#: apt.conf.5.xml:1098
 msgid ""
 "When invoking &dpkg;, output the precise command line with which it is being "
 "invoked, with arguments separated by a single space character."
@@ -5165,7 +5144,7 @@ msgstr ""
 "切られます。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1114
+#: apt.conf.5.xml:1109
 msgid ""
 "Output all the data received from &dpkg; on the status file descriptor and "
 "any errors encountered while parsing it."
@@ -5174,7 +5153,7 @@ msgstr ""
 "を解析中に発生したエラーを出力します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1125
+#: apt.conf.5.xml:1120
 msgid ""
 "Generate a trace of the algorithm that decides the order in which "
 "<literal>apt</literal> should pass packages to &dpkg;."
@@ -5183,18 +5162,18 @@ msgstr ""
 "のトレースを生成します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1137
+#: apt.conf.5.xml:1132
 msgid ""
 "Output status messages tracing the steps performed when invoking &dpkg;."
 msgstr "&dpkg; を呼び出す際に、実行手順を追跡した状態メッセージを出力します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1148
+#: apt.conf.5.xml:1143
 msgid "Output the priority of each package list on startup."
 msgstr "起動時の各パッケージの優先度を表示します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1158
+#: apt.conf.5.xml:1153
 msgid ""
 "Trace the execution of the dependency resolver (this applies only to what "
 "happens when a complex dependency problem is encountered)."
@@ -5203,7 +5182,7 @@ msgstr ""
 "した場合にのみ、適用されます)。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1169
+#: apt.conf.5.xml:1164
 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 "
@@ -5214,7 +5193,7 @@ msgstr ""
 "説明したものと同じです。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1181
+#: apt.conf.5.xml:1176
 msgid ""
 "Print information about the vendors read from <filename>/etc/apt/vendors."
 "list</filename>."
@@ -5223,21 +5202,24 @@ msgstr ""
 "します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1191
+#: apt.conf.5.xml:1186
 msgid ""
 "Display the external commands that are called by apt hooks.  This includes e."
 "g. the config options <literal>DPkg::{Pre,Post}-Invoke</literal> or "
 "<literal>APT::Update::{Pre,Post}-Invoke</literal>."
 msgstr ""
+"aptのフックにより呼び出される外部コマンドを表示します。これには例えば、設定オ"
+"プション <literal>DPkg::{Pre,Post}-Invoke</literal> や <literal>APT::Update::"
+"{Pre,Post}-Invoke</literal> があります。"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1215 apt_preferences.5.xml:547 sources.list.5.xml:239
-#: apt-ftparchive.1.xml:598
+#: apt.conf.5.xml:1210 apt_preferences.5.xml:541 sources.list.5.xml:233
+#: apt-ftparchive.1.xml:592
 msgid "Examples"
 msgstr "サンプル"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1216
+#: apt.conf.5.xml:1211
 msgid ""
 "&configureindex; is a configuration file showing example values for all "
 "possible options."
@@ -5247,17 +5229,17 @@ msgstr ""
 
 #.  ? reading apt.conf 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1228
+#: apt.conf.5.xml:1223
 msgid "&apt-cache;, &apt-config;, &apt-preferences;."
 msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt_preferences.5.xml:34
+#: apt_preferences.5.xml:28
 msgid "Preference control file for APT"
 msgstr "APT 用選択制御ファイル"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:39
+#: apt_preferences.5.xml:33
 msgid ""
 "The APT preferences file <filename>/etc/apt/preferences</filename> and the "
 "fragment files in the <filename>/etc/apt/preferences.d/</filename> folder "
@@ -5269,7 +5251,7 @@ msgstr ""
 "ンストールするパッケージのバージョンを制御するのに使用します。"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:44
+#: apt_preferences.5.xml:38
 msgid ""
 "Several versions of a package may be available for installation when the "
 "&sources-list; file contains references to more than one distribution (for "
@@ -5290,7 +5272,7 @@ msgstr ""
 "のの選択を、ユーザが選択できるようになります。"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:54
+#: apt_preferences.5.xml:48
 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 "
@@ -5305,7 +5287,7 @@ msgstr ""
 "し、インスタンスの選択には影響しません。"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:61
+#: apt_preferences.5.xml:55
 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 "
@@ -5328,7 +5310,7 @@ msgstr ""
 "ん)。以上、警告しました。"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:72
+#: apt_preferences.5.xml:66
 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 "
@@ -5348,24 +5330,24 @@ msgstr ""
 "する場合は黙って無視します。"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:81
+#: apt_preferences.5.xml:75
 msgid "APT's Default Priority Assignments"
 msgstr "APT のデフォルト優先度の割り当て"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:96
+#: apt_preferences.5.xml:90
 #, no-wrap
 msgid "<command>apt-get install -t testing <replaceable>some-package</replaceable></command>\n"
 msgstr "<command>apt-get install -t testing <replaceable>some-package</replaceable></command>\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:99
+#: apt_preferences.5.xml:93
 #, no-wrap
 msgid "APT::Default-Release \"stable\";\n"
 msgstr "APT::Default-Release \"stable\";\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:83
+#: apt_preferences.5.xml:77
 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 "
@@ -5391,7 +5373,7 @@ msgstr ""
 "\"programlisting\" id=\"0\"/> <placeholder type=\"programlisting\" id=\"1\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:103
+#: apt_preferences.5.xml:97
 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:"
@@ -5400,12 +5382,12 @@ msgstr ""
 "バージョンの優先度を設定します。以下のように割り当てます。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:108
+#: apt_preferences.5.xml:102
 msgid "priority 1"
 msgstr "優先度 1"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:109
+#: apt_preferences.5.xml:103
 msgid ""
 "to the versions coming from archives which in their <filename>Release</"
 "filename> files are marked as \"NotAutomatic: yes\" but <emphasis>not</"
@@ -5418,12 +5400,12 @@ msgstr ""
 "アーカイブ由来のバージョン。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:115
+#: apt_preferences.5.xml:109
 msgid "priority 100"
 msgstr "優先度 100"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:116
+#: apt_preferences.5.xml:110
 msgid ""
 "to the version that is already installed (if any) and to the versions coming "
 "from archives which in their <filename>Release</filename> files are marked "
@@ -5436,30 +5418,30 @@ msgstr ""
 "\"ButAutomaticUpgrades: yes\" とマークされているアーカイブ由来のバージョン。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:123
+#: apt_preferences.5.xml:117
 msgid "priority 500"
 msgstr "優先度 500"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:124
+#: apt_preferences.5.xml:118
 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:128
+#: apt_preferences.5.xml:122
 msgid "priority 990"
 msgstr "優先度 990"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:129
+#: apt_preferences.5.xml:123
 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:134
+#: apt_preferences.5.xml:128
 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 "
@@ -5477,7 +5459,7 @@ msgstr ""
 "てます。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:141
+#: apt_preferences.5.xml:135
 msgid ""
 "APT then applies the following rules, listed in order of precedence, to "
 "determine which version of a package to install."
@@ -5486,7 +5468,7 @@ msgstr ""
 "を上から順番に適用します。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:144
+#: apt_preferences.5.xml:138
 msgid ""
 "Never downgrade unless the priority of an available version exceeds 1000.  "
 "(\"Downgrading\" is installing a less recent version of a package in place "
@@ -5501,12 +5483,12 @@ msgstr ""
 "す。また、パッケージのダウングレードは危険であることにも注意してください)"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:150
+#: apt_preferences.5.xml:144
 msgid "Install the highest priority version."
 msgstr "最も高い優先度のバージョンをインストールします。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:151
+#: apt_preferences.5.xml:145
 msgid ""
 "If two or more versions have the same priority, install the most recent one "
 "(that is, the one with the higher version number)."
@@ -5515,7 +5497,7 @@ msgstr ""
 "が高いもの) をインストールします。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:154
+#: apt_preferences.5.xml:148
 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 <literal>--reinstall</"
@@ -5526,7 +5508,7 @@ msgstr ""
 "トールされていないものをインストールします。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:160
+#: apt_preferences.5.xml:154
 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 "
@@ -5541,7 +5523,7 @@ msgstr ""
 "get upgrade</command> を実行するとパッケージが更新されます。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:167
+#: apt_preferences.5.xml:161
 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 "
@@ -5554,7 +5536,7 @@ msgstr ""
 "get upgrade</command> を実行しても、ダウングレードしません。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:172
+#: apt_preferences.5.xml:166
 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 "
@@ -5573,12 +5555,12 @@ msgstr ""
 "ケージがあるからです。"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:181
+#: apt_preferences.5.xml:175
 msgid "The Effect of APT Preferences"
 msgstr "APT プリファレンスファイルの効果"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:183
+#: apt_preferences.5.xml:177
 msgid ""
 "The APT preferences file allows the system administrator to control the "
 "assignment of priorities.  The file consists of one or more multi-line "
@@ -5590,7 +5572,7 @@ msgstr ""
 "れています。レコードは特定形式か、汎用形式のどちらかの形式をとります。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:189
+#: apt_preferences.5.xml:183
 msgid ""
 "The specific form assigns a priority (a \"Pin-Priority\") to one or more "
 "specified packages with a specified version or version range.  For example, "
@@ -5606,7 +5588,7 @@ msgstr ""
 "きます。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:196
+#: apt_preferences.5.xml:190
 #, no-wrap
 msgid ""
 "Package: perl\n"
@@ -5618,7 +5600,7 @@ msgstr ""
 "Pin-Priority: 1001\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:202
+#: apt_preferences.5.xml:196
 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 "
@@ -5632,7 +5614,7 @@ msgstr ""
 "てます。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:208
+#: apt_preferences.5.xml:202
 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 "
@@ -5643,7 +5625,7 @@ msgstr ""
 "全パッケージについて、高い優先度を割り当てます。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:213
+#: apt_preferences.5.xml:207
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -5655,7 +5637,7 @@ msgstr ""
 "Pin-Priority: 999\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:218
+#: apt_preferences.5.xml:212
 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 "
@@ -5668,7 +5650,7 @@ msgstr ""
 "てます。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:222
+#: apt_preferences.5.xml:216
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -5680,7 +5662,7 @@ msgstr ""
 "Pin-Priority: 999\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:226
+#: apt_preferences.5.xml:220
 msgid ""
 "This should <emphasis>not</emphasis> be confused with the Origin of a "
 "distribution as specified in a <filename>Release</filename> file.  What "
@@ -5694,7 +5676,7 @@ msgstr ""
 "トアドレスではなく、\"Debian\" や \"Ximian\" といった作者やベンダ名です。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:231
+#: apt_preferences.5.xml:225
 msgid ""
 "The following record assigns a low priority to all package versions "
 "belonging to any distribution whose Archive name is \"<literal>unstable</"
@@ -5704,7 +5686,7 @@ msgstr ""
 "ディストリビューションに属するパッケージを、すべて低い優先度に割り当てます。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:235
+#: apt_preferences.5.xml:229
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -5716,7 +5698,7 @@ msgstr ""
 "Pin-Priority: 50\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:240
+#: apt_preferences.5.xml:234
 msgid ""
 "The following record assigns a high priority to all package versions "
 "belonging to any distribution whose Codename is \"<literal>&testing-codename;"
@@ -5727,7 +5709,7 @@ msgstr ""
 "り当てます。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:244
+#: apt_preferences.5.xml:238
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -5739,7 +5721,7 @@ msgstr ""
 "Pin-Priority: 900\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:249
+#: apt_preferences.5.xml:243
 msgid ""
 "The following record assigns a high priority to all package versions "
 "belonging to any release whose Archive name is \"<literal>stable</literal>\" "
@@ -5750,7 +5732,7 @@ msgstr ""
 "に属するパッケージを、すべて高い優先度に割り当てます。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:254
+#: apt_preferences.5.xml:248
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -5762,12 +5744,12 @@ msgstr ""
 "Pin-Priority: 500\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:264
+#: apt_preferences.5.xml:258
 msgid "Regular expressions and &glob; syntax"
 msgstr "正規表現と &glob; 構文"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:266
+#: apt_preferences.5.xml:260
 msgid ""
 "APT also supports pinning by &glob; expressions, and regular expressions "
 "surrounded by slashes. For example, the following example assigns the "
@@ -5781,7 +5763,7 @@ msgstr ""
 "ケージに、優先度500を割り当てます。"
 
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:275
+#: apt_preferences.5.xml:269
 #, no-wrap
 msgid ""
 "Package: gnome* /kde/\n"
@@ -5793,7 +5775,7 @@ msgstr ""
 "Pin-Priority: 500\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:281
+#: apt_preferences.5.xml:275
 msgid ""
 "The rule for those expressions is that they can occur anywhere where a "
 "string can occur. Thus, the following pin assigns the priority 990 to all "
@@ -5804,7 +5786,7 @@ msgstr ""
 "パッケージに、優先度 990 を割り当てます。"
 
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:287
+#: apt_preferences.5.xml:281
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -5816,7 +5798,7 @@ msgstr ""
 "Pin-Priority: 990\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:293
+#: apt_preferences.5.xml:287
 msgid ""
 "If a regular expression occurs in a <literal>Package</literal> field, the "
 "behavior is the same as if this regular expression were replaced with a list "
@@ -5833,12 +5815,12 @@ msgstr ""
 "体とは見なされません。"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:309
+#: apt_preferences.5.xml:303
 msgid "How APT Interprets Priorities"
 msgstr "APT が優先度に割り込む方法"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:312
+#: apt_preferences.5.xml:306
 msgid ""
 "Priorities (P) assigned in the APT preferences file must be positive or "
 "negative integers.  They are interpreted as follows (roughly speaking):"
@@ -5847,12 +5829,12 @@ msgstr ""
 "ません。これは (おおざっぱにいうと) 以下のように解釈されます。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:317
+#: apt_preferences.5.xml:311
 msgid "P &gt;= 1000"
 msgstr "P &gt;= 1000"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:318
+#: apt_preferences.5.xml:312
 msgid ""
 "causes a version to be installed even if this constitutes a downgrade of the "
 "package"
@@ -5860,12 +5842,12 @@ msgstr ""
 "パッケージがダウングレードしても、このバージョンのパッケージをインストール"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:322
+#: apt_preferences.5.xml:316
 msgid "990 &lt;= P &lt; 1000"
 msgstr "990 &lt;= P &lt; 1000"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:323
+#: apt_preferences.5.xml:317
 msgid ""
 "causes a version to be installed even if it does not come from the target "
 "release, unless the installed version is more recent"
@@ -5874,12 +5856,12 @@ msgstr ""
 "に含まれなくても、このバージョンのパッケージをインストール"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:328
+#: apt_preferences.5.xml:322
 msgid "500 &lt;= P &lt; 990"
 msgstr "500 &lt;= P &lt; 990"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:329
+#: apt_preferences.5.xml:323
 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"
@@ -5888,12 +5870,12 @@ msgstr ""
 "ジョンの方が新しいのでなければ、このバージョンのパッケージをインストール"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:334
+#: apt_preferences.5.xml:328
 msgid "100 &lt;= P &lt; 500"
 msgstr "100 &lt;= P &lt; 500"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:335
+#: apt_preferences.5.xml:329
 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"
@@ -5903,12 +5885,12 @@ msgstr ""
 "ル"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:340
+#: apt_preferences.5.xml:334
 msgid "0 &lt; P &lt; 100"
 msgstr "0 &lt; P &lt; 100"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:341
+#: apt_preferences.5.xml:335
 msgid ""
 "causes a version to be installed only if there is no installed version of "
 "the package"
@@ -5917,17 +5899,17 @@ msgstr ""
 "ンストール"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:345
+#: apt_preferences.5.xml:339
 msgid "P &lt; 0"
 msgstr "P &lt; 0"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:346
+#: apt_preferences.5.xml:340
 msgid "prevents the version from being installed"
 msgstr "このバージョンのインストール禁止"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:351
+#: apt_preferences.5.xml:345
 msgid ""
 "If any specific-form records match an available package version then the "
 "first such record determines the priority of the package version.  Failing "
@@ -5940,7 +5922,7 @@ msgstr ""
 "バージョンの優先度を決定します。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:357
+#: apt_preferences.5.xml:351
 msgid ""
 "For example, suppose the APT preferences file contains the three records "
 "presented earlier:"
@@ -5949,7 +5931,7 @@ msgstr ""
 "仮定してください。"
 
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:361
+#: apt_preferences.5.xml:355
 #, no-wrap
 msgid ""
 "Package: perl\n"
@@ -5977,12 +5959,12 @@ msgstr ""
 "Pin-Priority: 50\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:374
+#: apt_preferences.5.xml:368
 msgid "Then:"
 msgstr "すると、以下のように動作します。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:376
+#: apt_preferences.5.xml:370
 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 "
@@ -5996,7 +5978,7 @@ msgstr ""
 "れている場合、<literal>perl</literal> はダウングレードされます。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:381
+#: apt_preferences.5.xml:375
 msgid ""
 "A version of any package other than <literal>perl</literal> that is "
 "available from the local system has priority over other versions, even "
@@ -6007,7 +5989,7 @@ msgstr ""
 "なります。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:385
+#: apt_preferences.5.xml:379
 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 <literal>unstable</"
@@ -6020,12 +6002,12 @@ msgstr ""
 "い場合にのみインストールされます。"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:395
+#: apt_preferences.5.xml:389
 msgid "Determination of Package Version and Distribution Properties"
 msgstr "パッケージのバージョンとディストリビューションプロパティの決定"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:397
+#: apt_preferences.5.xml:391
 msgid ""
 "The locations listed in the &sources-list; file should provide "
 "<filename>Packages</filename> and <filename>Release</filename> files to "
@@ -6036,7 +6018,7 @@ msgstr ""
 "filename> ファイルを提供します。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:401
+#: apt_preferences.5.xml:395
 msgid ""
 "The <filename>Packages</filename> file is normally found in the directory "
 "<filename>.../dists/<replaceable>dist-name</replaceable>/"
@@ -6054,27 +6036,27 @@ msgstr ""
 "ます。APT 優先度の設定は、レコードごとに以下の 2 行だけです。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:409
+#: apt_preferences.5.xml:403
 msgid "the <literal>Package:</literal> line"
 msgstr "<literal>Package:</literal> 行"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:410
+#: apt_preferences.5.xml:404
 msgid "gives the package name"
 msgstr "パッケージ名"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:413 apt_preferences.5.xml:463
+#: apt_preferences.5.xml:407 apt_preferences.5.xml:457
 msgid "the <literal>Version:</literal> line"
 msgstr "<literal>Version:</literal> 行"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:414
+#: apt_preferences.5.xml:408
 msgid "gives the version number for the named package"
 msgstr "その名前のパッケージのバージョン番号"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:419
+#: apt_preferences.5.xml:413
 msgid ""
 "The <filename>Release</filename> file is normally found in the directory "
 "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
@@ -6095,12 +6077,12 @@ msgstr ""
 "す。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:430
+#: apt_preferences.5.xml:424
 msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
 msgstr "<literal>Archive:</literal> 行や <literal>Suite:</literal> 行"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:431
+#: apt_preferences.5.xml:425
 msgid ""
 "names the archive to which all the packages in the directory tree belong.  "
 "For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@ -6116,18 +6098,18 @@ msgstr ""
 "ルでこの値を指定するには、以下の行が必要になります。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:441
+#: apt_preferences.5.xml:435
 #, no-wrap
 msgid "Pin: release a=stable\n"
 msgstr "Pin: release a=stable\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:447
+#: apt_preferences.5.xml:441
 msgid "the <literal>Codename:</literal> line"
 msgstr "<literal>Codename:</literal> 行"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:448
+#: apt_preferences.5.xml:442
 msgid ""
 "names the codename to which all the packages in the directory tree belong.  "
 "For example, the line \"Codename: &testing-codename;\" specifies that all of "
@@ -6144,13 +6126,13 @@ msgstr ""
 "ます。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:457
+#: apt_preferences.5.xml:451
 #, no-wrap
 msgid "Pin: release n=&testing-codename;\n"
 msgstr "Pin: release n=&testing-codename;\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:464
+#: apt_preferences.5.xml:458
 msgid ""
 "names the release version.  For example, the packages in the tree might "
 "belong to Debian release version &stable-version;.  Note that there is "
@@ -6167,7 +6149,7 @@ msgstr ""
 "ります。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:473
+#: apt_preferences.5.xml:467
 #, no-wrap
 msgid ""
 "Pin: release v=&stable-version;\n"
@@ -6179,12 +6161,12 @@ msgstr ""
 "Pin: release &stable-version;\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:482
+#: apt_preferences.5.xml:476
 msgid "the <literal>Component:</literal> line"
 msgstr "<literal>Component:</literal> 行"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:483
+#: apt_preferences.5.xml:477
 msgid ""
 "names the licensing component associated with the packages in the directory "
 "tree of the <filename>Release</filename> file.  For example, the line "
@@ -6201,18 +6183,18 @@ msgstr ""
 "下の行が必要になります。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:492
+#: apt_preferences.5.xml:486
 #, no-wrap
 msgid "Pin: release c=main\n"
 msgstr "Pin: release c=main\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:498
+#: apt_preferences.5.xml:492
 msgid "the <literal>Origin:</literal> line"
 msgstr "<literal>Origin:</literal> 行"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:499
+#: apt_preferences.5.xml:493
 msgid ""
 "names the originator of the packages in the directory tree of the "
 "<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"
@@ -6224,18 +6206,18 @@ msgstr ""
 "ファイルでこの提供者を指定するには、以下の行が必要になります。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:505
+#: apt_preferences.5.xml:499
 #, no-wrap
 msgid "Pin: release o=Debian\n"
 msgstr "Pin: release o=Debian\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:511
+#: apt_preferences.5.xml:505
 msgid "the <literal>Label:</literal> line"
 msgstr "<literal>Label:</literal> 行"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:512
+#: apt_preferences.5.xml:506
 msgid ""
 "names the label of the packages in the directory tree of the "
 "<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"
@@ -6247,13 +6229,13 @@ msgstr ""
 "ファイルでこのラベルを指定するには、以下の行が必要になります。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:518
+#: apt_preferences.5.xml:512
 #, no-wrap
 msgid "Pin: release l=Debian\n"
 msgstr "Pin: release l=Debian\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:525
+#: apt_preferences.5.xml:519
 msgid ""
 "All of the <filename>Packages</filename> and <filename>Release</filename> "
 "files retrieved from locations listed in the &sources-list; file are stored "
@@ -6278,12 +6260,12 @@ msgstr ""
 "filename> ファイルを含んでいます。"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:538
+#: apt_preferences.5.xml:532
 msgid "Optional Lines in an APT Preferences Record"
 msgstr "APT プリファレンスレコードのオプション行"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:540
+#: apt_preferences.5.xml:534
 msgid ""
 "Each record in the APT preferences file can optionally begin with one or "
 "more lines beginning with the word <literal>Explanation:</literal>.  This "
@@ -6293,12 +6275,12 @@ msgstr ""
 "literal> で始まる行を持てます。これは、コメント用の場所を確保します。"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:549
+#: apt_preferences.5.xml:543
 msgid "Tracking Stable"
 msgstr "安定版の追跡"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:557
+#: apt_preferences.5.xml:551
 #, no-wrap
 msgid ""
 "Explanation: Uninstall or do not install any Debian-originated\n"
@@ -6322,7 +6304,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:551
+#: apt_preferences.5.xml:545
 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 "
@@ -6337,8 +6319,8 @@ msgstr ""
 "す。<placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:574 apt_preferences.5.xml:620
-#: apt_preferences.5.xml:678
+#: apt_preferences.5.xml:568 apt_preferences.5.xml:614
+#: apt_preferences.5.xml:672
 #, no-wrap
 msgid ""
 "apt-get install <replaceable>package-name</replaceable>\n"
@@ -6350,7 +6332,7 @@ msgstr ""
 "apt-get dist-upgrade\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:569
+#: apt_preferences.5.xml:563
 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 "
@@ -6362,13 +6344,13 @@ msgstr ""
 "できます。<placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:586
+#: apt_preferences.5.xml:580
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/testing\n"
 msgstr "apt-get install <replaceable>package</replaceable>/testing\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:580
+#: apt_preferences.5.xml:574
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>testing</literal> distribution; the package "
@@ -6381,12 +6363,12 @@ msgstr ""
 "\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:592
+#: apt_preferences.5.xml:586
 msgid "Tracking Testing or Unstable"
 msgstr "テスト版や不安定版の追跡"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:601
+#: apt_preferences.5.xml:595
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -6414,7 +6396,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:594
+#: apt_preferences.5.xml:588
 msgid ""
 "The following APT preferences file will cause APT to assign a high priority "
 "to package versions from the <literal>testing</literal> distribution, a "
@@ -6431,7 +6413,7 @@ msgstr ""
 "先度を割り当てます。<placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:615
+#: apt_preferences.5.xml:609
 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 "
@@ -6443,13 +6425,13 @@ msgstr ""
 "ドできます。<placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:635
+#: apt_preferences.5.xml:629
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
 msgstr "apt-get install <replaceable>package</replaceable>/unstable\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:626
+#: apt_preferences.5.xml:620
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>unstable</literal> distribution.  "
@@ -6468,12 +6450,12 @@ msgstr ""
 "\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:642
+#: apt_preferences.5.xml:636
 msgid "Tracking the evolution of a codename release"
 msgstr "コード名リリースの進化の追跡"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:656
+#: apt_preferences.5.xml:650
 #, no-wrap
 msgid ""
 "Explanation: Uninstall or do not install any Debian-originated package versions\n"
@@ -6507,7 +6489,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:644
+#: apt_preferences.5.xml:638
 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 "
@@ -6531,7 +6513,7 @@ msgstr ""
 "す。<placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:673
+#: apt_preferences.5.xml:667
 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 "
@@ -6544,13 +6526,13 @@ msgstr ""
 "\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:693
+#: apt_preferences.5.xml:687
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/sid\n"
 msgstr "apt-get install <replaceable>package</replaceable>/sid\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:684
+#: apt_preferences.5.xml:678
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>sid</literal> distribution.  Thereafter, "
@@ -6569,17 +6551,17 @@ msgstr ""
 "\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:708
+#: apt_preferences.5.xml:702
 msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: sources.list.5.xml:35
+#: sources.list.5.xml:29
 msgid "List of configured APT data sources"
 msgstr "APT のデータ取得元の設定リスト"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:40
+#: sources.list.5.xml:34
 msgid ""
 "The source list <filename>/etc/apt/sources.list</filename> is designed to "
 "support any number of active sources and a variety of source media. The file "
@@ -6595,7 +6577,7 @@ msgstr ""
 "のコマンド) で取得します。"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:47
+#: sources.list.5.xml:41
 msgid ""
 "Each line specifying a source starts with type (e.g. <literal>deb-src</"
 "literal>)  followed by options and arguments for this type.  Individual "
@@ -6609,12 +6591,12 @@ msgstr ""
 "なります。"
 
 #. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:55
+#: sources.list.5.xml:49
 msgid "sources.list.d"
 msgstr "sources.list.d"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:56
+#: sources.list.5.xml:50
 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 "
@@ -6635,12 +6617,12 @@ msgstr ""
 "APT が出力します。一致する場合は黙って無視します。"
 
 #. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:67
+#: sources.list.5.xml:61
 msgid "The deb and deb-src types"
 msgstr "deb タイプと deb-src タイプ"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:68
+#: sources.list.5.xml:62
 msgid ""
 "The <literal>deb</literal> type references a typical two-level Debian "
 "archive, <filename>distribution/component</filename>. The "
@@ -6665,7 +6647,7 @@ msgstr ""
 "です。"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:79
+#: sources.list.5.xml:73
 msgid ""
 "The format for a <filename>sources.list</filename> entry using the "
 "<literal>deb</literal> and <literal>deb-src</literal> types is:"
@@ -6675,14 +6657,13 @@ msgstr ""
 "ます。"
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:82
-#, fuzzy, no-wrap
-#| msgid "deb [ options ] uri distribution [component1] [component2] [...]"
+#: sources.list.5.xml:76
+#, no-wrap
 msgid "deb [ options ] uri suite [component1] [component2] [...]"
-msgstr "deb [ オプション ] uri distribution [コンポーネント1] [コンポーネント2] [...]"
+msgstr "deb [ オプション ] uri スイート [コンポーネント1] [コンポーネント2] [...]"
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:86
+#: sources.list.5.xml:80
 #, no-wrap
 msgid ""
 "     Types: deb deb-src\n"
@@ -6703,26 +6684,35 @@ msgid ""
 "     [option1]: [option1-value]\n"
 "   "
 msgstr ""
+"     Types: deb deb-src\n"
+"     URIs: http://example.com\n"
+"     Suites: stable testing\n"
+"     Sections: component1 component2\n"
+"     Description: short\n"
+"      long long long\n"
+"     [option1]: [option1-value]\n"
+"\n"
+"     Types: deb\n"
+"     URIs: http://another.example.com\n"
+"     Suites: experimental\n"
+"     Sections: component1 component2\n"
+"     Enabled: no\n"
+"     Description: short\n"
+"      long long long\n"
+"     [option1]: [option1-value]\n"
+"   "
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:84
+#: sources.list.5.xml:78
 msgid ""
 "Alternatively a rfc822 style format is also supported: <placeholder type="
 "\"literallayout\" id=\"0\"/>"
 msgstr ""
+"他に rfc822 形式の表記もサポートしています: <placeholder type=\"literallayout"
+"\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:105
-#, fuzzy
-#| msgid ""
-#| "The URI for the <literal>deb</literal> type must specify the base of the "
-#| "Debian distribution, from which APT will find the information it needs.  "
-#| "<literal>distribution</literal> can specify an exact path, in which case "
-#| "the components must be omitted and <literal>distribution</literal> must "
-#| "end with a slash (<literal>/</literal>). This is useful for the case when "
-#| "only a particular sub-section of the archive denoted by the URI is of "
-#| "interest.  If <literal>distribution</literal> does not specify an exact "
-#| "path, at least one <literal>component</literal> must be present."
+#: sources.list.5.xml:99
 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.  "
@@ -6734,25 +6724,16 @@ msgid ""
 "<literal>component</literal> must be present."
 msgstr ""
 "<literal>deb</literal> タイプの URI は、APT が必要な情報を見つけられるよう"
-"に、Debian ディストリビューションの基底を指定しなければなりません。"
-"<literal>distribution</literal> には正確なパスを指定できます。その場合 "
-"component を省略し、<literal>distribution</literal> はスラッシュ (<literal>/"
-"</literal>) で終わらなくてはなりません。これは URL で指定されたアーカイブの、"
-"特定のサブセクションのみに関心があるときに役に立ちます。"
-"<literal>distribution</literal> に正確なパスを指定しないのなら、少なくともひ"
-"とつは <literal>component</literal> を指定しなければなりません。"
+"に、Debian ディストリビューションの基底を指定しなければなりません。<literal>"
+"スイート</literal>には正確なパスを指定できます。その場合コンポーネントを省略"
+"し、<literal>スイート</literal>はスラッシュ (<literal>/</literal>) で終わらな"
+"くてはなりません。これは URL で指定されたアーカイブの、特定のサブセクションの"
+"みに関心があるときに役に立ちます。<literal>スイート</literal>に正確なパスを指"
+"定しないのなら、少なくともひとつは <literal>コンポーネント</literal> を指定し"
+"なければなりません。"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:114
-#, fuzzy
-#| msgid ""
-#| "<literal>distribution</literal> may also contain a variable, <literal>"
-#| "$(ARCH)</literal> which expands to the Debian architecture (such as "
-#| "<literal>amd64</literal> or <literal>armel</literal>) used on the system. "
-#| "This permits architecture-independent <filename>sources.list</filename> "
-#| "files to be used. In general this is only of interest when specifying an "
-#| "exact path, <literal>APT</literal> will automatically generate a URI with "
-#| "the current architecture otherwise."
+#: sources.list.5.xml:108
 msgid ""
 "<literal>suite</literal> may also contain a variable, <literal>$(ARCH)</"
 "literal> which expands to the Debian architecture (such as <literal>amd64</"
@@ -6762,29 +6743,16 @@ msgid ""
 "<literal>APT</literal> will automatically generate a URI with the current "
 "architecture otherwise."
 msgstr ""
-"<literal>distribution</literal> は、<literal>$(ARCH)</literal> 変数を含む場合"
-"があります。<literal>$(ARCH)</literal> 変数は、システムで使用している Debian "
-"アーキテクチャ (<literal>amd64</literal> や <literal>armel</literal> など) に"
-"展開されます。これにより、アーキテクチャに依存しない <filename>sources.list</"
+"<literal>スイート</literal> は、<literal>$(ARCH)</literal> 変数を含む場合があ"
+"ります。<literal>$(ARCH)</literal> 変数は、システムで使用している Debian アー"
+"キテクチャ (<literal>amd64</literal> や <literal>armel</literal> など) に展開"
+"されます。これにより、アーキテクチャに依存しない <filename>sources.list</"
 "filename> ファイルを使用できます。一般的に、これは正しいパスを指定するときに"
 "気にするだけです。そうでない場合は、<literal>APT</literal> は現在のアーキテク"
 "チャで URI を自動的に生成します。"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:122
-#, fuzzy
-#| 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 "
-#| "distributions or components at that location is desired.  APT will sort "
-#| "the URI list after it has generated a complete set internally, and will "
-#| "collapse multiple references to the same Internet host, for instance, "
-#| "into a single connection, so that it does not inefficiently establish an "
-#| "FTP connection, close it, do something else, and then re-establish a "
-#| "connection to that same host. This feature is useful for accessing busy "
-#| "FTP sites with limits on the number of simultaneous anonymous users. APT "
-#| "also parallelizes connections to different hosts to more effectively deal "
-#| "with sites with low bandwidth."
+#: sources.list.5.xml:116
 msgid ""
 "In the traditional style sources.list format since only one distribution can "
 "be specified per line it may be necessary to have multiple lines for the "
@@ -6798,17 +6766,18 @@ msgid ""
 "users. APT also parallelizes connections to different hosts to more "
 "effectively deal with sites with low bandwidth."
 msgstr ""
-"有効な全 distribution, component の場所から、一部が必要な場合、1 行につき 1 "
-"distribution しか指定できないため、同じ URI の行を複数記述することになるで"
-"しょう。APT は内部で URI リストを生成してから、並べ替えます。そして、同じイン"
-"ターネットホストに対しては複数の参照をまとめます。例えば FTP 接続後、切断して"
-"からまた同じホストに再接続するといった、効率の悪いことをせずに、1 接続にまと"
-"めます。この機能は、同時接続匿名ユーザ数を制限している、混んでいる FTP サイト"
-"にアクセスするのに便利です。APT は、帯域の狭いサイトを効率よく扱うのに、異な"
-"るホストへは、接続を並行して行うようにもしています。"
+"古い形式の sources.list の記法では有効なディストリビューションやコンポーネン"
+"トの場所全てから、一部が必要な場合、1 行につき 1 つのディストリビューションし"
+"か指定できないため、同じ URI の行を複数記述することになるでしょう。APT は内部"
+"で URI リストを生成してから、並べ替えます。そして、同じインターネットホストに"
+"対しては複数の参照をまとめます。例えば FTP 接続後、切断してからまた同じホスト"
+"に再接続するといった、効率の悪いことをせずに、1 接続にまとめます。この機能"
+"は、同時接続匿名ユーザ数を制限している、混んでいる FTP サイトにアクセスするの"
+"に便利です。APT は、帯域の狭いサイトを効率よく扱うのに、異なるホストへは、接"
+"続を並行して行うようにもしています。"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:136
+#: sources.list.5.xml:130
 msgid ""
 "<literal>options</literal> is always optional and needs to be surrounded by "
 "square brackets. It can consist of multiple settings in the form "
@@ -6824,7 +6793,7 @@ msgstr ""
 "す)。"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:142
+#: sources.list.5.xml:136
 msgid ""
 "<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
 "replaceable>,…</literal> can be used to specify for which architectures "
@@ -6838,27 +6807,20 @@ msgstr ""
 "literal> オプションに定義してある、全アーキテクチャをダウンロードします。"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:146
-#, fuzzy
-#| msgid ""
-#| "<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
-#| "replaceable>,…</literal> can be used to specify for which architectures "
-#| "information should be downloaded. If this option is not set all "
-#| "architectures defined by the <literal>APT::Architectures</literal> option "
-#| "will be downloaded."
+#: sources.list.5.xml:140
 msgid ""
 "<literal>arch+=<replaceable>arch1</replaceable>,<replaceable>arch2</"
 "replaceable>,…</literal> and <literal>arch-=<replaceable>arch1</replaceable>,"
 "<replaceable>arch2</replaceable>,…</literal> which can be used to add/remove "
 "architectures from the set which will be downloaded."
 msgstr ""
-"<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
-"replaceable>,…</literal> により、どのアーキテクチャ情報をダウンロードするか指"
-"定します。このオプションを指定していないと、<literal>APT::Architectures</"
-"literal> オプションに定義してある、全アーキテクチャをダウンロードします。"
+"<literal>arch+=<replaceable>arch1</replaceable>,<replaceable>arch2</"
+"replaceable>,…</literal> あるいは <literal>arch-=<replaceable>arch1</"
+"replaceable>,<replaceable>arch2</replaceable>,…</literal> を使って、ダウン"
+"ロードするアーキテクチャを追加、削除できます。"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:149
+#: sources.list.5.xml:143
 msgid ""
 "<literal>trusted=yes</literal> can be set to indicate that packages from "
 "this source are always authenticated even if the <filename>Release</"
@@ -6875,7 +6837,7 @@ msgstr ""
 "認証として扱います。"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:156
+#: sources.list.5.xml:150
 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 "
@@ -6888,12 +6850,12 @@ msgstr ""
 "しょう。"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:161
+#: sources.list.5.xml:155
 msgid "Some examples:"
 msgstr "例:"
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:163
+#: sources.list.5.xml:157
 #, no-wrap
 msgid ""
 "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
@@ -6905,17 +6867,17 @@ msgstr ""
 "   "
 
 #. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:169
+#: sources.list.5.xml:163
 msgid "URI specification"
 msgstr "URI の仕様"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:171
+#: sources.list.5.xml:165
 msgid "The currently recognized URI types are:"
 msgstr "現在認識できる URI タイプは以下のとおりです。"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:175
+#: sources.list.5.xml:169
 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 "
@@ -6925,7 +6887,7 @@ msgstr ""
 "にします。これは NFS マウントやローカルミラーで便利です。"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:182
+#: sources.list.5.xml:176
 msgid ""
 "The cdrom scheme allows APT to use a local CD-ROM drive with media swapping. "
 "Use the &apt-cdrom; program to create cdrom entries in the source list."
@@ -6935,7 +6897,7 @@ msgstr ""
 "グラムを使用してください。"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:189
+#: sources.list.5.xml:183
 msgid ""
 "The http scheme specifies an HTTP server for the archive. If an environment "
 "variable <envar>http_proxy</envar> is set with the format http://server:"
@@ -6951,7 +6913,7 @@ msgstr ""
 "指定してください。この認証方法は安全ではないことに注意してください。"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:200
+#: sources.list.5.xml:194
 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 page. "
@@ -6970,7 +6932,7 @@ msgstr ""
 "す)。設定ファイルで HTTP を利用するプロキシが指定してあっても、無視されます。"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:212
+#: sources.list.5.xml:206
 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.  "
@@ -6982,7 +6944,7 @@ msgstr ""
 "用していて、APT でコピーを行う場合に便利です。"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:219
+#: sources.list.5.xml:213
 msgid ""
 "The rsh/ssh method invokes RSH/SSH to connect to a remote host and access "
 "the files as a given user. Prior configuration of rhosts or RSA keys is "
@@ -6996,12 +6958,12 @@ msgstr ""
 "す。"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:226
+#: sources.list.5.xml:220
 msgid "adding more recognizable URI types"
 msgstr "さらに認識できる URI タイプの追加"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:228
+#: sources.list.5.xml:222
 msgid ""
 "APT can be extended with more methods shipped in other optional packages, "
 "which should follow the naming scheme <package>apt-transport-"
@@ -7019,7 +6981,7 @@ msgstr ""
 "transport-debtorrent; を参照してください。"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:240
+#: sources.list.5.xml:234
 msgid ""
 "Uses the archive stored locally (or NFS mounted) at /home/jason/debian for "
 "stable/main, stable/contrib, and stable/non-free."
@@ -7028,35 +6990,35 @@ msgstr ""
 "free 用のローカル (または NFS) アーカイブを使用します。"
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:242
+#: sources.list.5.xml:236
 #, no-wrap
 msgid "deb file:/home/jason/debian stable main contrib non-free"
 msgstr "deb file:/home/jason/debian stable main contrib non-free"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:244
+#: sources.list.5.xml:238
 msgid "As above, except this uses the unstable (development) distribution."
 msgstr "上記と同様ですが、不安定版 (開発版) を使用します。"
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:245
+#: sources.list.5.xml:239
 #, no-wrap
 msgid "deb file:/home/jason/debian unstable main contrib non-free"
 msgstr "deb file:/home/jason/debian unstable main contrib non-free"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:247
+#: sources.list.5.xml:241
 msgid "Source line for the above"
 msgstr "上記のソース行は以下のようになります。"
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:248
+#: sources.list.5.xml:242
 #, no-wrap
 msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
 msgstr "deb-src file:/home/jason/debian unstable main contrib non-free"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:250
+#: sources.list.5.xml:244
 msgid ""
 "The first line gets package information for the architectures in "
 "<literal>APT::Architectures</literal> while the second always retrieves "
@@ -7067,7 +7029,7 @@ msgstr ""
 "<literal>armel</literal> アーキテクチャのパッケージ情報を取得します。"
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:252
+#: sources.list.5.xml:246
 #, no-wrap
 msgid ""
 "deb http://ftp.debian.org/debian &stable-codename; main\n"
@@ -7077,7 +7039,7 @@ msgstr ""
 "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:255
+#: sources.list.5.xml:249
 msgid ""
 "Uses HTTP to access the archive at archive.debian.org, and uses only the "
 "hamm/main area."
@@ -7086,13 +7048,13 @@ msgstr ""
 "す。"
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:257
+#: sources.list.5.xml:251
 #, no-wrap
 msgid "deb http://archive.debian.org/debian-archive hamm main"
 msgstr "deb http://archive.debian.org/debian-archive hamm main"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:259
+#: sources.list.5.xml:253
 msgid ""
 "Uses FTP to access the archive at ftp.debian.org, under the debian "
 "directory, and uses only the &stable-codename;/contrib area."
@@ -7101,13 +7063,13 @@ msgstr ""
 "&stable-codename;/contrib のみを使用します。"
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:261
+#: sources.list.5.xml:255
 #, no-wrap
 msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
 msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:263
+#: sources.list.5.xml:257
 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 "
@@ -7120,19 +7082,19 @@ msgstr ""
 "つだけになります。"
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:267
+#: sources.list.5.xml:261
 #, no-wrap
 msgid "deb ftp://ftp.debian.org/debian unstable contrib"
 msgstr "deb ftp://ftp.debian.org/debian unstable contrib"
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:276
+#: sources.list.5.xml:270
 #, no-wrap
 msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
 msgstr "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:269
+#: sources.list.5.xml:263
 msgid ""
 "Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe "
 "directory, and uses only files found under <filename>unstable/binary-i386</"
@@ -7151,17 +7113,17 @@ msgstr ""
 "<placeholder type=\"literallayout\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:281
+#: sources.list.5.xml:275
 msgid "&apt-cache; &apt-conf;"
 msgstr "&apt-cache; &apt-conf;"
 
 #. type: Content of: <refentry><refmeta><manvolnum>
-#: apt-extracttemplates.1.xml:28 apt-sortpkgs.1.xml:28 apt-ftparchive.1.xml:28
+#: apt-extracttemplates.1.xml:22 apt-sortpkgs.1.xml:22 apt-ftparchive.1.xml:22
 msgid "1"
 msgstr "1"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-extracttemplates.1.xml:35
+#: apt-extracttemplates.1.xml:29
 msgid ""
 "Utility to extract <command>debconf</command> config and templates from "
 "Debian packages"
@@ -7170,7 +7132,7 @@ msgstr ""
 "るユーティリティ"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:41
+#: apt-extracttemplates.1.xml:35
 msgid ""
 "<command>apt-extracttemplates</command> will take one or more Debian package "
 "files as input and write out (to a temporary directory) all associated "
@@ -7184,12 +7146,12 @@ msgstr ""
 "ぞれに対し、以下の形式で 1 行ずつ出力します。"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:46
+#: apt-extracttemplates.1.xml:40
 msgid "package version template-file config-script"
 msgstr "package version template-file config-script"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:47
+#: apt-extracttemplates.1.xml:41
 msgid ""
 "template-file and config-script are written to the temporary directory "
 "specified by the <option>-t</option> or <option>--tempdir</option> "
@@ -7204,7 +7166,7 @@ msgstr ""
 "なります。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-extracttemplates.1.xml:60
+#: apt-extracttemplates.1.xml:54
 msgid ""
 "Temporary directory in which to write extracted <command>debconf</command> "
 "template files and config scripts.  Configuration Item: <literal>APT::"
@@ -7215,7 +7177,7 @@ msgstr ""
 "literal>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:77
+#: apt-extracttemplates.1.xml:71
 msgid ""
 "<command>apt-extracttemplates</command> returns zero on normal operation, "
 "decimal 100 on error."
@@ -7224,12 +7186,12 @@ msgstr ""
 "には十進の 100 を返します。"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-sortpkgs.1.xml:35
+#: apt-sortpkgs.1.xml:29
 msgid "Utility to sort package index files"
 msgstr "パッケージインデックスファイルのソートユーティリティ"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-sortpkgs.1.xml:41
+#: apt-sortpkgs.1.xml:35
 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 "
@@ -7241,14 +7203,14 @@ msgstr ""
 "また、内部のソート規則に従って、内部フィールドについてもソートを行います。"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-sortpkgs.1.xml:47
+#: apt-sortpkgs.1.xml:41
 msgid ""
 "All output is sent to standard output; the input must be a seekable file."
 msgstr ""
 "出力はすべて標準出力に送られ、入力は検索できるファイルでなければなりません。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-sortpkgs.1.xml:56
+#: apt-sortpkgs.1.xml:50
 msgid ""
 "Use source index field ordering.  Configuration Item: <literal>APT::"
 "SortPkgs::Source</literal>."
@@ -7257,7 +7219,7 @@ msgstr ""
 "<literal>APT::SortPkgs::Source</literal>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-sortpkgs.1.xml:70
+#: apt-sortpkgs.1.xml:64
 msgid ""
 "<command>apt-sortpkgs</command> returns zero on normal operation, decimal "
 "100 on error."
@@ -7266,12 +7228,12 @@ msgstr ""
 "の 100 を返します。"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-ftparchive.1.xml:35
+#: apt-ftparchive.1.xml:29
 msgid "Utility to generate index files"
 msgstr "インデックスファイル生成ユーティリティ"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:41
+#: apt-ftparchive.1.xml:35
 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 "
@@ -7283,7 +7245,7 @@ msgstr ""
 "は、元のサイトの内容に基づき生成されるべきです。"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:45
+#: apt-ftparchive.1.xml:39
 msgid ""
 "<command>apt-ftparchive</command> is a superset of the &dpkg-scanpackages; "
 "program, incorporating its entire functionality via the <literal>packages</"
@@ -7297,7 +7259,7 @@ msgstr ""
 "全なアーカイブの生成プロセス「スクリプト」である綿密な手段を含んでいます。"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:51
+#: apt-ftparchive.1.xml:45
 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 "
@@ -7311,7 +7273,7 @@ msgstr ""
 "望した圧縮出力ファイルの作成を自動的に実行します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:62
+#: apt-ftparchive.1.xml:56
 msgid ""
 "The packages command generates a package file from a directory tree. It "
 "takes the given directory and recursively searches it for .deb files, "
@@ -7324,13 +7286,13 @@ msgstr ""
 "とほぼ同じです。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:67 apt-ftparchive.1.xml:91
+#: apt-ftparchive.1.xml:61 apt-ftparchive.1.xml:85
 msgid ""
 "The option <option>--db</option> can be used to specify a binary caching DB."
 msgstr "<option>--db</option> オプションで、キャッシュ DB を指定できます。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:72
+#: apt-ftparchive.1.xml:66
 msgid ""
 "The <literal>sources</literal> command generates a source index file from a "
 "directory tree.  It takes the given directory and recursively searches it "
@@ -7343,7 +7305,7 @@ msgstr ""
 "は、&dpkg-scansources; とほぼ同じです。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:77
+#: apt-ftparchive.1.xml:71
 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 "
@@ -7354,7 +7316,7 @@ msgstr ""
 "override オプションを使用します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:84
+#: apt-ftparchive.1.xml:78
 msgid ""
 "The <literal>contents</literal> command generates a contents file from a "
 "directory tree. It takes the given directory and recursively searches it "
@@ -7371,7 +7333,7 @@ msgstr ""
 "で出力します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:96
+#: apt-ftparchive.1.xml:90
 msgid ""
 "The <literal>release</literal> command generates a Release file from a "
 "directory tree. It recursively searches the given directory for uncompressed "
@@ -7397,7 +7359,7 @@ msgstr ""
 "出します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:106
+#: apt-ftparchive.1.xml:100
 msgid ""
 "Values for the additional metadata fields in the Release file are taken from "
 "the corresponding variables under <literal>APT::FTPArchive::Release</"
@@ -7417,7 +7379,7 @@ msgstr ""
 "<literal>Components</literal>, <literal>Description</literal> です。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:119
+#: apt-ftparchive.1.xml:113
 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 "
@@ -7431,7 +7393,7 @@ msgstr ""
 "のディレクトリから作成するかを指定する、柔軟な方法を提供します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:128
+#: apt-ftparchive.1.xml:122
 msgid ""
 "The <literal>clean</literal> command tidies the databases used by the given "
 "configuration file by removing any records that are no longer necessary."
@@ -7440,12 +7402,12 @@ msgstr ""
 "もう必要ないレコードを削除して整理します。"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:134
+#: apt-ftparchive.1.xml:128
 msgid "The Generate Configuration"
 msgstr "Generate 設定"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:136
+#: apt-ftparchive.1.xml:130
 msgid ""
 "The <literal>generate</literal> command uses a configuration file to "
 "describe the archives that are going to be generated. It follows the typical "
@@ -7462,7 +7424,7 @@ msgstr ""
 "す。"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:144
+#: apt-ftparchive.1.xml:138
 msgid ""
 "The generate configuration has four separate sections, each described below."
 msgstr ""
@@ -7470,12 +7432,12 @@ msgstr ""
 "す。"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:146
+#: apt-ftparchive.1.xml:140
 msgid "<literal>Dir</literal> Section"
 msgstr "<literal>Dir</literal> セクション"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:148
+#: apt-ftparchive.1.xml:142
 msgid ""
 "The <literal>Dir</literal> section defines the standard directories needed "
 "to locate the files required during the generation process. These "
@@ -7487,7 +7449,7 @@ msgstr ""
 "を生成するため、後のセクションで定義される相対パスの前に結合されます。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:155
+#: apt-ftparchive.1.xml:149
 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 "
@@ -7497,17 +7459,17 @@ msgstr ""
 "リには <filename>ls-LR</filename> と dist ノードがあります。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:162
+#: apt-ftparchive.1.xml:156
 msgid "Specifies the location of the override files."
 msgstr "オーバーライドファイルの場所を指定します。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:167
+#: apt-ftparchive.1.xml:161
 msgid "Specifies the location of the cache files."
 msgstr "キャッシュファイルの場所を指定します。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:172
+#: apt-ftparchive.1.xml:166
 msgid ""
 "Specifies the location of the file list files, if the <literal>FileList</"
 "literal> setting is used below."
@@ -7516,12 +7478,12 @@ msgstr ""
 "ファイルの場所を指定します。"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:178
+#: apt-ftparchive.1.xml:172
 msgid "<literal>Default</literal> Section"
 msgstr "<literal>Default</literal> セクション"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:180
+#: apt-ftparchive.1.xml:174
 msgid ""
 "The <literal>Default</literal> section specifies default values, and "
 "settings that control the operation of the generator. Other sections may "
@@ -7532,7 +7494,7 @@ msgstr ""
 "を、セクションごとの設定で上書きします。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:186
+#: apt-ftparchive.1.xml:180
 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 "
@@ -7544,7 +7506,7 @@ msgstr ""
 "方法のデフォルトはすべて '. gzip' です。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:194
+#: apt-ftparchive.1.xml:188
 msgid ""
 "Sets the default list of file extensions that are package files.  This "
 "defaults to '.deb'."
@@ -7553,7 +7515,7 @@ msgstr ""
 "deb' です。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:200
+#: apt-ftparchive.1.xml:194
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Sources files."
@@ -7562,7 +7524,7 @@ msgstr ""
 "指定します。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:206
+#: apt-ftparchive.1.xml:200
 msgid ""
 "Sets the default list of file extensions that are source files.  This "
 "defaults to '.dsc'."
@@ -7571,7 +7533,7 @@ msgstr ""
 "す。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:212
+#: apt-ftparchive.1.xml:206
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Contents files."
@@ -7580,7 +7542,7 @@ msgstr ""
 "指定します。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:218
+#: apt-ftparchive.1.xml:212
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Translation-en master file."
@@ -7589,7 +7551,7 @@ msgstr ""
 "ルの圧縮を制御します。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:224
+#: apt-ftparchive.1.xml:218
 msgid ""
 "Specifies the number of kilobytes to delink (and replace with hard links) "
 "per run. This is used in conjunction with the per-section <literal>External-"
@@ -7600,7 +7562,7 @@ msgstr ""
 "使います。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:231
+#: apt-ftparchive.1.xml:225
 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."
@@ -7609,7 +7571,7 @@ msgstr ""
 "インデックスファイルは、umask を無視してこのモードを使用します。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:238 apt-ftparchive.1.xml:384
+#: apt-ftparchive.1.xml:232 apt-ftparchive.1.xml:378
 msgid ""
 "Specifies whether long descriptions should be included in the "
 "<filename>Packages</filename> file or split out into a master "
@@ -7619,12 +7581,12 @@ msgstr ""
 "<filename>Translation-en</filename> ファイルに分割するかを指定します。"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:244
+#: apt-ftparchive.1.xml:238
 msgid "<literal>TreeDefault</literal> Section"
 msgstr "<literal>TreeDefault</literal> セクション"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:246
+#: apt-ftparchive.1.xml:240
 msgid ""
 "Sets defaults specific to <literal>Tree</literal> sections. All of these "
 "variables are substitution variables and have the strings $(DIST), "
@@ -7635,7 +7597,7 @@ msgstr ""
 "に展開します。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:253
+#: apt-ftparchive.1.xml:247
 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 will all "
@@ -7645,7 +7607,7 @@ msgstr ""
 "ルをラウンドロビンし、数日経つとすべて再生成します。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:260
+#: apt-ftparchive.1.xml:254
 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 updated. "
@@ -7661,7 +7623,7 @@ msgstr ""
 "き、少なくとも新しいファイルが必要です。デフォルトは 10 で、単位は日です。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:271
+#: apt-ftparchive.1.xml:265
 msgid ""
 "Sets the top of the .deb directory tree. Defaults to <filename>$(DIST)/"
 "$(SECTION)/binary-$(ARCH)/</filename>"
@@ -7670,7 +7632,7 @@ msgstr ""
 "$(SECTION)/binary-$(ARCH)/</filename> です。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:277
+#: apt-ftparchive.1.xml:271
 msgid ""
 "Sets the top of the source package directory tree. Defaults to <filename>"
 "$(DIST)/$(SECTION)/source/</filename>"
@@ -7679,7 +7641,7 @@ msgstr ""
 "$(DIST)/$(SECTION)/source/</filename> です。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:283
+#: apt-ftparchive.1.xml:277
 msgid ""
 "Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
 "binary-$(ARCH)/Packages</filename>"
@@ -7688,7 +7650,7 @@ msgstr ""
 "$(SECTION)/binary-$(ARCH)/Packages</filename> です。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:289
+#: apt-ftparchive.1.xml:283
 msgid ""
 "Sets the output Sources file. Defaults to <filename>$(DIST)/$(SECTION)/"
 "source/Sources</filename>"
@@ -7697,7 +7659,7 @@ msgstr ""
 "$(SECTION)/source/Sources</filename> です。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:295
+#: apt-ftparchive.1.xml:289
 msgid ""
 "Sets the output Translation-en master file with the long descriptions if "
 "they should be not included in the Packages file. Defaults to <filename>"
@@ -7708,7 +7670,7 @@ msgstr ""
 "$(SECTION)/i18n/Translation-en</filename> です。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:302
+#: apt-ftparchive.1.xml:296
 msgid ""
 "Sets the path prefix that causes a symlink to be considered an internal link "
 "instead of an external link. Defaults to <filename>$(DIST)/$(SECTION)/</"
@@ -7718,7 +7680,7 @@ msgstr ""
 "設定します。デフォルトは、<filename>$(DIST)/$(SECTION)/</filename> です。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:309
+#: apt-ftparchive.1.xml:303
 msgid ""
 "Sets the output Contents file. Defaults to <filename>$(DIST)/$(SECTION)/"
 "Contents-$(ARCH)</filename>. If this setting causes multiple Packages files "
@@ -7732,12 +7694,12 @@ msgstr ""
 "ftparchive</command> は自動でパッケージファイルをまとめます。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:318
+#: apt-ftparchive.1.xml:312
 msgid "Sets header file to prepend to the contents output."
 msgstr "contents の出力に付けるヘッダファイルを設定します。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:323
+#: apt-ftparchive.1.xml:317
 msgid ""
 "Sets the binary cache database to use for this section. Multiple sections "
 "can share the same database."
@@ -7746,7 +7708,7 @@ msgstr ""
 "クションで同じデータベースを共有できます。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:329
+#: apt-ftparchive.1.xml:323
 msgid ""
 "Specifies that instead of walking the directory tree, <command>apt-"
 "ftparchive</command> should read the list of files from the given file. "
@@ -7757,7 +7719,7 @@ msgstr ""
 "トリが先頭につきます。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:336
+#: apt-ftparchive.1.xml:330
 msgid ""
 "Specifies that instead of walking the directory tree, <command>apt-"
 "ftparchive</command> should read the list of files from the given file. "
@@ -7769,12 +7731,12 @@ msgstr ""
 "トリが先頭につきます。ソースインデックスを処理する際に使用します。"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:344
+#: apt-ftparchive.1.xml:338
 msgid "<literal>Tree</literal> Section"
 msgstr "<literal>Tree</literal> セクション"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:346
+#: apt-ftparchive.1.xml:340
 msgid ""
 "The <literal>Tree</literal> section defines a standard Debian file tree "
 "which consists of a base directory, then multiple sections in that base "
@@ -7788,7 +7750,7 @@ msgstr ""
 "<literal>Directory</literal> 変数で定義されます。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:351
+#: apt-ftparchive.1.xml:345
 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 "
@@ -7801,7 +7763,7 @@ msgstr ""
 "codename;</filename> のようになります。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:356
+#: apt-ftparchive.1.xml:350
 msgid ""
 "All of the settings defined in the <literal>TreeDefault</literal> section "
 "can be used in a <literal>Tree</literal> section as well as three new "
@@ -7811,7 +7773,7 @@ msgstr ""
 "い変数と同様に、<literal>Tree</literal> セクションで使用できます。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt-ftparchive.1.xml:362
+#: apt-ftparchive.1.xml:356
 #, no-wrap
 msgid ""
 "for i in Sections do \n"
@@ -7825,7 +7787,7 @@ msgstr ""
 "     "
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:359
+#: apt-ftparchive.1.xml:353
 msgid ""
 "When processing a <literal>Tree</literal> section <command>apt-ftparchive</"
 "command> performs an operation similar to: <placeholder type=\"programlisting"
@@ -7836,7 +7798,7 @@ msgstr ""
 "id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:370
+#: apt-ftparchive.1.xml:364
 msgid ""
 "This is a space separated list of sections which appear under the "
 "distribution; typically this is something like <literal>main contrib non-"
@@ -7846,7 +7808,7 @@ msgstr ""
 "<literal>main contrib non-free</literal> のようになります。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:377
+#: apt-ftparchive.1.xml:371
 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 "
@@ -7857,7 +7819,7 @@ msgstr ""
 "ます。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:390
+#: apt-ftparchive.1.xml:384
 msgid ""
 "Sets the binary override file. The override file contains section, priority "
 "and maintainer address information."
@@ -7866,7 +7828,7 @@ msgstr ""
 "セクション、優先度、メンテナのアドレスといった情報が含まれています。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:396
+#: apt-ftparchive.1.xml:390
 msgid ""
 "Sets the source override file. The override file contains section "
 "information."
@@ -7875,22 +7837,22 @@ msgstr ""
 "クションの情報が含まれています。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:402 apt-ftparchive.1.xml:448
+#: apt-ftparchive.1.xml:396 apt-ftparchive.1.xml:442
 msgid "Sets the binary extra override file."
 msgstr "バイナリ特別オーバーライドファイルを設定します。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:407 apt-ftparchive.1.xml:453
+#: apt-ftparchive.1.xml:401 apt-ftparchive.1.xml:447
 msgid "Sets the source extra override file."
 msgstr "ソース特別オーバーライドファイルを設定します。"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:412
+#: apt-ftparchive.1.xml:406
 msgid "<literal>BinDirectory</literal> Section"
 msgstr "<literal>BinDirectory</literal> セクション"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:414
+#: apt-ftparchive.1.xml:408
 msgid ""
 "The <literal>bindirectory</literal> section defines a binary directory tree "
 "with no special structure. The scope tag specifies the location of the "
@@ -7904,12 +7866,12 @@ msgstr ""
 "<literal>Section</literal><literal>Architecture</literal> 設定に似ています。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:422
+#: apt-ftparchive.1.xml:416
 msgid "Sets the Packages file output."
 msgstr "Packages ファイルの出力先を設定します。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:427
+#: apt-ftparchive.1.xml:421
 msgid ""
 "Sets the Sources file output. At least one of <literal>Packages</literal> or "
 "<literal>Sources</literal> is required."
@@ -7918,42 +7880,42 @@ msgstr ""
 "か <literal>Sources</literal> のうち、ひとつは必要です。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:433
+#: apt-ftparchive.1.xml:427
 msgid "Sets the Contents file output (optional)."
 msgstr "Contents ファイルの出力先を設定します (オプション)。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:438
+#: apt-ftparchive.1.xml:432
 msgid "Sets the binary override file."
 msgstr "バイナリオーバーライドファイルを設定します。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:443
+#: apt-ftparchive.1.xml:437
 msgid "Sets the source override file."
 msgstr "ソースオーバーライドファイルを設定します。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:458
+#: apt-ftparchive.1.xml:452
 msgid "Sets the cache DB."
 msgstr "キャッシュ DB を設定します。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:463
+#: apt-ftparchive.1.xml:457
 msgid "Appends a path to all the output paths."
 msgstr "全出力パスに付加するパス。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:468
+#: apt-ftparchive.1.xml:462
 msgid "Specifies the file list file."
 msgstr "ファイル一覧ファイルを指定します。"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:475
+#: apt-ftparchive.1.xml:469
 msgid "The Binary Override File"
 msgstr "バイナリオーバーライドファイル"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:476
+#: apt-ftparchive.1.xml:470
 msgid ""
 "The binary override file is fully compatible with &dpkg-scanpackages;. It "
 "contains four fields separated by spaces. The first field is the package "
@@ -7968,19 +7930,19 @@ msgstr ""
 "す。"
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:482
+#: apt-ftparchive.1.xml:476
 #, no-wrap
 msgid "old [// oldn]* => new"
 msgstr "old [// oldn]* => new"
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:484
+#: apt-ftparchive.1.xml:478
 #, no-wrap
 msgid "new"
 msgstr "new"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:481
+#: apt-ftparchive.1.xml:475
 msgid ""
 "The general form of the maintainer field is: <placeholder type="
 "\"literallayout\" id=\"0\"/> or simply, <placeholder type=\"literallayout\" "
@@ -7997,12 +7959,12 @@ msgstr ""
 "す。"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:492
+#: apt-ftparchive.1.xml:486
 msgid "The Source Override File"
 msgstr "ソースオーバーライドファイル"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:494
+#: apt-ftparchive.1.xml:488
 msgid ""
 "The source override file is fully compatible with &dpkg-scansources;. It "
 "contains two fields separated by spaces. The first field is the source "
@@ -8013,12 +7975,12 @@ msgstr ""
 "ケージ名、2 番目のフィールドは割り当てるセクションです。"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:499
+#: apt-ftparchive.1.xml:493
 msgid "The Extra Override File"
 msgstr "特別オーバーライドファイル"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:501
+#: apt-ftparchive.1.xml:495
 msgid ""
 "The extra override file allows any arbitrary tag to be added or replaced in "
 "the output. It has three columns, the first is the package, the second is "
@@ -8028,7 +7990,7 @@ msgstr ""
 "す。3 列からなり、先頭はパッケージ、2番目はタグ、残りは新しい値です。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:512
+#: apt-ftparchive.1.xml:506
 msgid ""
 "Generate the given checksum. These options default to on, when turned off "
 "the generated index files will not have the checksum fields where possible.  "
@@ -8051,7 +8013,7 @@ msgstr ""
 "literal>, <literal>SHA1</literal>, <literal>SHA256</literal> になります。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:523
+#: apt-ftparchive.1.xml:517
 msgid ""
 "Use a binary caching DB. This has no effect on the generate command.  "
 "Configuration Item: <literal>APT::FTPArchive::DB</literal>."
@@ -8060,7 +8022,7 @@ msgstr ""
 "目: <literal>APT::FTPArchive::DB</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:529
+#: apt-ftparchive.1.xml:523
 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 "
@@ -8073,7 +8035,7 @@ msgstr ""
 "<literal>quiet</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:537
+#: apt-ftparchive.1.xml:531
 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 "
@@ -8086,7 +8048,7 @@ msgstr ""
 "<literal>APT::FTPArchive::DeLinkAct</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:545
+#: apt-ftparchive.1.xml:539
 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 "
@@ -8101,7 +8063,7 @@ msgstr ""
 "<literal>APT::FTPArchive::Contents</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:555
+#: apt-ftparchive.1.xml:549
 msgid ""
 "Select the source override file to use with the <literal>sources</literal> "
 "command.  Configuration Item: <literal>APT::FTPArchive::SourceOverride</"
@@ -8111,7 +8073,7 @@ msgstr ""
 "選択します。設定項目: <literal>APT::FTPArchive::SourceOverride</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:561
+#: apt-ftparchive.1.xml:555
 msgid ""
 "Make the caching databases read only.  Configuration Item: <literal>APT::"
 "FTPArchive::ReadOnlyDB</literal>."
@@ -8120,7 +8082,7 @@ msgstr ""
 "FTPArchive::ReadOnlyDB</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:566
+#: apt-ftparchive.1.xml:560
 msgid ""
 "Accept in the <literal>packages</literal> and <literal>contents</literal> "
 "commands only package files matching <literal>*_arch.deb</literal> or "
@@ -8133,7 +8095,7 @@ msgstr ""
 "け付けます。設定項目: <literal>APT::FTPArchive::Architecture</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:574
+#: apt-ftparchive.1.xml:568
 msgid ""
 "&apt-ftparchive; caches as much as possible of metadata in a cachedb. If "
 "packages are recompiled and/or republished with the same version again, this "
@@ -8156,7 +8118,7 @@ msgstr ""
 "加チェックには、意味がありません。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:586
+#: apt-ftparchive.1.xml:580
 msgid ""
 "This configuration option defaults to \"<literal>true</literal>\" and should "
 "only be set to <literal>\"false\"</literal> if the Archive generated with "
@@ -8171,13 +8133,13 @@ msgstr ""
 "み生成できることに注意してください。"
 
 #. type: Content of: <refentry><refsect1><para><programlisting>
-#: apt-ftparchive.1.xml:604
+#: apt-ftparchive.1.xml:598
 #, no-wrap
 msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
 msgstr "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:600
+#: apt-ftparchive.1.xml:594
 msgid ""
 "To create a compressed Packages file for a directory containing binary "
 "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
@@ -8186,7 +8148,7 @@ msgstr ""
 "は、以下のようにします。<placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:614
+#: apt-ftparchive.1.xml:608
 msgid ""
 "<command>apt-ftparchive</command> returns zero on normal operation, decimal "
 "100 on error."
@@ -8194,34 +8156,51 @@ msgstr ""
 "<command>apt-ftparchive</command> は正常終了時に 0 を返します。エラー時には十"
 "進の 100 を返します。"
 
-#. type: <title></title>
-#: guide.sgml:4
+#. type: Attribute 'lang' of: <book>
+#: guide.dbk:9 offline.dbk:9
+msgid "en"
+msgstr "ja"
+
+#. type: Content of: <book><title>
+#: guide.dbk:11
 msgid "APT User's Guide"
 msgstr "APT ユーザガイド"
 
-#. type: <author></author>
-#: guide.sgml:6 offline.sgml:6
-msgid "<name>Jason Gunthorpe </name><email>jgg@debian.org</email>"
-msgstr "<name>Jason Gunthorpe </name><email>jgg@debian.org</email>"
+#. type: Content of: <book><bookinfo><authorgroup><author><personname>
+#: guide.dbk:17 offline.dbk:17
+msgid "Jason Gunthorpe"
+msgstr "Jason Gunthorpe"
+
+#. type: Content of: <book><bookinfo><authorgroup><author><email>
+#: guide.dbk:17 offline.dbk:17
+msgid "jgg@debian.org"
+msgstr "jgg@debian.org"
 
-#. type: <version></version>
-#: guide.sgml:7
-msgid "$Id: guide.sgml,v 1.7 2003/04/26 23:26:13 doogie Exp $"
-msgstr "$Id: guide.sgml,v 1.7 2003/04/26 23:26:13 doogie Exp $"
+#. type: Content of: <book><bookinfo><releaseinfo>
+#: guide.dbk:21 offline.dbk:21
+msgid "Version &apt-product-version;"
+msgstr "バージョン &apt-product-version;"
 
-#. type: <abstract></abstract>
-#: guide.sgml:11
+#. type: Content of: <book><bookinfo><abstract><para>
+#: guide.dbk:25
 msgid ""
 "This document provides an overview of how to use the the APT package manager."
 msgstr "本文書は APT パッケージマネージャの使い方の概要を提供します。"
 
-#. type: <copyrightsummary></copyrightsummary>
-#: guide.sgml:15
-msgid "Copyright &copy; Jason Gunthorpe, 1998."
-msgstr "Copyright &copy; Jason Gunthorpe, 1998."
+#. type: Content of: <book><bookinfo>
+#: guide.dbk:29
+msgid ""
+"<copyright><year>1998</year><holder>Jason Gunthorpe</holder></copyright>"
+msgstr ""
+"<copyright><year>1998</year><holder>Jason Gunthorpe</holder></copyright>"
+
+#. type: Content of: <book><bookinfo><legalnotice><title>
+#: guide.dbk:32 offline.dbk:33
+msgid "License Notice"
+msgstr "ライセンスについて"
 
-#. type: <p></p>
-#: guide.sgml:21 offline.sgml:22
+#. type: Content of: <book><bookinfo><legalnotice><para>
+#: guide.dbk:34 offline.dbk:35
 msgid ""
 "\"APT\" and this document are free software; you can redistribute them and/"
 "or modify them under the terms of the GNU General Public License as "
@@ -8233,8 +8212,8 @@ msgstr ""
 "published by the Free Software Foundation; either version 2 of the License, "
 "or (at your option) any later version."
 
-#. type: <p></p>
-#: guide.sgml:24 offline.sgml:25
+#. type: Content of: <book><bookinfo><legalnotice><para>
+#: guide.dbk:43 offline.dbk:41
 msgid ""
 "For more details, on Debian systems, see the file /usr/share/common-licenses/"
 "GPL for the full license."
@@ -8242,35 +8221,42 @@ msgstr ""
 "For more details, on Debian systems, see the file /usr/share/common-licenses/"
 "GPL for the full license."
 
-#. type: <heading></heading>
-#: guide.sgml:32
+#. type: Content of: <book><chapter><title>
+#: guide.dbk:50
 msgid "General"
 msgstr "全般"
 
-#. type: <p></p>
-#: guide.sgml:38
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:52
 msgid ""
-"The APT package currently contains two sections, the APT <prgn>dselect</"
-"prgn> method and the <prgn>apt-get</prgn> command line user interface. Both "
-"provide a way to install and remove packages as well as download new "
-"packages from the Internet."
+"The APT package currently contains two sections, the APT <command>dselect</"
+"command> method and the <command>apt-get</command> command line user "
+"interface. Both provide a way to install and remove packages as well as "
+"download new packages from the Internet."
 msgstr ""
+"APT パッケージは現在、APT <command>dselect</command> メソッドと <command>apt-"
+"get</command> コマンドラインユーザインターフェイスの2つを収録しています。両方"
+"ともインターネットから新しいパッケージをダウンロードするのと同様、パッケージ"
+"をインストール、削除する方法を提供しています。"
 
-#. type: <heading></heading>
-#: guide.sgml:39
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:58
 msgid "Anatomy of the Package System"
 msgstr "パッケージシステムの構造"
 
-#. type: <p></p>
-#: guide.sgml:44
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:60
 msgid ""
 "The Debian packaging system has a large amount of information associated "
 "with each package to help assure that it integrates cleanly and easily into "
 "the system. The most prominent of its features is the dependency system."
 msgstr ""
+"Debian パッケージシステムには各パッケージに関連する膨大な情報があり、システム"
+"に手際良く簡単に統合することを支援します。その最も重要な機能は依存システムで"
+"す。"
 
-#. type: <p></p>
-#: guide.sgml:52
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:65
 msgid ""
 "The dependency system allows individual programs to make use of shared "
 "elements in the system such as libraries. It simplifies placing infrequently "
@@ -8278,27 +8264,40 @@ msgid ""
 "things the average user is required to install. Also, it allows for choices "
 "in mail transport agents, X servers and so on."
 msgstr ""
+"依存システムにより、システムにあるライブラリ等の共有要素を個々のプログラムを"
+"使えるようになります。簡単に言うと、プログラムのうちまれに利用される部分を別"
+"個のパッケージに配置して、平均的ユーザがインストールを必要とするものの数を減"
+"らします。また、メール転送エージェントや X サーバ等の選択ができるようにもなり"
+"ます。"
 
-#. type: <p></p>
-#: guide.sgml:57
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:72
 msgid ""
 "The first step to understanding the dependency system is to grasp the "
 "concept of a simple dependency. The meaning of a simple dependency is that a "
 "package requires another package to be installed at the same time to work "
 "properly."
 msgstr ""
+"依存システムの理解はまず単純な依存の概念を把握することから始まります。単純な"
+"依存というのは、あるパッケージが適切に機能するためには別のパッケージが同時に"
+"インストールされている必要があるということです。"
 
-#. type: <p></p>
-#: guide.sgml:63
+# Translator's NOTE: maybe s/GPGP/GPG/?
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:77
 msgid ""
 "For instance, mailcrypt is an emacs extension that aids in encrypting email "
 "with GPG. Without GPGP installed mailcrypt is useless, so mailcrypt has a "
 "simple dependency on GPG. Also, because it is an emacs extension it has a "
 "simple dependency on emacs, without emacs it is completely useless."
 msgstr ""
+"例えば mailcrypt は emacs を拡張するプログラムで、GPG によるメールの暗号化を"
+"支援します。GPGP がインストールされていなければ mailcrypt は役に立たないので "
+"mailcrypt には GPG に単純に依存しています。また、これは emacs の拡張なので "
+"emacs に単純に依存し、emacs がないと何の役にも立ちません。"
 
-#. type: <p></p>
-#: guide.sgml:73
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:83
 msgid ""
 "The other important dependency to understand is a conflicting dependency. It "
 "means that a package, when installed with another package, will not work and "
@@ -8309,9 +8308,17 @@ msgid ""
 "system so all mail transport agents have a conflicting dependency with all "
 "other mail transport agents."
 msgstr ""
+"理解しておかないといけないもう一つの重要な依存に競合する依存があります。これ"
+"はあるパッケージが別のパッケージと同時にインストールされていると機能せず、シ"
+"ステムにとってひどく有害なこともあります。例として sendmail や exim、qmail 等"
+"のメール転送エージェントで考えてみましょう。メール転送エージェントはどれも"
+"メールを受け取るのにネットワークを待ち受ける必要があるため、2つインストールす"
+"ることは不可能です。複数インストールするとシステムに重大な被害を与える可能性"
+"があるため、メール転送エージェントはどれも他のあらゆるメール転送エージェント"
+"と競合依存となっています。"
 
-#. type: <p></p>
-#: guide.sgml:83
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:93
 msgid ""
 "As an added complication there is the possibility for a package to pretend "
 "to be another package. Consider that exim and sendmail for many intents are "
@@ -8322,86 +8329,122 @@ msgid ""
 "depend on mail-transport-agent. This can add a great deal of confusion when "
 "trying to manually fix packages."
 msgstr ""
+"複雑な例としては、別のパッケージのように装うパッケージがあります。exim と "
+"sendmail について見てみると、その多くの目的は同一で、両方ともメールを配送し、"
+"一般的インターフェイスを解釈します。そこで、パッケージシステムにはどちらも "
+"mail-transport-agents だと宣言する方法があります。そうして exim と sendmail "
+"は両方とも mail-transport-agent を提供すると宣言し、他のメール転送エージェン"
+"トを必要とするパッケージは mail-transport-agent に依存します。手作業により"
+"パッケージを修正しようとしたときに多大な混乱が生まれる可能性があります。"
 
-#. type: <p></p>
-#: guide.sgml:88
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:103
 msgid ""
 "At any given time a single dependency may be met by packages that are "
 "already installed or it may not be. APT attempts to help resolve dependency "
 "issues by providing a number of automatic algorithms that help in selecting "
 "packages for installation."
 msgstr ""
+"既にインストールされている、あるいはされていないパッケージについて、1つの依存"
+"が生まれる可能性は常にあります。APT はインストールするパッケージの選択を支援"
+"する自動化でのアルゴリズムをいくつか提供することで依存問題の解決支援に努めま"
+"す。"
 
-#. type: <heading></heading>
-#: guide.sgml:96
+#. type: Content of: <book><chapter><title>
+#: guide.dbk:112
 msgid "apt-get"
 msgstr "apt-get"
 
-#. type: <p></p>
-#: guide.sgml:102
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:114
 msgid ""
-"<prgn>apt-get</prgn> provides a simple way to install packages from the "
-"command line. Unlike <prgn>dpkg</prgn>, <prgn>apt-get</prgn> does not "
-"understand .deb files, it works with the package's proper name and can only "
-"install .deb archives from a <em>Source</em>."
+"<command>apt-get</command> provides a simple way to install packages from "
+"the command line. Unlike <command>dpkg</command>, <command>apt-get</command> "
+"does not understand .deb files, it works with the package's proper name and "
+"can only install .deb archives from a <emphasis>Source</emphasis>."
 msgstr ""
+"<command>apt-get</command> はコマンドラインからパッケージをインストールする簡"
+"単な方法を提供します。<command>dpkg</command> とは異なり、<command>apt-get</"
+"command> は .deb ファイルを解釈せず、連携するのはパッケージ特有の名前で、イン"
+"ストールできるのは<emphasis>ソース</emphasis>にある .deb アーカイブだけです。"
 
-#. type: <p></p>
-#: guide.sgml:109
+#. type: Content of: <book><chapter><para><footnote><para>
+#: guide.dbk:120
 msgid ""
-"The first <footnote><p>If you are using an http proxy server you must set "
-"the http_proxy environment variable first, see sources.list(5)</p></"
-"footnote> thing that should be done before using <prgn>apt-get</prgn> is to "
-"fetch the package lists from the <em>Sources</em> so that it knows what "
-"packages are available. This is done with <tt>apt-get update</tt>. For "
-"instance,"
+"If you are using an http proxy server you must set the http_proxy "
+"environment variable first, see sources.list(5)"
 msgstr ""
+"http プロキシサーバを使っている場合はまず http_proxy 環境変数をセットする必要"
+"があります。sources.list(5) を見てください"
 
-#. type: <example></example>
-#: guide.sgml:116
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:120
+msgid ""
+"The first <placeholder type=\"footnote\" id=\"0\"/> thing that should be "
+"done before using <command>apt-get</command> is to fetch the package lists "
+"from the <emphasis>Sources</emphasis> so that it knows what packages are "
+"available. This is done with <literal>apt-get update</literal>. For instance,"
+msgstr ""
+"<command>apt-get</command> を使う前にまずやるべきことは<placeholder type="
+"\"footnote\" id=\"0\"/>パッケージ一覧を<emphasis>ソース</emphasis>から取得す"
+"ることで、それにより利用できるパッケージがわかるようになります。これには "
+"<literal>apt-get update</literal> を実行します。例えば"
+
+#. type: Content of: <book><chapter><screen>
+#: guide.dbk:128
 #, no-wrap
 msgid ""
 "# apt-get update\n"
 "Get http://ftp.de.debian.org/debian-non-US/ stable/binary-i386/ Packages\n"
 "Get http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n"
 "Reading Package Lists... Done\n"
-"Building Dependency Tree... Done"
+"Building Dependency Tree... Done\n"
 msgstr ""
 "# apt-get update\n"
 "Get http://ftp.de.debian.org/debian-non-US/ stable/binary-i386/ Packages\n"
 "Get http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n"
 "Reading Package Lists... Done\n"
-"Building Dependency Tree... Done"
+"Building Dependency Tree... Done\n"
 
-#. type: <p><taglist>
-#: guide.sgml:120
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:135
 msgid "Once updated there are several commands that can be used:"
-msgstr ""
+msgstr "更新後は複数のコマンドを使えます:"
 
-#. type: <tag></tag>
-#: guide.sgml:121
+#. type: Content of: <book><chapter><variablelist><varlistentry><term>
+#: guide.dbk:139
 msgid "upgrade"
 msgstr "upgrade"
 
-#. type: <p></p>
-#: guide.sgml:131
+#. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
+#: guide.dbk:142
 msgid ""
 "Upgrade will attempt to gently upgrade the whole system. Upgrade will never "
 "install a new package or remove an existing package, nor will it ever "
 "upgrade a package that might cause some other package to break. This can be "
 "used daily to relatively safely upgrade the system. Upgrade will list all of "
 "the packages that it could not upgrade, this usually means that they depend "
-"on new packages or conflict with some other package. <prgn>dselect</prgn> or "
-"<tt>apt-get install</tt> can be used to force these packages to install."
-msgstr ""
+"on new packages or conflict with some other package. <command>dselect</"
+"command> or <literal>apt-get install</literal> can be used to force these "
+"packages to install."
+msgstr ""
+"upgrade を行うとシステム全体を穏やかにアップグレードします。アップグレードで"
+"は新しいパッケージのインストールや既存のパッケージの削除、アップグレードする"
+"と他のパッケージを破壊する可能性のある場合のそのパッケージのアップグレードは"
+"行いません。これは毎日実行してシステムを比較的安全にアップグレードできます。"
+"upgrade を行うとアップグレードできないパッケージがある場合にその一覧を表示し"
+"ます。これは通常新しいパッケージに依存しているか他のパッケージと競合している"
+"ということになります。<command>dselect</command> や <literal>apt-get "
+"install</literal> を使うとそういったパッケージを強制的にインストールできま"
+"す。"
 
-#. type: <tag></tag>
-#: guide.sgml:131
+#. type: Content of: <book><chapter><variablelist><varlistentry><term>
+#: guide.dbk:154
 msgid "install"
 msgstr "install"
 
-#. type: <p></p>
-#: guide.sgml:140
+#. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
+#: guide.dbk:157
 msgid ""
 "Install is used to install packages by name. The package is automatically "
 "fetched and installed. This can be useful if you already know the name of "
@@ -8411,236 +8454,348 @@ msgid ""
 "listed packages and will print a summary and ask for confirmation if "
 "anything other than its arguments are changed."
 msgstr ""
+"install を使ってパッケージを名前によりインストールします。パッケージは自動的"
+"に取得、インストールされます。これはインストールするパッケージの名前が既にわ"
+"かっていて GUI を使って選択したくない場合に有用です。インストールするパッケー"
+"ジはいくらでも指定でき、全て取得されます。install では対象パッケージ一覧から"
+"自動的に依存問題の解決に努めてまとめを提示し、指示以外の変更がある場合は確認"
+"を促します。"
 
-#. type: <tag></tag>
-#: guide.sgml:140
+#. type: Content of: <book><chapter><variablelist><varlistentry><term>
+#: guide.dbk:168
 msgid "dist-upgrade"
 msgstr "dist-upgrade"
 
-#. type: <p></p>
-#: guide.sgml:149
+#. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
+#: guide.dbk:171
 msgid ""
 "Dist-upgrade is a complete upgrader designed to simplify upgrading between "
 "releases of Debian. It uses a sophisticated algorithm to determine the best "
 "set of packages to install, upgrade and remove to get as much of the system "
 "to the newest release. In some situations it may be desired to use dist-"
 "upgrade rather than spend the time manually resolving dependencies in "
-"<prgn>dselect</prgn>. Once dist-upgrade has completed then <prgn>dselect</"
-"prgn> can be used to install any packages that may have been left out."
+"<command>dselect</command>. Once dist-upgrade has completed then "
+"<command>dselect</command> can be used to install any packages that may have "
+"been left out."
 msgstr ""
+"dist-upgrade は完全なアップグレードを行うように設計されていて、Debian のリ"
+"リース間のアップグレードを単純化します。洗練されたアルゴリズムを使って、シス"
+"テムをできるだけ最新のリリースにするためにインストール、アップグレード、削除"
+"する最善のパッケージ群を決定します。状況によっては <command>dselect</"
+"command> で手作業により時間を掛けて依存を解決するよりも dist-upgrade を使う方"
+"が希望には合うかもしれません。dist-upgrade 完了後は <command>dselect</"
+"command> を使って、残っているパッケージがあればインストールできます。"
 
-#. type: <p></p>
-#: guide.sgml:152
+#. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
+#: guide.dbk:181
 msgid ""
 "It is important to closely look at what dist-upgrade is going to do, its "
 "decisions may sometimes be quite surprising."
 msgstr ""
+"dist-upgrade が実行する内容をよく観察するのは重要です。かなり驚くような判断が"
+"なされることもあります。"
 
-#. type: <p></p>
-#: guide.sgml:163
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:188
 msgid ""
-"<prgn>apt-get</prgn> has several command line options that are detailed in "
-"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful "
-"option is <tt>-d</tt> which does not install the fetched files. If the "
-"system has to download a large number of package it would be undesired to "
-"start installing them in case something goes wrong. When <tt>-d</tt> is used "
-"the downloaded archives can be installed by simply running the command that "
-"caused them to be downloaded again without <tt>-d</tt>."
+"<command>apt-get</command> has several command line options that are "
+"detailed in its man page, <citerefentry><refentrytitle>apt-get</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>. The most useful "
+"option is <literal>-d</literal> which does not install the fetched files. If "
+"the system has to download a large number of package it would be undesired "
+"to start installing them in case something goes wrong. When <literal>-d</"
+"literal> is used the downloaded archives can be installed by simply running "
+"the command that caused them to be downloaded again without <literal>-d</"
+"literal>."
 msgstr ""
-
-#. type: <heading></heading>
-#: guide.sgml:168
+"<command>apt-get</command> にはコマンドラインオプションが複数あり、man ページ"
+"の <citerefentry><refentrytitle>apt-get</refentrytitle><manvolnum>8</"
+"manvolnum></citerefentry> で詳細に説明されています。最も有用なオプションは取"
+"得したファイルをインストールしない <literal>-d</literal> です。システムが大量"
+"のパッケージをダウンロードする必要がある場合、何かうまくいかなかったときにイ"
+"ンストールを開始するのは望ましくはないでしょう。<literal>-d</literal> を指定"
+"すると、ダウンロードしたときのコマンドを単純に再び、<literal>-d</literal> を"
+"付けずに実行することでダウンロードしたアーカイブをインストールできます。"
+
+#. type: Content of: <book><chapter><title>
+#: guide.dbk:200
 msgid "DSelect"
 msgstr "DSelect"
 
-#. type: <p></p>
-#: guide.sgml:173
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:202
 msgid ""
-"The APT <prgn>dselect</prgn> method provides the complete APT system with "
-"the <prgn>dselect</prgn> package selection GUI. <prgn>dselect</prgn> is used "
-"to select the packages to be installed or removed and APT actually installs "
-"them."
+"The APT <command>dselect</command> method provides the complete APT system "
+"with the <command>dselect</command> package selection GUI. <command>dselect</"
+"command> is used to select the packages to be installed or removed and APT "
+"actually installs them."
 msgstr ""
+"APT の <command>dselect</command> メソッドは <command>dselect</command> パッ"
+"ケージ選択 GUI を使った完全な APT システムを提供します。インストールや削除す"
+"るパッケージの選択には <command>dselect</command> を使い、実際のインストール"
+"は APT が行います。"
 
-#. type: <p></p>
-#: guide.sgml:184
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:208
 msgid ""
-"To enable the APT method you need to select [A]ccess in <prgn>dselect</prgn> "
-"and then choose the APT method. You will be prompted for a set of "
-"<em>Sources</em> which are places to fetch archives from. These can be "
-"remote Internet sites, local Debian mirrors or CD-ROMs. Each source can "
-"provide a fragment of the total Debian archive, APT will automatically "
+"To enable the APT method you need to select [A]ccess in <command>dselect</"
+"command> and then choose the APT method. You will be prompted for a set of "
+"<emphasis>Sources</emphasis> which are places to fetch archives from. These "
+"can be remote Internet sites, local Debian mirrors or CD-ROMs. Each source "
+"can provide a fragment of the total Debian archive, APT will automatically "
 "combine them to form a complete set of packages. If you have a CD-ROM then "
 "it is a good idea to specify it first and then specify a mirror so that you "
 "have access to the latest bug fixes. APT will automatically use packages on "
 "your CD-ROM before downloading from the Internet."
 msgstr ""
-
-#. type: <example></example>
-#: guide.sgml:198
+"APT メソッドを有効にするには、<command>dselect</command> でアクセス(a) を選択"
+"し、それから APT メソッドを選択する必要があります。そうするとアーカイブの取得"
+"先の場所となる<emphasis>ソース</emphasis>群を聞かれます。これにはリモートのイ"
+"ンターネットサイトやローカルの Debian ミラー、CD-ROM を指定できます。各ソース"
+"で Debian アーカイブ全体のうちの一部を提供でき、APT は自動的に組み合わせて"
+"パッケージ群一式を構成します。CD-ROM がある場合はまずそれを指定し、それからミ"
+"ラーを指定するのが良い方法で、そうすることで最新のバグ修正にアクセスできるよ"
+"うになります。APT はインターネットからダウンロードする前に CD-ROM にあるパッ"
+"ケージを自動的に利用します。"
+
+#. type: Content of: <book><chapter><screen>
+#: guide.dbk:219
 #, no-wrap
 msgid ""
 "   Set up a list of distribution source locations\n"
-"\t \n"
+"\n"
 " Please give the base URL of the debian distribution.\n"
 " The access schemes I know about are: http file\n"
-"\t   \n"
+"\n"
 " For example:\n"
 "      file:/mnt/debian,\n"
 "      ftp://ftp.debian.org/debian,\n"
 "      http://ftp.de.debian.org/debian,\n"
-"      \n"
-"      \n"
-" URL [http://llug.sep.bnl.gov/debian]:"
-msgstr "   "
+"\n"
+"\n"
+" URL [http://llug.sep.bnl.gov/debian]:\n"
+msgstr ""
+"   ディストリビューションソース位置一覧の準備\n"
+"\n"
+" Debian ディストリビューションの基底 URL を指定してください。\n"
+" 認識できるアクセス方法: http file\n"
+"\n"
+" 例:\n"
+"      file:/mnt/debian,\n"
+"      ftp://ftp.debian.org/debian,\n"
+"      http://ftp.de.debian.org/debian,\n"
+"\n"
+"\n"
+" URL [http://llug.sep.bnl.gov/debian]:\n"
 
-#. type: <p></p>
-#: guide.sgml:205
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:233
 msgid ""
-"The <em>Sources</em> setup starts by asking for the base of the Debian "
-"archive, defaulting to a HTTP mirror. Next it asks for the distribution to "
-"get."
+"The <emphasis>Sources</emphasis> setup starts by asking for the base of the "
+"Debian archive, defaulting to a HTTP mirror. Next it asks for the "
+"distribution to get."
 msgstr ""
+"<emphasis>ソース</emphasis>の準備は基礎となる Debian アーカイブの質問から始ま"
+"り、デフォルトは HTTP ミラーとなっています。その次は取得するディストリビュー"
+"ションを質問します。"
 
-#. type: <example></example>
-#: guide.sgml:212
+#. type: Content of: <book><chapter><screen>
+#: guide.dbk:238
 #, no-wrap
 msgid ""
 " Please give the distribution tag to get or a path to the\n"
 " package file ending in a /. The distribution\n"
 " tags are typically something like: stable unstable testing non-US\n"
-"   \n"
-" Distribution [stable]:"
-msgstr " "
-
-#. type: <p></p>
-#: guide.sgml:222
-msgid ""
-"The distribution refers to the Debian version in the archive, <em>stable</"
-"em> refers to the latest released version and <em>unstable</em> refers to "
-"the developmental version. <em>non-US</em> is only available on some mirrors "
-"and refers to packages that contain encryption technology or other things "
-"that cannot be exported from the United States. Importing these packages "
-"into the US is legal however."
+"\n"
+" Distribution [stable]:\n"
 msgstr ""
+" 取得するディストリビューションのタグやパッケージファイルへのパスを\n"
+" / で終える形式で指定してください。ディストリビューションのタグには\n"
+" 以下のようなものがあります: stable unstable testing non-US\n"
+"\n"
+" ディストリビューション [stable]:\n"
+
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:245
+msgid ""
+"The distribution refers to the Debian version in the archive, "
+"<emphasis>stable</emphasis> refers to the latest released version and "
+"<emphasis>unstable</emphasis> refers to the developmental version. "
+"<emphasis>non-US</emphasis> is only available on some mirrors and refers to "
+"packages that contain encryption technology or other things that cannot be "
+"exported from the United States. Importing these packages into the US is "
+"legal however."
+msgstr ""
+"ディストリビューションはアーカイブ中の Debian バージョンを参照し、"
+"<emphasis>stable</emphasis> は最新のリリース版を、<emphasis>unstable</"
+"emphasis> は開発版を参照します。<emphasis>non-US</emphasis> は一部のミラーで"
+"のみ利用可能で、合衆国からの輸出ができない暗号化技術その他のものを収録する"
+"パッケージを参照します。ただしこういったパッケージの合衆国への輸入は合法で"
+"す。"
 
-#. type: <example></example>
-#: guide.sgml:228
+#. type: Content of: <book><chapter><screen>
+#: guide.dbk:254
 #, no-wrap
 msgid ""
 " Please give the components to get\n"
 " The components are typically something like: main contrib non-free\n"
-"  \n"
-" Components [main contrib non-free]:"
-msgstr " "
+"\n"
+" Components [main contrib non-free]:\n"
+msgstr ""
+" 取得するコンポーネントを指定してください\n"
+" コンポーネントには以下のようなものがあります: main contrib non-free\n"
+"\n"
+" コンポーネント [main contrib non-free]:\n"
 
-#. type: <p></p>
-#: guide.sgml:236
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:260
 msgid ""
 "The components list refers to the list of sub distributions to fetch. The "
 "distribution is split up based on software licenses, main being DFSG free "
 "packages while contrib and non-free contain things that have various "
 "restrictions placed on their use and distribution."
 msgstr ""
+"コンポーネント一覧は取得するサブディストリビューションの一覧を参照します。こ"
+"のディストリビューションはソフトウェアのライセンスを基にして分けられていま"
+"す。main にあるのは DFSG フリーのパッケージですが contrib や non-free には利"
+"用目的や配布形態に様々な制限を課せられているものが収録されています。"
 
-#. type: <p></p>
-#: guide.sgml:240
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:266
 msgid ""
 "Any number of sources can be added, the setup script will continue to prompt "
 "until you have specified all that you want."
 msgstr ""
+"ソースはいくらでも追加できます。準備スクリプトは必要なソースを全て指定するま"
+"で聞き続けます。"
 
-#. type: <p></p>
-#: guide.sgml:247
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:270
 msgid ""
-"Before starting to use <prgn>dselect</prgn> it is necessary to update the "
-"available list by selecting [U]pdate from the menu. This is a superset of "
-"<tt>apt-get update</tt> that makes the fetched information available to "
-"<prgn>dselect</prgn>. [U]pdate must be performed even if <tt>apt-get update</"
-"tt> has been run before."
+"Before starting to use <command>dselect</command> it is necessary to update "
+"the available list by selecting [U]pdate from the menu. This is a superset "
+"of <literal>apt-get update</literal> that makes the fetched information "
+"available to <command>dselect</command>. [U]pdate must be performed even if "
+"<literal>apt-get update</literal> has been run before."
 msgstr ""
+"<command>dselect</command> を使う前にメニューから更新(u)を選択して利用可能な"
+"パッケージ一覧を更新する必要があります。これは <literal>apt-get update</"
+"literal> の上位集合で、取得した情報を <command>dselect</command> から利用でき"
+"るようにします。以前に <literal>apt-get update</literal> を実行していても更新"
+"(u)を実行する必要があります。"
 
-#. type: <p></p>
-#: guide.sgml:253
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:277
 msgid ""
 "You can then go on and make your selections using [S]elect and then perform "
 "the installation using [I]nstall. When using the APT method the [C]onfig and "
 "[R]emove commands have no meaning, the [I]nstall command performs both of "
 "them together."
 msgstr ""
+"その後は選択(s)を使って選択し、導入(i)を使ってインストールします。APT メソッ"
+"ドを使っている場合は設定(c)や削除(r)コマンドに意味はなく、導入(i)コマンドがそ"
+"の両方を実行します。"
 
-#. type: <p></p>
-#: guide.sgml:258
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:283
 msgid ""
 "By default APT will automatically remove the package (.deb) files once they "
-"have been successfully installed. To change this behavior place <tt>Dselect::"
-"clean \"prompt\";</tt> in /etc/apt/apt.conf."
+"have been successfully installed. To change this behavior place "
+"<literal>Dselect::clean \"prompt\";</literal> in /etc/apt/apt.conf."
 msgstr ""
+"デフォルトで APT はインストールに成功したパッケージ (.deb) ファイルを自動的に"
+"削除します。この挙動を変更するには /etc/apt/apt.conf 中に <literal>Dselect::"
+"clean \"prompt\";</literal> と記述します。"
 
-#. type: <heading></heading>
-#: guide.sgml:264
+#. type: Content of: <book><chapter><title>
+#: guide.dbk:289
 msgid "The Interface"
 msgstr "インターフェース"
 
-#. type: <p></p>
-#: guide.sgml:278
+#. type: Content of: <book><chapter><para><footnote><para>
+#: guide.dbk:293
 msgid ""
-"Both that APT <prgn>dselect</prgn> method and <prgn>apt-get</prgn> share the "
-"same interface. It is a simple system that generally tells you what it will "
-"do and then goes and does it. <footnote><p>The <prgn>dselect</prgn> method "
-"actually is a set of wrapper scripts to <prgn>apt-get</prgn>. The method "
-"actually provides more functionality than is present in <prgn>apt-get</prgn> "
-"alone.</p></footnote> After printing out a summary of what will happen APT "
+"The <command>dselect</command> method actually is a set of wrapper scripts "
+"to <command>apt-get</command>. The method actually provides more "
+"functionality than is present in <command>apt-get</command> alone."
+msgstr ""
+"<command>dselect</command> メソッドは実際に <command>apt-get</command> に対す"
+"るラッパースクリプト群です。このメソッドでは <command>apt-get</command> 単体"
+"に存在している以上の機能を実際に提供しています。"
+
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:291
+msgid ""
+"Both that APT <command>dselect</command> method and <command>apt-get</"
+"command> share the same interface. It is a simple system that generally "
+"tells you what it will do and then goes and does it. <placeholder type="
+"\"footnote\" id=\"0\"/> After printing out a summary of what will happen APT "
 "then will print out some informative status messages so that you can "
 "estimate how far along it is and how much is left to do."
 msgstr ""
+"APT の <command>dselect</command> メソッドと <command>apt-get</command> は共"
+"に同一のインターフェイスを共有しています。通常は行う内容を告知して実行する簡"
+"単なシステムです。<placeholder type=\"footnote\" id=\"0\"/> 実行内容のまとめ"
+"を告知した後 APT が参考になる状態メッセージをいくらか表示するため、どれくらい"
+"進んでいるのか、あるいは残り作業がどれくらいあるのか見積もることができるよう"
+"になっています。"
 
-#. type: <heading></heading>
-#: guide.sgml:280
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:302
 msgid "Startup"
 msgstr "スタートアップ"
 
-#. type: <p></p>
-#: guide.sgml:284
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:304
 msgid ""
 "Before all operations except update, APT performs a number of actions to "
 "prepare its internal state. It also does some checks of the system's state. "
-"At any time these operations can be performed by running <tt>apt-get check</"
-"tt>."
+"At any time these operations can be performed by running <literal>apt-get "
+"check</literal>."
 msgstr ""
+"update 以外のあらゆる操作で、APT はいくつか処理を行い内部状態を準備します。ま"
+"た、システムの状態についてもいくらか確認します。この処理は <literal>apt-get "
+"check</literal> によりいつでも実行できます。"
 
-#. type: <example></example>
-#: guide.sgml:289
+#. type: Content of: <book><chapter><section><screen>
+#: guide.dbk:310
 #, no-wrap
 msgid ""
 "# apt-get check\n"
 "Reading Package Lists... Done\n"
-"Building Dependency Tree... Done"
+"Building Dependency Tree... Done\n"
 msgstr ""
 "# apt-get check\n"
 "Reading Package Lists... Done\n"
-"Building Dependency Tree... Done"
+"Building Dependency Tree... Done\n"
 
-#. type: <p></p>
-#: guide.sgml:297
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:315
 msgid ""
 "The first thing it does is read all the package files into memory. APT uses "
 "a caching scheme so this operation will be faster the second time it is run. "
 "If some of the package files are not found then they will be ignored and a "
 "warning will be printed when apt-get exits."
 msgstr ""
+"これが最初に行うのはパッケージファイルを全てメモリに読み込むことです。APT は"
+"キャッシュを使うようになっているので、この処理は次に実行するときには早く終わ"
+"ります。見つけられないパッケージファイルがある場合は無視され、apt-get 終了時"
+"に注意を表示します。"
 
-#. type: <p></p>
-#: guide.sgml:303
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:321
 msgid ""
 "The final operation performs a detailed analysis of the system's "
 "dependencies. It checks every dependency of every installed or unpacked "
 "package and considers if it is OK. Should this find a problem then a report "
-"will be printed out and <prgn>apt-get</prgn> will refuse to run."
+"will be printed out and <command>apt-get</command> will refuse to run."
 msgstr ""
+"最後の処理はシステムの依存関係の詳細な分析です。インストール、あるいは展開さ"
+"れたパッケージの依存関係を全て確認し、問題ないか判断します。問題が見つかった"
+"場合は報告し、<command>apt-get</command> の実行を拒否します。"
 
-#. type: <example></example>
-#: guide.sgml:320
+#. type: Content of: <book><chapter><section><screen>
+#: guide.dbk:327
 #, no-wrap
 msgid ""
 "# apt-get check\n"
@@ -8650,14 +8805,14 @@ msgid ""
 "Sorry, but the following packages have unmet dependencies:\n"
 "  9fonts: Depends: xlib6g but it is not installed\n"
 "  uucp: Depends: mailx but it is not installed\n"
-"  blast: Depends: xlib6g (>= 3.3-5) but it is not installed\n"
+"  blast: Depends: xlib6g (&gt;= 3.3-5) but it is not installed\n"
 "  adduser: Depends: perl-base but it is not installed\n"
 "  aumix: Depends: libgpmg1 but it is not installed\n"
 "  debiandoc-sgml: Depends: sgml-base but it is not installed\n"
-"  bash-builtins: Depends: bash (>= 2.01) but 2.0-3 is installed\n"
+"  bash-builtins: Depends: bash (&gt;= 2.01) but 2.0-3 is installed\n"
 "  cthugha: Depends: svgalibg1 but it is not installed\n"
-"           Depends: xlib6g (>= 3.3-5) but it is not installed\n"
-"  libreadlineg2: Conflicts:libreadline2 (<< 2.1-2.1)"
+"           Depends: xlib6g (&gt;= 3.3-5) but it is not installed\n"
+"  libreadlineg2: Conflicts:libreadline2 (&lt;&lt; 2.1-2.1)\n"
 msgstr ""
 "# apt-get check\n"
 "Reading Package Lists... Done\n"
@@ -8666,17 +8821,17 @@ msgstr ""
 "Sorry, but the following packages have unmet dependencies:\n"
 "  9fonts: Depends: xlib6g but it is not installed\n"
 "  uucp: Depends: mailx but it is not installed\n"
-"  blast: Depends: xlib6g (>= 3.3-5) but it is not installed\n"
+"  blast: Depends: xlib6g (&gt;= 3.3-5) but it is not installed\n"
 "  adduser: Depends: perl-base but it is not installed\n"
 "  aumix: Depends: libgpmg1 but it is not installed\n"
 "  debiandoc-sgml: Depends: sgml-base but it is not installed\n"
-"  bash-builtins: Depends: bash (>= 2.01) but 2.0-3 is installed\n"
+"  bash-builtins: Depends: bash (&gt;= 2.01) but 2.0-3 is installed\n"
 "  cthugha: Depends: svgalibg1 but it is not installed\n"
-"           Depends: xlib6g (>= 3.3-5) but it is not installed\n"
-"  libreadlineg2: Conflicts:libreadline2 (<< 2.1-2.1)"
+"           Depends: xlib6g (&gt;= 3.3-5) but it is not installed\n"
+"  libreadlineg2: Conflicts:libreadline2 (&lt;&lt; 2.1-2.1)\n"
 
-#. type: <p></p>
-#: guide.sgml:329
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:344
 msgid ""
 "In this example the system has many problems, including a serious problem "
 "with libreadlineg2. For each package that has unmet dependencies a line is "
@@ -8684,62 +8839,97 @@ msgid ""
 "that are unmet. A short explanation of why the package has a dependency "
 "problem is also included."
 msgstr ""
+"この例ではシステムに libreadlineg2 に関する重大な問題を含めて多数の問題があり"
+"ます。未解決の依存関係があれば各パッケージごとにそのパッケージに問題があるこ"
+"とを示し、併せて未解決の依存関係を1行で出力します。そのパッケージの依存問題の"
+"理由について簡潔な説明も添えられます。"
 
-#. type: <p></p>
-#: guide.sgml:337
+#. type: Content of: <book><chapter><section><para><footnote><para>
+#: guide.dbk:353
 msgid ""
-"There are two ways a system can get into a broken state like this. The first "
-"is caused by <prgn>dpkg</prgn> missing some subtle relationships between "
-"packages when performing upgrades. <footnote><p>APT however considers all "
-"known dependencies and attempts to prevent broken packages</p></footnote>. "
-"The second is if a package installation fails during an operation. In this "
-"situation a package may have been unpacked without its dependents being "
-"installed."
+"APT however considers all known dependencies and attempts to prevent broken "
+"packages"
 msgstr ""
+"APT はそれでも既知の依存関係を全て検討し、パッケージが壊れた状態となることを"
+"回避しようとします。"
 
-#. type: <p></p>
-#: guide.sgml:345
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:351
 msgid ""
-"The second situation is much less serious than the first because APT places "
-"certain constraints on the order that packages are installed. In both cases "
-"supplying the <tt>-f</tt> option to <prgn>apt-get</prgn> will cause APT to "
-"deduce a possible solution to the problem and then continue on. The APT "
-"<prgn>dselect</prgn> method always supplies the <tt>-f</tt> option to allow "
-"for easy continuation of failed maintainer scripts."
+"There are two ways a system can get into a broken state like this. The first "
+"is caused by <command>dpkg</command> missing some subtle relationships "
+"between packages when performing upgrades. <placeholder type=\"footnote\" id="
+"\"0\"/>. The second is if a package installation fails during an operation. "
+"In this situation a package may have been unpacked without its dependents "
+"being installed."
 msgstr ""
+"システムがこのように壊れた状態となる原因は2つあります。1つ目はアップグレード"
+"実行時にパッケージ間の難解な依存関係を <command>dpkg</command> がいくらか欠い"
+"ていることによります。<placeholder type=\"footnote\" id=\"0\"/>2つ目はパッ"
+"ケージのインストール処理中に何か失敗した場合です。この状況では依存するパッ"
+"ケージがインストールされないままパッケージが展開されている可能性があります。"
 
-#. type: <p></p>
-#: guide.sgml:351
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:360
 msgid ""
-"However, if the <tt>-f</tt> option is used to correct a seriously broken "
-"system caused by the first case then it is possible that it will either fail "
-"immediately or the installation sequence will fail. In either case it is "
-"necessary to manually use dpkg (possibly with forcing options) to correct "
-"the situation enough to allow APT to proceed."
-msgstr ""
-
-#. type: <heading></heading>
-#: guide.sgml:356
+"The second situation is much less serious than the first because APT places "
+"certain constraints on the order that packages are installed. In both cases "
+"supplying the <literal>-f</literal> option to <command>apt-get</command> "
+"will cause APT to deduce a possible solution to the problem and then "
+"continue on. The APT <command>dselect</command> method always supplies the "
+"<literal>-f</literal> option to allow for easy continuation of failed "
+"maintainer scripts."
+msgstr ""
+"APT がパッケージのインストール順序に特定の制約を設けていることにより2つ目の状"
+"況は1つ目の状況と比べて重大ですらなくなります。どちらの場合でも <command>apt-"
+"get</command> に <literal>-f</literal> オプションを指定することで APT は解決"
+"方法を推測し、処理を続けます。APT <command>dselect</command> メソッドでは常"
+"に <literal>-f</literal> オプションを有効にして、メンテナスクリプトでの問題が"
+"起きた場合でも簡単に処理を継続できるようにしています。"
+
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:369
+msgid ""
+"However, if the <literal>-f</literal> option is used to correct a seriously "
+"broken system caused by the first case then it is possible that it will "
+"either fail immediately or the installation sequence will fail. In either "
+"case it is necessary to manually use dpkg (possibly with forcing options) to "
+"correct the situation enough to allow APT to proceed."
+msgstr ""
+"しかし、1つ目の状況により重大な壊れ方になっているシステムの修正に <literal>-"
+"f</literal> オプションを使った場合はインストールにすぐに失敗、あるいはインス"
+"トール順序がおかしくなる可能性があります。どちらの場合も、APT が処理を十分に"
+"進められるところまで手作業により dpkg を使って (恐らく強制するオプションを指"
+"定して) 状況を修正する必要があります。"
+
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:377
 msgid "The Status Report"
 msgstr "状態レポート"
 
-#. type: <p></p>
-#: guide.sgml:363
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:379
 msgid ""
-"Before proceeding <prgn>apt-get</prgn> will present a report on what will "
-"happen. Generally the report reflects the type of operation being performed "
-"but there are several common elements. In all cases the lists reflect the "
-"final state of things, taking into account the <tt>-f</tt> option and any "
-"other relevant activities to the command being executed."
+"Before proceeding <command>apt-get</command> will present a report on what "
+"will happen. Generally the report reflects the type of operation being "
+"performed but there are several common elements. In all cases the lists "
+"reflect the final state of things, taking into account the <literal>-f</"
+"literal> option and any other relevant activities to the command being "
+"executed."
 msgstr ""
+"処理を続ける前に <command>apt-get</command> は実行しようとする処理について報"
+"告します。通常この報告は実行される操作の種類を反映したものになりますが、一般"
+"的要素がいくつかあります。どの場合でもこの処理一覧は最終的な状態を示し、"
+"<literal>-f</literal> オプションその他の実行されるコマンドに関連する動作を考"
+"慮したものとなります。"
 
-#. type: <heading></heading>
-#: guide.sgml:364
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:386
 msgid "The Extra Package list"
 msgstr "追加パッケージリスト"
 
-#. type: <example></example>
-#: guide.sgml:372
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:388
 #, no-wrap
 msgid ""
 "The following extra packages will be installed:\n"
@@ -8747,156 +8937,178 @@ msgid ""
 "  mailpgp xdpkg fileutils pinepgp zlib1g xlib6g perl-base\n"
 "  bin86 libgdbm1 libgdbmg1 quake-lib gmp2 bcc xbuffy\n"
 "  squake pgp-i python-base debmake ldso perl libreadlineg2\n"
-"  ssh"
+"  ssh\n"
 msgstr ""
 "The following extra packages will be installed:\n"
 "  libdbd-mysql-perl xlib6 zlib1 xzx libreadline2 libdbd-msql-perl\n"
 "  mailpgp xdpkg fileutils pinepgp zlib1g xlib6g perl-base\n"
 "  bin86 libgdbm1 libgdbmg1 quake-lib gmp2 bcc xbuffy\n"
 "  squake pgp-i python-base debmake ldso perl libreadlineg2\n"
-"  ssh"
+"  ssh\n"
 
-#. type: <p></p>
-#: guide.sgml:379
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:396
 msgid ""
 "The Extra Package list shows all of the packages that will be installed or "
 "upgraded in excess of the ones mentioned on the command line. It is only "
-"generated for an <tt>install</tt> command. The listed packages are often the "
-"result of an Auto Install."
+"generated for an <literal>install</literal> command. The listed packages are "
+"often the result of an Auto Install."
 msgstr ""
+"追加パッケージリストはコマンドラインで指示した以外にインストールやアップグ"
+"レードされるパッケージを全て表示します。これは <literal>install</literal> コ"
+"マンドの場合にのみ生成されます。一覧に挙げられるパッケージは自動インストール"
+"の結果による場合が多くなります。"
 
-#. type: <heading></heading>
-#: guide.sgml:382
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:403
 msgid "The Packages to Remove"
 msgstr "削除するパッケージ"
 
-#. type: <example></example>
-#: guide.sgml:389
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:405
 #, no-wrap
 msgid ""
 "The following packages will be REMOVED:\n"
 "  xlib6-dev xpat2 tk40-dev xkeycaps xbattle xonix\n"
 "  xdaliclock tk40 tk41 xforms0.86 ghostview xloadimage xcolorsel\n"
 "  xadmin xboard perl-debug tkined xtetris libreadline2-dev perl-suid\n"
-"  nas xpilot xfig"
+"  nas xpilot xfig\n"
 msgstr ""
 "The following packages will be REMOVED:\n"
 "  xlib6-dev xpat2 tk40-dev xkeycaps xbattle xonix\n"
 "  xdaliclock tk40 tk41 xforms0.86 ghostview xloadimage xcolorsel\n"
 "  xadmin xboard perl-debug tkined xtetris libreadline2-dev perl-suid\n"
-"  nas xpilot xfig"
+"  nas xpilot xfig\n"
 
-#. type: <p></p>
-#: guide.sgml:399
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:412
 msgid ""
 "The Packages to Remove list shows all of the packages that will be removed "
 "from the system. It can be shown for any of the operations and should be "
 "given a careful inspection to ensure nothing important is to be taken off. "
-"The <tt>-f</tt> option is especially good at generating packages to remove "
-"so extreme care should be used in that case. The list may contain packages "
-"that are going to be removed because they are only partially installed, "
-"possibly due to an aborted installation."
-msgstr ""
-
-#. type: <heading></heading>
-#: guide.sgml:402
+"The <literal>-f</literal> option is especially good at generating packages "
+"to remove so extreme care should be used in that case. The list may contain "
+"packages that are going to be removed because they are only partially "
+"installed, possibly due to an aborted installation."
+msgstr ""
+"削除するパッケージリストはシステムから削除されるパッケージを全て表示します。"
+"これはどの操作でも起きるもので、重要なものが失われることのないように注意深く"
+"確認すべきです。<literal>-f</literal> オプションを使った場合はパッケージの削"
+"除を伴うことが特に多く、そのためこのオプションを指定した場合は特に注意を払う"
+"ようにしてください。この一覧にはインストールの中止等により一部だけがインス"
+"トールされているために削除されるパッケージが含まれることがあります。"
+
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:422
 msgid "The New Packages list"
 msgstr "新規パッケージリスト"
 
-#. type: <example></example>
-#: guide.sgml:406
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:424
 #, no-wrap
 msgid ""
 "The following NEW packages will installed:\n"
-"  zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base"
+"  zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base\n"
 msgstr ""
 "The following NEW packages will installed:\n"
-"  zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base"
+"  zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base\n"
 
-#. type: <p></p>
-#: guide.sgml:411
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:428
 msgid ""
 "The New Packages list is simply a reminder of what will happen. The packages "
 "listed are not presently installed in the system but will be when APT is "
 "done."
 msgstr ""
+"新規パッケージリストでは単純にこれから起きることを再通知します。このパッケー"
+"ジ一覧は現在システムにインストールされておらず、APT 処理後には存在することに"
+"なります。"
 
-#. type: <heading></heading>
-#: guide.sgml:414
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:433
 msgid "The Kept Back list"
 msgstr "一時固定リスト"
 
-#. type: <example></example>
-#: guide.sgml:419
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:435
 #, no-wrap
 msgid ""
 "The following packages have been kept back\n"
 "  compface man-db tetex-base msql libpaper svgalib1\n"
-"  gs snmp arena lynx xpat2 groff xscreensaver"
+"  gs snmp arena lynx xpat2 groff xscreensaver\n"
 msgstr ""
 "The following packages have been kept back\n"
 "  compface man-db tetex-base msql libpaper svgalib1\n"
-"  gs snmp arena lynx xpat2 groff xscreensaver"
+"  gs snmp arena lynx xpat2 groff xscreensaver\n"
 
-#. type: <p></p>
-#: guide.sgml:428
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:440
 msgid ""
 "Whenever the whole system is being upgraded there is the possibility that "
 "new versions of packages cannot be installed because they require new things "
 "or conflict with already installed things. In this case the package will "
 "appear in the Kept Back list. The best way to convince packages listed there "
-"to install is with <tt>apt-get install</tt> or by using <prgn>dselect</prgn> "
-"to resolve their problems."
-msgstr ""
-
-#. type: <heading></heading>
-#: guide.sgml:431
+"to install is with <literal>apt-get install</literal> or by using "
+"<command>dselect</command> to resolve their problems."
+msgstr ""
+"システム全体をアップグレードする場合、新しいパッケージが必要であったり既にイ"
+"ンストールされているパッケージと競合するためにパッケージの新しいバージョンが"
+"インストールできないということがあります。この場合、そのパッケージは一時固定"
+"リストに表示されます。この一覧に挙げられたパッケージをインストールする最善の"
+"方法は <literal>apt-get install</literal> または <command>dselect</command> "
+"を使ってその問題を解決することです。"
+
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:449
 msgid "Held Packages warning"
 msgstr "保留パッケージの警告"
 
-#. type: <example></example>
-#: guide.sgml:435
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:451
 #, no-wrap
 msgid ""
 "The following held packages will be changed:\n"
-"  cvs"
+"  cvs\n"
 msgstr ""
 "The following held packages will be changed:\n"
-"  cvs"
+"  cvs\n"
 
-#. type: <p></p>
-#: guide.sgml:441
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:455
 msgid ""
 "Sometimes you can ask APT to install a package that is on hold, in such a "
 "case it prints out a warning that the held package is going to be changed. "
 "This should only happen during dist-upgrade or install."
 msgstr ""
+"保留となっているパッケージをインストールするように APT に指示することもできま"
+"す。その際、保留となっているパッケージを変更することを警告します。これは "
+"dist-upgrade または install を指示したときにしか起きないはずです。"
 
-#. type: <heading></heading>
-#: guide.sgml:444
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:461
 msgid "Final summary"
 msgstr "最後のまとめ"
 
-#. type: <p></p>
-#: guide.sgml:447
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:463
 msgid ""
 "Finally, APT will print out a summary of all the changes that will occur."
-msgstr ""
+msgstr "最後に、APT は発生する全変更のまとめを表示します。"
 
-#. type: <example></example>
-#: guide.sgml:452
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:466
 #, no-wrap
 msgid ""
 "206 packages upgraded, 8 newly installed, 23 to remove and 51 not upgraded.\n"
 "12 packages not fully installed or removed.\n"
-"Need to get 65.7M/66.7M of archives. After unpacking 26.5M will be used."
+"Need to get 65.7M/66.7M of archives. After unpacking 26.5M will be used.\n"
 msgstr ""
 "206 packages upgraded, 8 newly installed, 23 to remove and 51 not upgraded.\n"
 "12 packages not fully installed or removed.\n"
-"Need to get 65.7M/66.7M of archives. After unpacking 26.5M will be used."
+"Need to get 65.7M/66.7M of archives. After unpacking 26.5M will be used.\n"
 
-#. type: <p></p>
-#: guide.sgml:470
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:471
 msgid ""
 "The first line of the summary simply is a reduced version of all of the "
 "lists and includes the number of upgrades - that is packages already "
@@ -8912,28 +9124,42 @@ msgid ""
 "If a large number of packages are being removed then the value may indicate "
 "the amount of space that will be freed."
 msgstr ""
+"まとめの1行目は単純に一覧を全て短くまとめたもので、アップグレードされる (既に"
+"インストールされていて新しいバージョンが利用可能な) パッケージの数についても"
+"示します。2行目は設定が完了していないパッケージの数を示し、インストールを中止"
+"した場合にこれに集計されることがあります。最終行はそのインストールで必要とな"
+"る容量の要件を示します。最初の数値の組はアーカイブファイルのサイズを示しま"
+"す。この1つ目の数値はリモートから取得してくる必要のあるバイト数、2つ目は必要"
+"となる全アーカイブの合計サイズを示します。次の数値は現在インストールされてい"
+"るパッケージと新しくインストールしたパッケージのサイズの違いを示します。これ"
+"は処理が全て終わった後に /usr で消費される容量にほぼ相当します。パッケージを"
+"大量に削除する場合は解放される容量を示すこともあります。"
 
-#. type: <p></p>
-#: guide.sgml:473
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:485
 msgid ""
 "Some other reports can be generated by using the -u option to show packages "
 "to upgrade, they are similar to the previous examples."
 msgstr ""
+"他の報告として、-u オプションを使うとアップグレードされるパッケージを表示しま"
+"す。これは前に示した例と似たものです。"
 
-#. type: <heading></heading>
-#: guide.sgml:477
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:492
 msgid "The Status Display"
 msgstr "状態表示"
 
-#. type: <p></p>
-#: guide.sgml:481
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:494
 msgid ""
 "During the download of archives and package files APT prints out a series of "
 "status messages."
 msgstr ""
+"アーカイブやパッケージファイルのダウンロード中、APT は状態を示す一連のメッ"
+"セージを表示します。"
 
-#. type: <example></example>
-#: guide.sgml:490
+#. type: Content of: <book><chapter><section><screen>
+#: guide.dbk:498
 #, no-wrap
 msgid ""
 "# apt-get update\n"
@@ -8942,7 +9168,7 @@ msgid ""
 "Hit http://llug.sep.bnl.gov/debian/ testing/main Packages\n"
 "Get:4 http://ftp.de.debian.org/debian-non-US/ unstable/binary-i386/ Packages\n"
 "Get:5 http://llug.sep.bnl.gov/debian/ testing/non-free Packages\n"
-"11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s"
+"11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s\n"
 msgstr ""
 "# apt-get update\n"
 "Get:1 http://ftp.de.debian.org/debian-non-US/ stable/non-US/ Packages\n"
@@ -8950,87 +9176,116 @@ msgstr ""
 "Hit http://llug.sep.bnl.gov/debian/ testing/main Packages\n"
 "Get:4 http://ftp.de.debian.org/debian-non-US/ unstable/binary-i386/ Packages\n"
 "Get:5 http://llug.sep.bnl.gov/debian/ testing/non-free Packages\n"
-"11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s"
+"11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s\n"
 
-#. type: <p></p>
-#: guide.sgml:500
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:507
 msgid ""
-"The lines starting with <em>Get</em> are printed out when APT begins to "
-"fetch a file while the last line indicates the progress of the download. The "
-"first percent value on the progress line indicates the total percent done of "
-"all files. Unfortunately since the size of the Package files is unknown "
-"<tt>apt-get update</tt> estimates the percent done which causes some "
-"inaccuracies."
+"The lines starting with <emphasis>Get</emphasis> are printed out when APT "
+"begins to fetch a file while the last line indicates the progress of the "
+"download. The first percent value on the progress line indicates the total "
+"percent done of all files. Unfortunately since the size of the Package files "
+"is unknown <literal>apt-get update</literal> estimates the percent done "
+"which causes some inaccuracies."
 msgstr ""
+"APT がファイルの取得を開始すると、最終行でダウンロードの進捗状況を示しつつ"
+"<emphasis>取得</emphasis>で始まる行が表示されます。進捗の最初のパーセント値は"
+"全ファイルに対する取得済みの全体での割合を示します。残念ながらパッケージファ"
+"イルのサイズは不明なので <literal>apt-get update</literal> は不正確な予測を行"
+"う可能性があります。"
 
-#. type: <p></p>
-#: guide.sgml:509
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:515
 msgid ""
 "The next section of the status line is repeated once for each download "
 "thread and indicates the operation being performed and some useful "
 "information about what is happening. Sometimes this section will simply read "
-"<em>Forking</em> which means the OS is loading the download module. The "
-"first word after the [ is the fetch number as shown on the history lines. "
-"The next word is the short form name of the object being downloaded. For "
-"archives it will contain the name of the package that is being fetched."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:524
+"<emphasis>Forking</emphasis> which means the OS is loading the download "
+"module. The first word after the [ is the fetch number as shown on the "
+"history lines. The next word is the short form name of the object being "
+"downloaded. For archives it will contain the name of the package that is "
+"being fetched."
+msgstr ""
+"状態を示す行の次の節は各ダウンロードスレッドごとに1度ずつ繰り返され、進行中の"
+"操作や処理についての有用な情報をいくらか示します。この節は単純に "
+"<emphasis>Forking</emphasis> となっていることもあり、その場合は OS がダウン"
+"ロード用のモジュールを読み込んでいることを示します。[ の後の最初の語は履歴に"
+"表示されている取得番号です。その次の語はダウンロード対象の名前の短縮形です。"
+"アーカイブの場合は取得中のパッケージの名前が入ります。"
+
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:525
 msgid ""
 "Inside of the single quote is an informative string indicating the progress "
 "of the negotiation phase of the download. Typically it progresses from "
-"<em>Connecting</em> to <em>Waiting for file</em> to <em>Downloading</em> or "
-"<em>Resuming</em>. The final value is the number of bytes downloaded from "
-"the remote site. Once the download begins this is represented as "
-"<tt>102/10.2k</tt> indicating that 102 bytes have been fetched and 10.2 "
-"kilobytes is expected. The total size is always shown in 4 figure notation "
-"to preserve space. After the size display is a percent meter for the file "
-"itself. The second last element is the instantaneous average speed. This "
-"values is updated every 5 seconds and reflects the rate of data transfer for "
-"that period. Finally is shown the estimated transfer time. This is updated "
-"regularly and reflects the time to complete everything at the shown transfer "
-"rate."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:530
+"<emphasis>Connecting</emphasis> to <emphasis>Waiting for file</emphasis> to "
+"<emphasis>Downloading</emphasis> or <emphasis>Resuming</emphasis>. The final "
+"value is the number of bytes downloaded from the remote site. Once the "
+"download begins this is represented as <literal>102/10.2k</literal> "
+"indicating that 102 bytes have been fetched and 10.2 kilobytes is expected. "
+"The total size is always shown in 4 figure notation to preserve space. After "
+"the size display is a percent meter for the file itself. The second last "
+"element is the instantaneous average speed. This values is updated every 5 "
+"seconds and reflects the rate of data transfer for that period. Finally is "
+"shown the estimated transfer time. This is updated regularly and reflects "
+"the time to complete everything at the shown transfer rate."
+msgstr ""
+"単一引用符内はダウンロードのやりとりの進捗を示す有益な文字列です。標準的には"
+"<emphasis>...へ接続しています</emphasis>から<emphasis>ファイルを待っています"
+"</emphasis>へ、それから<emphasis>...をダウンロードしています</emphasis>または"
+"<emphasis>...を再開しています</emphasis>へと進みます。最後の値はリモートサイ"
+"トからダウンロードしたバイト数です。ダウンロードが始まるとこれは "
+"<literal>102/10.2k</literal> のように表示され、この場合10.2キロバイトのうち"
+"102バイトが取得済みであることを示します。合計サイズは常に4ケタで表示され、表"
+"示空間を保つようになっています。サイズ表示の後はそのファイル自体の進捗状況を"
+"百分率で示したものです。その2つ後は瞬間的な平均速度です。この値は5秒ごとに更"
+"新され、その間のデータ転送速度を反映します。最後は推定転送時間を表示していま"
+"す。これは定期的に更新され、表示している転送速度で全て完了する時間を表示しま"
+"す。"
+
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:540
 msgid ""
 "The status display updates every half second to provide a constant feedback "
 "on the download progress while the Get lines scroll back whenever a new file "
 "is started. Since the status display is constantly updated it is unsuitable "
-"for logging to a file, use the <tt>-q</tt> option to remove the status "
-"display."
+"for logging to a file, use the <literal>-q</literal> option to remove the "
+"status display."
 msgstr ""
+"状態表示は0.5秒ごとに更新してダウンロードの進捗状況を絶えず通知し、取得行は新"
+"しいファイルの処理が始まるたびに流れていきます。状態表示は絶えず更新されるた"
+"めファイルへの記録には適しません。<literal>-q</literal> オプションを使うと状"
+"態を表示しないようにできます。"
 
-#. type: <heading></heading>
-#: guide.sgml:535
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:548
 msgid "Dpkg"
 msgstr "Dpkg"
 
-#. type: <p></p>
-#: guide.sgml:542
-msgid ""
-"APT uses <prgn>dpkg</prgn> for installing the archives and will switch over "
-"to the <prgn>dpkg</prgn> interface once downloading is completed. "
-"<prgn>dpkg</prgn> will also ask a number of questions as it processes the "
-"packages and the packages themselves may also ask several questions. Before "
-"each question there is usually a description of what it is asking and the "
-"questions are too varied to discuss completely here."
-msgstr ""
-
-#. type: <title></title>
-#: offline.sgml:4
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:550
+msgid ""
+"APT uses <command>dpkg</command> for installing the archives and will switch "
+"over to the <command>dpkg</command> interface once downloading is completed. "
+"<command>dpkg</command> will also ask a number of questions as it processes "
+"the packages and the packages themselves may also ask several questions. "
+"Before each question there is usually a description of what it is asking and "
+"the questions are too varied to discuss completely here."
+msgstr ""
+"APT はアーカイブのインストールに <command>dpkg</command> を使い、ダウンロード"
+"の完了後は <command>dpkg</command> インターフェイスに切り替わります。"
+"<command>dpkg</command> もパッケージの処理中にいくつか質問し、パッケージ自体"
+"も複数質問するかもしれません。通常それぞれの質問の前にそれが何を聞いているの"
+"か説明します。その質問の内容は多岐にわたるものであり、ここで説明できるもので"
+"は全くありません。"
+
+#. type: Content of: <book><title>
+#: offline.dbk:11
 msgid "Using APT Offline"
 msgstr "オフラインでの APT の使用法"
 
-#. type: <version></version>
-#: offline.sgml:7
-msgid "$Id: offline.sgml,v 1.8 2003/02/12 15:06:41 doogie Exp $"
-msgstr "$Id: offline.sgml,v 1.8 2003/02/12 15:06:41 doogie Exp $"
-
-#. type: <abstract></abstract>
-#: offline.sgml:12
+#. type: Content of: <book><bookinfo><abstract><para>
+#: offline.dbk:25
 msgid ""
 "This document describes how to use APT in a non-networked environment, "
 "specifically a 'sneaker-net' approach for performing upgrades."
@@ -9038,32 +9293,38 @@ msgstr ""
 "このドキュメントはネットワークがない環境での APT の使用方法を説明しています。"
 "具体的には、アップグレード時の「スニーカーネット」アプローチです。"
 
-#. type: <copyrightsummary></copyrightsummary>
-#: offline.sgml:16
-msgid "Copyright &copy; Jason Gunthorpe, 1999."
-msgstr "Copyright &copy; Jason Gunthorpe, 1999."
+#. type: Content of: <book><bookinfo>
+#: offline.dbk:30
+msgid ""
+"<copyright><year>1999</year><holder>Jason Gunthorpe</holder></copyright>"
+msgstr ""
+"<copyright><year>1999</year><holder>Jason Gunthorpe</holder></copyright>"
 
-#. type: <heading></heading>
-#: offline.sgml:32
+#. type: Content of: <book><chapter><title>
+#: offline.dbk:48
 msgid "Introduction"
 msgstr "はじめに"
 
-#. type: <heading></heading>
-#: offline.sgml:34 offline.sgml:65 offline.sgml:180
+#. type: Content of: <book><chapter><section><title>
+#: offline.dbk:50 offline.dbk:80 offline.dbk:192
 msgid "Overview"
 msgstr "概要"
 
-#. type: <p></p>
-#: offline.sgml:40
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:52
 msgid ""
 "Normally APT requires direct access to a Debian archive, either from a local "
 "media or through a network. Another common complaint is that a Debian "
 "machine is on a slow link, such as a modem and another machine has a very "
 "fast connection but they are physically distant."
 msgstr ""
+"通常 APT は Debian アーカイブに、ローカルメディアから、あるいはネットワーク経"
+"由で直接アクセスできる必要があります。他によくある苦情としてはある Debian マ"
+"シンの接続がモデム等のために低速で、別のマシンには非常に高速な接続があるけれ"
+"ども物理的に遠い、といったことがあります。"
 
-#. type: <p></p>
-#: offline.sgml:51
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:58
 msgid ""
 "The solution to this is to use large removable media such as a Zip disc or a "
 "SuperDisk disc. These discs are not large enough to store the entire Debian "
@@ -9071,36 +9332,53 @@ msgid ""
 "to use APT to generate a list of packages that are required and then fetch "
 "them onto the disc using another machine with good connectivity. It is even "
 "possible to use another Debian machine with APT or to use a completely "
-"different OS and a download tool like wget. Let <em>remote host</em> mean "
-"the machine downloading the packages, and <em>target host</em> the one with "
-"bad or no connection."
-msgstr ""
-
-#. type: <p></p>
-#: offline.sgml:57
+"different OS and a download tool like wget. Let <emphasis>remote host</"
+"emphasis> mean the machine downloading the packages, and <emphasis>target "
+"host</emphasis> the one with bad or no connection."
+msgstr ""
+"これに対する解法としては Zip や SuperDisk ディスクといった大容量脱着可能メ"
+"ディアを使います。こういったディスクは Debian アーカイブ全体を格納するには十"
+"分とは言えない容量ですがほとんどのユーザにとって必要なその一部を収めるには十"
+"分余裕があります。その考え方は APT を使って必要なパッケージの一覧を生成し、接"
+"続状態の良好な別のマシンを使ってそのディスク上に取得します。APT を使える別の "
+"Debian マシンや、完全に異なる OS で wget のようなダウンロードツールを使うこと"
+"も可能です。<emphasis>リモートホスト</emphasis>はパッケージをダウンロードする"
+"マシン、<emphasis>対象ホスト</emphasis>は接続がないあるいは良くないマシンだと"
+"考えてください。"
+
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:69
 msgid ""
 "This is achieved by creatively manipulating the APT configuration file. The "
 "essential premise to tell APT to look on a disc for it's archive files. Note "
 "that the disc should be formated with a filesystem that can handle long file "
 "names such as ext2, fat32 or vfat."
 msgstr ""
+"これは APT 設定ファイルを独創的に操作することで実現できます。あるディスクを "
+"APT が検索するようにするために必須となる前提条件はアーカイブファイルです。そ"
+"のディスクは長いファイル名を扱えるファイルシステム、例えば ext2 や fat32、"
+"vfat でフォーマットする必要があることに注意してください。"
 
-#. type: <heading></heading>
-#: offline.sgml:63
+#. type: Content of: <book><chapter><title>
+#: offline.dbk:78
 msgid "Using APT on both machines"
 msgstr "両方のマシンでの APT の使用法"
 
-#. type: <p><example>
-#: offline.sgml:71
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:82
 msgid ""
 "APT being available on both machines gives the simplest configuration. The "
 "basic idea is to place a copy of the status file on the disc and use the "
 "remote machine to fetch the latest package files and decide which packages "
 "to download. The disk directory structure should look like:"
 msgstr ""
+"APT を両方のマシンで利用できるようにする最も単純な設定を考えます。基本的な考"
+"え方は status ファイルのコピーをそのディスクに置いて最新のパッケージファイル"
+"の取得やダウンロードするパッケージの決定にはリモートマシンを使います。その"
+"ディスクのディレクトリ構造は次のようになります:"
 
-#. type: <example></example>
-#: offline.sgml:80
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:88
 #, no-wrap
 msgid ""
 "  /disc/\n"
@@ -9110,7 +9388,7 @@ msgid ""
 "       partial/\n"
 "    status\n"
 "    sources.list\n"
-"    apt.conf"
+"    apt.conf\n"
 msgstr ""
 "  /disc/\n"
 "    archives/\n"
@@ -9119,33 +9397,42 @@ msgstr ""
 "       partial/\n"
 "    status\n"
 "    sources.list\n"
-"    apt.conf"
+"    apt.conf\n"
 
-#. type: <heading></heading>
-#: offline.sgml:88
+#. type: Content of: <book><chapter><section><title>
+#: offline.dbk:99
 msgid "The configuration file"
 msgstr "設定ファイル"
 
-#. type: <p></p>
-#: offline.sgml:96
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:101
 msgid ""
 "The configuration file should tell APT to store its files on the disc and to "
 "use the configuration files on the disc as well. The sources.list should "
 "contain the proper sites that you wish to use from the remote machine, and "
-"the status file should be a copy of <em>/var/lib/dpkg/status</em> from the "
-"<em>target host</em>. Please note, if you are using a local archive you must "
-"use copy URIs, the syntax is identical to file URIs."
+"the status file should be a copy of <emphasis>/var/lib/dpkg/status</"
+"emphasis> from the <emphasis>target host</emphasis>. Please note, if you are "
+"using a local archive you must use copy URIs, the syntax is identical to "
+"file URIs."
 msgstr ""
+"設定ファイルでは APT が管理ファイルをそのディスクに保存し、そのディスク上の設"
+"定ファイルを同様に利用するように指示する必要があります。sources.list ではリ"
+"モートマシンから利用する適切なサイトを指定し、status ファイルは<emphasis>対象"
+"ホスト</emphasis>の <emphasis>/var/lib/dpkg/status</emphasis> をコピーしたも"
+"のを利用します。ローカルアーカイブを使っている場合はその URI を利用しないとい"
+"けないことに注意してください。書式はファイルの URI と同一です。"
 
-#. type: <p><example>
-#: offline.sgml:100
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:109
 msgid ""
-"<em>apt.conf</em> must contain the necessary information to make APT use the "
-"disc:"
+"<emphasis>apt.conf</emphasis> must contain the necessary information to make "
+"APT use the disc:"
 msgstr ""
+"<emphasis>apt.conf</emphasis> には APT がそのディスクを使うようにするのに必要"
+"な情報を記述しないといけません:"
 
-#. type: <example></example>
-#: offline.sgml:124
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:113
 #, no-wrap
 msgid ""
 " APT\n"
@@ -9153,10 +9440,10 @@ msgid ""
 "   /* This is not necessary if the two machines are the same arch, it tells\n"
 "      the remote APT what architecture the target machine is */\n"
 "   Architecture \"i386\";\n"
-"   \n"
+"\n"
 "   Get::Download-Only \"true\";\n"
 " };\n"
-" \n"
+"\n"
 " Dir\n"
 " {\n"
 "   /* Use the disc for state information and redirect the status file from\n"
@@ -9167,20 +9454,20 @@ msgid ""
 "   // Binary caches will be stored locally\n"
 "   Cache::archives \"/disc/archives/\";\n"
 "   Cache \"/tmp/\";\n"
-"   \n"
+"\n"
 "   // Location of the source list.\n"
 "   Etc \"/disc/\";\n"
-" };"
+" };\n"
 msgstr ""
 " APT\n"
 " {\n"
 "   /* This is not necessary if the two machines are the same arch, it tells\n"
 "      the remote APT what architecture the target machine is */\n"
 "   Architecture \"i386\";\n"
-"   \n"
+"\n"
 "   Get::Download-Only \"true\";\n"
 " };\n"
-" \n"
+"\n"
 " Dir\n"
 " {\n"
 "   /* Use the disc for state information and redirect the status file from\n"
@@ -9191,85 +9478,103 @@ msgstr ""
 "   // Binary caches will be stored locally\n"
 "   Cache::archives \"/disc/archives/\";\n"
 "   Cache \"/tmp/\";\n"
-"   \n"
+"\n"
 "   // Location of the source list.\n"
 "   Etc \"/disc/\";\n"
-" };"
+" };\n"
 
-#. type: </example></p>
-#: offline.sgml:129
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:138
 msgid ""
 "More details can be seen by examining the apt.conf man page and the sample "
-"configuration file in <em>/usr/share/doc/apt/examples/apt.conf</em>."
-msgstr ""
-
-#. type: <p><example>
-#: offline.sgml:136
-msgid ""
-"On the target machine the first thing to do is mount the disc and copy <em>/"
-"var/lib/dpkg/status</em> to it. You will also need to create the directories "
-"outlined in the Overview, <em>archives/partial/</em> and <em>lists/partial/</"
-"em>. Then take the disc to the remote machine and configure the sources."
-"list. On the remote machine execute the following:"
-msgstr ""
-
-#. type: <example></example>
-#: offline.sgml:142
+"configuration file in <emphasis>/usr/share/doc/apt/examples/apt.conf</"
+"emphasis>."
+msgstr ""
+"apt.conf の man ページや <emphasis>/usr/share/doc/apt/examples/apt.conf</"
+"emphasis> にある見本の設定ファイルを調べるとさらなる詳細があります。"
+
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:143
+msgid ""
+"On the target machine the first thing to do is mount the disc and copy "
+"<emphasis>/var/lib/dpkg/status</emphasis> to it. You will also need to "
+"create the directories outlined in the Overview, <emphasis>archives/partial/"
+"</emphasis> and <emphasis>lists/partial/</emphasis>. Then take the disc to "
+"the remote machine and configure the sources.list. On the remote machine "
+"execute the following:"
+msgstr ""
+"対象のマシンでまず行うことはディスクをマウントしてそのディスクに <emphasis>/"
+"var/lib/dpkg/status</emphasis> をコピーすることです。概要にまとめられているよ"
+"うに、ディレクトリ <emphasis>archives/partial/</emphasis> 及び "
+"<emphasis>lists/partial/</emphasis> を作成する必要もあるでしょう。それから"
+"ディスクをリモートマシンに移動して sources.list を設定します。リモートマシン"
+"では以下の手順を実行します:"
+
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:152
 #, no-wrap
 msgid ""
 " # export APT_CONFIG=\"/disc/apt.conf\"\n"
 " # apt-get update\n"
 " [ APT fetches the package files ]\n"
 " # apt-get dist-upgrade\n"
-" [ APT fetches all the packages needed to upgrade the target machine ]"
+" [ APT fetches all the packages needed to upgrade the target machine ]\n"
 msgstr ""
 " # export APT_CONFIG=\"/disc/apt.conf\"\n"
 " # apt-get update\n"
 " [ package ファイルを APT が取得します ]\n"
 " # apt-get dist-upgrade\n"
-" [ 対象マシンをアップグレードするのに必要なパッケージを、APT が取得します ]"
+" [ 対象マシンをアップグレードするのに必要なパッケージを、APT が取得します ]\n"
 
-#. type: </example></p>
-#: offline.sgml:149
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:159
 msgid ""
 "The dist-upgrade command can be replaced with any other standard APT "
 "commands, particularly dselect-upgrade. You can even use an APT front end "
-"such as <em>dselect</em>. However this presents a problem in communicating "
-"your selections back to the local computer."
+"such as <emphasis>dselect</emphasis>. However this presents a problem in "
+"communicating your selections back to the local computer."
 msgstr ""
+"dist-upgrade コマンドは他の任意の標準的な APT コマンド、特に dselect-upgrade "
+"に置き換えることができます。<emphasis>dselect</emphasis> 等の APT フロントエ"
+"ンドを使うこともできます。しかし、それには選択したときにローカルコンピュータ"
+"とやりとりしてしまうという問題があります。"
 
-#. type: <p><example>
-#: offline.sgml:153
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:165
 msgid ""
 "Now the disc contains all of the index files and archives needed to upgrade "
 "the target machine. Take the disc back and run:"
 msgstr ""
+"これで、対象のマシンをアップグレードするのに必要な索引ファイルとアーカイブが"
+"全てこのディスクに収録されたということになります。ディスクを戻して実行します:"
 
-#. type: <example></example>
-#: offline.sgml:159
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:169
 #, no-wrap
 msgid ""
 "  # export APT_CONFIG=\"/disc/apt.conf\"\n"
 "  # apt-get check\n"
 "  [ APT generates a local copy of the cache files ]\n"
 "  # apt-get --no-d -o dir::state::status=/var/lib/dpkg/status dist-upgrade\n"
-"  [ Or any other APT command ]"
+"  [ Or any other APT command ]\n"
 msgstr ""
 "  # export APT_CONFIG=\"/disc/apt.conf\"\n"
 "  # apt-get check\n"
-" [ キャッシュファイルのローカルコピーを生成します ]\n"
-" # apt-get --no-d -o dir::state::status=/var/lib/dpkg/status dist-upgrade\n"
-" [ もしくはその他の APT コマンド ]"
+"  [ キャッシュファイルのローカルコピーを生成します ]\n"
+"  # apt-get --no-d -o dir::state::status=/var/lib/dpkg/status dist-upgrade\n"
+"  [ もしくはその他の APT コマンド ]\n"
 
-#. type: <p></p>
-#: offline.sgml:165
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:176
 msgid ""
 "It is necessary for proper function to re-specify the status file to be the "
 "local one. This is very important!"
 msgstr ""
+"適切に機能するためにはローカルのファイルを status ファイルに再指定する必要が"
+"あります。これは非常に重要です!"
 
-#. type: <p></p>
-#: offline.sgml:172
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:180
 msgid ""
 "If you are using dselect you can do the very risky operation of copying disc/"
 "status to /var/lib/dpkg/status so that any selections you made on the remote "
@@ -9277,233 +9582,123 @@ msgid ""
 "the local machine - but this may not always be possible. DO NOT copy the "
 "status file if dpkg or APT have been run in the mean time!!"
 msgstr ""
+"dselect を使っている場合、disc/status はリモートマシンで何か選択すると更新さ"
+"れるため /var/lib/dpkg/status にコピーするのは非常に危険です。選択はローカル"
+"マシンでのみ行うことを強く勧めます - しかしこれは常に可能だとは限りません。"
+"dpkg や APT を実行している間は status ファイルをコピー *しないでください* !!"
 
-#. type: <heading></heading>
-#: offline.sgml:178
+#. type: Content of: <book><chapter><title>
+#: offline.dbk:190
 msgid "Using APT and wget"
-msgstr "APT と wget の使用法"
+msgstr "APT と wget の使用"
 
-#. type: <p></p>
-#: offline.sgml:185
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:194
 msgid ""
-"<em>wget</em> is a popular and portable download tool that can run on nearly "
-"any machine. Unlike the method above this requires that the Debian machine "
-"already has a list of available packages."
+"<emphasis>wget</emphasis> is a popular and portable download tool that can "
+"run on nearly any machine. Unlike the method above this requires that the "
+"Debian machine already has a list of available packages."
 msgstr ""
+"<emphasis>wget</emphasis> は人気のある移植性の高いダウンロードツールで、ほぼ"
+"あらゆるマシンで実行できます。上記の方法とは異なり、これには利用可能なパッ"
+"ケージの一覧を Debian マシンで用意しておく必要があります。"
 
-#. type: <p></p>
-#: offline.sgml:190
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:199
 msgid ""
 "The basic idea is to create a disc that has only the archive files "
 "downloaded from the remote site. This is done by using the --print-uris "
 "option to apt-get and then preparing a wget script to actually fetch the "
 "packages."
 msgstr ""
+"基本的な考え方は、リモートサイトからダウンロードしたアーカイブファイルだけを"
+"収録したディスクを作成するということです。これは apt-get に --print-uris オプ"
+"ションを使って行い、それから wget スクリプトを準備して実際にパッケージを取得"
+"します。"
 
-#. type: <heading></heading>
-#: offline.sgml:196
+#. type: Content of: <book><chapter><section><title>
+#: offline.dbk:205
 msgid "Operation"
 msgstr "操作"
 
-#. type: <p><example>
-#: offline.sgml:200
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:207
 msgid ""
 "Unlike the previous technique no special configuration files are required. "
 "We merely use the standard APT commands to generate the file list."
 msgstr ""
+"前の技とは異なり、特別な設定ファイルを必要としません。標準的な APT コマンドを"
+"単純に使ってファイル一覧を生成します。"
 
-#. type: <example></example>
-#: offline.sgml:205
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:211
 #, no-wrap
 msgid ""
-" # apt-get dist-upgrade \n"
+" # apt-get dist-upgrade\n"
 " [ Press no when prompted, make sure you are happy with the actions ]\n"
-" # apt-get -qq --print-uris dist-upgrade > uris\n"
-" # awk '{print \"wget -O \" $2 \" \" $1}' < uris > /disc/wget-script"
+" # apt-get -qq --print-uris dist-upgrade &gt; uris\n"
+" # awk '{print \"wget -O \" $2 \" \" $1}' &lt; uris &gt; /disc/wget-script\n"
 msgstr ""
-" # apt-get dist-upgrade \n"
+" # apt-get dist-upgrade\n"
 " [ Press no when prompted, make sure you are happy with the actions ]\n"
-" # apt-get -qq --print-uris dist-upgrade > uris\n"
-" # awk '{print \"wget -O \" $2 \" \" $1}' < uris > /disc/wget-script"
+" # apt-get -qq --print-uris dist-upgrade &gt; uris\n"
+" # awk '{print \"wget -O \" $2 \" \" $1}' &lt; uris &gt; /disc/wget-script\n"
 
-#. type: </example></p>
-#: offline.sgml:210
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:217
 msgid ""
 "Any command other than dist-upgrade could be used here, including dselect-"
 "upgrade."
 msgstr ""
+"dselect-upgrade を含め、ここでは dist-upgrade 以外の任意のコマンドを使えま"
+"す。"
 
-#. type: <p></p>
-#: offline.sgml:216
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:221
 msgid ""
 "The /disc/wget-script file will now contain a list of wget commands to "
 "execute in order to fetch the necessary archives. This script should be run "
 "with the current directory as the disc's mount point so as to save the "
 "output on the disc."
 msgstr ""
+"/disc/wget-script ファイルには、必要なアーカイブを取得するために実行する "
+"wget コマンドの一覧を収録するようになっています。ディスク上の出力を減らすた"
+"め、このスクリプトは現在のディレクトリをそのディスクのマウントポイントとして"
+"実行するようにしてください。"
 
-#. type: <p><example>
-#: offline.sgml:219
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:227
 msgid "The remote machine would do something like"
 msgstr "リモートマシンでは以下のようにします。"
 
-#. type: <example></example>
-#: offline.sgml:223
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:230
 #, no-wrap
 msgid ""
 "  # cd /disc\n"
 "  # sh -x ./wget-script\n"
-"  [ wait.. ]"
+"  [ wait.. ]\n"
 msgstr ""
 "  # cd /disc\n"
 "  # sh -x ./wget-script\n"
-"  [ お待ちください... ]"
+"  [ お待ちください... ]\n"
 
-#. type: </example><example>
-#: offline.sgml:228
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:235
 msgid ""
 "Once the archives are downloaded and the disc returned to the Debian machine "
 "installation can proceed using,"
 msgstr ""
+"アーカイブのダウンロードが終わってディスクが Debian マシンに返ってくるとイン"
+"ストールを続けられるようになります。"
 
-#. type: <example></example>
-#: offline.sgml:230
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:239
 #, no-wrap
-msgid "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade"
-msgstr "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade"
+msgid "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade\n"
+msgstr "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade\n"
 
-#. type: </example></p>
-#: offline.sgml:234
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:242
 msgid "Which will use the already fetched archives on the disc."
-msgstr "これで、disc にある取得済みのアーカイブを使用するようになります。"
-
-#~ msgid "apt"
-#~ msgstr "apt"
-
-#~ msgid "16 June 1998"
-#~ msgstr "16 June 1998"
-
-#~ msgid "Debian"
-#~ msgstr "Debian"
-
-#~ msgid "NAME"
-#~ msgstr "名前"
-
-#~ msgid "apt - Advanced Package Tool"
-#~ msgstr "apt - 高度パッケージツール"
-
-#~ msgid "SYNOPSIS"
-#~ msgstr "書式"
-
-#~ msgid "B<apt>"
-#~ msgstr "B<apt>"
-
-#~ msgid "DESCRIPTION"
-#~ msgstr "説明"
-
-#, fuzzy
-#~| msgid ""
-#~| "APT is a management system for software packages. For normal day to day "
-#~| "package management there are several frontends available, such as "
-#~| "B<aptitude>(8)  for the command line or B<synaptic>(8)  for the X Window "
-#~| "System. Some options are only implemented in B<apt-get>(8)  though."
-#~ msgid ""
-#~ "For normal day to day package management there are several frontends "
-#~ "available, such as B<aptitude>(8)  for the command line or "
-#~ "B<synaptic>(8)  for the X Window System. Some options are only "
-#~ "implemented in B<apt-get>(8)  though."
-#~ msgstr ""
-#~ "APT はソフトウェアパッケージの管理システムです。日々のパッケージ管理のため"
-#~ "に、コマンドライン用の B<aptitude>(8) や、X Window System 用の "
-#~ "B<synaptic>(8) といった、いくつかのフロントエンドが用意されています。いく"
-#~ "つかのオプションは B<apt-get>(8) にしか実装されていません。"
-
-#~ msgid "SEE ALSO"
-#~ msgstr "関連項目"
-
-#, fuzzy
-#~| msgid ""
-#~| "B<apt-cache>(8), B<apt-get>(8), B<apt.conf>(5), B<sources.list>(5), "
-#~| "B<apt_preferences>(5), B<apt-secure>(8)"
-#~ msgid ""
-#~ "B<apt>(8), B<apt-cache>(8), B<apt-get>(8), B<apt.conf>(5), B<sources."
-#~ "list>(5), B<apt_preferences>(5), B<apt-secure>(8)"
-#~ msgstr ""
-#~ "B<apt-cache>(8), B<apt-get>(8), B<apt.conf>(5), B<sources.list>(5), "
-#~ "B<apt_preferences>(5), B<apt-secure>(8)"
-
-#~ msgid "DIAGNOSTICS"
-#~ msgstr "診断メッセージ"
-
-#~ msgid "apt returns zero on normal operation, decimal 100 on error."
-#~ msgstr ""
-#~ "apt は正常終了時に 0 を返します。エラー時には十進の 100 を返します。"
-
-#~ msgid "BUGS"
-#~ msgstr "バグ"
-
-#~ msgid "This manpage isn't even started."
-#~ msgstr "このマニュアルページは、始まってさえいません。"
-
-#~ msgid ""
-#~ "See E<lt>http://bugs.debian.org/aptE<gt>.  If you wish to report a bug in "
-#~ "B<apt>, please see I</usr/share/doc/debian/bug-reporting.txt> or the "
-#~ "B<reportbug>(1)  command."
-#~ msgstr ""
-#~ "E<lt>http://bugs.debian.org/aptE<gt> をご覧ください。B<apt> のバグを報告す"
-#~ "る場合は、I</usr/share/doc/debian/bug-reporting.txt> や B<reportbug>(1) コ"
-#~ "マンドをご覧ください。"
-
-#~ msgid "AUTHOR"
-#~ msgstr "著者"
-
-#~ msgid "apt was written by the APT team E<lt>apt@packages.debian.orgE<gt>."
-#~ msgstr ""
-#~ "apt は APT チーム E<lt>apt@packages.debian.orgE<gt> によって書かれました。"
-
-#~ msgid "Debian GNU/Linux"
-#~ msgstr "Debian GNU/Linux"
-
-#~ msgid "&apt-commonoptions;"
-#~ msgstr "&apt-commonoptions;"
-
-#~ msgid "&file-sourceslist; &file-statelists;"
-#~ msgstr "&file-sourceslist; &file-statelists;"
-
-#~ msgid ""
-#~ "Unless the <option>-h</option>, or <option>--help</option> option is "
-#~ "given one of the commands below must be present.  <placeholder type="
-#~ "\"variablelist\" id=\"0\"/>"
-#~ msgstr ""
-#~ "<option>-h</option> オプションや <option>--help</option> オプションを除"
-#~ "き、以下に挙げるコマンドが必要です。<placeholder type=\"variablelist\" id="
-#~ "\"0\"/>"
-
-#~ msgid ""
-#~ "Unless the <option>-h</option>, or <option>--help</option> option is "
-#~ "given one of the commands below must be present."
-#~ msgstr ""
-#~ "<option>-h</option> オプションや <option>--help</option> オプションを除"
-#~ "き、以下に挙げるコマンドが必要です。"
-
-#~ msgid "Dir Section"
-#~ msgstr "Dir セクション"
-
-#~ msgid "Default Section"
-#~ msgstr "Default セクション"
-
-#~ msgid "TreeDefault Section"
-#~ msgstr "TreeDefault セクション"
-
-#~ msgid "Tree Section"
-#~ msgstr "Tree セクション"
-
-#~ msgid ""
-#~ "&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; "
-#~ "&file-statelists;"
-#~ msgstr ""
-#~ "&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; "
-#~ "&file-statelists;"
-
-#~ msgid "&file-trustedgpg;"
-#~ msgstr "&file-trustedgpg;"
+msgstr "これで、ディスクにある取得済みのアーカイブを使用するようになります。"
diff --git a/doc/po/pl.po b/doc/po/pl.po
index 36c6eedfb..b0a6514b9 100644
--- a/doc/po/pl.po
+++ b/doc/po/pl.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.9.7.3\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-11 14:52+0200\n"
-"PO-Revision-Date: 2014-04-01 13:59+0200\n"
+"POT-Creation-Date: 2014-08-28 00:20+0000\n"
+"PO-Revision-Date: 2014-07-04 02:13+0200\n"
 "Last-Translator: Robert Luberda <robert@debian.org>\n"
 "Language-Team: Polish <manpages-pl-list@lists.sourceforge.net>\n"
 "Language: pl\n"
@@ -657,37 +657,37 @@ msgstr ""
 "473041FA --> <!ENTITY synopsis-keyid \"id_klucza\">"
 
 #. type: Content of: <refentry><refmeta><manvolnum>
-#: apt.8.xml:25 apt-get.8.xml:28 apt-cache.8.xml:28 apt-key.8.xml:27
-#: apt-mark.8.xml:28 apt-secure.8.xml:27 apt-cdrom.8.xml:27
-#: apt-config.8.xml:28
+#: apt.8.xml:21 apt-get.8.xml:22 apt-cache.8.xml:22 apt-key.8.xml:21
+#: apt-mark.8.xml:22 apt-secure.8.xml:21 apt-cdrom.8.xml:21
+#: apt-config.8.xml:22
 msgid "8"
 msgstr "8"
 
 #. type: Content of: <refentry><refmeta><refmiscinfo>
-#: apt.8.xml:26 apt-get.8.xml:29 apt-cache.8.xml:29 apt-key.8.xml:28
-#: apt-mark.8.xml:29 apt-secure.8.xml:28 apt-cdrom.8.xml:28
-#: apt-config.8.xml:29 apt.conf.5.xml:34 apt_preferences.5.xml:28
-#: sources.list.5.xml:29 apt-extracttemplates.1.xml:29 apt-sortpkgs.1.xml:29
-#: apt-ftparchive.1.xml:29
+#: apt.8.xml:22 apt-get.8.xml:23 apt-cache.8.xml:23 apt-key.8.xml:22
+#: apt-mark.8.xml:23 apt-secure.8.xml:22 apt-cdrom.8.xml:22
+#: apt-config.8.xml:23 apt.conf.5.xml:28 apt_preferences.5.xml:22
+#: sources.list.5.xml:23 apt-extracttemplates.1.xml:23 apt-sortpkgs.1.xml:23
+#: apt-ftparchive.1.xml:23
 msgid "APT"
 msgstr "APT"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt.8.xml:32
+#: apt.8.xml:28
 msgid "command-line interface"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:37 apt-get.8.xml:40 apt-cache.8.xml:40 apt-key.8.xml:39
-#: apt-mark.8.xml:40 apt-secure.8.xml:52 apt-cdrom.8.xml:39
-#: apt-config.8.xml:40 apt.conf.5.xml:43 apt_preferences.5.xml:38
-#: sources.list.5.xml:38 apt-extracttemplates.1.xml:40 apt-sortpkgs.1.xml:40
-#: apt-ftparchive.1.xml:40
+#: apt.8.xml:33 apt-get.8.xml:34 apt-cache.8.xml:34 apt-key.8.xml:33
+#: apt-mark.8.xml:34 apt-secure.8.xml:46 apt-cdrom.8.xml:33
+#: apt-config.8.xml:34 apt.conf.5.xml:37 apt_preferences.5.xml:32
+#: sources.list.5.xml:32 apt-extracttemplates.1.xml:34 apt-sortpkgs.1.xml:34
+#: apt-ftparchive.1.xml:34
 msgid "Description"
 msgstr "Opis"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:38
+#: apt.8.xml:34
 msgid ""
 "<command>apt</command> (Advanced Package Tool) is the command-line tool for "
 "handling packages. It provides a commandline interface for the package "
@@ -696,7 +696,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:47
+#: apt.8.xml:43
 msgid ""
 "<literal>list</literal> is used to display a list of packages. It supports "
 "shell pattern for matching package names and the following options: "
@@ -705,7 +705,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:58
+#: apt.8.xml:54
 msgid ""
 "<literal>search</literal> searches for the given term(s) and display "
 "matching packages."
@@ -713,7 +713,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:64
+#: apt.8.xml:60
 #, fuzzy
 #| msgid ""
 #| "<literal>rdepends</literal> shows a listing of each reverse dependency a "
@@ -726,7 +726,7 @@ msgstr ""
 "danego pakietu."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:71
+#: apt.8.xml:67
 msgid ""
 "<literal>install</literal> is followed by one or more package names desired "
 "for installation or upgrading."
@@ -734,7 +734,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:75 apt-get.8.xml:118
+#: apt.8.xml:71 apt-get.8.xml:112
 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 "
@@ -752,7 +752,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:85 apt-get.8.xml:153
+#: apt.8.xml:81 apt-get.8.xml:147
 msgid ""
 "<literal>remove</literal> is identical to <literal>install</literal> except "
 "that packages are removed instead of installed. Note that removing a package "
@@ -766,14 +766,14 @@ msgstr ""
 "pakiet zostanie zainstalowany zamiast zostać usunięty."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:93
+#: apt.8.xml:89
 msgid ""
 "<literal>edit-sources</literal> lets you edit your sources.list file and "
 "provides basic sanity checks."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:99
+#: apt.8.xml:95
 #, fuzzy
 #| msgid ""
 #| "<literal>showhold</literal> is used to print a list of packages on hold "
@@ -786,16 +786,16 @@ msgstr ""
 "pakietów wstrzymanych, w taki sam sposób jak pozostałe polecenia \"show\"."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:105
+#: apt.8.xml:101
 msgid ""
 "<literal>upgrade</literal> is used to install the newest versions of all "
 "packages currently installed on the system from the sources enumerated in "
-"<filename>/etc/apt/sources.list</filename>. New package will be installed, "
-"but existing package will never removed."
+"<filename>/etc/apt/sources.list</filename>. New packages will be installed, "
+"but existing packages will never be removed."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:114
+#: apt.8.xml:110
 msgid ""
 "<literal>full-upgrade</literal> performs the function of upgrade but may "
 "also remove installed packages if that is required in order to resolve a "
@@ -803,19 +803,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:124 apt-get.8.xml:257 apt-cache.8.xml:250 apt-mark.8.xml:110
-#: apt-config.8.xml:86 apt-extracttemplates.1.xml:54 apt-sortpkgs.1.xml:50
-#: apt-ftparchive.1.xml:506
+#: apt.8.xml:120 apt-get.8.xml:251 apt-cache.8.xml:244 apt-mark.8.xml:104
+#: apt-config.8.xml:80 apt-extracttemplates.1.xml:48 apt-sortpkgs.1.xml:44
+#: apt-ftparchive.1.xml:500
 msgid "options"
 msgstr "opcje"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:134
+#: apt.8.xml:130
 msgid "Script usage"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:136
+#: apt.8.xml:132
 msgid ""
 "The &apt; commandline is designed as a end-user tool and it may change the "
 "output between versions. While it tries to not break backward compatibility "
@@ -825,12 +825,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:144
+#: apt.8.xml:140
 msgid "Differences to &apt-get;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:145
+#: apt.8.xml:141
 msgid ""
 "The <command>apt</command> command is meant to be pleasant for end users and "
 "does not need to be backward compatible like &apt-get;. Therefore some "
@@ -838,28 +838,28 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml:151
+#: apt.8.xml:147
 #, fuzzy
 #| msgid "the <literal>Package:</literal> line"
 msgid "The option <literal>DPkg::Progress-Fancy</literal> is enabled."
 msgstr "linia <literal>Package:</literal>"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml:155
+#: apt.8.xml:151
 #, fuzzy
 #| msgid "the <literal>Component:</literal> line"
 msgid "The option <literal>APT::Color</literal> is enabled."
 msgstr "linia <literal>Component:</literal>"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml:159
+#: apt.8.xml:155
 msgid ""
 "A new <literal>list</literal> command is available similar to <literal>dpkg "
 "--list</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml:164
+#: apt.8.xml:160
 #, fuzzy
 #| msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
 msgid ""
@@ -868,17 +868,17 @@ msgid ""
 msgstr "linia <literal>Archive:</literal> lub <literal>Suite:</literal>"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:174 apt-get.8.xml:558 apt-cache.8.xml:352 apt-key.8.xml:197
-#: apt-mark.8.xml:133 apt-secure.8.xml:193 apt-cdrom.8.xml:154
-#: apt-config.8.xml:111 apt.conf.5.xml:1227 apt_preferences.5.xml:707
-#: sources.list.5.xml:280 apt-extracttemplates.1.xml:72 apt-sortpkgs.1.xml:65
-#: apt-ftparchive.1.xml:609
+#: apt.8.xml:170 apt-get.8.xml:552 apt-cache.8.xml:346 apt-key.8.xml:191
+#: apt-mark.8.xml:127 apt-secure.8.xml:187 apt-cdrom.8.xml:148
+#: apt-config.8.xml:105 apt.conf.5.xml:1222 apt_preferences.5.xml:701
+#: sources.list.5.xml:274 apt-extracttemplates.1.xml:66 apt-sortpkgs.1.xml:59
+#: apt-ftparchive.1.xml:603
 msgid "See Also"
 msgstr "Zobacz także"
 
 #
 #. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:175
+#: apt.8.xml:171
 #, fuzzy
 #| msgid ""
 #| "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
@@ -893,15 +893,15 @@ msgstr ""
 "&apt-preferences;, APT Howto."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:180 apt-get.8.xml:564 apt-cache.8.xml:357 apt-mark.8.xml:137
-#: apt-cdrom.8.xml:159 apt-config.8.xml:116 apt-extracttemplates.1.xml:76
-#: apt-sortpkgs.1.xml:69 apt-ftparchive.1.xml:613
+#: apt.8.xml:176 apt-get.8.xml:558 apt-cache.8.xml:351 apt-mark.8.xml:131
+#: apt-cdrom.8.xml:153 apt-config.8.xml:110 apt-extracttemplates.1.xml:70
+#: apt-sortpkgs.1.xml:63 apt-ftparchive.1.xml:607
 msgid "Diagnostics"
 msgstr "Diagnostyka"
 
 #
 #. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:181
+#: apt.8.xml:177
 #, fuzzy
 #| msgid ""
 #| "<command>apt-get</command> returns zero on normal operation, decimal 100 "
@@ -915,12 +915,12 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-get.8.xml:35
+#: apt-get.8.xml:29
 msgid "APT package handling utility -- command-line interface"
 msgstr "Narzędzie zarządzania pakietami APT -- interfejs linii poleceń"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:41
+#: apt-get.8.xml:35
 #, fuzzy
 #| msgid ""
 #| "<command>apt-get</command> is the command-line tool for handling "
@@ -940,8 +940,8 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:46 apt-cache.8.xml:46 apt-cdrom.8.xml:53 apt-config.8.xml:46
-#: apt-ftparchive.1.xml:56
+#: apt-get.8.xml:40 apt-cache.8.xml:40 apt-cdrom.8.xml:47 apt-config.8.xml:40
+#: apt-ftparchive.1.xml:50
 msgid ""
 "Unless the <option>-h</option>, or <option>--help</option> option is given, "
 "one of the commands below must be present."
@@ -951,7 +951,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:51
+#: apt-get.8.xml:45
 msgid ""
 "<literal>update</literal> is used to resynchronize the package index files "
 "from their sources. The indexes of available packages are fetched from the "
@@ -976,7 +976,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:63
+#: apt-get.8.xml:57
 msgid ""
 "<literal>upgrade</literal> is used to install the newest versions of all "
 "packages currently installed on the system from the sources enumerated in "
@@ -1002,7 +1002,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:76
+#: apt-get.8.xml:70
 msgid ""
 "<literal>dist-upgrade</literal> in addition to performing the function of "
 "<literal>upgrade</literal>, also intelligently handles changing dependencies "
@@ -1028,7 +1028,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:89
+#: apt-get.8.xml:83
 msgid ""
 "<literal>dselect-upgrade</literal> is used in conjunction with the "
 "traditional Debian packaging front-end, &dselect;. <literal>dselect-upgrade</"
@@ -1046,7 +1046,7 @@ msgstr ""
 "nowych)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:100
+#: apt-get.8.xml:94
 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 "
@@ -1077,7 +1077,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:125
+#: apt-get.8.xml:119
 msgid ""
 "Both of the version selection mechanisms can downgrade packages and must be "
 "used with care."
@@ -1087,7 +1087,7 @@ msgstr ""
 "ostrożnie."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:128
+#: apt-get.8.xml:122
 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 system. "
@@ -1108,7 +1108,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:139
+#: apt-get.8.xml:133
 msgid ""
 "Finally, the &apt-preferences; mechanism allows you to create an alternative "
 "installation policy for individual packages."
@@ -1118,7 +1118,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:143
+#: apt-get.8.xml:137
 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 "
@@ -1139,7 +1139,7 @@ msgstr ""
 "lub \"$\", można też stworzyć bardziej specyficzne wyrażenie regularne."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:161
+#: apt-get.8.xml:155
 msgid ""
 "<literal>purge</literal> is identical to <literal>remove</literal> except "
 "that packages are removed and purged (any configuration files are deleted "
@@ -1151,7 +1151,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:166
+#: apt-get.8.xml:160
 msgid ""
 "<literal>source</literal> causes <command>apt-get</command> to fetch source "
 "packages. APT will examine the available packages to decide which source "
@@ -1171,7 +1171,7 @@ msgstr ""
 "wydanie</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:174
+#: apt-get.8.xml:168
 msgid ""
 "Source packages are tracked separately from binary packages via <literal>deb-"
 "src</literal> lines in the &sources-list; file. This means that you will "
@@ -1187,7 +1187,7 @@ msgstr ""
 "możliwe pobranie jakiejkolwiek wersji pakietu."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:180
+#: apt-get.8.xml:174
 msgid ""
 "If the <option>--compile</option> option is specified then the package will "
 "be compiled to a binary .deb using <command>dpkg-buildpackage</command> for "
@@ -1203,7 +1203,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:187
+#: apt-get.8.xml:181
 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 "
@@ -1218,7 +1218,7 @@ msgstr ""
 "włączona zostaje opcja <literal>APT::Get::Only-Source</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:193
+#: apt-get.8.xml:187
 msgid ""
 "Note that source packages are not installed and tracked in the "
 "<command>dpkg</command> database like binary packages; they are simply "
@@ -1230,7 +1230,7 @@ msgstr ""
 "<command>tar</command>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:199
+#: apt-get.8.xml:193
 msgid ""
 "<literal>build-dep</literal> causes apt-get to install/remove packages in an "
 "attempt to satisfy the build dependencies for a source package. By default "
@@ -1244,7 +1244,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:206
+#: apt-get.8.xml:200
 msgid ""
 "<literal>check</literal> is a diagnostic tool; it updates the package cache "
 "and checks for broken dependencies."
@@ -1253,7 +1253,7 @@ msgstr ""
 "bufor (cache) pakietów i szuka zepsutych pakietów."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:211
+#: apt-get.8.xml:205
 msgid ""
 "<literal>download</literal> will download the given binary package into the "
 "current directory."
@@ -1263,7 +1263,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:217
+#: apt-get.8.xml:211
 #, fuzzy
 #| msgid ""
 #| "<literal>clean</literal> clears out the local repository of retrieved "
@@ -1289,7 +1289,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:224
+#: apt-get.8.xml:218
 msgid ""
 "Like <literal>clean</literal>, <literal>autoclean</literal> clears out the "
 "local repository of retrieved package files. The difference is that it only "
@@ -1309,7 +1309,7 @@ msgstr ""
 "zawierających zainstalowane pakiety."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:234
+#: apt-get.8.xml:228
 msgid ""
 "<literal>autoremove</literal> is used to remove packages that were "
 "automatically installed to satisfy dependencies for other packages and are "
@@ -1320,7 +1320,7 @@ msgstr ""
 "pakietach, i nie są już potrzebne."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:239
+#: apt-get.8.xml:233
 msgid ""
 "<literal>changelog</literal> downloads a package changelog and displays it "
 "through <command>sensible-pager</command>. The server name and base "
@@ -1343,7 +1343,7 @@ msgstr ""
 "te dla polecenia <option>install</option>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:262
+#: apt-get.8.xml:256
 msgid ""
 "Do not consider recommended packages as a dependency for installing.  "
 "Configuration Item: <literal>APT::Install-Recommends</literal>."
@@ -1352,7 +1352,7 @@ msgstr ""
 "Pozycja w pliku konfiguracyjnym: <literal>APT::Install-Recommends</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:267
+#: apt-get.8.xml:261
 msgid ""
 "Consider suggested packages as a dependency for installing.  Configuration "
 "Item: <literal>APT::Install-Suggests</literal>."
@@ -1362,7 +1362,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:272
+#: apt-get.8.xml:266
 msgid ""
 "Download only; package files are only retrieved, not unpacked or installed.  "
 "Configuration Item: <literal>APT::Get::Download-Only</literal>."
@@ -1373,7 +1373,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:277
+#: apt-get.8.xml:271
 #, fuzzy
 #| msgid ""
 #| "Fix; attempt to correct a system with broken dependencies in place. This "
@@ -1414,7 +1414,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:292
+#: apt-get.8.xml:286
 msgid ""
 "Ignore missing packages; if packages cannot be retrieved or fail the "
 "integrity check after retrieval (corrupted package files), hold back those "
@@ -1434,7 +1434,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:303
+#: apt-get.8.xml:297
 msgid ""
 "Disables downloading of packages. This is best used with <option>--ignore-"
 "missing</option> to force APT to use only the .debs it has already "
@@ -1446,7 +1446,7 @@ msgstr ""
 "Download</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:310
+#: apt-get.8.xml:304
 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 "
@@ -1467,7 +1467,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:325
+#: apt-get.8.xml:319
 msgid ""
 "No action; perform a simulation of events that would occur but do not "
 "actually change the system.  Configuration Item: <literal>APT::Get::"
@@ -1478,7 +1478,7 @@ msgstr ""
 "Get::Simulate</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:329
+#: apt-get.8.xml:323
 msgid ""
 "Simulated runs performed as a user will automatically deactivate locking "
 "(<literal>Debug::NoLocking</literal>), and if the option <literal>APT::Get::"
@@ -1498,7 +1498,7 @@ msgstr ""
 "strony <literal>apt-get</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:337
+#: apt-get.8.xml:331
 msgid ""
 "Simulated runs print out a series of lines, each representing a "
 "<command>dpkg</command> operation: configure (<literal>Conf</literal>), "
@@ -1515,7 +1515,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:345
+#: apt-get.8.xml:339
 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 "
@@ -1531,7 +1531,7 @@ msgstr ""
 "Assume-Yes</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:353
+#: apt-get.8.xml:347
 msgid ""
 "Automatic \"no\" to all prompts.  Configuration Item: <literal>APT::Get::"
 "Assume-No</literal>."
@@ -1541,7 +1541,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:358
+#: apt-get.8.xml:352
 msgid ""
 "Show upgraded packages; print out a list of all packages that are to be "
 "upgraded.  Configuration Item: <literal>APT::Get::Show-Upgraded</literal>."
@@ -1552,7 +1552,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:364
+#: apt-get.8.xml:358
 msgid ""
 "Show full versions for upgraded and installed packages.  Configuration Item: "
 "<literal>APT::Get::Show-Versions</literal>."
@@ -1561,7 +1561,7 @@ msgstr ""
 "konfiguracyjnym: <literal>APT::Get::Show-Versions</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:370
+#: apt-get.8.xml:364
 #, fuzzy
 #| msgid ""
 #| "This option controls the architecture packages are built for by "
@@ -1587,7 +1587,7 @@ msgstr ""
 "Host-Architecture</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:380
+#: apt-get.8.xml:374
 #, fuzzy
 #| msgid ""
 #| "This option controls the architecture packages are built for by "
@@ -1613,7 +1613,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:391
+#: apt-get.8.xml:385
 msgid ""
 "Compile source packages after downloading them.  Configuration Item: "
 "<literal>APT::Get::Compile</literal>."
@@ -1623,7 +1623,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:396
+#: apt-get.8.xml:390
 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 "
@@ -1637,7 +1637,7 @@ msgstr ""
 "<literal>APT::Ignore-Hold</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:403
+#: apt-get.8.xml:397
 msgid ""
 "Allow installing new packages when used in conjunction with "
 "<literal>upgrade</literal>.  This is useful if the update of a installed "
@@ -1650,7 +1650,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:415
+#: apt-get.8.xml:409
 msgid ""
 "Do not upgrade packages; when used in conjunction with <literal>install</"
 "literal>, <literal>no-upgrade</literal> will prevent packages on the command "
@@ -1663,7 +1663,7 @@ msgstr ""
 "<literal>APT::Get::Upgrade</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:422
+#: apt-get.8.xml:416
 msgid ""
 "Do not install new packages; when used in conjunction with <literal>install</"
 "literal>, <literal>only-upgrade</literal> will install upgrades for already "
@@ -1677,7 +1677,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:430
+#: apt-get.8.xml:424
 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 "
@@ -1694,7 +1694,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:438
+#: apt-get.8.xml:432
 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 "
@@ -1717,7 +1717,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:449
+#: apt-get.8.xml:443
 msgid ""
 "Use purge instead of remove for anything that would be removed.  An asterisk "
 "(\"*\") will be displayed next to packages which are scheduled to be purged. "
@@ -1732,7 +1732,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:457
+#: apt-get.8.xml:451
 msgid ""
 "Re-install packages that are already installed and at the newest version.  "
 "Configuration Item: <literal>APT::Get::ReInstall</literal>."
@@ -1741,7 +1741,7 @@ msgstr ""
 "Pozycja w pliku konfiguracyjnym: <literal>APT::Get::ReInstall</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:462
+#: apt-get.8.xml:456
 msgid ""
 "This option is on by default; use <literal>--no-list-cleanup</literal> to "
 "turn it off. When it is on, <command>apt-get</command> will automatically "
@@ -1759,7 +1759,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:472
+#: apt-get.8.xml:466
 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 "
@@ -1783,7 +1783,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:487
+#: apt-get.8.xml:481
 msgid ""
 "Only perform operations that are 'trivial'. Logically this can be considered "
 "related to <option>--assume-yes</option>; where <option>--assume-yes</"
@@ -1798,7 +1798,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:494
+#: apt-get.8.xml:488
 msgid ""
 "If any packages are to be removed apt-get immediately aborts without "
 "prompting.  Configuration Item: <literal>APT::Get::Remove</literal>."
@@ -1808,7 +1808,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:500
+#: apt-get.8.xml:494
 msgid ""
 "If the command is either <literal>install</literal> or <literal>remove</"
 "literal>, then this option acts like running the <literal>autoremove</"
@@ -1823,7 +1823,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:507
+#: apt-get.8.xml:501
 msgid ""
 "Only has meaning for the <literal>source</literal> and <literal>build-dep</"
 "literal> commands.  Indicates that the given source names are not to be "
@@ -1843,7 +1843,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:518
+#: apt-get.8.xml:512
 msgid ""
 "Download only the diff, dsc, or tar file of a source archive.  Configuration "
 "Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</"
@@ -1855,7 +1855,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:524
+#: apt-get.8.xml:518
 msgid ""
 "Only process architecture-dependent build-dependencies.  Configuration Item: "
 "<literal>APT::Get::Arch-Only</literal>."
@@ -1866,7 +1866,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:529
+#: apt-get.8.xml:523
 msgid ""
 "Ignore if packages can't be authenticated and don't prompt about it.  This "
 "is useful for tools like pbuilder.  Configuration Item: <literal>APT::Get::"
@@ -1877,7 +1877,7 @@ msgstr ""
 "w pliku konfiguracyjnym: <literal>APT::Get::AllowUnauthenticated</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:535
+#: apt-get.8.xml:529
 msgid ""
 "Show user friendly progress information in the terminal window when packages "
 "are installed, upgraded or removed. For a machine parsable version of this "
@@ -1887,14 +1887,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:548 apt-cache.8.xml:345 apt-key.8.xml:176 apt-mark.8.xml:127
-#: apt.conf.5.xml:1221 apt_preferences.5.xml:700
+#: apt-get.8.xml:542 apt-cache.8.xml:339 apt-key.8.xml:170 apt-mark.8.xml:121
+#: apt.conf.5.xml:1216 apt_preferences.5.xml:694
 msgid "Files"
 msgstr "Pliki"
 
 #
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:559
+#: apt-get.8.xml:553
 #, fuzzy
 #| msgid ""
 #| "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
@@ -1911,7 +1911,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:565
+#: apt-get.8.xml:559
 msgid ""
 "<command>apt-get</command> returns zero on normal operation, decimal 100 on "
 "error."
@@ -1920,13 +1920,13 @@ msgstr ""
 "w przypadku błędu."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-cache.8.xml:35
+#: apt-cache.8.xml:29
 msgid "query the APT cache"
 msgstr "odpytanie bufora APT"
 
 #
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:41
+#: apt-cache.8.xml:35
 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 "
@@ -1939,7 +1939,7 @@ msgstr ""
 "generowania interesującego wyjścia."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:51
+#: apt-cache.8.xml:45
 msgid ""
 "<literal>gencaches</literal> creates APT's package cache. This is done "
 "implicitly by all commands needing this cache if it is missing or outdated."
@@ -1949,15 +1949,15 @@ msgstr ""
 "istnieje lub jest przestarzały."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
-#: apt-cache.8.xml:55 apt-cache.8.xml:144 apt-cache.8.xml:165
-#: apt-cache.8.xml:187 apt-cache.8.xml:192 apt-cache.8.xml:208
-#: apt-cache.8.xml:226 apt-cache.8.xml:238
+#: apt-cache.8.xml:49 apt-cache.8.xml:138 apt-cache.8.xml:159
+#: apt-cache.8.xml:181 apt-cache.8.xml:186 apt-cache.8.xml:202
+#: apt-cache.8.xml:220 apt-cache.8.xml:232
 msgid "&synopsis-pkg;"
 msgstr "&synopsis-pkg;"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:56
+#: apt-cache.8.xml:50
 msgid ""
 "<literal>showpkg</literal> displays information about the packages listed on "
 "the command line. Remaining arguments are package names. The available "
@@ -1980,7 +1980,7 @@ msgstr ""
 "poniższego:"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
-#: apt-cache.8.xml:68
+#: apt-cache.8.xml:62
 #, no-wrap
 msgid ""
 "Package: libreadline2\n"
@@ -2007,7 +2007,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:80
+#: apt-cache.8.xml:74
 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, "
@@ -2027,7 +2027,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:89
+#: apt-cache.8.xml:83
 msgid ""
 "<literal>stats</literal> displays some statistics about the cache.  No "
 "further arguments are expected. Statistics reported are:"
@@ -2037,7 +2037,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:92
+#: apt-cache.8.xml:86
 msgid ""
 "<literal>Total package names</literal> is the number of package names found "
 "in the cache."
@@ -2047,7 +2047,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:96
+#: apt-cache.8.xml:90
 msgid ""
 "<literal>Normal packages</literal> is the number of regular, ordinary "
 "package names; these are packages that bear a one-to-one correspondence "
@@ -2060,7 +2060,7 @@ msgstr ""
 "pakiety jako zależności.  Większość pakietów należy do tej kategorii."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:102
+#: apt-cache.8.xml:96
 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 "
@@ -2077,7 +2077,7 @@ msgstr ""
 "agenta\", ale żaden pakiet nie nazywa się \"mail-transport-agent\"."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:110
+#: apt-cache.8.xml:104
 msgid ""
 "<literal>Single virtual packages</literal> is the number of packages with "
 "only one package providing a particular virtual package. For example, in the "
@@ -2091,7 +2091,7 @@ msgstr ""
 "dostarcza \"X11-text-viewer\"."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:116
+#: apt-cache.8.xml:110
 msgid ""
 "<literal>Mixed virtual packages</literal> is the number of packages that "
 "either provide a particular virtual package or have the virtual package name "
@@ -2106,7 +2106,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:123
+#: apt-cache.8.xml:117
 msgid ""
 "<literal>Missing</literal> is the number of package names that were "
 "referenced in a dependency but were not provided by any package. Missing "
@@ -2122,7 +2122,7 @@ msgstr ""
 "zależnościach typu \"Conflicts\" lub \"Breaks\"."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:130
+#: apt-cache.8.xml:124
 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 "
@@ -2139,7 +2139,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:137
+#: apt-cache.8.xml:131
 msgid ""
 "<literal>Total dependencies</literal> is the number of dependency "
 "relationships claimed by all of the packages in the cache."
@@ -2148,7 +2148,7 @@ msgstr ""
 "więzów zależności wymaganych przez wszystkie pakiety w buforze."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:145
+#: apt-cache.8.xml:139
 msgid ""
 "<literal>showsrc</literal> displays all the source package records that "
 "match the given package names. All versions are shown, as well as all "
@@ -2161,7 +2161,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:151
+#: apt-cache.8.xml:145
 msgid ""
 "<literal>dump</literal> shows a short listing of every package in the cache. "
 "It is primarily for debugging."
@@ -2171,7 +2171,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:156
+#: apt-cache.8.xml:150
 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."
@@ -2182,7 +2182,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:161
+#: apt-cache.8.xml:155
 msgid ""
 "<literal>unmet</literal> displays a summary of all unmet dependencies in the "
 "package cache."
@@ -2192,7 +2192,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:166
+#: apt-cache.8.xml:160
 msgid ""
 "<literal>show</literal> performs a function similar to <command>dpkg --print-"
 "avail</command>; it displays the package records for the named packages."
@@ -2201,12 +2201,12 @@ msgstr ""
 "avail</command>; pokazuje szczegółowe informacje o podanych pakietach."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
-#: apt-cache.8.xml:171
+#: apt-cache.8.xml:165
 msgid "&synopsis-regex;"
 msgstr "&synopsis-regex;"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:172
+#: apt-cache.8.xml:166
 msgid ""
 "<literal>search</literal> performs a full text search on all available "
 "package lists for the POSIX regex pattern given, see &regex;.  It searches "
@@ -2229,7 +2229,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:183
+#: apt-cache.8.xml:177
 msgid ""
 "Separate arguments can be used to specify multiple search patterns that are "
 "and'ed together."
@@ -2239,7 +2239,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:188
+#: apt-cache.8.xml:182
 msgid ""
 "<literal>depends</literal> shows a listing of each dependency a package has "
 "and all the possible other packages that can fulfill that dependency."
@@ -2249,7 +2249,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:193
+#: apt-cache.8.xml:187
 msgid ""
 "<literal>rdepends</literal> shows a listing of each reverse dependency a "
 "package has."
@@ -2258,13 +2258,13 @@ msgstr ""
 "danego pakietu."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:197
+#: apt-cache.8.xml:191
 msgid "<optional><replaceable>&synopsis-prefix;</replaceable></optional>"
 msgstr "<optional><replaceable>&synopsis-prefix;</replaceable></optional>"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:198
+#: apt-cache.8.xml:192
 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 "
@@ -2279,7 +2279,7 @@ msgstr ""
 "używać z opcją <option>--generate</option>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:203
+#: apt-cache.8.xml:197
 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 "
@@ -2292,7 +2292,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:209
+#: apt-cache.8.xml:203
 msgid ""
 "<literal>dotty</literal> takes a list of packages on the command line and "
 "generates output suitable for use by dotty from the <ulink url=\"http://www."
@@ -2313,7 +2313,7 @@ msgstr ""
 "Cache::GivenOnly</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:218
+#: apt-cache.8.xml:212
 msgid ""
 "The resulting nodes will have several shapes; normal packages are boxes, "
 "pure virtual packages are triangles, mixed virtual packages are diamonds, "
@@ -2328,12 +2328,12 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:223
+#: apt-cache.8.xml:217
 msgid "Caution, dotty cannot graph larger sets of packages."
 msgstr "Uwaga: dotty nie potrafi narysować większego zbioru pakietów."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:227
+#: apt-cache.8.xml:221
 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 tool</ulink>."
@@ -2343,13 +2343,13 @@ msgstr ""
 "ulink>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:231
+#: apt-cache.8.xml:225
 msgid "<optional><replaceable>&synopsis-pkg;</replaceable>…</optional>"
 msgstr "<optional><replaceable>&synopsis-pkg;</replaceable>…</optional>"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:232
+#: apt-cache.8.xml:226
 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 "
@@ -2363,7 +2363,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:239
+#: apt-cache.8.xml:233
 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 "
@@ -2382,7 +2382,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:255
+#: apt-cache.8.xml:249
 msgid ""
 "Select the file to store the package cache. The package cache is the primary "
 "cache used by all operations.  Configuration Item: <literal>Dir::Cache::"
@@ -2394,7 +2394,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:261
+#: apt-cache.8.xml:255
 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 "
@@ -2411,7 +2411,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:269
+#: apt-cache.8.xml:263
 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 "
@@ -2425,7 +2425,7 @@ msgstr ""
 "pliku konfiguracyjnym: <literal>quiet</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:276
+#: apt-cache.8.xml:270
 msgid ""
 "Print only important dependencies; for use with <literal>unmet</literal> and "
 "<literal>depends</literal>. Causes only Depends and Pre-Depends relations to "
@@ -2437,7 +2437,7 @@ msgstr ""
 "Cache::Important</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:290
+#: apt-cache.8.xml:284
 msgid ""
 "Per default the <literal>depends</literal> and <literal>rdepends</literal> "
 "print all dependencies. This can be tweaked with these flags which will omit "
@@ -2453,7 +2453,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:297
+#: apt-cache.8.xml:291
 msgid ""
 "Print full package records when searching.  Configuration Item: "
 "<literal>APT::Cache::ShowFull</literal>."
@@ -2462,7 +2462,7 @@ msgstr ""
 "konfiguracyjnym: <literal>APT::Cache::ShowFull</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:302
+#: apt-cache.8.xml:296
 msgid ""
 "Print full records for all available versions. This is the default; to turn "
 "it off, use <option>--no-all-versions</option>.  If <option>--no-all-"
@@ -2481,7 +2481,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:311
+#: apt-cache.8.xml:305
 msgid ""
 "Perform automatic package cache regeneration, rather than use the cache as "
 "it is. This is the default; to turn it off, use <option>--no-generate</"
@@ -2494,7 +2494,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:317
+#: apt-cache.8.xml:311
 msgid ""
 "Only search on the package names, not the long descriptions.  Configuration "
 "Item: <literal>APT::Cache::NamesOnly</literal>."
@@ -2504,7 +2504,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:322
+#: apt-cache.8.xml:316
 msgid ""
 "Make <literal>pkgnames</literal> print all names, including virtual packages "
 "and missing dependencies.  Configuration Item: <literal>APT::Cache::"
@@ -2517,7 +2517,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:328
+#: apt-cache.8.xml:322
 msgid ""
 "Make <literal>depends</literal> and <literal>rdepends</literal> recursive so "
 "that all packages mentioned are printed once.  Configuration Item: "
@@ -2530,7 +2530,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:335
+#: apt-cache.8.xml:329
 msgid ""
 "Limit the output of <literal>depends</literal> and <literal>rdepends</"
 "literal> to packages which are currently installed.  Configuration Item: "
@@ -2542,13 +2542,13 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:353
+#: apt-cache.8.xml:347
 msgid "&apt-conf;, &sources-list;, &apt-get;"
 msgstr "&apt-conf;, &sources-list;, &apt-get;"
 
 #
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:358
+#: apt-cache.8.xml:352
 msgid ""
 "<command>apt-cache</command> returns zero on normal operation, decimal 100 "
 "on error."
@@ -2558,12 +2558,12 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-key.8.xml:34
+#: apt-key.8.xml:28
 msgid "APT key management utility"
 msgstr "Narzędzie zarządzanie kluczami APT"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:41
+#: apt-key.8.xml:35
 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 "
@@ -2575,12 +2575,12 @@ msgstr ""
 "zaufane."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-key.8.xml:47
+#: apt-key.8.xml:41
 msgid "Commands"
 msgstr "Polecenia"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:52
+#: apt-key.8.xml:46
 msgid ""
 "Add a new key to the list of trusted keys.  The key is read from the "
 "filename given with the parameter &synopsis-param-filename; or if the "
@@ -2591,32 +2591,32 @@ msgstr ""
 "wejścia, jeśli zamiast nazwy pliku podano <literal>-</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:65
+#: apt-key.8.xml:59
 msgid "Remove a key from the list of trusted keys."
 msgstr "Usuwa klucz z listy zaufanych kluczy."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:76
+#: apt-key.8.xml:70
 msgid "Output the key &synopsis-param-keyid; to standard output."
 msgstr "Wyświetla klucz &synopsis-param-keyid; na standardowym wyjściu."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:87
+#: apt-key.8.xml:81
 msgid "Output all trusted keys to standard output."
 msgstr "Wypisuje na standardowe wyjście wszystkie zaufane klucze."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:98
+#: apt-key.8.xml:92
 msgid "List trusted keys."
 msgstr "Wyświetla listę zaufanych kluczy."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:109
+#: apt-key.8.xml:103
 msgid "List fingerprints of trusted keys."
 msgstr "Wyświetla listę odcisków zaufanych kluczy."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:120
+#: apt-key.8.xml:114
 msgid ""
 "Pass advanced options to gpg. With adv --recv-key you can download the "
 "public key."
@@ -2625,7 +2625,7 @@ msgstr ""
 "pobranie klucza publicznego."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:132
+#: apt-key.8.xml:126
 msgid ""
 "Update the local keyring with the archive keyring and remove from the local "
 "keyring the archive keys which are no longer valid.  The archive keyring is "
@@ -2639,7 +2639,7 @@ msgstr ""
 "distro;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:146
+#: apt-key.8.xml:140
 msgid ""
 "Perform an update working similarly to the <command>update</command> command "
 "above, but get the archive keyring from a URI instead and validate it "
@@ -2657,12 +2657,12 @@ msgstr ""
 "command>, ale APT w Ubuntu je obsługuje."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-key.8.xml:162 apt-cdrom.8.xml:82
+#: apt-key.8.xml:156 apt-cdrom.8.xml:76
 msgid "Options"
 msgstr "Opcje"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:163
+#: apt-key.8.xml:157
 msgid ""
 "Note that options need to be defined before the commands described in the "
 "previous section."
@@ -2671,7 +2671,7 @@ msgstr ""
 "opisanymi w poprzednim rozdziale."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:166
+#: apt-key.8.xml:160
 msgid ""
 "With this option it is possible to specify a particular keyring file the "
 "command should operate on. The default is that a command is executed on the "
@@ -2688,47 +2688,47 @@ msgstr ""
 "właśnie tam."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:181
+#: apt-key.8.xml:175
 msgid "<filename>/etc/apt/trustdb.gpg</filename>"
 msgstr "<filename>/etc/apt/trustdb.gpg</filename>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:182
+#: apt-key.8.xml:176
 msgid "Local trust database of archive keys."
 msgstr "Lokalna składnica zaufanych kluczy archiwum."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:185
+#: apt-key.8.xml:179
 msgid "&keyring-filename;"
 msgstr "&keyring-filename;"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:186
+#: apt-key.8.xml:180
 msgid "Keyring of &keyring-distro; archive trusted keys."
 msgstr "Składnica zaufanych kluczy archiwum &keyring-distro;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:189
+#: apt-key.8.xml:183
 msgid "&keyring-removed-filename;"
 msgstr "&keyring-removed-filename;"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:190
+#: apt-key.8.xml:184
 msgid "Keyring of &keyring-distro; archive removed trusted keys."
 msgstr "Składnica usuniętych zaufanych kluczy archiwum &keyring-distro;."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:199
+#: apt-key.8.xml:193
 msgid "&apt-get;, &apt-secure;"
 msgstr "&apt-get;, &apt-secure;"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-mark.8.xml:35
+#: apt-mark.8.xml:29
 msgid "mark/unmark a package as being automatically-installed"
 msgstr "Zaznaczanie/odznaczanie pakietu jako zainstalowanego automatycznie."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:41
+#: apt-mark.8.xml:35
 msgid ""
 "<command>apt-mark</command> will change whether a package has been marked as "
 "being automatically installed."
@@ -2737,7 +2737,7 @@ msgstr ""
 "zainstalowany automatycznie."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:45
+#: apt-mark.8.xml:39
 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 "
@@ -2753,7 +2753,7 @@ msgstr ""
 "lub <command>aptitude</command>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:54
+#: apt-mark.8.xml:48
 msgid ""
 "<literal>auto</literal> is used to mark a package as being automatically "
 "installed, which will cause the package to be removed when no more manually "
@@ -2764,7 +2764,7 @@ msgstr ""
 "żaden inny ręcznie zainstalowany pakiet nie będzie od niego zależał."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:62
+#: apt-mark.8.xml:56
 msgid ""
 "<literal>manual</literal> is used to mark a package as being manually "
 "installed, which will prevent the package from being automatically removed "
@@ -2775,7 +2775,7 @@ msgstr ""
 "sytuacji gdy żaden inny pakiet nie będzie od niego zależał."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:70
+#: apt-mark.8.xml:64
 msgid ""
 "<literal>hold</literal> is used to mark a package as held back, which will "
 "prevent the package from being automatically installed, upgraded or "
@@ -2790,7 +2790,7 @@ msgstr ""
 "działanie tego polecenia."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:80
+#: apt-mark.8.xml:74
 msgid ""
 "<literal>unhold</literal> is used to cancel a previously set hold on a "
 "package to allow all actions again."
@@ -2800,7 +2800,7 @@ msgstr ""
 "na tym pakiecie."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:86
+#: apt-mark.8.xml:80
 msgid ""
 "<literal>showauto</literal> is used to print a list of automatically "
 "installed packages with each package on a new line.  All automatically "
@@ -2814,7 +2814,7 @@ msgstr ""
 "to zostaną wypisane tylko te z nich, które są automatycznie zainstalowane."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:94
+#: apt-mark.8.xml:88
 msgid ""
 "<literal>showmanual</literal> can be used in the same way as "
 "<literal>showauto</literal> except that it will print a list of manually "
@@ -2825,7 +2825,7 @@ msgstr ""
 "zainstalowanych pakietów."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:101
+#: apt-mark.8.xml:95
 msgid ""
 "<literal>showhold</literal> is used to print a list of packages on hold in "
 "the same way as for the other show commands."
@@ -2834,7 +2834,7 @@ msgstr ""
 "pakietów wstrzymanych, w taki sam sposób jak pozostałe polecenia \"show\"."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:117
+#: apt-mark.8.xml:111
 msgid ""
 "Read/Write package stats from the filename given with the parameter "
 "&synopsis-param-filename; instead of from the default location, which is "
@@ -2848,7 +2848,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:138
+#: apt-mark.8.xml:132
 msgid ""
 "<command>apt-mark</command> returns zero on normal operation, non-zero on "
 "error."
@@ -2857,12 +2857,12 @@ msgstr ""
 "wartość niezerową - w przypadku błędu."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-secure.8.xml:49
+#: apt-secure.8.xml:43
 msgid "Archive authentication support for APT"
 msgstr "Wsparcie APT dla autentykacji archiwum."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:54
+#: apt-secure.8.xml:48
 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 "
@@ -2875,7 +2875,7 @@ msgstr ""
 "używanego do podpisywania plików \"Release\"."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:62
+#: apt-secure.8.xml:56
 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 "
@@ -2891,7 +2891,7 @@ msgstr ""
 "zweryfikowane, zanim w ogóle APT spróbuje z nich pobrać pakiety."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:71
+#: apt-secure.8.xml:65
 msgid ""
 "The package frontends &apt-get;, &aptitude; and &synaptic; support this new "
 "authentication feature."
@@ -2900,12 +2900,12 @@ msgstr ""
 "sposób autoryzacji pakietów."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:76
+#: apt-secure.8.xml:70
 msgid "Trusted archives"
 msgstr "Zaufane archiwa"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:79
+#: apt-secure.8.xml:73
 msgid ""
 "The chain of trust from an apt archive to the end user is made up of several "
 "steps. <command>apt-secure</command> is the last step in this chain; "
@@ -2921,7 +2921,7 @@ msgstr ""
 "opiekuna archiwum jest zapewnienie poprawności integralności archiwum."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:87
+#: apt-secure.8.xml:81
 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 "
@@ -2934,7 +2934,7 @@ msgstr ""
 "verify i devscripts)."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:94
+#: apt-secure.8.xml:88
 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. In order to become "
@@ -2951,7 +2951,7 @@ msgstr ""
 "odpowiednie procedury używane w Debianie do identyfikacji posiadacza klucza."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:104
+#: apt-secure.8.xml:98
 msgid ""
 "Once the uploaded package is verified and included in the archive, the "
 "maintainer signature is stripped off, and checksums of the package are "
@@ -2973,7 +2973,7 @@ msgstr ""
 "&keyring-package;."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:115
+#: apt-secure.8.xml:109
 msgid ""
 "End users can check the signature of the Release file, extract a checksum of "
 "a package from it and compare it with the checksum of the package they "
@@ -2984,7 +2984,7 @@ msgstr ""
 "pakietu. Mogą też polegać na tym, że APT zrobi to automatycznie."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:120
+#: apt-secure.8.xml:114
 msgid ""
 "Notice that this is distinct from checking signatures on a per package "
 "basis. It is designed to prevent two possible attacks:"
@@ -2994,7 +2994,7 @@ msgstr ""
 "dwoma możliwymi typami ataków:"
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:125
+#: apt-secure.8.xml:119
 msgid ""
 "<literal>Network \"man in the middle\" attacks</literal>. Without signature "
 "checking, malicious agents can introduce themselves into the package "
@@ -3011,7 +3011,7 @@ msgstr ""
 "\"ARP (DNS) spoofing\")."
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:133
+#: apt-secure.8.xml:127
 msgid ""
 "<literal>Mirror network compromise</literal>.  Without signature checking, a "
 "malicious agent can compromise a mirror host and modify the files in it to "
@@ -3025,7 +3025,7 @@ msgstr ""
 "pobierającym pakiety z tego serwera."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:140
+#: apt-secure.8.xml:134
 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 "
@@ -3038,12 +3038,12 @@ msgstr ""
 "dla sprawdzania sygnatur poszczególnych pakietów."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:146
+#: apt-secure.8.xml:140
 msgid "User configuration"
 msgstr "Konfiguracja użytkownika"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:148
+#: apt-secure.8.xml:142
 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 "
@@ -3057,7 +3057,7 @@ msgstr ""
 "Debiana."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:155
+#: apt-secure.8.xml:149
 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 "
@@ -3073,19 +3073,19 @@ msgstr ""
 "<filename>Release.gpg</filename> ze skonfigurowanych archiwów."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:164
+#: apt-secure.8.xml:158
 msgid "Archive configuration"
 msgstr "Konfiguracja archiwum"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:166
+#: apt-secure.8.xml:160
 msgid ""
 "If you want to provide archive signatures in an archive under your "
 "maintenance you have to:"
 msgstr "Aby dołączyć sygnatury do archiwum, którym się opiekujesz, należy:"
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:171
+#: apt-secure.8.xml:165
 msgid ""
 "<emphasis>Create a toplevel Release file</emphasis>, if it does not exist "
 "already. You can do this by running <command>apt-ftparchive release</"
@@ -3096,7 +3096,7 @@ msgstr ""
 "release</command> (dostarczanego w pakiecie apt-utils)."
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:176
+#: apt-secure.8.xml:170
 msgid ""
 "<emphasis>Sign it</emphasis>. You can do this by running <command>gpg --"
 "clearsign -o InRelease Release</command> and <command>gpg -abs -o Release."
@@ -3107,7 +3107,7 @@ msgstr ""
 "o Release.gpg Release</command>."
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:180
+#: apt-secure.8.xml:174
 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 "
@@ -3118,7 +3118,7 @@ msgstr ""
 "autoryzować plików w archiwum."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:187
+#: apt-secure.8.xml:181
 msgid ""
 "Whenever the contents of the archive change (new packages are added or "
 "removed) the archive maintainer has to follow the first two steps outlined "
@@ -3128,16 +3128,16 @@ msgstr ""
 "opiekun archiwum musi wykonać pierwsze dwa z wymienionych powyżej kroków."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:195
+#: apt-secure.8.xml:189
 msgid ""
 "&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, "
-"&debsign; &debsig-verify;, &gpg;"
+"&debsign;, &debsig-verify;, &gpg;"
 msgstr ""
 "&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, "
-"&debsign; &debsig-verify;, &gpg;"
+"&debsign;, &debsig-verify;, &gpg;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:199
+#: apt-secure.8.xml:193
 msgid ""
 "For more background information you might want to review the <ulink url="
 "\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "
@@ -3153,12 +3153,12 @@ msgstr ""
 "Distribution HOWTO</ulink>\" napisanym przez V. Alexa Brennena."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:212
+#: apt-secure.8.xml:206
 msgid "Manpage Authors"
 msgstr "Autorzy strony podręcznika"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:214
+#: apt-secure.8.xml:208
 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."
@@ -3169,13 +3169,13 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-cdrom.8.xml:34
+#: apt-cdrom.8.xml:28
 msgid "APT CD-ROM management utility"
 msgstr "Narzędzie APT do zarządzania źródłami typu CD-ROM"
 
 #
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:40
+#: apt-cdrom.8.xml:34
 msgid ""
 "<command>apt-cdrom</command> is used to add a new CD-ROM to APT's list of "
 "available sources. <command>apt-cdrom</command> takes care of determining "
@@ -3189,7 +3189,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:47
+#: apt-cdrom.8.xml:41
 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 disc in a multi-CD set "
@@ -3200,7 +3200,7 @@ msgstr ""
 "w wielodyskowym archiwum musi być włożony i zeskanowany oddzielnie."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:58
+#: apt-cdrom.8.xml:52
 msgid ""
 "<literal>add</literal> is used to add a new disc to the source list. It will "
 "unmount the CD-ROM device, prompt for a disc to be inserted and then proceed "
@@ -3216,7 +3216,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:66
+#: apt-cdrom.8.xml:60
 msgid ""
 "APT uses a CD-ROM ID to track which disc is currently in the drive and "
 "maintains a database of these IDs in <filename>&statedir;/cdroms.list</"
@@ -3228,7 +3228,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:74
+#: apt-cdrom.8.xml:68
 msgid ""
 "A debugging tool to report the identity of the current disc as well as the "
 "stored file name"
@@ -3238,7 +3238,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:87
+#: apt-cdrom.8.xml:81
 #, fuzzy
 #| msgid ""
 #| "Mount point; specify the location to mount the CD-ROM. This mount point "
@@ -3256,7 +3256,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:95
+#: apt-cdrom.8.xml:89
 msgid ""
 "Mount point; specify the location to mount the CD-ROM. This mount point must "
 "be listed in <filename>/etc/fstab</filename> and properly configured.  "
@@ -3269,7 +3269,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:104
+#: apt-cdrom.8.xml:98
 msgid ""
 "Rename a disc; change the label of a disc or override the disc's given "
 "label. This option will cause <command>apt-cdrom</command> to prompt for a "
@@ -3282,7 +3282,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:113
+#: apt-cdrom.8.xml:107
 msgid ""
 "No mounting; prevent <command>apt-cdrom</command> from mounting and "
 "unmounting the mount point.  Configuration Item: <literal>APT::CDROM::"
@@ -3294,7 +3294,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:121
+#: apt-cdrom.8.xml:115
 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 "
@@ -3309,7 +3309,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:131
+#: apt-cdrom.8.xml:125
 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 "
@@ -3322,7 +3322,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:142
+#: apt-cdrom.8.xml:136
 msgid ""
 "No Changes; Do not change the &sources-list; file and do not write index "
 "files. Everything is still checked however.  Configuration Item: "
@@ -3334,13 +3334,13 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:155
+#: apt-cdrom.8.xml:149
 msgid "&apt-conf;, &apt-get;, &sources-list;"
 msgstr "&apt-conf;, &apt-get;, &sources-list;"
 
 #
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:160
+#: apt-cdrom.8.xml:154
 msgid ""
 "<command>apt-cdrom</command> returns zero on normal operation, decimal 100 "
 "on error."
@@ -3349,12 +3349,12 @@ msgstr ""
 "- w przypadku błędu."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-config.8.xml:35
+#: apt-config.8.xml:29
 msgid "APT Configuration Query program"
 msgstr "Program odpytywania konfiguracji APT"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:41
+#: apt-config.8.xml:35
 msgid ""
 "<command>apt-config</command> is an internal program used by various "
 "portions of the APT suite to provide consistent configurability. It accesses "
@@ -3367,7 +3367,7 @@ msgstr ""
 "filename> w sposób łatwy do użycia w programach skryptowych."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:53
+#: apt-config.8.xml:47
 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 the "
@@ -3382,7 +3382,7 @@ msgstr ""
 "Przykład użycia w skrypcie powłoki:"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
-#: apt-config.8.xml:61
+#: apt-config.8.xml:55
 #, no-wrap
 msgid ""
 "OPTS=\"-f\"\n"
@@ -3394,7 +3394,7 @@ msgstr ""
 "eval $RES\n"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:66
+#: apt-config.8.xml:60
 msgid ""
 "This will set the shell environment variable $OPTS to the value of MyApp::"
 "options with a default of <option>-f</option>."
@@ -3403,7 +3403,7 @@ msgstr ""
 "zmiennej MojaAplikacja::opcje, z domyślną wartością <option>-f</option>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:70
+#: apt-config.8.xml:64
 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 "
@@ -3414,12 +3414,12 @@ msgstr ""
 "jest ujednolicana i weryfikowana."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:79
+#: apt-config.8.xml:73
 msgid "Just show the contents of the configuration space."
 msgstr "Wyświetla zawartość przestrzeni konfiguracji."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:92
+#: apt-config.8.xml:86
 msgid ""
 "Include options which have an empty value. This is the default, so use --no-"
 "empty to remove them from the output."
@@ -3428,12 +3428,12 @@ msgstr ""
 "użyć <literal>--no-empty</literal>, aby usunąć takie opcje z wyjścia."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
-#: apt-config.8.xml:97
+#: apt-config.8.xml:91
 msgid "&percnt;f &#x0022;&percnt;v&#x0022;;&percnt;n"
 msgstr "&percnt;f &#x0022;&percnt;v&#x0022;;&percnt;n"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:98
+#: apt-config.8.xml:92
 msgid ""
 "Defines the output of each config option. &percnt;t will be replaced with "
 "its individual name, &percnt;f with its full hierarchical name and &percnt;v "
@@ -3452,14 +3452,14 @@ msgstr ""
 "używając &percnt;&percnt;."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:112 apt-extracttemplates.1.xml:73 apt-sortpkgs.1.xml:66
-#: apt-ftparchive.1.xml:610
+#: apt-config.8.xml:106 apt-extracttemplates.1.xml:67 apt-sortpkgs.1.xml:60
+#: apt-ftparchive.1.xml:604
 msgid "&apt-conf;"
 msgstr "&apt-conf;"
 
 #
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:117
+#: apt-config.8.xml:111
 msgid ""
 "<command>apt-config</command> returns zero on normal operation, decimal 100 "
 "on error."
@@ -3468,27 +3468,27 @@ msgstr ""
 "- w przypadku błędu."
 
 #. type: Content of: <refentry><refentryinfo><author><contrib>
-#: apt.conf.5.xml:22
+#: apt.conf.5.xml:16
 msgid "Initial documentation of Debug::*."
 msgstr "Wstępna dokumentacja hierarchii Debug::*."
 
 #. type: Content of: <refentry><refentryinfo><author><email>
-#: apt.conf.5.xml:23
+#: apt.conf.5.xml:17
 msgid "dburrows@debian.org"
 msgstr "dburrows@debian.org"
 
 #. type: Content of: <refentry><refmeta><manvolnum>
-#: apt.conf.5.xml:33 apt_preferences.5.xml:27 sources.list.5.xml:28
+#: apt.conf.5.xml:27 apt_preferences.5.xml:21 sources.list.5.xml:22
 msgid "5"
 msgstr "5"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt.conf.5.xml:40
+#: apt.conf.5.xml:34
 msgid "Configuration file for APT"
 msgstr "Plik konfiguracyjny dla APT"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:44
+#: apt.conf.5.xml:38
 msgid ""
 "<filename>/etc/apt/apt.conf</filename> is the main configuration file shared "
 "by all the tools in the APT suite of tools, though it is by no means the "
@@ -3502,7 +3502,7 @@ msgstr ""
 "jednolite środowisko pracy."
 
 #. type: Content of: <refentry><refsect1><orderedlist><para>
-#: apt.conf.5.xml:50
+#: apt.conf.5.xml:44
 msgid ""
 "When an APT tool starts up it will read the configuration files in the "
 "following order:"
@@ -3511,7 +3511,7 @@ msgstr ""
 "następującym porządku:"
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:52
+#: apt.conf.5.xml:46
 msgid ""
 "the file specified by the <envar>APT_CONFIG</envar> environment variable (if "
 "any)"
@@ -3520,7 +3520,7 @@ msgstr ""
 "ustawiona)."
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:54
+#: apt.conf.5.xml:48
 msgid ""
 "all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending "
 "order which have either no or \"<literal>conf</literal>\" as filename "
@@ -3540,14 +3540,14 @@ msgstr ""
 "żadnych informacji."
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:61
+#: apt.conf.5.xml:55
 msgid ""
 "the main configuration file specified by <literal>Dir::Etc::main</literal>"
 msgstr ""
 "główny plik konfiguracyjny określony przez <literal>Dir::Etc::main</literal>."
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:63
+#: apt.conf.5.xml:57
 msgid ""
 "the command line options are applied to override the configuration "
 "directives or to load even more configuration files."
@@ -3556,12 +3556,12 @@ msgstr ""
 "załadowania kolejnych plików konfiguracyjnych."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:67
+#: apt.conf.5.xml:61
 msgid "Syntax"
 msgstr "Składnia"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:68
+#: apt.conf.5.xml:62
 msgid ""
 "The configuration file is organized in a tree with options organized into "
 "functional groups. Option specification is given with a double colon "
@@ -3576,7 +3576,7 @@ msgstr ""
 "dziedziczą ustawień od swoich przodków."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:74
+#: apt.conf.5.xml:68
 msgid ""
 "Syntactically the configuration language is modeled after what the ISC tools "
 "such as bind and dhcp use. Lines starting with <literal>//</literal> are "
@@ -3591,7 +3591,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><informalexample><programlisting>
-#: apt.conf.5.xml:87
+#: apt.conf.5.xml:81
 #, no-wrap
 msgid ""
 "APT {\n"
@@ -3609,7 +3609,7 @@ msgstr ""
 "};\n"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:95
+#: apt.conf.5.xml:89
 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 "
@@ -3617,27 +3617,27 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><informalexample><programlisting>
-#: apt.conf.5.xml:100
+#: apt.conf.5.xml:94
 #, no-wrap
 msgid "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n"
 msgstr "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:103
+#: apt.conf.5.xml:97
 msgid ""
 "In general the sample configuration file &configureindex; is a good guide "
 "for how it should look."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:106
+#: apt.conf.5.xml:100
 msgid ""
 "Case is not significant in names of configuration items, 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:109
+#: apt.conf.5.xml:103
 msgid ""
 "Names for the configuration items are optional if a list is defined as can "
 "be seen in the <literal>DPkg::Pre-Install-Pkgs</literal> example above. If "
@@ -3647,7 +3647,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:114
+#: apt.conf.5.xml:108
 msgid ""
 "Two special commands are defined: <literal>#include</literal> (which is "
 "deprecated and not supported by alternative implementations) and "
@@ -3659,7 +3659,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:124
+#: apt.conf.5.xml:118
 msgid ""
 "The <literal>#clear</literal> command is the only way to delete a list or a "
 "complete scope. Reopening a scope (or using the syntax described below with "
@@ -3669,7 +3669,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:132
+#: apt.conf.5.xml:126
 msgid ""
 "All of the APT tools take an -o option which allows an arbitrary "
 "configuration directive to be specified on the command line. The syntax is a "
@@ -3681,7 +3681,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:140
+#: apt.conf.5.xml:134
 msgid ""
 "Note that appending items to a list using <literal>::</literal> only works "
 "for one item per line, and that you should not use it in combination with "
@@ -3698,19 +3698,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:155
+#: apt.conf.5.xml:149
 msgid "The APT Group"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:156
+#: apt.conf.5.xml:150
 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><listitem><para>
-#: apt.conf.5.xml:161
+#: apt.conf.5.xml:155
 msgid ""
 "System Architecture; sets the architecture to use when fetching files and "
 "parsing package lists. The internal default is the architecture apt was "
@@ -3718,7 +3718,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:168
+#: apt.conf.5.xml:162
 msgid ""
 "All Architectures the system supports. For instance, CPUs implementing the "
 "<literal>amd64</literal> (also called <literal>x86-64</literal>)  "
@@ -3731,7 +3731,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:182
+#: apt.conf.5.xml:176
 msgid ""
 "List of all build profiles enabled for build-dependency resolution, without "
 "the \"<literal>profile.</literal>\" namespace prefix.  By default this list "
@@ -3740,7 +3740,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:190
+#: apt.conf.5.xml:184
 msgid ""
 "Default release to install packages from if more than one version is "
 "available. Contains release name, codename or release version. Examples: "
@@ -3749,14 +3749,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:196
+#: apt.conf.5.xml:190
 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><listitem><para>
-#: apt.conf.5.xml:201
+#: apt.conf.5.xml:195
 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 "
@@ -3765,7 +3765,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:209
+#: apt.conf.5.xml:203
 msgid ""
 "Defaults to on, which will cause APT to install essential and important "
 "packages as soon as possible in an install/upgrade operation, in order to "
@@ -3780,7 +3780,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:221
+#: apt.conf.5.xml:215
 msgid ""
 "The immediate configuration marker is also applied in the potentially "
 "problematic case of circular dependencies, since a dependency with the "
@@ -3797,7 +3797,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:234
+#: apt.conf.5.xml:228
 msgid ""
 "Before a big operation like <literal>dist-upgrade</literal> is run with this "
 "option disabled you should try to explicitly <literal>install</literal> the "
@@ -3808,7 +3808,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:245
+#: apt.conf.5.xml:239
 msgid ""
 "Never enable this option unless you <emphasis>really</emphasis> know what "
 "you are doing. It permits APT to temporarily remove an essential package to "
@@ -3821,7 +3821,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:257
+#: apt.conf.5.xml:251
 msgid ""
 "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 of "
@@ -3841,38 +3841,38 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:273
+#: apt.conf.5.xml:267
 msgid "Defines which packages are considered essential build dependencies."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:277
+#: apt.conf.5.xml:271
 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><listitem><para>
-#: apt.conf.5.xml:282
+#: apt.conf.5.xml:276
 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><listitem><para>
-#: apt.conf.5.xml:287
+#: apt.conf.5.xml:281
 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:293
+#: apt.conf.5.xml:287
 msgid "The Acquire Group"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:294
+#: apt.conf.5.xml:288
 msgid ""
 "The <literal>Acquire</literal> group of options controls the download of "
 "packages as well as the various \"acquire methods\" responsible for the "
@@ -3880,7 +3880,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:301
+#: apt.conf.5.xml:295
 msgid ""
 "Security related option defaulting to true, as giving a Release file's "
 "validation an expiration date prevents replay attacks over a long timescale, "
@@ -3893,7 +3893,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:314
+#: apt.conf.5.xml:308
 msgid ""
 "Maximum time (in seconds) after its creation (as indicated by the "
 "<literal>Date</literal> header) that the <filename>Release</filename> file "
@@ -3905,7 +3905,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:326
+#: apt.conf.5.xml:320
 msgid ""
 "Minimum time (in seconds) after its creation (as indicated by the "
 "<literal>Date</literal> header) that the <filename>Release</filename> file "
@@ -3917,7 +3917,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:338
+#: apt.conf.5.xml:332
 msgid ""
 "Try to download deltas called <literal>PDiffs</literal> for indexes (like "
 "<filename>Packages</filename> files) instead of downloading whole ones. True "
@@ -3925,7 +3925,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:341
+#: apt.conf.5.xml:335
 msgid ""
 "Two sub-options to limit the use of PDiffs are also available: "
 "<literal>FileLimit</literal> can be used to specify a maximum number of "
@@ -3936,7 +3936,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:351
+#: apt.conf.5.xml:345
 msgid ""
 "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</"
 "literal> or <literal>access</literal> which determines how APT parallelizes "
@@ -3946,21 +3946,21 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:359
+#: apt.conf.5.xml:353
 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><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:364
+#: apt.conf.5.xml:358
 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><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:369
+#: apt.conf.5.xml:363
 msgid ""
 "<literal>http::Proxy</literal> sets the default proxy to use for HTTP URIs. "
 "It is in the standard form of <literal>http://[[user][:pass]@]host[:port]/</"
@@ -3972,7 +3972,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:377
+#: apt.conf.5.xml:371
 msgid ""
 "Three settings are provided for cache control with HTTP/1.1 compliant proxy "
 "caches.  <literal>No-Cache</literal> tells the proxy not to use its cached "
@@ -3984,14 +3984,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:387 apt.conf.5.xml:475
+#: apt.conf.5.xml:381 apt.conf.5.xml:469
 msgid ""
 "The option <literal>timeout</literal> sets the timeout timer used by the "
 "method; this value applies to the connection as well as the data timeout."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:390
+#: apt.conf.5.xml:384
 msgid ""
 "The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to "
 "enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be beneficial e."
@@ -4003,14 +4003,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:397
+#: apt.conf.5.xml:391
 msgid ""
 "<literal>Acquire::http::AllowRedirect</literal> controls whether APT will "
 "follow redirects, which is enabled by default."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:400
+#: apt.conf.5.xml:394
 msgid ""
 "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
 "literal> which accepts integer values in kilobytes per second. The default "
@@ -4020,7 +4020,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:407
+#: apt.conf.5.xml:401
 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 "
@@ -4028,7 +4028,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:411
+#: apt.conf.5.xml:405
 msgid ""
 "<literal>Acquire::http::Proxy-Auto-Detect</literal> can be used to specify "
 "an external command to discover the http proxy to use. Apt expects the "
@@ -4042,7 +4042,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:429
+#: apt.conf.5.xml:423
 msgid ""
 "The <literal>Cache-control</literal>, <literal>Timeout</literal>, "
 "<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> and "
@@ -4053,7 +4053,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:437
+#: apt.conf.5.xml:431
 msgid ""
 "<literal>CaInfo</literal> suboption specifies place of file that holds info "
 "about trusted certificates.  <literal>&lt;host&gt;::CaInfo</literal> is the "
@@ -4075,7 +4075,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:458
+#: apt.conf.5.xml:452
 msgid ""
 "<literal>ftp::Proxy</literal> sets the default proxy to use for FTP URIs.  "
 "It is in the standard form of <literal>ftp://[[user][:pass]@]host[:port]/</"
@@ -4094,7 +4094,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:478
+#: apt.conf.5.xml:472
 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, "
@@ -4104,7 +4104,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:485
+#: apt.conf.5.xml:479
 msgid ""
 "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
 "envar> environment variable to an HTTP URL - see the discussion of the http "
@@ -4113,7 +4113,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:490
+#: apt.conf.5.xml:484
 msgid ""
 "The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
 "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -4123,13 +4123,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:504
+#: apt.conf.5.xml:498
 #, no-wrap
 msgid "/cdrom/::Mount \"foo\";"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:499
+#: apt.conf.5.xml:493
 msgid ""
 "For URIs using the <literal>cdrom</literal> method, the only configurable "
 "option is the mount point, <literal>cdrom::Mount</literal>, which must be "
@@ -4142,20 +4142,20 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:512
+#: apt.conf.5.xml:506
 msgid ""
 "For GPGV URIs the only configurable option is <literal>gpgv::Options</"
 "literal>, which passes additional parameters to gpgv."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:523
+#: apt.conf.5.xml:517
 #, no-wrap
 msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:518
+#: apt.conf.5.xml:512
 msgid ""
 "List of compression types which are understood by the acquire methods.  "
 "Files like <filename>Packages</filename> can be available in various "
@@ -4167,19 +4167,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:528
+#: apt.conf.5.xml:522
 #, no-wrap
 msgid "Acquire::CompressionTypes::Order:: \"gz\";"
 msgstr "Acquire::CompressionTypes::Order:: \"gz\";"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:531
+#: apt.conf.5.xml:525
 #, no-wrap
 msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
 msgstr "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:524
+#: apt.conf.5.xml:518
 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 "
@@ -4197,13 +4197,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:538
+#: apt.conf.5.xml:532
 #, no-wrap
 msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
 msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:533
+#: apt.conf.5.xml:527
 msgid ""
 "Note that the <literal>Dir::Bin::<replaceable>Methodname</replaceable></"
 "literal> will be checked at run time. If this option has been set, the "
@@ -4218,7 +4218,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:543
+#: apt.conf.5.xml:537
 msgid ""
 "The special type <literal>uncompressed</literal> can be used to give "
 "uncompressed files a preference, but note that most archives don't provide "
@@ -4226,7 +4226,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:550
+#: apt.conf.5.xml:544
 msgid ""
 "When downloading <literal>gzip</literal> compressed indexes (Packages, "
 "Sources, or Translations), keep them gzip compressed locally instead of "
@@ -4235,7 +4235,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:558
+#: apt.conf.5.xml:552
 msgid ""
 "The Languages subsection controls which <filename>Translation</filename> "
 "files are downloaded and in which order APT tries to display the description-"
@@ -4247,13 +4247,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><programlisting>
-#: apt.conf.5.xml:575
+#: apt.conf.5.xml:569
 #, no-wrap
 msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:563
+#: apt.conf.5.xml:557
 msgid ""
 "The default list includes \"environment\" and \"en\". "
 "\"<literal>environment</literal>\" has a special meaning here: it will be "
@@ -4275,7 +4275,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:576
+#: apt.conf.5.xml:570
 msgid ""
 "Note: To prevent problems resulting from APT being executed in different "
 "environments (e.g. by different users or by other programs) all Translation "
@@ -4284,22 +4284,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:585
+#: apt.conf.5.xml:579
 msgid "When downloading, force to use only the IPv4 protocol."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:591
+#: apt.conf.5.xml:585
 msgid "When downloading, force to use only the IPv6 protocol."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:598
+#: apt.conf.5.xml:592
 msgid "Directories"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:600
+#: apt.conf.5.xml:594
 msgid ""
 "The <literal>Dir::State</literal> section has directories that pertain to "
 "local state information. <literal>lists</literal> is the directory to place "
@@ -4311,20 +4311,21 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:607
+#: apt.conf.5.xml:601
 msgid ""
 "<literal>Dir::Cache</literal> contains locations pertaining to local cache "
 "information, such as the two package caches <literal>srcpkgcache</literal> "
 "and <literal>pkgcache</literal> as well as the location to place downloaded "
 "archives, <literal>Dir::Cache::archives</literal>. Generation of caches can "
-"be turned off by setting their names to the empty string. This will slow "
+"be turned off by setting <literal>pkgcache</literal> or "
+"<literal>srcpkgcache</literal> to <literal>\"\"</literal>.  This will slow "
 "down startup but save disk space. It is probably preferable to turn off the "
-"pkgcache rather than the srcpkgcache. Like <literal>Dir::State</literal> the "
-"default directory is contained in <literal>Dir::Cache</literal>"
+"pkgcache rather than the srcpkgcache.  Like <literal>Dir::State</literal> "
+"the default directory is contained in <literal>Dir::Cache</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:616
+#: apt.conf.5.xml:611
 msgid ""
 "<literal>Dir::Etc</literal> contains the location of configuration files, "
 "<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -4334,7 +4335,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:622
+#: apt.conf.5.xml:617
 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 "
@@ -4342,7 +4343,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:626
+#: apt.conf.5.xml:621
 msgid ""
 "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
 "Bin::Methods</literal> specifies the location of the method handlers and "
@@ -4353,7 +4354,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:634
+#: apt.conf.5.xml:629
 msgid ""
 "The configuration item <literal>RootDir</literal> has a special meaning.  If "
 "set, all paths in <literal>Dir::</literal> will be relative to "
@@ -4366,7 +4367,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:647
+#: apt.conf.5.xml:642
 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 "
@@ -4377,12 +4378,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:656
+#: apt.conf.5.xml:651
 msgid "APT in DSelect"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:658
+#: apt.conf.5.xml:653
 msgid ""
 "When APT is used as a &dselect; method several configuration directives "
 "control the default behavior. These are in the <literal>DSelect</literal> "
@@ -4390,7 +4391,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:663
+#: apt.conf.5.xml:658
 msgid ""
 "Cache Clean mode; this value may be one of <literal>always</literal>, "
 "<literal>prompt</literal>, <literal>auto</literal>, <literal>pre-auto</"
@@ -4403,40 +4404,40 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:677
+#: apt.conf.5.xml:672
 msgid ""
 "The contents of this variable are passed to &apt-get; as command line "
 "options when it is run for the install phase."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:682
+#: apt.conf.5.xml:677
 msgid ""
 "The contents of this variable are passed to &apt-get; as command line "
 "options when it is run for the update phase."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:687
+#: apt.conf.5.xml:682
 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:693
+#: apt.conf.5.xml:688
 msgid "How APT calls &dpkg;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:694
+#: apt.conf.5.xml:689
 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:699
+#: apt.conf.5.xml:694
 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 "
@@ -4444,7 +4445,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:705
+#: apt.conf.5.xml:700
 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 "
@@ -4453,7 +4454,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:712
+#: apt.conf.5.xml:707
 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 "
@@ -4464,7 +4465,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:719
+#: apt.conf.5.xml:714
 msgid ""
 "Version 2 of this protocol dumps more information, including the protocol "
 "version, the APT configuration space and the packages, files and versions "
@@ -4473,7 +4474,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:724
+#: apt.conf.5.xml:719
 msgid ""
 "The version of the protocol to be used for the command "
 "<literal><replaceable>cmd</replaceable></literal> can be chosen by setting "
@@ -4484,7 +4485,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:731
+#: apt.conf.5.xml:726
 msgid ""
 "The file descriptor to be used to send the information can be requested with "
 "<literal>DPkg::Tools::options::<replaceable>cmd</replaceable>::InfoFD</"
@@ -4495,26 +4496,26 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:741
+#: apt.conf.5.xml:736
 msgid ""
 "APT chdirs to this directory before invoking &dpkg;, the default is "
 "<filename>/</filename>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:746
+#: apt.conf.5.xml:741
 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:751
+#: apt.conf.5.xml:746
 msgid "dpkg trigger usage (and related options)"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:752
+#: apt.conf.5.xml:747
 msgid ""
 "APT can call &dpkg; in such a way as to let it make aggressive use of "
 "triggers over multiple calls of &dpkg;. Without further options &dpkg; will "
@@ -4529,7 +4530,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:767
+#: apt.conf.5.xml:762
 #, no-wrap
 msgid ""
 "DPkg::NoTriggers \"true\";\n"
@@ -4543,7 +4544,7 @@ msgstr ""
 "DPkg::TriggersPending \"true\";"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:761
+#: apt.conf.5.xml:756
 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 "
@@ -4557,7 +4558,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:774
+#: apt.conf.5.xml:769
 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 "
@@ -4570,7 +4571,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:782
+#: apt.conf.5.xml:777
 msgid ""
 "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
 "and \"<literal>no</literal>\".  The default value is \"<literal>all</literal>"
@@ -4587,7 +4588,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:797
+#: apt.conf.5.xml:792
 msgid ""
 "If this option is set APT will call <command>dpkg --configure --pending</"
 "command> to let &dpkg; handle all required configurations and triggers. This "
@@ -4598,7 +4599,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:804
+#: apt.conf.5.xml:799
 msgid ""
 "Useful for the <literal>smart</literal> configuration as a package which has "
 "pending triggers is not considered as <literal>installed</literal>, and "
@@ -4608,7 +4609,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:817
+#: apt.conf.5.xml:812
 #, no-wrap
 msgid ""
 "OrderList::Score {\n"
@@ -4626,7 +4627,7 @@ msgstr ""
 "};"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:810
+#: apt.conf.5.xml:805
 msgid ""
 "Essential packages (and their dependencies) should be configured immediately "
 "after unpacking. It is a good idea to do this quite early in the upgrade "
@@ -4640,12 +4641,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:830
+#: apt.conf.5.xml:825
 msgid "Periodic and Archives options"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:831
+#: apt.conf.5.xml:826
 msgid ""
 "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
 "of options configure behavior of apt periodic updates, which is done by the "
@@ -4654,13 +4655,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:839
+#: apt.conf.5.xml:834
 #, fuzzy
 msgid "Debug options"
 msgstr "opcje"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:841
+#: apt.conf.5.xml:836
 msgid ""
 "Enabling options in the <literal>Debug::</literal> section will cause "
 "debugging information to be sent to the standard error stream of the program "
@@ -4671,7 +4672,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:852
+#: apt.conf.5.xml:847
 msgid ""
 "<literal>Debug::pkgProblemResolver</literal> enables output about the "
 "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -4679,7 +4680,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:860
+#: apt.conf.5.xml:855
 msgid ""
 "<literal>Debug::NoLocking</literal> disables all file locking.  This can be "
 "used to run some operations (for instance, <literal>apt-get -s install</"
@@ -4687,7 +4688,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:869
+#: apt.conf.5.xml:864
 msgid ""
 "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
 "time that <literal>apt</literal> invokes &dpkg;."
@@ -4697,7 +4698,7 @@ 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:877
+#: apt.conf.5.xml:872
 #, fuzzy
 msgid ""
 "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
@@ -4707,59 +4708,59 @@ msgstr ""
 "in CDROM IDs."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:887
+#: apt.conf.5.xml:882
 msgid "A full list of debugging options to apt follows."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:896
+#: apt.conf.5.xml:891
 msgid ""
 "Print information related to accessing <literal>cdrom://</literal> sources."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:907
+#: apt.conf.5.xml:902
 msgid "Print information related to downloading packages using FTP."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:918
+#: apt.conf.5.xml:913
 msgid "Print information related to downloading packages using HTTP."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:929
+#: apt.conf.5.xml:924
 msgid "Print information related to downloading packages using HTTPS."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:940
+#: apt.conf.5.xml:935
 msgid ""
 "Print information related to verifying cryptographic signatures using "
 "<literal>gpg</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:951
+#: apt.conf.5.xml:946
 msgid ""
 "Output information about the process of accessing collections of packages "
 "stored on CD-ROMs."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:961
+#: apt.conf.5.xml:956
 msgid "Describes the process of resolving build-dependencies in &apt-get;."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:971
+#: apt.conf.5.xml:966
 msgid ""
 "Output each cryptographic hash that is generated by the <literal>apt</"
 "literal> libraries."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:981
+#: apt.conf.5.xml:976
 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 "
@@ -4767,53 +4768,53 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:992
+#: apt.conf.5.xml:987
 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><listitem><para>
-#: apt.conf.5.xml:1004
+#: apt.conf.5.xml:999
 msgid "Log when items are added to or removed from the global download queue."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1014
+#: apt.conf.5.xml:1009
 msgid ""
 "Output status messages and errors related to verifying checksums and "
 "cryptographic signatures of downloaded files."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1024
+#: apt.conf.5.xml:1019
 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><listitem><para>
-#: apt.conf.5.xml:1036
+#: apt.conf.5.xml:1031
 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><listitem><para>
-#: apt.conf.5.xml:1047
+#: apt.conf.5.xml:1042
 msgid ""
 "Log all interactions with the sub-processes that actually perform downloads."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1058
+#: apt.conf.5.xml:1053
 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><listitem><para>
-#: apt.conf.5.xml:1068
+#: apt.conf.5.xml:1063
 msgid ""
 "Generate debug messages describing which packages are being automatically "
 "installed to resolve dependencies.  This corresponds to the initial auto-"
@@ -4823,7 +4824,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1082
+#: apt.conf.5.xml:1077
 msgid ""
 "Generate debug messages describing which packages are marked as keep/install/"
 "remove while the ProblemResolver does his work.  Each addition or deletion "
@@ -4841,46 +4842,46 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1103
+#: apt.conf.5.xml:1098
 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><listitem><para>
-#: apt.conf.5.xml:1114
+#: apt.conf.5.xml:1109
 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><listitem><para>
-#: apt.conf.5.xml:1125
+#: apt.conf.5.xml:1120
 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><listitem><para>
-#: apt.conf.5.xml:1137
+#: apt.conf.5.xml:1132
 msgid ""
 "Output status messages tracing the steps performed when invoking &dpkg;."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1148
+#: apt.conf.5.xml:1143
 msgid "Output the priority of each package list on startup."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1158
+#: apt.conf.5.xml:1153
 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><listitem><para>
-#: apt.conf.5.xml:1169
+#: apt.conf.5.xml:1164
 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 "
@@ -4888,14 +4889,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1181
+#: apt.conf.5.xml:1176
 msgid ""
 "Print information about the vendors read from <filename>/etc/apt/vendors."
 "list</filename>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1191
+#: apt.conf.5.xml:1186
 msgid ""
 "Display the external commands that are called by apt hooks.  This includes e."
 "g. the config options <literal>DPkg::{Pre,Post}-Invoke</literal> or "
@@ -4903,13 +4904,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1215 apt_preferences.5.xml:547 sources.list.5.xml:239
-#: apt-ftparchive.1.xml:598
+#: apt.conf.5.xml:1210 apt_preferences.5.xml:541 sources.list.5.xml:233
+#: apt-ftparchive.1.xml:592
 msgid "Examples"
 msgstr "Przykłady"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1216
+#: apt.conf.5.xml:1211
 msgid ""
 "&configureindex; is a configuration file showing example values for all "
 "possible options."
@@ -4917,17 +4918,17 @@ msgstr ""
 
 #.  ? reading apt.conf 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1228
+#: apt.conf.5.xml:1223
 msgid "&apt-cache;, &apt-config;, &apt-preferences;."
 msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt_preferences.5.xml:34
+#: apt_preferences.5.xml:28
 msgid "Preference control file for APT"
 msgstr "Plik kontrolny preferencji APT"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:39
+#: apt_preferences.5.xml:33
 msgid ""
 "The APT preferences file <filename>/etc/apt/preferences</filename> and the "
 "fragment files in the <filename>/etc/apt/preferences.d/</filename> folder "
@@ -4939,7 +4940,7 @@ msgstr ""
 "do określania wersji pakietów wybieranych do instalacji."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:44
+#: apt_preferences.5.xml:38
 msgid ""
 "Several versions of a package may be available for installation when the "
 "&sources-list; file contains references to more than one distribution (for "
@@ -4961,7 +4962,7 @@ msgstr ""
 "zainstalowania."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:54
+#: apt_preferences.5.xml:48
 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 "
@@ -4976,7 +4977,7 @@ msgstr ""
 "wybór instancji, ale na wybór wersji."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:61
+#: apt_preferences.5.xml:55
 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 "
@@ -5001,7 +5002,7 @@ msgstr ""
 "oczekiwało. Ostrzegamy!"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:72
+#: apt_preferences.5.xml:66
 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 "
@@ -5024,24 +5025,24 @@ msgstr ""
 "komunikat."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:81
+#: apt_preferences.5.xml:75
 msgid "APT's Default Priority Assignments"
 msgstr "Domyślne przypisania priorytetów APT"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:96
+#: apt_preferences.5.xml:90
 #, no-wrap
 msgid "<command>apt-get install -t testing <replaceable>some-package</replaceable></command>\n"
 msgstr "<command>apt-get install -t testing <replaceable>jakiś-pakiet</replaceable></command>\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:99
+#: apt_preferences.5.xml:93
 #, no-wrap
 msgid "APT::Default-Release \"stable\";\n"
 msgstr "APT::Default-Release \"stable\";\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:83
+#: apt_preferences.5.xml:77
 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 "
@@ -5069,7 +5070,7 @@ msgstr ""
 "\"0\"/> <placeholder type=\"programlisting\" id=\"1\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:103
+#: apt_preferences.5.xml:97
 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:"
@@ -5078,12 +5079,12 @@ msgstr ""
 "do ustawiania priorytetów wersjom pakietu. Przypisuje:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:108
+#: apt_preferences.5.xml:102
 msgid "priority 1"
 msgstr "priorytet 1"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:109
+#: apt_preferences.5.xml:103
 msgid ""
 "to the versions coming from archives which in their <filename>Release</"
 "filename> files are marked as \"NotAutomatic: yes\" but <emphasis>not</"
@@ -5096,12 +5097,12 @@ msgstr ""
 "<literal>experimental</literal> Debiana."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:115
+#: apt_preferences.5.xml:109
 msgid "priority 100"
 msgstr "priorytet 100"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:116
+#: apt_preferences.5.xml:110
 msgid ""
 "to the version that is already installed (if any) and to the versions coming "
 "from archives which in their <filename>Release</filename> files are marked "
@@ -5115,30 +5116,30 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:123
+#: apt_preferences.5.xml:117
 msgid "priority 500"
 msgstr "priorytet 500"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:124
+#: apt_preferences.5.xml:118
 msgid ""
 "to the versions that are not installed and do not belong to the target "
 "release."
 msgstr "wersjom niezainstalowanym i nienależącym do wydania docelowego."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:128
+#: apt_preferences.5.xml:122
 msgid "priority 990"
 msgstr "priorytet 990"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:129
+#: apt_preferences.5.xml:123
 msgid ""
 "to the versions that are not installed and belong to the target release."
 msgstr "wersjom niezainstalowanym i należącym do wydania docelowego."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:134
+#: apt_preferences.5.xml:128
 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 "
@@ -5155,7 +5156,7 @@ msgstr ""
 "100, jeśli dodatkowo są  oznaczone jako \"ButAutomaticUpgrades: yes\"."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:141
+#: apt_preferences.5.xml:135
 msgid ""
 "APT then applies the following rules, listed in order of precedence, to "
 "determine which version of a package to install."
@@ -5164,7 +5165,7 @@ msgstr ""
 "następujące reguły wymienione w kolejności, w jakiej są stosowane."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:144
+#: apt_preferences.5.xml:138
 msgid ""
 "Never downgrade unless the priority of an available version exceeds 1000.  "
 "(\"Downgrading\" is installing a less recent version of a package in place "
@@ -5179,12 +5180,12 @@ msgstr ""
 "Instalowanie wcześniejszych wersji pakietów może być ryzykowną operacją)."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:150
+#: apt_preferences.5.xml:144
 msgid "Install the highest priority version."
 msgstr "Instaluje wersję o najwyższym priorytecie."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:151
+#: apt_preferences.5.xml:145
 msgid ""
 "If two or more versions have the same priority, install the most recent one "
 "(that is, the one with the higher version number)."
@@ -5193,7 +5194,7 @@ msgstr ""
 "wersja nowsza (czyli z większym numerem wersji)."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:154
+#: apt_preferences.5.xml:148
 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 <literal>--reinstall</"
@@ -5205,7 +5206,7 @@ msgstr ""
 "niezainstalowany."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:160
+#: apt_preferences.5.xml:154
 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 "
@@ -5220,7 +5221,7 @@ msgstr ""
 "upgrade</command> zaktualizują ten pakiet."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:167
+#: apt_preferences.5.xml:161
 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 "
@@ -5234,7 +5235,7 @@ msgstr ""
 "wersją."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:172
+#: apt_preferences.5.xml:166
 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 "
@@ -5252,12 +5253,12 @@ msgstr ""
 "wersji ma większy priorytet niż wersja zainstalowana."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:181
+#: apt_preferences.5.xml:175
 msgid "The Effect of APT Preferences"
 msgstr "Efekt stosowania preferencji APT"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:183
+#: apt_preferences.5.xml:177
 msgid ""
 "The APT preferences file allows the system administrator to control the "
 "assignment of priorities.  The file consists of one or more multi-line "
@@ -5270,7 +5271,7 @@ msgstr ""
 "przyjmować jedną z dwóch postaci: szczegółową i ogólną."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:189
+#: apt_preferences.5.xml:183
 msgid ""
 "The specific form assigns a priority (a \"Pin-Priority\") to one or more "
 "specified packages with a specified version or version range.  For example, "
@@ -5287,7 +5288,7 @@ msgstr ""
 "rozdzielając je od siebie spacjami."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:196
+#: apt_preferences.5.xml:190
 #, no-wrap
 msgid ""
 "Package: perl\n"
@@ -5299,7 +5300,7 @@ msgstr ""
 "Pin-Priority: 1001\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:202
+#: apt_preferences.5.xml:196
 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 "
@@ -5313,7 +5314,7 @@ msgstr ""
 "strony internetowej identyfikowanej przez pełną nazwę domenową strony."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:208
+#: apt_preferences.5.xml:202
 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 "
@@ -5324,7 +5325,7 @@ msgstr ""
 "wszystkim wersjom pakietów dostępnych na lokalnym komputerze."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:213
+#: apt_preferences.5.xml:207
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -5336,7 +5337,7 @@ msgstr ""
 "Pin-Priority: 999\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:218
+#: apt_preferences.5.xml:212
 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 "
@@ -5349,7 +5350,7 @@ msgstr ""
 "identyfikowanym przez nazwę komputera \"ftp.de.debian.org\"."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:222
+#: apt_preferences.5.xml:216
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -5361,7 +5362,7 @@ msgstr ""
 "Pin-Priority: 999\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:226
+#: apt_preferences.5.xml:220
 msgid ""
 "This should <emphasis>not</emphasis> be confused with the Origin of a "
 "distribution as specified in a <filename>Release</filename> file.  What "
@@ -5376,7 +5377,7 @@ msgstr ""
 "lub \"Ximian\"."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:231
+#: apt_preferences.5.xml:225
 msgid ""
 "The following record assigns a low priority to all package versions "
 "belonging to any distribution whose Archive name is \"<literal>unstable</"
@@ -5387,7 +5388,7 @@ msgstr ""
 "\"<literal>unstable</literal>\"."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:235
+#: apt_preferences.5.xml:229
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -5399,7 +5400,7 @@ msgstr ""
 "Pin-Priority: 50\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:240
+#: apt_preferences.5.xml:234
 msgid ""
 "The following record assigns a high priority to all package versions "
 "belonging to any distribution whose Codename is \"<literal>&testing-codename;"
@@ -5410,7 +5411,7 @@ msgstr ""
 "\"<literal>&testing-codename;</literal>\"."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:244
+#: apt_preferences.5.xml:238
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -5422,7 +5423,7 @@ msgstr ""
 "Pin-Priority: 900\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:249
+#: apt_preferences.5.xml:243
 msgid ""
 "The following record assigns a high priority to all package versions "
 "belonging to any release whose Archive name is \"<literal>stable</literal>\" "
@@ -5435,7 +5436,7 @@ msgstr ""
 "\"<literal>&stable-version;</literal>\"."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:254
+#: apt_preferences.5.xml:248
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -5447,12 +5448,12 @@ msgstr ""
 "Pin-Priority: 500\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:264
+#: apt_preferences.5.xml:258
 msgid "Regular expressions and &glob; syntax"
 msgstr "Składnia wyrażeń regularnych i &glob;"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:266
+#: apt_preferences.5.xml:260
 msgid ""
 "APT also supports pinning by &glob; expressions, and regular expressions "
 "surrounded by slashes. For example, the following example assigns the "
@@ -5468,7 +5469,7 @@ msgstr ""
 "POSIX otoczone ukośnikami)."
 
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:275
+#: apt_preferences.5.xml:269
 #, no-wrap
 msgid ""
 "Package: gnome* /kde/\n"
@@ -5480,7 +5481,7 @@ msgstr ""
 "Pin-Priority: 500\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:281
+#: apt_preferences.5.xml:275
 msgid ""
 "The rule for those expressions is that they can occur anywhere where a "
 "string can occur. Thus, the following pin assigns the priority 990 to all "
@@ -5491,7 +5492,7 @@ msgstr ""
 "pakietom z wydania o nazwie zaczynającej się od &ubuntu-codename;."
 
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:287
+#: apt_preferences.5.xml:281
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -5503,7 +5504,7 @@ msgstr ""
 "Pin-Priority: 990\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:293
+#: apt_preferences.5.xml:287
 msgid ""
 "If a regular expression occurs in a <literal>Package</literal> field, the "
 "behavior is the same as if this regular expression were replaced with a list "
@@ -5522,12 +5523,12 @@ msgstr ""
 "<literal>Package</literal> nie jest uznawany za wyrażenie &glob;."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:309
+#: apt_preferences.5.xml:303
 msgid "How APT Interprets Priorities"
 msgstr "Jak APT interpretuje priorytety"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:312
+#: apt_preferences.5.xml:306
 msgid ""
 "Priorities (P) assigned in the APT preferences file must be positive or "
 "negative integers.  They are interpreted as follows (roughly speaking):"
@@ -5537,12 +5538,12 @@ msgstr ""
 "rzecz biorąc):"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:317
+#: apt_preferences.5.xml:311
 msgid "P &gt;= 1000"
 msgstr "P &gt;= 1000"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:318
+#: apt_preferences.5.xml:312
 msgid ""
 "causes a version to be installed even if this constitutes a downgrade of the "
 "package"
@@ -5551,12 +5552,12 @@ msgstr ""
 "zastąpienie pakietu jego wcześniejszą wersją."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:322
+#: apt_preferences.5.xml:316
 msgid "990 &lt;= P &lt; 1000"
 msgstr "990 &lt;= P &lt; 1000"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:323
+#: apt_preferences.5.xml:317
 msgid ""
 "causes a version to be installed even if it does not come from the target "
 "release, unless the installed version is more recent"
@@ -5565,12 +5566,12 @@ msgstr ""
 "wydania docelowego, chyba że zainstalowana wersja jest nowsza."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:328
+#: apt_preferences.5.xml:322
 msgid "500 &lt;= P &lt; 990"
 msgstr "500 &lt;= P &lt; 990"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:329
+#: apt_preferences.5.xml:323
 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"
@@ -5580,12 +5581,12 @@ msgstr ""
 "zainstalowana."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:334
+#: apt_preferences.5.xml:328
 msgid "100 &lt;= P &lt; 500"
 msgstr "100 &lt;= P &lt; 500"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:335
+#: apt_preferences.5.xml:329
 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"
@@ -5594,12 +5595,12 @@ msgstr ""
 "należąca do innej dystrybucji lub nowsza wersja jest zainstalowana"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:340
+#: apt_preferences.5.xml:334
 msgid "0 &lt; P &lt; 100"
 msgstr "0 &lt; P &lt; 100"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:341
+#: apt_preferences.5.xml:335
 msgid ""
 "causes a version to be installed only if there is no installed version of "
 "the package"
@@ -5608,17 +5609,17 @@ msgstr ""
 "pakietu nie jest jeszcze zainstalowana"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:345
+#: apt_preferences.5.xml:339
 msgid "P &lt; 0"
 msgstr "P &lt; 0"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:346
+#: apt_preferences.5.xml:340
 msgid "prevents the version from being installed"
 msgstr "zapobiega instalowaniu wersji"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:351
+#: apt_preferences.5.xml:345
 msgid ""
 "If any specific-form records match an available package version then the "
 "first such record determines the priority of the package version.  Failing "
@@ -5632,7 +5633,7 @@ msgstr ""
 "określany na podstawie pierwszego z takich rekordów."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:357
+#: apt_preferences.5.xml:351
 msgid ""
 "For example, suppose the APT preferences file contains the three records "
 "presented earlier:"
@@ -5641,7 +5642,7 @@ msgstr ""
 "wcześniej rekordy:"
 
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:361
+#: apt_preferences.5.xml:355
 #, no-wrap
 msgid ""
 "Package: perl\n"
@@ -5669,12 +5670,12 @@ msgstr ""
 "Pin-Priority: 50\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:374
+#: apt_preferences.5.xml:368
 msgid "Then:"
 msgstr "Wtedy:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:376
+#: apt_preferences.5.xml:370
 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 "
@@ -5690,7 +5691,7 @@ msgstr ""
 "&good-perl;*."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:381
+#: apt_preferences.5.xml:375
 msgid ""
 "A version of any package other than <literal>perl</literal> that is "
 "available from the local system has priority over other versions, even "
@@ -5701,7 +5702,7 @@ msgstr ""
 "pakietu, włączając w to wersję należącą do wydania docelowego."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:385
+#: apt_preferences.5.xml:379
 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 <literal>unstable</"
@@ -5715,12 +5716,12 @@ msgstr ""
 "nie jest jeszcze zainstalowana."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:395
+#: apt_preferences.5.xml:389
 msgid "Determination of Package Version and Distribution Properties"
 msgstr "Określanie wersji pakietu i właściwości dystrybucji"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:397
+#: apt_preferences.5.xml:391
 msgid ""
 "The locations listed in the &sources-list; file should provide "
 "<filename>Packages</filename> and <filename>Release</filename> files to "
@@ -5731,7 +5732,7 @@ msgstr ""
 "pakiety dostępne w danej lokalizacji."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:401
+#: apt_preferences.5.xml:395
 msgid ""
 "The <filename>Packages</filename> file is normally found in the directory "
 "<filename>.../dists/<replaceable>dist-name</replaceable>/"
@@ -5750,27 +5751,27 @@ msgstr ""
 "priorytetów APT bierze pod uwagę tylko dwie linie z każdego rekordu:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:409
+#: apt_preferences.5.xml:403
 msgid "the <literal>Package:</literal> line"
 msgstr "linia <literal>Package:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:410
+#: apt_preferences.5.xml:404
 msgid "gives the package name"
 msgstr "podaje nazwę pakietu"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:413 apt_preferences.5.xml:463
+#: apt_preferences.5.xml:407 apt_preferences.5.xml:457
 msgid "the <literal>Version:</literal> line"
 msgstr "linia <literal>Version:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:414
+#: apt_preferences.5.xml:408
 msgid "gives the version number for the named package"
 msgstr "podaje numer wersji danego pakietu"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:419
+#: apt_preferences.5.xml:413
 msgid ""
 "The <filename>Release</filename> file is normally found in the directory "
 "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
@@ -5793,12 +5794,12 @@ msgstr ""
 "priorytetów APT:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:430
+#: apt_preferences.5.xml:424
 msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
 msgstr "linia <literal>Archive:</literal> lub <literal>Suite:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:431
+#: apt_preferences.5.xml:425
 msgid ""
 "names the archive to which all the packages in the directory tree belong.  "
 "For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@ -5815,18 +5816,18 @@ msgstr ""
 "następujący sposób:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:441
+#: apt_preferences.5.xml:435
 #, no-wrap
 msgid "Pin: release a=stable\n"
 msgstr "Pin: release a=stable\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:447
+#: apt_preferences.5.xml:441
 msgid "the <literal>Codename:</literal> line"
 msgstr "linia <literal>Codename:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:448
+#: apt_preferences.5.xml:442
 msgid ""
 "names the codename to which all the packages in the directory tree belong.  "
 "For example, the line \"Codename: &testing-codename;\" specifies that all of "
@@ -5843,13 +5844,13 @@ msgstr ""
 "następujący sposób:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:457
+#: apt_preferences.5.xml:451
 #, no-wrap
 msgid "Pin: release n=&testing-codename;\n"
 msgstr "Pin: release n=&testing-codename;\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:464
+#: apt_preferences.5.xml:458
 msgid ""
 "names the release version.  For example, the packages in the tree might "
 "belong to Debian release version &stable-version;.  Note that there is "
@@ -5866,7 +5867,7 @@ msgstr ""
 "sposób:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:473
+#: apt_preferences.5.xml:467
 #, no-wrap
 msgid ""
 "Pin: release v=&stable-version;\n"
@@ -5878,12 +5879,12 @@ msgstr ""
 "Pin: release &stable-version;\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:482
+#: apt_preferences.5.xml:476
 msgid "the <literal>Component:</literal> line"
 msgstr "linia <literal>Component:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:483
+#: apt_preferences.5.xml:477
 msgid ""
 "names the licensing component associated with the packages in the directory "
 "tree of the <filename>Release</filename> file.  For example, the line "
@@ -5901,18 +5902,18 @@ msgstr ""
 "następujący sposób:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:492
+#: apt_preferences.5.xml:486
 #, no-wrap
 msgid "Pin: release c=main\n"
 msgstr "Pin: release c=main\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:498
+#: apt_preferences.5.xml:492
 msgid "the <literal>Origin:</literal> line"
 msgstr "linia <literal>Origin:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:499
+#: apt_preferences.5.xml:493
 msgid ""
 "names the originator of the packages in the directory tree of the "
 "<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"
@@ -5924,18 +5925,18 @@ msgstr ""
 "można podać w pliku preferencji APT w następujący sposób:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:505
+#: apt_preferences.5.xml:499
 #, no-wrap
 msgid "Pin: release o=Debian\n"
 msgstr "Pin: release o=Debian\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:511
+#: apt_preferences.5.xml:505
 msgid "the <literal>Label:</literal> line"
 msgstr "linia <literal>Label:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:512
+#: apt_preferences.5.xml:506
 msgid ""
 "names the label of the packages in the directory tree of the "
 "<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"
@@ -5947,13 +5948,13 @@ msgstr ""
 "podać w pliku preferencji APT w następujący sposób:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:518
+#: apt_preferences.5.xml:512
 #, no-wrap
 msgid "Pin: release l=Debian\n"
 msgstr "Pin: release l=Debian\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:525
+#: apt_preferences.5.xml:519
 msgid ""
 "All of the <filename>Packages</filename> and <filename>Release</filename> "
 "files retrieved from locations listed in the &sources-list; file are stored "
@@ -5978,12 +5979,12 @@ msgstr ""
 "dystrybucji <literal>unstable</literal> ."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:538
+#: apt_preferences.5.xml:532
 msgid "Optional Lines in an APT Preferences Record"
 msgstr "Opcjonalne linie w rekordzie preferencji APT"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:540
+#: apt_preferences.5.xml:534
 msgid ""
 "Each record in the APT preferences file can optionally begin with one or "
 "more lines beginning with the word <literal>Explanation:</literal>.  This "
@@ -5994,12 +5995,12 @@ msgstr ""
 "literal> (tj. objaśnienie). Pozwala to na dodawanie komentarzy do rekordów."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:549
+#: apt_preferences.5.xml:543
 msgid "Tracking Stable"
 msgstr "Śledzenie dystrybucji stabilnej"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:557
+#: apt_preferences.5.xml:551
 #, no-wrap
 msgid ""
 "Explanation: Uninstall or do not install any Debian-originated\n"
@@ -6023,7 +6024,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:551
+#: apt_preferences.5.xml:545
 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 "
@@ -6038,8 +6039,8 @@ msgstr ""
 "type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:574 apt_preferences.5.xml:620
-#: apt_preferences.5.xml:678
+#: apt_preferences.5.xml:568 apt_preferences.5.xml:614
+#: apt_preferences.5.xml:672
 #, no-wrap
 msgid ""
 "apt-get install <replaceable>package-name</replaceable>\n"
@@ -6051,7 +6052,7 @@ msgstr ""
 "apt-get dist-upgrade\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:569
+#: apt_preferences.5.xml:563
 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 "
@@ -6064,13 +6065,13 @@ msgstr ""
 "type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:586
+#: apt_preferences.5.xml:580
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/testing\n"
 msgstr "apt-get install <replaceable>pakiet</replaceable>/testing\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:580
+#: apt_preferences.5.xml:574
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>testing</literal> distribution; the package "
@@ -6083,12 +6084,12 @@ msgstr ""
 "<placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:592
+#: apt_preferences.5.xml:586
 msgid "Tracking Testing or Unstable"
 msgstr "Śledzenie dystrybucji testowej lub niestabilnej"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:601
+#: apt_preferences.5.xml:595
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -6116,7 +6117,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:594
+#: apt_preferences.5.xml:588
 msgid ""
 "The following APT preferences file will cause APT to assign a high priority "
 "to package versions from the <literal>testing</literal> distribution, a "
@@ -6133,7 +6134,7 @@ msgstr ""
 "id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:615
+#: apt_preferences.5.xml:609
 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 "
@@ -6146,13 +6147,13 @@ msgstr ""
 "type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:635
+#: apt_preferences.5.xml:629
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
 msgstr "apt-get install <replaceable>pakiet</replaceable>/unstable\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:626
+#: apt_preferences.5.xml:620
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>unstable</literal> distribution.  "
@@ -6172,12 +6173,12 @@ msgstr ""
 "\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:642
+#: apt_preferences.5.xml:636
 msgid "Tracking the evolution of a codename release"
 msgstr "Śledzenie ewolucji wydania o danej nazwie kodowej"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:656
+#: apt_preferences.5.xml:650
 #, no-wrap
 msgid ""
 "Explanation: Uninstall or do not install any Debian-originated package versions\n"
@@ -6211,7 +6212,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:644
+#: apt_preferences.5.xml:638
 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 "
@@ -6237,7 +6238,7 @@ msgstr ""
 "\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:673
+#: apt_preferences.5.xml:667
 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 "
@@ -6250,13 +6251,13 @@ msgstr ""
 "literal>. <placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:693
+#: apt_preferences.5.xml:687
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/sid\n"
 msgstr "apt-get install <replaceable>pakiet</replaceable>/sid\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:684
+#: apt_preferences.5.xml:678
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>sid</literal> distribution.  Thereafter, "
@@ -6276,17 +6277,17 @@ msgstr ""
 "id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:708
+#: apt_preferences.5.xml:702
 msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: sources.list.5.xml:35
+#: sources.list.5.xml:29
 msgid "List of configured APT data sources"
 msgstr "Lista skonfigurowanych źródeł danych APT"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:40
+#: sources.list.5.xml:34
 msgid ""
 "The source list <filename>/etc/apt/sources.list</filename> is designed to "
 "support any number of active sources and a variety of source media. The file "
@@ -6304,7 +6305,7 @@ msgstr ""
 "programu użytkowego będącego interfejsem do systemu APT)."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:47
+#: sources.list.5.xml:41
 msgid ""
 "Each line specifying a source starts with type (e.g. <literal>deb-src</"
 "literal>)  followed by options and arguments for this type.  Individual "
@@ -6319,12 +6320,12 @@ msgstr ""
 "dalsza część linii stanowi komentarz."
 
 #. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:55
+#: sources.list.5.xml:49
 msgid "sources.list.d"
 msgstr "sources.list.d"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:56
+#: sources.list.5.xml:50
 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 "
@@ -6346,12 +6347,12 @@ msgstr ""
 "wypisze odpowiedni komunikat."
 
 #. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:67
+#: sources.list.5.xml:61
 msgid "The deb and deb-src types"
 msgstr "Typy deb i deb-src"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:68
+#: sources.list.5.xml:62
 msgid ""
 "The <literal>deb</literal> type references a typical two-level Debian "
 "archive, <filename>distribution/component</filename>. The "
@@ -6377,7 +6378,7 @@ msgstr ""
 "źródłowych."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:79
+#: sources.list.5.xml:73
 msgid ""
 "The format for a <filename>sources.list</filename> entry using the "
 "<literal>deb</literal> and <literal>deb-src</literal> types is:"
@@ -6386,14 +6387,14 @@ msgstr ""
 "<literal>deb</literal> i <literal>deb-src</literal> jest następujący:"
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:82
+#: sources.list.5.xml:76
 #, fuzzy, no-wrap
 #| msgid "deb [ options ] uri distribution [component1] [component2] [...]"
 msgid "deb [ options ] uri suite [component1] [component2] [...]"
 msgstr "deb [ opcje ] uri dystrybucja [komponent1] [komponent2] [...]"
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:86
+#: sources.list.5.xml:80
 #, no-wrap
 msgid ""
 "     Types: deb deb-src\n"
@@ -6416,14 +6417,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:84
+#: sources.list.5.xml:78
 msgid ""
 "Alternatively a rfc822 style format is also supported: <placeholder type="
 "\"literallayout\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:105
+#: sources.list.5.xml:99
 #, fuzzy
 #| msgid ""
 #| "The URI for the <literal>deb</literal> type must specify the base of the "
@@ -6454,7 +6455,7 @@ msgstr ""
 "<literal>komponent</literal>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:114
+#: sources.list.5.xml:108
 #, fuzzy
 #| msgid ""
 #| "<literal>distribution</literal> may also contain a variable, <literal>"
@@ -6483,7 +6484,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:122
+#: sources.list.5.xml:116
 #, fuzzy
 #| msgid ""
 #| "Since only one distribution can be specified per line it may be necessary "
@@ -6524,7 +6525,7 @@ msgstr ""
 "sieciach o niskiej przepustowości łączy."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:136
+#: sources.list.5.xml:130
 msgid ""
 "<literal>options</literal> is always optional and needs to be surrounded by "
 "square brackets. It can consist of multiple settings in the form "
@@ -6541,7 +6542,7 @@ msgstr ""
 "wypisywania żadnego ostrzeżenia):"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:142
+#: sources.list.5.xml:136
 msgid ""
 "<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
 "replaceable>,…</literal> can be used to specify for which architectures "
@@ -6556,7 +6557,7 @@ msgstr ""
 "w opcji konfiguracji <literal>APT::Architectures</literal>."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:146
+#: sources.list.5.xml:140
 #, fuzzy
 #| msgid ""
 #| "<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
@@ -6577,7 +6578,7 @@ msgstr ""
 "w opcji konfiguracji <literal>APT::Architectures</literal>."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:149
+#: sources.list.5.xml:143
 msgid ""
 "<literal>trusted=yes</literal> can be set to indicate that packages from "
 "this source are always authenticated even if the <filename>Release</"
@@ -6595,7 +6596,7 @@ msgstr ""
 "niezautentykowane."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:156
+#: sources.list.5.xml:150
 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 "
@@ -6609,12 +6610,12 @@ msgstr ""
 "komputerami w Internecie)."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:161
+#: sources.list.5.xml:155
 msgid "Some examples:"
 msgstr "Kilka przykładów:"
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:163
+#: sources.list.5.xml:157
 #, no-wrap
 msgid ""
 "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
@@ -6626,17 +6627,17 @@ msgstr ""
 "   "
 
 #. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:169
+#: sources.list.5.xml:163
 msgid "URI specification"
 msgstr "Określanie URI"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:171
+#: sources.list.5.xml:165
 msgid "The currently recognized URI types are:"
 msgstr "Obecnie rozpoznawane są następujące typy URI:"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:175
+#: sources.list.5.xml:169
 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 "
@@ -6647,7 +6648,7 @@ msgstr ""
 "archiwów."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:182
+#: sources.list.5.xml:176
 msgid ""
 "The cdrom scheme allows APT to use a local CD-ROM drive with media swapping. "
 "Use the &apt-cdrom; program to create cdrom entries in the source list."
@@ -6657,7 +6658,7 @@ msgstr ""
 "list."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:189
+#: sources.list.5.xml:183
 msgid ""
 "The http scheme specifies an HTTP server for the archive. If an environment "
 "variable <envar>http_proxy</envar> is set with the format http://server:"
@@ -6674,7 +6675,7 @@ msgstr ""
 "bezpieczny."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:200
+#: sources.list.5.xml:194
 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 page. "
@@ -6694,7 +6695,7 @@ msgstr ""
 "konfiguracyjnym serwery proxy  używające HTTP zostaną zignorowane."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:212
+#: sources.list.5.xml:206
 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.  "
@@ -6707,7 +6708,7 @@ msgstr ""
 "do skopiowania plików przy użyciu APT."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:219
+#: sources.list.5.xml:213
 msgid ""
 "The rsh/ssh method invokes RSH/SSH to connect to a remote host and access "
 "the files as a given user. Prior configuration of rhosts or RSA keys is "
@@ -6721,12 +6722,12 @@ msgstr ""
 "przetransferowania plików ze zdalnego komputera."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:226
+#: sources.list.5.xml:220
 msgid "adding more recognizable URI types"
 msgstr "dodawanie innych rozpoznawanych typów URI"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:228
+#: sources.list.5.xml:222
 msgid ""
 "APT can be extended with more methods shipped in other optional packages, "
 "which should follow the naming scheme <package>apt-transport-"
@@ -6745,7 +6746,7 @@ msgstr ""
 "zobaczyć &apt-transport-debtorrent;."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:240
+#: sources.list.5.xml:234
 msgid ""
 "Uses the archive stored locally (or NFS mounted) at /home/jason/debian for "
 "stable/main, stable/contrib, and stable/non-free."
@@ -6754,36 +6755,36 @@ msgstr ""
 "debian dla zasobów stable/main, stable/contrib i stable/non-free."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:242
+#: sources.list.5.xml:236
 #, no-wrap
 msgid "deb file:/home/jason/debian stable main contrib non-free"
 msgstr "deb file:/home/jason/debian stable main contrib non-free"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:244
+#: sources.list.5.xml:238
 msgid "As above, except this uses the unstable (development) distribution."
 msgstr ""
 "Jak wyżej, z tą różnicą że używa dystrybucji niestabilnej (deweloperskiej)."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:245
+#: sources.list.5.xml:239
 #, no-wrap
 msgid "deb file:/home/jason/debian unstable main contrib non-free"
 msgstr "deb file:/home/jason/debian unstable main contrib non-free"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:247
+#: sources.list.5.xml:241
 msgid "Source line for the above"
 msgstr "Linie źródeł dla powyższego przykładu"
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:248
+#: sources.list.5.xml:242
 #, no-wrap
 msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
 msgstr "deb-src file:/home/jason/debian unstable main contrib non-free"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:250
+#: sources.list.5.xml:244
 msgid ""
 "The first line gets package information for the architectures in "
 "<literal>APT::Architectures</literal> while the second always retrieves "
@@ -6794,7 +6795,7 @@ msgstr ""
 "literal> i <literal>armel</literal>."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:252
+#: sources.list.5.xml:246
 #, no-wrap
 msgid ""
 "deb http://ftp.debian.org/debian &stable-codename; main\n"
@@ -6804,7 +6805,7 @@ msgstr ""
 "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:255
+#: sources.list.5.xml:249
 msgid ""
 "Uses HTTP to access the archive at archive.debian.org, and uses only the "
 "hamm/main area."
@@ -6813,13 +6814,13 @@ msgstr ""
 "org i dystrybucji hamm/main."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:257
+#: sources.list.5.xml:251
 #, no-wrap
 msgid "deb http://archive.debian.org/debian-archive hamm main"
 msgstr "deb http://archive.debian.org/debian-archive hamm main"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:259
+#: sources.list.5.xml:253
 msgid ""
 "Uses FTP to access the archive at ftp.debian.org, under the debian "
 "directory, and uses only the &stable-codename;/contrib area."
@@ -6828,13 +6829,13 @@ msgstr ""
 "katalogu debian i używa tylko dystrybucji &stable-codename;/contrib."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:261
+#: sources.list.5.xml:255
 #, no-wrap
 msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
 msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:263
+#: sources.list.5.xml:257
 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 "
@@ -6847,19 +6848,19 @@ msgstr ""
 "to pojedyncza sesja FTP będzie użyta w celu uzyskania dostępu do obu zasobów."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:267
+#: sources.list.5.xml:261
 #, no-wrap
 msgid "deb ftp://ftp.debian.org/debian unstable contrib"
 msgstr "deb ftp://ftp.debian.org/debian unstable contrib"
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:276
+#: sources.list.5.xml:270
 #, no-wrap
 msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
 msgstr "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:269
+#: sources.list.5.xml:263
 msgid ""
 "Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe "
 "directory, and uses only files found under <filename>unstable/binary-i386</"
@@ -6878,17 +6879,17 @@ msgstr ""
 "nie zawiera takiej struktury). <placeholder type=\"literallayout\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:281
+#: sources.list.5.xml:275
 msgid "&apt-cache; &apt-conf;"
 msgstr "&apt-cache;, &apt-conf;"
 
 #. type: Content of: <refentry><refmeta><manvolnum>
-#: apt-extracttemplates.1.xml:28 apt-sortpkgs.1.xml:28 apt-ftparchive.1.xml:28
+#: apt-extracttemplates.1.xml:22 apt-sortpkgs.1.xml:22 apt-ftparchive.1.xml:22
 msgid "1"
 msgstr "1"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-extracttemplates.1.xml:35
+#: apt-extracttemplates.1.xml:29
 msgid ""
 "Utility to extract <command>debconf</command> config and templates from "
 "Debian packages"
@@ -6897,7 +6898,7 @@ msgstr ""
 "<command>debconf</command>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:41
+#: apt-extracttemplates.1.xml:35
 msgid ""
 "<command>apt-extracttemplates</command> will take one or more Debian package "
 "files as input and write out (to a temporary directory) all associated "
@@ -6911,12 +6912,12 @@ msgstr ""
 "te skrypty i szablony, zostanie wypisana linia w następującym formacie:"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:46
+#: apt-extracttemplates.1.xml:40
 msgid "package version template-file config-script"
 msgstr "pakiet wersja plik-template skrypt-config"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:47
+#: apt-extracttemplates.1.xml:41
 msgid ""
 "template-file and config-script are written to the temporary directory "
 "specified by the <option>-t</option> or <option>--tempdir</option> "
@@ -6931,7 +6932,7 @@ msgstr ""
 "config.XXXXXX</filename>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-extracttemplates.1.xml:60
+#: apt-extracttemplates.1.xml:54
 msgid ""
 "Temporary directory in which to write extracted <command>debconf</command> "
 "template files and config scripts.  Configuration Item: <literal>APT::"
@@ -6943,7 +6944,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:77
+#: apt-extracttemplates.1.xml:71
 msgid ""
 "<command>apt-extracttemplates</command> returns zero on normal operation, "
 "decimal 100 on error."
@@ -6953,12 +6954,12 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-sortpkgs.1.xml:35
+#: apt-sortpkgs.1.xml:29
 msgid "Utility to sort package index files"
 msgstr "Narzędzie użytkowe do sortowania plików indeksu"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-sortpkgs.1.xml:41
+#: apt-sortpkgs.1.xml:35
 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 "
@@ -6970,7 +6971,7 @@ msgstr ""
 "zgodnie z wewnętrznymi zasadami sortowania."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-sortpkgs.1.xml:47
+#: apt-sortpkgs.1.xml:41
 msgid ""
 "All output is sent to standard output; the input must be a seekable file."
 msgstr ""
@@ -6979,7 +6980,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-sortpkgs.1.xml:56
+#: apt-sortpkgs.1.xml:50
 msgid ""
 "Use source index field ordering.  Configuration Item: <literal>APT::"
 "SortPkgs::Source</literal>."
@@ -6989,7 +6990,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><para>
-#: apt-sortpkgs.1.xml:70
+#: apt-sortpkgs.1.xml:64
 msgid ""
 "<command>apt-sortpkgs</command> returns zero on normal operation, decimal "
 "100 on error."
@@ -6998,12 +6999,12 @@ msgstr ""
 "100 - w przypadku błędu."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-ftparchive.1.xml:35
+#: apt-ftparchive.1.xml:29
 msgid "Utility to generate index files"
 msgstr "Narzędzie użytkowe do generowania plików indeksu"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:41
+#: apt-ftparchive.1.xml:35
 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 "
@@ -7016,7 +7017,7 @@ msgstr ""
 "on the content of that site."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:45
+#: apt-ftparchive.1.xml:39
 msgid ""
 "<command>apt-ftparchive</command> is a superset of the &dpkg-scanpackages; "
 "program, incorporating its entire functionality via the <literal>packages</"
@@ -7026,7 +7027,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:51
+#: apt-ftparchive.1.xml:45
 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 "
@@ -7036,7 +7037,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:62
+#: apt-ftparchive.1.xml:56
 msgid ""
 "The packages command generates a package file from a directory tree. It "
 "takes the given directory and recursively searches it for .deb files, "
@@ -7045,13 +7046,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:67 apt-ftparchive.1.xml:91
+#: apt-ftparchive.1.xml:61 apt-ftparchive.1.xml:85
 msgid ""
 "The option <option>--db</option> can be used to specify a binary caching DB."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:72
+#: apt-ftparchive.1.xml:66
 msgid ""
 "The <literal>sources</literal> command generates a source index file from a "
 "directory tree.  It takes the given directory and recursively searches it "
@@ -7060,7 +7061,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:77
+#: apt-ftparchive.1.xml:71
 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 "
@@ -7068,7 +7069,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:84
+#: apt-ftparchive.1.xml:78
 msgid ""
 "The <literal>contents</literal> command generates a contents file from a "
 "directory tree. It takes the given directory and recursively searches it "
@@ -7079,7 +7080,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:96
+#: apt-ftparchive.1.xml:90
 msgid ""
 "The <literal>release</literal> command generates a Release file from a "
 "directory tree. It recursively searches the given directory for uncompressed "
@@ -7094,7 +7095,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:106
+#: apt-ftparchive.1.xml:100
 msgid ""
 "Values for the additional metadata fields in the Release file are taken from "
 "the corresponding variables under <literal>APT::FTPArchive::Release</"
@@ -7107,7 +7108,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:119
+#: apt-ftparchive.1.xml:113
 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 "
@@ -7117,20 +7118,20 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:128
+#: apt-ftparchive.1.xml:122
 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:134
+#: apt-ftparchive.1.xml:128
 #, fuzzy
 msgid "The Generate Configuration"
 msgstr "Plik konfiguracyjny"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:136
+#: apt-ftparchive.1.xml:130
 msgid ""
 "The <literal>generate</literal> command uses a configuration file to "
 "describe the archives that are going to be generated. It follows the typical "
@@ -7141,20 +7142,20 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:144
+#: apt-ftparchive.1.xml:138
 msgid ""
 "The generate configuration has four separate sections, each described below."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:146
+#: apt-ftparchive.1.xml:140
 #, fuzzy
 #| msgid "the <literal>Origin:</literal> line"
 msgid "<literal>Dir</literal> Section"
 msgstr "linia <literal>Origin:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:148
+#: apt-ftparchive.1.xml:142
 msgid ""
 "The <literal>Dir</literal> section defines the standard directories needed "
 "to locate the files required during the generation process. These "
@@ -7163,7 +7164,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:155
+#: apt-ftparchive.1.xml:149
 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 "
@@ -7171,31 +7172,31 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:162
+#: apt-ftparchive.1.xml:156
 msgid "Specifies the location of the override files."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:167
+#: apt-ftparchive.1.xml:161
 msgid "Specifies the location of the cache files."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:172
+#: apt-ftparchive.1.xml:166
 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:178
+#: apt-ftparchive.1.xml:172
 #, fuzzy
 #| msgid "the <literal>Label:</literal> line"
 msgid "<literal>Default</literal> Section"
 msgstr "linia <literal>Label:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:180
+#: apt-ftparchive.1.xml:174
 msgid ""
 "The <literal>Default</literal> section specifies default values, and "
 "settings that control the operation of the generator. Other sections may "
@@ -7203,7 +7204,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:186
+#: apt-ftparchive.1.xml:180
 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 "
@@ -7212,42 +7213,42 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:194
+#: apt-ftparchive.1.xml:188
 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><listitem><para>
-#: apt-ftparchive.1.xml:200
+#: apt-ftparchive.1.xml:194
 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><listitem><para>
-#: apt-ftparchive.1.xml:206
+#: apt-ftparchive.1.xml:200
 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><listitem><para>
-#: apt-ftparchive.1.xml:212
+#: apt-ftparchive.1.xml:206
 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><listitem><para>
-#: apt-ftparchive.1.xml:218
+#: apt-ftparchive.1.xml:212
 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><listitem><para>
-#: apt-ftparchive.1.xml:224
+#: apt-ftparchive.1.xml:218
 msgid ""
 "Specifies the number of kilobytes to delink (and replace with hard links) "
 "per run. This is used in conjunction with the per-section <literal>External-"
@@ -7255,14 +7256,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:231
+#: apt-ftparchive.1.xml:225
 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><listitem><para>
-#: apt-ftparchive.1.xml:238 apt-ftparchive.1.xml:384
+#: apt-ftparchive.1.xml:232 apt-ftparchive.1.xml:378
 msgid ""
 "Specifies whether long descriptions should be included in the "
 "<filename>Packages</filename> file or split out into a master "
@@ -7270,14 +7271,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:244
+#: apt-ftparchive.1.xml:238
 #, fuzzy
 #| msgid "the <literal>Label:</literal> line"
 msgid "<literal>TreeDefault</literal> Section"
 msgstr "linia <literal>Label:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:246
+#: apt-ftparchive.1.xml:240
 msgid ""
 "Sets defaults specific to <literal>Tree</literal> sections. All of these "
 "variables are substitution variables and have the strings $(DIST), "
@@ -7285,7 +7286,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:253
+#: apt-ftparchive.1.xml:247
 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 will all "
@@ -7293,7 +7294,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:260
+#: apt-ftparchive.1.xml:254
 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 updated. "
@@ -7304,35 +7305,35 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:271
+#: apt-ftparchive.1.xml:265
 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><listitem><para>
-#: apt-ftparchive.1.xml:277
+#: apt-ftparchive.1.xml:271
 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><listitem><para>
-#: apt-ftparchive.1.xml:283
+#: apt-ftparchive.1.xml:277
 msgid ""
 "Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
 "binary-$(ARCH)/Packages</filename>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:289
+#: apt-ftparchive.1.xml:283
 msgid ""
 "Sets the output Sources file. Defaults to <filename>$(DIST)/$(SECTION)/"
 "source/Sources</filename>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:295
+#: apt-ftparchive.1.xml:289
 msgid ""
 "Sets the output Translation-en master file with the long descriptions if "
 "they should be not included in the Packages file. Defaults to <filename>"
@@ -7340,7 +7341,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:302
+#: apt-ftparchive.1.xml:296
 msgid ""
 "Sets the path prefix that causes a symlink to be considered an internal link "
 "instead of an external link. Defaults to <filename>$(DIST)/$(SECTION)/</"
@@ -7348,7 +7349,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:309
+#: apt-ftparchive.1.xml:303
 msgid ""
 "Sets the output Contents file. Defaults to <filename>$(DIST)/$(SECTION)/"
 "Contents-$(ARCH)</filename>. If this setting causes multiple Packages files "
@@ -7358,19 +7359,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:318
+#: apt-ftparchive.1.xml:312
 msgid "Sets header file to prepend to the contents output."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:323
+#: apt-ftparchive.1.xml:317
 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><listitem><para>
-#: apt-ftparchive.1.xml:329
+#: apt-ftparchive.1.xml:323
 msgid ""
 "Specifies that instead of walking the directory tree, <command>apt-"
 "ftparchive</command> should read the list of files from the given file. "
@@ -7378,7 +7379,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:336
+#: apt-ftparchive.1.xml:330
 msgid ""
 "Specifies that instead of walking the directory tree, <command>apt-"
 "ftparchive</command> should read the list of files from the given file. "
@@ -7387,14 +7388,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:344
+#: apt-ftparchive.1.xml:338
 #, fuzzy
 #| msgid "the <literal>Label:</literal> line"
 msgid "<literal>Tree</literal> Section"
 msgstr "linia <literal>Label:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:346
+#: apt-ftparchive.1.xml:340
 msgid ""
 "The <literal>Tree</literal> section defines a standard Debian file tree "
 "which consists of a base directory, then multiple sections in that base "
@@ -7404,7 +7405,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:351
+#: apt-ftparchive.1.xml:345
 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 "
@@ -7413,7 +7414,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:356
+#: apt-ftparchive.1.xml:350
 msgid ""
 "All of the settings defined in the <literal>TreeDefault</literal> section "
 "can be used in a <literal>Tree</literal> section as well as three new "
@@ -7421,7 +7422,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt-ftparchive.1.xml:362
+#: apt-ftparchive.1.xml:356
 #, no-wrap
 msgid ""
 "for i in Sections do \n"
@@ -7435,7 +7436,7 @@ msgstr ""
 "     "
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:359
+#: apt-ftparchive.1.xml:353
 msgid ""
 "When processing a <literal>Tree</literal> section <command>apt-ftparchive</"
 "command> performs an operation similar to: <placeholder type=\"programlisting"
@@ -7443,7 +7444,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:370
+#: apt-ftparchive.1.xml:364
 msgid ""
 "This is a space separated list of sections which appear under the "
 "distribution; typically this is something like <literal>main contrib non-"
@@ -7451,7 +7452,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:377
+#: apt-ftparchive.1.xml:371
 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 "
@@ -7459,38 +7460,38 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:390
+#: apt-ftparchive.1.xml:384
 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><listitem><para>
-#: apt-ftparchive.1.xml:396
+#: apt-ftparchive.1.xml:390
 msgid ""
 "Sets the source override file. The override file contains section "
 "information."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:402 apt-ftparchive.1.xml:448
+#: apt-ftparchive.1.xml:396 apt-ftparchive.1.xml:442
 msgid "Sets the binary extra override file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:407 apt-ftparchive.1.xml:453
+#: apt-ftparchive.1.xml:401 apt-ftparchive.1.xml:447
 msgid "Sets the source extra override file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:412
+#: apt-ftparchive.1.xml:406
 #, fuzzy
 #| msgid "the <literal>Component:</literal> line"
 msgid "<literal>BinDirectory</literal> Section"
 msgstr "linia <literal>Component:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:414
+#: apt-ftparchive.1.xml:408
 msgid ""
 "The <literal>bindirectory</literal> section defines a binary directory tree "
 "with no special structure. The scope tag specifies the location of the "
@@ -7500,55 +7501,55 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:422
+#: apt-ftparchive.1.xml:416
 msgid "Sets the Packages file output."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:427
+#: apt-ftparchive.1.xml:421
 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:433
+#: apt-ftparchive.1.xml:427
 msgid "Sets the Contents file output (optional)."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:438
+#: apt-ftparchive.1.xml:432
 msgid "Sets the binary override file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:443
+#: apt-ftparchive.1.xml:437
 msgid "Sets the source override file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:458
+#: apt-ftparchive.1.xml:452
 msgid "Sets the cache DB."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:463
+#: apt-ftparchive.1.xml:457
 msgid "Appends a path to all the output paths."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:468
+#: apt-ftparchive.1.xml:462
 msgid "Specifies the file list file."
 msgstr "Określa plik zawierający listę plików."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:475
+#: apt-ftparchive.1.xml:469
 #, fuzzy
 msgid "The Binary Override File"
 msgstr "Wprowadzenie"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:476
+#: apt-ftparchive.1.xml:470
 msgid ""
 "The binary override file is fully compatible with &dpkg-scanpackages;. It "
 "contains four fields separated by spaces. The first field is the package "
@@ -7558,19 +7559,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:482
+#: apt-ftparchive.1.xml:476
 #, no-wrap
 msgid "old [// oldn]* => new"
 msgstr "old [// oldn]* => new"
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:484
+#: apt-ftparchive.1.xml:478
 #, no-wrap
 msgid "new"
 msgstr "new"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:481
+#: apt-ftparchive.1.xml:475
 msgid ""
 "The general form of the maintainer field is: <placeholder type="
 "\"literallayout\" id=\"0\"/> or simply, <placeholder type=\"literallayout\" "
@@ -7581,13 +7582,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:492
+#: apt-ftparchive.1.xml:486
 #, fuzzy
 msgid "The Source Override File"
 msgstr "Wprowadzenie"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:494
+#: apt-ftparchive.1.xml:488
 msgid ""
 "The source override file is fully compatible with &dpkg-scansources;. It "
 "contains two fields separated by spaces. The first field is the source "
@@ -7595,12 +7596,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:499
+#: apt-ftparchive.1.xml:493
 msgid "The Extra Override File"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:501
+#: apt-ftparchive.1.xml:495
 msgid ""
 "The extra override file allows any arbitrary tag to be added or replaced in "
 "the output. It has three columns, the first is the package, the second is "
@@ -7608,7 +7609,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:512
+#: apt-ftparchive.1.xml:506
 msgid ""
 "Generate the given checksum. These options default to on, when turned off "
 "the generated index files will not have the checksum fields where possible.  "
@@ -7623,7 +7624,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:523
+#: apt-ftparchive.1.xml:517
 #, fuzzy
 msgid ""
 "Use a binary caching DB. This has no effect on the generate command.  "
@@ -7634,7 +7635,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:529
+#: apt-ftparchive.1.xml:523
 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 "
@@ -7649,7 +7650,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:537
+#: apt-ftparchive.1.xml:531
 #, fuzzy
 msgid ""
 "Perform Delinking. If the <literal>External-Links</literal> setting is used "
@@ -7663,7 +7664,7 @@ msgstr ""
 "<literal>APT::Cache::Generate</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:545
+#: apt-ftparchive.1.xml:539
 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 "
@@ -7674,7 +7675,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:555
+#: apt-ftparchive.1.xml:549
 #, fuzzy
 msgid ""
 "Select the source override file to use with the <literal>sources</literal> "
@@ -7687,7 +7688,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:561
+#: apt-ftparchive.1.xml:555
 #, fuzzy
 msgid ""
 "Make the caching databases read only.  Configuration Item: <literal>APT::"
@@ -7697,7 +7698,7 @@ msgstr ""
 "pliku konfiguracyjnym: <literal>APT::Cache::NamesOnly</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:566
+#: apt-ftparchive.1.xml:560
 #, fuzzy
 #| msgid ""
 #| "If the command is either <literal>install</literal> or <literal>remove</"
@@ -7717,7 +7718,7 @@ msgstr ""
 "AutomaticRemove</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:574
+#: apt-ftparchive.1.xml:568
 msgid ""
 "&apt-ftparchive; caches as much as possible of metadata in a cachedb. If "
 "packages are recompiled and/or republished with the same version again, this "
@@ -7731,7 +7732,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:586
+#: apt-ftparchive.1.xml:580
 msgid ""
 "This configuration option defaults to \"<literal>true</literal>\" and should "
 "only be set to <literal>\"false\"</literal> if the Archive generated with "
@@ -7741,13 +7742,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><programlisting>
-#: apt-ftparchive.1.xml:604
+#: apt-ftparchive.1.xml:598
 #, no-wrap
 msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
 msgstr "<command>apt-ftparchive</command> packages <replaceable>katalog</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:600
+#: apt-ftparchive.1.xml:594
 msgid ""
 "To create a compressed Packages file for a directory containing binary "
 "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
@@ -7755,7 +7756,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:614
+#: apt-ftparchive.1.xml:608
 msgid ""
 "<command>apt-ftparchive</command> returns zero on normal operation, decimal "
 "100 on error."
@@ -7763,34 +7764,51 @@ msgstr ""
 "<command>apt-ftparchive</command> zwraca zero, gdy zakończyło się pomyślnie, "
 "100 - w przypadku błędu."
 
-#. type: <title></title>
-#: guide.sgml:4
+#. type: Attribute 'lang' of: <book>
+#: guide.dbk:9 offline.dbk:9
+msgid "en"
+msgstr "pl"
+
+#. type: Content of: <book><title>
+#: guide.dbk:11
 msgid "APT User's Guide"
 msgstr "Podręcznik użytkownika APT"
 
-#. type: <author></author>
-#: guide.sgml:6 offline.sgml:6
-msgid "<name>Jason Gunthorpe </name><email>jgg@debian.org</email>"
-msgstr "<name>Jason Gunthorpe </name><email>jgg@debian.org</email>"
+#. type: Content of: <book><bookinfo><authorgroup><author><personname>
+#: guide.dbk:17 offline.dbk:17
+msgid "Jason Gunthorpe"
+msgstr "Jason Gunthorpe"
 
-#. type: <version></version>
-#: guide.sgml:7
-msgid "$Id: guide.sgml,v 1.7 2003/04/26 23:26:13 doogie Exp $"
-msgstr "$Id: guide.sgml,v 1.7 2003/04/26 23:26:13 doogie Exp $"
+#. type: Content of: <book><bookinfo><authorgroup><author><email>
+#: guide.dbk:17 offline.dbk:17
+msgid "jgg@debian.org"
+msgstr "jgg@debian.org"
 
-#. type: <abstract></abstract>
-#: guide.sgml:11
+#. type: Content of: <book><bookinfo><releaseinfo>
+#: guide.dbk:21 offline.dbk:21
+msgid "Version &apt-product-version;"
+msgstr ""
+
+#. type: Content of: <book><bookinfo><abstract><para>
+#: guide.dbk:25
 msgid ""
 "This document provides an overview of how to use the the APT package manager."
 msgstr "Dokument zawiera opis używania menadżera pakietów APT."
 
-#. type: <copyrightsummary></copyrightsummary>
-#: guide.sgml:15
-msgid "Copyright &copy; Jason Gunthorpe, 1998."
-msgstr "Copyright &copy; Jason Gunthorpe, 1998."
+#. type: Content of: <book><bookinfo>
+#: guide.dbk:29
+msgid ""
+"<copyright><year>1998</year><holder>Jason Gunthorpe</holder></copyright>"
+msgstr ""
+"<copyright><year>1998</year><holder>Jason Gunthorpe</holder></copyright>"
+
+#. type: Content of: <book><bookinfo><legalnotice><title>
+#: guide.dbk:32 offline.dbk:33
+msgid "License Notice"
+msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:21 offline.sgml:22
+#. type: Content of: <book><bookinfo><legalnotice><para>
+#: guide.dbk:34 offline.dbk:35
 msgid ""
 "\"APT\" and this document are free software; you can redistribute them and/"
 "or modify them under the terms of the GNU General Public License as "
@@ -7803,8 +7821,8 @@ msgstr ""
 "\" (GNU General Public License) publikowanej przez \"Fundację Wolnego "
 "Oprogramowania (Free Software Foundation)."
 
-#. type: <p></p>
-#: guide.sgml:24 offline.sgml:25
+#. type: Content of: <book><bookinfo><legalnotice><para>
+#: guide.dbk:43 offline.dbk:41
 msgid ""
 "For more details, on Debian systems, see the file /usr/share/common-licenses/"
 "GPL for the full license."
@@ -7812,31 +7830,31 @@ msgstr ""
 "Więcej szczegółów można uzyskać, przeglądając plik zawierający pełen tekst "
 "licencji (w systemach Debian jest to plik /usr/share/common-licenses/GPL)."
 
-#. type: <heading></heading>
-#: guide.sgml:32
+#. type: Content of: <book><chapter><title>
+#: guide.dbk:50
 msgid "General"
 msgstr "Ogólne"
 
-#. type: <p></p>
-#: guide.sgml:38
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:52
 msgid ""
-"The APT package currently contains two sections, the APT <prgn>dselect</"
-"prgn> method and the <prgn>apt-get</prgn> command line user interface. Both "
-"provide a way to install and remove packages as well as download new "
-"packages from the Internet."
+"The APT package currently contains two sections, the APT <command>dselect</"
+"command> method and the <command>apt-get</command> command line user "
+"interface. Both provide a way to install and remove packages as well as "
+"download new packages from the Internet."
 msgstr ""
-"Pakiet APT składa się z dwóch części: z metody APT programu <prgn>dselect</"
-"prgn> oraz z programu <prgn>apt-get</prgn> będącego interfejsem linii "
-"poleceń. Obie części pozwalają na instalowanie i usuwanie pakietów oraz na "
-"pobieranie nowych pakietów z Internetu."
+"Pakiet APT składa się z dwóch części: z metody APT programu "
+"<command>dselect</command> oraz z programu <command>apt-get</command> "
+"będącego interfejsem linii poleceń. Obie części pozwalają na instalowanie i "
+"usuwanie pakietów oraz na pobieranie nowych pakietów z Internetu."
 
-#. type: <heading></heading>
-#: guide.sgml:39
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:58
 msgid "Anatomy of the Package System"
 msgstr "Budowa systemu pakietów"
 
-#. type: <p></p>
-#: guide.sgml:44
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:60
 msgid ""
 "The Debian packaging system has a large amount of information associated "
 "with each package to help assure that it integrates cleanly and easily into "
@@ -7846,8 +7864,8 @@ msgstr ""
 "pakietem, zapewniających integralność pakietów w systemie. Najbardziej "
 "widoczną cechą systemu pakietów jest system zależności."
 
-#. type: <p></p>
-#: guide.sgml:52
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:65
 msgid ""
 "The dependency system allows individual programs to make use of shared "
 "elements in the system such as libraries. It simplifies placing infrequently "
@@ -7861,8 +7879,8 @@ msgstr ""
 "liczbę pakietów instalowanych przez przeciętnego użytkownika. Pozwala także "
 "wybierać programy odpowiedzialne za dostarczanie poczty, serwery X-ów itp."
 
-#. type: <p></p>
-#: guide.sgml:57
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:72
 msgid ""
 "The first step to understanding the dependency system is to grasp the "
 "concept of a simple dependency. The meaning of a simple dependency is that a "
@@ -7873,8 +7891,8 @@ msgstr ""
 "zrozumienie koncepcji prostej zależności. Prosta zależność oznacza, że dany "
 "pakiet do poprawnego działania wymaga zainstalowania innego pakietu."
 
-#. type: <p></p>
-#: guide.sgml:63
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:77
 msgid ""
 "For instance, mailcrypt is an emacs extension that aids in encrypting email "
 "with GPG. Without GPGP installed mailcrypt is useless, so mailcrypt has a "
@@ -7887,8 +7905,8 @@ msgstr ""
 "GPG. Ma także prostą zależność od pakietu emacs, ponieważ jest rozszerzeniem "
 "emacsa, więc i bez emacsa jest równie bezużyteczny."
 
-#. type: <p></p>
-#: guide.sgml:73
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:83
 msgid ""
 "The other important dependency to understand is a conflicting dependency. It "
 "means that a package, when installed with another package, will not work and "
@@ -7910,8 +7928,8 @@ msgstr ""
 "są w konflikcie ze wszystkimi innymi programami obsługującymi dostarczanie "
 "poczty."
 
-#. type: <p></p>
-#: guide.sgml:83
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:93
 msgid ""
 "As an added complication there is the possibility for a package to pretend "
 "to be another package. Consider that exim and sendmail for many intents are "
@@ -7932,8 +7950,8 @@ msgstr ""
 "obsługi poczty. Może to być bardzo mylące podczas próby ręcznego naprawiania "
 "zależności pakietów."
 
-#. type: <p></p>
-#: guide.sgml:88
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:103
 msgid ""
 "At any given time a single dependency may be met by packages that are "
 "already installed or it may not be. APT attempts to help resolve dependency "
@@ -7944,77 +7962,85 @@ msgstr ""
 "obecnie zainstalowane pakiety. ATP próbuje rozwiązać zależności używając "
 "pewnej liczby algorytmów pomagających w wyborze pakietów do zainstalowania."
 
-#. type: <heading></heading>
-#: guide.sgml:96
+#. type: Content of: <book><chapter><title>
+#: guide.dbk:112
 msgid "apt-get"
 msgstr "apt-get"
 
-#. type: <p></p>
-#: guide.sgml:102
-msgid ""
-"<prgn>apt-get</prgn> provides a simple way to install packages from the "
-"command line. Unlike <prgn>dpkg</prgn>, <prgn>apt-get</prgn> does not "
-"understand .deb files, it works with the package's proper name and can only "
-"install .deb archives from a <em>Source</em>."
-msgstr ""
-"<prgn>apt-get</prgn> dostarcza prostego sposobu na zainstalowanie pakietów z "
-"linii poleceń. W przeciwieństwie do <prgn>dpkg</prgn>, <prgn>apt-get</prgn> "
-"nie posługuje się nazwami plików \".deb\", lecz używa nazw pakietów i może "
-"zainstalować tylko archiwa \".deb\" ze skonfigurowanych <em>źródeł</em>."
-
-#. type: <p></p>
-#: guide.sgml:109
-msgid ""
-"The first <footnote><p>If you are using an http proxy server you must set "
-"the http_proxy environment variable first, see sources.list(5)</p></"
-"footnote> thing that should be done before using <prgn>apt-get</prgn> is to "
-"fetch the package lists from the <em>Sources</em> so that it knows what "
-"packages are available. This is done with <tt>apt-get update</tt>. For "
-"instance,"
-msgstr ""
-"Pierwszą rzeczą <footnote><p> Aby używać serwera proxy, należy najpierw "
-"ustawić zmienną środowiskową http_proxy, proszę przeczytać sources.list(5)</"
-"p></footnote>, którą należy zrobić przed użyciem <prgn>apt-get</prgn> jest "
-"pobranie listy pakietów (ze <em>źródeł</em> wymienionych w pliku sources."
-"list(5)), tak żeby APT wiedział, jakie pakiety są dostępne. Robi się to za "
-"pomocą polecenia <tt>apt-get update</tt>. Na przykład:"
-
-#. type: <example></example>
-#: guide.sgml:116
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:114
+msgid ""
+"<command>apt-get</command> provides a simple way to install packages from "
+"the command line. Unlike <command>dpkg</command>, <command>apt-get</command> "
+"does not understand .deb files, it works with the package's proper name and "
+"can only install .deb archives from a <emphasis>Source</emphasis>."
+msgstr ""
+"<command>apt-get</command> dostarcza prostego sposobu na zainstalowanie "
+"pakietów z linii poleceń. W przeciwieństwie do <command>dpkg</command>, "
+"<command>apt-get</command> nie posługuje się nazwami plików \".deb\", lecz "
+"używa nazw pakietów i może zainstalować tylko archiwa \".deb\" ze "
+"skonfigurowanych <emphasis>źródeł</emphasis>."
+
+#. type: Content of: <book><chapter><para><footnote><para>
+#: guide.dbk:120
+msgid ""
+"If you are using an http proxy server you must set the http_proxy "
+"environment variable first, see sources.list(5)"
+msgstr ""
+"Aby używać serwera proxy, należy najpierw ustawić zmienną środowiskową "
+"http_proxy, proszę przeczytać sources.list(5)"
+
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:120
+msgid ""
+"The first <placeholder type=\"footnote\" id=\"0\"/> thing that should be "
+"done before using <command>apt-get</command> is to fetch the package lists "
+"from the <emphasis>Sources</emphasis> so that it knows what packages are "
+"available. This is done with <literal>apt-get update</literal>. For instance,"
+msgstr ""
+"Pierwszą rzeczą <placeholder type=\"footnote\" id=\"0\"/>, którą należy "
+"zrobić przed użyciem <command>apt-get</command> jest pobranie listy pakietów "
+"(ze <emphasis>źródeł</emphasis> wymienionych w pliku sources.list(5)), tak "
+"żeby APT wiedział, jakie pakiety są dostępne. Robi się to za pomocą "
+"polecenia <literal>apt-get update</literal>. Na przykład:"
+
+#. type: Content of: <book><chapter><screen>
+#: guide.dbk:128
 #, no-wrap
 msgid ""
 "# apt-get update\n"
 "Get http://ftp.de.debian.org/debian-non-US/ stable/binary-i386/ Packages\n"
 "Get http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n"
 "Reading Package Lists... Done\n"
-"Building Dependency Tree... Done"
+"Building Dependency Tree... Done\n"
 msgstr ""
 "# apt-get update\n"
 "Pob: http://ftp.de.debian.org/debian-non-US/ stable/binary-i386/ Packages\n"
 "Pob: http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n"
 "Czytanie list pakietów... Gotowe\n"
-"Budowanie drzewa zależności.. Gotowe"
+"Budowanie drzewa zależności... Gotowe\n"
 
-#. type: <p><taglist>
-#: guide.sgml:120
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:135
 msgid "Once updated there are several commands that can be used:"
 msgstr "Po zaktualizowaniu można użyć następnych poleceń:"
 
-#. type: <tag></tag>
-#: guide.sgml:121
+#. type: Content of: <book><chapter><variablelist><varlistentry><term>
+#: guide.dbk:139
 msgid "upgrade"
 msgstr "upgrade"
 
-#. type: <p></p>
-#: guide.sgml:131
+#. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
+#: guide.dbk:142
 msgid ""
 "Upgrade will attempt to gently upgrade the whole system. Upgrade will never "
 "install a new package or remove an existing package, nor will it ever "
 "upgrade a package that might cause some other package to break. This can be "
 "used daily to relatively safely upgrade the system. Upgrade will list all of "
 "the packages that it could not upgrade, this usually means that they depend "
-"on new packages or conflict with some other package. <prgn>dselect</prgn> or "
-"<tt>apt-get install</tt> can be used to force these packages to install."
+"on new packages or conflict with some other package. <command>dselect</"
+"command> or <literal>apt-get install</literal> can be used to force these "
+"packages to install."
 msgstr ""
 "Upgrade spróbuje delikatnie zaktualizować cały system. Upgrade nigdy nie "
 "zainstaluje nowego pakietu ani nie usunie istniejącego pakiety, ani też nie "
@@ -8023,15 +8049,16 @@ msgstr ""
 "aktualizacji systemu. Upgrade wypisze listę pakietów, których nie potrafił "
 "zaktualizować, co zazwyczaj oznacza, że zależą one od nowych pakietów lub są "
 "w konflikcie z innymi pakietami. Można wymusić instalację takich pakietów, "
-"używając do tego <prgn>dselect</prgn> lub <tt>apt-get install</tt>."
+"używając do tego <command>dselect</command> lub <literal>apt-get install</"
+"literal>."
 
-#. type: <tag></tag>
-#: guide.sgml:131
+#. type: Content of: <book><chapter><variablelist><varlistentry><term>
+#: guide.dbk:154
 msgid "install"
 msgstr "install"
 
-#. type: <p></p>
-#: guide.sgml:140
+#. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
+#: guide.dbk:157
 msgid ""
 "Install is used to install packages by name. The package is automatically "
 "fetched and installed. This can be useful if you already know the name of "
@@ -8050,21 +8077,22 @@ msgstr ""
 "wypisze podsumowanie i poprosi o potwierdzenie, jeśli zamierza zmienić "
 "cokolwiek innego niż pakiety podane jako jego argumenty."
 
-#. type: <tag></tag>
-#: guide.sgml:140
+#. type: Content of: <book><chapter><variablelist><varlistentry><term>
+#: guide.dbk:168
 msgid "dist-upgrade"
 msgstr "dist-upgrade"
 
-#. type: <p></p>
-#: guide.sgml:149
+#. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
+#: guide.dbk:171
 msgid ""
 "Dist-upgrade is a complete upgrader designed to simplify upgrading between "
 "releases of Debian. It uses a sophisticated algorithm to determine the best "
 "set of packages to install, upgrade and remove to get as much of the system "
 "to the newest release. In some situations it may be desired to use dist-"
 "upgrade rather than spend the time manually resolving dependencies in "
-"<prgn>dselect</prgn>. Once dist-upgrade has completed then <prgn>dselect</"
-"prgn> can be used to install any packages that may have been left out."
+"<command>dselect</command>. Once dist-upgrade has completed then "
+"<command>dselect</command> can be used to install any packages that may have "
+"been left out."
 msgstr ""
 "Dist-upgrade powoduje całkowitą aktualizację systemu i jest zaprojektowany "
 "do uproszczenia aktualizacji z jednego wydania Debiana do kolejnego. Używa "
@@ -8072,11 +8100,12 @@ msgstr ""
 "zainstalowania, aktualizacji lub usunięcia, tak aby zaktualizować jak "
 "najwięcej pakietów w systemie do nowszego wydania. W niektórych sytuacjach, "
 "może być prościej użyć dist-upgrade niż ręcznie rozwiązywać zależności w "
-"programie <prgn>dselect</prgn>. Kiedy dist-upgrade zakończy działanie, można "
-"użyć programu <prgn>dselect</prgn> do zainstalowania pominiętych pakietów."
+"programie <command>dselect</command>. Kiedy dist-upgrade zakończy działanie, "
+"można użyć programu <command>dselect</command> do zainstalowania pominiętych "
+"pakietów."
 
-#. type: <p></p>
-#: guide.sgml:152
+#. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
+#: guide.dbk:181
 msgid ""
 "It is important to closely look at what dist-upgrade is going to do, its "
 "decisions may sometimes be quite surprising."
@@ -8084,168 +8113,165 @@ msgstr ""
 "Jest ważne, aby dokładnie przyjrzeć się temu, co dist-upgrade zamierza "
 "zrobić, gdyż jego decyzje mogą czasami zdumiewać."
 
-#. type: <p></p>
-#: guide.sgml:163
-#, fuzzy
-#| msgid ""
-#| "<prgn>apt-get</prgn> has several command line options that are detailed "
-#| "in its man page, <manref section=\"8\" name=\"apt-get\">. The most useful "
-#| "option is <tt>-d</tt> which does not install the fetched files. If the "
-#| "system has to download a large number of package it would be undesired to "
-#| "start installing them in case something goes wrong. When <tt>-d</tt> is "
-#| "used the downloaded archives can be installed by simply running the "
-#| "command that caused them to be downloaded again without <tt>-d</tt>."
-msgid ""
-"<prgn>apt-get</prgn> has several command line options that are detailed in "
-"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful "
-"option is <tt>-d</tt> which does not install the fetched files. If the "
-"system has to download a large number of package it would be undesired to "
-"start installing them in case something goes wrong. When <tt>-d</tt> is used "
-"the downloaded archives can be installed by simply running the command that "
-"caused them to be downloaded again without <tt>-d</tt>."
-msgstr ""
-"Zachowanie programu <prgn>apt-get</prgn> można kontrolować za pomocą opcji "
-"linii poleceń szczegółowo opisanych w stronie podręcznika ekranowego <manref "
-"section=\"8\" name=\"apt-get\">. Najbardziej użyteczną z nich jest <tt>-d</"
-"tt>, która nie instaluje pobranych plików. Jeśli system musi pobrać dużą "
-"liczbę pakietów, instalowanie ich może być niepożądane, jeśli coś pójdzie "
-"nie tak. Jeśli użyto <tt>-d</tt>, to pobrane archiwa można zainstalować, "
-"ponownie uruchamiając polecenie, które spowodowało ich pobranie, tym razem "
-"bez opcji <tt>-d</tt>."
-
-#. type: <heading></heading>
-#: guide.sgml:168
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:188
+msgid ""
+"<command>apt-get</command> has several command line options that are "
+"detailed in its man page, <citerefentry><refentrytitle>apt-get</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>. The most useful "
+"option is <literal>-d</literal> which does not install the fetched files. If "
+"the system has to download a large number of package it would be undesired "
+"to start installing them in case something goes wrong. When <literal>-d</"
+"literal> is used the downloaded archives can be installed by simply running "
+"the command that caused them to be downloaded again without <literal>-d</"
+"literal>."
+msgstr ""
+"Zachowanie programu <command>apt-get</command> można kontrolować za pomocą "
+"opcji linii poleceń szczegółowo opisanych w stronie podręcznika ekranowego "
+"<citerefentry><refentrytitle>apt-get</refentrytitle><manvolnum>8</"
+"manvolnum></citerefentry>. Najbardziej użyteczną z nich jest <literal>-d</"
+"literal>, która nie instaluje pobranych plików. Jeśli system musi pobrać "
+"dużą liczbę pakietów, instalowanie ich może być niepożądane, jeśli coś "
+"pójdzie nie tak. Jeśli użyto <literal>-d</literal>, to pobrane archiwa można "
+"zainstalować, ponownie uruchamiając polecenie, które spowodowało ich "
+"pobranie, tym razem bez opcji <literal>-d</literal>."
+
+#. type: Content of: <book><chapter><title>
+#: guide.dbk:200
 msgid "DSelect"
 msgstr "DSelect"
 
-#. type: <p></p>
-#: guide.sgml:173
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:202
 msgid ""
-"The APT <prgn>dselect</prgn> method provides the complete APT system with "
-"the <prgn>dselect</prgn> package selection GUI. <prgn>dselect</prgn> is used "
-"to select the packages to be installed or removed and APT actually installs "
-"them."
+"The APT <command>dselect</command> method provides the complete APT system "
+"with the <command>dselect</command> package selection GUI. <command>dselect</"
+"command> is used to select the packages to be installed or removed and APT "
+"actually installs them."
 msgstr ""
-"Metoda APT <prgn>dselect</prgn> dostarcza kompletnego systemu APT w "
-"interfejsie użytkownika programu wyboru pakietów <prgn>dselect</prgn>. "
-"<prgn>dselect</prgn> może być użyty do wybrania pakietów przeznaczonych do "
-"zainstalowania lub usunięcia, a APT zainstaluje lub usunie te pakiety."
+"Metoda APT <command>dselect</command> dostarcza kompletnego systemu APT w "
+"interfejsie użytkownika programu wyboru pakietów <command>dselect</command>. "
+"<command>dselect</command> może być użyty do wybrania pakietów "
+"przeznaczonych do zainstalowania lub usunięcia, a APT zainstaluje lub usunie "
+"te pakiety."
 
-#. type: <p></p>
-#: guide.sgml:184
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:208
 msgid ""
-"To enable the APT method you need to select [A]ccess in <prgn>dselect</prgn> "
-"and then choose the APT method. You will be prompted for a set of "
-"<em>Sources</em> which are places to fetch archives from. These can be "
-"remote Internet sites, local Debian mirrors or CD-ROMs. Each source can "
-"provide a fragment of the total Debian archive, APT will automatically "
+"To enable the APT method you need to select [A]ccess in <command>dselect</"
+"command> and then choose the APT method. You will be prompted for a set of "
+"<emphasis>Sources</emphasis> which are places to fetch archives from. These "
+"can be remote Internet sites, local Debian mirrors or CD-ROMs. Each source "
+"can provide a fragment of the total Debian archive, APT will automatically "
 "combine them to form a complete set of packages. If you have a CD-ROM then "
 "it is a good idea to specify it first and then specify a mirror so that you "
 "have access to the latest bug fixes. APT will automatically use packages on "
 "your CD-ROM before downloading from the Internet."
 msgstr ""
 "Aby włączyć metodę APT należy wybrać opcję \"[A] Dostęp\" w programie "
-"<prgn>dselect</prgn> , a następnie wybrać metodę APT. Użytkownik zostanie "
-"poproszony o skonfigurowanie listy <em>źródeł</em>, będących lokalizacjami, "
-"z których będą pobierane pakiety. Mogą być to strony internetowe, lokalne "
-"serwery lustrzane Debiana lub CD-ROM-y. Każde źródło może dostarczać tylko "
-"fragmentu pełnego archiwum Debiana, a APT automatycznie połączy je w "
-"kompletny zbiór pakietów. Jeśli używany jest CD-ROM, to dobrym pomysłem jest "
-"podanie najpierw jego, a potem podanie mirrorów umożliwiających dostęp do "
-"najnowszych wersji pakietów zawierających poprawki błędów. APT automatycznie "
-"użyje pakietów z CD-ROM-u zanim zacznie pobierać pakiety z Internetu."
-
-#. type: <example></example>
-#: guide.sgml:198
+"<command>dselect</command> , a następnie wybrać metodę APT. Użytkownik "
+"zostanie poproszony o skonfigurowanie listy <emphasis>źródeł</emphasis>, "
+"będących lokalizacjami, z których będą pobierane pakiety. Mogą być to strony "
+"internetowe, lokalne serwery lustrzane Debiana lub CD-ROM-y. Każde źródło "
+"może dostarczać tylko fragmentu pełnego archiwum Debiana, a APT "
+"automatycznie połączy je w kompletny zbiór pakietów. Jeśli używany jest CD-"
+"ROM, to dobrym pomysłem jest podanie najpierw jego, a potem podanie mirrorów "
+"umożliwiających dostęp do najnowszych wersji pakietów zawierających poprawki "
+"błędów. APT automatycznie użyje pakietów z CD-ROM-u zanim zacznie pobierać "
+"pakiety z Internetu."
+
+#. type: Content of: <book><chapter><screen>
+#: guide.dbk:219
 #, no-wrap
 msgid ""
 "   Set up a list of distribution source locations\n"
-"\t \n"
+"\n"
 " Please give the base URL of the debian distribution.\n"
 " The access schemes I know about are: http file\n"
-"\t   \n"
+"\n"
 " For example:\n"
 "      file:/mnt/debian,\n"
 "      ftp://ftp.debian.org/debian,\n"
 "      http://ftp.de.debian.org/debian,\n"
-"      \n"
-"      \n"
-" URL [http://llug.sep.bnl.gov/debian]:"
+"\n"
+"\n"
+" URL [http://llug.sep.bnl.gov/debian]:\n"
 msgstr ""
 "  Ustawianie listy źródłowych lokalizacji dystrybucji\n"
-"\t \n"
+"\n"
 " Proszę podać bazowy URL dystrybucji Debiana.\n"
 " Obsługiwane schematy połączeń to: http ftp file\n"
-"\t   \n"
+"\n"
 " Przykłady:\n"
 "      file:/mnt/debian,\n"
 "      ftp://ftp.debian.org/debian,\n"
 "      http://ftp.pl.debian.org/debian,\n"
-"      \n"
-"      \n"
-" URL [http://llug.sep.bnl.gov/debian]:"
+"\n"
+"\n"
+" URL [http://llug.sep.bnl.gov/debian]:\n"
 
-#. type: <p></p>
-#: guide.sgml:205
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:233
 msgid ""
-"The <em>Sources</em> setup starts by asking for the base of the Debian "
-"archive, defaulting to a HTTP mirror. Next it asks for the distribution to "
-"get."
+"The <emphasis>Sources</emphasis> setup starts by asking for the base of the "
+"Debian archive, defaulting to a HTTP mirror. Next it asks for the "
+"distribution to get."
 msgstr ""
 "Ustawianie źródeł zaczyna się od pytania o bazową lokalizację Debiana. "
 "Domyślną wartością jest mirror HTTP. Następnie użytkownik jest pytany o "
 "dystrybucję do pobrania."
 
-#. type: <example></example>
-#: guide.sgml:212
+#. type: Content of: <book><chapter><screen>
+#: guide.dbk:238
 #, no-wrap
 msgid ""
 " Please give the distribution tag to get or a path to the\n"
 " package file ending in a /. The distribution\n"
 " tags are typically something like: stable unstable testing non-US\n"
-"   \n"
-" Distribution [stable]:"
+"\n"
+" Distribution [stable]:\n"
 msgstr ""
 " Proszę podać znacznik dystrybucji do pobrania lub ścieżkę do pliku\n"
 " pakietów kończącą się znakiem \"/\". Zazwyczaj znacznikiem dystrybucji\n"
 " jest coś w rodzaju: stable unstable testing non-US\n"
-"   \n"
-" Dystrybucja [stable]:"
-
-#. type: <p></p>
-#: guide.sgml:222
-msgid ""
-"The distribution refers to the Debian version in the archive, <em>stable</"
-"em> refers to the latest released version and <em>unstable</em> refers to "
-"the developmental version. <em>non-US</em> is only available on some mirrors "
-"and refers to packages that contain encryption technology or other things "
-"that cannot be exported from the United States. Importing these packages "
-"into the US is legal however."
-msgstr ""
-"Dystrybucja odnosi się do wersji Debiana: <em>stable</em>(stabilna) to "
-"najnowsza wydana wersja, a <em>unstable</em> (niestabilna) to wersja "
-"rozwojowa. <em>non-US</em> jest dostępna tylko na wybranych serwerach "
-"lustrzanych i zawiera pakiety, które wykorzystują technologie szyfrowania "
-"danych lub inne rzeczy, które nie mogą być eksportowane z serwerów "
-"umieszczonych w Stanach Zjednoczonych. Importowanie tych pakietów do Stanów "
-"Zjednoczonych jest jednakże legalne."
-
-#. type: <example></example>
-#: guide.sgml:228
+"\n"
+" Dystrybucja [stable]:\n"
+
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:245
+msgid ""
+"The distribution refers to the Debian version in the archive, "
+"<emphasis>stable</emphasis> refers to the latest released version and "
+"<emphasis>unstable</emphasis> refers to the developmental version. "
+"<emphasis>non-US</emphasis> is only available on some mirrors and refers to "
+"packages that contain encryption technology or other things that cannot be "
+"exported from the United States. Importing these packages into the US is "
+"legal however."
+msgstr ""
+"Dystrybucja odnosi się do wersji Debiana: <emphasis>stable</"
+"emphasis>(stabilna) to najnowsza wydana wersja, a <emphasis>unstable</"
+"emphasis> (niestabilna) to wersja rozwojowa. <emphasis>non-US</emphasis> "
+"jest dostępna tylko na wybranych serwerach lustrzanych i zawiera pakiety, "
+"które wykorzystują technologie szyfrowania danych lub inne rzeczy, które nie "
+"mogą być eksportowane z serwerów umieszczonych w Stanach Zjednoczonych. "
+"Importowanie tych pakietów do Stanów Zjednoczonych jest jednakże legalne."
+
+#. type: Content of: <book><chapter><screen>
+#: guide.dbk:254
 #, no-wrap
 msgid ""
 " Please give the components to get\n"
 " The components are typically something like: main contrib non-free\n"
-"  \n"
-" Components [main contrib non-free]:"
+"\n"
+" Components [main contrib non-free]:\n"
 msgstr ""
 " Proszę podać komponenty do pobrania\n"
 " Zazwyczaj komponentem jest coś w rodzaju: main contrib non-free\n"
-"  \n"
-" Komponenty [main contrib non-free]:"
+"\n"
+" Komponenty [main contrib non-free]:\n"
 
-#. type: <p></p>
-#: guide.sgml:236
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:260
 msgid ""
 "The components list refers to the list of sub distributions to fetch. The "
 "distribution is split up based on software licenses, main being DFSG free "
@@ -8258,8 +8284,8 @@ msgstr ""
 "\"),contrib i non-free zawierają pakiety, które zawierają restrykcje "
 "związane z ich używaniem lub rozpowszechnianiem."
 
-#. type: <p></p>
-#: guide.sgml:240
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:266
 msgid ""
 "Any number of sources can be added, the setup script will continue to prompt "
 "until you have specified all that you want."
@@ -8268,24 +8294,24 @@ msgstr ""
 "odpytywanie użytkownika dopóty, dopóki nie poda wszystkich źródeł, które "
 "chciał skonfigurować."
 
-#. type: <p></p>
-#: guide.sgml:247
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:270
 msgid ""
-"Before starting to use <prgn>dselect</prgn> it is necessary to update the "
-"available list by selecting [U]pdate from the menu. This is a superset of "
-"<tt>apt-get update</tt> that makes the fetched information available to "
-"<prgn>dselect</prgn>. [U]pdate must be performed even if <tt>apt-get update</"
-"tt> has been run before."
+"Before starting to use <command>dselect</command> it is necessary to update "
+"the available list by selecting [U]pdate from the menu. This is a superset "
+"of <literal>apt-get update</literal> that makes the fetched information "
+"available to <command>dselect</command>. [U]pdate must be performed even if "
+"<literal>apt-get update</literal> has been run before."
 msgstr ""
-"Przed rozpoczęciem używania programu <prgn>dselect</prgn> należy w menu tego "
-"programu wybrać \"[U] Aktualizacja\", abyzaktualizować listę dostępnych "
-"pakietów. To polecenie jest nadzbiorem polecenia <tt>apt-get update</tt>, "
-"zapewniającym programowi <prgn>dselect</prgn> dostęp do pobranych informacji "
-"o pakietach. \"[U] Aktualizacja\" musi być wykonana, nawet jeśli wcześniej "
-"uruchomiono <tt>apt-get update</tt>."
+"Przed rozpoczęciem używania programu <command>dselect</command> należy w "
+"menu tego programu wybrać \"[U] Aktualizacja\", abyzaktualizować listę "
+"dostępnych pakietów. To polecenie jest nadzbiorem polecenia <literal>apt-get "
+"update</literal>, zapewniającym programowi <command>dselect</command> dostęp "
+"do pobranych informacji o pakietach. \"[U] Aktualizacja\" musi być wykonana, "
+"nawet jeśli wcześniej uruchomiono <literal>apt-get update</literal>."
 
-#. type: <p></p>
-#: guide.sgml:253
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:277
 msgid ""
 "You can then go on and make your selections using [S]elect and then perform "
 "the installation using [I]nstall. When using the APT method the [C]onfig and "
@@ -8298,76 +8324,83 @@ msgstr ""
 "bezużytecznymi, gdyż \"[I] Instalacja\" przeprowadza również te dwie "
 "operacje."
 
-#. type: <p></p>
-#: guide.sgml:258
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:283
 msgid ""
 "By default APT will automatically remove the package (.deb) files once they "
-"have been successfully installed. To change this behavior place <tt>Dselect::"
-"clean \"prompt\";</tt> in /etc/apt/apt.conf."
+"have been successfully installed. To change this behavior place "
+"<literal>Dselect::clean \"prompt\";</literal> in /etc/apt/apt.conf."
 msgstr ""
 "Domyślnie APT automatycznie usunie pliki pakietów (.deb), gdy tylko zostaną "
-"zainstalowane. Aby zmienić to zachowanie, proszę umieścić  <tt>Dselect::"
-"clean \"prompt\";</tt> w /etc/apt/apt.conf."
+"zainstalowane. Aby zmienić to zachowanie, proszę umieścić  <literal>Dselect::"
+"clean \"prompt\";</literal> w /etc/apt/apt.conf."
 
-#. type: <heading></heading>
-#: guide.sgml:264
+#. type: Content of: <book><chapter><title>
+#: guide.dbk:289
 msgid "The Interface"
 msgstr "Interfejs"
 
-#. type: <p></p>
-#: guide.sgml:278
+#. type: Content of: <book><chapter><para><footnote><para>
+#: guide.dbk:293
 msgid ""
-"Both that APT <prgn>dselect</prgn> method and <prgn>apt-get</prgn> share the "
-"same interface. It is a simple system that generally tells you what it will "
-"do and then goes and does it. <footnote><p>The <prgn>dselect</prgn> method "
-"actually is a set of wrapper scripts to <prgn>apt-get</prgn>. The method "
-"actually provides more functionality than is present in <prgn>apt-get</prgn> "
-"alone.</p></footnote> After printing out a summary of what will happen APT "
+"The <command>dselect</command> method actually is a set of wrapper scripts "
+"to <command>apt-get</command>. The method actually provides more "
+"functionality than is present in <command>apt-get</command> alone."
+msgstr ""
+"Metoda programu <command>dselect</command> jest tak naprawdę zbiorem "
+"skryptów wywołujących <command>apt-get</command>. Metoda ta ma jednakże "
+"większą funkcjonalność niż sam program <command>apt-get</command>."
+
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:291
+msgid ""
+"Both that APT <command>dselect</command> method and <command>apt-get</"
+"command> share the same interface. It is a simple system that generally "
+"tells you what it will do and then goes and does it. <placeholder type="
+"\"footnote\" id=\"0\"/> After printing out a summary of what will happen APT "
 "then will print out some informative status messages so that you can "
 "estimate how far along it is and how much is left to do."
 msgstr ""
-"Metoda APT programu <prgn>dselect</prgn> i program <prgn>apt-get</prgn> "
-"dzielą wspólny interfejs. Jest to prosty system, który najpierw informuje "
-"użytkownika, co będzie zrobione, a następnie to robi<footnote><p>Metoda "
-"programu <prgn>dselect</prgn> jest tak naprawdę zbiorem skryptów "
-"wywołujących <prgn>apt-get</prgn>. Metoda ta ma jednakże większą "
-"funkcjonalność niż sam program <prgn>apt-get</prgn>.</p></footnote>. Po "
-"wyświetleniu podsumowania informującego o tym, co będzie zrobione, APT "
-"wyświetla komunikaty dotyczące postępu przeprowadzanych operacji, tak żeby "
-"można było oszacować czas pozostały do ich zakończenia."
-
-#. type: <heading></heading>
-#: guide.sgml:280
+"Metoda APT programu <command>dselect</command> i program <command>apt-get</"
+"command> dzielą wspólny interfejs. Jest to prosty system, który najpierw "
+"informuje użytkownika, co będzie zrobione, a następnie to robi. <placeholder "
+"type=\"footnote\" id=\"0\"/> Po wyświetleniu podsumowania informującego o "
+"tym, co będzie zrobione, APT wyświetla komunikaty dotyczące postępu "
+"przeprowadzanych operacji, tak żeby można było oszacować czas pozostały do "
+"ich zakończenia."
+
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:302
 msgid "Startup"
 msgstr "Uruchamianie"
 
-#. type: <p></p>
-#: guide.sgml:284
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:304
 msgid ""
 "Before all operations except update, APT performs a number of actions to "
 "prepare its internal state. It also does some checks of the system's state. "
-"At any time these operations can be performed by running <tt>apt-get check</"
-"tt>."
+"At any time these operations can be performed by running <literal>apt-get "
+"check</literal>."
 msgstr ""
 "Przed każdą operacją, z wyjątkiem update, APT przeprowadza pewne akcje "
 "przygotowujące wewnętrzny stan. Sprawdza również stan systemu. Te same "
-"operacje można przeprowadzić w dowolnej chwili, uruchamiając <tt>apt-get "
-"check</tt>."
+"operacje można przeprowadzić w dowolnej chwili, uruchamiając <literal>apt-"
+"get check</literal>."
 
-#. type: <example></example>
-#: guide.sgml:289
+#. type: Content of: <book><chapter><section><screen>
+#: guide.dbk:310
 #, no-wrap
 msgid ""
 "# apt-get check\n"
 "Reading Package Lists... Done\n"
-"Building Dependency Tree... Done"
+"Building Dependency Tree... Done\n"
 msgstr ""
 "# apt-get check\n"
 "Czytanie list pakietów... Gotowe\n"
-"Budowanie drzewa zależności... Gotowe"
+"Budowanie drzewa zależności... Gotowe\n"
 
-#. type: <p></p>
-#: guide.sgml:297
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:315
 msgid ""
 "The first thing it does is read all the package files into memory. APT uses "
 "a caching scheme so this operation will be faster the second time it is run. "
@@ -8379,21 +8412,21 @@ msgstr ""
 "następnym uruchomieniu. Jeśli nie znajdzie niektórych plików pakietów, to "
 "wypisze ostrzeżenie, a te pakiety zignoruje."
 
-#. type: <p></p>
-#: guide.sgml:303
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:321
 msgid ""
 "The final operation performs a detailed analysis of the system's "
 "dependencies. It checks every dependency of every installed or unpacked "
 "package and considers if it is OK. Should this find a problem then a report "
-"will be printed out and <prgn>apt-get</prgn> will refuse to run."
+"will be printed out and <command>apt-get</command> will refuse to run."
 msgstr ""
 "Końcową operacją jest szczegółowa analiza zależności w systemie. Sprawdzana "
 "jest każda zależność każdego pakietu zainstalowanego lub rozpakowanego. W "
-"razie wykrycia problemów z zależnościami <prgn>apt-get</prgn> wypisze "
+"razie wykrycia problemów z zależnościami <command>apt-get</command> wypisze "
 "odpowiedni komunikat i odmówi dalszego działania."
 
-#. type: <example></example>
-#: guide.sgml:320
+#. type: Content of: <book><chapter><section><screen>
+#: guide.dbk:327
 #, no-wrap
 msgid ""
 "# apt-get check\n"
@@ -8403,14 +8436,14 @@ msgid ""
 "Sorry, but the following packages have unmet dependencies:\n"
 "  9fonts: Depends: xlib6g but it is not installed\n"
 "  uucp: Depends: mailx but it is not installed\n"
-"  blast: Depends: xlib6g (>= 3.3-5) but it is not installed\n"
+"  blast: Depends: xlib6g (&gt;= 3.3-5) but it is not installed\n"
 "  adduser: Depends: perl-base but it is not installed\n"
 "  aumix: Depends: libgpmg1 but it is not installed\n"
 "  debiandoc-sgml: Depends: sgml-base but it is not installed\n"
-"  bash-builtins: Depends: bash (>= 2.01) but 2.0-3 is installed\n"
+"  bash-builtins: Depends: bash (&gt;= 2.01) but 2.0-3 is installed\n"
 "  cthugha: Depends: svgalibg1 but it is not installed\n"
-"           Depends: xlib6g (>= 3.3-5) but it is not installed\n"
-"  libreadlineg2: Conflicts:libreadline2 (<< 2.1-2.1)"
+"           Depends: xlib6g (&gt;= 3.3-5) but it is not installed\n"
+"  libreadlineg2: Conflicts:libreadline2 (&lt;&lt; 2.1-2.1)\n"
 msgstr ""
 "# apt-get check\n"
 "Czytanie list pakietów... Gotowe\n"
@@ -8419,17 +8452,17 @@ msgstr ""
 "Następujące pakiety mają niespełnione zależności:\n"
 "  9fonts: Wymaga: xlib6g ale nie jest zainstalowany\n"
 "  uucp: Wymaga: mailx ale nie jest zainstalowany\n"
-"  blast: Wymaga: xlib6g (>= 3.3-5) ale nie jest zainstalowany\n"
+"  blast: Wymaga: xlib6g (&gt;= 3.3-5) ale nie jest zainstalowany\n"
 "  adduser: Wymaga: perl-base ale nie jest zainstalowany\n"
 "  aumix: Wymaga: libgpmg1 but ale nie jest zainstalowany\n"
 "  debiandoc-sgml: Wymaga: sgml-base ale nie jest zainstalowany\n"
-"  bash-builtins: Wymaga: bash (>= 2.01) but 2.0-3 is installed\n"
+"  bash-builtins: Wymaga: bash (&gt;= 2.01) but 2.0-3 is installed\n"
 "  cthugha: Wymaga: svgalibg1 but it is not installed\n"
-"           Wymaga: xlib6g (>= 3.3-5) ale nie jest zainstalowany\n"
-"  libreadlineg2: Jest w konflikcie z: libreadline2 (<< 2.1-2.1)"
+"           Wymaga: xlib6g (&gt;= 3.3-5) ale nie jest zainstalowany\n"
+"  libreadlineg2: Jest w konflikcie z: libreadline2 (&lt;&lt; 2.1-2.1)\n"
 
-#. type: <p></p>
-#: guide.sgml:329
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:344
 msgid ""
 "In this example the system has many problems, including a serious problem "
 "with libreadlineg2. For each package that has unmet dependencies a line is "
@@ -8442,87 +8475,98 @@ msgstr ""
 "jest wypisywany w osobnej linii razem z niespełnionymi zależnościami. Podane "
 "jest również krótkie wyjaśnienie dotyczące przyczyny problemu."
 
-#. type: <p></p>
-#: guide.sgml:337
+#. type: Content of: <book><chapter><section><para><footnote><para>
+#: guide.dbk:353
+msgid ""
+"APT however considers all known dependencies and attempts to prevent broken "
+"packages"
+msgstr ""
+"APT rozważa wszystkie znane zależności i próbuje nie dopuścić do zepsucia "
+"pakietów."
+
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:351
 msgid ""
 "There are two ways a system can get into a broken state like this. The first "
-"is caused by <prgn>dpkg</prgn> missing some subtle relationships between "
-"packages when performing upgrades. <footnote><p>APT however considers all "
-"known dependencies and attempts to prevent broken packages</p></footnote>. "
-"The second is if a package installation fails during an operation. In this "
-"situation a package may have been unpacked without its dependents being "
-"installed."
+"is caused by <command>dpkg</command> missing some subtle relationships "
+"between packages when performing upgrades. <placeholder type=\"footnote\" id="
+"\"0\"/>. The second is if a package installation fails during an operation. "
+"In this situation a package may have been unpacked without its dependents "
+"being installed."
 msgstr ""
 "Są dwie przyczyny, z których powodu system może być zepsuty w powyższy "
-"sposób. Pierwszą jest to, że <prgn>dpkg</prgn> podczas aktualizacji systemu "
-"nie zauważył jakiejś subtelnej relacji między pakietami<footnote><p>APT "
-"rozważa wszystkie znane zależności i próbuje nie dopuścić do zepsucia "
-"pakietów.</p></footnote>. Drugą przyczyną jest wystąpienie błędu w czasie "
-"instalowania pakietu. W takim przypadku pakiet może być rozpakowany, mimo że "
-"pakiety od niego zależące nie są zainstalowane."
+"sposób. Pierwszą jest to, że <command>dpkg</command> podczas aktualizacji "
+"systemu nie zauważył jakiejś subtelnej relacji między pakietami<placeholder "
+"type=\"footnote\" id=\"0\"/>. Drugą przyczyną jest wystąpienie błędu w "
+"czasie instalowania pakietu. W takim przypadku pakiet może być rozpakowany, "
+"mimo że pakiety od niego zależące nie są zainstalowane."
 
-#. type: <p></p>
-#: guide.sgml:345
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:360
 msgid ""
 "The second situation is much less serious than the first because APT places "
 "certain constraints on the order that packages are installed. In both cases "
-"supplying the <tt>-f</tt> option to <prgn>apt-get</prgn> will cause APT to "
-"deduce a possible solution to the problem and then continue on. The APT "
-"<prgn>dselect</prgn> method always supplies the <tt>-f</tt> option to allow "
-"for easy continuation of failed maintainer scripts."
+"supplying the <literal>-f</literal> option to <command>apt-get</command> "
+"will cause APT to deduce a possible solution to the problem and then "
+"continue on. The APT <command>dselect</command> method always supplies the "
+"<literal>-f</literal> option to allow for easy continuation of failed "
+"maintainer scripts."
 msgstr ""
 "Druga przyczyna jest o wiele mniej poważna niż pierwsza, ponieważ APT "
 "wymusza pewne więzy integralności dotyczące kolejności instalowania "
-"pakietów. W obu przypadkach przekazanie programowi <prgn>apt-get</prgn> "
-"opcji <tt>-f</tt> wymusi na APT znalezienie rozwiązania umożliwiającego mu "
-"kontynuowanie działania. Metoda APT programu <prgn>dselect</prgn> zawsze "
-"przekazuje opcję <tt>-f</tt>, aby móc kontynuować po wystąpieniu błędu w "
-"skryptach opiekunów pakietów."
-
-#. type: <p></p>
-#: guide.sgml:351
-msgid ""
-"However, if the <tt>-f</tt> option is used to correct a seriously broken "
-"system caused by the first case then it is possible that it will either fail "
-"immediately or the installation sequence will fail. In either case it is "
-"necessary to manually use dpkg (possibly with forcing options) to correct "
-"the situation enough to allow APT to proceed."
-msgstr ""
-"Jednak gdy opcja <tt>-f</tt> jest używana do poprawienia zależności w "
-"poważnie uszkodzonym systemie (pierwsza z opisanych wyżej przyczyn), możliwe "
-"jest że albo od razu zwróci błąd, albo nie powiedzie się sekwencja "
-"instalowania pakietów. W obu przypadkach należy poprawić zależności ręcznie, "
-"używając do tego dpkg (być może przekazując mu opcje wymuszające \"--"
-"force-...\"), w takim stopniu, aby umożliwić działanie systemowi APT."
-
-#. type: <heading></heading>
-#: guide.sgml:356
+"pakietów. W obu przypadkach przekazanie programowi <command>apt-get</"
+"command> opcji <literal>-f</literal> wymusi na APT znalezienie rozwiązania "
+"umożliwiającego mu kontynuowanie działania. Metoda APT programu "
+"<command>dselect</command> zawsze przekazuje opcję <literal>-f</literal>, "
+"aby móc kontynuować po wystąpieniu błędu w skryptach opiekunów pakietów."
+
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:369
+msgid ""
+"However, if the <literal>-f</literal> option is used to correct a seriously "
+"broken system caused by the first case then it is possible that it will "
+"either fail immediately or the installation sequence will fail. In either "
+"case it is necessary to manually use dpkg (possibly with forcing options) to "
+"correct the situation enough to allow APT to proceed."
+msgstr ""
+"Jednak gdy opcja <literal>-f</literal> jest używana do poprawienia "
+"zależności w poważnie uszkodzonym systemie (pierwsza z opisanych wyżej "
+"przyczyn), możliwe jest że albo od razu zwróci błąd, albo nie powiedzie się "
+"sekwencja instalowania pakietów. W obu przypadkach należy poprawić "
+"zależności ręcznie, używając do tego dpkg (być może przekazując mu opcje "
+"wymuszające \"--force-...\"), w takim stopniu, aby umożliwić działanie "
+"systemowi APT."
+
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:377
 msgid "The Status Report"
 msgstr "Raport stanu"
 
-#. type: <p></p>
-#: guide.sgml:363
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:379
 msgid ""
-"Before proceeding <prgn>apt-get</prgn> will present a report on what will "
-"happen. Generally the report reflects the type of operation being performed "
-"but there are several common elements. In all cases the lists reflect the "
-"final state of things, taking into account the <tt>-f</tt> option and any "
-"other relevant activities to the command being executed."
+"Before proceeding <command>apt-get</command> will present a report on what "
+"will happen. Generally the report reflects the type of operation being "
+"performed but there are several common elements. In all cases the lists "
+"reflect the final state of things, taking into account the <literal>-f</"
+"literal> option and any other relevant activities to the command being "
+"executed."
 msgstr ""
-"Przed rozpoczęciem przetwarzania <prgn>apt-get</prgn> wyświetli raport "
+"Przed rozpoczęciem przetwarzania <command>apt-get</command> wyświetli raport "
 "zawierający informacje o tym, co będzie zrobione. W ogólności raport ten "
 "zależy od typu wykonywanej operacji, jednakże występuje w nim kilka "
 "elementów wspólnych dla wszystkich typów. We wszystkich wypadkach "
-"wyświetlane są informacje o końcowym stanie, brana jest pod uwagę opcja <tt>-"
-"f</tt>, a także wszystkie istotne działania wykonywanego polecenia."
+"wyświetlane są informacje o końcowym stanie, brana jest pod uwagę opcja "
+"<literal>-f</literal>, a także wszystkie istotne działania wykonywanego "
+"polecenia."
 
-#. type: <heading></heading>
-#: guide.sgml:364
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:386
 msgid "The Extra Package list"
 msgstr "Lista dodatkowych pakietów"
 
-#. type: <example></example>
-#: guide.sgml:372
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:388
 #, no-wrap
 msgid ""
 "The following extra packages will be installed:\n"
@@ -8530,86 +8574,86 @@ msgid ""
 "  mailpgp xdpkg fileutils pinepgp zlib1g xlib6g perl-base\n"
 "  bin86 libgdbm1 libgdbmg1 quake-lib gmp2 bcc xbuffy\n"
 "  squake pgp-i python-base debmake ldso perl libreadlineg2\n"
-"  ssh"
+"  ssh\n"
 msgstr ""
 "Zostaną zainstalowane następujące dodatkowe pakiety:\n"
 "  libdbd-mysql-perl xlib6 zlib1 xzx libreadline2 libdbd-msql-perl\n"
 "  mailpgp xdpkg fileutils pinepgp zlib1g xlib6g perl-base\n"
 "  bin86 libgdbm1 libgdbmg1 quake-lib gmp2 bcc xbuffy\n"
 "  squake pgp-i python-base debmake ldso perl libreadlineg2\n"
-"  ssh"
+"  ssh\n"
 
-#. type: <p></p>
-#: guide.sgml:379
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:396
 msgid ""
 "The Extra Package list shows all of the packages that will be installed or "
 "upgraded in excess of the ones mentioned on the command line. It is only "
-"generated for an <tt>install</tt> command. The listed packages are often the "
-"result of an Auto Install."
+"generated for an <literal>install</literal> command. The listed packages are "
+"often the result of an Auto Install."
 msgstr ""
 "Lista dodatkowych pakietów wyświetla wszystkie pakiety, które będą "
 "zainstalowane lub zaktualizowane oprócz tych wymienionych w linii poleceń. "
-"Jest generowana tylko dla polecenia <tt>install</tt>. Wymienione pakiety są "
-"najczęściej wynikiem automatycznej instalacji."
+"Jest generowana tylko dla polecenia <literal>install</literal>. Wymienione "
+"pakiety są najczęściej wynikiem automatycznej instalacji."
 
-#. type: <heading></heading>
-#: guide.sgml:382
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:403
 msgid "The Packages to Remove"
 msgstr "Pakiety przeznaczone do usunięcia"
 
-#. type: <example></example>
-#: guide.sgml:389
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:405
 #, no-wrap
 msgid ""
 "The following packages will be REMOVED:\n"
 "  xlib6-dev xpat2 tk40-dev xkeycaps xbattle xonix\n"
 "  xdaliclock tk40 tk41 xforms0.86 ghostview xloadimage xcolorsel\n"
 "  xadmin xboard perl-debug tkined xtetris libreadline2-dev perl-suid\n"
-"  nas xpilot xfig"
+"  nas xpilot xfig\n"
 msgstr ""
 "Następujące pakiety zostaną USUNIĘTE:\n"
 "  xlib6-dev xpat2 tk40-dev xkeycaps xbattle xonix\n"
 "  xdaliclock tk40 tk41 xforms0.86 ghostview xloadimage xcolorsel\n"
 "  xadmin xboard perl-debug tkined xtetris libreadline2-dev perl-suid\n"
-"  nas xpilot xfig"
+"  nas xpilot xfig\n"
 
-#. type: <p></p>
-#: guide.sgml:399
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:412
 msgid ""
 "The Packages to Remove list shows all of the packages that will be removed "
 "from the system. It can be shown for any of the operations and should be "
 "given a careful inspection to ensure nothing important is to be taken off. "
-"The <tt>-f</tt> option is especially good at generating packages to remove "
-"so extreme care should be used in that case. The list may contain packages "
-"that are going to be removed because they are only partially installed, "
-"possibly due to an aborted installation."
+"The <literal>-f</literal> option is especially good at generating packages "
+"to remove so extreme care should be used in that case. The list may contain "
+"packages that are going to be removed because they are only partially "
+"installed, possibly due to an aborted installation."
 msgstr ""
 "Lista pakietów przeznaczonych do usunięcia wyświetla wszystkie pakiety, "
 "które zostaną usunięte z systemu. Może być pokazana dla każdej operacji i "
 "powinna być szczegółowo przeanalizowana, aby zapewnić, że żaden istotny "
-"pakiet nie będzie usunięty. W szczególności opcja <tt>-f</tt> może "
+"pakiet nie będzie usunięty. W szczególności opcja <literal>-f</literal> może "
 "wygenerować sporo pakietów do usunięcia, także w przypadku jej użycia należy "
 "szczególnie dokładnie przeanalizować wyświetlany raport. Lista może zawierać "
 "pakiety usuwane z powodu ich tylko częściowego zainstalowania, wynikającego "
 "być może z przerwania wcześniejszej instalacji."
 
-#. type: <heading></heading>
-#: guide.sgml:402
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:422
 msgid "The New Packages list"
 msgstr "Lista nowych pakietów"
 
-#. type: <example></example>
-#: guide.sgml:406
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:424
 #, no-wrap
 msgid ""
 "The following NEW packages will installed:\n"
-"  zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base"
+"  zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base\n"
 msgstr ""
 "Zostaną zainstalowane następujące NOWE pakiety:\n"
-"  zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base"
+"  zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base\n"
 
-#. type: <p></p>
-#: guide.sgml:411
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:428
 msgid ""
 "The New Packages list is simply a reminder of what will happen. The packages "
 "listed are not presently installed in the system but will be when APT is "
@@ -8619,58 +8663,58 @@ msgstr ""
 "pakiety nie są obecnie zainstalowane w systemie, ale będą, kiedy APT skończy "
 "działanie."
 
-#. type: <heading></heading>
-#: guide.sgml:414
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:433
 msgid "The Kept Back list"
 msgstr "Lista zatrzymanych pakietów"
 
-#. type: <example></example>
-#: guide.sgml:419
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:435
 #, no-wrap
 msgid ""
 "The following packages have been kept back\n"
 "  compface man-db tetex-base msql libpaper svgalib1\n"
-"  gs snmp arena lynx xpat2 groff xscreensaver"
+"  gs snmp arena lynx xpat2 groff xscreensaver\n"
 msgstr ""
 "Następujące pakiety zostały zatrzymane:\n"
 "  compface man-db tetex-base msql libpaper svgalib1\n"
-"  gs snmp arena lynx xpat2 groff xscreensaver"
+"  gs snmp arena lynx xpat2 groff xscreensaver\n"
 
-#. type: <p></p>
-#: guide.sgml:428
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:440
 msgid ""
 "Whenever the whole system is being upgraded there is the possibility that "
 "new versions of packages cannot be installed because they require new things "
 "or conflict with already installed things. In this case the package will "
 "appear in the Kept Back list. The best way to convince packages listed there "
-"to install is with <tt>apt-get install</tt> or by using <prgn>dselect</prgn> "
-"to resolve their problems."
+"to install is with <literal>apt-get install</literal> or by using "
+"<command>dselect</command> to resolve their problems."
 msgstr ""
 "Jeśli aktualizowany jest cały system, to jest możliwe, że nowe wersje "
 "pakietów nie będą mogły być zainstalowane, ponieważ wymagają nowych pakietów "
 "lub są w konflikcie z już zainstalowanymi pakietami. W takim wypadku pakiet "
 "pojawi się na liście pakietów zatrzymanych. Najlepszym sposobem na "
-"zainstalowanie takich pakietów jest użycie <tt>apt-get install</tt> lub "
-"rozwiązanie problemów z zależnościami za pomocą programu <prgn>dselect</"
-"prgn>."
+"zainstalowanie takich pakietów jest użycie <literal>apt-get install</"
+"literal> lub rozwiązanie problemów z zależnościami za pomocą programu "
+"<command>dselect</command>."
 
-#. type: <heading></heading>
-#: guide.sgml:431
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:449
 msgid "Held Packages warning"
 msgstr "Ostrzeżenie o zmianie zatrzymanych pakietów"
 
-#. type: <example></example>
-#: guide.sgml:435
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:451
 #, no-wrap
 msgid ""
 "The following held packages will be changed:\n"
-"  cvs"
+"  cvs\n"
 msgstr ""
 "Zostaną zmienione następujące zatrzymane pakiety:\n"
-"  cvs"
+"  cvs\n"
 
-#. type: <p></p>
-#: guide.sgml:441
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:455
 msgid ""
 "Sometimes you can ask APT to install a package that is on hold, in such a "
 "case it prints out a warning that the held package is going to be changed. "
@@ -8680,32 +8724,32 @@ msgstr ""
 "W takim przypadku wypisywane jest ostrzeżenie o zmianie zatrzymanego "
 "pakietu. Może się to zdarzyć tylko podczas dist-upgrade lub install."
 
-#. type: <heading></heading>
-#: guide.sgml:444
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:461
 msgid "Final summary"
 msgstr "Podsumowanie"
 
-#. type: <p></p>
-#: guide.sgml:447
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:463
 msgid ""
 "Finally, APT will print out a summary of all the changes that will occur."
 msgstr ""
 "APT zakończy raport podsumowaniem wszystkich zmian, które przeprowadzi."
 
-#. type: <example></example>
-#: guide.sgml:452
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:466
 #, no-wrap
 msgid ""
 "206 packages upgraded, 8 newly installed, 23 to remove and 51 not upgraded.\n"
 "12 packages not fully installed or removed.\n"
-"Need to get 65.7M/66.7M of archives. After unpacking 26.5M will be used."
+"Need to get 65.7M/66.7M of archives. After unpacking 26.5M will be used.\n"
 msgstr ""
 "206 aktualizowanych, 8 nowo instalowanych, 25 usuwanych i 51 nieaktualizowanych.\n"
 "12 nie w pełni zainstalowanych lub usuniętych.\n"
-"Konieczne pobranie 65.7M/66.7M archiwów. Po rozpakowaniu zostanie użyte 26.5M."
+"Konieczne pobranie 65.7M/66.7M archiwów. Po rozpakowaniu zostanie użyte 26.5M.\n"
 
-#. type: <p></p>
-#: guide.sgml:470
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:471
 msgid ""
 "The first line of the summary simply is a reduced version of all of the "
 "lists and includes the number of upgrades - that is packages already "
@@ -8734,8 +8778,8 @@ msgstr ""
 "będzie zajęta w /usr po zakończeniu instalacji. Wartość ta może wskazywać na "
 "zwolnienie miejsca na dysku, jeśli usuwana jest duża liczba pakietów."
 
-#. type: <p></p>
-#: guide.sgml:473
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:485
 msgid ""
 "Some other reports can be generated by using the -u option to show packages "
 "to upgrade, they are similar to the previous examples."
@@ -8743,13 +8787,13 @@ msgstr ""
 "Używając opcji -u, można wygenerować raport pokazujący pakiety przeznaczone "
 "do aktualizacji, podobny do tego pokazanego w poprzednim przykładzie."
 
-#. type: <heading></heading>
-#: guide.sgml:477
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:492
 msgid "The Status Display"
 msgstr "Wyświetlanie stanu przetwarzania"
 
-#. type: <p></p>
-#: guide.sgml:481
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:494
 msgid ""
 "During the download of archives and package files APT prints out a series of "
 "status messages."
@@ -8757,8 +8801,8 @@ msgstr ""
 "Podczas pobierania archiwów i plików pakietów APT wyświetla serię "
 "komunikatów o stanie."
 
-#. type: <example></example>
-#: guide.sgml:490
+#. type: Content of: <book><chapter><section><screen>
+#: guide.dbk:498
 #, no-wrap
 msgid ""
 "# apt-get update\n"
@@ -8767,7 +8811,7 @@ msgid ""
 "Hit http://llug.sep.bnl.gov/debian/ testing/main Packages\n"
 "Get:4 http://ftp.de.debian.org/debian-non-US/ unstable/binary-i386/ Packages\n"
 "Get:5 http://llug.sep.bnl.gov/debian/ testing/non-free Packages\n"
-"11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s"
+"11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s\n"
 msgstr ""
 "# apt-get update\n"
 "Pob:1 http://ftp.de.debian.org/debian-non-US/ stable/non-US/ Packages\n"
@@ -8775,127 +8819,126 @@ msgstr ""
 "Traf http://llug.sep.bnl.gov/debian/ testing/main Packages\n"
 "Pob:4 http://ftp.de.debian.org/debian-non-US/ unstable/binary-i386/ Packages\n"
 "Pob:5 http://llug.sep.bnl.gov/debian/ testing/non-free Packages\n"
-"11% [5 testing/non-free `Oczekiwane na nagłówki' 0/32.1k 0%] 2203b/s 1m52s"
+"11% [5 testing/non-free `Oczekiwane na nagłówki' 0/32.1k 0%] 2203b/s 1m52s\n"
 
-#. type: <p></p>
-#: guide.sgml:500
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:507
 msgid ""
-"The lines starting with <em>Get</em> are printed out when APT begins to "
-"fetch a file while the last line indicates the progress of the download. The "
-"first percent value on the progress line indicates the total percent done of "
-"all files. Unfortunately since the size of the Package files is unknown "
-"<tt>apt-get update</tt> estimates the percent done which causes some "
-"inaccuracies."
+"The lines starting with <emphasis>Get</emphasis> are printed out when APT "
+"begins to fetch a file while the last line indicates the progress of the "
+"download. The first percent value on the progress line indicates the total "
+"percent done of all files. Unfortunately since the size of the Package files "
+"is unknown <literal>apt-get update</literal> estimates the percent done "
+"which causes some inaccuracies."
 msgstr ""
-"Linie zaczynające się od <em>Pob:</em> są wypisywane, kiedy APT zaczyna "
-"pobierać plik, a ostatnia linia oznacza postęp pobierania. Pierwsza wartość "
-"podana w procentach określa całkowity procent pobierania wszystkich plików. "
-"Niestety rozmiar plików Package nie jest znany, tak więc <tt>apt-get update</"
-"tt> estymuje procent wykonanego pobierania, co powoduje pewne nieścisłości."
+"Linie zaczynające się od <emphasis>Pob:</emphasis> są wypisywane, kiedy APT "
+"zaczyna pobierać plik, a ostatnia linia oznacza postęp pobierania. Pierwsza "
+"wartość podana w procentach określa całkowity procent pobierania wszystkich "
+"plików. Niestety rozmiar plików Package nie jest znany, tak więc "
+"<literal>apt-get update</literal> estymuje procent wykonanego pobierania, co "
+"powoduje pewne nieścisłości."
 
-#. type: <p></p>
-#: guide.sgml:509
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:515
 msgid ""
 "The next section of the status line is repeated once for each download "
 "thread and indicates the operation being performed and some useful "
 "information about what is happening. Sometimes this section will simply read "
-"<em>Forking</em> which means the OS is loading the download module. The "
-"first word after the [ is the fetch number as shown on the history lines. "
-"The next word is the short form name of the object being downloaded. For "
-"archives it will contain the name of the package that is being fetched."
+"<emphasis>Forking</emphasis> which means the OS is loading the download "
+"module. The first word after the [ is the fetch number as shown on the "
+"history lines. The next word is the short form name of the object being "
+"downloaded. For archives it will contain the name of the package that is "
+"being fetched."
 msgstr ""
 "Następna sekcja linii statusu powtarza się dla każdego wątku pobierania, "
 "oznacza przeprowadzanie operacji i podaje kilka użytecznych informacji na "
-"temat tego, co się dzieje. Czasem sekcja ta zawiera komunikat <em>Tworzenie "
-"procesu potomnego</em>, co oznacza, że system operacyjny ładuje moduł "
-"pobierania. Pierwszym słowem po znaku \"[\" jest liczba pobrań, dokładnie "
-"taka jaka jest pokazana liczba linii historii pobrań. Następnie w skróconej "
-"formie wyświetlana jest nazwa pobieranego obiektu. W przypadku archiwów "
-"nazwa ta będzie zawierać nazwę pobieranego pakietu."
+"temat tego, co się dzieje. Czasem sekcja ta zawiera komunikat "
+"<emphasis>Tworzenie procesu potomnego</emphasis>, co oznacza, że system "
+"operacyjny ładuje moduł pobierania. Pierwszym słowem po znaku \"[\" jest "
+"liczba pobrań, dokładnie taka jaka jest pokazana liczba linii historii "
+"pobrań. Następnie w skróconej formie wyświetlana jest nazwa pobieranego "
+"obiektu. W przypadku archiwów nazwa ta będzie zawierać nazwę pobieranego "
+"pakietu."
 
-#. type: <p></p>
-#: guide.sgml:524
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:525
 msgid ""
 "Inside of the single quote is an informative string indicating the progress "
 "of the negotiation phase of the download. Typically it progresses from "
-"<em>Connecting</em> to <em>Waiting for file</em> to <em>Downloading</em> or "
-"<em>Resuming</em>. The final value is the number of bytes downloaded from "
-"the remote site. Once the download begins this is represented as "
-"<tt>102/10.2k</tt> indicating that 102 bytes have been fetched and 10.2 "
-"kilobytes is expected. The total size is always shown in 4 figure notation "
-"to preserve space. After the size display is a percent meter for the file "
-"itself. The second last element is the instantaneous average speed. This "
-"values is updated every 5 seconds and reflects the rate of data transfer for "
-"that period. Finally is shown the estimated transfer time. This is updated "
-"regularly and reflects the time to complete everything at the shown transfer "
-"rate."
+"<emphasis>Connecting</emphasis> to <emphasis>Waiting for file</emphasis> to "
+"<emphasis>Downloading</emphasis> or <emphasis>Resuming</emphasis>. The final "
+"value is the number of bytes downloaded from the remote site. Once the "
+"download begins this is represented as <literal>102/10.2k</literal> "
+"indicating that 102 bytes have been fetched and 10.2 kilobytes is expected. "
+"The total size is always shown in 4 figure notation to preserve space. After "
+"the size display is a percent meter for the file itself. The second last "
+"element is the instantaneous average speed. This values is updated every 5 "
+"seconds and reflects the rate of data transfer for that period. Finally is "
+"shown the estimated transfer time. This is updated regularly and reflects "
+"the time to complete everything at the shown transfer rate."
 msgstr ""
 "W pojedynczych cudzysłowach podawany jest komunikat wskazujący na postęp "
 "tworzenia połączenia pobierania danych. Zazwyczaj postęp ten jest sekwencją "
-"zdarzeń od <em>Podłączanie</em> przez <em>Oczekiwanie na nagłówki</em> do "
-"<em>Pobieranie</em> lub <em>Wznawianie</em>. Końcową wartością jest liczba "
-"bajtów pobranych ze zdalnego serwera. Kiedy tylko pobieranie się rozpocznie, "
-"wartość ta jest wyświetlana jw formacie typu <tt>102/10.2k</tt>, co oznacza, "
-"że pobrano 102 bajty, a oczekuje się jeszcze pobrania 10.2 kilobajtów. Aby "
-"zaoszczędzić miejsce, całkowity rozmiar jest zawsze wyświetlany jako w "
-"postaci 4-znakowej. Po rozmiarze następuje procentowy wskaźnik postępu "
-"pobierania danego pliku. Przedostatnim elementem jest bieżąca średnia "
-"prędkość pobierania, która jest aktualizowane co każde 5 sekund i "
-"odzwierciedla tempo pobierania w tym okresie. W końcu wyświetlany jest "
-"estymowany czas pobierania, regularnie aktualizowany i odzwierciedlający "
-"czas pozostały do zakończenia pobierania przy założeniu utrzymania się "
-"pokazanego tempa pobierania."
-
-#. type: <p></p>
-#: guide.sgml:530
+"zdarzeń od <emphasis>Podłączanie</emphasis> przez <emphasis>Oczekiwanie na "
+"nagłówki</emphasis> do <emphasis>Pobieranie</emphasis> lub "
+"<emphasis>Wznawianie</emphasis>. Końcową wartością jest liczba bajtów "
+"pobranych ze zdalnego serwera. Kiedy tylko pobieranie się rozpocznie, "
+"wartość ta jest wyświetlana jw formacie typu <literal>102/10.2k</literal>, "
+"co oznacza, że pobrano 102 bajty, a oczekuje się jeszcze pobrania 10.2 "
+"kilobajtów. Aby zaoszczędzić miejsce, całkowity rozmiar jest zawsze "
+"wyświetlany jako w postaci 4-znakowej. Po rozmiarze następuje procentowy "
+"wskaźnik postępu pobierania danego pliku. Przedostatnim elementem jest "
+"bieżąca średnia prędkość pobierania, która jest aktualizowane co każde 5 "
+"sekund i odzwierciedla tempo pobierania w tym okresie. W końcu wyświetlany "
+"jest estymowany czas pobierania, regularnie aktualizowany i "
+"odzwierciedlający czas pozostały do zakończenia pobierania przy założeniu "
+"utrzymania się pokazanego tempa pobierania."
+
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:540
 msgid ""
 "The status display updates every half second to provide a constant feedback "
 "on the download progress while the Get lines scroll back whenever a new file "
 "is started. Since the status display is constantly updated it is unsuitable "
-"for logging to a file, use the <tt>-q</tt> option to remove the status "
-"display."
+"for logging to a file, use the <literal>-q</literal> option to remove the "
+"status display."
 msgstr ""
 "Linia stanu jest aktualizowana co każde pół sekundy, aby na bieżąco "
 "informować użytkownika o postępie pobierania, podczas gdy linie \"Pob:\" są "
 "przesuwane w dół, gdy tylko zacznie się pobieranie nowego pliku. Ponieważ "
 "linia stanu jest ciągle zmieniana, wyjście programu nie jest odpowiednie do "
-"przekierowania do pliku. Aby usunąć linie stanu, należy użyć opcji <tt>-q</"
-"tt>."
+"przekierowania do pliku. Aby usunąć linie stanu, należy użyć opcji <literal>-"
+"q</literal>."
 
-#. type: <heading></heading>
-#: guide.sgml:535
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:548
 msgid "Dpkg"
 msgstr "Dpkg"
 
-#. type: <p></p>
-#: guide.sgml:542
-msgid ""
-"APT uses <prgn>dpkg</prgn> for installing the archives and will switch over "
-"to the <prgn>dpkg</prgn> interface once downloading is completed. "
-"<prgn>dpkg</prgn> will also ask a number of questions as it processes the "
-"packages and the packages themselves may also ask several questions. Before "
-"each question there is usually a description of what it is asking and the "
-"questions are too varied to discuss completely here."
-msgstr ""
-"APT używa programu <prgn>dpkg</prgn> do instalowania archiwów i przełączy "
-"się do interfejsu <prgn>dpkg</prgn>, gdy tylko zakończy pobieranie plików. "
-"<prgn>dpkg</prgn> może również zadawać pytania podczas przetwarzania "
-"pakietów, a same pakiety także mogą zadawać pytania. Każde pytanie zazwyczaj "
-"jest poprzedzone opisem, a same pytania są zbyt zróżnicowane, by je tutaj "
-"opisać."
-
-#. type: <title></title>
-#: offline.sgml:4
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:550
+msgid ""
+"APT uses <command>dpkg</command> for installing the archives and will switch "
+"over to the <command>dpkg</command> interface once downloading is completed. "
+"<command>dpkg</command> will also ask a number of questions as it processes "
+"the packages and the packages themselves may also ask several questions. "
+"Before each question there is usually a description of what it is asking and "
+"the questions are too varied to discuss completely here."
+msgstr ""
+"APT używa programu <command>dpkg</command> do instalowania archiwów i "
+"przełączy się do interfejsu <command>dpkg</command>, gdy tylko zakończy "
+"pobieranie plików. <command>dpkg</command> może również zadawać pytania "
+"podczas przetwarzania pakietów, a same pakiety także mogą zadawać pytania. "
+"Każde pytanie zazwyczaj jest poprzedzone opisem, a same pytania są zbyt "
+"zróżnicowane, by je tutaj opisać."
+
+#. type: Content of: <book><title>
+#: offline.dbk:11
 msgid "Using APT Offline"
 msgstr "Używanie APT w trybie offline"
 
-#. type: <version></version>
-#: offline.sgml:7
-msgid "$Id: offline.sgml,v 1.8 2003/02/12 15:06:41 doogie Exp $"
-msgstr "$Id: offline.sgml,v 1.8 2003/02/12 15:06:41 doogie Exp $"
-
-#. type: <abstract></abstract>
-#: offline.sgml:12
+#. type: Content of: <book><bookinfo><abstract><para>
+#: offline.dbk:25
 msgid ""
 "This document describes how to use APT in a non-networked environment, "
 "specifically a 'sneaker-net' approach for performing upgrades."
@@ -8904,23 +8947,24 @@ msgstr ""
 "dostępu, do sieci, a w szczególności metodę pozwalającą na przeprowadzanie "
 "aktualizacji systemu."
 
-#. type: <copyrightsummary></copyrightsummary>
-#: offline.sgml:16
-msgid "Copyright &copy; Jason Gunthorpe, 1999."
-msgstr "Copyright &copy; Jason Gunthorpe, 1999."
+#. type: Content of: <book><bookinfo>
+#: offline.dbk:30
+msgid ""
+"<copyright><year>1999</year><holder>Jason Gunthorpe</holder></copyright>"
+msgstr ""
 
-#. type: <heading></heading>
-#: offline.sgml:32
+#. type: Content of: <book><chapter><title>
+#: offline.dbk:48
 msgid "Introduction"
 msgstr "Wstęp"
 
-#. type: <heading></heading>
-#: offline.sgml:34 offline.sgml:65 offline.sgml:180
+#. type: Content of: <book><chapter><section><title>
+#: offline.dbk:50 offline.dbk:80 offline.dbk:192
 msgid "Overview"
 msgstr "Wprowadzenie"
 
-#. type: <p></p>
-#: offline.sgml:40
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:52
 msgid ""
 "Normally APT requires direct access to a Debian archive, either from a local "
 "media or through a network. Another common complaint is that a Debian "
@@ -8932,8 +8976,8 @@ msgstr ""
 "że nasz komputer, który pracuje na powolnym łączu takim jak modem, jest "
 "znacznie oddalony od innego komputera z szybkim łączem."
 
-#. type: <p></p>
-#: offline.sgml:51
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:58
 msgid ""
 "The solution to this is to use large removable media such as a Zip disc or a "
 "SuperDisk disc. These discs are not large enough to store the entire Debian "
@@ -8941,9 +8985,9 @@ msgid ""
 "to use APT to generate a list of packages that are required and then fetch "
 "them onto the disc using another machine with good connectivity. It is even "
 "possible to use another Debian machine with APT or to use a completely "
-"different OS and a download tool like wget. Let <em>remote host</em> mean "
-"the machine downloading the packages, and <em>target host</em> the one with "
-"bad or no connection."
+"different OS and a download tool like wget. Let <emphasis>remote host</"
+"emphasis> mean the machine downloading the packages, and <emphasis>target "
+"host</emphasis> the one with bad or no connection."
 msgstr ""
 "Rozwiązaniem tego problemu jest użycie pojemnych przenośnych nośników takich "
 "jak dyskietka Zip lub dysk SuperDisk. Nośniki te nie są wystarczająco "
@@ -8956,8 +9000,8 @@ msgstr ""
 "innym systemem operacyjnym i programem narzędziowym do pobierania plików "
 "takim jak wget."
 
-#. type: <p></p>
-#: offline.sgml:57
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:69
 msgid ""
 "This is achieved by creatively manipulating the APT configuration file. The "
 "essential premise to tell APT to look on a disc for it's archive files. Note "
@@ -8970,13 +9014,13 @@ msgstr ""
 "sformatowany do obsługi systemu plików pozwalającego posługiwać się długimi "
 "nazwami plików (np. ext2, fat32 albo vfat)."
 
-#. type: <heading></heading>
-#: offline.sgml:63
+#. type: Content of: <book><chapter><title>
+#: offline.dbk:78
 msgid "Using APT on both machines"
 msgstr "Używanie programu APT na obu komputerach"
 
-#. type: <p><example>
-#: offline.sgml:71
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:82
 msgid ""
 "APT being available on both machines gives the simplest configuration. The "
 "basic idea is to place a copy of the status file on the disc and use the "
@@ -8989,8 +9033,8 @@ msgstr ""
 "które pakiety trzeba pobrać. Struktura katalogów na dysku powinna wyglądać "
 "następująco:"
 
-#. type: <example></example>
-#: offline.sgml:80
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:88
 #, no-wrap
 msgid ""
 "  /disc/\n"
@@ -9000,7 +9044,7 @@ msgid ""
 "       partial/\n"
 "    status\n"
 "    sources.list\n"
-"    apt.conf"
+"    apt.conf\n"
 msgstr ""
 "  /disc/\n"
 "    archives/\n"
@@ -9009,40 +9053,42 @@ msgstr ""
 "       partial/\n"
 "    status\n"
 "    sources.list\n"
-"    apt.conf"
+"    apt.conf\n"
 
-#. type: <heading></heading>
-#: offline.sgml:88
+#. type: Content of: <book><chapter><section><title>
+#: offline.dbk:99
 msgid "The configuration file"
 msgstr "Plik konfiguracyjny"
 
-#. type: <p></p>
-#: offline.sgml:96
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:101
 msgid ""
 "The configuration file should tell APT to store its files on the disc and to "
 "use the configuration files on the disc as well. The sources.list should "
 "contain the proper sites that you wish to use from the remote machine, and "
-"the status file should be a copy of <em>/var/lib/dpkg/status</em> from the "
-"<em>target host</em>. Please note, if you are using a local archive you must "
-"use copy URIs, the syntax is identical to file URIs."
+"the status file should be a copy of <emphasis>/var/lib/dpkg/status</"
+"emphasis> from the <emphasis>target host</emphasis>. Please note, if you are "
+"using a local archive you must use copy URIs, the syntax is identical to "
+"file URIs."
 msgstr ""
 "Plik konfiguracyjny powinien informować program APT, aby przechowywał swoje "
 "pliki na dysku, a także używał plików konfiguracyjnych z dysku. Plik sources."
 "list powinien zawierać prawidłowe odnośniki, których należy użyć na zdalnym "
-"komputerze, a plik status powinien być kopią <em>/var/lib/dpkg/status</em>. "
-"Należy zauważyć, że podczas używania lokalnego archiwum trzeba użyć tych "
-"samych odnośników o identycznej składni."
+"komputerze, a plik status powinien być kopią <emphasis>/var/lib/dpkg/status</"
+"emphasis>. Należy zauważyć, że podczas używania lokalnego archiwum trzeba "
+"użyć tych samych odnośników o identycznej składni."
 
-#. type: <p><example>
-#: offline.sgml:100
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:109
 msgid ""
-"<em>apt.conf</em> must contain the necessary information to make APT use the "
-"disc:"
+"<emphasis>apt.conf</emphasis> must contain the necessary information to make "
+"APT use the disc:"
 msgstr ""
-"<em>apt.conf</em> musi zawierać niezbędne wpisy, by APT korzystał z dysku:"
+"<emphasis>apt.conf</emphasis> musi zawierać niezbędne wpisy, by APT "
+"korzystał z dysku:"
 
-#. type: <example></example>
-#: offline.sgml:124
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:113
 #, no-wrap
 msgid ""
 " APT\n"
@@ -9050,10 +9096,10 @@ msgid ""
 "   /* This is not necessary if the two machines are the same arch, it tells\n"
 "      the remote APT what architecture the target machine is */\n"
 "   Architecture \"i386\";\n"
-"   \n"
+"\n"
 "   Get::Download-Only \"true\";\n"
 " };\n"
-" \n"
+"\n"
 " Dir\n"
 " {\n"
 "   /* Use the disc for state information and redirect the status file from\n"
@@ -9064,20 +9110,20 @@ msgid ""
 "   // Binary caches will be stored locally\n"
 "   Cache::archives \"/disc/archives/\";\n"
 "   Cache \"/tmp/\";\n"
-"   \n"
+"\n"
 "   // Location of the source list.\n"
 "   Etc \"/disc/\";\n"
-" };"
+" };\n"
 msgstr ""
 " APT\n"
 " {\n"
 "   /* Wpis nie jest wymagany, jeśli oba komputery mają tę samą architekturę;\n"
 "    podaje architekturę naszego komputera programowi APT na odległym komputerze */\n"
 "   Architecture \"i386\";\n"
-"   \n"
+"\n"
 "   Get::Download-Only \"true\";\n"
 " };\n"
-" \n"
+"\n"
 " Dir\n"
 " {\n"
 "   /* Używaj katalogu disc na informacje stanu i przekieruj plik status\n"
@@ -9088,68 +9134,71 @@ msgstr ""
 "   // Katalog lokalnie przechowywanych pakietów binarnych\n"
 "   Cache::archives \"/disc/archives/\";\n"
 "   Cache \"/tmp/\";\n"
-"   \n"
+"\n"
 "   // Lokalizacja pliku sources.list.\n"
 "   Etc \"/disc\";\n"
-" };"
+" };\n"
 
-#. type: </example></p>
-#: offline.sgml:129
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:138
 msgid ""
 "More details can be seen by examining the apt.conf man page and the sample "
-"configuration file in <em>/usr/share/doc/apt/examples/apt.conf</em>."
+"configuration file in <emphasis>/usr/share/doc/apt/examples/apt.conf</"
+"emphasis>."
 msgstr ""
 "Więcej szczegółów można zobaczyć w stronie podręcznika apt.conf i w "
-"przykładowym pliku konfiguracyjnym <em>/usr/share/doc/apt/examples/apt.conf</"
-"em>."
+"przykładowym pliku konfiguracyjnym <emphasis>/usr/share/doc/apt/examples/apt."
+"conf</emphasis>."
 
-#. type: <p><example>
-#: offline.sgml:136
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:143
 msgid ""
-"On the target machine the first thing to do is mount the disc and copy <em>/"
-"var/lib/dpkg/status</em> to it. You will also need to create the directories "
-"outlined in the Overview, <em>archives/partial/</em> and <em>lists/partial/</"
-"em>. Then take the disc to the remote machine and configure the sources."
-"list. On the remote machine execute the following:"
+"On the target machine the first thing to do is mount the disc and copy "
+"<emphasis>/var/lib/dpkg/status</emphasis> to it. You will also need to "
+"create the directories outlined in the Overview, <emphasis>archives/partial/"
+"</emphasis> and <emphasis>lists/partial/</emphasis>. Then take the disc to "
+"the remote machine and configure the sources.list. On the remote machine "
+"execute the following:"
 msgstr ""
 "Pierwszą rzeczą, jaką należy zrobić na oddalonym komputerze z Debianem to "
-"zamontować dysk i przekopiować na niego plik <em>/var/lib/dpkg/status</em>. "
-"Trzeba także utworzyć strukturę katalogów przedstawioną we \"Wprowadzeniu\": "
-"<em>archives/partial/</em> i <em>lists/partial/</em>. Następnie należy "
-"przenieść dysk do oddalonego komputera z szybkim łączem i skonfigurować plik "
-"sources.list. Na oddalonym komputerze wykonujemy kolejno:"
-
-#. type: <example></example>
-#: offline.sgml:142
+"zamontować dysk i przekopiować na niego plik <emphasis>/var/lib/dpkg/status</"
+"emphasis>. Trzeba także utworzyć strukturę katalogów przedstawioną we "
+"\"Wprowadzeniu\": <emphasis>archives/partial/</emphasis> i <emphasis>lists/"
+"partial/</emphasis>. Następnie należy przenieść dysk do oddalonego komputera "
+"z szybkim łączem i skonfigurować plik sources.list. Na oddalonym komputerze "
+"wykonujemy kolejno:"
+
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:152
 #, no-wrap
 msgid ""
 " # export APT_CONFIG=\"/disc/apt.conf\"\n"
 " # apt-get update\n"
 " [ APT fetches the package files ]\n"
 " # apt-get dist-upgrade\n"
-" [ APT fetches all the packages needed to upgrade the target machine ]"
+" [ APT fetches all the packages needed to upgrade the target machine ]\n"
 msgstr ""
 " # export APT_CONFIG=\"/disc/apt.conf\"\n"
 " # apt-get update\n"
 " [ APT aktualizuje ustawienia ]\n"
 " # apt-get dist-upgrade\n"
-" [ APT pobiera wszystkie pakiety potrzebne do aktualizacji Twojego systemu ]"
+" [ APT pobiera wszystkie pakiety potrzebne do aktualizacji Twojego systemu ]\n"
 
-#. type: </example></p>
-#: offline.sgml:149
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:159
 msgid ""
 "The dist-upgrade command can be replaced with any other standard APT "
 "commands, particularly dselect-upgrade. You can even use an APT front end "
-"such as <em>dselect</em>. However this presents a problem in communicating "
-"your selections back to the local computer."
+"such as <emphasis>dselect</emphasis>. However this presents a problem in "
+"communicating your selections back to the local computer."
 msgstr ""
 "Polecenie dist-upgrade można zastąpić każdym innym podstawowym poleceniem "
 "APT, w szczególności dselect-upgrade. Można nawet użyć APT jako metody "
-"dostępu dla <em>dselect</em>. Jednak stworzy to problem w przeniesieniu "
-"Twoich operacji wyborów z powrotem na lokalny komputer."
+"dostępu dla <emphasis>dselect</emphasis>. Jednak stworzy to problem w "
+"przeniesieniu Twoich operacji wyborów z powrotem na lokalny komputer."
 
-#. type: <p><example>
-#: offline.sgml:153
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:165
 msgid ""
 "Now the disc contains all of the index files and archives needed to upgrade "
 "the target machine. Take the disc back and run:"
@@ -9158,24 +9207,24 @@ msgstr ""
 "niezbędne do aktualizacji maszyny z Debianem. Bierzemy dysk z powrotem do "
 "siebie i wpisujemy:"
 
-#. type: <example></example>
-#: offline.sgml:159
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:169
 #, no-wrap
 msgid ""
 "  # export APT_CONFIG=\"/disc/apt.conf\"\n"
 "  # apt-get check\n"
 "  [ APT generates a local copy of the cache files ]\n"
 "  # apt-get --no-d -o dir::state::status=/var/lib/dpkg/status dist-upgrade\n"
-"  [ Or any other APT command ]"
+"  [ Or any other APT command ]\n"
 msgstr ""
 "  # export APT_CONFIG=\"/disc/apt.conf\"\n"
 "  # apt-get check\n"
 "  [ APT tworzy lokalną kopię plików cache ]\n"
 "  # apt-get --no-d -o dir::state::status=/var/lib/dpkg/status dist-upgrade\n"
-"  [ Może też być inne polecenie programu APT ]"
+"  [ Może też być inne polecenie programu APT ]\n"
 
-#. type: <p></p>
-#: offline.sgml:165
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:176
 msgid ""
 "It is necessary for proper function to re-specify the status file to be the "
 "local one. This is very important!"
@@ -9183,8 +9232,8 @@ msgstr ""
 "Do prawidłowego działania koniecznie należy podać plik status z lokalnej "
 "maszyny. To jest bardzo ważne!"
 
-#. type: <p></p>
-#: offline.sgml:172
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:180
 msgid ""
 "If you are using dselect you can do the very risky operation of copying disc/"
 "status to /var/lib/dpkg/status so that any selections you made on the remote "
@@ -9199,25 +9248,25 @@ msgstr ""
 "to możliwe. NIE podmieniaj pliku status, jeśli dpkg lub APT były uruchamiane "
 "w międzyczasie!"
 
-#. type: <heading></heading>
-#: offline.sgml:178
+#. type: Content of: <book><chapter><title>
+#: offline.dbk:190
 msgid "Using APT and wget"
 msgstr "Używanie programów APT i wget"
 
-#. type: <p></p>
-#: offline.sgml:185
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:194
 msgid ""
-"<em>wget</em> is a popular and portable download tool that can run on nearly "
-"any machine. Unlike the method above this requires that the Debian machine "
-"already has a list of available packages."
+"<emphasis>wget</emphasis> is a popular and portable download tool that can "
+"run on nearly any machine. Unlike the method above this requires that the "
+"Debian machine already has a list of available packages."
 msgstr ""
-"<em>wget</em> jest popularnym i przenośnym programem narzędziowym pobierania "
-"plików, który działa prawie na każdym komputerze. W przeciwieństwie do "
-"metody opisanej powyżej ta wymaga, aby na lokalnym komputerze była aktualna "
-"lista dostępnych pakietów."
+"<emphasis>wget</emphasis> jest popularnym i przenośnym programem "
+"narzędziowym pobierania plików, który działa prawie na każdym komputerze. W "
+"przeciwieństwie do metody opisanej powyżej ta wymaga, aby na lokalnym "
+"komputerze była aktualna lista dostępnych pakietów."
 
-#. type: <p></p>
-#: offline.sgml:190
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:199
 msgid ""
 "The basic idea is to create a disc that has only the archive files "
 "downloaded from the remote site. This is done by using the --print-uris "
@@ -9229,13 +9278,13 @@ msgstr ""
 "następnie przygotujemy skrypt dla programu wget, który pobierze właściwe "
 "pakiety."
 
-#. type: <heading></heading>
-#: offline.sgml:196
+#. type: Content of: <book><chapter><section><title>
+#: offline.dbk:205
 msgid "Operation"
 msgstr "Kolejne kroki"
 
-#. type: <p><example>
-#: offline.sgml:200
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:207
 msgid ""
 "Unlike the previous technique no special configuration files are required. "
 "We merely use the standard APT commands to generate the file list."
@@ -9244,22 +9293,22 @@ msgstr ""
 "plików konfiguracyjnych. Używamy jedynie podstawowych poleceń APT, by "
 "wygenerować listę plików."
 
-#. type: <example></example>
-#: offline.sgml:205
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:211
 #, no-wrap
 msgid ""
-" # apt-get dist-upgrade \n"
+" # apt-get dist-upgrade\n"
 " [ Press no when prompted, make sure you are happy with the actions ]\n"
-" # apt-get -qq --print-uris dist-upgrade > uris\n"
-" # awk '{print \"wget -O \" $2 \" \" $1}' < uris > /disc/wget-script"
+" # apt-get -qq --print-uris dist-upgrade &gt; uris\n"
+" # awk '{print \"wget -O \" $2 \" \" $1}' &lt; uris &gt; /disc/wget-script\n"
 msgstr ""
 " # apt-get dist-upgrade \n"
 " [ Wybierz \"no\" po znaku zachęty, upewnij się, czy to właściwy wybór ]\n"
-" # apt-get -qq --print-uris dist-upgrade > uris\n"
-" # awk '{print \"wget -O \" $2 \" \" $1}' < uris > /disc/wget-script"
+" # apt-get -qq --print-uris dist-upgrade &gt; uris\n"
+" # awk '{print \"wget -O \" $2 \" \" $1}' &lt; uris &gt; /disc/wget-script\n"
 
-#. type: </example></p>
-#: offline.sgml:210
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:217
 msgid ""
 "Any command other than dist-upgrade could be used here, including dselect-"
 "upgrade."
@@ -9267,8 +9316,8 @@ msgstr ""
 "Można tu użyć także polecenia innego niż dist-upgrade, na przykład dselect-"
 "upgrade."
 
-#. type: <p></p>
-#: offline.sgml:216
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:221
 msgid ""
 "The /disc/wget-script file will now contain a list of wget commands to "
 "execute in order to fetch the necessary archives. This script should be run "
@@ -9280,25 +9329,25 @@ msgstr ""
 "uruchomić w bieżącym katalogu o punkcie montowania disc, tak aby zapisywał "
 "dane na tym dysku."
 
-#. type: <p><example>
-#: offline.sgml:219
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:227
 msgid "The remote machine would do something like"
 msgstr "Na oddalonym komputerze należy wykonać coś takiego"
 
-#. type: <example></example>
-#: offline.sgml:223
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:230
 #, no-wrap
 msgid ""
 "  # cd /disc\n"
 "  # sh -x ./wget-script\n"
-"  [ wait.. ]"
+"  [ wait.. ]\n"
 msgstr ""
 "  # cd /disc\n"
 "  # sh -x ./wget-script\n"
-"  [ czekaj.. ]"
+"  [ czekaj.. ]\n"
 
-#. type: </example><example>
-#: offline.sgml:228
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:235
 msgid ""
 "Once the archives are downloaded and the disc returned to the Debian machine "
 "installation can proceed using,"
@@ -9306,14 +9355,14 @@ msgstr ""
 "Gdy archiwa zostaną pobrane i dysk wróci do komputera z Debianem, "
 "instalowanie można prowadzić dalej poleceniem:"
 
-#. type: <example></example>
-#: offline.sgml:230
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:239
 #, no-wrap
-msgid "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade"
-msgstr "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade"
+msgid "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade\n"
+msgstr "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade\n"
 
-#. type: </example></p>
-#: offline.sgml:234
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:242
 msgid "Which will use the already fetched archives on the disc."
 msgstr "Które użyje pobranych uprzednio archiwów z dysku."
 
@@ -9329,14 +9378,12 @@ msgstr "Które użyje pobranych uprzednio archiwów z dysku."
 #~ msgid "NAME"
 #~ msgstr "NAZWA"
 
-#
 #~ msgid "apt - Advanced Package Tool"
 #~ msgstr "apt - Zaawansowane narzędzie zarządzania pakietami"
 
 #~ msgid "SYNOPSIS"
 #~ msgstr "SKŁADNIA"
 
-#
 #~ msgid "B<apt>"
 #~ msgstr "B<apt>"
 
@@ -9364,7 +9411,6 @@ msgstr "Które użyje pobranych uprzednio archiwów z dysku."
 #~ msgid "SEE ALSO"
 #~ msgstr "ZOBACZ TAKŻE"
 
-#
 #, fuzzy
 #~| msgid ""
 #~| "B<apt-cache>(8), B<apt-get>(8), B<apt.conf>(5), B<sources.list>(5), "
@@ -9379,7 +9425,6 @@ msgstr "Które użyje pobranych uprzednio archiwów z dysku."
 #~ msgid "DIAGNOSTICS"
 #~ msgstr "DIAGNOSTYKA"
 
-#
 #~ msgid "apt returns zero on normal operation, decimal 100 on error."
 #~ msgstr ""
 #~ "apt zwraca zero, jeżeli zakończyło się pomyślnie, 100 dziesiętnie w "
@@ -9388,11 +9433,9 @@ msgstr "Które użyje pobranych uprzednio archiwów z dysku."
 #~ msgid "BUGS"
 #~ msgstr "BŁĘDY"
 
-#
 #~ msgid "This manpage isn't even started."
 #~ msgstr "Ta strona podręcznika nie jest nawet zaczęta."
 
-#
 #~ msgid ""
 #~ "See E<lt>http://bugs.debian.org/aptE<gt>.  If you wish to report a bug in "
 #~ "B<apt>, please see I</usr/share/doc/debian/bug-reporting.txt> or the "
@@ -9405,7 +9448,6 @@ msgstr "Które użyje pobranych uprzednio archiwów z dysku."
 #~ msgid "AUTHOR"
 #~ msgstr "AUTOR"
 
-#
 #~ msgid "apt was written by the APT team E<lt>apt@packages.debian.orgE<gt>."
 #~ msgstr ""
 #~ "apt zostało napisane przez zespół APT E<lt>apt@packages.debian.orgE<gt>."
@@ -9445,7 +9487,6 @@ msgstr "Które użyje pobranych uprzednio archiwów z dysku."
 #~ "Universal Resource Locator - URL). Pozostała część linii może być "
 #~ "komentarzem, jeśli zaczyna się od znaku \"#\"."
 
-#
 #~ msgid ""
 #~ "<literal>gencaches</literal> performs the same operation as <command>apt-"
 #~ "get check</command>. It builds the source and package caches from the "
@@ -9457,7 +9498,6 @@ msgstr "Które użyje pobranych uprzednio archiwów z dysku."
 #~ "podstawie źródeł wymienionych w &sources-list; oraz pliku <filename>/var/"
 #~ "lib/dpkg/status</filename>."
 
-#
 #~ msgid ""
 #~ "Unless the <option>-h</option>, or <option>--help</option> option is "
 #~ "given one of the commands below must be present.  <placeholder type="
@@ -9467,14 +9507,12 @@ msgstr "Które użyje pobranych uprzednio archiwów z dysku."
 #~ "<option>-h</option> lub <option>--help</option>. <placeholder type="
 #~ "\"variablelist\" id=\"0\"/>"
 
-#
 #~ msgid "APT package handling utility -- cache manipulator"
 #~ msgstr "Narzędzie zarządzania pakietami APT -- manipulator bufora"
 
 #~ msgid "add <replaceable>file(s)</replaceable>"
 #~ msgstr "add <replaceable>plik(i)</replaceable>"
 
-#
 #~ msgid ""
 #~ "<literal>add</literal> adds the named package index files to the package "
 #~ "cache.  This is for debugging only."
diff --git a/doc/po/pt.po b/doc/po/pt.po
index 0c3052c72..c92a2016d 100644
--- a/doc/po/pt.po
+++ b/doc/po/pt.po
@@ -2,20 +2,20 @@
 # Copyright (C) 2009 Free Software Foundation, Inc.
 # This file is distributed under the same license as the apt package.
 #
-# Américo Monteiro <a_monteiro@netcabo.pt>, 2009, 2010, 2012.
+# Américo Monteiro <a_monteiro@gmx.com>, 2009 - 2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: apt 0.9.7.1\n"
+"Project-Id-Version: apt 1.0.7\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-11 14:52+0200\n"
-"PO-Revision-Date: 2014-04-01 13:59+0200\n"
-"Last-Translator: Américo Monteiro <a_monteiro@netcabo.pt>\n"
-"Language-Team: Portuguese <l10n@debianpt.org>\n"
+"POT-Creation-Date: 2014-08-29 11:04+0200\n"
+"PO-Revision-Date: 2014-08-29 00:34+0100\n"
+"Last-Translator: Américo Monteiro <a_monteiro@gmx.com>\n"
+"Language-Team: Portuguese <traduz@debianpt.org>\n"
 "Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.5\n"
+"X-Generator: Lokalize 1.4\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. type: Plain text
@@ -660,82 +660,90 @@ msgstr ""
 "export 473041FA --> <!ENTITY synopsis-keyid \"id_de_chave\">"
 
 #. type: Content of: <refentry><refmeta><manvolnum>
-#: apt.8.xml:25 apt-get.8.xml:28 apt-cache.8.xml:28 apt-key.8.xml:27
-#: apt-mark.8.xml:28 apt-secure.8.xml:27 apt-cdrom.8.xml:27
-#: apt-config.8.xml:28
+#: apt.8.xml:21 apt-get.8.xml:22 apt-cache.8.xml:22 apt-key.8.xml:21
+#: apt-mark.8.xml:22 apt-secure.8.xml:21 apt-cdrom.8.xml:21
+#: apt-config.8.xml:22
 msgid "8"
 msgstr "8"
 
 #. type: Content of: <refentry><refmeta><refmiscinfo>
-#: apt.8.xml:26 apt-get.8.xml:29 apt-cache.8.xml:29 apt-key.8.xml:28
-#: apt-mark.8.xml:29 apt-secure.8.xml:28 apt-cdrom.8.xml:28
-#: apt-config.8.xml:29 apt.conf.5.xml:34 apt_preferences.5.xml:28
-#: sources.list.5.xml:29 apt-extracttemplates.1.xml:29 apt-sortpkgs.1.xml:29
-#: apt-ftparchive.1.xml:29
+#: apt.8.xml:22 apt-get.8.xml:23 apt-cache.8.xml:23 apt-key.8.xml:22
+#: apt-mark.8.xml:23 apt-secure.8.xml:22 apt-cdrom.8.xml:22
+#: apt-config.8.xml:23 apt.conf.5.xml:28 apt_preferences.5.xml:22
+#: sources.list.5.xml:23 apt-extracttemplates.1.xml:23 apt-sortpkgs.1.xml:23
+#: apt-ftparchive.1.xml:23
 msgid "APT"
 msgstr "APT"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt.8.xml:32
+#: apt.8.xml:28
 msgid "command-line interface"
-msgstr ""
+msgstr "interface de linha de comandos"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:37 apt-get.8.xml:40 apt-cache.8.xml:40 apt-key.8.xml:39
-#: apt-mark.8.xml:40 apt-secure.8.xml:52 apt-cdrom.8.xml:39
-#: apt-config.8.xml:40 apt.conf.5.xml:43 apt_preferences.5.xml:38
-#: sources.list.5.xml:38 apt-extracttemplates.1.xml:40 apt-sortpkgs.1.xml:40
-#: apt-ftparchive.1.xml:40
+#: apt.8.xml:33 apt-get.8.xml:34 apt-cache.8.xml:34 apt-key.8.xml:33
+#: apt-mark.8.xml:34 apt-secure.8.xml:46 apt-cdrom.8.xml:33
+#: apt-config.8.xml:34 apt.conf.5.xml:37 apt_preferences.5.xml:32
+#: sources.list.5.xml:32 apt-extracttemplates.1.xml:34 apt-sortpkgs.1.xml:34
+#: apt-ftparchive.1.xml:34
 msgid "Description"
 msgstr "Descrição"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:38
+#: apt.8.xml:34
 msgid ""
 "<command>apt</command> (Advanced Package Tool) is the command-line tool for "
 "handling packages. It provides a commandline interface for the package "
 "management of the system.  See also &apt-get; and &apt-cache; for more low-"
 "level command options."
 msgstr ""
+"<command>apt</command> (Advanced Package Tool) é uma ferramenta de linha de "
+"comandos para manuseamento de pacotes. Disponibiliza uma interface de linha "
+"de comandos para a gestão de pacotes do sistema. Veja também &apt-get; e "
+"&apt-cache; para mais opções de baixo nível dos comandos."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:47
+#: apt.8.xml:43
 msgid ""
 "<literal>list</literal> is used to display a list of packages. It supports "
 "shell pattern for matching package names and the following options: "
 "<option>--installed</option>, <option>--upgradable</option>, <option>--all-"
 "versions</option> are supported."
 msgstr ""
+"<literal>list</literal> é usado para mostrar uma lista de pacotes. Suporta "
+"padrões da shell para corresponder aos nomes de pacotes e são suportadas as "
+"seguintes opções <option>--installed</option>, <option>--upgradable</"
+"option>, <option>--all-versions</option>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:58
+#: apt.8.xml:54
 msgid ""
 "<literal>search</literal> searches for the given term(s) and display "
 "matching packages."
 msgstr ""
+"<literal>search</literal> procura por termo(s) determinado(s) e mostra os "
+"pacotes correspondentes."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:64
-#, fuzzy
-#| msgid ""
-#| "<literal>rdepends</literal> shows a listing of each reverse dependency a "
-#| "package has."
+#: apt.8.xml:60
 msgid ""
 "<literal>show</literal> shows the package information for the given "
 "package(s)."
 msgstr ""
-"<literal>rdepends</literal> mostra uma listagem de cada dependência reversa "
-"que um pacote tem."
+"<literal>show</literal> mostra a informação do pacote para o(s) pacote(s) "
+"determinado(s)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:71
+#: apt.8.xml:67
 msgid ""
 "<literal>install</literal> is followed by one or more package names desired "
 "for installation or upgrading."
 msgstr ""
+"<literal>install</literal> é seguido por um ou mais nomes de pacotes que se "
+"deseja instalar ou actualizar."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:75 apt-get.8.xml:118
+#: apt.8.xml:71 apt-get.8.xml:112
 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 "
@@ -752,7 +760,7 @@ msgstr ""
 "versão da distribuição ou o nome de Arquivo (stable, testing, unstable)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:85 apt-get.8.xml:153
+#: apt.8.xml:81 apt-get.8.xml:147
 msgid ""
 "<literal>remove</literal> is identical to <literal>install</literal> except "
 "that packages are removed instead of installed. Note that removing a package "
@@ -767,56 +775,61 @@ msgstr ""
 "pacote identificado será instalado em vez de removido."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:93
+#: apt.8.xml:89
 msgid ""
 "<literal>edit-sources</literal> lets you edit your sources.list file and "
 "provides basic sanity checks."
 msgstr ""
+"<literal>edit-sources</literal> permite-lhe editar o seu ficheiro sources."
+"list e disponibiliza verificações de sanidade básicas."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:99
-#, fuzzy
-#| msgid ""
-#| "<literal>showhold</literal> is used to print a list of packages on hold "
-#| "in the same way as for the other show commands."
+#: apt.8.xml:95
 msgid ""
 "<literal>update</literal> is used to resynchronize the package index files "
 "from their sources."
 msgstr ""
-"<literal>showhold</literal> é usado para escrever uma lista dos pacotes em "
-"retenção do mesmo modo que os outros comandos show."
+"<literal>update</literal> é usado para re-sincronizar o índice dos pacotes a "
+"partir das suas fontes."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:105
+#: apt.8.xml:101
 msgid ""
 "<literal>upgrade</literal> is used to install the newest versions of all "
 "packages currently installed on the system from the sources enumerated in "
-"<filename>/etc/apt/sources.list</filename>. New package will be installed, "
-"but existing package will never removed."
+"<filename>/etc/apt/sources.list</filename>. New packages will be installed, "
+"but existing packages will never be removed."
 msgstr ""
+"<literal>upgrade</literal> é usado para instalar as versões mais recentes de "
+"todos os pacotes actualmente instalados no sistema a partir das fontes "
+"enumeradas em <filename>/etc/apt/sources.list</filename>. Serão instalados "
+"novos pacotes, mas pacotes existentes nunca serão removidos."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:114
+#: apt.8.xml:110
 msgid ""
 "<literal>full-upgrade</literal> performs the function of upgrade but may "
 "also remove installed packages if that is required in order to resolve a "
 "package conflict."
 msgstr ""
+"<literal>full-upgrade</literal> executa a função de upgrade mas pode também "
+"remover pacotes instalados se tal for necessário de modo a resolver um "
+"conflito de pacotes."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:124 apt-get.8.xml:257 apt-cache.8.xml:250 apt-mark.8.xml:110
-#: apt-config.8.xml:86 apt-extracttemplates.1.xml:54 apt-sortpkgs.1.xml:50
-#: apt-ftparchive.1.xml:506
+#: apt.8.xml:120 apt-get.8.xml:251 apt-cache.8.xml:244 apt-mark.8.xml:104
+#: apt-config.8.xml:80 apt-extracttemplates.1.xml:48 apt-sortpkgs.1.xml:44
+#: apt-ftparchive.1.xml:500
 msgid "options"
 msgstr "opções"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:134
+#: apt.8.xml:130
 msgid "Script usage"
-msgstr ""
+msgstr "Utilização de script"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:136
+#: apt.8.xml:132
 msgid ""
 "The &apt; commandline is designed as a end-user tool and it may change the "
 "output between versions. While it tries to not break backward compatibility "
@@ -824,109 +837,99 @@ msgid ""
 "&apt-cache; and &apt-get; via APT options. Please prefer using these "
 "commands in your scripts."
 msgstr ""
+"A linha de comandos do &apt; foi desenhada como ferramenta de utilizador "
+"final e pode variar os textos mostrados entre versões. Apesar de tentar não "
+"perder a compatibilidade com versões anteriores, não há garantia disso. "
+"Todas as funcionalidades do &apt; estão disponíveis em &apt-cache; e &apt-"
+"get; via opções do APT. Por favor dê preferência a usar estes comandos nos "
+"seus scripts."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:144
+#: apt.8.xml:140
 msgid "Differences to &apt-get;"
-msgstr ""
+msgstr "Diferenças para o &apt-get;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:145
+#: apt.8.xml:141
 msgid ""
 "The <command>apt</command> command is meant to be pleasant for end users and "
 "does not need to be backward compatible like &apt-get;. Therefore some "
 "options are different:"
 msgstr ""
+"O comando  <command>apt</command> destina-se a ser agradável para os "
+"utilizadores finais e não precisa de ser compatível com as versões "
+"anteriores como o &apt-get;. Por isso algumas opções são diferentes."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml:151
-#, fuzzy
-#| msgid "the <literal>Package:</literal> line"
+#: apt.8.xml:147
 msgid "The option <literal>DPkg::Progress-Fancy</literal> is enabled."
-msgstr "a linha <literal>Package:</literal>"
+msgstr "A opção <literal>DPkg::Progress-Fancy</literal> está activada."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml:155
-#, fuzzy
-#| msgid "the <literal>Component:</literal> line"
+#: apt.8.xml:151
 msgid "The option <literal>APT::Color</literal> is enabled."
-msgstr "a linha <literal>Component:</literal>"
+msgstr "A opção <literal>APT::Color</literal> está activada."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml:159
+#: apt.8.xml:155
 msgid ""
 "A new <literal>list</literal> command is available similar to <literal>dpkg "
 "--list</literal>."
 msgstr ""
+"Está disponível um novo comando <literal>list</literal> de modo semelhante a "
+"<literal>dpkg --list</literal>."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml:164
-#, fuzzy
-#| msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
+#: apt.8.xml:160
 msgid ""
 "The option <literal>upgrade</literal> has <literal>--with-new-pkgs</literal> "
 "enabled by default."
-msgstr "a linha <literal>Archive:</literal> ou <literal>Suite:</literal>"
+msgstr ""
+"A opção <literal>upgrade</literal> tem <literal>--with-new-pkgs</literal> "
+"activado por predefinição."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:174 apt-get.8.xml:558 apt-cache.8.xml:352 apt-key.8.xml:197
-#: apt-mark.8.xml:133 apt-secure.8.xml:193 apt-cdrom.8.xml:154
-#: apt-config.8.xml:111 apt.conf.5.xml:1227 apt_preferences.5.xml:707
-#: sources.list.5.xml:280 apt-extracttemplates.1.xml:72 apt-sortpkgs.1.xml:65
-#: apt-ftparchive.1.xml:609
+#: apt.8.xml:170 apt-get.8.xml:552 apt-cache.8.xml:346 apt-key.8.xml:191
+#: apt-mark.8.xml:127 apt-secure.8.xml:187 apt-cdrom.8.xml:148
+#: apt-config.8.xml:105 apt.conf.5.xml:1222 apt_preferences.5.xml:701
+#: sources.list.5.xml:274 apt-extracttemplates.1.xml:66 apt-sortpkgs.1.xml:59
+#: apt-ftparchive.1.xml:603
 msgid "See Also"
 msgstr "Veja também"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:175
-#, fuzzy
-#| msgid ""
-#| "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
-#| "&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-"
-#| "preferences;, the APT Howto."
+#: apt.8.xml:171
 msgid ""
 "&apt-get;, &apt-cache;, &sources-list;, &apt-conf;, &apt-config;, The APT "
 "User's guide in &guidesdir;, &apt-preferences;, the APT Howto."
 msgstr ""
-"&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
-"&apt-config;, &apt-secure;, O guia de utilizadores do The APT em "
-"&guidesdir;, &apt-preferences;, o Howto do APT."
+"&apt-get;, &apt-cache;, &sources-list;, &apt-conf;, &apt-config;, O guia de "
+"utilizadores do The APT em &guidesdir;, &apt-preferences;, o Howto do APT."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:180 apt-get.8.xml:564 apt-cache.8.xml:357 apt-mark.8.xml:137
-#: apt-cdrom.8.xml:159 apt-config.8.xml:116 apt-extracttemplates.1.xml:76
-#: apt-sortpkgs.1.xml:69 apt-ftparchive.1.xml:613
+#: apt.8.xml:176 apt-get.8.xml:558 apt-cache.8.xml:351 apt-mark.8.xml:131
+#: apt-cdrom.8.xml:153 apt-config.8.xml:110 apt-extracttemplates.1.xml:70
+#: apt-sortpkgs.1.xml:63 apt-ftparchive.1.xml:607
 msgid "Diagnostics"
 msgstr "Diagnóstico"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:181
-#, fuzzy
-#| msgid ""
-#| "<command>apt-get</command> returns zero on normal operation, decimal 100 "
-#| "on error."
+#: apt.8.xml:177
 msgid ""
 "<command>apt</command> returns zero on normal operation, decimal 100 on "
 "error."
 msgstr ""
-"<command>apt-get</command> devolve zero na operação normal, 100 decimal em "
-"erro."
+"<command>apt</command> devolve zero na operação normal, 100 decimal em erro."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-get.8.xml:35
+#: apt-get.8.xml:29
 msgid "APT package handling utility -- command-line interface"
 msgstr ""
 "Utilitário de manuseamento de pacotes do APT -- interface de linha de "
 "comandos"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:41
-#, fuzzy
-#| 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; and &wajig;."
+#: apt-get.8.xml:35
 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 "
@@ -936,11 +939,11 @@ msgstr ""
 "<command>apt-get</command> é a ferramenta de linha de comandos para lidar "
 "com pacotes, e pode ser considerada o \"back-end\" dos utilizadores para "
 "outras ferramentas que usam a biblioteca APT. Existem várias interfaces "
-"\"front-end\" como o &dselect;, &aptitude;, &synaptic; e &wajig;."
+"\"front-end\" como o &aptitude;, &synaptic; e &wajig;."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:46 apt-cache.8.xml:46 apt-cdrom.8.xml:53 apt-config.8.xml:46
-#: apt-ftparchive.1.xml:56
+#: apt-get.8.xml:40 apt-cache.8.xml:40 apt-cdrom.8.xml:47 apt-config.8.xml:40
+#: apt-ftparchive.1.xml:50
 msgid ""
 "Unless the <option>-h</option>, or <option>--help</option> option is given, "
 "one of the commands below must be present."
@@ -949,7 +952,7 @@ msgstr ""
 "fornecida, um dos comandos abaixo têm que estar presentes."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:51
+#: apt-get.8.xml:45
 msgid ""
 "<literal>update</literal> is used to resynchronize the package index files "
 "from their sources. The indexes of available packages are fetched from the "
@@ -973,7 +976,7 @@ msgstr ""
 "ficheiros de pacotes não pode ser conhecido com antecedência."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:63
+#: apt-get.8.xml:57
 msgid ""
 "<literal>upgrade</literal> is used to install the newest versions of all "
 "packages currently installed on the system from the sources enumerated in "
@@ -999,7 +1002,7 @@ msgstr ""
 "novas versões de pacotes."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:76
+#: apt-get.8.xml:70
 msgid ""
 "<literal>dist-upgrade</literal> in addition to performing the function of "
 "<literal>upgrade</literal>, also intelligently handles changing dependencies "
@@ -1024,7 +1027,7 @@ msgstr ""
 "sobrepor as definições gerais em pacotes individuais."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:89
+#: apt-get.8.xml:83
 msgid ""
 "<literal>dselect-upgrade</literal> is used in conjunction with the "
 "traditional Debian packaging front-end, &dselect;. <literal>dselect-upgrade</"
@@ -1040,7 +1043,7 @@ msgstr ""
 "estado (por exemplo, a remoção de pacotes antigos e a instalação de novos)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:100
+#: apt-get.8.xml:94
 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 "
@@ -1070,7 +1073,7 @@ msgstr ""
 "de resolução de conflitos do apt-get."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:125
+#: apt-get.8.xml:119
 msgid ""
 "Both of the version selection mechanisms can downgrade packages and must be "
 "used with care."
@@ -1079,7 +1082,7 @@ msgstr ""
 "e devem ser usados com cuidado."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:128
+#: apt-get.8.xml:122
 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 system. "
@@ -1099,7 +1102,7 @@ msgstr ""
 "descarregadas e instaladas."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:139
+#: apt-get.8.xml:133
 msgid ""
 "Finally, the &apt-preferences; mechanism allows you to create an alternative "
 "installation policy for individual packages."
@@ -1108,7 +1111,7 @@ msgstr ""
 "instalação alternativa para pacotes individuais."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:143
+#: apt-get.8.xml:137
 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 "
@@ -1127,7 +1130,7 @@ msgstr ""
 "caractere '^' ou '$', para criar uma expressão regular mais específica."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:161
+#: apt-get.8.xml:155
 msgid ""
 "<literal>purge</literal> is identical to <literal>remove</literal> except "
 "that packages are removed and purged (any configuration files are deleted "
@@ -1138,7 +1141,7 @@ msgstr ""
 "configuração são também apagados)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:166
+#: apt-get.8.xml:160
 msgid ""
 "<literal>source</literal> causes <command>apt-get</command> to fetch source "
 "packages. APT will examine the available packages to decide which source "
@@ -1157,7 +1160,7 @@ msgstr ""
 "<literal>pkg/release</literal>, se possível."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:174
+#: apt-get.8.xml:168
 msgid ""
 "Source packages are tracked separately from binary packages via <literal>deb-"
 "src</literal> lines in the &sources-list; file. This means that you will "
@@ -1172,7 +1175,7 @@ msgstr ""
 "de fonte erradas (muito antigas/muito novas) ou mesmo nenhuma."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:180
+#: apt-get.8.xml:174
 msgid ""
 "If the <option>--compile</option> option is specified then the package will "
 "be compiled to a binary .deb using <command>dpkg-buildpackage</command> for "
@@ -1187,7 +1190,7 @@ msgstr ""
 "então o pacote fonte não será desempacotado."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:187
+#: apt-get.8.xml:181
 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 "
@@ -1202,7 +1205,7 @@ msgstr ""
 "Only-Source</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:193
+#: apt-get.8.xml:187
 msgid ""
 "Note that source packages are not installed and tracked in the "
 "<command>dpkg</command> database like binary packages; they are simply "
@@ -1213,7 +1216,7 @@ msgstr ""
 "descarregados para o directório actual, como tarballs fonte."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:199
+#: apt-get.8.xml:193
 msgid ""
 "<literal>build-dep</literal> causes apt-get to install/remove packages in an "
 "attempt to satisfy the build dependencies for a source package. By default "
@@ -1228,7 +1231,7 @@ msgstr ""
 "arquitectura-anfitriã com a opção <option>--host-architecture</option>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:206
+#: apt-get.8.xml:200
 msgid ""
 "<literal>check</literal> is a diagnostic tool; it updates the package cache "
 "and checks for broken dependencies."
@@ -1237,7 +1240,7 @@ msgstr ""
 "de pacotes e verifica por dependências quebradas."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:211
+#: apt-get.8.xml:205
 msgid ""
 "<literal>download</literal> will download the given binary package into the "
 "current directory."
@@ -1246,16 +1249,7 @@ msgstr ""
 "directório actual."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:217
-#, fuzzy
-#| msgid ""
-#| "<literal>clean</literal> clears out the local repository of retrieved "
-#| "package files. It removes everything but the lock file from "
-#| "<filename>&cachedir;/archives/</filename> and <filename>&cachedir;/"
-#| "archives/partial/</filename>. When APT is used as a &dselect; method, "
-#| "<literal>clean</literal> is run automatically.  Those who do not use "
-#| "dselect will likely want to run <literal>apt-get clean</literal> from "
-#| "time to time to free up disk space."
+#: apt-get.8.xml:211
 msgid ""
 "<literal>clean</literal> clears out the local repository of retrieved "
 "package files. It removes everything but the lock file from "
@@ -1264,14 +1258,10 @@ msgid ""
 msgstr ""
 "<literal>clean</literal> limpa o repositório local dos ficheiros de pacotes "
 "obtidos. Remove tudo excepto o ficheiro lock de <filename>&cachedir;/"
-"archives/</filename> e <filename>&cachedir;/archives/partial/</filename>. "
-"Quando o APT é usado com um método &dselect;, <literal>clean</literal> é "
-"executado automaticamente. Aqueles que não usam o dselect irão provavelmente "
-"querer executar <literal>apt-get clean</literal> de tempos a tempos para "
-"libertar espaço do disco."
+"archives/</filename> e <filename>&cachedir;/archives/partial/</filename>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:224
+#: apt-get.8.xml:218
 msgid ""
 "Like <literal>clean</literal>, <literal>autoclean</literal> clears out the "
 "local repository of retrieved package files. The difference is that it only "
@@ -1290,7 +1280,7 @@ msgstr ""
 "pacotes instalados sejam apagados se estiver definida para 'off'."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:234
+#: apt-get.8.xml:228
 msgid ""
 "<literal>autoremove</literal> is used to remove packages that were "
 "automatically installed to satisfy dependencies for other packages and are "
@@ -1301,7 +1291,7 @@ msgstr ""
 "que já não são necessários."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:239
+#: apt-get.8.xml:233
 msgid ""
 "<literal>changelog</literal> downloads a package changelog and displays it "
 "through <command>sensible-pager</command>. The server name and base "
@@ -1324,7 +1314,7 @@ msgstr ""
 "para o comando <option>install</option>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:262
+#: apt-get.8.xml:256
 msgid ""
 "Do not consider recommended packages as a dependency for installing.  "
 "Configuration Item: <literal>APT::Install-Recommends</literal>."
@@ -1333,7 +1323,7 @@ msgstr ""
 "de Configuração: <literal>APT::Install-Recommends</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:267
+#: apt-get.8.xml:261
 msgid ""
 "Consider suggested packages as a dependency for installing.  Configuration "
 "Item: <literal>APT::Install-Suggests</literal>."
@@ -1342,7 +1332,7 @@ msgstr ""
 "Configuração: <literal>APT::Install-Suggests</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:272
+#: apt-get.8.xml:266
 msgid ""
 "Download only; package files are only retrieved, not unpacked or installed.  "
 "Configuration Item: <literal>APT::Get::Download-Only</literal>."
@@ -1352,20 +1342,7 @@ msgstr ""
 "Download-Only</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:277
-#, fuzzy
-#| msgid ""
-#| "Fix; attempt to correct a system with broken dependencies in place. This "
-#| "option, when used with install/remove, can omit any packages to permit "
-#| "APT to deduce a likely solution. If packages are specified, these have to "
-#| "completely correct the problem. The option is sometimes necessary when "
-#| "running APT for the first time; APT itself does not allow broken package "
-#| "dependencies to exist on a system. It is possible that a system's "
-#| "dependency structure can be so corrupt as to require manual intervention "
-#| "(which usually means using &dselect; or <command>dpkg --remove</command> "
-#| "to eliminate some of the offending packages). Use of this option together "
-#| "with <option>-m</option> may produce an error in some situations.  "
-#| "Configuration Item: <literal>APT::Get::Fix-Broken</literal>."
+#: apt-get.8.xml:271
 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 "
@@ -1387,13 +1364,13 @@ msgstr ""
 "permite que existam num sistema dependências de pacotes quebradas. É "
 "possível que uma estrutura de dependências de um sistema esteja tão "
 "corrompida ao ponto de requerer intervenção manual (o que normalmente "
-"significa usar o &dselect; ou <command>dpkg --remove</command> para eliminar "
-"alguns dos pacotes ofensivos). O uso desta opção juntamente com <option>-m</"
-"option> pode produzir um erro em algumas situações. Item de Configuração: "
+"significa usar o <command>dpkg --remove</command> para eliminar alguns dos "
+"pacotes ofensivos). O uso desta opção juntamente com <option>-m</option> "
+"pode produzir um erro em algumas situações. Item de Configuração: "
 "<literal>APT::Get::Fix-Broken</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:292
+#: apt-get.8.xml:286
 msgid ""
 "Ignore missing packages; if packages cannot be retrieved or fail the "
 "integrity check after retrieval (corrupted package files), hold back those "
@@ -1412,7 +1389,7 @@ msgstr ""
 "de Configuração: <literal>APT::Get::Fix-Missing</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:303
+#: apt-get.8.xml:297
 msgid ""
 "Disables downloading of packages. This is best used with <option>--ignore-"
 "missing</option> to force APT to use only the .debs it has already "
@@ -1423,7 +1400,7 @@ msgstr ""
 "descarregados. Item de Configuração: <literal>APT::Get::Download</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:310
+#: apt-get.8.xml:304
 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 "
@@ -1443,7 +1420,7 @@ msgstr ""
 "<literal>quiet</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:325
+#: apt-get.8.xml:319
 msgid ""
 "No action; perform a simulation of events that would occur but do not "
 "actually change the system.  Configuration Item: <literal>APT::Get::"
@@ -1454,7 +1431,7 @@ msgstr ""
 "Simulate</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:329
+#: apt-get.8.xml:323
 msgid ""
 "Simulated runs performed as a user will automatically deactivate locking "
 "(<literal>Debug::NoLocking</literal>), and if the option <literal>APT::Get::"
@@ -1473,7 +1450,7 @@ msgstr ""
 "avisos do <literal>apt-get</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:337
+#: apt-get.8.xml:331
 msgid ""
 "Simulated runs print out a series of lines, each representing a "
 "<command>dpkg</command> operation: configure (<literal>Conf</literal>), "
@@ -1488,7 +1465,7 @@ msgstr ""
 "indicam quebras que não têm consequência (raro)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:345
+#: apt-get.8.xml:339
 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 "
@@ -1504,7 +1481,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:353
+#: apt-get.8.xml:347
 msgid ""
 "Automatic \"no\" to all prompts.  Configuration Item: <literal>APT::Get::"
 "Assume-No</literal>."
@@ -1513,7 +1490,7 @@ msgstr ""
 "<literal>APT::Get::Assume-No</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:358
+#: apt-get.8.xml:352
 msgid ""
 "Show upgraded packages; print out a list of all packages that are to be "
 "upgraded.  Configuration Item: <literal>APT::Get::Show-Upgraded</literal>."
@@ -1523,7 +1500,7 @@ msgstr ""
 "Upgraded</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:364
+#: apt-get.8.xml:358
 msgid ""
 "Show full versions for upgraded and installed packages.  Configuration Item: "
 "<literal>APT::Get::Show-Versions</literal>."
@@ -1532,15 +1509,7 @@ msgstr ""
 "Configuração: <literal>APT::Get::Show-Versions</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:370
-#, fuzzy
-#| msgid ""
-#| "This option controls the architecture packages are built for by "
-#| "<command>apt-get source --compile</command> and how cross-"
-#| "builddependencies are satisfied. By default is it not set which means "
-#| "that the host architecture is the same as the build architecture (which "
-#| "is defined by <literal>APT::Architecture</literal>).  Configuration Item: "
-#| "<literal>APT::Get::Host-Architecture</literal>"
+#: apt-get.8.xml:364
 msgid ""
 "This option controls the architecture packages are built for by <command>apt-"
 "get source --compile</command> and how cross-builddependencies are "
@@ -1557,15 +1526,7 @@ msgstr ""
 "item de Configuração: <literal>APT::Get::Host-Architecture</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:380
-#, fuzzy
-#| msgid ""
-#| "This option controls the architecture packages are built for by "
-#| "<command>apt-get source --compile</command> and how cross-"
-#| "builddependencies are satisfied. By default is it not set which means "
-#| "that the host architecture is the same as the build architecture (which "
-#| "is defined by <literal>APT::Architecture</literal>).  Configuration Item: "
-#| "<literal>APT::Get::Host-Architecture</literal>"
+#: apt-get.8.xml:374
 msgid ""
 "This option controls the activated build profiles for which a source package "
 "is built by <command>apt-get source --compile</command> and how build "
@@ -1573,15 +1534,15 @@ msgid ""
 "than one build profile can be activated at a time by concatenating them with "
 "a comma.  Configuration Item: <literal>APT::Build-Profiles</literal>."
 msgstr ""
-"Esta opção controla a arquitectura para que os pacotes são compilados pelo "
-"<command>apt-get source --compile</command> e como as dependências cruzadas "
-"de compilação são satisfeitas. Por predefinição não está activa o que "
-"significa que a arquitectura anfitriã é a mesma que a arquitectura de "
-"compilação (a qual é definida por <literal>APT::Architecture</literal>).  "
-"item de Configuração: <literal>APT::Get::Host-Architecture</literal>"
+"Esta opção controla perfis de compilação activados pelos quais um pacote "
+"fonte é compilado por <command>apt-get source --compile</command> e como as "
+"dependências de compilação são satisfeitas. Por predefinição, nenhum perfil "
+"de compilação está activo. Podem ser activados ao mesmo tempo mais do que um "
+"perfil de compilação ao concatená-los com uma vírgula. Item de configuração: "
+"<literal>APT::Build-Profiles</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:391
+#: apt-get.8.xml:385
 msgid ""
 "Compile source packages after downloading them.  Configuration Item: "
 "<literal>APT::Get::Compile</literal>."
@@ -1590,7 +1551,7 @@ msgstr ""
 "<literal>APT::Get::Compile</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:396
+#: apt-get.8.xml:390
 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 "
@@ -1603,7 +1564,7 @@ msgstr ""
 "Item de Configuração: <literal>APT::Ignore-Hold</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:403
+#: apt-get.8.xml:397
 msgid ""
 "Allow installing new packages when used in conjunction with "
 "<literal>upgrade</literal>.  This is useful if the update of a installed "
@@ -1613,9 +1574,16 @@ msgid ""
 "will never remove packages, only allow adding new ones.  Configuration Item: "
 "<literal>APT::Get::Upgrade-Allow-New</literal>."
 msgstr ""
+"Permite a instalação de novos pacotes quando usado em conjunto com "
+"<literal>upgrade</literal>. Isto é útil se a actualização de um pacote "
+"instalado requerer que sejam instaladas novas dependências. Em vez de reter "
+"o pacote, o <literal>upgrade</literal>irá actualizar o pacote e instalar as "
+"novas dependências. Note que <literal>upgrade</literal> com esta opção nunca "
+"irá remover pacotes, apenas permitir adicionar novos. Item de configuração: "
+"<literal>APT::Get::Upgrade-Allow-New</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:415
+#: apt-get.8.xml:409
 msgid ""
 "Do not upgrade packages; when used in conjunction with <literal>install</"
 "literal>, <literal>no-upgrade</literal> will prevent packages on the command "
@@ -1628,7 +1596,7 @@ msgstr ""
 "Configuração: <literal>APT::Get::Upgrade</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:422
+#: apt-get.8.xml:416
 msgid ""
 "Do not install new packages; when used in conjunction with <literal>install</"
 "literal>, <literal>only-upgrade</literal> will install upgrades for already "
@@ -1641,7 +1609,7 @@ msgstr ""
 "Item de Configuração: <literal>APT::Get::Only-Upgrade</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:430
+#: apt-get.8.xml:424
 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 "
@@ -1656,7 +1624,7 @@ msgstr ""
 "<literal>APT::Get::force-yes</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:438
+#: apt-get.8.xml:432
 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 "
@@ -1677,7 +1645,7 @@ msgstr ""
 "Configuração: <literal>APT::Get::Print-URIs</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:449
+#: apt-get.8.xml:443
 msgid ""
 "Use purge instead of remove for anything that would be removed.  An asterisk "
 "(\"*\") will be displayed next to packages which are scheduled to be purged. "
@@ -1690,7 +1658,7 @@ msgstr ""
 "option>. Item de Configuração: <literal>APT::Get::Purge</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:457
+#: apt-get.8.xml:451
 msgid ""
 "Re-install packages that are already installed and at the newest version.  "
 "Configuration Item: <literal>APT::Get::ReInstall</literal>."
@@ -1699,7 +1667,7 @@ msgstr ""
 "Configuração: <literal>APT::Get::ReInstall</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:462
+#: apt-get.8.xml:456
 msgid ""
 "This option is on by default; use <literal>--no-list-cleanup</literal> to "
 "turn it off. When it is on, <command>apt-get</command> will automatically "
@@ -1716,7 +1684,7 @@ msgstr ""
 "fontes. Item de Configuração: <literal>APT::Get::List-Cleanup</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:472
+#: apt-get.8.xml:466
 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 "
@@ -1739,7 +1707,7 @@ msgstr ""
 "Release</literal>; veja também o manual &apt-preferences;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:487
+#: apt-get.8.xml:481
 msgid ""
 "Only perform operations that are 'trivial'. Logically this can be considered "
 "related to <option>--assume-yes</option>; where <option>--assume-yes</"
@@ -1753,7 +1721,7 @@ msgstr ""
 "Trivial-Only</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:494
+#: apt-get.8.xml:488
 msgid ""
 "If any packages are to be removed apt-get immediately aborts without "
 "prompting.  Configuration Item: <literal>APT::Get::Remove</literal>."
@@ -1763,7 +1731,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:500
+#: apt-get.8.xml:494
 msgid ""
 "If the command is either <literal>install</literal> or <literal>remove</"
 "literal>, then this option acts like running the <literal>autoremove</"
@@ -1776,7 +1744,7 @@ msgstr ""
 "Configuração: <literal>APT::Get::AutomaticRemove</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:507
+#: apt-get.8.xml:501
 msgid ""
 "Only has meaning for the <literal>source</literal> and <literal>build-dep</"
 "literal> commands.  Indicates that the given source names are not to be "
@@ -1795,7 +1763,7 @@ msgstr ""
 "<literal>APT::Get::Only-Source</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:518
+#: apt-get.8.xml:512
 msgid ""
 "Download only the diff, dsc, or tar file of a source archive.  Configuration "
 "Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</"
@@ -1806,7 +1774,7 @@ msgstr ""
 "Only</literal>, e <literal>APT::Get::Tar-Only</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:524
+#: apt-get.8.xml:518
 msgid ""
 "Only process architecture-dependent build-dependencies.  Configuration Item: "
 "<literal>APT::Get::Arch-Only</literal>."
@@ -1815,7 +1783,7 @@ msgstr ""
 "de Configuração: <literal>APT::Get::Arch-Only</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:529
+#: apt-get.8.xml:523
 msgid ""
 "Ignore if packages can't be authenticated and don't prompt about it.  This "
 "is useful for tools like pbuilder.  Configuration Item: <literal>APT::Get::"
@@ -1826,7 +1794,7 @@ msgstr ""
 "Get::AllowUnauthenticated</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:535
+#: apt-get.8.xml:529
 msgid ""
 "Show user friendly progress information in the terminal window when packages "
 "are installed, upgraded or removed. For a machine parsable version of this "
@@ -1834,31 +1802,31 @@ msgid ""
 "Item: <literal>Dpkg::Progress</literal> and <literal>Dpkg::Progress-Fancy</"
 "literal>."
 msgstr ""
+"Mostra informação de progresso compreensível para o utilizador na janela de "
+"terminal quando os pacotes são instalados, actualizados ou removidos. Para "
+"uma versão \"analisável por máquina\" destes dados veja o  README.progress-"
+"reporting no directório doc do apt. Item de Configuração:  <literal>Dpkg::"
+"Progress</literal> e <literal>Dpkg::Progress-Fancy</literal>."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:548 apt-cache.8.xml:345 apt-key.8.xml:176 apt-mark.8.xml:127
-#: apt.conf.5.xml:1221 apt_preferences.5.xml:700
+#: apt-get.8.xml:542 apt-cache.8.xml:339 apt-key.8.xml:170 apt-mark.8.xml:121
+#: apt.conf.5.xml:1216 apt_preferences.5.xml:694
 msgid "Files"
 msgstr "Ficheiros"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:559
-#, fuzzy
-#| msgid ""
-#| "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
-#| "&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-"
-#| "preferences;, the APT Howto."
+#: apt-get.8.xml:553
 msgid ""
 "&apt-cache;, &apt-cdrom;, &dpkg;, &sources-list;, &apt-conf;, &apt-config;, "
 "&apt-secure;, The APT User's guide in &guidesdir;, &apt-preferences;, the "
 "APT Howto."
 msgstr ""
-"&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
-"&apt-config;, &apt-secure;, O guia de utilizadores do The APT em "
-"&guidesdir;, &apt-preferences;, o Howto do APT."
+"&apt-cache;, &apt-cdrom;, &dpkg;, &sources-list;, &apt-conf;, &apt-config;, "
+"&apt-secure;, O guia de utilizadores do The APT em &guidesdir;, &apt-"
+"preferences;, o Howto do APT."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:565
+#: apt-get.8.xml:559
 msgid ""
 "<command>apt-get</command> returns zero on normal operation, decimal 100 on "
 "error."
@@ -1867,12 +1835,12 @@ msgstr ""
 "erro."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-cache.8.xml:35
+#: apt-cache.8.xml:29
 msgid "query the APT cache"
 msgstr "pesquisa a cache do APT"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:41
+#: apt-cache.8.xml:35
 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 "
@@ -1885,7 +1853,7 @@ msgstr ""
 "a partir dos metadados do pacote."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:51
+#: apt-cache.8.xml:45
 msgid ""
 "<literal>gencaches</literal> creates APT's package cache. This is done "
 "implicitly by all commands needing this cache if it is missing or outdated."
@@ -1895,14 +1863,14 @@ msgstr ""
 "estiver em falta ou desactualizada."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
-#: apt-cache.8.xml:55 apt-cache.8.xml:144 apt-cache.8.xml:165
-#: apt-cache.8.xml:187 apt-cache.8.xml:192 apt-cache.8.xml:208
-#: apt-cache.8.xml:226 apt-cache.8.xml:238
+#: apt-cache.8.xml:49 apt-cache.8.xml:138 apt-cache.8.xml:159
+#: apt-cache.8.xml:181 apt-cache.8.xml:186 apt-cache.8.xml:202
+#: apt-cache.8.xml:220 apt-cache.8.xml:232
 msgid "&synopsis-pkg;"
 msgstr "&synopsis-pkg;"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:56
+#: apt-cache.8.xml:50
 msgid ""
 "<literal>showpkg</literal> displays information about the packages listed on "
 "the command line. Remaining arguments are package names. The available "
@@ -1926,7 +1894,7 @@ msgstr ""
 "ao seguinte:"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
-#: apt-cache.8.xml:68
+#: apt-cache.8.xml:62
 #, no-wrap
 msgid ""
 "Package: libreadline2\n"
@@ -1952,7 +1920,7 @@ msgstr ""
 "Fornecimentos Reversos: \n"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:80
+#: apt-cache.8.xml:74
 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, "
@@ -1971,7 +1939,7 @@ msgstr ""
 "consultar o código fonte do apt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:89
+#: apt-cache.8.xml:83
 msgid ""
 "<literal>stats</literal> displays some statistics about the cache.  No "
 "further arguments are expected. Statistics reported are:"
@@ -1980,7 +1948,7 @@ msgstr ""
 "são esperados mais argumentos. As estatísticas reportadas são:"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:92
+#: apt-cache.8.xml:86
 msgid ""
 "<literal>Total package names</literal> is the number of package names found "
 "in the cache."
@@ -1989,7 +1957,7 @@ msgstr ""
 "encontrados na cache."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:96
+#: apt-cache.8.xml:90
 msgid ""
 "<literal>Normal packages</literal> is the number of regular, ordinary "
 "package names; these are packages that bear a one-to-one correspondence "
@@ -2002,7 +1970,7 @@ msgstr ""
 "dependências. A maioria dos pacotes caem nesta categoria."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:102
+#: apt-cache.8.xml:96
 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 "
@@ -2019,7 +1987,7 @@ msgstr ""
 "mas não existe um existe um pacote chamado \"mail-transport-agent\"."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:110
+#: apt-cache.8.xml:104
 msgid ""
 "<literal>Single virtual packages</literal> is the number of packages with "
 "only one package providing a particular virtual package. For example, in the "
@@ -2032,7 +2000,7 @@ msgstr ""
 "pacote, xless, disponibiliza \"X11-text-viewer\"."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:116
+#: apt-cache.8.xml:110
 msgid ""
 "<literal>Mixed virtual packages</literal> is the number of packages that "
 "either provide a particular virtual package or have the virtual package name "
@@ -2045,7 +2013,7 @@ msgstr ""
 "um pacote real, como também disponibilizado pelo pacote debconf-tiny."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:123
+#: apt-cache.8.xml:117
 msgid ""
 "<literal>Missing</literal> is the number of package names that were "
 "referenced in a dependency but were not provided by any package. Missing "
@@ -2061,7 +2029,7 @@ msgstr ""
 "declarações de Conflitos ou Breaks."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:130
+#: apt-cache.8.xml:124
 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 "
@@ -2076,7 +2044,7 @@ msgstr ""
 "consideravelmente maior que o número do total de nomes de pacotes."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:137
+#: apt-cache.8.xml:131
 msgid ""
 "<literal>Total dependencies</literal> is the number of dependency "
 "relationships claimed by all of the packages in the cache."
@@ -2085,7 +2053,7 @@ msgstr ""
 "dependências reivindicadas por todos os pacotes na cache."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:145
+#: apt-cache.8.xml:139
 msgid ""
 "<literal>showsrc</literal> displays all the source package records that "
 "match the given package names. All versions are shown, as well as all "
@@ -2097,7 +2065,7 @@ msgstr ""
 "pacote binário."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:151
+#: apt-cache.8.xml:145
 msgid ""
 "<literal>dump</literal> shows a short listing of every package in the cache. "
 "It is primarily for debugging."
@@ -2106,7 +2074,7 @@ msgstr ""
 "cache. É principalmente para depuração."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:156
+#: apt-cache.8.xml:150
 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."
@@ -2116,7 +2084,7 @@ msgstr ""
 "&dselect;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:161
+#: apt-cache.8.xml:155
 msgid ""
 "<literal>unmet</literal> displays a summary of all unmet dependencies in the "
 "package cache."
@@ -2125,7 +2093,7 @@ msgstr ""
 "insatisfeitas na cache do pacote."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:166
+#: apt-cache.8.xml:160
 msgid ""
 "<literal>show</literal> performs a function similar to <command>dpkg --print-"
 "avail</command>; it displays the package records for the named packages."
@@ -2134,12 +2102,12 @@ msgstr ""
 "print-avail</command>; mostra os registos do pacote para os pacotes nomeados."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
-#: apt-cache.8.xml:171
+#: apt-cache.8.xml:165
 msgid "&synopsis-regex;"
 msgstr "&synopsis-regex;"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:172
+#: apt-cache.8.xml:166
 msgid ""
 "<literal>search</literal> performs a full text search on all available "
 "package lists for the POSIX regex pattern given, see &regex;.  It searches "
@@ -2160,7 +2128,7 @@ msgstr ""
 "então não há procura na descrição longa, apenas no nome do pacote."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:183
+#: apt-cache.8.xml:177
 msgid ""
 "Separate arguments can be used to specify multiple search patterns that are "
 "and'ed together."
@@ -2169,7 +2137,7 @@ msgstr ""
 "busca os quais são lidados em conjunto."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:188
+#: apt-cache.8.xml:182
 msgid ""
 "<literal>depends</literal> shows a listing of each dependency a package has "
 "and all the possible other packages that can fulfill that dependency."
@@ -2179,7 +2147,7 @@ msgstr ""
 "dependência."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:193
+#: apt-cache.8.xml:187
 msgid ""
 "<literal>rdepends</literal> shows a listing of each reverse dependency a "
 "package has."
@@ -2188,12 +2156,12 @@ msgstr ""
 "que um pacote tem."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:197
+#: apt-cache.8.xml:191
 msgid "<optional><replaceable>&synopsis-prefix;</replaceable></optional>"
 msgstr "<optional><replaceable>&synopsis-prefix;</replaceable></optional>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:198
+#: apt-cache.8.xml:192
 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 "
@@ -2208,7 +2176,7 @@ msgstr ""
 "opção <option>--generate</option>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:203
+#: apt-cache.8.xml:197
 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 "
@@ -2219,7 +2187,7 @@ msgstr ""
 "também são listados na lista gerada."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:209
+#: apt-cache.8.xml:203
 msgid ""
 "<literal>dotty</literal> takes a list of packages on the command line and "
 "generates output suitable for use by dotty from the <ulink url=\"http://www."
@@ -2240,7 +2208,7 @@ msgstr ""
 "defina a opção <literal>APT::Cache::GivenOnly</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:218
+#: apt-cache.8.xml:212
 msgid ""
 "The resulting nodes will have several shapes; normal packages are boxes, "
 "pure virtual packages are triangles, mixed virtual packages are diamonds, "
@@ -2254,14 +2222,14 @@ msgstr ""
 "dependências, linhas verdes são conflitos."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:223
+#: apt-cache.8.xml:217
 msgid "Caution, dotty cannot graph larger sets of packages."
 msgstr ""
 "Atenção, o dotty não consegue fazer gráficos com grandes conjuntos de "
 "pacotes."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:227
+#: apt-cache.8.xml:221
 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 tool</ulink>."
@@ -2271,12 +2239,12 @@ msgstr ""
 "VCG</ulink>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:231
+#: apt-cache.8.xml:225
 msgid "<optional><replaceable>&synopsis-pkg;</replaceable>…</optional>"
 msgstr "<optional><replaceable>&synopsis-pkg;</replaceable>…</optional>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:232
+#: apt-cache.8.xml:226
 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 "
@@ -2289,7 +2257,7 @@ msgstr ""
 "acerca da selecção de prioridade do pacote nomeado."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:239
+#: apt-cache.8.xml:233
 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 "
@@ -2308,7 +2276,7 @@ msgstr ""
 "Architecture</literal>)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:255
+#: apt-cache.8.xml:249
 msgid ""
 "Select the file to store the package cache. The package cache is the primary "
 "cache used by all operations.  Configuration Item: <literal>Dir::Cache::"
@@ -2319,7 +2287,7 @@ msgstr ""
 "<literal>Dir::Cache::pkgcache</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:261
+#: apt-cache.8.xml:255
 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 "
@@ -2334,7 +2302,7 @@ msgstr ""
 "pacote. Item de Configuração: <literal>Dir::Cache::srcpkgcache</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:269
+#: apt-cache.8.xml:263
 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 "
@@ -2348,7 +2316,7 @@ msgstr ""
 "Configuração: <literal>quiet</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:276
+#: apt-cache.8.xml:270
 msgid ""
 "Print only important dependencies; for use with <literal>unmet</literal> and "
 "<literal>depends</literal>. Causes only Depends and Pre-Depends relations to "
@@ -2360,7 +2328,7 @@ msgstr ""
 "Important</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:290
+#: apt-cache.8.xml:284
 msgid ""
 "Per default the <literal>depends</literal> and <literal>rdepends</literal> "
 "print all dependencies. This can be tweaked with these flags which will omit "
@@ -2375,7 +2343,7 @@ msgstr ""
 "replaceable></literal> ex. <literal>APT::Cache::ShowRecommends</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:297
+#: apt-cache.8.xml:291
 msgid ""
 "Print full package records when searching.  Configuration Item: "
 "<literal>APT::Cache::ShowFull</literal>."
@@ -2384,7 +2352,7 @@ msgstr ""
 "<literal>APT::Cache::ShowFull</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:302
+#: apt-cache.8.xml:296
 msgid ""
 "Print full records for all available versions. This is the default; to turn "
 "it off, use <option>--no-all-versions</option>.  If <option>--no-all-"
@@ -2401,7 +2369,7 @@ msgstr ""
 "Configuração: <literal>APT::Cache::AllVersions</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:311
+#: apt-cache.8.xml:305
 msgid ""
 "Perform automatic package cache regeneration, rather than use the cache as "
 "it is. This is the default; to turn it off, use <option>--no-generate</"
@@ -2413,7 +2381,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:317
+#: apt-cache.8.xml:311
 msgid ""
 "Only search on the package names, not the long descriptions.  Configuration "
 "Item: <literal>APT::Cache::NamesOnly</literal>."
@@ -2422,7 +2390,7 @@ msgstr ""
 "Configuração: <literal>APT::Cache::NamesOnly</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:322
+#: apt-cache.8.xml:316
 msgid ""
 "Make <literal>pkgnames</literal> print all names, including virtual packages "
 "and missing dependencies.  Configuration Item: <literal>APT::Cache::"
@@ -2433,7 +2401,7 @@ msgstr ""
 "<literal>APT::Cache::AllNames</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:328
+#: apt-cache.8.xml:322
 msgid ""
 "Make <literal>depends</literal> and <literal>rdepends</literal> recursive so "
 "that all packages mentioned are printed once.  Configuration Item: "
@@ -2444,7 +2412,7 @@ msgstr ""
 "Configuração <literal>APT::Cache::RecurseDepends</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:335
+#: apt-cache.8.xml:329
 msgid ""
 "Limit the output of <literal>depends</literal> and <literal>rdepends</"
 "literal> to packages which are currently installed.  Configuration Item: "
@@ -2455,12 +2423,12 @@ msgstr ""
 "<literal>APT::Cache::Installed</literal>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:353
+#: apt-cache.8.xml:347
 msgid "&apt-conf;, &sources-list;, &apt-get;"
 msgstr "&apt-conf;, &sources-list;, &apt-get;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:358
+#: apt-cache.8.xml:352
 msgid ""
 "<command>apt-cache</command> returns zero on normal operation, decimal 100 "
 "on error."
@@ -2469,12 +2437,12 @@ msgstr ""
 "erro."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-key.8.xml:34
+#: apt-key.8.xml:28
 msgid "APT key management utility"
 msgstr "Utilitário de gestão de chaves do APT"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:41
+#: apt-key.8.xml:35
 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 "
@@ -2485,12 +2453,12 @@ msgstr ""
 "estas chaves serão considerados de confiança."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-key.8.xml:47
+#: apt-key.8.xml:41
 msgid "Commands"
 msgstr "Comandos"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:52
+#: apt-key.8.xml:46
 msgid ""
 "Add a new key to the list of trusted keys.  The key is read from the "
 "filename given with the parameter &synopsis-param-filename; or if the "
@@ -2501,32 +2469,32 @@ msgstr ""
 "se o nome do ficheiro for <literal>-</literal> a partir da entrada standard."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:65
+#: apt-key.8.xml:59
 msgid "Remove a key from the list of trusted keys."
 msgstr "Remove uma chave da lista de chaves de confiança."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:76
+#: apt-key.8.xml:70
 msgid "Output the key &synopsis-param-keyid; to standard output."
 msgstr "Escreve o &synopsis-param-keyid; da chave na saída standard."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:87
+#: apt-key.8.xml:81
 msgid "Output all trusted keys to standard output."
 msgstr "Escreve todas as chaves de confiança na saída standard."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:98
+#: apt-key.8.xml:92
 msgid "List trusted keys."
 msgstr "Lista as chaves de confiança."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:109
+#: apt-key.8.xml:103
 msgid "List fingerprints of trusted keys."
 msgstr "Lista as fingerprints das chaves de confiança."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:120
+#: apt-key.8.xml:114
 msgid ""
 "Pass advanced options to gpg. With adv --recv-key you can download the "
 "public key."
@@ -2535,7 +2503,7 @@ msgstr ""
 "chave pública."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:132
+#: apt-key.8.xml:126
 msgid ""
 "Update the local keyring with the archive keyring and remove from the local "
 "keyring the archive keys which are no longer valid.  The archive keyring is "
@@ -2548,7 +2516,7 @@ msgstr ""
 "por exemplo o pacote &keyring-package; em &keyring-distro;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:146
+#: apt-key.8.xml:140
 msgid ""
 "Perform an update working similarly to the <command>update</command> command "
 "above, but get the archive keyring from a URI instead and validate it "
@@ -2566,12 +2534,12 @@ msgstr ""
 "lo."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-key.8.xml:162 apt-cdrom.8.xml:82
+#: apt-key.8.xml:156 apt-cdrom.8.xml:76
 msgid "Options"
 msgstr "Opções"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:163
+#: apt-key.8.xml:157
 msgid ""
 "Note that options need to be defined before the commands described in the "
 "previous section."
@@ -2580,7 +2548,7 @@ msgstr ""
 "secção prévia."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:166
+#: apt-key.8.xml:160
 msgid ""
 "With this option it is possible to specify a particular keyring file the "
 "command should operate on. The default is that a command is executed on the "
@@ -2597,48 +2565,48 @@ msgstr ""
 "chaves são adicionadas a este."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:181
+#: apt-key.8.xml:175
 msgid "<filename>/etc/apt/trustdb.gpg</filename>"
 msgstr "<filename>/etc/apt/trustdb.gpg</filename>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:182
+#: apt-key.8.xml:176
 msgid "Local trust database of archive keys."
 msgstr "Base de dados local de confiança de chaves de arquivos."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:185
+#: apt-key.8.xml:179
 msgid "&keyring-filename;"
 msgstr "&keyring-filename;"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:186
+#: apt-key.8.xml:180
 msgid "Keyring of &keyring-distro; archive trusted keys."
 msgstr "Chaveiro das chaves de confiança dos arquivos &keyring-distro;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:189
+#: apt-key.8.xml:183
 msgid "&keyring-removed-filename;"
 msgstr "&keyring-removed-filename;"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:190
+#: apt-key.8.xml:184
 msgid "Keyring of &keyring-distro; archive removed trusted keys."
 msgstr ""
 "Chaveiro das chaves de confiança removidas dos arquivos &keyring-distro;."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:199
+#: apt-key.8.xml:193
 msgid "&apt-get;, &apt-secure;"
 msgstr "&apt-get;, &apt-secure;"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-mark.8.xml:35
+#: apt-mark.8.xml:29
 msgid "mark/unmark a package as being automatically-installed"
 msgstr "marca/desmarca um pacote como sendo instalado automaticamente"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:41
+#: apt-mark.8.xml:35
 msgid ""
 "<command>apt-mark</command> will change whether a package has been marked as "
 "being automatically installed."
@@ -2647,7 +2615,7 @@ msgstr ""
 "sendo instalado automaticamente."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:45
+#: apt-mark.8.xml:39
 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 "
@@ -2663,7 +2631,7 @@ msgstr ""
 "command> ou <command>aptitude</command> (exemplos)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:54
+#: apt-mark.8.xml:48
 msgid ""
 "<literal>auto</literal> is used to mark a package as being automatically "
 "installed, which will cause the package to be removed when no more manually "
@@ -2674,7 +2642,7 @@ msgstr ""
 "pacote instalado manualmente depender deste pacote."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:62
+#: apt-mark.8.xml:56
 msgid ""
 "<literal>manual</literal> is used to mark a package as being manually "
 "installed, which will prevent the package from being automatically removed "
@@ -2685,7 +2653,7 @@ msgstr ""
 "se nenhum outro pacote depender dele."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:70
+#: apt-mark.8.xml:64
 msgid ""
 "<literal>hold</literal> is used to mark a package as held back, which will "
 "prevent the package from being automatically installed, upgraded or "
@@ -2700,7 +2668,7 @@ msgstr ""
 "pela opção <option>--file</option>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:80
+#: apt-mark.8.xml:74
 msgid ""
 "<literal>unhold</literal> is used to cancel a previously set hold on a "
 "package to allow all actions again."
@@ -2709,7 +2677,7 @@ msgstr ""
 "definido num pacote para permitir de novo todas as acções."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:86
+#: apt-mark.8.xml:80
 msgid ""
 "<literal>showauto</literal> is used to print a list of automatically "
 "installed packages with each package on a new line.  All automatically "
@@ -2723,7 +2691,7 @@ msgstr ""
 "automaticamente."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:94
+#: apt-mark.8.xml:88
 msgid ""
 "<literal>showmanual</literal> can be used in the same way as "
 "<literal>showauto</literal> except that it will print a list of manually "
@@ -2734,7 +2702,7 @@ msgstr ""
 "instalados manualmente."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:101
+#: apt-mark.8.xml:95
 msgid ""
 "<literal>showhold</literal> is used to print a list of packages on hold in "
 "the same way as for the other show commands."
@@ -2743,7 +2711,7 @@ msgstr ""
 "retenção do mesmo modo que os outros comandos show."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:117
+#: apt-mark.8.xml:111
 msgid ""
 "Read/Write package stats from the filename given with the parameter "
 "&synopsis-param-filename; instead of from the default location, which is "
@@ -2756,7 +2724,7 @@ msgstr ""
 "directório definido pelo Item de Configuração: <literal>Dir::State</literal>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:138
+#: apt-mark.8.xml:132
 msgid ""
 "<command>apt-mark</command> returns zero on normal operation, non-zero on "
 "error."
@@ -2765,12 +2733,12 @@ msgstr ""
 "erro."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-secure.8.xml:49
+#: apt-secure.8.xml:43
 msgid "Archive authentication support for APT"
 msgstr "Suporte de autenticação de arquivos para o APT"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:54
+#: apt-secure.8.xml:48
 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 "
@@ -2783,7 +2751,7 @@ msgstr ""
 "não têm acesso à chave de assinatura do ficheiro Release."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:62
+#: apt-secure.8.xml:56
 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 "
@@ -2799,7 +2767,7 @@ msgstr ""
 "verificadas antes de descarregar pacotes delas."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:71
+#: apt-secure.8.xml:65
 msgid ""
 "The package frontends &apt-get;, &aptitude; and &synaptic; support this new "
 "authentication feature."
@@ -2808,12 +2776,12 @@ msgstr ""
 "nova funcionalidade de autenticação."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:76
+#: apt-secure.8.xml:70
 msgid "Trusted archives"
 msgstr "Arquivos de confiança"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:79
+#: apt-secure.8.xml:73
 msgid ""
 "The chain of trust from an apt archive to the end user is made up of several "
 "steps. <command>apt-secure</command> is the last step in this chain; "
@@ -2830,7 +2798,7 @@ msgstr ""
 "assegurar que a integridade do arquivo está correcta."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:87
+#: apt-secure.8.xml:81
 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 "
@@ -2843,7 +2811,7 @@ msgstr ""
 "verify e devscripts respectivamente)."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:94
+#: apt-secure.8.xml:88
 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. In order to become "
@@ -2861,7 +2829,7 @@ msgstr ""
 "para assegurar a identidade do dono da chave."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:104
+#: apt-secure.8.xml:98
 msgid ""
 "Once the uploaded package is verified and included in the archive, the "
 "maintainer signature is stripped off, and checksums of the package are "
@@ -2883,7 +2851,7 @@ msgstr ""
 "package;."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:115
+#: apt-secure.8.xml:109
 msgid ""
 "End users can check the signature of the Release file, extract a checksum of "
 "a package from it and compare it with the checksum of the package they "
@@ -2895,7 +2863,7 @@ msgstr ""
 "confiar no APT que faz isto automaticamente."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:120
+#: apt-secure.8.xml:114
 msgid ""
 "Notice that this is distinct from checking signatures on a per package "
 "basis. It is designed to prevent two possible attacks:"
@@ -2904,7 +2872,7 @@ msgstr ""
 "desenhado para prevenir dois ataques possíveis:"
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:125
+#: apt-secure.8.xml:119
 msgid ""
 "<literal>Network \"man in the middle\" attacks</literal>. Without signature "
 "checking, malicious agents can introduce themselves into the package "
@@ -2919,7 +2887,7 @@ msgstr ""
 "um servidor impostor (através de ataques de fraude de ARP ou DNS)."
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:133
+#: apt-secure.8.xml:127
 msgid ""
 "<literal>Mirror network compromise</literal>.  Without signature checking, a "
 "malicious agent can compromise a mirror host and modify the files in it to "
@@ -2932,7 +2900,7 @@ msgstr ""
 "descarregam pacotes a partir dessa máquina."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:140
+#: apt-secure.8.xml:134
 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 "
@@ -2945,12 +2913,12 @@ msgstr ""
 "mecanismo pode complementar uma assinatura por-pacote."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:146
+#: apt-secure.8.xml:140
 msgid "User configuration"
 msgstr "Configuração do utilizador"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:148
+#: apt-secure.8.xml:142
 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 "
@@ -2964,7 +2932,7 @@ msgstr ""
 "pacotes Debian."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:155
+#: apt-secure.8.xml:149
 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 "
@@ -2981,12 +2949,12 @@ msgstr ""
 "<filename>Release.gpg</filename> dos arquivos que você configurou."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:164
+#: apt-secure.8.xml:158
 msgid "Archive configuration"
 msgstr "Configuração de arquivos"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:166
+#: apt-secure.8.xml:160
 msgid ""
 "If you want to provide archive signatures in an archive under your "
 "maintenance you have to:"
@@ -2995,7 +2963,7 @@ msgstr ""
 "manutenção, você tem que:"
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:171
+#: apt-secure.8.xml:165
 msgid ""
 "<emphasis>Create a toplevel Release file</emphasis>, if it does not exist "
 "already. You can do this by running <command>apt-ftparchive release</"
@@ -3006,7 +2974,7 @@ msgstr ""
 "command> (disponibilizado no apt-utils)."
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:176
+#: apt-secure.8.xml:170
 msgid ""
 "<emphasis>Sign it</emphasis>. You can do this by running <command>gpg --"
 "clearsign -o InRelease Release</command> and <command>gpg -abs -o Release."
@@ -3017,7 +2985,7 @@ msgstr ""
 "gpg Release</command>."
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:180
+#: apt-secure.8.xml:174
 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 "
@@ -3028,7 +2996,7 @@ msgstr ""
 "autenticar os ficheiros no arquivo."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:187
+#: apt-secure.8.xml:181
 msgid ""
 "Whenever the contents of the archive change (new packages are added or "
 "removed) the archive maintainer has to follow the first two steps outlined "
@@ -3039,16 +3007,16 @@ msgstr ""
 "previamente delineados."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:195
+#: apt-secure.8.xml:189
 msgid ""
 "&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, "
-"&debsign; &debsig-verify;, &gpg;"
+"&debsign;, &debsig-verify;, &gpg;"
 msgstr ""
 "&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, "
-"&debsign; &debsig-verify;, &gpg;"
+"&debsign;, &debsig-verify;, &gpg;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:199
+#: apt-secure.8.xml:193
 msgid ""
 "For more background information you might want to review the <ulink url="
 "\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "
@@ -3065,12 +3033,12 @@ msgstr ""
 "ulink> de V. Alex Brennen."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:212
+#: apt-secure.8.xml:206
 msgid "Manpage Authors"
 msgstr "Autores do manual"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:214
+#: apt-secure.8.xml:208
 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."
@@ -3079,12 +3047,12 @@ msgstr ""
 "Jones, Colin Walters, Florian Weimer e Michael Vogt."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-cdrom.8.xml:34
+#: apt-cdrom.8.xml:28
 msgid "APT CD-ROM management utility"
 msgstr "Utilitário de gestão de CD-ROM do APT"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:40
+#: apt-cdrom.8.xml:34
 msgid ""
 "<command>apt-cdrom</command> is used to add a new CD-ROM to APT's list of "
 "available sources. <command>apt-cdrom</command> takes care of determining "
@@ -3097,7 +3065,7 @@ msgstr ""
 "e verificar os ficheiros de índice."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:47
+#: apt-cdrom.8.xml:41
 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 disc in a multi-CD set "
@@ -3109,7 +3077,7 @@ msgstr ""
 "conta possíveis falhas."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:58
+#: apt-cdrom.8.xml:52
 msgid ""
 "<literal>add</literal> is used to add a new disc to the source list. It will "
 "unmount the CD-ROM device, prompt for a disc to be inserted and then proceed "
@@ -3124,7 +3092,7 @@ msgstr ""
 "lhe-à pedido um título descritivo."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:66
+#: apt-cdrom.8.xml:60
 msgid ""
 "APT uses a CD-ROM ID to track which disc is currently in the drive and "
 "maintains a database of these IDs in <filename>&statedir;/cdroms.list</"
@@ -3135,7 +3103,7 @@ msgstr ""
 "list</filename>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:74
+#: apt-cdrom.8.xml:68
 msgid ""
 "A debugging tool to report the identity of the current disc as well as the "
 "stored file name"
@@ -3144,24 +3112,18 @@ msgstr ""
 "assim como o nome de ficheiro armazenado"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:87
-#, fuzzy
-#| msgid ""
-#| "Mount point; specify the location to mount the CD-ROM. This mount point "
-#| "must be listed in <filename>/etc/fstab</filename> and properly "
-#| "configured.  Configuration Item: <literal>Acquire::cdrom::mount</literal>."
+#: apt-cdrom.8.xml:81
 msgid ""
 "Do not try to auto-detect the CD-ROM path. Usually combined with the "
 "<option>--cdrom</option> option.  Configuration Item: <literal>Acquire::"
 "cdrom::AutoDetect</literal>."
 msgstr ""
-"Ponto de Montagem; especifica a localização para montar o cdrom. Este ponto "
-"de montagem deve estar listado em <filename>/etc/fstab</filename> e "
-"configurado apropriadamente. Item de configuração: <literal>Acquire::cdrom::"
-"mount</literal>."
+"Não tente a auto-detecção do caminho do CD-ROM. Normalmente combinada com a "
+"opção <option>--cdrom</option>.  Item de Configuração: <literal>Acquire::"
+"cdrom::AutoDetect</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:95
+#: apt-cdrom.8.xml:89
 msgid ""
 "Mount point; specify the location to mount the CD-ROM. This mount point must "
 "be listed in <filename>/etc/fstab</filename> and properly configured.  "
@@ -3173,7 +3135,7 @@ msgstr ""
 "mount</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:104
+#: apt-cdrom.8.xml:98
 msgid ""
 "Rename a disc; change the label of a disc or override the disc's given "
 "label. This option will cause <command>apt-cdrom</command> to prompt for a "
@@ -3185,7 +3147,7 @@ msgstr ""
 "CDROM::Rename</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:113
+#: apt-cdrom.8.xml:107
 msgid ""
 "No mounting; prevent <command>apt-cdrom</command> from mounting and "
 "unmounting the mount point.  Configuration Item: <literal>APT::CDROM::"
@@ -3196,7 +3158,7 @@ msgstr ""
 "NoMount</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:121
+#: apt-cdrom.8.xml:115
 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 "
@@ -3209,7 +3171,7 @@ msgstr ""
 "configuração: <literal>APT::CDROM::Fast</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:131
+#: apt-cdrom.8.xml:125
 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 "
@@ -3220,7 +3182,7 @@ msgstr ""
 "estranhos. Demora muito mais tempo a sondar o CD mas irá apanhá-los a todos."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:142
+#: apt-cdrom.8.xml:136
 msgid ""
 "No Changes; Do not change the &sources-list; file and do not write index "
 "files. Everything is still checked however.  Configuration Item: "
@@ -3231,12 +3193,12 @@ msgstr ""
 "configuração: <literal>APT::CDROM::NoAct</literal>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:155
+#: apt-cdrom.8.xml:149
 msgid "&apt-conf;, &apt-get;, &sources-list;"
 msgstr "&apt-conf;, &apt-get;, &sources-list;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:160
+#: apt-cdrom.8.xml:154
 msgid ""
 "<command>apt-cdrom</command> returns zero on normal operation, decimal 100 "
 "on error."
@@ -3245,12 +3207,12 @@ msgstr ""
 "erro."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-config.8.xml:35
+#: apt-config.8.xml:29
 msgid "APT Configuration Query program"
 msgstr "Programa de Consulta de Configuração do APT"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:41
+#: apt-config.8.xml:35
 msgid ""
 "<command>apt-config</command> is an internal program used by various "
 "portions of the APT suite to provide consistent configurability. It accesses "
@@ -3263,7 +3225,7 @@ msgstr ""
 "um modo que é fácil de usar para aplicações em script."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:53
+#: apt-config.8.xml:47
 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 the "
@@ -3278,7 +3240,7 @@ msgstr ""
 "script shell deverá ser usado como se segue:"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
-#: apt-config.8.xml:61
+#: apt-config.8.xml:55
 #, no-wrap
 msgid ""
 "OPTS=\"-f\"\n"
@@ -3290,7 +3252,7 @@ msgstr ""
 "eval $RES\n"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:66
+#: apt-config.8.xml:60
 msgid ""
 "This will set the shell environment variable $OPTS to the value of MyApp::"
 "options with a default of <option>-f</option>."
@@ -3299,7 +3261,7 @@ msgstr ""
 "options com uma predefinição de <option>-f</option>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:70
+#: apt-config.8.xml:64
 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 "
@@ -3311,12 +3273,12 @@ msgstr ""
 "verificado internamente."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:79
+#: apt-config.8.xml:73
 msgid "Just show the contents of the configuration space."
 msgstr "Apenas mostra o conteúdo do espaço de configuração."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:92
+#: apt-config.8.xml:86
 msgid ""
 "Include options which have an empty value. This is the default, so use --no-"
 "empty to remove them from the output."
@@ -3325,12 +3287,12 @@ msgstr ""
 "empty para removê-las dos resultados."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
-#: apt-config.8.xml:97
+#: apt-config.8.xml:91
 msgid "&percnt;f &#x0022;&percnt;v&#x0022;;&percnt;n"
 msgstr "&percnt;f &#x0022;&percnt;v&#x0022;;&percnt;n"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:98
+#: apt-config.8.xml:92
 msgid ""
 "Defines the output of each config option. &percnt;t will be replaced with "
 "its individual name, &percnt;f with its full hierarchical name and &percnt;v "
@@ -3348,13 +3310,13 @@ msgstr ""
 "pode ser escrito ao usar &percnt;&percnt;."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:112 apt-extracttemplates.1.xml:73 apt-sortpkgs.1.xml:66
-#: apt-ftparchive.1.xml:610
+#: apt-config.8.xml:106 apt-extracttemplates.1.xml:67 apt-sortpkgs.1.xml:60
+#: apt-ftparchive.1.xml:604
 msgid "&apt-conf;"
 msgstr "&apt-conf;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:117
+#: apt-config.8.xml:111
 msgid ""
 "<command>apt-config</command> returns zero on normal operation, decimal 100 "
 "on error."
@@ -3363,27 +3325,27 @@ msgstr ""
 "em erro."
 
 #. type: Content of: <refentry><refentryinfo><author><contrib>
-#: apt.conf.5.xml:22
+#: apt.conf.5.xml:16
 msgid "Initial documentation of Debug::*."
 msgstr "Documentação inicial do Debug::*."
 
 #. type: Content of: <refentry><refentryinfo><author><email>
-#: apt.conf.5.xml:23
+#: apt.conf.5.xml:17
 msgid "dburrows@debian.org"
 msgstr "dburrows@debian.org"
 
 #. type: Content of: <refentry><refmeta><manvolnum>
-#: apt.conf.5.xml:33 apt_preferences.5.xml:27 sources.list.5.xml:28
+#: apt.conf.5.xml:27 apt_preferences.5.xml:21 sources.list.5.xml:22
 msgid "5"
 msgstr "5"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt.conf.5.xml:40
+#: apt.conf.5.xml:34
 msgid "Configuration file for APT"
 msgstr "Ficheiro de configuração para o APT"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:44
+#: apt.conf.5.xml:38
 msgid ""
 "<filename>/etc/apt/apt.conf</filename> is the main configuration file shared "
 "by all the tools in the APT suite of tools, though it is by no means the "
@@ -3397,7 +3359,7 @@ msgstr ""
 "para disponibilizar um ambiente uniforme."
 
 #. type: Content of: <refentry><refsect1><orderedlist><para>
-#: apt.conf.5.xml:50
+#: apt.conf.5.xml:44
 msgid ""
 "When an APT tool starts up it will read the configuration files in the "
 "following order:"
@@ -3406,7 +3368,7 @@ msgstr ""
 "seguinte ordem:"
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:52
+#: apt.conf.5.xml:46
 msgid ""
 "the file specified by the <envar>APT_CONFIG</envar> environment variable (if "
 "any)"
@@ -3415,7 +3377,7 @@ msgstr ""
 "(se existir)"
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:54
+#: apt.conf.5.xml:48
 msgid ""
 "all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending "
 "order which have either no or \"<literal>conf</literal>\" as filename "
@@ -3434,7 +3396,7 @@ msgstr ""
 "literal> - que então nesse caso será ignorado em silêncio."
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:61
+#: apt.conf.5.xml:55
 msgid ""
 "the main configuration file specified by <literal>Dir::Etc::main</literal>"
 msgstr ""
@@ -3442,7 +3404,7 @@ msgstr ""
 "main</literal>"
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:63
+#: apt.conf.5.xml:57
 msgid ""
 "the command line options are applied to override the configuration "
 "directives or to load even more configuration files."
@@ -3451,12 +3413,12 @@ msgstr ""
 "configuração ou para carregar mais ficheiros de configuração."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:67
+#: apt.conf.5.xml:61
 msgid "Syntax"
 msgstr "Sintaxe"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:68
+#: apt.conf.5.xml:62
 msgid ""
 "The configuration file is organized in a tree with options organized into "
 "functional groups. Option specification is given with a double colon "
@@ -3471,7 +3433,7 @@ msgstr ""
 "ferramenta Get. A opções não herdam dos seus grupos parentes."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:74
+#: apt.conf.5.xml:68
 msgid ""
 "Syntactically the configuration language is modeled after what the ISC tools "
 "such as bind and dhcp use. Lines starting with <literal>//</literal> are "
@@ -3496,7 +3458,7 @@ msgstr ""
 "\"/-:._+\". Um novo scope pode ser aberto com chavetas, assim:"
 
 #. type: Content of: <refentry><refsect1><informalexample><programlisting>
-#: apt.conf.5.xml:87
+#: apt.conf.5.xml:81
 #, no-wrap
 msgid ""
 "APT {\n"
@@ -3514,7 +3476,7 @@ msgstr ""
 "};\n"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:95
+#: apt.conf.5.xml:89
 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 "
@@ -3526,13 +3488,13 @@ msgstr ""
 "por um ponto e vírgula (;)."
 
 #. type: Content of: <refentry><refsect1><informalexample><programlisting>
-#: apt.conf.5.xml:100
+#: apt.conf.5.xml:94
 #, no-wrap
 msgid "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n"
 msgstr "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:103
+#: apt.conf.5.xml:97
 msgid ""
 "In general the sample configuration file &configureindex; is a good guide "
 "for how it should look."
@@ -3541,7 +3503,7 @@ msgstr ""
 "guia de como deve ficar."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:106
+#: apt.conf.5.xml:100
 msgid ""
 "Case is not significant in names of configuration items, so in the previous "
 "example you could use <literal>dpkg::pre-install-pkgs</literal>."
@@ -3551,7 +3513,7 @@ msgstr ""
 "pre-install-pkgs</literal>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:109
+#: apt.conf.5.xml:103
 msgid ""
 "Names for the configuration items are optional if a list is defined as can "
 "be seen in the <literal>DPkg::Pre-Install-Pkgs</literal> example above. If "
@@ -3567,7 +3529,7 @@ msgstr ""
 "opção."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:114
+#: apt.conf.5.xml:108
 msgid ""
 "Two special commands are defined: <literal>#include</literal> (which is "
 "deprecated and not supported by alternative implementations) and "
@@ -3587,7 +3549,7 @@ msgstr ""
 "acabar com um 'ponto e vírgula' (;) .)"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:124
+#: apt.conf.5.xml:118
 msgid ""
 "The <literal>#clear</literal> command is the only way to delete a list or a "
 "complete scope. Reopening a scope (or using the syntax described below with "
@@ -3603,7 +3565,7 @@ msgstr ""
 "sobrepostos, apenas limpos."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:132
+#: apt.conf.5.xml:126
 msgid ""
 "All of the APT tools take an -o option which allows an arbitrary "
 "configuration directive to be specified on the command line. The syntax is a "
@@ -3622,7 +3584,7 @@ msgstr ""
 "ser usada na linha de comandos.)"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:140
+#: apt.conf.5.xml:134
 msgid ""
 "Note that appending items to a list using <literal>::</literal> only works "
 "for one item per line, and that you should not use it in combination with "
@@ -3652,12 +3614,12 @@ msgstr ""
 "explicitamente delas."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:155
+#: apt.conf.5.xml:149
 msgid "The APT Group"
 msgstr "O Grupo APT"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:156
+#: apt.conf.5.xml:150
 msgid ""
 "This group of options controls general APT behavior as well as holding the "
 "options for all of the tools."
@@ -3666,7 +3628,7 @@ msgstr ""
 "as opções para todas as ferramentas."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:161
+#: apt.conf.5.xml:155
 msgid ""
 "System Architecture; sets the architecture to use when fetching files and "
 "parsing package lists. The internal default is the architecture apt was "
@@ -3677,7 +3639,7 @@ msgstr ""
 "qual o APT foi compilado."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:168
+#: apt.conf.5.xml:162
 msgid ""
 "All Architectures the system supports. For instance, CPUs implementing the "
 "<literal>amd64</literal> (also called <literal>x86-64</literal>)  "
@@ -3699,16 +3661,20 @@ msgstr ""
 "<command>dpkg --add-architecture</command>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:182
+#: apt.conf.5.xml:176
 msgid ""
 "List of all build profiles enabled for build-dependency resolution, without "
 "the \"<literal>profile.</literal>\" namespace prefix.  By default this list "
 "is empty. The <envar>DEB_BUILD_PROFILES</envar> as used by &dpkg-"
 "buildpackage; overrides the list notation."
 msgstr ""
+"Lista todos os perfis de compilação activos para resolução de dependências "
+"de compilação, sem o prefixo \"<literal>profile.</literal>\" no espaço do "
+"nome. Por predefinição esta lista está vazia. O <envar>DEB_BUILD_PROFILES</"
+"envar> usado pelo &dpkg-buildpackage; sobrepõe a notação da lista."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:190
+#: apt.conf.5.xml:184
 msgid ""
 "Default release to install packages from if more than one version is "
 "available. Contains release name, codename or release version. Examples: "
@@ -3721,7 +3687,7 @@ msgstr ""
 "'&testing-codename;', '4.0', '5.0*'. Veja também &apt-preferences;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:196
+#: apt.conf.5.xml:190
 msgid ""
 "Ignore held packages; this global option causes the problem resolver to "
 "ignore held packages in its decision making."
@@ -3730,7 +3696,7 @@ msgstr ""
 "os pacotes segurados sejam ignorados na sua decisão de marcação."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:201
+#: apt.conf.5.xml:195
 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 "
@@ -3744,7 +3710,7 @@ msgstr ""
 "directo de os reinstalar."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:209
+#: apt.conf.5.xml:203
 msgid ""
 "Defaults to on, which will cause APT to install essential and important "
 "packages as soon as possible in an install/upgrade operation, in order to "
@@ -3771,7 +3737,7 @@ msgstr ""
 "de A não está mais satisfeita."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:221
+#: apt.conf.5.xml:215
 msgid ""
 "The immediate configuration marker is also applied in the potentially "
 "problematic case of circular dependencies, since a dependency with the "
@@ -3800,7 +3766,7 @@ msgstr ""
 "que pode ajudar a prevenir."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:234
+#: apt.conf.5.xml:228
 msgid ""
 "Before a big operation like <literal>dist-upgrade</literal> is run with this "
 "option disabled you should try to explicitly <literal>install</literal> the "
@@ -3817,7 +3783,7 @@ msgstr ""
 "eles possa trabalhar em melhorar ou corrigir o processo de actualização."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:245
+#: apt.conf.5.xml:239
 msgid ""
 "Never enable this option unless you <emphasis>really</emphasis> know what "
 "you are doing. It permits APT to temporarily remove an essential package to "
@@ -3838,7 +3804,7 @@ msgstr ""
 "command> ou nada de que esses pacotes dependam."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:257
+#: apt.conf.5.xml:251
 msgid ""
 "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 of "
@@ -3875,13 +3841,13 @@ msgstr ""
 "da cache é desactivado."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:273
+#: apt.conf.5.xml:267
 msgid "Defines which packages are considered essential build dependencies."
 msgstr ""
 "Define quais pacotes são considerados dependências essenciais de compilação."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:277
+#: apt.conf.5.xml:271
 msgid ""
 "The Get subsection controls the &apt-get; tool; please see its documentation "
 "for more information about the options here."
@@ -3890,7 +3856,7 @@ msgstr ""
 "documentação para mais informação acerca das opções daqui."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:282
+#: apt.conf.5.xml:276
 msgid ""
 "The Cache subsection controls the &apt-cache; tool; please see its "
 "documentation for more information about the options here."
@@ -3899,7 +3865,7 @@ msgstr ""
 "documentação para mais informação acerca das opções daqui."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:287
+#: apt.conf.5.xml:281
 msgid ""
 "The CDROM subsection controls the &apt-cdrom; tool; please see its "
 "documentation for more information about the options here."
@@ -3908,12 +3874,12 @@ msgstr ""
 "documentação para mais informação acerca das opções de aqui."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:293
+#: apt.conf.5.xml:287
 msgid "The Acquire Group"
 msgstr "O Grupo Acquire"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:294
+#: apt.conf.5.xml:288
 msgid ""
 "The <literal>Acquire</literal> group of options controls the download of "
 "packages as well as the various \"acquire methods\" responsible for the "
@@ -3924,7 +3890,7 @@ msgstr ""
 "descarga (veja também &sources-list;)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:301
+#: apt.conf.5.xml:295
 msgid ""
 "Security related option defaulting to true, as giving a Release file's "
 "validation an expiration date prevents replay attacks over a long timescale, "
@@ -3946,7 +3912,7 @@ msgstr ""
 "seguinte."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:314
+#: apt.conf.5.xml:308
 msgid ""
 "Maximum time (in seconds) after its creation (as indicated by the "
 "<literal>Date</literal> header) that the <filename>Release</filename> file "
@@ -3966,7 +3932,7 @@ msgstr ""
 "nome da opção."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:326
+#: apt.conf.5.xml:320
 msgid ""
 "Minimum time (in seconds) after its creation (as indicated by the "
 "<literal>Date</literal> header) that the <filename>Release</filename> file "
@@ -3986,7 +3952,7 @@ msgstr ""
 "arquivo ao nome da opção."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:338
+#: apt.conf.5.xml:332
 msgid ""
 "Try to download deltas called <literal>PDiffs</literal> for indexes (like "
 "<filename>Packages</filename> files) instead of downloading whole ones. True "
@@ -3997,7 +3963,7 @@ msgstr ""
 "por inteiro. Verdadeiro por predefinição."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:341
+#: apt.conf.5.xml:335
 msgid ""
 "Two sub-options to limit the use of PDiffs are also available: "
 "<literal>FileLimit</literal> can be used to specify a maximum number of "
@@ -4015,7 +3981,7 @@ msgstr ""
 "completo em vez das patches."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:351
+#: apt.conf.5.xml:345
 msgid ""
 "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</"
 "literal> or <literal>access</literal> which determines how APT parallelizes "
@@ -4030,7 +3996,7 @@ msgstr ""
 "aberta uma ligação por tipo de URI."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:359
+#: apt.conf.5.xml:353
 msgid ""
 "Number of retries to perform. If this is non-zero APT will retry failed "
 "files the given number of times."
@@ -4039,7 +4005,7 @@ msgstr ""
 "tentar, no número fornecido de vezes, obter ficheiros falhados."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:364
+#: apt.conf.5.xml:358
 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."
@@ -4049,7 +4015,7 @@ msgstr ""
 "A predefinição é verdadeiro."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:369
+#: apt.conf.5.xml:363
 msgid ""
 "<literal>http::Proxy</literal> sets the default proxy to use for HTTP URIs. "
 "It is in the standard form of <literal>http://[[user][:pass]@]host[:port]/</"
@@ -4068,7 +4034,7 @@ msgstr ""
 "variável de ambiente <envar>http_proxy</envar>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:377
+#: apt.conf.5.xml:371
 msgid ""
 "Three settings are provided for cache control with HTTP/1.1 compliant proxy "
 "caches.  <literal>No-Cache</literal> tells the proxy not to use its cached "
@@ -4088,7 +4054,7 @@ msgstr ""
 "(grandes) ficheiros .deb."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:387 apt.conf.5.xml:475
+#: apt.conf.5.xml:381 apt.conf.5.xml:469
 msgid ""
 "The option <literal>timeout</literal> sets the timeout timer used by the "
 "method; this value applies to the connection as well as the data timeout."
@@ -4098,7 +4064,7 @@ msgstr ""
 "dados."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:390
+#: apt.conf.5.xml:384
 msgid ""
 "The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to "
 "enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be beneficial e."
@@ -4117,7 +4083,7 @@ msgstr ""
 "web e proxies que escolheram não respeitar a especificação HTTP/1.1."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:397
+#: apt.conf.5.xml:391
 msgid ""
 "<literal>Acquire::http::AllowRedirect</literal> controls whether APT will "
 "follow redirects, which is enabled by default."
@@ -4126,14 +4092,7 @@ msgstr ""
 "os redireccionamentos, o que está activo por predefinição."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:400
-#, fuzzy
-#| msgid ""
-#| "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
-#| "literal> which accepts integer values in kilobytes. The default value is "
-#| "0 which deactivates the limit and tries to use all available bandwidth "
-#| "(note that this option implicitly disables downloading from multiple "
-#| "servers at the same time.)"
+#: apt.conf.5.xml:394
 msgid ""
 "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
 "literal> which accepts integer values in kilobytes per second. The default "
@@ -4142,13 +4101,13 @@ msgid ""
 "multiple servers at the same time."
 msgstr ""
 "A largura de banda usada pode ser limitada com <literal>Acquire::http::Dl-"
-"Limit</literal> que aceita valores inteiros em kilobytes. O valor "
-"predefinido é 0 que desactiva o limite e tenta usar toda a largura de banda "
-"disponível (note que esta opção implicitamente desactiva a descarga a partir "
-"de múltiplos servidores ao mesmo tempo.)"
+"Limit</literal> que aceita valores inteiros em kilobytes por segundo. O "
+"valor predefinido é 0 que desactiva o limite e tenta usar toda a largura de "
+"banda disponível. Note que esta opção implicitamente desactiva a descarga a "
+"partir de múltiplos servidores ao mesmo tempo."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:407
+#: apt.conf.5.xml:401
 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 "
@@ -4160,7 +4119,7 @@ msgstr ""
 "identificador conhecido."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:411
+#: apt.conf.5.xml:405
 msgid ""
 "<literal>Acquire::http::Proxy-Auto-Detect</literal> can be used to specify "
 "an external command to discover the http proxy to use. Apt expects the "
@@ -4172,9 +4131,18 @@ msgid ""
 "takes precedence over the legacy option name <literal>ProxyAutoDetect</"
 "literal>."
 msgstr ""
+"<literal>Acquire::http::Proxy-Auto-Detect</literal> pode ser usado para "
+"especificar um comando externo para descobrir o proxy http a usar. O apt "
+"espera que o comando forneça o resultado do proxy no stdout ao estilo "
+"<literal>http://proxy:port/</literal>. Isto irá sobrepor o <literal>Acquire::"
+"http::Proxy</literal> genérico mas não qualquer configuração especifica da "
+"máquina proxy definida via <literal>Acquire::http::Proxy::$HOST</literal>. "
+"Veja o pacote &squid-deb-proxy-client; para um exemplo de implementação que "
+"usa avahi. Esta opção toma precedência sobre o nome de opção antigo "
+"<literal>ProxyAutoDetect</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:429
+#: apt.conf.5.xml:423
 msgid ""
 "The <literal>Cache-control</literal>, <literal>Timeout</literal>, "
 "<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> and "
@@ -4191,7 +4159,7 @@ msgstr ""
 "literal> ainda não é suportada."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:437
+#: apt.conf.5.xml:431
 msgid ""
 "<literal>CaInfo</literal> suboption specifies place of file that holds info "
 "about trusted certificates.  <literal>&lt;host&gt;::CaInfo</literal> is the "
@@ -4230,7 +4198,7 @@ msgstr ""
 "host&gt;::SslForceVersion</literal> é a opção 'por máquina' correspondente."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:458
+#: apt.conf.5.xml:452
 msgid ""
 "<literal>ftp::Proxy</literal> sets the default proxy to use for FTP URIs.  "
 "It is in the standard form of <literal>ftp://[[user][:pass]@]host[:port]/</"
@@ -4264,7 +4232,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:478
+#: apt.conf.5.xml:472
 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, "
@@ -4280,7 +4248,7 @@ msgstr ""
 "específica (veja a amostra de ficheiro de configuração para exemplos)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:485
+#: apt.conf.5.xml:479
 msgid ""
 "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
 "envar> environment variable to an HTTP URL - see the discussion of the http "
@@ -4294,7 +4262,7 @@ msgstr ""
 "eficiência."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:490
+#: apt.conf.5.xml:484
 msgid ""
 "The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
 "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -4309,13 +4277,13 @@ msgstr ""
 "ligações IPv4. Note que a maioria dos servidores FTP não suporta RFC2428."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:504
+#: apt.conf.5.xml:498
 #, no-wrap
 msgid "/cdrom/::Mount \"foo\";"
 msgstr "/cdrom/::Mount \"foo\";"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:499
+#: apt.conf.5.xml:493
 msgid ""
 "For URIs using the <literal>cdrom</literal> method, the only configurable "
 "option is the mount point, <literal>cdrom::Mount</literal>, which must be "
@@ -4336,7 +4304,7 @@ msgstr ""
 "barra final. Comandos para desmontar podem ser especificados usando o UMount."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:512
+#: apt.conf.5.xml:506
 msgid ""
 "For GPGV URIs the only configurable option is <literal>gpgv::Options</"
 "literal>, which passes additional parameters to gpgv."
@@ -4345,13 +4313,13 @@ msgstr ""
 "literal>, a qual passa parâmetros adicionais ao gpgv."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:523
+#: apt.conf.5.xml:517
 #, no-wrap
 msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
 msgstr "Acquire::CompressionTypes::<replaceable>Extensão de Ficheiro</replaceable> \"<replaceable>Nome de método</replaceable>\";"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:518
+#: apt.conf.5.xml:512
 msgid ""
 "List of compression types which are understood by the acquire methods.  "
 "Files like <filename>Packages</filename> can be available in various "
@@ -4370,19 +4338,19 @@ msgstr ""
 "alterado. A sintaxe para isto é: <placeholder type=\"synopsis\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:528
+#: apt.conf.5.xml:522
 #, no-wrap
 msgid "Acquire::CompressionTypes::Order:: \"gz\";"
 msgstr "Acquire::CompressionTypes::Order:: \"gz\";"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:531
+#: apt.conf.5.xml:525
 #, no-wrap
 msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
 msgstr "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:524
+#: apt.conf.5.xml:518
 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 "
@@ -4414,13 +4382,13 @@ msgstr ""
 "automaticamente."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:538
+#: apt.conf.5.xml:532
 #, no-wrap
 msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
 msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:533
+#: apt.conf.5.xml:527
 msgid ""
 "Note that the <literal>Dir::Bin::<replaceable>Methodname</replaceable></"
 "literal> will be checked at run time. If this option has been set, the "
@@ -4446,7 +4414,7 @@ msgstr ""
 "prefixar a lista com este tipo."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:543
+#: apt.conf.5.xml:537
 msgid ""
 "The special type <literal>uncompressed</literal> can be used to give "
 "uncompressed files a preference, but note that most archives don't provide "
@@ -4458,7 +4426,7 @@ msgstr ""
 "maioritariamente apenas para mirrors locais."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:550
+#: apt.conf.5.xml:544
 msgid ""
 "When downloading <literal>gzip</literal> compressed indexes (Packages, "
 "Sources, or Translations), keep them gzip compressed locally instead of "
@@ -4471,7 +4439,7 @@ msgstr ""
 "CPU quando constrói as caches de pacotes locais. Falso por predefinição."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:558
+#: apt.conf.5.xml:552
 msgid ""
 "The Languages subsection controls which <filename>Translation</filename> "
 "files are downloaded and in which order APT tries to display the description-"
@@ -4491,13 +4459,13 @@ msgstr ""
 "especialmenteraros."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><programlisting>
-#: apt.conf.5.xml:575
+#: apt.conf.5.xml:569
 #, no-wrap
 msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
 msgstr "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:563
+#: apt.conf.5.xml:557
 msgid ""
 "The default list includes \"environment\" and \"en\". "
 "\"<literal>environment</literal>\" has a special meaning here: it will be "
@@ -4536,7 +4504,7 @@ msgstr ""
 "\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:576
+#: apt.conf.5.xml:570
 msgid ""
 "Note: To prevent problems resulting from APT being executed in different "
 "environments (e.g. by different users or by other programs) all Translation "
@@ -4550,22 +4518,22 @@ msgstr ""
 "literal>\" implícito)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:585
+#: apt.conf.5.xml:579
 msgid "When downloading, force to use only the IPv4 protocol."
-msgstr ""
+msgstr "Ao descarregar, força o uso exclusivo do protocolo IPv4."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:591
+#: apt.conf.5.xml:585
 msgid "When downloading, force to use only the IPv6 protocol."
-msgstr ""
+msgstr "Ao descarregar, força o uso exclusivo do protocolo IPv6."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:598
+#: apt.conf.5.xml:592
 msgid "Directories"
 msgstr "Directórios"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:600
+#: apt.conf.5.xml:594
 msgid ""
 "The <literal>Dir::State</literal> section has directories that pertain to "
 "local state information. <literal>lists</literal> is the directory to place "
@@ -4584,29 +4552,30 @@ msgstr ""
 "items que não começam com <filename>/</filename> ou <filename>./</filename>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:607
+#: apt.conf.5.xml:601
 msgid ""
 "<literal>Dir::Cache</literal> contains locations pertaining to local cache "
 "information, such as the two package caches <literal>srcpkgcache</literal> "
 "and <literal>pkgcache</literal> as well as the location to place downloaded "
 "archives, <literal>Dir::Cache::archives</literal>. Generation of caches can "
-"be turned off by setting their names to the empty string. This will slow "
+"be turned off by setting <literal>pkgcache</literal> or "
+"<literal>srcpkgcache</literal> to <literal>\"\"</literal>.  This will slow "
 "down startup but save disk space. It is probably preferable to turn off the "
-"pkgcache rather than the srcpkgcache. Like <literal>Dir::State</literal> the "
-"default directory is contained in <literal>Dir::Cache</literal>"
+"pkgcache rather than the srcpkgcache.  Like <literal>Dir::State</literal> "
+"the default directory is contained in <literal>Dir::Cache</literal>"
 msgstr ""
 "<literal>Dir::Cache</literal> contém localizações pertencentes a informação "
 "da cache local, como as caches de dois pacotes <literal>srcpkgcache</"
 "literal> e <literal>pkgcache</literal> assim como a localização onde colocar "
 "arquivos descarregados, <literal>Dir::Cache::archives</literal>. A geração "
-"de caches pode ser desligada ao definir os seus nomes para uma string vazia. "
-"Isto irá abrandar o arranque mas poupar espaço em disco. Provavelmente é "
-"preferível desligar o pkgcache em vez do srcpkgcache. Tal como <literal>Dir::"
-"State</literal> o directório predefinido é contido em <literal>Dir::Cache</"
-"literal>"
+"de caches pode ser desligada ao definir <literal>pkgcache</literal> ou "
+"<literal>srcpkgcache</literal> para <literal>\"\"</literal>. Isto irá "
+"abrandar o arranque mas poupar espaço em disco. Provavelmente é preferível "
+"desligar o pkgcache em vez do srcpkgcache. Tal como <literal>Dir::State</"
+"literal> o directório predefinido é contido em <literal>Dir::Cache</literal>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:616
+#: apt.conf.5.xml:611
 msgid ""
 "<literal>Dir::Etc</literal> contains the location of configuration files, "
 "<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -4621,7 +4590,7 @@ msgstr ""
 "ficheiro de configuração especificado por <envar>APT_CONFIG</envar>)."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:622
+#: apt.conf.5.xml:617
 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 "
@@ -4632,7 +4601,7 @@ msgstr ""
 "estar feito então é carregado o ficheiro de configuração principal."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:626
+#: apt.conf.5.xml:621
 msgid ""
 "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
 "Bin::Methods</literal> specifies the location of the method handlers and "
@@ -4650,7 +4619,7 @@ msgstr ""
 "respectivos programas."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:634
+#: apt.conf.5.xml:629
 msgid ""
 "The configuration item <literal>RootDir</literal> has a special meaning.  If "
 "set, all paths in <literal>Dir::</literal> will be relative to "
@@ -4671,7 +4640,7 @@ msgstr ""
 "procurado em <filename>/tmp/staging/var/lib/dpkg/status</filename>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:647
+#: apt.conf.5.xml:642
 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 "
@@ -4689,12 +4658,12 @@ msgstr ""
 "expressão regular."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:656
+#: apt.conf.5.xml:651
 msgid "APT in DSelect"
 msgstr "APT em DSelect"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:658
+#: apt.conf.5.xml:653
 msgid ""
 "When APT is used as a &dselect; method several configuration directives "
 "control the default behavior. These are in the <literal>DSelect</literal> "
@@ -4705,7 +4674,7 @@ msgstr ""
 "<literal>DSelect</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:663
+#: apt.conf.5.xml:658
 msgid ""
 "Cache Clean mode; this value may be one of <literal>always</literal>, "
 "<literal>prompt</literal>, <literal>auto</literal>, <literal>pre-auto</"
@@ -4727,7 +4696,7 @@ msgstr ""
 "pacotes."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:677
+#: apt.conf.5.xml:672
 msgid ""
 "The contents of this variable are passed to &apt-get; as command line "
 "options when it is run for the install phase."
@@ -4736,7 +4705,7 @@ msgstr ""
 "comandos quando é corrido para a fase de instalação."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:682
+#: apt.conf.5.xml:677
 msgid ""
 "The contents of this variable are passed to &apt-get; as command line "
 "options when it is run for the update phase."
@@ -4745,7 +4714,7 @@ msgstr ""
 "comandos quando é executado para a fase de actualização."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:687
+#: apt.conf.5.xml:682
 msgid ""
 "If true the [U]pdate operation in &dselect; will always prompt to continue.  "
 "The default is to prompt only on error."
@@ -4754,12 +4723,12 @@ msgstr ""
 "continuar. A predefinição é avisar apenas em caso de erro."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:693
+#: apt.conf.5.xml:688
 msgid "How APT calls &dpkg;"
 msgstr "Como o APT chama o &dpkg;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:694
+#: apt.conf.5.xml:689
 msgid ""
 "Several configuration directives control how APT invokes &dpkg;. These are "
 "in the <literal>DPkg</literal> section."
@@ -4768,7 +4737,7 @@ msgstr ""
 "&dpkg;. Estas estão na secção <literal>DPkg</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:699
+#: apt.conf.5.xml:694
 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 "
@@ -4779,7 +4748,7 @@ msgstr ""
 "um argumento único ao &dpkg;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:705
+#: apt.conf.5.xml:700
 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 "
@@ -4792,14 +4761,7 @@ msgstr ""
 "bin/sh</filename>, caso algum deles falhe, o APT irá abortar."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:712
-#, fuzzy
-#| 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 "
-#| "commands are invoked in order using <filename>/bin/sh</filename>; should "
-#| "any fail APT will abort. APT will pass the filenames of all .deb files it "
-#| "is going to install to the commands, one per line on standard input."
+#: apt.conf.5.xml:707
 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 "
@@ -4813,17 +4775,11 @@ msgstr ""
 "notação listada. Os  comandos são invocados em ordem usando <filename>/bin/"
 "sh</filename>, caso algum deles falhe, o APT irá abortar. O APT irá passar "
 "para os comandos os nomes de ficheiros de todos os ficheiros .deb que vai "
-"instalar, um por cada linha na entrada standard."
+"instalar, um por cada linha no descritor de ficheiro requisitado, usando por "
+"predefinição a entrada standard."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:719
-#, fuzzy
-#| msgid ""
-#| "Version 2 of this protocol dumps more information, including the protocol "
-#| "version, the APT configuration space and the packages, files and versions "
-#| "being changed. Version 2 is enabled by setting <literal>DPkg::Tools::"
-#| "options::cmd::Version</literal> to 2. <literal>cmd</literal> is a command "
-#| "given to <literal>Pre-Install-Pkgs</literal>."
+#: apt.conf.5.xml:714
 msgid ""
 "Version 2 of this protocol dumps more information, including the protocol "
 "version, the APT configuration space and the packages, files and versions "
@@ -4832,12 +4788,11 @@ msgid ""
 msgstr ""
 "A versão 2 deste protocolo despeja mais informação, incluindo a versão de "
 "protocolo, o espaço de configuração do APT e os pacotes, ficheiros e versões "
-"que foram alteradas. A versão 2 é activada ao definir <literal>DPkg::Tools::"
-"options::cmd::Version</literal> a 2. <literal>cmd</literal> é um comando "
-"dado ao <literal>Pre-Install-Pkgs</literal>."
+"que foram alteradas. A versão 3 adiciona a arquitectura e a bandeira "
+"<literal>MultiArch</literal> a cada versão a ser despejada."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:724
+#: apt.conf.5.xml:719
 msgid ""
 "The version of the protocol to be used for the command "
 "<literal><replaceable>cmd</replaceable></literal> can be chosen by setting "
@@ -4846,9 +4801,14 @@ msgid ""
 "the requested version it will send the information in the highest version it "
 "has support for instead."
 msgstr ""
+"A versão do protocolo a ser usado para o comando <literal><replaceable>cmd</"
+"replaceable></literal> pode ser escolhida ao definir <literal>DPkg::Tools::"
+"options::<replaceable>cmd</replaceable>::Version</literal> correctamente, "
+"sendo a predefinição a versão 1. Se o APT não suportar a versão requisitada "
+"irá então enviar a informação na versão mais alta que suporta."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:731
+#: apt.conf.5.xml:726
 msgid ""
 "The file descriptor to be used to send the information can be requested with "
 "<literal>DPkg::Tools::options::<replaceable>cmd</replaceable>::InfoFD</"
@@ -4857,9 +4817,16 @@ msgid ""
 "looking for the environment variable <envar>APT_HOOK_INFO_FD</envar> which "
 "contains the number of the used file descriptor as a confirmation."
 msgstr ""
+"O descritor de ficheiro a ser usado para enviar a informação pode ser "
+"requisitado com <literal>DPkg::Tools::options::<replaceable>cmd</"
+"replaceable>::InfoFD</literal> o qual usa <literal>0</literal> por "
+"predefinição para a saída standard e está disponível desde a versão 0.9.11. "
+"como confirmação pode ser detectado o suporte para a opção ao observar a "
+"variável de ambiente <envar>APT_HOOK_INFO_FD</envar> que contém o número do "
+"descritor de ficheiro usado."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:741
+#: apt.conf.5.xml:736
 msgid ""
 "APT chdirs to this directory before invoking &dpkg;, the default is "
 "<filename>/</filename>."
@@ -4868,7 +4835,7 @@ msgstr ""
 "predefinição é <filename>/</filename>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:746
+#: apt.conf.5.xml:741
 msgid ""
 "These options are passed to &dpkg-buildpackage; when compiling packages; the "
 "default is to disable signing and produce all binaries."
@@ -4877,12 +4844,12 @@ msgstr ""
 "predefinição é desactivar a assinatura e produzir todos os binários."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:751
+#: apt.conf.5.xml:746
 msgid "dpkg trigger usage (and related options)"
 msgstr "Utilização trigger do dpkg (e opções relacionadas)"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:752
+#: apt.conf.5.xml:747
 msgid ""
 "APT can call &dpkg; in such a way as to let it make aggressive use of "
 "triggers over multiple calls of &dpkg;. Without further options &dpkg; will "
@@ -4908,7 +4875,7 @@ msgstr ""
 "100% enquanto na realidade está a configurar todos os pacotes."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:767
+#: apt.conf.5.xml:762
 #, no-wrap
 msgid ""
 "DPkg::NoTriggers \"true\";\n"
@@ -4922,7 +4889,7 @@ msgstr ""
 "DPkg::TriggersPending \"true\";"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:761
+#: apt.conf.5.xml:756
 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 "
@@ -4946,7 +4913,7 @@ msgstr ""
 "\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:774
+#: apt.conf.5.xml:769
 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 "
@@ -4968,7 +4935,7 @@ msgstr ""
 "chamadas unpack e remove."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:782
+#: apt.conf.5.xml:777
 msgid ""
 "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
 "and \"<literal>no</literal>\".  The default value is \"<literal>all</literal>"
@@ -4998,7 +4965,7 @@ msgstr ""
 "arrancar."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:797
+#: apt.conf.5.xml:792
 msgid ""
 "If this option is set APT will call <command>dpkg --configure --pending</"
 "command> to let &dpkg; handle all required configurations and triggers. This "
@@ -5016,7 +4983,7 @@ msgstr ""
 "esta opção em todas excepto na última execução."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:804
+#: apt.conf.5.xml:799
 msgid ""
 "Useful for the <literal>smart</literal> configuration as a package which has "
 "pending triggers is not considered as <literal>installed</literal>, and "
@@ -5032,7 +4999,7 @@ msgstr ""
 "configurar este pacote."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:817
+#: apt.conf.5.xml:812
 #, no-wrap
 msgid ""
 "OrderList::Score {\n"
@@ -5050,7 +5017,7 @@ msgstr ""
 "};"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:810
+#: apt.conf.5.xml:805
 msgid ""
 "Essential packages (and their dependencies) should be configured immediately "
 "after unpacking. It is a good idea to do this quite early in the upgrade "
@@ -5074,12 +5041,12 @@ msgstr ""
 "predefinidos. <placeholder type=\"literallayout\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:830
+#: apt.conf.5.xml:825
 msgid "Periodic and Archives options"
 msgstr "Opções Periodic e Archives"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:831
+#: apt.conf.5.xml:826
 msgid ""
 "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
 "of options configure behavior of apt periodic updates, which is done by the "
@@ -5092,12 +5059,12 @@ msgstr ""
 "Veja o cabeçalho deste script para uma breve documentação das suas opções."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:839
+#: apt.conf.5.xml:834
 msgid "Debug options"
 msgstr "Opções de depuração"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:841
+#: apt.conf.5.xml:836
 msgid ""
 "Enabling options in the <literal>Debug::</literal> section will cause "
 "debugging information to be sent to the standard error stream of the program "
@@ -5114,7 +5081,7 @@ msgstr ""
 "interesse para o utilizador normal, mas algumas podem ter:"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:852
+#: apt.conf.5.xml:847
 msgid ""
 "<literal>Debug::pkgProblemResolver</literal> enables output about the "
 "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -5125,7 +5092,7 @@ msgstr ""
 "remove, purge</literal>."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:860
+#: apt.conf.5.xml:855
 msgid ""
 "<literal>Debug::NoLocking</literal> disables all file locking.  This can be "
 "used to run some operations (for instance, <literal>apt-get -s install</"
@@ -5136,7 +5103,7 @@ msgstr ""
 "<literal>apt-get -s install</literal>) como um utilizador não root."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:869
+#: apt.conf.5.xml:864
 msgid ""
 "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
 "time that <literal>apt</literal> invokes &dpkg;."
@@ -5148,7 +5115,7 @@ 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:877
+#: apt.conf.5.xml:872
 msgid ""
 "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
 "in CD-ROM IDs."
@@ -5157,12 +5124,12 @@ msgstr ""
 "IDs de CD-ROM."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:887
+#: apt.conf.5.xml:882
 msgid "A full list of debugging options to apt follows."
 msgstr "Segue-se uma lista completa de opções de depuração para o apt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:896
+#: apt.conf.5.xml:891
 msgid ""
 "Print information related to accessing <literal>cdrom://</literal> sources."
 msgstr ""
@@ -5170,25 +5137,25 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:907
+#: apt.conf.5.xml:902
 msgid "Print information related to downloading packages using FTP."
 msgstr ""
 "Escreve informação relacionada com o descarregamento de pacotes usando FTP."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:918
+#: apt.conf.5.xml:913
 msgid "Print information related to downloading packages using HTTP."
 msgstr ""
 "Escreve informação relacionada com o descarregamento de pacotes usando HTTP."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:929
+#: apt.conf.5.xml:924
 msgid "Print information related to downloading packages using HTTPS."
 msgstr ""
 "Escreve informação relacionada com o descarregamento de pacotes usando HTTPS."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:940
+#: apt.conf.5.xml:935
 msgid ""
 "Print information related to verifying cryptographic signatures using "
 "<literal>gpg</literal>."
@@ -5197,7 +5164,7 @@ msgstr ""
 "criptográficas usando <literal>gpg</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:951
+#: apt.conf.5.xml:946
 msgid ""
 "Output information about the process of accessing collections of packages "
 "stored on CD-ROMs."
@@ -5206,13 +5173,13 @@ msgstr ""
 "armazenados em CD-ROMs."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:961
+#: apt.conf.5.xml:956
 msgid "Describes the process of resolving build-dependencies in &apt-get;."
 msgstr ""
 "Descreve os processos de resolver dependências de compilação no &apt-get;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:971
+#: apt.conf.5.xml:966
 msgid ""
 "Output each cryptographic hash that is generated by the <literal>apt</"
 "literal> libraries."
@@ -5221,7 +5188,7 @@ msgstr ""
 "<literal>apt</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:981
+#: apt.conf.5.xml:976
 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 "
@@ -5232,7 +5199,7 @@ msgstr ""
 "para um CD-ROM."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:992
+#: apt.conf.5.xml:987
 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."
@@ -5242,14 +5209,14 @@ msgstr ""
 "literal></quote> ao mesmo tempo."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1004
+#: apt.conf.5.xml:999
 msgid "Log when items are added to or removed from the global download queue."
 msgstr ""
 "Regista no log quando os items são adicionados ou removidos da fila de "
 "download global."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1014
+#: apt.conf.5.xml:1009
 msgid ""
 "Output status messages and errors related to verifying checksums and "
 "cryptographic signatures of downloaded files."
@@ -5258,7 +5225,7 @@ msgstr ""
 "checksums e assinaturas criptográficas dos ficheiros descarregados."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1024
+#: apt.conf.5.xml:1019
 msgid ""
 "Output information about downloading and applying package index list diffs, "
 "and errors relating to package index list diffs."
@@ -5268,7 +5235,7 @@ msgstr ""
 "pacote."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1036
+#: apt.conf.5.xml:1031
 msgid ""
 "Output information related to patching apt package lists when downloading "
 "index diffs instead of full indices."
@@ -5277,7 +5244,7 @@ msgstr ""
 "do apt quando se descarrega diffs de índice em vez de índices completos."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1047
+#: apt.conf.5.xml:1042
 msgid ""
 "Log all interactions with the sub-processes that actually perform downloads."
 msgstr ""
@@ -5285,7 +5252,7 @@ msgstr ""
 "downloads."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1058
+#: apt.conf.5.xml:1053
 msgid ""
 "Log events related to the automatically-installed status of packages and to "
 "the removal of unused packages."
@@ -5294,7 +5261,7 @@ msgstr ""
 "de pacotes e com a remoção de pacotes não utilizados."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1068
+#: apt.conf.5.xml:1063
 msgid ""
 "Generate debug messages describing which packages are being automatically "
 "installed to resolve dependencies.  This corresponds to the initial auto-"
@@ -5309,7 +5276,7 @@ msgstr ""
 "literal>; veja <literal>Debug::pkgProblemResolver</literal> para isso."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1082
+#: apt.conf.5.xml:1077
 msgid ""
 "Generate debug messages describing which packages are marked as keep/install/"
 "remove while the ProblemResolver does his work.  Each addition or deletion "
@@ -5340,7 +5307,7 @@ msgstr ""
 "pacote aparece."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1103
+#: apt.conf.5.xml:1098
 msgid ""
 "When invoking &dpkg;, output the precise command line with which it is being "
 "invoked, with arguments separated by a single space character."
@@ -5350,7 +5317,7 @@ msgstr ""
 "único."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1114
+#: apt.conf.5.xml:1109
 msgid ""
 "Output all the data received from &dpkg; on the status file descriptor and "
 "any errors encountered while parsing it."
@@ -5359,7 +5326,7 @@ msgstr ""
 "estado e quaisquer erros encontrados enquanto os analisa."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1125
+#: apt.conf.5.xml:1120
 msgid ""
 "Generate a trace of the algorithm that decides the order in which "
 "<literal>apt</literal> should pass packages to &dpkg;."
@@ -5368,7 +5335,7 @@ msgstr ""
 "literal> deve passar os pacotes ao &dpkg;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1137
+#: apt.conf.5.xml:1132
 msgid ""
 "Output status messages tracing the steps performed when invoking &dpkg;."
 msgstr ""
@@ -5376,12 +5343,12 @@ msgstr ""
 "&dpkg;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1148
+#: apt.conf.5.xml:1143
 msgid "Output the priority of each package list on startup."
 msgstr "Escreve a prioridade da cada lista de pacote no arranque."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1158
+#: apt.conf.5.xml:1153
 msgid ""
 "Trace the execution of the dependency resolver (this applies only to what "
 "happens when a complex dependency problem is encountered)."
@@ -5390,7 +5357,7 @@ msgstr ""
 "acontece quando é encontrado um problema de dependências complexo)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1169
+#: apt.conf.5.xml:1164
 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 "
@@ -5401,7 +5368,7 @@ msgstr ""
 "mesma que é descrita em <literal>Debug::pkgDepCache::Marker</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1181
+#: apt.conf.5.xml:1176
 msgid ""
 "Print information about the vendors read from <filename>/etc/apt/vendors."
 "list</filename>."
@@ -5410,21 +5377,24 @@ msgstr ""
 "vendors.list</filename>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1191
+#: apt.conf.5.xml:1186
 msgid ""
 "Display the external commands that are called by apt hooks.  This includes e."
 "g. the config options <literal>DPkg::{Pre,Post}-Invoke</literal> or "
 "<literal>APT::Update::{Pre,Post}-Invoke</literal>."
 msgstr ""
+"Mostra os comandos externos que são chamados por hooks do apt. Isto inclui "
+"por exemplo as opções de configuração <literal>DPkg::{Pre,Post}-Invoke</"
+"literal> ou <literal>APT::Update::{Pre,Post}-Invoke</literal>."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1215 apt_preferences.5.xml:547 sources.list.5.xml:239
-#: apt-ftparchive.1.xml:598
+#: apt.conf.5.xml:1210 apt_preferences.5.xml:541 sources.list.5.xml:233
+#: apt-ftparchive.1.xml:592
 msgid "Examples"
 msgstr "Exemplos"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1216
+#: apt.conf.5.xml:1211
 msgid ""
 "&configureindex; is a configuration file showing example values for all "
 "possible options."
@@ -5434,17 +5404,17 @@ msgstr ""
 
 #.  ? reading apt.conf 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1228
+#: apt.conf.5.xml:1223
 msgid "&apt-cache;, &apt-config;, &apt-preferences;."
 msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt_preferences.5.xml:34
+#: apt_preferences.5.xml:28
 msgid "Preference control file for APT"
 msgstr "Ficheiro de controle de preferências para o APT"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:39
+#: apt_preferences.5.xml:33
 msgid ""
 "The APT preferences file <filename>/etc/apt/preferences</filename> and the "
 "fragment files in the <filename>/etc/apt/preferences.d/</filename> folder "
@@ -5457,7 +5427,7 @@ msgstr ""
 "ser seleccionadas para instalação."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:44
+#: apt_preferences.5.xml:38
 msgid ""
 "Several versions of a package may be available for installation when the "
 "&sources-list; file contains references to more than one distribution (for "
@@ -5479,7 +5449,7 @@ msgstr ""
 "para instalação."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:54
+#: apt_preferences.5.xml:48
 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 "
@@ -5494,7 +5464,7 @@ msgstr ""
 "escolha da instância, apenas a escolha da versão."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:61
+#: apt_preferences.5.xml:55
 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 "
@@ -5518,7 +5488,7 @@ msgstr ""
 "foi avisado."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:72
+#: apt_preferences.5.xml:66
 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 "
@@ -5540,24 +5510,24 @@ msgstr ""
 "em silêncio."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:81
+#: apt_preferences.5.xml:75
 msgid "APT's Default Priority Assignments"
 msgstr "Atribuições de Prioridade Predefinidas do APT"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:96
+#: apt_preferences.5.xml:90
 #, no-wrap
 msgid "<command>apt-get install -t testing <replaceable>some-package</replaceable></command>\n"
 msgstr "<command>apt-get install -t testing <replaceable>algum-pacote</replaceable></command>\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:99
+#: apt_preferences.5.xml:93
 #, no-wrap
 msgid "APT::Default-Release \"stable\";\n"
 msgstr "APT::Default-Release \"stable\";\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:83
+#: apt_preferences.5.xml:77
 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 "
@@ -5585,7 +5555,7 @@ msgstr ""
 "\" id=\"0\"/> <placeholder type=\"programlisting\" id=\"1\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:103
+#: apt_preferences.5.xml:97
 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:"
@@ -5594,12 +5564,12 @@ msgstr ""
 "algoritmo para definir as prioridades das versões de um pacote. Atribuir:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:108
+#: apt_preferences.5.xml:102
 msgid "priority 1"
 msgstr "priority 1"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:109
+#: apt_preferences.5.xml:103
 msgid ""
 "to the versions coming from archives which in their <filename>Release</"
 "filename> files are marked as \"NotAutomatic: yes\" but <emphasis>not</"
@@ -5612,12 +5582,12 @@ msgstr ""
 "<literal>experimental</literal> da Debian."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:115
+#: apt_preferences.5.xml:109
 msgid "priority 100"
 msgstr "priority 100"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:116
+#: apt_preferences.5.xml:110
 msgid ""
 "to the version that is already installed (if any) and to the versions coming "
 "from archives which in their <filename>Release</filename> files are marked "
@@ -5630,12 +5600,12 @@ msgstr ""
 "backports da Debian desde <literal>squeeze-backports</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:123
+#: apt_preferences.5.xml:117
 msgid "priority 500"
 msgstr "priority 500"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:124
+#: apt_preferences.5.xml:118
 msgid ""
 "to the versions that are not installed and do not belong to the target "
 "release."
@@ -5644,19 +5614,19 @@ msgstr ""
 "destinado."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:128
+#: apt_preferences.5.xml:122
 msgid "priority 990"
 msgstr "priority 990"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:129
+#: apt_preferences.5.xml:123
 msgid ""
 "to the versions that are not installed and belong to the target release."
 msgstr ""
 "para as versões que não estão instaladas e pertencem ao lançamento destinado."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:134
+#: apt_preferences.5.xml:128
 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 "
@@ -5674,7 +5644,7 @@ msgstr ""
 "yes\"."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:141
+#: apt_preferences.5.xml:135
 msgid ""
 "APT then applies the following rules, listed in order of precedence, to "
 "determine which version of a package to install."
@@ -5683,7 +5653,7 @@ msgstr ""
 "para determinar qual versão de um pacote deve instalar."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:144
+#: apt_preferences.5.xml:138
 msgid ""
 "Never downgrade unless the priority of an available version exceeds 1000.  "
 "(\"Downgrading\" is installing a less recent version of a package in place "
@@ -5699,12 +5669,12 @@ msgstr ""
 "arriscado.)"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:150
+#: apt_preferences.5.xml:144
 msgid "Install the highest priority version."
 msgstr "Instala a versão de prioridade mais alta."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:151
+#: apt_preferences.5.xml:145
 msgid ""
 "If two or more versions have the same priority, install the most recent one "
 "(that is, the one with the higher version number)."
@@ -5713,7 +5683,7 @@ msgstr ""
 "(isto é, aquela com o número de versão mais alto)."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:154
+#: apt_preferences.5.xml:148
 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 <literal>--reinstall</"
@@ -5724,7 +5694,7 @@ msgstr ""
 "reinstall</literal> é fornecida, instala a que foi desinstalada."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:160
+#: apt_preferences.5.xml:154
 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 "
@@ -5739,7 +5709,7 @@ msgstr ""
 "replaceable></command> ou <command>apt-get upgrade</command>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:167
+#: apt_preferences.5.xml:161
 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 "
@@ -5753,7 +5723,7 @@ msgstr ""
 "get upgrade</command>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:172
+#: apt_preferences.5.xml:166
 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 "
@@ -5772,12 +5742,12 @@ msgstr ""
 "prioridade mais alta que a versão instalada."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:181
+#: apt_preferences.5.xml:175
 msgid "The Effect of APT Preferences"
 msgstr "O Efeito das Preferências do APT"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:183
+#: apt_preferences.5.xml:177
 msgid ""
 "The APT preferences file allows the system administrator to control the "
 "assignment of priorities.  The file consists of one or more multi-line "
@@ -5790,7 +5760,7 @@ msgstr ""
 "um ou dois formatos, um formato específico e um formato geral."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:189
+#: apt_preferences.5.xml:183
 msgid ""
 "The specific form assigns a priority (a \"Pin-Priority\") to one or more "
 "specified packages with a specified version or version range.  For example, "
@@ -5807,7 +5777,7 @@ msgstr ""
 "por espaços."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:196
+#: apt_preferences.5.xml:190
 #, no-wrap
 msgid ""
 "Package: perl\n"
@@ -5819,7 +5789,7 @@ msgstr ""
 "Pin-Priority: 1001\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:202
+#: apt_preferences.5.xml:196
 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 "
@@ -5834,7 +5804,7 @@ msgstr ""
 "nome de domínio totalmente qualificado do site."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:208
+#: apt_preferences.5.xml:202
 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 "
@@ -5846,7 +5816,7 @@ msgstr ""
 "local."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:213
+#: apt_preferences.5.xml:207
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -5858,7 +5828,7 @@ msgstr ""
 "Pin-Priority: 999\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:218
+#: apt_preferences.5.xml:212
 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 "
@@ -5871,7 +5841,7 @@ msgstr ""
 "servidor identificadas pelo nome de máquina \"ftp.de.debian.org\""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:222
+#: apt_preferences.5.xml:216
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -5883,7 +5853,7 @@ msgstr ""
 "Pin-Priority: 999\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:226
+#: apt_preferences.5.xml:220
 msgid ""
 "This should <emphasis>not</emphasis> be confused with the Origin of a "
 "distribution as specified in a <filename>Release</filename> file.  What "
@@ -5898,7 +5868,7 @@ msgstr ""
 "como \"Debian\" ou \"Ximian\"."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:231
+#: apt_preferences.5.xml:225
 msgid ""
 "The following record assigns a low priority to all package versions "
 "belonging to any distribution whose Archive name is \"<literal>unstable</"
@@ -5909,7 +5879,7 @@ msgstr ""
 "\"<literal>unstable</literal>\"."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:235
+#: apt_preferences.5.xml:229
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -5921,7 +5891,7 @@ msgstr ""
 "Pin-Priority: 50\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:240
+#: apt_preferences.5.xml:234
 msgid ""
 "The following record assigns a high priority to all package versions "
 "belonging to any distribution whose Codename is \"<literal>&testing-codename;"
@@ -5932,7 +5902,7 @@ msgstr ""
 "\"<literal>&testing-codename;</literal>\"."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:244
+#: apt_preferences.5.xml:238
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -5944,7 +5914,7 @@ msgstr ""
 "Pin-Priority: 900\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:249
+#: apt_preferences.5.xml:243
 msgid ""
 "The following record assigns a high priority to all package versions "
 "belonging to any release whose Archive name is \"<literal>stable</literal>\" "
@@ -5956,7 +5926,7 @@ msgstr ""
 "version;</literal>\"."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:254
+#: apt_preferences.5.xml:248
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -5968,12 +5938,12 @@ msgstr ""
 "Pin-Priority: 500\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:264
+#: apt_preferences.5.xml:258
 msgid "Regular expressions and &glob; syntax"
 msgstr "Expressões regulares e sintaxe &glob;"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:266
+#: apt_preferences.5.xml:260
 msgid ""
 "APT also supports pinning by &glob; expressions, and regular expressions "
 "surrounded by slashes. For example, the following example assigns the "
@@ -5988,7 +5958,7 @@ msgstr ""
 "regular extensa do POSIX rodeada de barras)."
 
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:275
+#: apt_preferences.5.xml:269
 #, no-wrap
 msgid ""
 "Package: gnome* /kde/\n"
@@ -6000,7 +5970,7 @@ msgstr ""
 "Pin-Priority: 500\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:281
+#: apt_preferences.5.xml:275
 msgid ""
 "The rule for those expressions is that they can occur anywhere where a "
 "string can occur. Thus, the following pin assigns the priority 990 to all "
@@ -6011,7 +5981,7 @@ msgstr ""
 "a todos os pacotes de um lançamento que começa com &ubuntu-codename;."
 
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:287
+#: apt_preferences.5.xml:281
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -6023,7 +5993,7 @@ msgstr ""
 "Pin-Priority: 990\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:293
+#: apt_preferences.5.xml:287
 msgid ""
 "If a regular expression occurs in a <literal>Package</literal> field, the "
 "behavior is the same as if this regular expression were replaced with a list "
@@ -6041,12 +6011,12 @@ msgstr ""
 "considerado uma expressão &glob; em si próprio."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:309
+#: apt_preferences.5.xml:303
 msgid "How APT Interprets Priorities"
 msgstr "Como o APT Interpreta as Prioridades"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:312
+#: apt_preferences.5.xml:306
 msgid ""
 "Priorities (P) assigned in the APT preferences file must be positive or "
 "negative integers.  They are interpreted as follows (roughly speaking):"
@@ -6056,12 +6026,12 @@ msgstr ""
 "(falando grosso):"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:317
+#: apt_preferences.5.xml:311
 msgid "P &gt;= 1000"
 msgstr "P &gt;= 1000"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:318
+#: apt_preferences.5.xml:312
 msgid ""
 "causes a version to be installed even if this constitutes a downgrade of the "
 "package"
@@ -6070,12 +6040,12 @@ msgstr ""
 "na versão do pacote (downgrade)"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:322
+#: apt_preferences.5.xml:316
 msgid "990 &lt;= P &lt; 1000"
 msgstr "990 &lt;= P &lt; 1000"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:323
+#: apt_preferences.5.xml:317
 msgid ""
 "causes a version to be installed even if it does not come from the target "
 "release, unless the installed version is more recent"
@@ -6084,12 +6054,12 @@ msgstr ""
 "destino, a menos que a versão instalada seja mais recente"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:328
+#: apt_preferences.5.xml:322
 msgid "500 &lt;= P &lt; 990"
 msgstr "500 &lt;= P &lt; 990"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:329
+#: apt_preferences.5.xml:323
 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"
@@ -6099,12 +6069,12 @@ msgstr ""
 "mais recente"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:334
+#: apt_preferences.5.xml:328
 msgid "100 &lt;= P &lt; 500"
 msgstr "100 &lt;= P &lt; 500"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:335
+#: apt_preferences.5.xml:329
 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"
@@ -6114,12 +6084,12 @@ msgstr ""
 "recente"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:340
+#: apt_preferences.5.xml:334
 msgid "0 &lt; P &lt; 100"
 msgstr "0 &lt; P &lt; 100"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:341
+#: apt_preferences.5.xml:335
 msgid ""
 "causes a version to be installed only if there is no installed version of "
 "the package"
@@ -6128,17 +6098,17 @@ msgstr ""
 "instalada do pacote"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:345
+#: apt_preferences.5.xml:339
 msgid "P &lt; 0"
 msgstr "P &lt; 0"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:346
+#: apt_preferences.5.xml:340
 msgid "prevents the version from being installed"
 msgstr "previne a instalação da versão"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:351
+#: apt_preferences.5.xml:345
 msgid ""
 "If any specific-form records match an available package version then the "
 "first such record determines the priority of the package version.  Failing "
@@ -6152,7 +6122,7 @@ msgstr ""
 "determina a prioridade da versão de pacote."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:357
+#: apt_preferences.5.xml:351
 msgid ""
 "For example, suppose the APT preferences file contains the three records "
 "presented earlier:"
@@ -6161,7 +6131,7 @@ msgstr ""
 "registos apresentados atrás:"
 
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:361
+#: apt_preferences.5.xml:355
 #, no-wrap
 msgid ""
 "Package: perl\n"
@@ -6189,12 +6159,12 @@ msgstr ""
 "Pin-Priority: 50\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:374
+#: apt_preferences.5.xml:368
 msgid "Then:"
 msgstr "Então:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:376
+#: apt_preferences.5.xml:370
 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 "
@@ -6209,7 +6179,7 @@ msgstr ""
 "perl;*, então será feito um downgrade ao <literal>perl</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:381
+#: apt_preferences.5.xml:375
 msgid ""
 "A version of any package other than <literal>perl</literal> that is "
 "available from the local system has priority over other versions, even "
@@ -6220,7 +6190,7 @@ msgstr ""
 "versões, mesmo versões que pertencem ao lançamento de destino."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:385
+#: apt_preferences.5.xml:379
 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 <literal>unstable</"
@@ -6233,12 +6203,12 @@ msgstr ""
 "instalação e se nenhuma versão do pacote já estiver instalada."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:395
+#: apt_preferences.5.xml:389
 msgid "Determination of Package Version and Distribution Properties"
 msgstr "Determinação da Versão do Pacote e Propriedades da Distribuição"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:397
+#: apt_preferences.5.xml:391
 msgid ""
 "The locations listed in the &sources-list; file should provide "
 "<filename>Packages</filename> and <filename>Release</filename> files to "
@@ -6249,7 +6219,7 @@ msgstr ""
 "descrever os pacotes disponíveis nessa localização."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:401
+#: apt_preferences.5.xml:395
 msgid ""
 "The <filename>Packages</filename> file is normally found in the directory "
 "<filename>.../dists/<replaceable>dist-name</replaceable>/"
@@ -6269,27 +6239,27 @@ msgstr ""
 "definir prioridades do APT:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:409
+#: apt_preferences.5.xml:403
 msgid "the <literal>Package:</literal> line"
 msgstr "a linha <literal>Package:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:410
+#: apt_preferences.5.xml:404
 msgid "gives the package name"
 msgstr "fornece o nome do pacote"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:413 apt_preferences.5.xml:463
+#: apt_preferences.5.xml:407 apt_preferences.5.xml:457
 msgid "the <literal>Version:</literal> line"
 msgstr "a linha <literal>Version:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:414
+#: apt_preferences.5.xml:408
 msgid "gives the version number for the named package"
 msgstr "fornece o número de versão do pacote nomeado"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:419
+#: apt_preferences.5.xml:413
 msgid ""
 "The <filename>Release</filename> file is normally found in the directory "
 "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
@@ -6311,12 +6281,12 @@ msgstr ""
 "APT:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:430
+#: apt_preferences.5.xml:424
 msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
 msgstr "a linha <literal>Archive:</literal> ou <literal>Suite:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:431
+#: apt_preferences.5.xml:425
 msgid ""
 "names the archive to which all the packages in the directory tree belong.  "
 "For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@ -6333,18 +6303,18 @@ msgstr ""
 "requerer a linha:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:441
+#: apt_preferences.5.xml:435
 #, no-wrap
 msgid "Pin: release a=stable\n"
 msgstr "Pin: release a=stable\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:447
+#: apt_preferences.5.xml:441
 msgid "the <literal>Codename:</literal> line"
 msgstr "a linha <literal>Codename:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:448
+#: apt_preferences.5.xml:442
 msgid ""
 "names the codename to which all the packages in the directory tree belong.  "
 "For example, the line \"Codename: &testing-codename;\" specifies that all of "
@@ -6361,13 +6331,13 @@ msgstr ""
 "preferências do APT requer a linha:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:457
+#: apt_preferences.5.xml:451
 #, no-wrap
 msgid "Pin: release n=&testing-codename;\n"
 msgstr "Pin: release n=&testing-codename;\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:464
+#: apt_preferences.5.xml:458
 msgid ""
 "names the release version.  For example, the packages in the tree might "
 "belong to Debian release version &stable-version;.  Note that there is "
@@ -6384,7 +6354,7 @@ msgstr ""
 "seguintes linhas:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:473
+#: apt_preferences.5.xml:467
 #, no-wrap
 msgid ""
 "Pin: release v=&stable-version;\n"
@@ -6396,12 +6366,12 @@ msgstr ""
 "Pin: release &stable-version;\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:482
+#: apt_preferences.5.xml:476
 msgid "the <literal>Component:</literal> line"
 msgstr "a linha <literal>Component:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:483
+#: apt_preferences.5.xml:477
 msgid ""
 "names the licensing component associated with the packages in the directory "
 "tree of the <filename>Release</filename> file.  For example, the line "
@@ -6419,18 +6389,18 @@ msgstr ""
 "a linha:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:492
+#: apt_preferences.5.xml:486
 #, no-wrap
 msgid "Pin: release c=main\n"
 msgstr "Pin: release c=main\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:498
+#: apt_preferences.5.xml:492
 msgid "the <literal>Origin:</literal> line"
 msgstr "a linha <literal>Origin:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:499
+#: apt_preferences.5.xml:493
 msgid ""
 "names the originator of the packages in the directory tree of the "
 "<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"
@@ -6443,18 +6413,18 @@ msgstr ""
 "linha:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:505
+#: apt_preferences.5.xml:499
 #, no-wrap
 msgid "Pin: release o=Debian\n"
 msgstr "Pin: release o=Debian\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:511
+#: apt_preferences.5.xml:505
 msgid "the <literal>Label:</literal> line"
 msgstr "a linha <literal>Label:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:512
+#: apt_preferences.5.xml:506
 msgid ""
 "names the label of the packages in the directory tree of the "
 "<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"
@@ -6467,13 +6437,13 @@ msgstr ""
 "linha:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:518
+#: apt_preferences.5.xml:512
 #, no-wrap
 msgid "Pin: release l=Debian\n"
 msgstr "Pin: release l=Debian\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:525
+#: apt_preferences.5.xml:519
 msgid ""
 "All of the <filename>Packages</filename> and <filename>Release</filename> "
 "files retrieved from locations listed in the &sources-list; file are stored "
@@ -6498,12 +6468,12 @@ msgstr ""
 "literal> da distribuição <literal>unstable</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:538
+#: apt_preferences.5.xml:532
 msgid "Optional Lines in an APT Preferences Record"
 msgstr "Linhas Opcionais num Registo de Preferências do APT"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:540
+#: apt_preferences.5.xml:534
 msgid ""
 "Each record in the APT preferences file can optionally begin with one or "
 "more lines beginning with the word <literal>Explanation:</literal>.  This "
@@ -6514,12 +6484,12 @@ msgstr ""
 "literal>. Isto disponibiliza um espaço para comentários."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:549
+#: apt_preferences.5.xml:543
 msgid "Tracking Stable"
 msgstr "Acompanhando Stable"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:557
+#: apt_preferences.5.xml:551
 #, no-wrap
 msgid ""
 "Explanation: Uninstall or do not install any Debian-originated\n"
@@ -6543,7 +6513,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:551
+#: apt_preferences.5.xml:545
 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 "
@@ -6559,8 +6529,8 @@ msgstr ""
 "\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:574 apt_preferences.5.xml:620
-#: apt_preferences.5.xml:678
+#: apt_preferences.5.xml:568 apt_preferences.5.xml:614
+#: apt_preferences.5.xml:672
 #, no-wrap
 msgid ""
 "apt-get install <replaceable>package-name</replaceable>\n"
@@ -6572,7 +6542,7 @@ msgstr ""
 "apt-get dist-upgrade\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:569
+#: apt_preferences.5.xml:563
 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 "
@@ -6585,13 +6555,13 @@ msgstr ""
 "\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:586
+#: apt_preferences.5.xml:580
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/testing\n"
 msgstr "apt-get install <replaceable>pacote</replaceable>/testing\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:580
+#: apt_preferences.5.xml:574
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>testing</literal> distribution; the package "
@@ -6604,12 +6574,12 @@ msgstr ""
 "outra vez. <placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:592
+#: apt_preferences.5.xml:586
 msgid "Tracking Testing or Unstable"
 msgstr "Acompanhando Testing ou Unstable"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:601
+#: apt_preferences.5.xml:595
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -6637,7 +6607,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:594
+#: apt_preferences.5.xml:588
 msgid ""
 "The following APT preferences file will cause APT to assign a high priority "
 "to package versions from the <literal>testing</literal> distribution, a "
@@ -6654,7 +6624,7 @@ msgstr ""
 "<placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:615
+#: apt_preferences.5.xml:609
 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 "
@@ -6667,13 +6637,13 @@ msgstr ""
 "\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:635
+#: apt_preferences.5.xml:629
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
 msgstr "apt-get install <replaceable>pacote</replaceable>/unstable\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:626
+#: apt_preferences.5.xml:620
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>unstable</literal> distribution.  "
@@ -6692,12 +6662,12 @@ msgstr ""
 "versão instalada. <placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:642
+#: apt_preferences.5.xml:636
 msgid "Tracking the evolution of a codename release"
 msgstr "Acompanhando a evolução de um nome de código de lançamento"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:656
+#: apt_preferences.5.xml:650
 #, no-wrap
 msgid ""
 "Explanation: Uninstall or do not install any Debian-originated package versions\n"
@@ -6731,7 +6701,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:644
+#: apt_preferences.5.xml:638
 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 "
@@ -6757,7 +6727,7 @@ msgstr ""
 "<placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:673
+#: apt_preferences.5.xml:667
 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 "
@@ -6770,13 +6740,13 @@ msgstr ""
 "codename;</literal>.  <placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:693
+#: apt_preferences.5.xml:687
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/sid\n"
 msgstr "apt-get install <replaceable>pacote</replaceable>/sid\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:684
+#: apt_preferences.5.xml:678
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>sid</literal> distribution.  Thereafter, "
@@ -6795,17 +6765,17 @@ msgstr ""
 "instalada. <placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:708
+#: apt_preferences.5.xml:702
 msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: sources.list.5.xml:35
+#: sources.list.5.xml:29
 msgid "List of configured APT data sources"
 msgstr "Lista das fontes de dados APT configuradas"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:40
+#: sources.list.5.xml:34
 msgid ""
 "The source list <filename>/etc/apt/sources.list</filename> is designed to "
 "support any number of active sources and a variety of source media. The file "
@@ -6822,7 +6792,7 @@ msgstr ""
 "comando equivalente de outra interface \"front-end\" do APT)."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:47
+#: sources.list.5.xml:41
 msgid ""
 "Each line specifying a source starts with type (e.g. <literal>deb-src</"
 "literal>)  followed by options and arguments for this type.  Individual "
@@ -6837,12 +6807,12 @@ msgstr ""
 "numa linha marca o restante dessa linha como um comentário."
 
 #. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:55
+#: sources.list.5.xml:49
 msgid "sources.list.d"
 msgstr "sources.list.d"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:56
+#: sources.list.5.xml:50
 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 "
@@ -6864,12 +6834,12 @@ msgstr ""
 "neste caso serão ignorados em silêncio."
 
 #. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:67
+#: sources.list.5.xml:61
 msgid "The deb and deb-src types"
 msgstr "Os tipos deb e deb-src"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:68
+#: sources.list.5.xml:62
 msgid ""
 "The <literal>deb</literal> type references a typical two-level Debian "
 "archive, <filename>distribution/component</filename>. The "
@@ -6894,7 +6864,7 @@ msgstr ""
 "linha <literal>deb-src</literal> para obter índices das fontes."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:79
+#: sources.list.5.xml:73
 msgid ""
 "The format for a <filename>sources.list</filename> entry using the "
 "<literal>deb</literal> and <literal>deb-src</literal> types is:"
@@ -6903,14 +6873,13 @@ msgstr ""
 "tipos <literal>deb</literal> e <literal>deb-src</literal> é:"
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:82
-#, fuzzy, no-wrap
-#| msgid "deb [ options ] uri distribution [component1] [component2] [...]"
+#: sources.list.5.xml:76
+#, no-wrap
 msgid "deb [ options ] uri suite [component1] [component2] [...]"
-msgstr "deb [ opções ] uri distribuição [componente1] [componente2] [...]"
+msgstr "deb [ opções ] uri suite [componente1] [componente2] [...]"
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:86
+#: sources.list.5.xml:80
 #, no-wrap
 msgid ""
 "     Types: deb deb-src\n"
@@ -6931,26 +6900,35 @@ msgid ""
 "     [option1]: [option1-value]\n"
 "   "
 msgstr ""
+"     Tipos: deb deb-src\n"
+"     URIs: http://exemplo.com\n"
+"     Suites: stable testing\n"
+"     Secções: component1 component2\n"
+"     Descrição: curta\n"
+"      longa longa longa\n"
+"     [opção1]: [opção1-valor]\n"
+"\n"
+"     Tipos: deb\n"
+"     URIs: http://outro.exemlo.com\n"
+"     Suites: experimental\n"
+"     Secções: component1 component2\n"
+"     Activo: não\n"
+"     Descrição: curta\n"
+"      longa longa longa\n"
+"     [opção1]: [opção1-valor]\n"
+"   "
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:84
+#: sources.list.5.xml:78
 msgid ""
 "Alternatively a rfc822 style format is also supported: <placeholder type="
 "\"literallayout\" id=\"0\"/>"
 msgstr ""
+"Em alternativa, é também suportado um formato estilo rfc822: <placeholder "
+"type=\"literallayout\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:105
-#, fuzzy
-#| msgid ""
-#| "The URI for the <literal>deb</literal> type must specify the base of the "
-#| "Debian distribution, from which APT will find the information it needs.  "
-#| "<literal>distribution</literal> can specify an exact path, in which case "
-#| "the components must be omitted and <literal>distribution</literal> must "
-#| "end with a slash (<literal>/</literal>). This is useful for the case when "
-#| "only a particular sub-section of the archive denoted by the URI is of "
-#| "interest.  If <literal>distribution</literal> does not specify an exact "
-#| "path, at least one <literal>component</literal> must be present."
+#: sources.list.5.xml:99
 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.  "
@@ -6963,25 +6941,15 @@ msgid ""
 msgstr ""
 "O URI para o tipo <literal>deb</literal> tem de especificar a base da "
 "distribuição Debian, a partir do qual o APT irá encontrar a informação que "
-"precisa. <literal>distribution</literal> pode especificar um caminho exacto, "
-"que no caso os componente têm de ser omitidos e <literal>distribution</"
-"literal> deve terminar com uma barra (<literal>/</literal>). Isto é útil "
-"para o caso de apenas ser de interesse uma sub-secção particular do arquivo "
-"denotado pelo URI. Se <literal>distribution</literal> não especificar um "
-"caminho exacto, pelo menos um <literal>component</literal> tem de estar "
-"presente."
+"precisa. <literal>suite</literal> pode especificar um caminho exacto, que no "
+"caso os componente têm de ser omitidos e <literal>suite</literal> deve "
+"terminar com uma barra (<literal>/</literal>). Isto é útil para o caso de "
+"apenas ser de interesse uma sub-secção particular do arquivo denotado pelo "
+"URI. Se <literal>suite</literal> não especificar um caminho exacto, pelo "
+"menos um <literal>component</literal> tem de estar presente."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:114
-#, fuzzy
-#| msgid ""
-#| "<literal>distribution</literal> may also contain a variable, <literal>"
-#| "$(ARCH)</literal> which expands to the Debian architecture (such as "
-#| "<literal>amd64</literal> or <literal>armel</literal>) used on the system. "
-#| "This permits architecture-independent <filename>sources.list</filename> "
-#| "files to be used. In general this is only of interest when specifying an "
-#| "exact path, <literal>APT</literal> will automatically generate a URI with "
-#| "the current architecture otherwise."
+#: sources.list.5.xml:108
 msgid ""
 "<literal>suite</literal> may also contain a variable, <literal>$(ARCH)</"
 "literal> which expands to the Debian architecture (such as <literal>amd64</"
@@ -6991,29 +6959,16 @@ msgid ""
 "<literal>APT</literal> will automatically generate a URI with the current "
 "architecture otherwise."
 msgstr ""
-"<literal>distribution</literal> também pode conter uma variável. <literal>"
-"$(ARCH)</literal> a qual se expande à arquitectura Debian (tal como "
-"<literal>amd64</literal> ou <literal>armel</literal>) usada no sistema. Isto "
-"permite que seja usados ficheiros <filename>sources.list</filename> "
-"independentes da arquitectura. Em geral, isto é apenas de interesse quando "
-"se especifica um caminho exacto. De outro modo o <literal>APT</literal> irá "
-"gerar automaticamente um URI com a arquitectura actual."
+"<literal>suite</literal> também pode conter uma variável. <literal>$(ARCH)</"
+"literal> a qual se expande à arquitectura Debian (tal como <literal>amd64</"
+"literal> ou <literal>armel</literal>) usada no sistema. Isto permite que "
+"seja usados ficheiros <filename>sources.list</filename> independentes da "
+"arquitectura. Em geral, isto é apenas de interesse quando se especifica um "
+"caminho exacto. De outro modo o <literal>APT</literal> irá gerar "
+"automaticamente um URI com a arquitectura actual."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:122
-#, fuzzy
-#| 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 "
-#| "distributions or components at that location is desired.  APT will sort "
-#| "the URI list after it has generated a complete set internally, and will "
-#| "collapse multiple references to the same Internet host, for instance, "
-#| "into a single connection, so that it does not inefficiently establish an "
-#| "FTP connection, close it, do something else, and then re-establish a "
-#| "connection to that same host. This feature is useful for accessing busy "
-#| "FTP sites with limits on the number of simultaneous anonymous users. APT "
-#| "also parallelizes connections to different hosts to more effectively deal "
-#| "with sites with low bandwidth."
+#: sources.list.5.xml:116
 msgid ""
 "In the traditional style sources.list format since only one distribution can "
 "be specified per line it may be necessary to have multiple lines for the "
@@ -7027,20 +6982,21 @@ msgid ""
 "users. APT also parallelizes connections to different hosts to more "
 "effectively deal with sites with low bandwidth."
 msgstr ""
-"Como apenas pode ser especificada por linha uma distribuição, pode ser "
-"necessário ter várias linhas para o mesmo URI, se só for desejado um sub-"
-"conjunto de todas as distribuições e componentes dessa localização. O APT "
-"irá ordenar a lista de URI após ter gerado internamente um conjunto "
-"completo, e irá desabar as várias referências à mesma máquina na Internet, "
-"por exemplo, numa única ligação, para que não estabeleça uma ligação FTP "
-"ineficiente, a feche, faça outra coisa, e depois volte a estabelecer ligação "
-"à mesma máquina. Esta funcionalidade é útil para aceder a sites FTP ocupados "
-"que limitam o número de utilizadores anónimos em simultâneo. O APT também "
-"paraleliza ligações a máquinas diferentes para lidar mais eficientemente com "
-"sites com baixa largura de banda."
+"No estilo tradicional, o formato do sources.list, como apenas pode ser "
+"especificada por linha uma distribuição, pode ser necessário ter várias "
+"linhas para o mesmo URI, se só for desejado um sub-conjunto de todas as "
+"distribuições e componentes dessa localização. O APT irá ordenar a lista de "
+"URI após ter gerado internamente um conjunto completo, e irá desabar as "
+"várias referências à mesma máquina na Internet, por exemplo, numa única "
+"ligação, para que não estabeleça uma ligação FTP ineficiente, a feche, faça "
+"outra coisa, e depois volte a estabelecer ligação à mesma máquina. Esta "
+"funcionalidade é útil para aceder a sites FTP ocupados que limitam o número "
+"de utilizadores anónimos em simultâneo. O APT também paraleliza ligações a "
+"máquinas diferentes para lidar mais eficientemente com sites com largura de "
+"banda baixa."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:136
+#: sources.list.5.xml:130
 msgid ""
 "<literal>options</literal> is always optional and needs to be surrounded by "
 "square brackets. It can consist of multiple settings in the form "
@@ -7057,7 +7013,7 @@ msgstr ""
 "definições não suportadas serão ignoradas em silêncio):"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:142
+#: sources.list.5.xml:136
 msgid ""
 "<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
 "replaceable>,…</literal> can be used to specify for which architectures "
@@ -7072,28 +7028,20 @@ msgstr ""
 "<literal>APT::Architectures</literal>."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:146
-#, fuzzy
-#| msgid ""
-#| "<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
-#| "replaceable>,…</literal> can be used to specify for which architectures "
-#| "information should be downloaded. If this option is not set all "
-#| "architectures defined by the <literal>APT::Architectures</literal> option "
-#| "will be downloaded."
+#: sources.list.5.xml:140
 msgid ""
 "<literal>arch+=<replaceable>arch1</replaceable>,<replaceable>arch2</"
 "replaceable>,…</literal> and <literal>arch-=<replaceable>arch1</replaceable>,"
 "<replaceable>arch2</replaceable>,…</literal> which can be used to add/remove "
 "architectures from the set which will be downloaded."
 msgstr ""
-"<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
-"replaceable>,…</literal> pode ser usado para especificar para quais "
-"arquitecturas deve ser descarregada a informação. Se esta opção não estiver "
-"definida, serão descarregadas todas as arquitecturas definidas pela opção "
-"<literal>APT::Architectures</literal>."
+"<literal>arch+=<replaceable>arch1</replaceable>,<replaceable>arch2</"
+"replaceable>,…</literal> e <literal>arch-=<replaceable>arch1</replaceable>,"
+"<replaceable>arch2</replaceable>,…</literal> que podem ser usadas para "
+"adicionar/remover arquitecturas do conjunto que será descarregado."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:149
+#: sources.list.5.xml:143
 msgid ""
 "<literal>trusted=yes</literal> can be set to indicate that packages from "
 "this source are always authenticated even if the <filename>Release</"
@@ -7110,7 +7058,7 @@ msgstr ""
 "lida com fontes mesmo actualmente autenticadas como não sendo autênticas."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:156
+#: sources.list.5.xml:150
 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 "
@@ -7124,12 +7072,12 @@ msgstr ""
 "Internet, por exemplo)."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:161
+#: sources.list.5.xml:155
 msgid "Some examples:"
 msgstr "Alguns exemplos:"
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:163
+#: sources.list.5.xml:157
 #, no-wrap
 msgid ""
 "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
@@ -7141,17 +7089,17 @@ msgstr ""
 "   "
 
 #. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:169
+#: sources.list.5.xml:163
 msgid "URI specification"
 msgstr "Especificação da URI"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:171
+#: sources.list.5.xml:165
 msgid "The currently recognized URI types are:"
 msgstr "Os tipos de URI actualmente reconhecidos são:"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:175
+#: sources.list.5.xml:169
 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 "
@@ -7162,7 +7110,7 @@ msgstr ""
 "arquivos locais."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:182
+#: sources.list.5.xml:176
 msgid ""
 "The cdrom scheme allows APT to use a local CD-ROM drive with media swapping. "
 "Use the &apt-cdrom; program to create cdrom entries in the source list."
@@ -7172,7 +7120,7 @@ msgstr ""
 "fontes."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:189
+#: sources.list.5.xml:183
 msgid ""
 "The http scheme specifies an HTTP server for the archive. If an environment "
 "variable <envar>http_proxy</envar> is set with the format http://server:"
@@ -7189,7 +7137,7 @@ msgstr ""
 "método de autenticação seguro."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:200
+#: sources.list.5.xml:194
 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 page. "
@@ -7210,7 +7158,7 @@ msgstr ""
 "configuração serão ignorados."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:212
+#: sources.list.5.xml:206
 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.  "
@@ -7223,7 +7171,7 @@ msgstr ""
 "ficheiros com o APT."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:219
+#: sources.list.5.xml:213
 msgid ""
 "The rsh/ssh method invokes RSH/SSH to connect to a remote host and access "
 "the files as a given user. Prior configuration of rhosts or RSA keys is "
@@ -7237,12 +7185,12 @@ msgstr ""
 "ficheiros a partir da máquina remota."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:226
+#: sources.list.5.xml:220
 msgid "adding more recognizable URI types"
 msgstr "adicionando mais tipos de URI reconhecíveis"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:228
+#: sources.list.5.xml:222
 msgid ""
 "APT can be extended with more methods shipped in other optional packages, "
 "which should follow the naming scheme <package>apt-transport-"
@@ -7261,7 +7209,7 @@ msgstr ""
 "exemplo o debtorrent - veja &apt-transport-debtorrent;."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:240
+#: sources.list.5.xml:234
 msgid ""
 "Uses the archive stored locally (or NFS mounted) at /home/jason/debian for "
 "stable/main, stable/contrib, and stable/non-free."
@@ -7270,36 +7218,36 @@ msgstr ""
 "para stable/main, stable/contrib, e stable/non-free."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:242
+#: sources.list.5.xml:236
 #, no-wrap
 msgid "deb file:/home/jason/debian stable main contrib non-free"
 msgstr "deb file:/home/jason/debian stable main contrib non-free"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:244
+#: sources.list.5.xml:238
 msgid "As above, except this uses the unstable (development) distribution."
 msgstr ""
 "Como em cima, excepto que usa a distribuição unstable (de desenvolvimento)."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:245
+#: sources.list.5.xml:239
 #, no-wrap
 msgid "deb file:/home/jason/debian unstable main contrib non-free"
 msgstr "deb file:/home/jason/debian unstable main contrib non-free"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:247
+#: sources.list.5.xml:241
 msgid "Source line for the above"
 msgstr "Linha de fonte para o referido acima"
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:248
+#: sources.list.5.xml:242
 #, no-wrap
 msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
 msgstr "deb-src file:/home/jason/debian unstable main contrib non-free"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:250
+#: sources.list.5.xml:244
 msgid ""
 "The first line gets package information for the architectures in "
 "<literal>APT::Architectures</literal> while the second always retrieves "
@@ -7310,7 +7258,7 @@ msgstr ""
 "<literal>amd64</literal> e <literal>armel</literal>."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:252
+#: sources.list.5.xml:246
 #, no-wrap
 msgid ""
 "deb http://ftp.debian.org/debian &stable-codename; main\n"
@@ -7320,7 +7268,7 @@ msgstr ""
 "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:255
+#: sources.list.5.xml:249
 msgid ""
 "Uses HTTP to access the archive at archive.debian.org, and uses only the "
 "hamm/main area."
@@ -7329,13 +7277,13 @@ msgstr ""
 "hamm/main."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:257
+#: sources.list.5.xml:251
 #, no-wrap
 msgid "deb http://archive.debian.org/debian-archive hamm main"
 msgstr "deb http://archive.debian.org/debian-archive hamm main"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:259
+#: sources.list.5.xml:253
 msgid ""
 "Uses FTP to access the archive at ftp.debian.org, under the debian "
 "directory, and uses only the &stable-codename;/contrib area."
@@ -7344,13 +7292,13 @@ msgstr ""
 "usa apenas a área &stable-codename;/contrib."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:261
+#: sources.list.5.xml:255
 #, no-wrap
 msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
 msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:263
+#: sources.list.5.xml:257
 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 "
@@ -7363,19 +7311,19 @@ msgstr ""
 "uma única sessão FTP para ambas linhas de recurso."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:267
+#: sources.list.5.xml:261
 #, no-wrap
 msgid "deb ftp://ftp.debian.org/debian unstable contrib"
 msgstr "deb ftp://ftp.debian.org/debian unstable contrib"
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:276
+#: sources.list.5.xml:270
 #, no-wrap
 msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
 msgstr "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:269
+#: sources.list.5.xml:263
 msgid ""
 "Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe "
 "directory, and uses only files found under <filename>unstable/binary-i386</"
@@ -7394,17 +7342,17 @@ msgstr ""
 "\"literallayout\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:281
+#: sources.list.5.xml:275
 msgid "&apt-cache; &apt-conf;"
 msgstr "&apt-cache; &apt-conf;"
 
 #. type: Content of: <refentry><refmeta><manvolnum>
-#: apt-extracttemplates.1.xml:28 apt-sortpkgs.1.xml:28 apt-ftparchive.1.xml:28
+#: apt-extracttemplates.1.xml:22 apt-sortpkgs.1.xml:22 apt-ftparchive.1.xml:22
 msgid "1"
 msgstr "1"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-extracttemplates.1.xml:35
+#: apt-extracttemplates.1.xml:29
 msgid ""
 "Utility to extract <command>debconf</command> config and templates from "
 "Debian packages"
@@ -7413,7 +7361,7 @@ msgstr ""
 "partir de pacotes Debian"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:41
+#: apt-extracttemplates.1.xml:35
 msgid ""
 "<command>apt-extracttemplates</command> will take one or more Debian package "
 "files as input and write out (to a temporary directory) all associated "
@@ -7428,12 +7376,12 @@ msgstr ""
 "gerada uma linha no formato:"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:46
+#: apt-extracttemplates.1.xml:40
 msgid "package version template-file config-script"
 msgstr "pacote versão ficheiro-modelo script-de-configuração"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:47
+#: apt-extracttemplates.1.xml:41
 msgid ""
 "template-file and config-script are written to the temporary directory "
 "specified by the <option>-t</option> or <option>--tempdir</option> "
@@ -7448,7 +7396,7 @@ msgstr ""
 "<filename>pacote.configuração.XXXXXX</filename>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-extracttemplates.1.xml:60
+#: apt-extracttemplates.1.xml:54
 msgid ""
 "Temporary directory in which to write extracted <command>debconf</command> "
 "template files and config scripts.  Configuration Item: <literal>APT::"
@@ -7459,7 +7407,7 @@ msgstr ""
 "<literal>APT::ExtractTemplates::TempDir</literal>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:77
+#: apt-extracttemplates.1.xml:71
 msgid ""
 "<command>apt-extracttemplates</command> returns zero on normal operation, "
 "decimal 100 on error."
@@ -7468,12 +7416,12 @@ msgstr ""
 "decimal em erro."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-sortpkgs.1.xml:35
+#: apt-sortpkgs.1.xml:29
 msgid "Utility to sort package index files"
 msgstr "Utilitário para organizar ficheiros índice de pacotes"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-sortpkgs.1.xml:41
+#: apt-sortpkgs.1.xml:35
 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 "
@@ -7486,7 +7434,7 @@ msgstr ""
 "registo de acordo com as regras de organização internas."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-sortpkgs.1.xml:47
+#: apt-sortpkgs.1.xml:41
 msgid ""
 "All output is sent to standard output; the input must be a seekable file."
 msgstr ""
@@ -7494,7 +7442,7 @@ msgstr ""
 "ficheiro pesquisável."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-sortpkgs.1.xml:56
+#: apt-sortpkgs.1.xml:50
 msgid ""
 "Use source index field ordering.  Configuration Item: <literal>APT::"
 "SortPkgs::Source</literal>."
@@ -7503,7 +7451,7 @@ msgstr ""
 "SortPkgs::Source</literal>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-sortpkgs.1.xml:70
+#: apt-sortpkgs.1.xml:64
 msgid ""
 "<command>apt-sortpkgs</command> returns zero on normal operation, decimal "
 "100 on error."
@@ -7512,12 +7460,12 @@ msgstr ""
 "em erro."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-ftparchive.1.xml:35
+#: apt-ftparchive.1.xml:29
 msgid "Utility to generate index files"
 msgstr "Utilitário para gerar ficheiros de índice"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:41
+#: apt-ftparchive.1.xml:35
 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 "
@@ -7530,7 +7478,7 @@ msgstr ""
 "baseados no conteúdo desse site."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:45
+#: apt-ftparchive.1.xml:39
 msgid ""
 "<command>apt-ftparchive</command> is a superset of the &dpkg-scanpackages; "
 "program, incorporating its entire functionality via the <literal>packages</"
@@ -7545,7 +7493,7 @@ msgstr ""
 "script o processo de geração para um arquivo completo."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:51
+#: apt-ftparchive.1.xml:45
 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 "
@@ -7560,7 +7508,7 @@ msgstr ""
 "ficheiros e constrói os ficheiros comprimidos desejados."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:62
+#: apt-ftparchive.1.xml:56
 msgid ""
 "The packages command generates a package file from a directory tree. It "
 "takes the given directory and recursively searches it for .deb files, "
@@ -7573,7 +7521,7 @@ msgstr ""
 "Este comando é aproximadamente equivalente ao &dpkg-scanpackages;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:67 apt-ftparchive.1.xml:91
+#: apt-ftparchive.1.xml:61 apt-ftparchive.1.xml:85
 msgid ""
 "The option <option>--db</option> can be used to specify a binary caching DB."
 msgstr ""
@@ -7581,7 +7529,7 @@ msgstr ""
 "dados de cache binária."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:72
+#: apt-ftparchive.1.xml:66
 msgid ""
 "The <literal>sources</literal> command generates a source index file from a "
 "directory tree.  It takes the given directory and recursively searches it "
@@ -7594,7 +7542,7 @@ msgstr ""
 "Este comando é aproximadamente equivalente ao &dpkg-scansources;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:77
+#: apt-ftparchive.1.xml:71
 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 "
@@ -7606,7 +7554,7 @@ msgstr ""
 "fonte que irá ser usado."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:84
+#: apt-ftparchive.1.xml:78
 msgid ""
 "The <literal>contents</literal> command generates a contents file from a "
 "directory tree. It takes the given directory and recursively searches it "
@@ -7624,7 +7572,7 @@ msgstr ""
 "por uma vírgula na saída."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:96
+#: apt-ftparchive.1.xml:90
 msgid ""
 "The <literal>release</literal> command generates a Release file from a "
 "directory tree. It recursively searches the given directory for uncompressed "
@@ -7648,7 +7596,7 @@ msgstr ""
 "contém um resultado de MD5, SHA1 e SHA256 para cada ficheiro."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:106
+#: apt-ftparchive.1.xml:100
 msgid ""
 "Values for the additional metadata fields in the Release file are taken from "
 "the corresponding variables under <literal>APT::FTPArchive::Release</"
@@ -7669,7 +7617,7 @@ msgstr ""
 "<literal>Description</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:119
+#: apt-ftparchive.1.xml:113
 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 "
@@ -7685,7 +7633,7 @@ msgstr ""
 "definições requeridas."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:128
+#: apt-ftparchive.1.xml:122
 msgid ""
 "The <literal>clean</literal> command tidies the databases used by the given "
 "configuration file by removing any records that are no longer necessary."
@@ -7695,12 +7643,12 @@ msgstr ""
 "são necessários."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:134
+#: apt-ftparchive.1.xml:128
 msgid "The Generate Configuration"
 msgstr "A Configuração do Generate"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:136
+#: apt-ftparchive.1.xml:130
 msgid ""
 "The <literal>generate</literal> command uses a configuration file to "
 "describe the archives that are going to be generated. It follows the typical "
@@ -7717,7 +7665,7 @@ msgstr ""
 "árvore. Isto apenas afecta o modo de como a etiqueta scope é manuseada."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:144
+#: apt-ftparchive.1.xml:138
 msgid ""
 "The generate configuration has four separate sections, each described below."
 msgstr ""
@@ -7725,12 +7673,12 @@ msgstr ""
 "abaixo."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:146
+#: apt-ftparchive.1.xml:140
 msgid "<literal>Dir</literal> Section"
 msgstr "Secção <literal>Dir</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:148
+#: apt-ftparchive.1.xml:142
 msgid ""
 "The <literal>Dir</literal> section defines the standard directories needed "
 "to locate the files required during the generation process. These "
@@ -7743,7 +7691,7 @@ msgstr ""
 "posteriores para produzir um caminho completo e absoluto."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:155
+#: apt-ftparchive.1.xml:149
 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 "
@@ -7753,17 +7701,17 @@ msgstr ""
 "directório que contém o <filename>ls-LR</filename> e nós da distribuição."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:162
+#: apt-ftparchive.1.xml:156
 msgid "Specifies the location of the override files."
 msgstr "Especifica a localização dos ficheiros de sobrepor."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:167
+#: apt-ftparchive.1.xml:161
 msgid "Specifies the location of the cache files."
 msgstr "Especifica a localização dos ficheiros de cache"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:172
+#: apt-ftparchive.1.xml:166
 msgid ""
 "Specifies the location of the file list files, if the <literal>FileList</"
 "literal> setting is used below."
@@ -7772,12 +7720,12 @@ msgstr ""
 "definição <literal>FileList</literal> for usada mais abaixo."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:178
+#: apt-ftparchive.1.xml:172
 msgid "<literal>Default</literal> Section"
 msgstr "Secção <literal>Default</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:180
+#: apt-ftparchive.1.xml:174
 msgid ""
 "The <literal>Default</literal> section specifies default values, and "
 "settings that control the operation of the generator. Other sections may "
@@ -7788,7 +7736,7 @@ msgstr ""
 "sobrepor estas predefinições em uma definição por-secção."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:186
+#: apt-ftparchive.1.xml:180
 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 "
@@ -7801,7 +7749,7 @@ msgstr ""
 "predefinição para todos os esquemas de compressão é '. gzip'."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:194
+#: apt-ftparchive.1.xml:188
 msgid ""
 "Sets the default list of file extensions that are package files.  This "
 "defaults to '.deb'."
@@ -7810,7 +7758,7 @@ msgstr ""
 "pacote. A predefinição é '.deb'."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:200
+#: apt-ftparchive.1.xml:194
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Sources files."
@@ -7819,7 +7767,7 @@ msgstr ""
 "controla a compressão para os ficheiros das Fontes."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:206
+#: apt-ftparchive.1.xml:200
 msgid ""
 "Sets the default list of file extensions that are source files.  This "
 "defaults to '.dsc'."
@@ -7828,7 +7776,7 @@ msgstr ""
 "fontes. A predefinição é '.dsc'."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:212
+#: apt-ftparchive.1.xml:206
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Contents files."
@@ -7837,7 +7785,7 @@ msgstr ""
 "controla a compressão para os ficheiros de Conteúdos."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:218
+#: apt-ftparchive.1.xml:212
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Translation-en master file."
@@ -7846,7 +7794,7 @@ msgstr ""
 "controla a compressão para o ficheiro mestre Translation-en."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:224
+#: apt-ftparchive.1.xml:218
 msgid ""
 "Specifies the number of kilobytes to delink (and replace with hard links) "
 "per run. This is used in conjunction with the per-section <literal>External-"
@@ -7857,7 +7805,7 @@ msgstr ""
 "Links</literal> por secção."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:231
+#: apt-ftparchive.1.xml:225
 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."
@@ -7867,7 +7815,7 @@ msgstr ""
 "independentemente do umask."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:238 apt-ftparchive.1.xml:384
+#: apt-ftparchive.1.xml:232 apt-ftparchive.1.xml:378
 msgid ""
 "Specifies whether long descriptions should be included in the "
 "<filename>Packages</filename> file or split out into a master "
@@ -7878,12 +7826,12 @@ msgstr ""
 "<filename>Translation-en</filename> mestre."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:244
+#: apt-ftparchive.1.xml:238
 msgid "<literal>TreeDefault</literal> Section"
 msgstr "Secção <literal>TreeDefault</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:246
+#: apt-ftparchive.1.xml:240
 msgid ""
 "Sets defaults specific to <literal>Tree</literal> sections. All of these "
 "variables are substitution variables and have the strings $(DIST), "
@@ -7894,7 +7842,7 @@ msgstr ""
 "$(DIST), $(SECTION) e $(ARCH) substituídas pelos seus respectivos valores."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:253
+#: apt-ftparchive.1.xml:247
 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 will all "
@@ -7905,7 +7853,7 @@ msgstr ""
 "alguns dias todos sejam reconstruídos."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:260
+#: apt-ftparchive.1.xml:254
 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 updated. "
@@ -7923,7 +7871,7 @@ msgstr ""
 "modo. A predefinição é 10, as unidades são em dias."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:271
+#: apt-ftparchive.1.xml:265
 msgid ""
 "Sets the top of the .deb directory tree. Defaults to <filename>$(DIST)/"
 "$(SECTION)/binary-$(ARCH)/</filename>"
@@ -7932,7 +7880,7 @@ msgstr ""
 "$(DIST)/$(SECTION)/binary-$(ARCH)/</filename>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:277
+#: apt-ftparchive.1.xml:271
 msgid ""
 "Sets the top of the source package directory tree. Defaults to <filename>"
 "$(DIST)/$(SECTION)/source/</filename>"
@@ -7941,7 +7889,7 @@ msgstr ""
 "<filename>$(DIST)/$(SECTION)/source/</filename>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:283
+#: apt-ftparchive.1.xml:277
 msgid ""
 "Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
 "binary-$(ARCH)/Packages</filename>"
@@ -7950,7 +7898,7 @@ msgstr ""
 "$(SECTION)/binary-$(ARCH)/Packages</filename>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:289
+#: apt-ftparchive.1.xml:283
 msgid ""
 "Sets the output Sources file. Defaults to <filename>$(DIST)/$(SECTION)/"
 "source/Sources</filename>"
@@ -7959,7 +7907,7 @@ msgstr ""
 "$(SECTION)/source/Sources</filename>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:295
+#: apt-ftparchive.1.xml:289
 msgid ""
 "Sets the output Translation-en master file with the long descriptions if "
 "they should be not included in the Packages file. Defaults to <filename>"
@@ -7970,7 +7918,7 @@ msgstr ""
 "$(DIST)/$(SECTION)/i18n/Translation-en</filename>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:302
+#: apt-ftparchive.1.xml:296
 msgid ""
 "Sets the path prefix that causes a symlink to be considered an internal link "
 "instead of an external link. Defaults to <filename>$(DIST)/$(SECTION)/</"
@@ -7981,7 +7929,7 @@ msgstr ""
 "$(SECTION)/</filename>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:309
+#: apt-ftparchive.1.xml:303
 msgid ""
 "Sets the output Contents file. Defaults to <filename>$(DIST)/$(SECTION)/"
 "Contents-$(ARCH)</filename>. If this setting causes multiple Packages files "
@@ -7996,12 +7944,12 @@ msgstr ""
 "ficheiros pacotes todos juntos."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:318
+#: apt-ftparchive.1.xml:312
 msgid "Sets header file to prepend to the contents output."
 msgstr "Define o ficheiro cabeçalho para prefixar a saída de conteúdos."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:323
+#: apt-ftparchive.1.xml:317
 msgid ""
 "Sets the binary cache database to use for this section. Multiple sections "
 "can share the same database."
@@ -8010,7 +7958,7 @@ msgstr ""
 "secções podem partilhar a mesma base de dados."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:329
+#: apt-ftparchive.1.xml:323
 msgid ""
 "Specifies that instead of walking the directory tree, <command>apt-"
 "ftparchive</command> should read the list of files from the given file. "
@@ -8022,7 +7970,7 @@ msgstr ""
 "arquivo."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:336
+#: apt-ftparchive.1.xml:330
 msgid ""
 "Specifies that instead of walking the directory tree, <command>apt-"
 "ftparchive</command> should read the list of files from the given file. "
@@ -8035,12 +7983,12 @@ msgstr ""
 "arquivo. Isto é usado quando se processa índices de fonte."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:344
+#: apt-ftparchive.1.xml:338
 msgid "<literal>Tree</literal> Section"
 msgstr "Secção <literal>Tree</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:346
+#: apt-ftparchive.1.xml:340
 msgid ""
 "The <literal>Tree</literal> section defines a standard Debian file tree "
 "which consists of a base directory, then multiple sections in that base "
@@ -8055,7 +8003,7 @@ msgstr ""
 "<literal>Directory</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:351
+#: apt-ftparchive.1.xml:345
 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 "
@@ -8068,7 +8016,7 @@ msgstr ""
 "definição tal como <filename>dists/&stable-codename;</filename>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:356
+#: apt-ftparchive.1.xml:350
 msgid ""
 "All of the settings defined in the <literal>TreeDefault</literal> section "
 "can be used in a <literal>Tree</literal> section as well as three new "
@@ -8079,7 +8027,7 @@ msgstr ""
 "variáveis."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt-ftparchive.1.xml:362
+#: apt-ftparchive.1.xml:356
 #, no-wrap
 msgid ""
 "for i in Sections do \n"
@@ -8093,7 +8041,7 @@ msgstr ""
 "     "
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:359
+#: apt-ftparchive.1.xml:353
 msgid ""
 "When processing a <literal>Tree</literal> section <command>apt-ftparchive</"
 "command> performs an operation similar to: <placeholder type=\"programlisting"
@@ -8104,7 +8052,7 @@ msgstr ""
 "\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:370
+#: apt-ftparchive.1.xml:364
 msgid ""
 "This is a space separated list of sections which appear under the "
 "distribution; typically this is something like <literal>main contrib non-"
@@ -8115,7 +8063,7 @@ msgstr ""
 "literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:377
+#: apt-ftparchive.1.xml:371
 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 "
@@ -8126,7 +8074,7 @@ msgstr ""
 "indicar que esta árvore tem um arquivo fonte."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:390
+#: apt-ftparchive.1.xml:384
 msgid ""
 "Sets the binary override file. The override file contains section, priority "
 "and maintainer address information."
@@ -8135,7 +8083,7 @@ msgstr ""
 "informação de secção, prioridade e endereço do responsável."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:396
+#: apt-ftparchive.1.xml:390
 msgid ""
 "Sets the source override file. The override file contains section "
 "information."
@@ -8144,22 +8092,22 @@ msgstr ""
 "informação de secção."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:402 apt-ftparchive.1.xml:448
+#: apt-ftparchive.1.xml:396 apt-ftparchive.1.xml:442
 msgid "Sets the binary extra override file."
 msgstr "Define o ficheiro de sobreposição extra binário."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:407 apt-ftparchive.1.xml:453
+#: apt-ftparchive.1.xml:401 apt-ftparchive.1.xml:447
 msgid "Sets the source extra override file."
 msgstr "Define o ficheiro de sobreposição extra fonte."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:412
+#: apt-ftparchive.1.xml:406
 msgid "<literal>BinDirectory</literal> Section"
 msgstr "Secção <literal>BinDirectory</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:414
+#: apt-ftparchive.1.xml:408
 msgid ""
 "The <literal>bindirectory</literal> section defines a binary directory tree "
 "with no special structure. The scope tag specifies the location of the "
@@ -8174,12 +8122,12 @@ msgstr ""
 "definições <literal>Section</literal><literal>Architecture</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:422
+#: apt-ftparchive.1.xml:416
 msgid "Sets the Packages file output."
 msgstr "Define a saída do ficheiro Packages."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:427
+#: apt-ftparchive.1.xml:421
 msgid ""
 "Sets the Sources file output. At least one of <literal>Packages</literal> or "
 "<literal>Sources</literal> is required."
@@ -8188,42 +8136,42 @@ msgstr ""
 "<literal>Packages</literal> ou <literal>Sources</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:433
+#: apt-ftparchive.1.xml:427
 msgid "Sets the Contents file output (optional)."
 msgstr "Define a saída do ficheiro Contents (opcional)"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:438
+#: apt-ftparchive.1.xml:432
 msgid "Sets the binary override file."
 msgstr "Define o ficheiro de sobreposição binário."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:443
+#: apt-ftparchive.1.xml:437
 msgid "Sets the source override file."
 msgstr "Define o ficheiro de sobreposição fonte."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:458
+#: apt-ftparchive.1.xml:452
 msgid "Sets the cache DB."
 msgstr "Define a base de dados de cache."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:463
+#: apt-ftparchive.1.xml:457
 msgid "Appends a path to all the output paths."
 msgstr "Acrescenta um caminho a todos os caminhos de saída."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:468
+#: apt-ftparchive.1.xml:462
 msgid "Specifies the file list file."
 msgstr "Especifica o ficheiro de lista de ficheiros."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:475
+#: apt-ftparchive.1.xml:469
 msgid "The Binary Override File"
 msgstr "O Ficheiro Binary Override"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:476
+#: apt-ftparchive.1.xml:470
 msgid ""
 "The binary override file is fully compatible with &dpkg-scanpackages;. It "
 "contains four fields separated by spaces. The first field is the package "
@@ -8238,19 +8186,19 @@ msgstr ""
 "permutação do responsável."
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:482
+#: apt-ftparchive.1.xml:476
 #, no-wrap
 msgid "old [// oldn]* => new"
 msgstr "old [// oldn]* => new"
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:484
+#: apt-ftparchive.1.xml:478
 #, no-wrap
 msgid "new"
 msgstr "new"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:481
+#: apt-ftparchive.1.xml:475
 msgid ""
 "The general form of the maintainer field is: <placeholder type="
 "\"literallayout\" id=\"0\"/> or simply, <placeholder type=\"literallayout\" "
@@ -8267,12 +8215,12 @@ msgstr ""
 "formato substitui incondicionalmente o campo do responsável."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:492
+#: apt-ftparchive.1.xml:486
 msgid "The Source Override File"
 msgstr "O Ficheiro Source Override"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:494
+#: apt-ftparchive.1.xml:488
 msgid ""
 "The source override file is fully compatible with &dpkg-scansources;. It "
 "contains two fields separated by spaces. The first field is the source "
@@ -8283,12 +8231,12 @@ msgstr ""
 "nome de pacote fonte, o segundo é a secção onde o atribuir."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:499
+#: apt-ftparchive.1.xml:493
 msgid "The Extra Override File"
 msgstr "O Ficheiro Extra Override"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:501
+#: apt-ftparchive.1.xml:495
 msgid ""
 "The extra override file allows any arbitrary tag to be added or replaced in "
 "the output. It has three columns, the first is the package, the second is "
@@ -8299,7 +8247,7 @@ msgstr ""
 "pacote, a segunda é a etiqueta e restante da linha é o novo valor."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:512
+#: apt-ftparchive.1.xml:506
 msgid ""
 "Generate the given checksum. These options default to on, when turned off "
 "the generated index files will not have the checksum fields where possible.  "
@@ -8323,7 +8271,7 @@ msgstr ""
 "<literal>MD5</literal>, <literal>SHA1</literal> ou <literal>SHA256</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:523
+#: apt-ftparchive.1.xml:517
 msgid ""
 "Use a binary caching DB. This has no effect on the generate command.  "
 "Configuration Item: <literal>APT::FTPArchive::DB</literal>."
@@ -8332,7 +8280,7 @@ msgstr ""
 "generate. Item de configuração: <literal>APT::FTPArchive::DB</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:529
+#: apt-ftparchive.1.xml:523
 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 "
@@ -8346,7 +8294,7 @@ msgstr ""
 "<literal>quiet</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:537
+#: apt-ftparchive.1.xml:531
 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 "
@@ -8359,7 +8307,7 @@ msgstr ""
 "option>. Item de Configuração: <literal>APT::FTPArchive::DeLinkAct</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:545
+#: apt-ftparchive.1.xml:539
 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 "
@@ -8375,7 +8323,7 @@ msgstr ""
 "de Configuração: <literal>APT::FTPArchive::Contents</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:555
+#: apt-ftparchive.1.xml:549
 msgid ""
 "Select the source override file to use with the <literal>sources</literal> "
 "command.  Configuration Item: <literal>APT::FTPArchive::SourceOverride</"
@@ -8386,7 +8334,7 @@ msgstr ""
 "SourceOverride</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:561
+#: apt-ftparchive.1.xml:555
 msgid ""
 "Make the caching databases read only.  Configuration Item: <literal>APT::"
 "FTPArchive::ReadOnlyDB</literal>."
@@ -8395,7 +8343,7 @@ msgstr ""
 "<literal>APT::FTPArchive::ReadOnlyDB</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:566
+#: apt-ftparchive.1.xml:560
 msgid ""
 "Accept in the <literal>packages</literal> and <literal>contents</literal> "
 "commands only package files matching <literal>*_arch.deb</literal> or "
@@ -8409,7 +8357,7 @@ msgstr ""
 "FTPArchive::Architecture</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:574
+#: apt-ftparchive.1.xml:568
 msgid ""
 "&apt-ftparchive; caches as much as possible of metadata in a cachedb. If "
 "packages are recompiled and/or republished with the same version again, this "
@@ -8433,7 +8381,7 @@ msgstr ""
 "as verificações extras serão desnecessárias."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:586
+#: apt-ftparchive.1.xml:580
 msgid ""
 "This configuration option defaults to \"<literal>true</literal>\" and should "
 "only be set to <literal>\"false\"</literal> if the Archive generated with "
@@ -8448,13 +8396,13 @@ msgstr ""
 "<filename>Translation-en</filename> só pode ser criado no comando generate."
 
 #. type: Content of: <refentry><refsect1><para><programlisting>
-#: apt-ftparchive.1.xml:604
+#: apt-ftparchive.1.xml:598
 #, no-wrap
 msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
 msgstr "<command>apt-ftparchive</command> pacotes <replaceable>directório</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:600
+#: apt-ftparchive.1.xml:594
 msgid ""
 "To create a compressed Packages file for a directory containing binary "
 "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
@@ -8463,7 +8411,7 @@ msgstr ""
 "pacotes binários (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:614
+#: apt-ftparchive.1.xml:608
 msgid ""
 "<command>apt-ftparchive</command> returns zero on normal operation, decimal "
 "100 on error."
@@ -8471,49 +8419,66 @@ msgstr ""
 "<command>apt-ftparchive</command> devolve zero na operação normal, 100 "
 "decimal em erro."
 
-#. type: <title></title>
-#: guide.sgml:4
+#. type: Attribute 'lang' of: <book>
+#: guide.dbk:9 offline.dbk:9
+msgid "en"
+msgstr "pt"
+
+#. type: Content of: <book><title>
+#: guide.dbk:11
 msgid "APT User's Guide"
 msgstr "Guia de Utilizador do APT"
 
-#. type: <author></author>
-#: guide.sgml:6 offline.sgml:6
-msgid "<name>Jason Gunthorpe </name><email>jgg@debian.org</email>"
-msgstr "<name>Jason Gunthorpe </name><email>jgg@debian.org</email>"
+#. type: Content of: <book><bookinfo><authorgroup><author><personname>
+#: guide.dbk:17 offline.dbk:17
+msgid "Jason Gunthorpe"
+msgstr "Jason Gunthorpe"
+
+#. type: Content of: <book><bookinfo><authorgroup><author><email>
+#: guide.dbk:17 offline.dbk:17
+msgid "jgg@debian.org"
+msgstr "jgg@debian.org"
 
-#. type: <version></version>
-#: guide.sgml:7
-msgid "$Id: guide.sgml,v 1.7 2003/04/26 23:26:13 doogie Exp $"
-msgstr "$Id: guide.sgml,v 1.7 2003/04/26 23:26:13 doogie Exp $"
+#. type: Content of: <book><bookinfo><releaseinfo>
+#: guide.dbk:21 offline.dbk:21
+msgid "Version &apt-product-version;"
+msgstr "Versão &apt-product-version;"
 
-#. type: <abstract></abstract>
-#: guide.sgml:11
+#. type: Content of: <book><bookinfo><abstract><para>
+#: guide.dbk:25
 msgid ""
 "This document provides an overview of how to use the the APT package manager."
 msgstr ""
 "Este documento disponibiliza uma visão geral de como usar o gestor de "
 "pacotes APT."
 
-#. type: <copyrightsummary></copyrightsummary>
-#: guide.sgml:15
-msgid "Copyright &copy; Jason Gunthorpe, 1998."
-msgstr "Copyright &copy; Jason Gunthorpe, 1998."
+#. type: Content of: <book><bookinfo>
+#: guide.dbk:29
+msgid ""
+"<copyright><year>1998</year><holder>Jason Gunthorpe</holder></copyright>"
+msgstr ""
+"<copyright><year>1998</year><holder>Jason Gunthorpe</holder></copyright>"
+
+#. type: Content of: <book><bookinfo><legalnotice><title>
+#: guide.dbk:32 offline.dbk:33
+msgid "License Notice"
+msgstr "Aviso de Licença"
 
-#. type: <p></p>
-#: guide.sgml:21 offline.sgml:22
+#. type: Content of: <book><bookinfo><legalnotice><para>
+#: guide.dbk:34 offline.dbk:35
 msgid ""
 "\"APT\" and this document are free software; you can redistribute them and/"
 "or modify them under the terms of the GNU General Public License as "
 "published by the Free Software Foundation; either version 2 of the License, "
 "or (at your option) any later version."
 msgstr ""
-"\"APT\" and this document are free software; you can redistribute them and/"
-"or modify them under the terms of the GNU General Public License as "
-"published by the Free Software Foundation; either version 2 of the License, "
-"or (at your option) any later version."
+"\"APT\" e este documento são software livre; você pode distribuí-lo e/ou "
+"modificá-lo sob os termos da GNU General Public License como publicada pela "
+"Free Software Foundation; seja na versão 2 da Licença, ou (por sua opção) "
+"qualquer versão posterior."
 
-#. type: <p></p>
-#: guide.sgml:24 offline.sgml:25
+#. type: Content of: <book><bookinfo><legalnotice><para>
+#: guide.dbk:43 offline.dbk:41
 msgid ""
 "For more details, on Debian systems, see the file /usr/share/common-licenses/"
 "GPL for the full license."
@@ -8521,31 +8486,31 @@ msgstr ""
 "Para mais detalhes em sistemas Debian, veja o ficheiro /usr/share/common-"
 "licenses/GPL para a licença completa."
 
-#. type: <heading></heading>
-#: guide.sgml:32
+#. type: Content of: <book><chapter><title>
+#: guide.dbk:50
 msgid "General"
 msgstr "Geral"
 
-#. type: <p></p>
-#: guide.sgml:38
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:52
 msgid ""
-"The APT package currently contains two sections, the APT <prgn>dselect</"
-"prgn> method and the <prgn>apt-get</prgn> command line user interface. Both "
-"provide a way to install and remove packages as well as download new "
-"packages from the Internet."
+"The APT package currently contains two sections, the APT <command>dselect</"
+"command> method and the <command>apt-get</command> command line user "
+"interface. Both provide a way to install and remove packages as well as "
+"download new packages from the Internet."
 msgstr ""
-"O pacote APT contém actualmente duas secções, o método <prgn>dselect</prgn> "
-"do APT e a interface de utilizador de linha de comandos <prgn>apt-get</"
-"prgn>. Ambos disponibilizam uma maneira de instalar e remover pacotes assim "
-"como descarregar novos pacotes da Internet."
+"O pacote APT contém actualmente duas secções, o método <command>dselect</"
+"command> do APT e a interface de utilizador de linha de comandos "
+"<command>apt-get</command>. Ambos disponibilizam uma maneira de instalar e "
+"remover pacotes assim como descarregar novos pacotes da Internet."
 
-#. type: <heading></heading>
-#: guide.sgml:39
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:58
 msgid "Anatomy of the Package System"
 msgstr "Anatomia do Sistema de Pacotes"
 
-#. type: <p></p>
-#: guide.sgml:44
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:60
 msgid ""
 "The Debian packaging system has a large amount of information associated "
 "with each package to help assure that it integrates cleanly and easily into "
@@ -8556,8 +8521,8 @@ msgstr ""
 "limpo e fácil no sistema. A mais proeminente das suas funcionalidades é o "
 "sistema de dependências."
 
-#. type: <p></p>
-#: guide.sgml:52
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:65
 msgid ""
 "The dependency system allows individual programs to make use of shared "
 "elements in the system such as libraries. It simplifies placing infrequently "
@@ -8572,8 +8537,8 @@ msgstr ""
 "médio. Também permite opções em agentes de transporte de mail, servidores X "
 "e mais."
 
-#. type: <p></p>
-#: guide.sgml:57
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:72
 msgid ""
 "The first step to understanding the dependency system is to grasp the "
 "concept of a simple dependency. The meaning of a simple dependency is that a "
@@ -8585,8 +8550,8 @@ msgstr ""
 "simples é que um pacote requer outro pacote seja instalado ao mesmo tempo "
 "para funcionar correctamente."
 
-#. type: <p></p>
-#: guide.sgml:63
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:77
 msgid ""
 "For instance, mailcrypt is an emacs extension that aids in encrypting email "
 "with GPG. Without GPGP installed mailcrypt is useless, so mailcrypt has a "
@@ -8598,8 +8563,8 @@ msgstr ""
 "uma dependência simples do GPG. Também, porque é uma extensão do emacs, tem "
 "uma dependência simples do emacs, e sem o emacs é completamente inútil."
 
-#. type: <p></p>
-#: guide.sgml:73
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:83
 msgid ""
 "The other important dependency to understand is a conflicting dependency. It "
 "means that a package, when installed with another package, will not work and "
@@ -8620,8 +8585,8 @@ msgstr ""
 "de mail têm uma dependência de conflito com todos os outros agentes de "
 "transporte de mail."
 
-#. type: <p></p>
-#: guide.sgml:83
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:93
 msgid ""
 "As an added complication there is the possibility for a package to pretend "
 "to be another package. Consider that exim and sendmail for many intents are "
@@ -8641,8 +8606,8 @@ msgstr ""
 "agente de transporte de mail dependem de um mail-transport-agent. Isto pode "
 "adicionar uma grande confusão quando se tenta corrigir pacotes manualmente."
 
-#. type: <p></p>
-#: guide.sgml:88
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:103
 msgid ""
 "At any given time a single dependency may be met by packages that are "
 "already installed or it may not be. APT attempts to help resolve dependency "
@@ -8654,77 +8619,85 @@ msgstr ""
 "problemas com dependências ao disponibilizar um número de algoritmos "
 "automáticos que ajudam a seleccionar os pacotes para instalação."
 
-#. type: <heading></heading>
-#: guide.sgml:96
+#. type: Content of: <book><chapter><title>
+#: guide.dbk:112
 msgid "apt-get"
 msgstr "apt-get"
 
-#. type: <p></p>
-#: guide.sgml:102
-msgid ""
-"<prgn>apt-get</prgn> provides a simple way to install packages from the "
-"command line. Unlike <prgn>dpkg</prgn>, <prgn>apt-get</prgn> does not "
-"understand .deb files, it works with the package's proper name and can only "
-"install .deb archives from a <em>Source</em>."
-msgstr ""
-"<prgn>apt-get</prgn> fornece uma maneira simples de instalar pacotes a "
-"partir da linha de comandos. Ao contrário do <prgn>dpkg</prgn>, o <prgn>apt-"
-"get</prgn> não compreende os ficheiros .deb, funciona com o nome próprio do "
-"pacote e apenas pode instalar arquivos .deb a partir de uma <em>Source</em>."
-
-#. type: <p></p>
-#: guide.sgml:109
-msgid ""
-"The first <footnote><p>If you are using an http proxy server you must set "
-"the http_proxy environment variable first, see sources.list(5)</p></"
-"footnote> thing that should be done before using <prgn>apt-get</prgn> is to "
-"fetch the package lists from the <em>Sources</em> so that it knows what "
-"packages are available. This is done with <tt>apt-get update</tt>. For "
-"instance,"
-msgstr ""
-"O primeira <footnote><p>se você está a usar um servidor proxy http você tem "
-"que definir a variável de ambiente http_proxy primeiro, veja sources."
-"list(5)</p></footnote> coisa que deve ser feita antes de usar <prgn>apt-get</"
-"prgn> é obter as listas de pacotes a partir das <em>Sources</em> para que "
-"ele saiba que pacotes estão disponíveis. Isto é feito com <tt>apt-get "
-"update</tt>. Por exemplo,"
-
-#. type: <example></example>
-#: guide.sgml:116
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:114
+msgid ""
+"<command>apt-get</command> provides a simple way to install packages from "
+"the command line. Unlike <command>dpkg</command>, <command>apt-get</command> "
+"does not understand .deb files, it works with the package's proper name and "
+"can only install .deb archives from a <emphasis>Source</emphasis>."
+msgstr ""
+"<command>apt-get</command> fornece uma maneira simples de instalar pacotes a "
+"partir da linha de comandos. Ao contrário do <command>dpkg</command>, o "
+"<command>apt-get</command> não compreende os ficheiros .deb, funciona com o "
+"nome próprio do pacote e apenas pode instalar arquivos .deb a partir de uma "
+"<emphasis>Source</emphasis>."
+
+#. type: Content of: <book><chapter><para><footnote><para>
+#: guide.dbk:120
+msgid ""
+"If you are using an http proxy server you must set the http_proxy "
+"environment variable first, see sources.list(5)"
+msgstr ""
+"se você está a usar um servidor proxy http você tem que definir a variável "
+"de ambiente http_proxy primeiro, veja sources.list(5)"
+
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:120
+msgid ""
+"The first <placeholder type=\"footnote\" id=\"0\"/> thing that should be "
+"done before using <command>apt-get</command> is to fetch the package lists "
+"from the <emphasis>Sources</emphasis> so that it knows what packages are "
+"available. This is done with <literal>apt-get update</literal>. For instance,"
+msgstr ""
+"O primeira <placeholder type=\"footnote\" id=\"0\"/> coisa que deve ser "
+"feita antes de usar <command>apt-get</command> é obter as listas de pacotes "
+"a partir das <emphasis>Sources</emphasis> para que ele saiba que pacotes "
+"estão disponíveis. Isto é feito com <literal>apt-get update</literal>. Por "
+"exemplo,"
+
+#. type: Content of: <book><chapter><screen>
+#: guide.dbk:128
 #, no-wrap
 msgid ""
 "# apt-get update\n"
 "Get http://ftp.de.debian.org/debian-non-US/ stable/binary-i386/ Packages\n"
 "Get http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n"
 "Reading Package Lists... Done\n"
-"Building Dependency Tree... Done"
+"Building Dependency Tree... Done\n"
 msgstr ""
 "# apt-get update\n"
 "Get http://ftp.de.debian.org/debian-non-US/ stable/binary-i386/ Packages\n"
 "Get http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n"
 "Reading Package Lists... Done\n"
-"Building Dependency Tree... Done"
+"Building Dependency Tree... Done\n"
 
-#. type: <p><taglist>
-#: guide.sgml:120
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:135
 msgid "Once updated there are several commands that can be used:"
 msgstr "Uma vez actualizado existem vários comandos que podem ser usados:"
 
-#. type: <tag></tag>
-#: guide.sgml:121
+#. type: Content of: <book><chapter><variablelist><varlistentry><term>
+#: guide.dbk:139
 msgid "upgrade"
 msgstr "upgrade"
 
-#. type: <p></p>
-#: guide.sgml:131
+#. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
+#: guide.dbk:142
 msgid ""
 "Upgrade will attempt to gently upgrade the whole system. Upgrade will never "
 "install a new package or remove an existing package, nor will it ever "
 "upgrade a package that might cause some other package to break. This can be "
 "used daily to relatively safely upgrade the system. Upgrade will list all of "
 "the packages that it could not upgrade, this usually means that they depend "
-"on new packages or conflict with some other package. <prgn>dselect</prgn> or "
-"<tt>apt-get install</tt> can be used to force these packages to install."
+"on new packages or conflict with some other package. <command>dselect</"
+"command> or <literal>apt-get install</literal> can be used to force these "
+"packages to install."
 msgstr ""
 "Upgrade irá tentar actualizar gentilmente todo o sistema. Upgrade nunca irá "
 "instalar um pacote novo ou remover um pacote existente, nem nunca irá "
@@ -8732,16 +8705,16 @@ msgstr ""
 "ser usado diariamente para actualizar o sistema com relativa segurança. "
 "Upgrade ira listar todos os pacotes que não pode actualizar, isto geralmente "
 "significa que eles dependem de novos pacotes ou entram em conflito com algum "
-"outro pacote. <prgn>dselect</prgn> ou <tt>apt-get install</tt> podem ser "
-"usados para forçar estes pacotes a instalar."
+"outro pacote. <command>dselect</command> ou <literal>apt-get install</"
+"literal> podem ser usados para forçar estes pacotes a instalar."
 
-#. type: <tag></tag>
-#: guide.sgml:131
+#. type: Content of: <book><chapter><variablelist><varlistentry><term>
+#: guide.dbk:154
 msgid "install"
 msgstr "install"
 
-#. type: <p></p>
-#: guide.sgml:140
+#. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
+#: guide.dbk:157
 msgid ""
 "Install is used to install packages by name. The package is automatically "
 "fetched and installed. This can be useful if you already know the name of "
@@ -8759,33 +8732,34 @@ msgstr ""
 "com os pacotes listados e irá escrever um sumário e pedir confirmação se "
 "algo mais que os seus argumentos serão alterados."
 
-#. type: <tag></tag>
-#: guide.sgml:140
+#. type: Content of: <book><chapter><variablelist><varlistentry><term>
+#: guide.dbk:168
 msgid "dist-upgrade"
 msgstr "dist-upgrade"
 
-#. type: <p></p>
-#: guide.sgml:149
+#. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
+#: guide.dbk:171
 msgid ""
 "Dist-upgrade is a complete upgrader designed to simplify upgrading between "
 "releases of Debian. It uses a sophisticated algorithm to determine the best "
 "set of packages to install, upgrade and remove to get as much of the system "
 "to the newest release. In some situations it may be desired to use dist-"
 "upgrade rather than spend the time manually resolving dependencies in "
-"<prgn>dselect</prgn>. Once dist-upgrade has completed then <prgn>dselect</"
-"prgn> can be used to install any packages that may have been left out."
+"<command>dselect</command>. Once dist-upgrade has completed then "
+"<command>dselect</command> can be used to install any packages that may have "
+"been left out."
 msgstr ""
 "Dist-upgrade é um actualizador completo desenhado para simplificar a "
 "actualização entre lançamentos da Debian. Usa um algoritmo sofisticado para "
 "determinar o melhor conjunto de pacotes a instalar, actualizar ou remover "
 "para obter o máximo do sistema para o novo lançamento. Em algumas situações "
 "pode ser desejável usar o dist-upgrade em vez de passar o tempo a resolver "
-"dependências manualmente no <prgn>dselect</prgn>. Assim que o dist-upgrade "
-"tiver terminado então pode ser usado o <prgn>dselect</prgn> para instalar "
-"quaisquer pacotes que tenham ficado de fora."
+"dependências manualmente no <command>dselect</command>. Assim que o dist-"
+"upgrade tiver terminado então pode ser usado o <command>dselect</command> "
+"para instalar quaisquer pacotes que tenham ficado de fora."
 
-#. type: <p></p>
-#: guide.sgml:152
+#. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
+#: guide.dbk:181
 msgid ""
 "It is important to closely look at what dist-upgrade is going to do, its "
 "decisions may sometimes be quite surprising."
@@ -8793,166 +8767,161 @@ msgstr ""
 "É importante observar de perto o que o dist-upgrade vai fazer, as suas "
 "decisões podem por vezes ser bastante surpreendentes."
 
-#. type: <p></p>
-#: guide.sgml:163
-#, fuzzy
-#| msgid ""
-#| "<prgn>apt-get</prgn> has several command line options that are detailed "
-#| "in its man page, <manref section=\"8\" name=\"apt-get\">. The most useful "
-#| "option is <tt>-d</tt> which does not install the fetched files. If the "
-#| "system has to download a large number of package it would be undesired to "
-#| "start installing them in case something goes wrong. When <tt>-d</tt> is "
-#| "used the downloaded archives can be installed by simply running the "
-#| "command that caused them to be downloaded again without <tt>-d</tt>."
-msgid ""
-"<prgn>apt-get</prgn> has several command line options that are detailed in "
-"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful "
-"option is <tt>-d</tt> which does not install the fetched files. If the "
-"system has to download a large number of package it would be undesired to "
-"start installing them in case something goes wrong. When <tt>-d</tt> is used "
-"the downloaded archives can be installed by simply running the command that "
-"caused them to be downloaded again without <tt>-d</tt>."
-msgstr ""
-"<prgn>apt-get</prgn> tem várias opções de linha de comandos que estão "
-"detalhados no seu manual, <manref section=\"8\" name=\"apt-get\">. A opção "
-"mais útil é <tt>-d</tt> que não instala os pacotes obtidos, Se o sistema "
-"tiver que descarregar um grande número de pacotes seria indesejável começar "
-"a instalá-los no caso de algo correr mal. Quando se usa <tt>-d</tt> os "
-"arquivos descarregados podem ser instalados simplesmente ao correr de novo "
-"comando que s descarregou mas sem o <tt>-d</tt>."
-
-#. type: <heading></heading>
-#: guide.sgml:168
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:188
+msgid ""
+"<command>apt-get</command> has several command line options that are "
+"detailed in its man page, <citerefentry><refentrytitle>apt-get</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>. The most useful "
+"option is <literal>-d</literal> which does not install the fetched files. If "
+"the system has to download a large number of package it would be undesired "
+"to start installing them in case something goes wrong. When <literal>-d</"
+"literal> is used the downloaded archives can be installed by simply running "
+"the command that caused them to be downloaded again without <literal>-d</"
+"literal>."
+msgstr ""
+"<command>apt-get</command> tem várias opções de linha de comandos que estão "
+"detalhados no seu manual, <citerefentry><refentrytitle>apt-get</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>. A opção mais útil é "
+"<literal>-d</literal> que não instala os pacotes obtidos, Se o sistema tiver "
+"que descarregar um grande número de pacotes seria indesejável começar a "
+"instalá-los no caso de algo correr mal. Quando se usa <literal>-d</literal> "
+"os arquivos descarregados podem ser instalados simplesmente ao correr de "
+"novo comando que s descarregou mas sem o <literal>-d</literal>."
+
+#. type: Content of: <book><chapter><title>
+#: guide.dbk:200
 msgid "DSelect"
 msgstr "DSelect"
 
-#. type: <p></p>
-#: guide.sgml:173
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:202
 msgid ""
-"The APT <prgn>dselect</prgn> method provides the complete APT system with "
-"the <prgn>dselect</prgn> package selection GUI. <prgn>dselect</prgn> is used "
-"to select the packages to be installed or removed and APT actually installs "
-"them."
+"The APT <command>dselect</command> method provides the complete APT system "
+"with the <command>dselect</command> package selection GUI. <command>dselect</"
+"command> is used to select the packages to be installed or removed and APT "
+"actually installs them."
 msgstr ""
-"O método <prgn>dselect</prgn> do APT disponibiliza o sistema APT completo "
-"com a GUI de selecção de pacotes <prgn>dselect</prgn>. O  <prgn>dselect</"
-"prgn> é usado para seleccionar os pacotes a serem instalados ou removidos e "
-"o APT instala-os."
+"O método <command>dselect</command> do APT disponibiliza o sistema APT "
+"completo com a GUI de selecção de pacotes <command>dselect</command>. O  "
+"<command>dselect</command> é usado para seleccionar os pacotes a serem "
+"instalados ou removidos e o APT instala-os."
 
-#. type: <p></p>
-#: guide.sgml:184
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:208
 msgid ""
-"To enable the APT method you need to select [A]ccess in <prgn>dselect</prgn> "
-"and then choose the APT method. You will be prompted for a set of "
-"<em>Sources</em> which are places to fetch archives from. These can be "
-"remote Internet sites, local Debian mirrors or CD-ROMs. Each source can "
-"provide a fragment of the total Debian archive, APT will automatically "
+"To enable the APT method you need to select [A]ccess in <command>dselect</"
+"command> and then choose the APT method. You will be prompted for a set of "
+"<emphasis>Sources</emphasis> which are places to fetch archives from. These "
+"can be remote Internet sites, local Debian mirrors or CD-ROMs. Each source "
+"can provide a fragment of the total Debian archive, APT will automatically "
 "combine them to form a complete set of packages. If you have a CD-ROM then "
 "it is a good idea to specify it first and then specify a mirror so that you "
 "have access to the latest bug fixes. APT will automatically use packages on "
 "your CD-ROM before downloading from the Internet."
 msgstr ""
 "Para activar o método APT você precisa de seleccionar [A]ccess no "
-"<prgn>dselect</prgn> e depois escolher o método APT. Ser-lhe-à perguntado "
-"por um conjunto de <em>Sources</em> que são os lugares de onde obter os "
-"arquivos. Estes podem ser sites remotos da Internet, mirrors Debian locais "
-"ou CD-ROMs. Cada source pode disponibilizar um fragmento do arquivo Debian "
-"total. O APT irá automaticamente combiná-los para formar um conjunto "
-"completo de pacotes. Se tem um CD-ROM, então é boa ideia especificá-lo em "
-"primeiro lugar e depois especificar um mirror para ter acesso às correcções "
-"de bugs mais recentes. O APT irá automaticamente usar os pacotes no seu CD-"
-"ROM antes de descarregar da Internet."
-
-#. type: <example></example>
-#: guide.sgml:198
+"<command>dselect</command> e depois escolher o método APT. Ser-lhe-à "
+"perguntado por um conjunto de <emphasis>Sources</emphasis> que são os "
+"lugares de onde obter os arquivos. Estes podem ser sites remotos da "
+"Internet, mirrors Debian locais ou CD-ROMs. Cada source pode disponibilizar "
+"um fragmento do arquivo Debian total. O APT irá automaticamente combiná-los "
+"para formar um conjunto completo de pacotes. Se tem um CD-ROM, então é boa "
+"ideia especificá-lo em primeiro lugar e depois especificar um mirror para "
+"ter acesso às correcções de bugs mais recentes. O APT irá automaticamente "
+"usar os pacotes no seu CD-ROM antes de descarregar da Internet."
+
+#. type: Content of: <book><chapter><screen>
+#: guide.dbk:219
 #, no-wrap
 msgid ""
 "   Set up a list of distribution source locations\n"
-"\t \n"
+"\n"
 " Please give the base URL of the debian distribution.\n"
 " The access schemes I know about are: http file\n"
-"\t   \n"
+"\n"
 " For example:\n"
 "      file:/mnt/debian,\n"
 "      ftp://ftp.debian.org/debian,\n"
 "      http://ftp.de.debian.org/debian,\n"
-"      \n"
-"      \n"
-" URL [http://llug.sep.bnl.gov/debian]:"
+"\n"
+"\n"
+" URL [http://llug.sep.bnl.gov/debian]:\n"
 msgstr ""
 "   Configurar uma lista de localizações fonte da distribuição\n"
-"\t \n"
+"\n"
 " Por favor forneça o URL base da distribuição Debian.\n"
 " Os esquemas de acesso que conheço são: http file\n"
-"\t   \n"
+"\n"
 " Por exemplo:\n"
 "      file:/mnt/debian,\n"
 "      ftp://ftp.debian.org/debian,\n"
 "      http://ftp.de.debian.org/debian,\n"
-"      \n"
-"      \n"
-" URL [http://llug.sep.bnl.gov/debian]:"
+"\n"
+"\n"
+" URL [http://llug.sep.bnl.gov/debian]:\n"
 
-#. type: <p></p>
-#: guide.sgml:205
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:233
 msgid ""
-"The <em>Sources</em> setup starts by asking for the base of the Debian "
-"archive, defaulting to a HTTP mirror. Next it asks for the distribution to "
-"get."
+"The <emphasis>Sources</emphasis> setup starts by asking for the base of the "
+"Debian archive, defaulting to a HTTP mirror. Next it asks for the "
+"distribution to get."
 msgstr ""
-"A configuração de <em>Sources</em> começa por perguntar pela base do arquivo "
-"Debian, usando por predefinição um mirror HTTP. Depois pergunta qual a "
-"distribuição a obter."
+"A configuração de <emphasis>Sources</emphasis> começa por perguntar pela "
+"base do arquivo Debian, usando por predefinição um mirror HTTP. Depois "
+"pergunta qual a distribuição a obter."
 
-#. type: <example></example>
-#: guide.sgml:212
+#. type: Content of: <book><chapter><screen>
+#: guide.dbk:238
 #, no-wrap
 msgid ""
 " Please give the distribution tag to get or a path to the\n"
 " package file ending in a /. The distribution\n"
 " tags are typically something like: stable unstable testing non-US\n"
-"   \n"
-" Distribution [stable]:"
+"\n"
+" Distribution [stable]:\n"
 msgstr ""
 " Por favor forneça a etiqueta da distribuição a obter ou um caminho para o\n"
 " ficheiro package terminando com um /. As etiquetas da\n"
 " distribuição são tipicamente algo como: stable unstable testing non-US\n"
-"   \n"
-" Distribution [stable]:"
-
-#. type: <p></p>
-#: guide.sgml:222
-msgid ""
-"The distribution refers to the Debian version in the archive, <em>stable</"
-"em> refers to the latest released version and <em>unstable</em> refers to "
-"the developmental version. <em>non-US</em> is only available on some mirrors "
-"and refers to packages that contain encryption technology or other things "
-"that cannot be exported from the United States. Importing these packages "
-"into the US is legal however."
-msgstr ""
-"A distribuição refere-se à versão Debian no arquivo, <em>stable</em> refere-"
-"se à última versão lançada e <em>unstable</em> refere-se à versão de "
-"desenvolvimento. <em>non-US</em> apenas está disponível em alguns mirrors e "
-"refere-se a pacotes que contém tecnologia de encriptação ou outras coisas "
-"que não podem ser exportadas dos Estados Unidos. No entanto importar estes "
-"pacotes para os US é legal."
-
-#. type: <example></example>
-#: guide.sgml:228
+"\n"
+" Distribution [stable]:\n"
+
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:245
+msgid ""
+"The distribution refers to the Debian version in the archive, "
+"<emphasis>stable</emphasis> refers to the latest released version and "
+"<emphasis>unstable</emphasis> refers to the developmental version. "
+"<emphasis>non-US</emphasis> is only available on some mirrors and refers to "
+"packages that contain encryption technology or other things that cannot be "
+"exported from the United States. Importing these packages into the US is "
+"legal however."
+msgstr ""
+"A distribuição refere-se à versão Debian no arquivo, <emphasis>stable</"
+"emphasis> refere-se à última versão lançada e <emphasis>unstable</emphasis> "
+"refere-se à versão de desenvolvimento. <emphasis>non-US</emphasis> apenas "
+"está disponível em alguns mirrors e refere-se a pacotes que contém "
+"tecnologia de encriptação ou outras coisas que não podem ser exportadas dos "
+"Estados Unidos. No entanto importar estes pacotes para os US é legal."
+
+#. type: Content of: <book><chapter><screen>
+#: guide.dbk:254
 #, no-wrap
 msgid ""
 " Please give the components to get\n"
 " The components are typically something like: main contrib non-free\n"
-"  \n"
-" Components [main contrib non-free]:"
+"\n"
+" Components [main contrib non-free]:\n"
 msgstr ""
 " Por favor forneça os componentes a obter\n"
 " Tipicamente os componentes são algo como: main contrib non-free\n"
-"  \n"
-" Componentes [main contrib non-free]:"
+"\n"
+" Componentes [main contrib non-free]:\n"
 
-#. type: <p></p>
-#: guide.sgml:236
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:260
 msgid ""
 "The components list refers to the list of sub distributions to fetch. The "
 "distribution is split up based on software licenses, main being DFSG free "
@@ -8964,8 +8933,8 @@ msgstr ""
 "pacotes livres DFSG enquanto contrib e non-free contêm coisas que têm várias "
 "restrições colocadas no seu uso e distribuição."
 
-#. type: <p></p>
-#: guide.sgml:240
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:266
 msgid ""
 "Any number of sources can be added, the setup script will continue to prompt "
 "until you have specified all that you want."
@@ -8973,23 +8942,23 @@ msgstr ""
 "Pode ser adicionado qualquer número de fontes, o script de configuração irá "
 "continuar a perguntar-lhe até que tenha especificado todas as que deseja."
 
-#. type: <p></p>
-#: guide.sgml:247
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:270
 msgid ""
-"Before starting to use <prgn>dselect</prgn> it is necessary to update the "
-"available list by selecting [U]pdate from the menu. This is a superset of "
-"<tt>apt-get update</tt> that makes the fetched information available to "
-"<prgn>dselect</prgn>. [U]pdate must be performed even if <tt>apt-get update</"
-"tt> has been run before."
+"Before starting to use <command>dselect</command> it is necessary to update "
+"the available list by selecting [U]pdate from the menu. This is a superset "
+"of <literal>apt-get update</literal> that makes the fetched information "
+"available to <command>dselect</command>. [U]pdate must be performed even if "
+"<literal>apt-get update</literal> has been run before."
 msgstr ""
-"Antes de começar a usar o <prgn>dselect</prgn> é necessário actualizar a "
-"lista disponível ao seleccionar [U]pdate no menu. Isto é um super-conjunto "
-"do <tt>apt-get update</tt> que torna a informação obtida disponível ao "
-"<prgn>dselect</prgn>. Deve ser executado o [U]pdate mesmo que tenha sido "
-"feito <tt>apt-get update</tt> antes."
+"Antes de começar a usar o <command>dselect</command> é necessário actualizar "
+"a lista disponível ao seleccionar [U]pdate no menu. Isto é um super-conjunto "
+"do <literal>apt-get update</literal> que torna a informação obtida "
+"disponível ao <command>dselect</command>. Deve ser executado o [U]pdate "
+"mesmo que tenha sido feito <literal>apt-get update</literal> antes."
 
-#. type: <p></p>
-#: guide.sgml:253
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:277
 msgid ""
 "You can then go on and make your selections using [S]elect and then perform "
 "the installation using [I]nstall. When using the APT method the [C]onfig and "
@@ -9000,76 +8969,83 @@ msgstr ""
 "instalação usando [I]nstall. Quando se usa o método APT os comandos [C]onfig "
 "e [R]emove não fazem sentido, o comando [I]nstall executa ambos juntamente."
 
-#. type: <p></p>
-#: guide.sgml:258
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:283
 msgid ""
 "By default APT will automatically remove the package (.deb) files once they "
-"have been successfully installed. To change this behavior place <tt>Dselect::"
-"clean \"prompt\";</tt> in /etc/apt/apt.conf."
+"have been successfully installed. To change this behavior place "
+"<literal>Dselect::clean \"prompt\";</literal> in /etc/apt/apt.conf."
 msgstr ""
 "Por predefinição o APT irá automaticamente remover o ficheiro de pacote (."
 "deb) assim que ele tenha sido instalado com sucesso. Para alterar este "
-"comportamento coloque <tt>Dselect::clean \"prompt\";</tt> em /etc/apt/apt."
-"conf."
+"comportamento coloque <literal>Dselect::clean \"prompt\";</literal> em /etc/"
+"apt/apt.conf."
 
-#. type: <heading></heading>
-#: guide.sgml:264
+#. type: Content of: <book><chapter><title>
+#: guide.dbk:289
 msgid "The Interface"
 msgstr "A Interface"
 
-#. type: <p></p>
-#: guide.sgml:278
+#. type: Content of: <book><chapter><para><footnote><para>
+#: guide.dbk:293
 msgid ""
-"Both that APT <prgn>dselect</prgn> method and <prgn>apt-get</prgn> share the "
-"same interface. It is a simple system that generally tells you what it will "
-"do and then goes and does it. <footnote><p>The <prgn>dselect</prgn> method "
-"actually is a set of wrapper scripts to <prgn>apt-get</prgn>. The method "
-"actually provides more functionality than is present in <prgn>apt-get</prgn> "
-"alone.</p></footnote> After printing out a summary of what will happen APT "
+"The <command>dselect</command> method actually is a set of wrapper scripts "
+"to <command>apt-get</command>. The method actually provides more "
+"functionality than is present in <command>apt-get</command> alone."
+msgstr ""
+"O método <command>dselect</command> na verdade é um conjunto de scripts "
+"wrapper para o <command>apt-get</command>. O método disponibiliza mais "
+"funcionalidades que aquelas presentes no <command>apt-get</command> sozinho."
+
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:291
+msgid ""
+"Both that APT <command>dselect</command> method and <command>apt-get</"
+"command> share the same interface. It is a simple system that generally "
+"tells you what it will do and then goes and does it. <placeholder type="
+"\"footnote\" id=\"0\"/> After printing out a summary of what will happen APT "
 "then will print out some informative status messages so that you can "
 "estimate how far along it is and how much is left to do."
 msgstr ""
-"Ambos método <prgn>dselect</prgn> do APT e <prgn>apt-get</prgn> partilham a "
-"mesma interface. É um sistema simples que geralmente lhe diz o que vai fazer "
-"e depois fá-lo. <footnote><p> O método <prgn>dselect</prgn> na verdade é um "
-"conjunto de scripts wrapper para o <prgn>apt-get</prgn>. O método "
-"disponibiliza mais funcionalidades que aquelas presentes no <prgn>apt-get</"
-"prgn> sozinho.</p></footnote> Após escrever um sumário do que vai acontecer, "
-"o APT depois irá escrever algumas mensagens de estado informativo para que "
-"você possa estimar o progresso e quanto falta fazer."
-
-#. type: <heading></heading>
-#: guide.sgml:280
+"Ambos método <command>dselect</command> do APT e <command>apt-get</command> "
+"partilham a mesma interface. É um sistema simples que geralmente lhe diz o "
+"que vai fazer e depois fá-lo. <placeholder type=\"footnote\" id=\"0\"/> Após "
+"escrever um sumário do que vai acontecer, o APT depois irá escrever algumas "
+"mensagens de estado informativo para que você possa estimar o progresso e "
+"quanto falta fazer."
+
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:302
 msgid "Startup"
 msgstr "Arranque"
 
-#. type: <p></p>
-#: guide.sgml:284
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:304
 msgid ""
 "Before all operations except update, APT performs a number of actions to "
 "prepare its internal state. It also does some checks of the system's state. "
-"At any time these operations can be performed by running <tt>apt-get check</"
-"tt>."
+"At any time these operations can be performed by running <literal>apt-get "
+"check</literal>."
 msgstr ""
 "Antes de todas as operações, excepto a update, o APT executa um número de "
 "acções para preparar o seu estado interno. Também faz algumas verificações "
 "do estado do sistema. A qualquer altura estas operações pode ser executadas "
-"correndo <tt>apt-get check</tt>."
+"correndo <literal>apt-get check</literal>."
 
-#. type: <example></example>
-#: guide.sgml:289
+#. type: Content of: <book><chapter><section><screen>
+#: guide.dbk:310
 #, no-wrap
 msgid ""
 "# apt-get check\n"
 "Reading Package Lists... Done\n"
-"Building Dependency Tree... Done"
+"Building Dependency Tree... Done\n"
 msgstr ""
 "# apt-get check\n"
 "Reading Package Lists... Done\n"
-"Building Dependency Tree... Done"
+"Building Dependency Tree... Done\n"
 
-#. type: <p></p>
-#: guide.sgml:297
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:315
 msgid ""
 "The first thing it does is read all the package files into memory. APT uses "
 "a caching scheme so this operation will be faster the second time it is run. "
@@ -9082,21 +9058,21 @@ msgstr ""
 "encontrados serão ignorados e será mostrado um aviso quando o apt-get "
 "terminar."
 
-#. type: <p></p>
-#: guide.sgml:303
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:321
 msgid ""
 "The final operation performs a detailed analysis of the system's "
 "dependencies. It checks every dependency of every installed or unpacked "
 "package and considers if it is OK. Should this find a problem then a report "
-"will be printed out and <prgn>apt-get</prgn> will refuse to run."
+"will be printed out and <command>apt-get</command> will refuse to run."
 msgstr ""
 "A operação final executa uma análise detalhada das dependências do sistema. "
 "Verifica cada dependência de cada pacote instalado ou desempacotado e "
 "considera se está OK. Caso isto encontre um problema, então é escrito um "
-"relatório e o <prgn>apt-get</prgn> recusa-se a funcionar."
+"relatório e o <command>apt-get</command> recusa-se a funcionar."
 
-#. type: <example></example>
-#: guide.sgml:320
+#. type: Content of: <book><chapter><section><screen>
+#: guide.dbk:327
 #, no-wrap
 msgid ""
 "# apt-get check\n"
@@ -9106,14 +9082,14 @@ msgid ""
 "Sorry, but the following packages have unmet dependencies:\n"
 "  9fonts: Depends: xlib6g but it is not installed\n"
 "  uucp: Depends: mailx but it is not installed\n"
-"  blast: Depends: xlib6g (>= 3.3-5) but it is not installed\n"
+"  blast: Depends: xlib6g (&gt;= 3.3-5) but it is not installed\n"
 "  adduser: Depends: perl-base but it is not installed\n"
 "  aumix: Depends: libgpmg1 but it is not installed\n"
 "  debiandoc-sgml: Depends: sgml-base but it is not installed\n"
-"  bash-builtins: Depends: bash (>= 2.01) but 2.0-3 is installed\n"
+"  bash-builtins: Depends: bash (&gt;= 2.01) but 2.0-3 is installed\n"
 "  cthugha: Depends: svgalibg1 but it is not installed\n"
-"           Depends: xlib6g (>= 3.3-5) but it is not installed\n"
-"  libreadlineg2: Conflicts:libreadline2 (<< 2.1-2.1)"
+"           Depends: xlib6g (&gt;= 3.3-5) but it is not installed\n"
+"  libreadlineg2: Conflicts:libreadline2 (&lt;&lt; 2.1-2.1)\n"
 msgstr ""
 "# apt-get check\n"
 "Reading Package Lists... Done\n"
@@ -9122,17 +9098,17 @@ msgstr ""
 "Sorry, but the following packages have unmet dependencies:\n"
 "  9fonts: Depends: xlib6g but it is not installed\n"
 "  uucp: Depends: mailx but it is not installed\n"
-"  blast: Depends: xlib6g (>= 3.3-5) but it is not installed\n"
+"  blast: Depends: xlib6g (&gt;= 3.3-5) but it is not installed\n"
 "  adduser: Depends: perl-base but it is not installed\n"
 "  aumix: Depends: libgpmg1 but it is not installed\n"
 "  debiandoc-sgml: Depends: sgml-base but it is not installed\n"
-"  bash-builtins: Depends: bash (>= 2.01) but 2.0-3 is installed\n"
+"  bash-builtins: Depends: bash (&gt;= 2.01) but 2.0-3 is installed\n"
 "  cthugha: Depends: svgalibg1 but it is not installed\n"
-"           Depends: xlib6g (>= 3.3-5) but it is not installed\n"
-"  libreadlineg2: Conflicts:libreadline2 (<< 2.1-2.1)"
+"           Depends: xlib6g (&gt;= 3.3-5) but it is not installed\n"
+"  libreadlineg2: Conflicts:libreadline2 (&lt;&lt; 2.1-2.1)\n"
 
-#. type: <p></p>
-#: guide.sgml:329
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:344
 msgid ""
 "In this example the system has many problems, including a serious problem "
 "with libreadlineg2. For each package that has unmet dependencies a line is "
@@ -9146,84 +9122,95 @@ msgstr ""
 "não estão satisfeitas. É também incluída uma explicação curta de porquê o "
 "pacote tem um problema de dependência."
 
-#. type: <p></p>
-#: guide.sgml:337
+#. type: Content of: <book><chapter><section><para><footnote><para>
+#: guide.dbk:353
+msgid ""
+"APT however considers all known dependencies and attempts to prevent broken "
+"packages"
+msgstr ""
+"No entanto o APT considera todas as dependências conhecidas e tenta prevenir "
+"pacotes quebrados"
+
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:351
 msgid ""
 "There are two ways a system can get into a broken state like this. The first "
-"is caused by <prgn>dpkg</prgn> missing some subtle relationships between "
-"packages when performing upgrades. <footnote><p>APT however considers all "
-"known dependencies and attempts to prevent broken packages</p></footnote>. "
-"The second is if a package installation fails during an operation. In this "
-"situation a package may have been unpacked without its dependents being "
-"installed."
+"is caused by <command>dpkg</command> missing some subtle relationships "
+"between packages when performing upgrades. <placeholder type=\"footnote\" id="
+"\"0\"/>. The second is if a package installation fails during an operation. "
+"In this situation a package may have been unpacked without its dependents "
+"being installed."
 msgstr ""
 "Existem duas maneiras de um sistema entrar num estado de quebra como este. A "
-"primeira é causada pelo <prgn>dpkg</prgn> que não vê algumas relações subtis "
-"entre pacotes quando executa actualizações. <footnote><p>No entanto o APT "
-"considera todas as dependências conhecidas e tenta prevenir pacotes "
-"quebrados</p></footnote>. A segunda é se uma instalação de pacote falha "
+"primeira é causada pelo <command>dpkg</command> que não vê algumas relações "
+"subtis entre pacotes quando executa actualizações. <placeholder type="
+"\"footnote\" id=\"0\"/>. A segunda é se uma instalação de pacote falha "
 "durante uma operação. Nesta situação um pacote pode ter sido desempacotado "
 "sem que as suas dependências tenham sido instaladas."
 
-#. type: <p></p>
-#: guide.sgml:345
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:360
 msgid ""
 "The second situation is much less serious than the first because APT places "
 "certain constraints on the order that packages are installed. In both cases "
-"supplying the <tt>-f</tt> option to <prgn>apt-get</prgn> will cause APT to "
-"deduce a possible solution to the problem and then continue on. The APT "
-"<prgn>dselect</prgn> method always supplies the <tt>-f</tt> option to allow "
-"for easy continuation of failed maintainer scripts."
+"supplying the <literal>-f</literal> option to <command>apt-get</command> "
+"will cause APT to deduce a possible solution to the problem and then "
+"continue on. The APT <command>dselect</command> method always supplies the "
+"<literal>-f</literal> option to allow for easy continuation of failed "
+"maintainer scripts."
 msgstr ""
 "A segunda situação é muito menos séria que a primeira porque o APT coloca "
 "certos constrangimentos na ordem que os pacotes são instalados. Em ambos os "
-"casos, fornecer a opção <tt>-f</tt> ao <prgn>apt-get</prgn> irá fazer com "
-"que o APT deduza uma solução possível para o problema e depois continue. O "
-"método <prgn>dselect</prgn> do APT fornece sempre a opção <tt>-f</tt> para "
-"permitir uma continuação fácil de scripts do responsável com falhas."
-
-#. type: <p></p>
-#: guide.sgml:351
-msgid ""
-"However, if the <tt>-f</tt> option is used to correct a seriously broken "
-"system caused by the first case then it is possible that it will either fail "
-"immediately or the installation sequence will fail. In either case it is "
-"necessary to manually use dpkg (possibly with forcing options) to correct "
-"the situation enough to allow APT to proceed."
-msgstr ""
-"No entanto, se for usada a opção <tt>-f</tt> para corrigir um sistema "
-"seriamente quebrado causado pelo primeiro caso, então é possível que ou "
-"falhe imediatamente ou falhe na sequência de instalação. Em qualquer dos "
+"casos, fornecer a opção <literal>-f</literal> ao <command>apt-get</command> "
+"irá fazer com que o APT deduza uma solução possível para o problema e depois "
+"continue. O método <command>dselect</command> do APT fornece sempre a opção "
+"<literal>-f</literal> para permitir uma continuação fácil de scripts do "
+"responsável com falhas."
+
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:369
+msgid ""
+"However, if the <literal>-f</literal> option is used to correct a seriously "
+"broken system caused by the first case then it is possible that it will "
+"either fail immediately or the installation sequence will fail. In either "
+"case it is necessary to manually use dpkg (possibly with forcing options) to "
+"correct the situation enough to allow APT to proceed."
+msgstr ""
+"No entanto, se for usada a opção <literal>-f</literal> para corrigir um "
+"sistema seriamente quebrado causado pelo primeiro caso, então é possível que "
+"ou falhe imediatamente ou falhe na sequência de instalação. Em qualquer dos "
 "casos é necessário usar o dpkg manualmente (possivelmente com opções de "
 "forçar) para corrigir a situação o suficiente para permitir ao APT continuar."
 
-#. type: <heading></heading>
-#: guide.sgml:356
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:377
 msgid "The Status Report"
 msgstr "O Relatório de Estado"
 
-#. type: <p></p>
-#: guide.sgml:363
-msgid ""
-"Before proceeding <prgn>apt-get</prgn> will present a report on what will "
-"happen. Generally the report reflects the type of operation being performed "
-"but there are several common elements. In all cases the lists reflect the "
-"final state of things, taking into account the <tt>-f</tt> option and any "
-"other relevant activities to the command being executed."
-msgstr ""
-"Antes de prosseguir, o <prgn>apt-get</prgn> irá apresentar um relatório do "
-"que irá acontecer. Geralmente o relatório reflecte o tipo de operações a ser "
-"executadas mas há vários elementos comuns. Em todos os casos a lista "
-"reflecte o estado final das coisas, tendo em conta a opção <tt>-f</tt> e "
-"quaisquer outras actividades relevantes ao comando que vai ser executado."
-
-#. type: <heading></heading>
-#: guide.sgml:364
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:379
+msgid ""
+"Before proceeding <command>apt-get</command> will present a report on what "
+"will happen. Generally the report reflects the type of operation being "
+"performed but there are several common elements. In all cases the lists "
+"reflect the final state of things, taking into account the <literal>-f</"
+"literal> option and any other relevant activities to the command being "
+"executed."
+msgstr ""
+"Antes de prosseguir, o <command>apt-get</command> irá apresentar um "
+"relatório do que irá acontecer. Geralmente o relatório reflecte o tipo de "
+"operações a ser executadas mas há vários elementos comuns. Em todos os casos "
+"a lista reflecte o estado final das coisas, tendo em conta a opção <literal>-"
+"f</literal> e quaisquer outras actividades relevantes ao comando que vai ser "
+"executado."
+
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:386
 msgid "The Extra Package list"
 msgstr "A lista de Pacotes Extra"
 
-#. type: <example></example>
-#: guide.sgml:372
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:388
 #, no-wrap
 msgid ""
 "The following extra packages will be installed:\n"
@@ -9231,85 +9218,85 @@ msgid ""
 "  mailpgp xdpkg fileutils pinepgp zlib1g xlib6g perl-base\n"
 "  bin86 libgdbm1 libgdbmg1 quake-lib gmp2 bcc xbuffy\n"
 "  squake pgp-i python-base debmake ldso perl libreadlineg2\n"
-"  ssh"
+"  ssh\n"
 msgstr ""
 "Os seguinte pacotes extra serão instalados:\n"
 "  libdbd-mysql-perl xlib6 zlib1 xzx libreadline2 libdbd-msql-perl\n"
 "  mailpgp xdpkg fileutils pinepgp zlib1g xlib6g perl-base\n"
 "  bin86 libgdbm1 libgdbmg1 quake-lib gmp2 bcc xbuffy\n"
 "  squake pgp-i python-base debmake ldso perl libreadlineg2\n"
-"  ssh"
+"  ssh\n"
 
-#. type: <p></p>
-#: guide.sgml:379
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:396
 msgid ""
 "The Extra Package list shows all of the packages that will be installed or "
 "upgraded in excess of the ones mentioned on the command line. It is only "
-"generated for an <tt>install</tt> command. The listed packages are often the "
-"result of an Auto Install."
+"generated for an <literal>install</literal> command. The listed packages are "
+"often the result of an Auto Install."
 msgstr ""
 "A lista de Pacotes Extra mostra todos os pacotes que irão ser instalados ou "
 "actualizados em excesso daqueles mencionados na linha de comandos. É apenas "
-"gerada para um comando <tt>install</tt>. Os pacotes listados são geralmente "
-"o resultado de uma Auto instalação."
+"gerada para um comando <literal>install</literal>. Os pacotes listados são "
+"geralmente o resultado de uma Auto instalação."
 
-#. type: <heading></heading>
-#: guide.sgml:382
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:403
 msgid "The Packages to Remove"
 msgstr "Os Pacotes para Remover"
 
-#. type: <example></example>
-#: guide.sgml:389
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:405
 #, no-wrap
 msgid ""
 "The following packages will be REMOVED:\n"
 "  xlib6-dev xpat2 tk40-dev xkeycaps xbattle xonix\n"
 "  xdaliclock tk40 tk41 xforms0.86 ghostview xloadimage xcolorsel\n"
 "  xadmin xboard perl-debug tkined xtetris libreadline2-dev perl-suid\n"
-"  nas xpilot xfig"
+"  nas xpilot xfig\n"
 msgstr ""
 "Os seguintes pacotes irão ser REMOVIDOS:\n"
 "  xlib6-dev xpat2 tk40-dev xkeycaps xbattle xonix\n"
 "  xdaliclock tk40 tk41 xforms0.86 ghostview xloadimage xcolorsel\n"
 "  xadmin xboard perl-debug tkined xtetris libreadline2-dev perl-suid\n"
-"  nas xpilot xfig"
+"  nas xpilot xfig\n"
 
-#. type: <p></p>
-#: guide.sgml:399
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:412
 msgid ""
 "The Packages to Remove list shows all of the packages that will be removed "
 "from the system. It can be shown for any of the operations and should be "
 "given a careful inspection to ensure nothing important is to be taken off. "
-"The <tt>-f</tt> option is especially good at generating packages to remove "
-"so extreme care should be used in that case. The list may contain packages "
-"that are going to be removed because they are only partially installed, "
-"possibly due to an aborted installation."
+"The <literal>-f</literal> option is especially good at generating packages "
+"to remove so extreme care should be used in that case. The list may contain "
+"packages that are going to be removed because they are only partially "
+"installed, possibly due to an aborted installation."
 msgstr ""
 "A lista Pacotes para Remover mostra todos os pacotes que irão ser removidos "
 "do sistema. Pode ser mostrada para qualquer das operações e deve ser-lhe "
 "dada uma inspecção cuidadosa para assegurar que nada de importante vai ser "
-"removido. A opção <tt>-f</tt> é especialmente boa a gerar pacotes para "
-"remover, portanto neste caso deve-se usar cuidados extremos. A lista pode "
-"conter pacotes que vão ser removidos porque estão apenas parcialmente "
+"removido. A opção <literal>-f</literal> é especialmente boa a gerar pacotes "
+"para remover, portanto neste caso deve-se usar cuidados extremos. A lista "
+"pode conter pacotes que vão ser removidos porque estão apenas parcialmente "
 "instalados, possivelmente devido a uma instalação abortada."
 
-#. type: <heading></heading>
-#: guide.sgml:402
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:422
 msgid "The New Packages list"
 msgstr "A lista de Novos Pacotes"
 
-#. type: <example></example>
-#: guide.sgml:406
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:424
 #, no-wrap
 msgid ""
 "The following NEW packages will installed:\n"
-"  zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base"
+"  zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base\n"
 msgstr ""
 "Os seguintes pacotes NOVOS irão ser instalados:\n"
-"  zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base"
+"  zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base\n"
 
-#. type: <p></p>
-#: guide.sgml:411
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:428
 msgid ""
 "The New Packages list is simply a reminder of what will happen. The packages "
 "listed are not presently installed in the system but will be when APT is "
@@ -9319,57 +9306,57 @@ msgstr ""
 "pacotes listados não estão instalados presentemente no sistema mas irão "
 "estar quando o APT terminar."
 
-#. type: <heading></heading>
-#: guide.sgml:414
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:433
 msgid "The Kept Back list"
 msgstr "A lista Kept Back"
 
-#. type: <example></example>
-#: guide.sgml:419
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:435
 #, no-wrap
 msgid ""
 "The following packages have been kept back\n"
 "  compface man-db tetex-base msql libpaper svgalib1\n"
-"  gs snmp arena lynx xpat2 groff xscreensaver"
+"  gs snmp arena lynx xpat2 groff xscreensaver\n"
 msgstr ""
 "Os seguintes pacotes formam mantidos na versão antiga\n"
 "  compface man-db tetex-base msql libpaper svgalib1\n"
-"  gs snmp arena lynx xpat2 groff xscreensaver"
+"  gs snmp arena lynx xpat2 groff xscreensaver\n"
 
-#. type: <p></p>
-#: guide.sgml:428
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:440
 msgid ""
 "Whenever the whole system is being upgraded there is the possibility that "
 "new versions of packages cannot be installed because they require new things "
 "or conflict with already installed things. In this case the package will "
 "appear in the Kept Back list. The best way to convince packages listed there "
-"to install is with <tt>apt-get install</tt> or by using <prgn>dselect</prgn> "
-"to resolve their problems."
+"to install is with <literal>apt-get install</literal> or by using "
+"<command>dselect</command> to resolve their problems."
 msgstr ""
 "Sempre que todo o sistema é actualizado existe a possibilidade que novas "
 "versões de pacotes não possam ser instaladas porque requerem coisas novas ou "
 "entram em conflito com coisas já instaladas. Nestes casos o pacote irá "
 "aparecer na lista Kept Back. A melhor maneira de convencer os pacotes "
-"listados aqui a instalarem é com o  <tt>apt-get install</tt> ou usando o "
-"<prgn>dselect</prgn> para resolver os seus problemas."
+"listados aqui a instalarem é com o  <literal>apt-get install</literal> ou "
+"usando o <command>dselect</command> para resolver os seus problemas."
 
-#. type: <heading></heading>
-#: guide.sgml:431
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:449
 msgid "Held Packages warning"
 msgstr "Aviso de Pacotes Mantidos"
 
-#. type: <example></example>
-#: guide.sgml:435
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:451
 #, no-wrap
 msgid ""
 "The following held packages will be changed:\n"
-"  cvs"
+"  cvs\n"
 msgstr ""
 "Os seguintes pacotes mantidos irão ser alterados:\n"
-"  cvs"
+"  cvs\n"
 
-#. type: <p></p>
-#: guide.sgml:441
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:455
 msgid ""
 "Sometimes you can ask APT to install a package that is on hold, in such a "
 "case it prints out a warning that the held package is going to be changed. "
@@ -9379,33 +9366,33 @@ msgstr ""
 "nestes casos ele mostra um aviso que o pacote retido vai ser alterado. Isto "
 "apenas deve acontecer durante um dist-upgrade ou install."
 
-#. type: <heading></heading>
-#: guide.sgml:444
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:461
 msgid "Final summary"
 msgstr "Sumário final"
 
-#. type: <p></p>
-#: guide.sgml:447
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:463
 msgid ""
 "Finally, APT will print out a summary of all the changes that will occur."
 msgstr ""
 "Finalmente, o APT irá escrever um sumário de todas as alterações que irão "
 "acontecer."
 
-#. type: <example></example>
-#: guide.sgml:452
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:466
 #, no-wrap
 msgid ""
 "206 packages upgraded, 8 newly installed, 23 to remove and 51 not upgraded.\n"
 "12 packages not fully installed or removed.\n"
-"Need to get 65.7M/66.7M of archives. After unpacking 26.5M will be used."
+"Need to get 65.7M/66.7M of archives. After unpacking 26.5M will be used.\n"
 msgstr ""
 "206 pacotes actualizados, 8 instalados de novo, 23 para remover e 51 não actualizados.\n"
 "12 pacotes não totalmente instalados ou removidos.\n"
-"É necessário obter 65.7M/66.7M de arquivos. Após desempacotamento será usado 26.5M."
+"É necessário obter 65.7M/66.7M de arquivos. Após desempacotamento será usado 26.5M.\n"
 
-#. type: <p></p>
-#: guide.sgml:470
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:471
 msgid ""
 "The first line of the summary simply is a reduced version of all of the "
 "lists and includes the number of upgrades - that is packages already "
@@ -9435,8 +9422,8 @@ msgstr ""
 "estar feito. Se forem removidos um grande número de pacotes então o valor "
 "pode indicar a quantidade de espaço que irá ser libertado."
 
-#. type: <p></p>
-#: guide.sgml:473
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:485
 msgid ""
 "Some other reports can be generated by using the -u option to show packages "
 "to upgrade, they are similar to the previous examples."
@@ -9444,13 +9431,13 @@ msgstr ""
 "Outros relatórios podem ser gerados ao usar a opção -u para mostrar os "
 "pacotes a actualizar, e são semelhantes aos exemplos prévios."
 
-#. type: <heading></heading>
-#: guide.sgml:477
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:492
 msgid "The Status Display"
 msgstr "O Mostrador de Estado"
 
-#. type: <p></p>
-#: guide.sgml:481
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:494
 msgid ""
 "During the download of archives and package files APT prints out a series of "
 "status messages."
@@ -9458,8 +9445,8 @@ msgstr ""
 "Durante a descarga dos arquivos e ficheiros de pacotes, o APT escreve uma "
 "série de mensagens de estado."
 
-#. type: <example></example>
-#: guide.sgml:490
+#. type: Content of: <book><chapter><section><screen>
+#: guide.dbk:498
 #, no-wrap
 msgid ""
 "# apt-get update\n"
@@ -9468,7 +9455,7 @@ msgid ""
 "Hit http://llug.sep.bnl.gov/debian/ testing/main Packages\n"
 "Get:4 http://ftp.de.debian.org/debian-non-US/ unstable/binary-i386/ Packages\n"
 "Get:5 http://llug.sep.bnl.gov/debian/ testing/non-free Packages\n"
-"11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s"
+"11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s\n"
 msgstr ""
 "# apt-get update\n"
 "Get:1 http://ftp.de.debian.org/debian-non-US/ stable/non-US/ Packages\n"
@@ -9476,68 +9463,70 @@ msgstr ""
 "Hit http://llug.sep.bnl.gov/debian/ testing/main Packages\n"
 "Get:4 http://ftp.de.debian.org/debian-non-US/ unstable/binary-i386/ Packages\n"
 "Get:5 http://llug.sep.bnl.gov/debian/ testing/non-free Packages\n"
-"11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s"
+"11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s\n"
 
-#. type: <p></p>
-#: guide.sgml:500
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:507
 msgid ""
-"The lines starting with <em>Get</em> are printed out when APT begins to "
-"fetch a file while the last line indicates the progress of the download. The "
-"first percent value on the progress line indicates the total percent done of "
-"all files. Unfortunately since the size of the Package files is unknown "
-"<tt>apt-get update</tt> estimates the percent done which causes some "
-"inaccuracies."
+"The lines starting with <emphasis>Get</emphasis> are printed out when APT "
+"begins to fetch a file while the last line indicates the progress of the "
+"download. The first percent value on the progress line indicates the total "
+"percent done of all files. Unfortunately since the size of the Package files "
+"is unknown <literal>apt-get update</literal> estimates the percent done "
+"which causes some inaccuracies."
 msgstr ""
-"A linhas iniciadas com <em>Get</em> são escritas quando o APT começa a obter "
-"um ficheiro enquanto a última linha indica o progresso da descarga. O "
-"primeiro valor percentual na linha de progresso indica a percentagem total "
-"completa de todos os ficheiros. Infelizmente como o tamanho dos ficheiros de "
-"Pacotes é desconhecido o <tt>apt-get update</tt> estima a percentagem de "
-"pronto o que causa algumas imprecisões."
+"A linhas iniciadas com <emphasis>Get</emphasis> são escritas quando o APT "
+"começa a obter um ficheiro enquanto a última linha indica o progresso da "
+"descarga. O primeiro valor percentual na linha de progresso indica a "
+"percentagem total completa de todos os ficheiros. Infelizmente como o "
+"tamanho dos ficheiros de Pacotes é desconhecido o <literal>apt-get update</"
+"literal> estima a percentagem de pronto o que causa algumas imprecisões."
 
-#. type: <p></p>
-#: guide.sgml:509
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:515
 msgid ""
 "The next section of the status line is repeated once for each download "
 "thread and indicates the operation being performed and some useful "
 "information about what is happening. Sometimes this section will simply read "
-"<em>Forking</em> which means the OS is loading the download module. The "
-"first word after the [ is the fetch number as shown on the history lines. "
-"The next word is the short form name of the object being downloaded. For "
-"archives it will contain the name of the package that is being fetched."
+"<emphasis>Forking</emphasis> which means the OS is loading the download "
+"module. The first word after the [ is the fetch number as shown on the "
+"history lines. The next word is the short form name of the object being "
+"downloaded. For archives it will contain the name of the package that is "
+"being fetched."
 msgstr ""
 "A secção seguinte da linha de estado é repetida para cada processo de "
 "descarga e indica a operação a ser executada e alguma informação útil acerca "
 "do que está a acontecer. Por vezes esta secção irá simplesmente ler "
-"<em>Forking</em> o que representa que o SO está a carregar o módulo de "
-"download. A primeira palavra após o [ é o número de obtenção como mostrado "
-"nas linhas de histórico. A palavra seguinte é o nome em formato curto do "
-"objecto a ser descarregado. Para os arquivos irá conter o nome do pacote que "
-"está a ser descarregado."
+"<emphasis>Forking</emphasis> o que representa que o SO está a carregar o "
+"módulo de download. A primeira palavra após o [ é o número de obtenção como "
+"mostrado nas linhas de histórico. A palavra seguinte é o nome em formato "
+"curto do objecto a ser descarregado. Para os arquivos irá conter o nome do "
+"pacote que está a ser descarregado."
 
-#. type: <p></p>
-#: guide.sgml:524
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:525
 msgid ""
 "Inside of the single quote is an informative string indicating the progress "
 "of the negotiation phase of the download. Typically it progresses from "
-"<em>Connecting</em> to <em>Waiting for file</em> to <em>Downloading</em> or "
-"<em>Resuming</em>. The final value is the number of bytes downloaded from "
-"the remote site. Once the download begins this is represented as "
-"<tt>102/10.2k</tt> indicating that 102 bytes have been fetched and 10.2 "
-"kilobytes is expected. The total size is always shown in 4 figure notation "
-"to preserve space. After the size display is a percent meter for the file "
-"itself. The second last element is the instantaneous average speed. This "
-"values is updated every 5 seconds and reflects the rate of data transfer for "
-"that period. Finally is shown the estimated transfer time. This is updated "
-"regularly and reflects the time to complete everything at the shown transfer "
-"rate."
+"<emphasis>Connecting</emphasis> to <emphasis>Waiting for file</emphasis> to "
+"<emphasis>Downloading</emphasis> or <emphasis>Resuming</emphasis>. The final "
+"value is the number of bytes downloaded from the remote site. Once the "
+"download begins this is represented as <literal>102/10.2k</literal> "
+"indicating that 102 bytes have been fetched and 10.2 kilobytes is expected. "
+"The total size is always shown in 4 figure notation to preserve space. After "
+"the size display is a percent meter for the file itself. The second last "
+"element is the instantaneous average speed. This values is updated every 5 "
+"seconds and reflects the rate of data transfer for that period. Finally is "
+"shown the estimated transfer time. This is updated regularly and reflects "
+"the time to complete everything at the shown transfer rate."
 msgstr ""
 "Dentro da única citação está uma string de informação que indica o progresso "
-"da fase de negociação do download. Progride tipicamente de <em>A Ligar</em> "
-"para <em>À espera do ficheiro</em> para <em>A descarregar</em> ou <em>A "
-"resumir</em>. O valor final é o número de bytes descarregados a partir do "
-"site remoto. Uma vez começado a descarga isto é representado como "
-"<tt>102/10.2k</tt> indicando que 102 bytes foram obtidos e são esperados "
+"da fase de negociação do download. Progride tipicamente de <emphasis>A "
+"Ligar</emphasis> para <emphasis>À espera do ficheiro</emphasis> para "
+"<emphasis>A descarregar</emphasis> ou <emphasis>A resumir</emphasis>. O "
+"valor final é o número de bytes descarregados a partir do site remoto. Uma "
+"vez começado a descarga isto é representado como <literal>102/10.2k</"
+"literal> indicando que 102 bytes foram obtidos e são esperados "
 "10.2kilobytes. O tamanho total é sempre representado numa anotação de 4 "
 "figuras para preservar espaço. Após a amostragem do tamanho está um medidor "
 "de percentagem para o próprio ficheiro. O segundo último elemento é a "
@@ -9547,56 +9536,52 @@ msgstr ""
 "regularmente e reflecte o tempo para completar tudo ao ritmo de "
 "transferência mostrado."
 
-#. type: <p></p>
-#: guide.sgml:530
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:540
 msgid ""
 "The status display updates every half second to provide a constant feedback "
 "on the download progress while the Get lines scroll back whenever a new file "
 "is started. Since the status display is constantly updated it is unsuitable "
-"for logging to a file, use the <tt>-q</tt> option to remove the status "
-"display."
+"for logging to a file, use the <literal>-q</literal> option to remove the "
+"status display."
 msgstr ""
 "O mostrador de estado actualiza-se a cada meio segundo para disponibilizar "
 "uma informação de retorno constante do progresso de descarga enquanto as "
 "linhas Get deslocam-se para trás sempre que uma nova linha é iniciada. Como "
 "o mostrador de estado é constantemente actualizado não é apropriado para "
-"registar num ficheiro, use a opção <tt>-q</tt> para remover o mostrador de "
-"estado."
+"registar num ficheiro, use a opção <literal>-q</literal> para remover o "
+"mostrador de estado."
 
-#. type: <heading></heading>
-#: guide.sgml:535
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:548
 msgid "Dpkg"
 msgstr "Dpkg"
 
-#. type: <p></p>
-#: guide.sgml:542
-msgid ""
-"APT uses <prgn>dpkg</prgn> for installing the archives and will switch over "
-"to the <prgn>dpkg</prgn> interface once downloading is completed. "
-"<prgn>dpkg</prgn> will also ask a number of questions as it processes the "
-"packages and the packages themselves may also ask several questions. Before "
-"each question there is usually a description of what it is asking and the "
-"questions are too varied to discuss completely here."
-msgstr ""
-"O APT usa o <prgn>dpkg</prgn> para instalar os arquivos e irá mudar para a "
-"interface do <prgn>dpkg</prgn> assim que a descarga estiver completa. O "
-"<prgn>dpkg</prgn> irá também fazer um número de perguntas conforme vai "
-"processando os pacotes e os próprios pacotes podem também fazer várias "
-"questões. Antes de cada pergunta há geralmente uma descrição do que se está "
-"a perguntar e as perguntas são demasiado variadas para serem discutidas aqui."
-
-#. type: <title></title>
-#: offline.sgml:4
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:550
+msgid ""
+"APT uses <command>dpkg</command> for installing the archives and will switch "
+"over to the <command>dpkg</command> interface once downloading is completed. "
+"<command>dpkg</command> will also ask a number of questions as it processes "
+"the packages and the packages themselves may also ask several questions. "
+"Before each question there is usually a description of what it is asking and "
+"the questions are too varied to discuss completely here."
+msgstr ""
+"O APT usa o <command>dpkg</command> para instalar os arquivos e irá mudar "
+"para a interface do <command>dpkg</command> assim que a descarga estiver "
+"completa. O <command>dpkg</command> irá também fazer um número de perguntas "
+"conforme vai processando os pacotes e os próprios pacotes podem também fazer "
+"várias questões. Antes de cada pergunta há geralmente uma descrição do que "
+"se está a perguntar e as perguntas são demasiado variadas para serem "
+"discutidas aqui."
+
+#. type: Content of: <book><title>
+#: offline.dbk:11
 msgid "Using APT Offline"
 msgstr "Usando o APT Offline"
 
-#. type: <version></version>
-#: offline.sgml:7
-msgid "$Id: offline.sgml,v 1.8 2003/02/12 15:06:41 doogie Exp $"
-msgstr "$Id: offline.sgml,v 1.8 2003/02/12 15:06:41 doogie Exp $"
-
-#. type: <abstract></abstract>
-#: offline.sgml:12
+#. type: Content of: <book><bookinfo><abstract><para>
+#: offline.dbk:25
 msgid ""
 "This document describes how to use APT in a non-networked environment, "
 "specifically a 'sneaker-net' approach for performing upgrades."
@@ -9604,23 +9589,25 @@ msgstr ""
 "Este documento descreve como usar o APT num ambiente sem rede, "
 "especificamente uma aproximação 'sneaker-net' para executar actualizações."
 
-#. type: <copyrightsummary></copyrightsummary>
-#: offline.sgml:16
-msgid "Copyright &copy; Jason Gunthorpe, 1999."
-msgstr "Copyright &copy; Jason Gunthorpe, 1999."
+#. type: Content of: <book><bookinfo>
+#: offline.dbk:30
+msgid ""
+"<copyright><year>1999</year><holder>Jason Gunthorpe</holder></copyright>"
+msgstr ""
+"<copyright><year>1999</year><holder>Jason Gunthorpe</holder></copyright>"
 
-#. type: <heading></heading>
-#: offline.sgml:32
+#. type: Content of: <book><chapter><title>
+#: offline.dbk:48
 msgid "Introduction"
 msgstr "Introdução"
 
-#. type: <heading></heading>
-#: offline.sgml:34 offline.sgml:65 offline.sgml:180
+#. type: Content of: <book><chapter><section><title>
+#: offline.dbk:50 offline.dbk:80 offline.dbk:192
 msgid "Overview"
 msgstr "Visão geral"
 
-#. type: <p></p>
-#: offline.sgml:40
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:52
 msgid ""
 "Normally APT requires direct access to a Debian archive, either from a local "
 "media or through a network. Another common complaint is that a Debian "
@@ -9632,8 +9619,8 @@ msgstr ""
 "numa ligação lenta, como um modem e outra máquina tem uma ligação muito "
 "rápida mas estão fisicamente distantes."
 
-#. type: <p></p>
-#: offline.sgml:51
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:58
 msgid ""
 "The solution to this is to use large removable media such as a Zip disc or a "
 "SuperDisk disc. These discs are not large enough to store the entire Debian "
@@ -9641,9 +9628,9 @@ msgid ""
 "to use APT to generate a list of packages that are required and then fetch "
 "them onto the disc using another machine with good connectivity. It is even "
 "possible to use another Debian machine with APT or to use a completely "
-"different OS and a download tool like wget. Let <em>remote host</em> mean "
-"the machine downloading the packages, and <em>target host</em> the one with "
-"bad or no connection."
+"different OS and a download tool like wget. Let <emphasis>remote host</"
+"emphasis> mean the machine downloading the packages, and <emphasis>target "
+"host</emphasis> the one with bad or no connection."
 msgstr ""
 "A solução para isto é usar grandes médias amovíveis como um disco Zip ou um "
 "disco SuperDisk. Estes discos não são suficientemente grandes para armazenar "
@@ -9652,12 +9639,12 @@ msgstr ""
 "para gerar uma lista de pacotes que são necessários e depois obter-los para "
 "o disco usando outra máquina com boa ligação. É até possível usar outra "
 "máquina Debian com APT ou usar um SO completamente diferente e uma "
-"ferramenta de download como o wget. Deixe <em>remote host</em> representar a "
-"máquina que descarrega os pacotes, e <em>target host</em> aquela com má ou "
-"nenhuma ligação."
+"ferramenta de download como o wget. Deixe <emphasis>remote host</emphasis> "
+"representar a máquina que descarrega os pacotes, e <emphasis>target host</"
+"emphasis> aquela com má ou nenhuma ligação."
 
-#. type: <p></p>
-#: offline.sgml:57
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:69
 msgid ""
 "This is achieved by creatively manipulating the APT configuration file. The "
 "essential premise to tell APT to look on a disc for it's archive files. Note "
@@ -9670,13 +9657,13 @@ msgstr ""
 "sistema de ficheiros que saiba lidar com nomes de ficheiros longos como o "
 "ext2, fat32 ou vfat."
 
-#. type: <heading></heading>
-#: offline.sgml:63
+#. type: Content of: <book><chapter><title>
+#: offline.dbk:78
 msgid "Using APT on both machines"
 msgstr "Usando o APT em ambas máquinas"
 
-#. type: <p><example>
-#: offline.sgml:71
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:82
 msgid ""
 "APT being available on both machines gives the simplest configuration. The "
 "basic idea is to place a copy of the status file on the disc and use the "
@@ -9689,8 +9676,8 @@ msgstr ""
 "quais pacotes descarregar. A estrutura de directórios do disco deverá "
 "parecer-se com:"
 
-#. type: <example></example>
-#: offline.sgml:80
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:88
 #, no-wrap
 msgid ""
 "  /disc/\n"
@@ -9700,7 +9687,7 @@ msgid ""
 "       partial/\n"
 "    status\n"
 "    sources.list\n"
-"    apt.conf"
+"    apt.conf\n"
 msgstr ""
 "  /disc/\n"
 "    archives/\n"
@@ -9709,41 +9696,43 @@ msgstr ""
 "       partial/\n"
 "    status\n"
 "    sources.list\n"
-"    apt.conf"
+"    apt.conf\n"
 
-#. type: <heading></heading>
-#: offline.sgml:88
+#. type: Content of: <book><chapter><section><title>
+#: offline.dbk:99
 msgid "The configuration file"
 msgstr "O ficheiro de configuração"
 
-#. type: <p></p>
-#: offline.sgml:96
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:101
 msgid ""
 "The configuration file should tell APT to store its files on the disc and to "
 "use the configuration files on the disc as well. The sources.list should "
 "contain the proper sites that you wish to use from the remote machine, and "
-"the status file should be a copy of <em>/var/lib/dpkg/status</em> from the "
-"<em>target host</em>. Please note, if you are using a local archive you must "
-"use copy URIs, the syntax is identical to file URIs."
+"the status file should be a copy of <emphasis>/var/lib/dpkg/status</"
+"emphasis> from the <emphasis>target host</emphasis>. Please note, if you are "
+"using a local archive you must use copy URIs, the syntax is identical to "
+"file URIs."
 msgstr ""
 "O ficheiro de configuração deve dizer ao APT para armazenar os seus ficheiro "
 "no disco e usar os ficheiros de configuração do disco também. O sources.list "
 "deve conter os sites apropriados que deseja usar a partir da máquina remota, "
-"e o ficheiro de estado deve ser uma cópia de <em>/var/lib/dpkg/status</em> a "
-"partir do <em>target host</em>. Por favor note, se está a usar um arquivo "
-"local você deve usar copy URIs, a sintaxe é idêntica a file URIs."
+"e o ficheiro de estado deve ser uma cópia de <emphasis>/var/lib/dpkg/status</"
+"emphasis> a partir do <emphasis>target host</emphasis>. Por favor note, se "
+"está a usar um arquivo local você deve usar copy URIs, a sintaxe é idêntica "
+"a file URIs."
 
-#. type: <p><example>
-#: offline.sgml:100
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:109
 msgid ""
-"<em>apt.conf</em> must contain the necessary information to make APT use the "
-"disc:"
+"<emphasis>apt.conf</emphasis> must contain the necessary information to make "
+"APT use the disc:"
 msgstr ""
-"<em>apt.conf</em> tem de conter a informação necessária para fazer o APT "
-"usar o disco:"
+"<emphasis>apt.conf</emphasis> tem de conter a informação necessária para "
+"fazer o APT usar o disco:"
 
-#. type: <example></example>
-#: offline.sgml:124
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:113
 #, no-wrap
 msgid ""
 " APT\n"
@@ -9751,10 +9740,10 @@ msgid ""
 "   /* This is not necessary if the two machines are the same arch, it tells\n"
 "      the remote APT what architecture the target machine is */\n"
 "   Architecture \"i386\";\n"
-"   \n"
+"\n"
 "   Get::Download-Only \"true\";\n"
 " };\n"
-" \n"
+"\n"
 " Dir\n"
 " {\n"
 "   /* Use the disc for state information and redirect the status file from\n"
@@ -9765,20 +9754,20 @@ msgid ""
 "   // Binary caches will be stored locally\n"
 "   Cache::archives \"/disc/archives/\";\n"
 "   Cache \"/tmp/\";\n"
-"   \n"
+"\n"
 "   // Location of the source list.\n"
 "   Etc \"/disc/\";\n"
-" };"
+" };\n"
 msgstr ""
 " APT\n"
 " {\n"
 "   /* Isto não é necessário se as duas máquinas forem da mesma arquitectura, diz\n"
 "      ao APT remoto que arquitectura tem a máquina de destino */\n"
 "   Architecture \"i386\";\n"
-"   \n"
+"\n"
 "   Get::Download-Only \"true\";\n"
 " };\n"
-" \n"
+"\n"
 " Dir\n"
 " {\n"
 "   /* Usa o disco para informação de estado e redirecciona o ficheiro de estado a partir de\n"
@@ -9789,66 +9778,70 @@ msgstr ""
 "   // Caches binárias serão armazenadas localmente\n"
 "   Cache::archives \"/disc/archives/\";\n"
 "   Cache \"/tmp/\";\n"
-"   \n"
+"\n"
 "   // Localização da lista de fontes.\n"
 "   Etc \"/disc/\";\n"
-" };"
+" };\n"
 
-#. type: </example></p>
-#: offline.sgml:129
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:138
 msgid ""
 "More details can be seen by examining the apt.conf man page and the sample "
-"configuration file in <em>/usr/share/doc/apt/examples/apt.conf</em>."
+"configuration file in <emphasis>/usr/share/doc/apt/examples/apt.conf</"
+"emphasis>."
 msgstr ""
 "Mais detalhes podem ser vistos ao examinar o manual do apt.conf e o exemplo "
-"de ficheiro de configuração em <em>/usr/share/doc/apt/examples/apt.conf</em>."
+"de ficheiro de configuração em <emphasis>/usr/share/doc/apt/examples/apt."
+"conf</emphasis>."
 
-#. type: <p><example>
-#: offline.sgml:136
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:143
 msgid ""
-"On the target machine the first thing to do is mount the disc and copy <em>/"
-"var/lib/dpkg/status</em> to it. You will also need to create the directories "
-"outlined in the Overview, <em>archives/partial/</em> and <em>lists/partial/</"
-"em>. Then take the disc to the remote machine and configure the sources."
-"list. On the remote machine execute the following:"
+"On the target machine the first thing to do is mount the disc and copy "
+"<emphasis>/var/lib/dpkg/status</emphasis> to it. You will also need to "
+"create the directories outlined in the Overview, <emphasis>archives/partial/"
+"</emphasis> and <emphasis>lists/partial/</emphasis>. Then take the disc to "
+"the remote machine and configure the sources.list. On the remote machine "
+"execute the following:"
 msgstr ""
 "Na máquina de destino a primeira coisa a fazer é montar o disco e copiar "
-"<em>/var/lib/dpkg/status</em> para ele. Você também precisa de criar os "
-"directórios delineados na Visão Geral, <em>archives/partial/</em> e "
-"<em>lists/partial/</em>. Depois leve o disco até à máquina remota e "
-"configure o sources.list. Na máquina remota execute o seguinte:"
-
-#. type: <example></example>
-#: offline.sgml:142
+"<emphasis>/var/lib/dpkg/status</emphasis> para ele. Você também precisa de "
+"criar os directórios delineados na Visão Geral, <emphasis>archives/partial/</"
+"emphasis> e <emphasis>lists/partial/</emphasis>. Depois leve o disco até à "
+"máquina remota e configure o sources.list. Na máquina remota execute o "
+"seguinte:"
+
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:152
 #, no-wrap
 msgid ""
 " # export APT_CONFIG=\"/disc/apt.conf\"\n"
 " # apt-get update\n"
 " [ APT fetches the package files ]\n"
 " # apt-get dist-upgrade\n"
-" [ APT fetches all the packages needed to upgrade the target machine ]"
+" [ APT fetches all the packages needed to upgrade the target machine ]\n"
 msgstr ""
 " # export APT_CONFIG=\"/disc/apt.conf\"\n"
 " # apt-get update\n"
 " [ APT obtém os ficheiros de pacotes ]\n"
 " # apt-get dist-upgrade\n"
-" [ APT obtém todos os pacotes necessários para actualizar a máquina de destino ]"
+" [ APT obtém todos os pacotes necessários para actualizar a máquina de destino ]\n"
 
-#. type: </example></p>
-#: offline.sgml:149
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:159
 msgid ""
 "The dist-upgrade command can be replaced with any other standard APT "
 "commands, particularly dselect-upgrade. You can even use an APT front end "
-"such as <em>dselect</em>. However this presents a problem in communicating "
-"your selections back to the local computer."
+"such as <emphasis>dselect</emphasis>. However this presents a problem in "
+"communicating your selections back to the local computer."
 msgstr ""
 "O comando dist-upgrade pode ser substituído por qualquer outro comando APT "
 "standard, particularmente dselect-upgrade. Você até pode usar um front-end "
-"do APT como o <em>dselect</em>. No entanto isto apresenta um problema ao "
-"comunicar as suas selecções de volta ao computador local."
+"do APT como o <emphasis>dselect</emphasis>. No entanto isto apresenta um "
+"problema ao comunicar as suas selecções de volta ao computador local."
 
-#. type: <p><example>
-#: offline.sgml:153
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:165
 msgid ""
 "Now the disc contains all of the index files and archives needed to upgrade "
 "the target machine. Take the disc back and run:"
@@ -9856,24 +9849,24 @@ msgstr ""
 "Agora o disco contém todos os ficheiros de índice e os arquivos necessários "
 "para actualizar a máquina de destino. Devolva o disco e corra:"
 
-#. type: <example></example>
-#: offline.sgml:159
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:169
 #, no-wrap
 msgid ""
 "  # export APT_CONFIG=\"/disc/apt.conf\"\n"
 "  # apt-get check\n"
 "  [ APT generates a local copy of the cache files ]\n"
 "  # apt-get --no-d -o dir::state::status=/var/lib/dpkg/status dist-upgrade\n"
-"  [ Or any other APT command ]"
+"  [ Or any other APT command ]\n"
 msgstr ""
 "  # export APT_CONFIG=\"/disc/apt.conf\"\n"
 "  # apt-get check\n"
 "  [ APT gera uma cópia local dos ficheiros de cache ]\n"
 "  # apt-get --no-d -o dir::state::status=/var/lib/dpkg/status dist-upgrade\n"
-"  [ Ou qualquer outro comando APT ]"
+"  [ Ou qualquer outro comando APT ]\n"
 
-#. type: <p></p>
-#: offline.sgml:165
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:176
 msgid ""
 "It is necessary for proper function to re-specify the status file to be the "
 "local one. This is very important!"
@@ -9881,8 +9874,8 @@ msgstr ""
 "Para uma função apropriada é necessário re-especificar que o ficheiro de "
 "estado seja o ficheiro local. Isto é muito importante!"
 
-#. type: <p></p>
-#: offline.sgml:172
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:180
 msgid ""
 "If you are using dselect you can do the very risky operation of copying disc/"
 "status to /var/lib/dpkg/status so that any selections you made on the remote "
@@ -9897,24 +9890,25 @@ msgstr ""
 "possível. NÃO copie o ficheiro de estado se entretanto correu o dpkg ou o "
 "APT!!"
 
-#. type: <heading></heading>
-#: offline.sgml:178
+#. type: Content of: <book><chapter><title>
+#: offline.dbk:190
 msgid "Using APT and wget"
 msgstr "Usando APT e wget"
 
-#. type: <p></p>
-#: offline.sgml:185
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:194
 msgid ""
-"<em>wget</em> is a popular and portable download tool that can run on nearly "
-"any machine. Unlike the method above this requires that the Debian machine "
-"already has a list of available packages."
+"<emphasis>wget</emphasis> is a popular and portable download tool that can "
+"run on nearly any machine. Unlike the method above this requires that the "
+"Debian machine already has a list of available packages."
 msgstr ""
-"<em>wget</em> é uma ferramenta popular e portável de download que pode "
-"correr praticamente em qualquer máquina. Ao contrário do método acima, este "
-"requer que a máquina Debian já tenha uma lista de pacotes disponíveis."
+"<emphasis>wget</emphasis> é uma ferramenta popular e portável de download "
+"que pode correr praticamente em qualquer máquina. Ao contrário do método "
+"acima, este requer que a máquina Debian já tenha uma lista de pacotes "
+"disponíveis."
 
-#. type: <p></p>
-#: offline.sgml:190
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:199
 msgid ""
 "The basic idea is to create a disc that has only the archive files "
 "downloaded from the remote site. This is done by using the --print-uris "
@@ -9925,13 +9919,13 @@ msgstr ""
 "descarregados do site remoto. Isto é feito ao usar a opção --print-uris no "
 "apt-get e depois preparar um script wget para realmente ir buscar os pacotes."
 
-#. type: <heading></heading>
-#: offline.sgml:196
+#. type: Content of: <book><chapter><section><title>
+#: offline.dbk:205
 msgid "Operation"
 msgstr "Operação"
 
-#. type: <p><example>
-#: offline.sgml:200
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:207
 msgid ""
 "Unlike the previous technique no special configuration files are required. "
 "We merely use the standard APT commands to generate the file list."
@@ -9940,22 +9934,22 @@ msgstr ""
 "configuração especiais. Nós usamos meramente os comandos standard do APT "
 "para gerar a lista de ficheiros."
 
-#. type: <example></example>
-#: offline.sgml:205
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:211
 #, no-wrap
 msgid ""
-" # apt-get dist-upgrade \n"
+" # apt-get dist-upgrade\n"
 " [ Press no when prompted, make sure you are happy with the actions ]\n"
-" # apt-get -qq --print-uris dist-upgrade > uris\n"
-" # awk '{print \"wget -O \" $2 \" \" $1}' < uris > /disc/wget-script"
+" # apt-get -qq --print-uris dist-upgrade &gt; uris\n"
+" # awk '{print \"wget -O \" $2 \" \" $1}' &lt; uris &gt; /disc/wget-script\n"
 msgstr ""
 " # apt-get dist-upgrade \n"
 " [ Escolha não quando perguntado, certifique-se que está contente com as acções ]\n"
-" # apt-get -qq --print-uris dist-upgrade > uris\n"
-" # awk '{print \"wget -O \" $2 \" \" $1}' < uris > /disc/wget-script"
+" # apt-get -qq --print-uris dist-upgrade &gt; uris\n"
+" # awk '{print \"wget -O \" $2 \" \" $1}' &lt; uris &gt; /disc/wget-script\n"
 
-#. type: </example></p>
-#: offline.sgml:210
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:217
 msgid ""
 "Any command other than dist-upgrade could be used here, including dselect-"
 "upgrade."
@@ -9963,8 +9957,8 @@ msgstr ""
 "Qualquer comando além do dist-upgrade pode ser usado aqui, incluindo dselect-"
 "upgrade."
 
-#. type: <p></p>
-#: offline.sgml:216
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:221
 msgid ""
 "The /disc/wget-script file will now contain a list of wget commands to "
 "execute in order to fetch the necessary archives. This script should be run "
@@ -9976,25 +9970,25 @@ msgstr ""
 "corrido com o directório actual sendo o ponto de montagem do disco para que "
 "grave os resultados no disco."
 
-#. type: <p><example>
-#: offline.sgml:219
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:227
 msgid "The remote machine would do something like"
 msgstr "A máquina remota deverá fazer algo como"
 
-#. type: <example></example>
-#: offline.sgml:223
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:230
 #, no-wrap
 msgid ""
 "  # cd /disc\n"
 "  # sh -x ./wget-script\n"
-"  [ wait.. ]"
+"  [ wait.. ]\n"
 msgstr ""
 "  # cd /disc\n"
 "  # sh -x ./wget-script\n"
-"  [ wait.. ]"
+"  [ wait.. ]\n"
 
-#. type: </example><example>
-#: offline.sgml:228
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:235
 msgid ""
 "Once the archives are downloaded and the disc returned to the Debian machine "
 "installation can proceed using,"
@@ -10002,435 +9996,13 @@ msgstr ""
 "Após os arquivos serem descarregados e o disco retornado à máquina Debian, a "
 "instalação pode prosseguir usando,"
 
-#. type: <example></example>
-#: offline.sgml:230
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:239
 #, no-wrap
-msgid "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade"
-msgstr "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade"
+msgid "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade\n"
+msgstr "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade\n"
 
-#. type: </example></p>
-#: offline.sgml:234
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:242
 msgid "Which will use the already fetched archives on the disc."
 msgstr "O qual irá usar os arquivos já obtidos e que estão no disco."
-
-#~ msgid "apt"
-#~ msgstr "apt"
-
-#~ msgid "16 June 1998"
-#~ msgstr "16 Junho 1998"
-
-#~ msgid "Debian"
-#~ msgstr "Debian"
-
-#~ msgid "NAME"
-#~ msgstr "NOME"
-
-#~ msgid "apt - Advanced Package Tool"
-#~ msgstr "apt - Ferramenta de Pacotes Avançada"
-
-#~ msgid "SYNOPSIS"
-#~ msgstr "SINOPSE"
-
-#~ msgid "B<apt>"
-#~ msgstr "B<apt>"
-
-#~ msgid "DESCRIPTION"
-#~ msgstr "DESCRIÇÃO"
-
-#, fuzzy
-#~| msgid ""
-#~| "APT is a management system for software packages. For normal day to day "
-#~| "package management there are several frontends available, such as "
-#~| "B<aptitude>(8)  for the command line or B<synaptic>(8)  for the X Window "
-#~| "System. Some options are only implemented in B<apt-get>(8)  though."
-#~ msgid ""
-#~ "For normal day to day package management there are several frontends "
-#~ "available, such as B<aptitude>(8)  for the command line or "
-#~ "B<synaptic>(8)  for the X Window System. Some options are only "
-#~ "implemented in B<apt-get>(8)  though."
-#~ msgstr ""
-#~ "APT é um sistema de gestão para pacotes de software. Para a gestão de "
-#~ "pacotes normal do dia-a-dia existem vários frontends disponíveis, como o "
-#~ "B<aptitude>(8) para a linha de comandos ou o B<synaptic>(8) para o X "
-#~ "Window System. No entanto, algumas das opções estão apenas implementadas "
-#~ "no B<apt-get>(8)."
-
-#~ msgid "SEE ALSO"
-#~ msgstr "VEJA TAMBÉM"
-
-#, fuzzy
-#~| msgid ""
-#~| "B<apt-cache>(8), B<apt-get>(8), B<apt.conf>(5), B<sources.list>(5), "
-#~| "B<apt_preferences>(5), B<apt-secure>(8)"
-#~ msgid ""
-#~ "B<apt>(8), B<apt-cache>(8), B<apt-get>(8), B<apt.conf>(5), B<sources."
-#~ "list>(5), B<apt_preferences>(5), B<apt-secure>(8)"
-#~ msgstr ""
-#~ "B<apt-cache>(8), B<apt-get>(8), B<apt.conf>(5), B<sources.list>(5), "
-#~ "B<apt_preferences>(5), B<apt-secure>(8)"
-
-#~ msgid "DIAGNOSTICS"
-#~ msgstr "DIAGNÓSTICOS"
-
-#~ msgid "apt returns zero on normal operation, decimal 100 on error."
-#~ msgstr "o apt devolve zero na operação normal, 100 decimal em erro."
-
-#~ msgid "BUGS"
-#~ msgstr "BUGS"
-
-#~ msgid "This manpage isn't even started."
-#~ msgstr "Este manual ainda nem começou."
-
-#~ msgid ""
-#~ "See E<lt>http://bugs.debian.org/aptE<gt>.  If you wish to report a bug in "
-#~ "B<apt>, please see I</usr/share/doc/debian/bug-reporting.txt> or the "
-#~ "B<reportbug>(1)  command."
-#~ msgstr ""
-#~ "Veja E<lt>http://bugs.debian.org/aptE<gt>.  Se deseja reportar um bug em "
-#~ "B<apt>, por favor veja I</usr/share/doc/debian/bug-reporting.txt> ou o "
-#~ "comando B<reportbug>(1) ."
-
-#~ msgid "AUTHOR"
-#~ msgstr "AUTOR"
-
-#~ msgid "apt was written by the APT team E<lt>apt@packages.debian.orgE<gt>."
-#~ msgstr "apt foi escrito pelo APT team E<lt>apt@packages.debian.orgE<gt>."
-
-#~ msgid "Package resource list for APT"
-#~ msgstr "Lista de recursos de pacote para APT"
-
-#~ 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 "
-#~ "Pre-Depends. Default is true and therefore the \"old\" method of ordering "
-#~ "in various steps by everything. While both method were present in earlier "
-#~ "APT versions the <literal>OrderCritical</literal> method was unused, so "
-#~ "this method is very experimental and needs further improvements before "
-#~ "becoming really useful."
-#~ msgstr ""
-#~ "Como a configuração pode ser diferida a ser feita no final pelo &dpkg;, "
-#~ "pode ser tentada a ordenar a série de desempacotamento apenas por "
-#~ "necessidades críticas, ex. por pré-dependências. A predefinição é "
-#~ "verdadeiro e então o método \"antigo\" de ordenar em vários passos por "
-#~ "tudo. Enquanto ambos os métodos estão presentes em versões jovens do APT, "
-#~ "o método <literal>OrderCritical</literal> não foi usado, portanto este "
-#~ "método é muito experimental e necessita de mais melhorias antes de se "
-#~ "tornar realmente útil."
-
-#~ msgid "Dump the default configuration to standard error on startup."
-#~ msgstr ""
-#~ "Despeja a configuração predefinida para o erro standard no arranque."
-
-#~ msgid ""
-#~ "Defaults to on which will cause APT to install essential and important "
-#~ "packages as fast as possible in the install/upgrade operation. This is "
-#~ "done to limit the effect of a failing &dpkg; call: If this option is "
-#~ "disabled APT does treat an important package in the same way as an extra "
-#~ "package: Between the unpacking of the important package A and his "
-#~ "configuration can then be many other unpack or configuration calls, e.g. "
-#~ "for package B which has no relation to A, but causes the dpkg call to "
-#~ "fail (e.g. because maintainer script of package B generates an error) "
-#~ "which results in a system state in which package A is unpacked but "
-#~ "unconfigured - each package depending on A is now no longer guaranteed to "
-#~ "work as their dependency on A is not longer satisfied. The immediate "
-#~ "configuration marker is also applied to all dependencies which can "
-#~ "generate a problem if the dependencies e.g. form a circle as a dependency "
-#~ "with the immediate flag is comparable with a Pre-Dependency. So in theory "
-#~ "it is possible that APT encounters a situation in which it is unable to "
-#~ "perform immediate configuration, errors out and refers to this option so "
-#~ "the user can deactivate the immediate configuration temporarily to be "
-#~ "able to perform an install/upgrade again. Note the use of the word "
-#~ "\"theory\" here as this problem was only encountered by now in real world "
-#~ "a few times in non-stable distribution versions and was caused by wrong "
-#~ "dependencies of the package in question or by a system in an already "
-#~ "broken state, so you should not blindly disable this option as the "
-#~ "mentioned scenario above is not the only problem immediate configuration "
-#~ "can help to prevent in the first place.  Before a big operation like "
-#~ "<literal>dist-upgrade</literal> is run with this option disabled it "
-#~ "should be tried to explicitly <literal>install</literal> the package APT "
-#~ "is unable to configure immediately, but please make sure to report your "
-#~ "problem also to your distribution and to the APT team with the buglink "
-#~ "below so they can work on improving or correcting the upgrade process."
-#~ msgstr ""
-#~ "A predefinição é ligado o que irá fazer com que o APT instale pacotes "
-#~ "essenciais e importantes o mais rápido possível na operação de instalar/"
-#~ "actualizar. Isto é feito para limitar o efeito de uma chamada falhada do "
-#~ "&dpkg;. Se esta opção for desactivada, o APT trata um pacote importante "
-#~ "do mesmo modo que um pacote extra: Entre o desempacotamento do pacote "
-#~ "importante A e a sua configuração podem acontecer muitas outras chamadas "
-#~ "de desempacotamento e configuração, exemplo, para o pacote B que não tem "
-#~ "nenhuma relação com A, mas causa uma falha na chamada ao dpkg (ex, porque "
-#~ "o script do responsável do pacote B gera um erro) o qual resulta num "
-#~ "estado do sistema em que o pacote A está desempacotado mas ainda não "
-#~ "configurado - já não se garante o funcionamento de cada pacote que "
-#~ "depende de A porque a sua dependência já não está satisfeita. O marcador "
-#~ "de configuração imediata é também aplicado a todas as dependências que "
-#~ "possam gerar um problema se as dependências, ex, formam um círculo como "
-#~ "uma dependência com a marca de imediato a ser comparável com uma Pré-"
-#~ "Dependência. Portanto, em teoria, é possível que o APT encontre uma "
-#~ "situação na qual é incapaz de executar configuração imediata, entre em "
-#~ "erro e refira esta opção para que o utilizador possa desactivar "
-#~ "temporariamente a configuração imediata para ser capaz de executar uma "
-#~ "instalação/actualização outra vez. Note o uso da palavra \"teoria\" aqui "
-#~ "pois este problema foi poucas vezes encontrado até agora no mundo real em "
-#~ "versões de distribuição não-estáveis e causados por dependências erradas "
-#~ "do pacote em questão ou por um sistema já num estado corrompido, portanto "
-#~ "você não deve desactivar esta opção às cegas porque, em primeiro lugar, o "
-#~ "cenário mencionado acima não é o único problema que a configuração "
-#~ "imediata pode ajudar a prevenir. Antes de uma grande operação como "
-#~ "<literal>dist-upgrade</literal> ser corrida com esta opção desactivada, "
-#~ "deve ser tentado primeiro fazer um <literal>install</literal> explicito "
-#~ "ao pacote que o APT é incapaz de configurar imediatamente, mas por favor "
-#~ "certifique-se de também relatar o seu problema à sua distribuição e à "
-#~ "equipa do APT com o link de bug abaixo para que possam trabalhar na "
-#~ "melhoria ou correcção do processo de actualização."
-
-#~ msgid ""
-#~ "The package resource list is used to locate archives of the package "
-#~ "distribution system in use on the system. At this time, this manual page "
-#~ "documents only the packaging system used by the Debian system.  This "
-#~ "control file is <filename>/etc/apt/sources.list</filename>."
-#~ msgstr ""
-#~ "A lista de recursos de pacote é usada para localizar arquivos do sistema "
-#~ "de distribuição de pacotes usado no sistema. Neste momento, este manual "
-#~ "documenta apenas o sistema de pacotes usado pelo sistema Debian. Este "
-#~ "ficheiro de controle é <filename>/etc/apt/sources.list</filename>."
-
-#~ msgid ""
-#~ "The source list is designed to support any number of active sources and a "
-#~ "variety of source media. The file lists one source per line, with the "
-#~ "most preferred source listed first. The format of each line is: "
-#~ "<literal>type uri args</literal> The first item, <literal>type</literal> "
-#~ "determines the format for <literal>args</literal>. <literal>uri</literal> "
-#~ "is a Universal Resource Identifier (URI), which is a superset of the more "
-#~ "specific and well-known Universal Resource Locator, or URL. The rest of "
-#~ "the line can be marked as a comment by using a #."
-#~ msgstr ""
-#~ "A lista de fontes é desenhada para suportar qualquer número de fontes "
-#~ "activas e uma variedade de médias fonte. O ficheiro lista uma fonte por "
-#~ "linha, com a fonte mais preferida listada em primeiro lugar. O formato "
-#~ "para cada linha é: <literal>tipo uri argumentos</literal>. O primeiro "
-#~ "item, <literal>tipo</literal> determina o formato para "
-#~ "<literal>argumentos</literal>. <literal>uri</literal> é um Universal "
-#~ "Resource Identifier (URI), o que é um super-conjunto para o mais "
-#~ "específico e conhecido Universal Resource Locator, ou URL. O resto da "
-#~ "linha pode ser marcado como um comentário usando um #."
-
-#~ 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 &sources-list; and from <filename>/var/lib/dpkg/status</"
-#~ "filename>."
-#~ msgstr ""
-#~ "<literal>gencaches</literal> executa a mesma operação que o <command>apt-"
-#~ "get check</command>. Constrói as caches de fonte e pacote a partir das "
-#~ "fontes em &sources-list; e a partir de <filename>/var/lib/dpkg/status</"
-#~ "filename>."
-
-#~ 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).  "
-#~ "<literal>Acquire::http::Pipeline-Depth</literal> can be a value from 0 to "
-#~ "5 indicating how many outstanding requests APT should send. A value of "
-#~ "zero MUST be specified if the remote host does not properly linger on TCP "
-#~ "connections - otherwise data corruption will occur. Hosts which require "
-#~ "this are in violation of RFC 2068."
-#~ msgstr ""
-#~ "É disponibilizada uma definição para controlar a profundidade do pipeline "
-#~ "em casos onde o servidor remoto não é compatível com RFC ou é buggy (como "
-#~ "o Squid 2.0.2). <literal>Acquire::http::Pipeline-Depth</literal> pode ser "
-#~ "um valor de 0 a 5 que indica quantos requerimentos pendentes o APT deve "
-#~ "enviar. TEM de ser especificado um valor de 0 se a máquina remota não "
-#~ "hesitar propriamente em ligações TCP - de outro modo irá ocorrer "
-#~ "corrupção de dados. As máquinas que requerem isto estão em violação de "
-#~ "RFC 2068."
-
-#~ msgid "add <replaceable>filename</replaceable>"
-#~ msgstr "add <replaceable>nome-de-ficheiro</replaceable>"
-
-#~ msgid "del <replaceable>keyid</replaceable>"
-#~ msgstr "del <replaceable>id de chave</replaceable>"
-
-#~ msgid "export <replaceable>keyid</replaceable>"
-#~ msgstr "export <replaceable>id de chave</replaceable>"
-
-#~ 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 ""
-#~ "Actualiza o chaveiro local com o chaveiro das chaves de arquivos Debian e "
-#~ "remove do chaveiro as chaves de arquivo que já não são válidas."
-
-#~ msgid "--keyring <replaceable>filename</replaceable>"
-#~ msgstr "--keyring <replaceable>nome-de-ficheiro</replaceable>"
-
-#, fuzzy
-#~| 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."
-#~ 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 ""
-#~ "Segundos em que o ficheiro Release deve considerado válido após ser "
-#~ "criado. A predefinição é \"para sempre\" (0) se o ficheiro Release do "
-#~ "arquivo não conter um cabeçalho <literal>Valid-Until</literal>. Se o "
-#~ "tiver então esta data é a predefinida. A data do ficheiro Release ou a "
-#~ "data especificada pela hora de criação do do ficheiro Release (cabeçalho "
-#~ "<literal>Date</literal>) mais os segundos especificados com esta opção "
-#~ "são usados para verificar se a validação de um ficheiro já expirou ao "
-#~ "usar uma data anterior às duas. Definições específicas do Arquivo podem "
-#~ "ser feitas ao adicionar a etiqueta do arquivo ao nome da opção. "
-
-#~ msgid ""
-#~ "Generate MD5 sums. This defaults to on, when turned off the generated "
-#~ "index files will not have MD5Sum fields where possible.  Configuration "
-#~ "Item: <literal>APT::FTPArchive::MD5</literal>"
-#~ msgstr ""
-#~ "Gera sumários MD5. A predefinição é ligado, quando desligado os ficheiros "
-#~ "índice gerados não terão campos MD5Sum onde possíveis. Item de "
-#~ "Configuração: <literal>APT::FTPArchive::MD5</literal>"
-
-#~ msgid "Show a short usage summary."
-#~ msgstr "Mostra um curto sumário de utilização."
-
-#~ msgid "Show the program version."
-#~ msgstr "Mostra a versão do programa."
-
-#~ msgid "to the version that is already installed (if any)."
-#~ msgstr "para a versão que já está instalada (se alguma)."
-
-#~ msgid "APT package handling utility -- cache manipulator"
-#~ msgstr ""
-#~ "Utilitário de manuseamento de pacotes do APT -- manipulador de cache"
-
-#~ msgid "add <replaceable>file(s)</replaceable>"
-#~ msgstr "add <replaceable>ficheiro(s)</replaceable>"
-
-#~ msgid ""
-#~ "<literal>add</literal> adds the named package index files to the package "
-#~ "cache.  This is for debugging only."
-#~ msgstr ""
-#~ "<literal>add</literal> adiciona ficheiros índice do pacote nomeado à "
-#~ "cache pacotes. Isto é apenas para depuração."
-
-#~ msgid ""
-#~ "The <literal>release</literal> command generates a Release file from a "
-#~ "directory tree. It recursively searches the given directory for Packages, "
-#~ "Packages.gz, Packages.bz2, Sources, Sources.gz, Sources.bz2, Release and "
-#~ "md5sum.txt files.  It then writes to stdout a Release file containing an "
-#~ "MD5 digest and SHA1 digest for each file."
-#~ msgstr ""
-#~ "O comando <literal>release</literal> gera um ficheiro Release a partir "
-#~ "duma árvore de directórios. Procura recursivamente o directório dado por "
-#~ "ficheiros Packages, Packages.gz, Packages.bz2, Sources, Sources.gz, "
-#~ "Sources.bz2, Release e md5sum.txt. Depois escreve para o stdout um "
-#~ "ficheiro Release contendo um sumário MD5 e um sumário SHA1 por cada "
-#~ "ficheiro."
-
-#~ msgid "Also install recommended packages."
-#~ msgstr "Também instala pacotes recomendados."
-
-#~ msgid "Do not install recommended packages."
-#~ msgstr "Não instala pacotes recomendados."
-
-#~ msgid ""
-#~ "While it is possible to add an empty compression type to the order list, "
-#~ "but APT in its current version doesn't understand it correctly and will "
-#~ "display many warnings about not downloaded files - these warnings are "
-#~ "most of the time false negatives. Future versions will maybe include a "
-#~ "way to really prefer uncompressed files to support the usage of local "
-#~ "mirrors."
-#~ msgstr ""
-#~ "Apesar de ser possível de adicionar um tipo de compressão vazio à lista "
-#~ "de ordem, o APT na sua versão actual não o compreende correctamente e irá "
-#~ "mostrar muitos avisos acerca de ficheiros não descarregados - estes "
-#~ "avisos são na maioria vezes falsos positivos. Futuras versões irão talvez "
-#~ "incluir um modo de realmente preferir ficheiros não-comprimidos para "
-#~ "suportar a utilização de mirrors locais."
-
-#~ msgid ""
-#~ "Uses HTTP to access the archive at nonus.debian.org, under the debian-non-"
-#~ "US directory."
-#~ msgstr ""
-#~ "Usa HTTP para aceder ao arquivo em nonus.debian.org, sob o directório "
-#~ "debian-non-US."
-
-#~ msgid "OPTIONS"
-#~ msgstr "OPÇÕES"
-
-#~ msgid "None."
-#~ msgstr "Nenhum."
-
-#~ msgid "FILES"
-#~ msgstr "FICHEIROS"
-
-#~ msgid ""
-#~ "Status list of auto-installed packages.  Configuration Item: "
-#~ "<literal>Dir::State</literal> sets the path to the "
-#~ "<filename>extended_states</filename> file."
-#~ msgstr ""
-#~ "Lista de estado de pacotes auto-instalados. Item de Configuração: "
-#~ "<literal>Dir::State</literal> que define o caminho para o ficheiro "
-#~ "<filename>extended_states</filename>."
-
-#~ msgid ""
-#~ "APT uses a fixed size memory mapped cache file to store the 'available' "
-#~ "information. This sets the size of that cache (in bytes)."
-#~ msgstr ""
-#~ "O APT usa um ficheiro de cache de memória mapeada de tamanho fixo para "
-#~ "armazenar a informação 'disponível'. Isto define o tamanho dessa cache "
-#~ "(em bytes)."
-
-#~ 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 ""
-#~ "A linha <literal>Pin-Priority:</literal> em cada registo de preferências "
-#~ "do APT é opcional. Se omitida, o APT atribui uma prioridade de 1 a menos "
-#~ "do último valor especificado numa linha que começa com <literal>Pin-"
-#~ "Priority: release ...</literal>."
-
-#~ msgid "Keyring of local trusted keys, new keys will be added here."
-#~ msgstr ""
-#~ "Chaveiro das chaves de confiança locais, as novas chaves serão "
-#~ "adicionadas aqui."
-
-#~ msgid ""
-#~ "<filename>apt.conf</filename> is the main configuration file for the APT "
-#~ "suite of tools, all tools make use of the configuration file and a common "
-#~ "command line parser to provide a uniform environment. When an APT tool "
-#~ "starts up it will read the configuration specified by the "
-#~ "<envar>APT_CONFIG</envar> environment variable (if any) and then read the "
-#~ "files in <literal>Dir::Etc::Parts</literal> then read the main "
-#~ "configuration file specified by <literal>Dir::Etc::main</literal> then "
-#~ "finally apply the command line options to override the configuration "
-#~ "directives, possibly loading even more config files."
-#~ msgstr ""
-#~ "<filename>apt.conf</filename> é o ficheiro de configuração principal para "
-#~ "a suite de ferramentas do APT, todas as ferramentas usam o ficheiro de "
-#~ "configuração e um analisador de linha de comandos comum para "
-#~ "disponibilizar um ambiente uniforme. Quando uma ferramenta do APT arranca "
-#~ "lê a configuração especificada pela variável de ambiente "
-#~ "<envar>APT_CONFIG</envar> (se existir alguma) e depois lê os ficheiros em "
-#~ "<literal>Dir::Etc::Parts</literal>, depois lê o ficheiro de configuração "
-#~ "principal especificado por <literal>Dir::Etc::main</literal> e finalmente "
-#~ "aplica as opções de linha de comandos para sobrepor as directivas de "
-#~ "configuração, possivelmente carregando ainda mais ficheiros de "
-#~ "configuração."
diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po
index 3813a7ed8..d28c1e633 100644
--- a/doc/po/pt_BR.po
+++ b/doc/po/pt_BR.po
@@ -5,16 +5,15 @@
 # Translators:
 # André Luís Lopes <andrelop@ig.com.br>
 #
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-11 14:52+0200\n"
+"POT-Creation-Date: 2014-08-28 00:20+0000\n"
 "PO-Revision-Date: 2004-09-20 17:02+0000\n"
 "Last-Translator: André Luís Lopes <andrelop@debian.org>\n"
 "Language-Team: <debian-l10n-portuguese@lists.debian.org>\n"
-"Language: \n"
+"Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -480,38 +479,38 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refmeta><manvolnum>
-#: apt.8.xml:25 apt-get.8.xml:28 apt-cache.8.xml:28 apt-key.8.xml:27
-#: apt-mark.8.xml:28 apt-secure.8.xml:27 apt-cdrom.8.xml:27
-#: apt-config.8.xml:28
+#: apt.8.xml:21 apt-get.8.xml:22 apt-cache.8.xml:22 apt-key.8.xml:21
+#: apt-mark.8.xml:22 apt-secure.8.xml:21 apt-cdrom.8.xml:21
+#: apt-config.8.xml:22
 msgid "8"
 msgstr ""
 
 #. type: Content of: <refentry><refmeta><refmiscinfo>
-#: apt.8.xml:26 apt-get.8.xml:29 apt-cache.8.xml:29 apt-key.8.xml:28
-#: apt-mark.8.xml:29 apt-secure.8.xml:28 apt-cdrom.8.xml:28
-#: apt-config.8.xml:29 apt.conf.5.xml:34 apt_preferences.5.xml:28
-#: sources.list.5.xml:29 apt-extracttemplates.1.xml:29 apt-sortpkgs.1.xml:29
-#: apt-ftparchive.1.xml:29
+#: apt.8.xml:22 apt-get.8.xml:23 apt-cache.8.xml:23 apt-key.8.xml:22
+#: apt-mark.8.xml:23 apt-secure.8.xml:22 apt-cdrom.8.xml:22
+#: apt-config.8.xml:23 apt.conf.5.xml:28 apt_preferences.5.xml:22
+#: sources.list.5.xml:23 apt-extracttemplates.1.xml:23 apt-sortpkgs.1.xml:23
+#: apt-ftparchive.1.xml:23
 msgid "APT"
 msgstr ""
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt.8.xml:32
+#: apt.8.xml:28
 msgid "command-line interface"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:37 apt-get.8.xml:40 apt-cache.8.xml:40 apt-key.8.xml:39
-#: apt-mark.8.xml:40 apt-secure.8.xml:52 apt-cdrom.8.xml:39
-#: apt-config.8.xml:40 apt.conf.5.xml:43 apt_preferences.5.xml:38
-#: sources.list.5.xml:38 apt-extracttemplates.1.xml:40 apt-sortpkgs.1.xml:40
-#: apt-ftparchive.1.xml:40
+#: apt.8.xml:33 apt-get.8.xml:34 apt-cache.8.xml:34 apt-key.8.xml:33
+#: apt-mark.8.xml:34 apt-secure.8.xml:46 apt-cdrom.8.xml:33
+#: apt-config.8.xml:34 apt.conf.5.xml:37 apt_preferences.5.xml:32
+#: sources.list.5.xml:32 apt-extracttemplates.1.xml:34 apt-sortpkgs.1.xml:34
+#: apt-ftparchive.1.xml:34
 #, fuzzy
 msgid "Description"
 msgstr "Descrição"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:38
+#: apt.8.xml:34
 msgid ""
 "<command>apt</command> (Advanced Package Tool) is the command-line tool for "
 "handling packages. It provides a commandline interface for the package "
@@ -520,7 +519,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:47
+#: apt.8.xml:43
 msgid ""
 "<literal>list</literal> is used to display a list of packages. It supports "
 "shell pattern for matching package names and the following options: "
@@ -529,28 +528,28 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:58
+#: apt.8.xml:54
 msgid ""
 "<literal>search</literal> searches for the given term(s) and display "
 "matching packages."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:64
+#: apt.8.xml:60
 msgid ""
 "<literal>show</literal> shows the package information for the given "
 "package(s)."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:71
+#: apt.8.xml:67
 msgid ""
 "<literal>install</literal> is followed by one or more package names desired "
 "for installation or upgrading."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:75 apt-get.8.xml:118
+#: apt.8.xml:71 apt-get.8.xml:112
 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 "
@@ -561,7 +560,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:85 apt-get.8.xml:153
+#: apt.8.xml:81 apt-get.8.xml:147
 msgid ""
 "<literal>remove</literal> is identical to <literal>install</literal> except "
 "that packages are removed instead of installed. Note that removing a package "
@@ -571,30 +570,30 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:93
+#: apt.8.xml:89
 msgid ""
 "<literal>edit-sources</literal> lets you edit your sources.list file and "
 "provides basic sanity checks."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:99
+#: apt.8.xml:95
 msgid ""
 "<literal>update</literal> is used to resynchronize the package index files "
 "from their sources."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:105
+#: apt.8.xml:101
 msgid ""
 "<literal>upgrade</literal> is used to install the newest versions of all "
 "packages currently installed on the system from the sources enumerated in "
-"<filename>/etc/apt/sources.list</filename>. New package will be installed, "
-"but existing package will never removed."
+"<filename>/etc/apt/sources.list</filename>. New packages will be installed, "
+"but existing packages will never be removed."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:114
+#: apt.8.xml:110
 msgid ""
 "<literal>full-upgrade</literal> performs the function of upgrade but may "
 "also remove installed packages if that is required in order to resolve a "
@@ -602,19 +601,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:124 apt-get.8.xml:257 apt-cache.8.xml:250 apt-mark.8.xml:110
-#: apt-config.8.xml:86 apt-extracttemplates.1.xml:54 apt-sortpkgs.1.xml:50
-#: apt-ftparchive.1.xml:506
+#: apt.8.xml:120 apt-get.8.xml:251 apt-cache.8.xml:244 apt-mark.8.xml:104
+#: apt-config.8.xml:80 apt-extracttemplates.1.xml:48 apt-sortpkgs.1.xml:44
+#: apt-ftparchive.1.xml:500
 msgid "options"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:134
+#: apt.8.xml:130
 msgid "Script usage"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:136
+#: apt.8.xml:132
 msgid ""
 "The &apt; commandline is designed as a end-user tool and it may change the "
 "output between versions. While it tries to not break backward compatibility "
@@ -624,12 +623,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:144
+#: apt.8.xml:140
 msgid "Differences to &apt-get;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:145
+#: apt.8.xml:141
 msgid ""
 "The <command>apt</command> command is meant to be pleasant for end users and "
 "does not need to be backward compatible like &apt-get;. Therefore some "
@@ -637,26 +636,26 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml:151
+#: apt.8.xml:147
 #, fuzzy
 msgid "The option <literal>DPkg::Progress-Fancy</literal> is enabled."
 msgstr "a linha <literal>Package:</literal>"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml:155
+#: apt.8.xml:151
 #, fuzzy
 msgid "The option <literal>APT::Color</literal> is enabled."
 msgstr "a linha <literal>Component:</literal>"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml:159
+#: apt.8.xml:155
 msgid ""
 "A new <literal>list</literal> command is available similar to <literal>dpkg "
 "--list</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml:164
+#: apt.8.xml:160
 #, fuzzy
 msgid ""
 "The option <literal>upgrade</literal> has <literal>--with-new-pkgs</literal> "
@@ -664,43 +663,43 @@ msgid ""
 msgstr "a linha <literal>Archive:</literal>"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:174 apt-get.8.xml:558 apt-cache.8.xml:352 apt-key.8.xml:197
-#: apt-mark.8.xml:133 apt-secure.8.xml:193 apt-cdrom.8.xml:154
-#: apt-config.8.xml:111 apt.conf.5.xml:1227 apt_preferences.5.xml:707
-#: sources.list.5.xml:280 apt-extracttemplates.1.xml:72 apt-sortpkgs.1.xml:65
-#: apt-ftparchive.1.xml:609
+#: apt.8.xml:170 apt-get.8.xml:552 apt-cache.8.xml:346 apt-key.8.xml:191
+#: apt-mark.8.xml:127 apt-secure.8.xml:187 apt-cdrom.8.xml:148
+#: apt-config.8.xml:105 apt.conf.5.xml:1222 apt_preferences.5.xml:701
+#: sources.list.5.xml:274 apt-extracttemplates.1.xml:66 apt-sortpkgs.1.xml:59
+#: apt-ftparchive.1.xml:603
 #, fuzzy
 msgid "See Also"
 msgstr "Consulte também"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:175
+#: apt.8.xml:171
 msgid ""
 "&apt-get;, &apt-cache;, &sources-list;, &apt-conf;, &apt-config;, The APT "
 "User's guide in &guidesdir;, &apt-preferences;, the APT Howto."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:180 apt-get.8.xml:564 apt-cache.8.xml:357 apt-mark.8.xml:137
-#: apt-cdrom.8.xml:159 apt-config.8.xml:116 apt-extracttemplates.1.xml:76
-#: apt-sortpkgs.1.xml:69 apt-ftparchive.1.xml:613
+#: apt.8.xml:176 apt-get.8.xml:558 apt-cache.8.xml:351 apt-mark.8.xml:131
+#: apt-cdrom.8.xml:153 apt-config.8.xml:110 apt-extracttemplates.1.xml:70
+#: apt-sortpkgs.1.xml:63 apt-ftparchive.1.xml:607
 msgid "Diagnostics"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:181
+#: apt.8.xml:177
 msgid ""
 "<command>apt</command> returns zero on normal operation, decimal 100 on "
 "error."
 msgstr ""
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-get.8.xml:35
+#: apt-get.8.xml:29
 msgid "APT package handling utility -- command-line interface"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:41
+#: apt-get.8.xml:35
 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 "
@@ -709,15 +708,15 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:46 apt-cache.8.xml:46 apt-cdrom.8.xml:53 apt-config.8.xml:46
-#: apt-ftparchive.1.xml:56
+#: apt-get.8.xml:40 apt-cache.8.xml:40 apt-cdrom.8.xml:47 apt-config.8.xml:40
+#: apt-ftparchive.1.xml:50
 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><listitem><para>
-#: apt-get.8.xml:51
+#: apt-get.8.xml:45
 msgid ""
 "<literal>update</literal> is used to resynchronize the package index files "
 "from their sources. The indexes of available packages are fetched from the "
@@ -731,7 +730,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:63
+#: apt-get.8.xml:57
 msgid ""
 "<literal>upgrade</literal> is used to install the newest versions of all "
 "packages currently installed on the system from the sources enumerated in "
@@ -746,7 +745,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:76
+#: apt-get.8.xml:70
 msgid ""
 "<literal>dist-upgrade</literal> in addition to performing the function of "
 "<literal>upgrade</literal>, also intelligently handles changing dependencies "
@@ -761,7 +760,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:89
+#: apt-get.8.xml:83
 msgid ""
 "<literal>dselect-upgrade</literal> is used in conjunction with the "
 "traditional Debian packaging front-end, &dselect;. <literal>dselect-upgrade</"
@@ -772,7 +771,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:100
+#: apt-get.8.xml:94
 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 "
@@ -789,14 +788,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:125
+#: apt-get.8.xml:119
 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:128
+#: apt-get.8.xml:122
 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 system. "
@@ -808,14 +807,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:139
+#: apt-get.8.xml:133
 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:143
+#: apt-get.8.xml:137
 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 "
@@ -827,7 +826,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:161
+#: apt-get.8.xml:155
 msgid ""
 "<literal>purge</literal> is identical to <literal>remove</literal> except "
 "that packages are removed and purged (any configuration files are deleted "
@@ -835,7 +834,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:166
+#: apt-get.8.xml:160
 msgid ""
 "<literal>source</literal> causes <command>apt-get</command> to fetch source "
 "packages. APT will examine the available packages to decide which source "
@@ -847,7 +846,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:174
+#: apt-get.8.xml:168
 msgid ""
 "Source packages are tracked separately from binary packages via <literal>deb-"
 "src</literal> lines in the &sources-list; file. This means that you will "
@@ -857,7 +856,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:180
+#: apt-get.8.xml:174
 msgid ""
 "If the <option>--compile</option> option is specified then the package will "
 "be compiled to a binary .deb using <command>dpkg-buildpackage</command> for "
@@ -867,7 +866,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:187
+#: apt-get.8.xml:181
 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 "
@@ -877,7 +876,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:193
+#: apt-get.8.xml:187
 msgid ""
 "Note that source packages are not installed and tracked in the "
 "<command>dpkg</command> database like binary packages; they are simply "
@@ -885,7 +884,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:199
+#: apt-get.8.xml:193
 msgid ""
 "<literal>build-dep</literal> causes apt-get to install/remove packages in an "
 "attempt to satisfy the build dependencies for a source package. By default "
@@ -895,21 +894,21 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:206
+#: apt-get.8.xml:200
 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:211
+#: apt-get.8.xml:205
 msgid ""
 "<literal>download</literal> will download the given binary package into the "
 "current directory."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:217
+#: apt-get.8.xml:211
 msgid ""
 "<literal>clean</literal> clears out the local repository of retrieved "
 "package files. It removes everything but the lock file from "
@@ -918,7 +917,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:224
+#: apt-get.8.xml:218
 msgid ""
 "Like <literal>clean</literal>, <literal>autoclean</literal> clears out the "
 "local repository of retrieved package files. The difference is that it only "
@@ -930,7 +929,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:234
+#: apt-get.8.xml:228
 msgid ""
 "<literal>autoremove</literal> is used to remove packages that were "
 "automatically installed to satisfy dependencies for other packages and are "
@@ -938,7 +937,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:239
+#: apt-get.8.xml:233
 msgid ""
 "<literal>changelog</literal> downloads a package changelog and displays it "
 "through <command>sensible-pager</command>. The server name and base "
@@ -952,28 +951,28 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:262
+#: apt-get.8.xml:256
 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><listitem><para>
-#: apt-get.8.xml:267
+#: apt-get.8.xml:261
 msgid ""
 "Consider suggested packages as a dependency for installing.  Configuration "
 "Item: <literal>APT::Install-Suggests</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:272
+#: apt-get.8.xml:266
 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><listitem><para>
-#: apt-get.8.xml:277
+#: apt-get.8.xml:271
 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 "
@@ -989,7 +988,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:292
+#: apt-get.8.xml:286
 msgid ""
 "Ignore missing packages; if packages cannot be retrieved or fail the "
 "integrity check after retrieval (corrupted package files), hold back those "
@@ -1001,7 +1000,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:303
+#: apt-get.8.xml:297
 msgid ""
 "Disables downloading of packages. This is best used with <option>--ignore-"
 "missing</option> to force APT to use only the .debs it has already "
@@ -1009,7 +1008,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:310
+#: apt-get.8.xml:304
 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 "
@@ -1021,7 +1020,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:325
+#: apt-get.8.xml:319
 msgid ""
 "No action; perform a simulation of events that would occur but do not "
 "actually change the system.  Configuration Item: <literal>APT::Get::"
@@ -1029,7 +1028,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:329
+#: apt-get.8.xml:323
 msgid ""
 "Simulated runs performed as a user will automatically deactivate locking "
 "(<literal>Debug::NoLocking</literal>), and if the option <literal>APT::Get::"
@@ -1041,7 +1040,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:337
+#: apt-get.8.xml:331
 msgid ""
 "Simulated runs print out a series of lines, each representing a "
 "<command>dpkg</command> operation: configure (<literal>Conf</literal>), "
@@ -1051,7 +1050,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:345
+#: apt-get.8.xml:339
 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 "
@@ -1061,28 +1060,28 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:353
+#: apt-get.8.xml:347
 msgid ""
 "Automatic \"no\" to all prompts.  Configuration Item: <literal>APT::Get::"
 "Assume-No</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:358
+#: apt-get.8.xml:352
 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><listitem><para>
-#: apt-get.8.xml:364
+#: apt-get.8.xml:358
 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><listitem><para>
-#: apt-get.8.xml:370
+#: apt-get.8.xml:364
 msgid ""
 "This option controls the architecture packages are built for by <command>apt-"
 "get source --compile</command> and how cross-builddependencies are "
@@ -1093,7 +1092,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:380
+#: apt-get.8.xml:374
 msgid ""
 "This option controls the activated build profiles for which a source package "
 "is built by <command>apt-get source --compile</command> and how build "
@@ -1103,14 +1102,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:391
+#: apt-get.8.xml:385
 msgid ""
 "Compile source packages after downloading them.  Configuration Item: "
 "<literal>APT::Get::Compile</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:396
+#: apt-get.8.xml:390
 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 "
@@ -1119,7 +1118,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:403
+#: apt-get.8.xml:397
 msgid ""
 "Allow installing new packages when used in conjunction with "
 "<literal>upgrade</literal>.  This is useful if the update of a installed "
@@ -1131,7 +1130,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:415
+#: apt-get.8.xml:409
 msgid ""
 "Do not upgrade packages; when used in conjunction with <literal>install</"
 "literal>, <literal>no-upgrade</literal> will prevent packages on the command "
@@ -1140,7 +1139,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:422
+#: apt-get.8.xml:416
 msgid ""
 "Do not install new packages; when used in conjunction with <literal>install</"
 "literal>, <literal>only-upgrade</literal> will install upgrades for already "
@@ -1149,7 +1148,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:430
+#: apt-get.8.xml:424
 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 "
@@ -1159,7 +1158,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:438
+#: apt-get.8.xml:432
 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 "
@@ -1172,7 +1171,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:449
+#: apt-get.8.xml:443
 msgid ""
 "Use purge instead of remove for anything that would be removed.  An asterisk "
 "(\"*\") will be displayed next to packages which are scheduled to be purged. "
@@ -1181,14 +1180,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:457
+#: apt-get.8.xml:451
 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><listitem><para>
-#: apt-get.8.xml:462
+#: apt-get.8.xml:456
 msgid ""
 "This option is on by default; use <literal>--no-list-cleanup</literal> to "
 "turn it off. When it is on, <command>apt-get</command> will automatically "
@@ -1199,7 +1198,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:472
+#: apt-get.8.xml:466
 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 "
@@ -1213,7 +1212,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:487
+#: apt-get.8.xml:481
 msgid ""
 "Only perform operations that are 'trivial'. Logically this can be considered "
 "related to <option>--assume-yes</option>; where <option>--assume-yes</"
@@ -1222,14 +1221,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:494
+#: apt-get.8.xml:488
 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><listitem><para>
-#: apt-get.8.xml:500
+#: apt-get.8.xml:494
 msgid ""
 "If the command is either <literal>install</literal> or <literal>remove</"
 "literal>, then this option acts like running the <literal>autoremove</"
@@ -1238,7 +1237,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:507
+#: apt-get.8.xml:501
 msgid ""
 "Only has meaning for the <literal>source</literal> and <literal>build-dep</"
 "literal> commands.  Indicates that the given source names are not to be "
@@ -1250,7 +1249,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:518
+#: apt-get.8.xml:512
 msgid ""
 "Download only the diff, dsc, or tar file of a source archive.  Configuration "
 "Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</"
@@ -1258,14 +1257,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:524
+#: apt-get.8.xml:518
 msgid ""
 "Only process architecture-dependent build-dependencies.  Configuration Item: "
 "<literal>APT::Get::Arch-Only</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:529
+#: apt-get.8.xml:523
 msgid ""
 "Ignore if packages can't be authenticated and don't prompt about it.  This "
 "is useful for tools like pbuilder.  Configuration Item: <literal>APT::Get::"
@@ -1273,7 +1272,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:535
+#: apt-get.8.xml:529
 msgid ""
 "Show user friendly progress information in the terminal window when packages "
 "are installed, upgraded or removed. For a machine parsable version of this "
@@ -1283,13 +1282,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:548 apt-cache.8.xml:345 apt-key.8.xml:176 apt-mark.8.xml:127
-#: apt.conf.5.xml:1221 apt_preferences.5.xml:700
+#: apt-get.8.xml:542 apt-cache.8.xml:339 apt-key.8.xml:170 apt-mark.8.xml:121
+#: apt.conf.5.xml:1216 apt_preferences.5.xml:694
 msgid "Files"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:559
+#: apt-get.8.xml:553
 msgid ""
 "&apt-cache;, &apt-cdrom;, &dpkg;, &sources-list;, &apt-conf;, &apt-config;, "
 "&apt-secure;, The APT User's guide in &guidesdir;, &apt-preferences;, the "
@@ -1297,19 +1296,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:565
+#: apt-get.8.xml:559
 msgid ""
 "<command>apt-get</command> returns zero on normal operation, decimal 100 on "
 "error."
 msgstr ""
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-cache.8.xml:35
+#: apt-cache.8.xml:29
 msgid "query the APT cache"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:41
+#: apt-cache.8.xml:35
 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 "
@@ -1318,21 +1317,21 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:51
+#: apt-cache.8.xml:45
 msgid ""
 "<literal>gencaches</literal> creates APT's package cache. This is done "
 "implicitly by all commands needing this cache if it is missing or outdated."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
-#: apt-cache.8.xml:55 apt-cache.8.xml:144 apt-cache.8.xml:165
-#: apt-cache.8.xml:187 apt-cache.8.xml:192 apt-cache.8.xml:208
-#: apt-cache.8.xml:226 apt-cache.8.xml:238
+#: apt-cache.8.xml:49 apt-cache.8.xml:138 apt-cache.8.xml:159
+#: apt-cache.8.xml:181 apt-cache.8.xml:186 apt-cache.8.xml:202
+#: apt-cache.8.xml:220 apt-cache.8.xml:232
 msgid "&synopsis-pkg;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:56
+#: apt-cache.8.xml:50
 msgid ""
 "<literal>showpkg</literal> displays information about the packages listed on "
 "the command line. Remaining arguments are package names. The available "
@@ -1346,7 +1345,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
-#: apt-cache.8.xml:68
+#: apt-cache.8.xml:62
 #, no-wrap
 msgid ""
 "Package: libreadline2\n"
@@ -1362,7 +1361,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:80
+#: apt-cache.8.xml:74
 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, "
@@ -1374,21 +1373,21 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:89
+#: apt-cache.8.xml:83
 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:92
+#: apt-cache.8.xml:86
 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:96
+#: apt-cache.8.xml:90
 msgid ""
 "<literal>Normal packages</literal> is the number of regular, ordinary "
 "package names; these are packages that bear a one-to-one correspondence "
@@ -1397,7 +1396,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:102
+#: apt-cache.8.xml:96
 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 "
@@ -1408,7 +1407,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:110
+#: apt-cache.8.xml:104
 msgid ""
 "<literal>Single virtual packages</literal> is the number of packages with "
 "only one package providing a particular virtual package. For example, in the "
@@ -1417,7 +1416,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:116
+#: apt-cache.8.xml:110
 msgid ""
 "<literal>Mixed virtual packages</literal> is the number of packages that "
 "either provide a particular virtual package or have the virtual package name "
@@ -1426,7 +1425,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:123
+#: apt-cache.8.xml:117
 msgid ""
 "<literal>Missing</literal> is the number of package names that were "
 "referenced in a dependency but were not provided by any package. Missing "
@@ -1436,7 +1435,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:130
+#: apt-cache.8.xml:124
 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 "
@@ -1446,14 +1445,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:137
+#: apt-cache.8.xml:131
 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><listitem><para>
-#: apt-cache.8.xml:145
+#: apt-cache.8.xml:139
 msgid ""
 "<literal>showsrc</literal> displays all the source package records that "
 "match the given package names. All versions are shown, as well as all "
@@ -1461,40 +1460,40 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:151
+#: apt-cache.8.xml:145
 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><listitem><para>
-#: apt-cache.8.xml:156
+#: apt-cache.8.xml:150
 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><listitem><para>
-#: apt-cache.8.xml:161
+#: apt-cache.8.xml:155
 msgid ""
 "<literal>unmet</literal> displays a summary of all unmet dependencies in the "
 "package cache."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:166
+#: apt-cache.8.xml:160
 msgid ""
 "<literal>show</literal> performs a function similar to <command>dpkg --print-"
 "avail</command>; it displays the package records for the named packages."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
-#: apt-cache.8.xml:171
+#: apt-cache.8.xml:165
 msgid "&synopsis-regex;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:172
+#: apt-cache.8.xml:166
 msgid ""
 "<literal>search</literal> performs a full text search on all available "
 "package lists for the POSIX regex pattern given, see &regex;.  It searches "
@@ -1507,28 +1506,28 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:183
+#: apt-cache.8.xml:177
 msgid ""
 "Separate arguments can be used to specify multiple search patterns that are "
 "and'ed together."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:188
+#: apt-cache.8.xml:182
 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><listitem><para>
-#: apt-cache.8.xml:193
+#: apt-cache.8.xml:187
 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:197
+#: apt-cache.8.xml:191
 #, fuzzy
 msgid "<optional><replaceable>&synopsis-prefix;</replaceable></optional>"
 msgstr ""
@@ -1536,7 +1535,7 @@ msgstr ""
 "apt-get install <replaceable>pacote</replaceable>/testing\n"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:198
+#: apt-cache.8.xml:192
 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 "
@@ -1546,7 +1545,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:203
+#: apt-cache.8.xml:197
 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 "
@@ -1554,7 +1553,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:209
+#: apt-cache.8.xml:203
 msgid ""
 "<literal>dotty</literal> takes a list of packages on the command line and "
 "generates output suitable for use by dotty from the <ulink url=\"http://www."
@@ -1567,7 +1566,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:218
+#: apt-cache.8.xml:212
 msgid ""
 "The resulting nodes will have several shapes; normal packages are boxes, "
 "pure virtual packages are triangles, mixed virtual packages are diamonds, "
@@ -1576,19 +1575,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:223
+#: apt-cache.8.xml:217
 msgid "Caution, dotty cannot graph larger sets of packages."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:227
+#: apt-cache.8.xml:221
 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 tool</ulink>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:231
+#: apt-cache.8.xml:225
 #, fuzzy
 msgid "<optional><replaceable>&synopsis-pkg;</replaceable>…</optional>"
 msgstr ""
@@ -1596,7 +1595,7 @@ msgstr ""
 "apt-get install <replaceable>pacote</replaceable>/testing\n"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:232
+#: apt-cache.8.xml:226
 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 "
@@ -1605,7 +1604,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:239
+#: apt-cache.8.xml:233
 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 "
@@ -1617,7 +1616,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:255
+#: apt-cache.8.xml:249
 msgid ""
 "Select the file to store the package cache. The package cache is the primary "
 "cache used by all operations.  Configuration Item: <literal>Dir::Cache::"
@@ -1625,7 +1624,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:261
+#: apt-cache.8.xml:255
 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 "
@@ -1635,7 +1634,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:269
+#: apt-cache.8.xml:263
 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 "
@@ -1644,7 +1643,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:276
+#: apt-cache.8.xml:270
 msgid ""
 "Print only important dependencies; for use with <literal>unmet</literal> and "
 "<literal>depends</literal>. Causes only Depends and Pre-Depends relations to "
@@ -1652,7 +1651,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:290
+#: apt-cache.8.xml:284
 msgid ""
 "Per default the <literal>depends</literal> and <literal>rdepends</literal> "
 "print all dependencies. This can be tweaked with these flags which will omit "
@@ -1662,14 +1661,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:297
+#: apt-cache.8.xml:291
 msgid ""
 "Print full package records when searching.  Configuration Item: "
 "<literal>APT::Cache::ShowFull</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:302
+#: apt-cache.8.xml:296
 msgid ""
 "Print full records for all available versions. This is the default; to turn "
 "it off, use <option>--no-all-versions</option>.  If <option>--no-all-"
@@ -1680,7 +1679,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:311
+#: apt-cache.8.xml:305
 msgid ""
 "Perform automatic package cache regeneration, rather than use the cache as "
 "it is. This is the default; to turn it off, use <option>--no-generate</"
@@ -1688,14 +1687,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:317
+#: apt-cache.8.xml:311
 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><listitem><para>
-#: apt-cache.8.xml:322
+#: apt-cache.8.xml:316
 msgid ""
 "Make <literal>pkgnames</literal> print all names, including virtual packages "
 "and missing dependencies.  Configuration Item: <literal>APT::Cache::"
@@ -1703,7 +1702,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:328
+#: apt-cache.8.xml:322
 msgid ""
 "Make <literal>depends</literal> and <literal>rdepends</literal> recursive so "
 "that all packages mentioned are printed once.  Configuration Item: "
@@ -1711,7 +1710,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:335
+#: apt-cache.8.xml:329
 msgid ""
 "Limit the output of <literal>depends</literal> and <literal>rdepends</"
 "literal> to packages which are currently installed.  Configuration Item: "
@@ -1719,24 +1718,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:353
+#: apt-cache.8.xml:347
 msgid "&apt-conf;, &sources-list;, &apt-get;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:358
+#: apt-cache.8.xml:352
 msgid ""
 "<command>apt-cache</command> returns zero on normal operation, decimal 100 "
 "on error."
 msgstr ""
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-key.8.xml:34
+#: apt-key.8.xml:28
 msgid "APT key management utility"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:41
+#: apt-key.8.xml:35
 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 "
@@ -1744,12 +1743,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-key.8.xml:47
+#: apt-key.8.xml:41
 msgid "Commands"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:52
+#: apt-key.8.xml:46
 msgid ""
 "Add a new key to the list of trusted keys.  The key is read from the "
 "filename given with the parameter &synopsis-param-filename; or if the "
@@ -1757,39 +1756,39 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:65
+#: apt-key.8.xml:59
 msgid "Remove a key from the list of trusted keys."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:76
+#: apt-key.8.xml:70
 msgid "Output the key &synopsis-param-keyid; to standard output."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:87
+#: apt-key.8.xml:81
 msgid "Output all trusted keys to standard output."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:98
+#: apt-key.8.xml:92
 msgid "List trusted keys."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:109
+#: apt-key.8.xml:103
 msgid "List fingerprints of trusted keys."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:120
+#: apt-key.8.xml:114
 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:132
+#: apt-key.8.xml:126
 msgid ""
 "Update the local keyring with the archive keyring and remove from the local "
 "keyring the archive keys which are no longer valid.  The archive keyring is "
@@ -1798,7 +1797,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:146
+#: apt-key.8.xml:140
 msgid ""
 "Perform an update working similarly to the <command>update</command> command "
 "above, but get the archive keyring from a URI instead and validate it "
@@ -1809,19 +1808,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-key.8.xml:162 apt-cdrom.8.xml:82
+#: apt-key.8.xml:156 apt-cdrom.8.xml:76
 msgid "Options"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:163
+#: apt-key.8.xml:157
 msgid ""
 "Note that options need to be defined before the commands described in the "
 "previous section."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:166
+#: apt-key.8.xml:160
 msgid ""
 "With this option it is possible to specify a particular keyring file the "
 "command should operate on. The default is that a command is executed on the "
@@ -1832,56 +1831,56 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:181
+#: apt-key.8.xml:175
 #, fuzzy
 msgid "<filename>/etc/apt/trustdb.gpg</filename>"
 msgstr "<filename>/etc/apt.conf</>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:182
+#: apt-key.8.xml:176
 msgid "Local trust database of archive keys."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:185
+#: apt-key.8.xml:179
 msgid "&keyring-filename;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:186
+#: apt-key.8.xml:180
 msgid "Keyring of &keyring-distro; archive trusted keys."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:189
+#: apt-key.8.xml:183
 msgid "&keyring-removed-filename;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:190
+#: apt-key.8.xml:184
 msgid "Keyring of &keyring-distro; archive removed trusted keys."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:199
+#: apt-key.8.xml:193
 #, fuzzy
 msgid "&apt-get;, &apt-secure;"
 msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-mark.8.xml:35
+#: apt-mark.8.xml:29
 msgid "mark/unmark a package as being automatically-installed"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:41
+#: apt-mark.8.xml:35
 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:45
+#: apt-mark.8.xml:39
 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 "
@@ -1891,7 +1890,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:54
+#: apt-mark.8.xml:48
 msgid ""
 "<literal>auto</literal> is used to mark a package as being automatically "
 "installed, which will cause the package to be removed when no more manually "
@@ -1899,7 +1898,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:62
+#: apt-mark.8.xml:56
 msgid ""
 "<literal>manual</literal> is used to mark a package as being manually "
 "installed, which will prevent the package from being automatically removed "
@@ -1907,7 +1906,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:70
+#: apt-mark.8.xml:64
 msgid ""
 "<literal>hold</literal> is used to mark a package as held back, which will "
 "prevent the package from being automatically installed, upgraded or "
@@ -1917,14 +1916,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:80
+#: apt-mark.8.xml:74
 msgid ""
 "<literal>unhold</literal> is used to cancel a previously set hold on a "
 "package to allow all actions again."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:86
+#: apt-mark.8.xml:80
 msgid ""
 "<literal>showauto</literal> is used to print a list of automatically "
 "installed packages with each package on a new line.  All automatically "
@@ -1933,7 +1932,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:94
+#: apt-mark.8.xml:88
 msgid ""
 "<literal>showmanual</literal> can be used in the same way as "
 "<literal>showauto</literal> except that it will print a list of manually "
@@ -1941,14 +1940,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:101
+#: apt-mark.8.xml:95
 msgid ""
 "<literal>showhold</literal> is used to print a list of packages on hold in "
 "the same way as for the other show commands."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:117
+#: apt-mark.8.xml:111
 msgid ""
 "Read/Write package stats from the filename given with the parameter "
 "&synopsis-param-filename; instead of from the default location, which is "
@@ -1957,19 +1956,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:138
+#: apt-mark.8.xml:132
 msgid ""
 "<command>apt-mark</command> returns zero on normal operation, non-zero on "
 "error."
 msgstr ""
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-secure.8.xml:49
+#: apt-secure.8.xml:43
 msgid "Archive authentication support for APT"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:54
+#: apt-secure.8.xml:48
 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 "
@@ -1978,7 +1977,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:62
+#: apt-secure.8.xml:56
 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 "
@@ -1988,19 +1987,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:71
+#: apt-secure.8.xml:65
 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:76
+#: apt-secure.8.xml:70
 msgid "Trusted archives"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:79
+#: apt-secure.8.xml:73
 msgid ""
 "The chain of trust from an apt archive to the end user is made up of several "
 "steps. <command>apt-secure</command> is the last step in this chain; "
@@ -2011,7 +2010,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:87
+#: apt-secure.8.xml:81
 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 "
@@ -2020,7 +2019,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:94
+#: apt-secure.8.xml:88
 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. In order to become "
@@ -2031,7 +2030,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:104
+#: apt-secure.8.xml:98
 msgid ""
 "Once the uploaded package is verified and included in the archive, the "
 "maintainer signature is stripped off, and checksums of the package are "
@@ -2044,7 +2043,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:115
+#: apt-secure.8.xml:109
 msgid ""
 "End users can check the signature of the Release file, extract a checksum of "
 "a package from it and compare it with the checksum of the package they "
@@ -2052,14 +2051,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:120
+#: apt-secure.8.xml:114
 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:125
+#: apt-secure.8.xml:119
 msgid ""
 "<literal>Network \"man in the middle\" attacks</literal>. Without signature "
 "checking, malicious agents can introduce themselves into the package "
@@ -2069,7 +2068,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:133
+#: apt-secure.8.xml:127
 msgid ""
 "<literal>Mirror network compromise</literal>.  Without signature checking, a "
 "malicious agent can compromise a mirror host and modify the files in it to "
@@ -2078,7 +2077,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:140
+#: apt-secure.8.xml:134
 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 "
@@ -2087,12 +2086,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:146
+#: apt-secure.8.xml:140
 msgid "User configuration"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:148
+#: apt-secure.8.xml:142
 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 "
@@ -2101,7 +2100,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:155
+#: apt-secure.8.xml:149
 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 "
@@ -2112,19 +2111,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:164
+#: apt-secure.8.xml:158
 msgid "Archive configuration"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:166
+#: apt-secure.8.xml:160
 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:171
+#: apt-secure.8.xml:165
 msgid ""
 "<emphasis>Create a toplevel Release file</emphasis>, if it does not exist "
 "already. You can do this by running <command>apt-ftparchive release</"
@@ -2132,7 +2131,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:176
+#: apt-secure.8.xml:170
 msgid ""
 "<emphasis>Sign it</emphasis>. You can do this by running <command>gpg --"
 "clearsign -o InRelease Release</command> and <command>gpg -abs -o Release."
@@ -2140,7 +2139,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:180
+#: apt-secure.8.xml:174
 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 "
@@ -2148,7 +2147,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:187
+#: apt-secure.8.xml:181
 msgid ""
 "Whenever the contents of the archive change (new packages are added or "
 "removed) the archive maintainer has to follow the first two steps outlined "
@@ -2156,14 +2155,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:195
+#: apt-secure.8.xml:189
 msgid ""
 "&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, "
-"&debsign; &debsig-verify;, &gpg;"
+"&debsign;, &debsig-verify;, &gpg;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:199
+#: apt-secure.8.xml:193
 msgid ""
 "For more background information you might want to review the <ulink url="
 "\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "
@@ -2174,24 +2173,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:212
+#: apt-secure.8.xml:206
 msgid "Manpage Authors"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:214
+#: apt-secure.8.xml:208
 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><refpurpose>
-#: apt-cdrom.8.xml:34
+#: apt-cdrom.8.xml:28
 msgid "APT CD-ROM management utility"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:40
+#: apt-cdrom.8.xml:34
 msgid ""
 "<command>apt-cdrom</command> is used to add a new CD-ROM to APT's list of "
 "available sources. <command>apt-cdrom</command> takes care of determining "
@@ -2200,7 +2199,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:47
+#: apt-cdrom.8.xml:41
 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 disc in a multi-CD set "
@@ -2208,7 +2207,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:58
+#: apt-cdrom.8.xml:52
 msgid ""
 "<literal>add</literal> is used to add a new disc to the source list. It will "
 "unmount the CD-ROM device, prompt for a disc to be inserted and then proceed "
@@ -2218,7 +2217,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:66
+#: apt-cdrom.8.xml:60
 msgid ""
 "APT uses a CD-ROM ID to track which disc is currently in the drive and "
 "maintains a database of these IDs in <filename>&statedir;/cdroms.list</"
@@ -2226,14 +2225,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:74
+#: apt-cdrom.8.xml:68
 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><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:87
+#: apt-cdrom.8.xml:81
 msgid ""
 "Do not try to auto-detect the CD-ROM path. Usually combined with the "
 "<option>--cdrom</option> option.  Configuration Item: <literal>Acquire::"
@@ -2241,7 +2240,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:95
+#: apt-cdrom.8.xml:89
 msgid ""
 "Mount point; specify the location to mount the CD-ROM. This mount point must "
 "be listed in <filename>/etc/fstab</filename> and properly configured.  "
@@ -2249,7 +2248,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:104
+#: apt-cdrom.8.xml:98
 msgid ""
 "Rename a disc; change the label of a disc or override the disc's given "
 "label. This option will cause <command>apt-cdrom</command> to prompt for a "
@@ -2257,7 +2256,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:113
+#: apt-cdrom.8.xml:107
 msgid ""
 "No mounting; prevent <command>apt-cdrom</command> from mounting and "
 "unmounting the mount point.  Configuration Item: <literal>APT::CDROM::"
@@ -2265,7 +2264,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:121
+#: apt-cdrom.8.xml:115
 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 "
@@ -2274,7 +2273,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:131
+#: apt-cdrom.8.xml:125
 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 "
@@ -2282,7 +2281,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:142
+#: apt-cdrom.8.xml:136
 msgid ""
 "No Changes; Do not change the &sources-list; file and do not write index "
 "files. Everything is still checked however.  Configuration Item: "
@@ -2290,25 +2289,25 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:155
+#: apt-cdrom.8.xml:149
 #, fuzzy
 msgid "&apt-conf;, &apt-get;, &sources-list;"
 msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:160
+#: apt-cdrom.8.xml:154
 msgid ""
 "<command>apt-cdrom</command> returns zero on normal operation, decimal 100 "
 "on error."
 msgstr ""
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-config.8.xml:35
+#: apt-config.8.xml:29
 msgid "APT Configuration Query program"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:41
+#: apt-config.8.xml:35
 msgid ""
 "<command>apt-config</command> is an internal program used by various "
 "portions of the APT suite to provide consistent configurability. It accesses "
@@ -2317,7 +2316,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:53
+#: apt-config.8.xml:47
 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 the "
@@ -2327,7 +2326,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
-#: apt-config.8.xml:61
+#: apt-config.8.xml:55
 #, no-wrap
 msgid ""
 "OPTS=\"-f\"\n"
@@ -2336,14 +2335,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:66
+#: apt-config.8.xml:60
 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:70
+#: apt-config.8.xml:64
 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 "
@@ -2351,24 +2350,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:79
+#: apt-config.8.xml:73
 msgid "Just show the contents of the configuration space."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:92
+#: apt-config.8.xml:86
 msgid ""
 "Include options which have an empty value. This is the default, so use --no-"
 "empty to remove them from the output."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
-#: apt-config.8.xml:97
+#: apt-config.8.xml:91
 msgid "&percnt;f &#x0022;&percnt;v&#x0022;;&percnt;n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:98
+#: apt-config.8.xml:92
 msgid ""
 "Defines the output of each config option. &percnt;t will be replaced with "
 "its individual name, &percnt;f with its full hierarchical name and &percnt;v "
@@ -2379,8 +2378,8 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:112 apt-extracttemplates.1.xml:73 apt-sortpkgs.1.xml:66
-#: apt-ftparchive.1.xml:610
+#: apt-config.8.xml:106 apt-extracttemplates.1.xml:67 apt-sortpkgs.1.xml:60
+#: apt-ftparchive.1.xml:604
 #, fuzzy
 msgid "&apt-conf;"
 msgstr ""
@@ -2389,34 +2388,34 @@ msgstr ""
 " "
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:117
+#: apt-config.8.xml:111
 msgid ""
 "<command>apt-config</command> returns zero on normal operation, decimal 100 "
 "on error."
 msgstr ""
 
 #. type: Content of: <refentry><refentryinfo><author><contrib>
-#: apt.conf.5.xml:22
+#: apt.conf.5.xml:16
 msgid "Initial documentation of Debug::*."
 msgstr ""
 
 #. type: Content of: <refentry><refentryinfo><author><email>
-#: apt.conf.5.xml:23
+#: apt.conf.5.xml:17
 msgid "dburrows@debian.org"
 msgstr ""
 
 #. type: Content of: <refentry><refmeta><manvolnum>
-#: apt.conf.5.xml:33 apt_preferences.5.xml:27 sources.list.5.xml:28
+#: apt.conf.5.xml:27 apt_preferences.5.xml:21 sources.list.5.xml:22
 msgid "5"
 msgstr ""
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt.conf.5.xml:40
+#: apt.conf.5.xml:34
 msgid "Configuration file for APT"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:44
+#: apt.conf.5.xml:38
 msgid ""
 "<filename>/etc/apt/apt.conf</filename> is the main configuration file shared "
 "by all the tools in the APT suite of tools, though it is by no means the "
@@ -2425,21 +2424,21 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><orderedlist><para>
-#: apt.conf.5.xml:50
+#: apt.conf.5.xml:44
 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:52
+#: apt.conf.5.xml:46
 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:54
+#: apt.conf.5.xml:48
 msgid ""
 "all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending "
 "order which have either no or \"<literal>conf</literal>\" as filename "
@@ -2451,25 +2450,25 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:61
+#: apt.conf.5.xml:55
 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:63
+#: apt.conf.5.xml:57
 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:67
+#: apt.conf.5.xml:61
 msgid "Syntax"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:68
+#: apt.conf.5.xml:62
 msgid ""
 "The configuration file is organized in a tree with options organized into "
 "functional groups. Option specification is given with a double colon "
@@ -2479,7 +2478,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:74
+#: apt.conf.5.xml:68
 msgid ""
 "Syntactically the configuration language is modeled after what the ISC tools "
 "such as bind and dhcp use. Lines starting with <literal>//</literal> are "
@@ -2494,7 +2493,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><informalexample><programlisting>
-#: apt.conf.5.xml:87
+#: apt.conf.5.xml:81
 #, no-wrap
 msgid ""
 "APT {\n"
@@ -2506,7 +2505,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:95
+#: apt.conf.5.xml:89
 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 "
@@ -2514,27 +2513,27 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><informalexample><programlisting>
-#: apt.conf.5.xml:100
+#: apt.conf.5.xml:94
 #, no-wrap
 msgid "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:103
+#: apt.conf.5.xml:97
 msgid ""
 "In general the sample configuration file &configureindex; is a good guide "
 "for how it should look."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:106
+#: apt.conf.5.xml:100
 msgid ""
 "Case is not significant in names of configuration items, 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:109
+#: apt.conf.5.xml:103
 msgid ""
 "Names for the configuration items are optional if a list is defined as can "
 "be seen in the <literal>DPkg::Pre-Install-Pkgs</literal> example above. If "
@@ -2544,7 +2543,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:114
+#: apt.conf.5.xml:108
 msgid ""
 "Two special commands are defined: <literal>#include</literal> (which is "
 "deprecated and not supported by alternative implementations) and "
@@ -2556,7 +2555,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:124
+#: apt.conf.5.xml:118
 msgid ""
 "The <literal>#clear</literal> command is the only way to delete a list or a "
 "complete scope. Reopening a scope (or using the syntax described below with "
@@ -2566,7 +2565,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:132
+#: apt.conf.5.xml:126
 msgid ""
 "All of the APT tools take an -o option which allows an arbitrary "
 "configuration directive to be specified on the command line. The syntax is a "
@@ -2578,7 +2577,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:140
+#: apt.conf.5.xml:134
 msgid ""
 "Note that appending items to a list using <literal>::</literal> only works "
 "for one item per line, and that you should not use it in combination with "
@@ -2595,19 +2594,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:155
+#: apt.conf.5.xml:149
 msgid "The APT Group"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:156
+#: apt.conf.5.xml:150
 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><listitem><para>
-#: apt.conf.5.xml:161
+#: apt.conf.5.xml:155
 msgid ""
 "System Architecture; sets the architecture to use when fetching files and "
 "parsing package lists. The internal default is the architecture apt was "
@@ -2615,7 +2614,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:168
+#: apt.conf.5.xml:162
 msgid ""
 "All Architectures the system supports. For instance, CPUs implementing the "
 "<literal>amd64</literal> (also called <literal>x86-64</literal>)  "
@@ -2628,7 +2627,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:182
+#: apt.conf.5.xml:176
 msgid ""
 "List of all build profiles enabled for build-dependency resolution, without "
 "the \"<literal>profile.</literal>\" namespace prefix.  By default this list "
@@ -2637,7 +2636,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:190
+#: apt.conf.5.xml:184
 msgid ""
 "Default release to install packages from if more than one version is "
 "available. Contains release name, codename or release version. Examples: "
@@ -2646,14 +2645,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:196
+#: apt.conf.5.xml:190
 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><listitem><para>
-#: apt.conf.5.xml:201
+#: apt.conf.5.xml:195
 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 "
@@ -2662,7 +2661,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:209
+#: apt.conf.5.xml:203
 msgid ""
 "Defaults to on, which will cause APT to install essential and important "
 "packages as soon as possible in an install/upgrade operation, in order to "
@@ -2677,7 +2676,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:221
+#: apt.conf.5.xml:215
 msgid ""
 "The immediate configuration marker is also applied in the potentially "
 "problematic case of circular dependencies, since a dependency with the "
@@ -2694,7 +2693,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:234
+#: apt.conf.5.xml:228
 msgid ""
 "Before a big operation like <literal>dist-upgrade</literal> is run with this "
 "option disabled you should try to explicitly <literal>install</literal> the "
@@ -2705,7 +2704,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:245
+#: apt.conf.5.xml:239
 msgid ""
 "Never enable this option unless you <emphasis>really</emphasis> know what "
 "you are doing. It permits APT to temporarily remove an essential package to "
@@ -2718,7 +2717,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:257
+#: apt.conf.5.xml:251
 msgid ""
 "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 of "
@@ -2738,38 +2737,38 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:273
+#: apt.conf.5.xml:267
 msgid "Defines which packages are considered essential build dependencies."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:277
+#: apt.conf.5.xml:271
 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><listitem><para>
-#: apt.conf.5.xml:282
+#: apt.conf.5.xml:276
 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><listitem><para>
-#: apt.conf.5.xml:287
+#: apt.conf.5.xml:281
 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:293
+#: apt.conf.5.xml:287
 msgid "The Acquire Group"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:294
+#: apt.conf.5.xml:288
 msgid ""
 "The <literal>Acquire</literal> group of options controls the download of "
 "packages as well as the various \"acquire methods\" responsible for the "
@@ -2777,7 +2776,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:301
+#: apt.conf.5.xml:295
 msgid ""
 "Security related option defaulting to true, as giving a Release file's "
 "validation an expiration date prevents replay attacks over a long timescale, "
@@ -2790,7 +2789,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:314
+#: apt.conf.5.xml:308
 msgid ""
 "Maximum time (in seconds) after its creation (as indicated by the "
 "<literal>Date</literal> header) that the <filename>Release</filename> file "
@@ -2802,7 +2801,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:326
+#: apt.conf.5.xml:320
 msgid ""
 "Minimum time (in seconds) after its creation (as indicated by the "
 "<literal>Date</literal> header) that the <filename>Release</filename> file "
@@ -2814,7 +2813,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:338
+#: apt.conf.5.xml:332
 msgid ""
 "Try to download deltas called <literal>PDiffs</literal> for indexes (like "
 "<filename>Packages</filename> files) instead of downloading whole ones. True "
@@ -2822,7 +2821,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:341
+#: apt.conf.5.xml:335
 msgid ""
 "Two sub-options to limit the use of PDiffs are also available: "
 "<literal>FileLimit</literal> can be used to specify a maximum number of "
@@ -2833,7 +2832,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:351
+#: apt.conf.5.xml:345
 msgid ""
 "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</"
 "literal> or <literal>access</literal> which determines how APT parallelizes "
@@ -2843,21 +2842,21 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:359
+#: apt.conf.5.xml:353
 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><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:364
+#: apt.conf.5.xml:358
 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><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:369
+#: apt.conf.5.xml:363
 msgid ""
 "<literal>http::Proxy</literal> sets the default proxy to use for HTTP URIs. "
 "It is in the standard form of <literal>http://[[user][:pass]@]host[:port]/</"
@@ -2869,7 +2868,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:377
+#: apt.conf.5.xml:371
 msgid ""
 "Three settings are provided for cache control with HTTP/1.1 compliant proxy "
 "caches.  <literal>No-Cache</literal> tells the proxy not to use its cached "
@@ -2881,14 +2880,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:387 apt.conf.5.xml:475
+#: apt.conf.5.xml:381 apt.conf.5.xml:469
 msgid ""
 "The option <literal>timeout</literal> sets the timeout timer used by the "
 "method; this value applies to the connection as well as the data timeout."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:390
+#: apt.conf.5.xml:384
 msgid ""
 "The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to "
 "enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be beneficial e."
@@ -2900,14 +2899,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:397
+#: apt.conf.5.xml:391
 msgid ""
 "<literal>Acquire::http::AllowRedirect</literal> controls whether APT will "
 "follow redirects, which is enabled by default."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:400
+#: apt.conf.5.xml:394
 msgid ""
 "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
 "literal> which accepts integer values in kilobytes per second. The default "
@@ -2917,7 +2916,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:407
+#: apt.conf.5.xml:401
 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 "
@@ -2925,7 +2924,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:411
+#: apt.conf.5.xml:405
 msgid ""
 "<literal>Acquire::http::Proxy-Auto-Detect</literal> can be used to specify "
 "an external command to discover the http proxy to use. Apt expects the "
@@ -2939,7 +2938,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:429
+#: apt.conf.5.xml:423
 msgid ""
 "The <literal>Cache-control</literal>, <literal>Timeout</literal>, "
 "<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> and "
@@ -2950,7 +2949,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:437
+#: apt.conf.5.xml:431
 msgid ""
 "<literal>CaInfo</literal> suboption specifies place of file that holds info "
 "about trusted certificates.  <literal>&lt;host&gt;::CaInfo</literal> is the "
@@ -2972,7 +2971,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:458
+#: apt.conf.5.xml:452
 msgid ""
 "<literal>ftp::Proxy</literal> sets the default proxy to use for FTP URIs.  "
 "It is in the standard form of <literal>ftp://[[user][:pass]@]host[:port]/</"
@@ -2991,7 +2990,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:478
+#: apt.conf.5.xml:472
 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, "
@@ -3001,7 +3000,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:485
+#: apt.conf.5.xml:479
 msgid ""
 "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
 "envar> environment variable to an HTTP URL - see the discussion of the http "
@@ -3010,7 +3009,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:490
+#: apt.conf.5.xml:484
 msgid ""
 "The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
 "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -3020,13 +3019,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:504
+#: apt.conf.5.xml:498
 #, no-wrap
 msgid "/cdrom/::Mount \"foo\";"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:499
+#: apt.conf.5.xml:493
 msgid ""
 "For URIs using the <literal>cdrom</literal> method, the only configurable "
 "option is the mount point, <literal>cdrom::Mount</literal>, which must be "
@@ -3039,20 +3038,20 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:512
+#: apt.conf.5.xml:506
 msgid ""
 "For GPGV URIs the only configurable option is <literal>gpgv::Options</"
 "literal>, which passes additional parameters to gpgv."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:523
+#: apt.conf.5.xml:517
 #, no-wrap
 msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:518
+#: apt.conf.5.xml:512
 msgid ""
 "List of compression types which are understood by the acquire methods.  "
 "Files like <filename>Packages</filename> can be available in various "
@@ -3064,19 +3063,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:528
+#: apt.conf.5.xml:522
 #, no-wrap
 msgid "Acquire::CompressionTypes::Order:: \"gz\";"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:531
+#: apt.conf.5.xml:525
 #, no-wrap
 msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:524
+#: apt.conf.5.xml:518
 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 "
@@ -3094,13 +3093,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:538
+#: apt.conf.5.xml:532
 #, no-wrap
 msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:533
+#: apt.conf.5.xml:527
 msgid ""
 "Note that the <literal>Dir::Bin::<replaceable>Methodname</replaceable></"
 "literal> will be checked at run time. If this option has been set, the "
@@ -3115,7 +3114,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:543
+#: apt.conf.5.xml:537
 msgid ""
 "The special type <literal>uncompressed</literal> can be used to give "
 "uncompressed files a preference, but note that most archives don't provide "
@@ -3123,7 +3122,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:550
+#: apt.conf.5.xml:544
 msgid ""
 "When downloading <literal>gzip</literal> compressed indexes (Packages, "
 "Sources, or Translations), keep them gzip compressed locally instead of "
@@ -3132,7 +3131,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:558
+#: apt.conf.5.xml:552
 msgid ""
 "The Languages subsection controls which <filename>Translation</filename> "
 "files are downloaded and in which order APT tries to display the description-"
@@ -3144,13 +3143,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><programlisting>
-#: apt.conf.5.xml:575
+#: apt.conf.5.xml:569
 #, no-wrap
 msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:563
+#: apt.conf.5.xml:557
 msgid ""
 "The default list includes \"environment\" and \"en\". "
 "\"<literal>environment</literal>\" has a special meaning here: it will be "
@@ -3172,7 +3171,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:576
+#: apt.conf.5.xml:570
 msgid ""
 "Note: To prevent problems resulting from APT being executed in different "
 "environments (e.g. by different users or by other programs) all Translation "
@@ -3181,22 +3180,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:585
+#: apt.conf.5.xml:579
 msgid "When downloading, force to use only the IPv4 protocol."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:591
+#: apt.conf.5.xml:585
 msgid "When downloading, force to use only the IPv6 protocol."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:598
+#: apt.conf.5.xml:592
 msgid "Directories"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:600
+#: apt.conf.5.xml:594
 msgid ""
 "The <literal>Dir::State</literal> section has directories that pertain to "
 "local state information. <literal>lists</literal> is the directory to place "
@@ -3208,20 +3207,21 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:607
+#: apt.conf.5.xml:601
 msgid ""
 "<literal>Dir::Cache</literal> contains locations pertaining to local cache "
 "information, such as the two package caches <literal>srcpkgcache</literal> "
 "and <literal>pkgcache</literal> as well as the location to place downloaded "
 "archives, <literal>Dir::Cache::archives</literal>. Generation of caches can "
-"be turned off by setting their names to the empty string. This will slow "
+"be turned off by setting <literal>pkgcache</literal> or "
+"<literal>srcpkgcache</literal> to <literal>\"\"</literal>.  This will slow "
 "down startup but save disk space. It is probably preferable to turn off the "
-"pkgcache rather than the srcpkgcache. Like <literal>Dir::State</literal> the "
-"default directory is contained in <literal>Dir::Cache</literal>"
+"pkgcache rather than the srcpkgcache.  Like <literal>Dir::State</literal> "
+"the default directory is contained in <literal>Dir::Cache</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:616
+#: apt.conf.5.xml:611
 msgid ""
 "<literal>Dir::Etc</literal> contains the location of configuration files, "
 "<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -3231,7 +3231,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:622
+#: apt.conf.5.xml:617
 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 "
@@ -3239,7 +3239,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:626
+#: apt.conf.5.xml:621
 msgid ""
 "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
 "Bin::Methods</literal> specifies the location of the method handlers and "
@@ -3250,7 +3250,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:634
+#: apt.conf.5.xml:629
 msgid ""
 "The configuration item <literal>RootDir</literal> has a special meaning.  If "
 "set, all paths in <literal>Dir::</literal> will be relative to "
@@ -3263,7 +3263,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:647
+#: apt.conf.5.xml:642
 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 "
@@ -3274,12 +3274,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:656
+#: apt.conf.5.xml:651
 msgid "APT in DSelect"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:658
+#: apt.conf.5.xml:653
 msgid ""
 "When APT is used as a &dselect; method several configuration directives "
 "control the default behavior. These are in the <literal>DSelect</literal> "
@@ -3287,7 +3287,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:663
+#: apt.conf.5.xml:658
 msgid ""
 "Cache Clean mode; this value may be one of <literal>always</literal>, "
 "<literal>prompt</literal>, <literal>auto</literal>, <literal>pre-auto</"
@@ -3300,40 +3300,40 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:677
+#: apt.conf.5.xml:672
 msgid ""
 "The contents of this variable are passed to &apt-get; as command line "
 "options when it is run for the install phase."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:682
+#: apt.conf.5.xml:677
 msgid ""
 "The contents of this variable are passed to &apt-get; as command line "
 "options when it is run for the update phase."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:687
+#: apt.conf.5.xml:682
 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:693
+#: apt.conf.5.xml:688
 msgid "How APT calls &dpkg;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:694
+#: apt.conf.5.xml:689
 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:699
+#: apt.conf.5.xml:694
 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 "
@@ -3341,7 +3341,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:705
+#: apt.conf.5.xml:700
 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 "
@@ -3350,7 +3350,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:712
+#: apt.conf.5.xml:707
 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 "
@@ -3361,7 +3361,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:719
+#: apt.conf.5.xml:714
 msgid ""
 "Version 2 of this protocol dumps more information, including the protocol "
 "version, the APT configuration space and the packages, files and versions "
@@ -3370,7 +3370,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:724
+#: apt.conf.5.xml:719
 msgid ""
 "The version of the protocol to be used for the command "
 "<literal><replaceable>cmd</replaceable></literal> can be chosen by setting "
@@ -3381,7 +3381,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:731
+#: apt.conf.5.xml:726
 msgid ""
 "The file descriptor to be used to send the information can be requested with "
 "<literal>DPkg::Tools::options::<replaceable>cmd</replaceable>::InfoFD</"
@@ -3392,26 +3392,26 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:741
+#: apt.conf.5.xml:736
 msgid ""
 "APT chdirs to this directory before invoking &dpkg;, the default is "
 "<filename>/</filename>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:746
+#: apt.conf.5.xml:741
 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:751
+#: apt.conf.5.xml:746
 msgid "dpkg trigger usage (and related options)"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:752
+#: apt.conf.5.xml:747
 msgid ""
 "APT can call &dpkg; in such a way as to let it make aggressive use of "
 "triggers over multiple calls of &dpkg;. Without further options &dpkg; will "
@@ -3426,7 +3426,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:767
+#: apt.conf.5.xml:762
 #, no-wrap
 msgid ""
 "DPkg::NoTriggers \"true\";\n"
@@ -3436,7 +3436,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:761
+#: apt.conf.5.xml:756
 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 "
@@ -3450,7 +3450,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:774
+#: apt.conf.5.xml:769
 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 "
@@ -3463,7 +3463,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:782
+#: apt.conf.5.xml:777
 msgid ""
 "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
 "and \"<literal>no</literal>\".  The default value is \"<literal>all</literal>"
@@ -3480,7 +3480,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:797
+#: apt.conf.5.xml:792
 msgid ""
 "If this option is set APT will call <command>dpkg --configure --pending</"
 "command> to let &dpkg; handle all required configurations and triggers. This "
@@ -3491,7 +3491,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:804
+#: apt.conf.5.xml:799
 msgid ""
 "Useful for the <literal>smart</literal> configuration as a package which has "
 "pending triggers is not considered as <literal>installed</literal>, and "
@@ -3501,7 +3501,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:817
+#: apt.conf.5.xml:812
 #, no-wrap
 msgid ""
 "OrderList::Score {\n"
@@ -3513,7 +3513,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:810
+#: apt.conf.5.xml:805
 msgid ""
 "Essential packages (and their dependencies) should be configured immediately "
 "after unpacking. It is a good idea to do this quite early in the upgrade "
@@ -3527,12 +3527,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:830
+#: apt.conf.5.xml:825
 msgid "Periodic and Archives options"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:831
+#: apt.conf.5.xml:826
 msgid ""
 "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
 "of options configure behavior of apt periodic updates, which is done by the "
@@ -3541,12 +3541,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:839
+#: apt.conf.5.xml:834
 msgid "Debug options"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:841
+#: apt.conf.5.xml:836
 msgid ""
 "Enabling options in the <literal>Debug::</literal> section will cause "
 "debugging information to be sent to the standard error stream of the program "
@@ -3557,7 +3557,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:852
+#: apt.conf.5.xml:847
 msgid ""
 "<literal>Debug::pkgProblemResolver</literal> enables output about the "
 "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -3565,7 +3565,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:860
+#: apt.conf.5.xml:855
 msgid ""
 "<literal>Debug::NoLocking</literal> disables all file locking.  This can be "
 "used to run some operations (for instance, <literal>apt-get -s install</"
@@ -3573,7 +3573,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:869
+#: apt.conf.5.xml:864
 msgid ""
 "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
 "time that <literal>apt</literal> invokes &dpkg;."
@@ -3583,66 +3583,66 @@ 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:877
+#: apt.conf.5.xml:872
 msgid ""
 "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
 "in CD-ROM IDs."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:887
+#: apt.conf.5.xml:882
 msgid "A full list of debugging options to apt follows."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:896
+#: apt.conf.5.xml:891
 msgid ""
 "Print information related to accessing <literal>cdrom://</literal> sources."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:907
+#: apt.conf.5.xml:902
 msgid "Print information related to downloading packages using FTP."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:918
+#: apt.conf.5.xml:913
 msgid "Print information related to downloading packages using HTTP."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:929
+#: apt.conf.5.xml:924
 msgid "Print information related to downloading packages using HTTPS."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:940
+#: apt.conf.5.xml:935
 msgid ""
 "Print information related to verifying cryptographic signatures using "
 "<literal>gpg</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:951
+#: apt.conf.5.xml:946
 msgid ""
 "Output information about the process of accessing collections of packages "
 "stored on CD-ROMs."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:961
+#: apt.conf.5.xml:956
 msgid "Describes the process of resolving build-dependencies in &apt-get;."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:971
+#: apt.conf.5.xml:966
 msgid ""
 "Output each cryptographic hash that is generated by the <literal>apt</"
 "literal> libraries."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:981
+#: apt.conf.5.xml:976
 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 "
@@ -3650,53 +3650,53 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:992
+#: apt.conf.5.xml:987
 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><listitem><para>
-#: apt.conf.5.xml:1004
+#: apt.conf.5.xml:999
 msgid "Log when items are added to or removed from the global download queue."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1014
+#: apt.conf.5.xml:1009
 msgid ""
 "Output status messages and errors related to verifying checksums and "
 "cryptographic signatures of downloaded files."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1024
+#: apt.conf.5.xml:1019
 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><listitem><para>
-#: apt.conf.5.xml:1036
+#: apt.conf.5.xml:1031
 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><listitem><para>
-#: apt.conf.5.xml:1047
+#: apt.conf.5.xml:1042
 msgid ""
 "Log all interactions with the sub-processes that actually perform downloads."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1058
+#: apt.conf.5.xml:1053
 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><listitem><para>
-#: apt.conf.5.xml:1068
+#: apt.conf.5.xml:1063
 msgid ""
 "Generate debug messages describing which packages are being automatically "
 "installed to resolve dependencies.  This corresponds to the initial auto-"
@@ -3706,7 +3706,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1082
+#: apt.conf.5.xml:1077
 msgid ""
 "Generate debug messages describing which packages are marked as keep/install/"
 "remove while the ProblemResolver does his work.  Each addition or deletion "
@@ -3724,46 +3724,46 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1103
+#: apt.conf.5.xml:1098
 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><listitem><para>
-#: apt.conf.5.xml:1114
+#: apt.conf.5.xml:1109
 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><listitem><para>
-#: apt.conf.5.xml:1125
+#: apt.conf.5.xml:1120
 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><listitem><para>
-#: apt.conf.5.xml:1137
+#: apt.conf.5.xml:1132
 msgid ""
 "Output status messages tracing the steps performed when invoking &dpkg;."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1148
+#: apt.conf.5.xml:1143
 msgid "Output the priority of each package list on startup."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1158
+#: apt.conf.5.xml:1153
 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><listitem><para>
-#: apt.conf.5.xml:1169
+#: apt.conf.5.xml:1164
 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 "
@@ -3771,14 +3771,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1181
+#: apt.conf.5.xml:1176
 msgid ""
 "Print information about the vendors read from <filename>/etc/apt/vendors."
 "list</filename>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1191
+#: apt.conf.5.xml:1186
 msgid ""
 "Display the external commands that are called by apt hooks.  This includes e."
 "g. the config options <literal>DPkg::{Pre,Post}-Invoke</literal> or "
@@ -3786,14 +3786,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1215 apt_preferences.5.xml:547 sources.list.5.xml:239
-#: apt-ftparchive.1.xml:598
+#: apt.conf.5.xml:1210 apt_preferences.5.xml:541 sources.list.5.xml:233
+#: apt-ftparchive.1.xml:592
 #, fuzzy
 msgid "Examples"
 msgstr "Exemplos"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1216
+#: apt.conf.5.xml:1211
 msgid ""
 "&configureindex; is a configuration file showing example values for all "
 "possible options."
@@ -3801,19 +3801,19 @@ msgstr ""
 
 #.  ? reading apt.conf 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1228
+#: apt.conf.5.xml:1223
 #, fuzzy
 msgid "&apt-cache;, &apt-config;, &apt-preferences;."
 msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt_preferences.5.xml:34
+#: apt_preferences.5.xml:28
 #, fuzzy
 msgid "Preference control file for APT"
 msgstr "Arquivo de controle de preferências para o APT"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:39
+#: apt_preferences.5.xml:33
 #, fuzzy
 msgid ""
 "The APT preferences file <filename>/etc/apt/preferences</filename> and the "
@@ -3826,7 +3826,7 @@ msgstr ""
 "para instalação."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:44
+#: apt_preferences.5.xml:38
 #, fuzzy
 msgid ""
 "Several versions of a package may be available for installation when the "
@@ -3849,7 +3849,7 @@ msgstr ""
 "selecionada para instalação."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:54
+#: apt_preferences.5.xml:48
 #, fuzzy
 msgid ""
 "Several instances of the same version of a package may be available when the "
@@ -3865,7 +3865,7 @@ msgstr ""
 "a escolha da instância."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:61
+#: apt_preferences.5.xml:55
 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 "
@@ -3879,7 +3879,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:72
+#: apt_preferences.5.xml:66
 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 "
@@ -3892,13 +3892,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:81
+#: apt_preferences.5.xml:75
 #, fuzzy
 msgid "APT's Default Priority Assignments"
 msgstr "Atribuições de Prioridade Padrão do APT"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:96
+#: apt_preferences.5.xml:90
 #, fuzzy, no-wrap
 msgid "<command>apt-get install -t testing <replaceable>some-package</replaceable></command>\n"
 msgstr ""
@@ -3906,7 +3906,7 @@ msgstr ""
 "<command>apt-get install -t testing <replaceable>algum-pacote</replaceable></command>\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:99
+#: apt_preferences.5.xml:93
 #, fuzzy, no-wrap
 msgid "APT::Default-Release \"stable\";\n"
 msgstr ""
@@ -3914,7 +3914,7 @@ msgstr ""
 "APT::Default-Release \"stable\";\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:83
+#: apt_preferences.5.xml:77
 #, fuzzy
 msgid ""
 "If there is no preferences file or if there is no entry in the file that "
@@ -3939,7 +3939,7 @@ msgstr ""
 "etc/apt/apt.conf</filename>. Por exemplo,"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:103
+#: apt_preferences.5.xml:97
 #, fuzzy
 msgid ""
 "If the target release has been specified then APT uses the following "
@@ -3950,13 +3950,13 @@ msgstr ""
 "Atribuirá :"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:108
+#: apt_preferences.5.xml:102
 #, fuzzy
 msgid "priority 1"
 msgstr "prioridade 100"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:109
+#: apt_preferences.5.xml:103
 msgid ""
 "to the versions coming from archives which in their <filename>Release</"
 "filename> files are marked as \"NotAutomatic: yes\" but <emphasis>not</"
@@ -3965,13 +3965,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:115
+#: apt_preferences.5.xml:109
 #, fuzzy
 msgid "priority 100"
 msgstr "prioridade 100"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:116
+#: apt_preferences.5.xml:110
 msgid ""
 "to the version that is already installed (if any) and to the versions coming "
 "from archives which in their <filename>Release</filename> files are marked "
@@ -3980,13 +3980,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:123
+#: apt_preferences.5.xml:117
 #, fuzzy
 msgid "priority 500"
 msgstr "prioridade 500"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:124
+#: apt_preferences.5.xml:118
 #, fuzzy
 msgid ""
 "to the versions that are not installed and do not belong to the target "
@@ -3995,13 +3995,13 @@ msgstr ""
 "para as instâncias que não estã instaladas e que não pertencem a versão alvo."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:128
+#: apt_preferences.5.xml:122
 #, fuzzy
 msgid "priority 990"
 msgstr "prioridade 990"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:129
+#: apt_preferences.5.xml:123
 #, fuzzy
 msgid ""
 "to the versions that are not installed and belong to the target release."
@@ -4009,7 +4009,7 @@ msgstr ""
 "para as instâncias que não estejam instaladas e pertençam a versão alvo."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:134
+#: apt_preferences.5.xml:128
 #, fuzzy
 msgid ""
 "If the target release has not been specified then APT simply assigns "
@@ -4024,7 +4024,7 @@ msgstr ""
 "prioridade 500 para todas as instâncias de pacotes não instaladas."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:141
+#: apt_preferences.5.xml:135
 #, fuzzy
 msgid ""
 "APT then applies the following rules, listed in order of precedence, to "
@@ -4034,7 +4034,7 @@ msgstr ""
 "determinar qual instância de um pacote instalar."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:144
+#: apt_preferences.5.xml:138
 #, fuzzy
 msgid ""
 "Never downgrade unless the priority of an available version exceeds 1000.  "
@@ -4051,13 +4051,13 @@ msgstr ""
 "\"downgrade\" pode ser arriscado.)"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:150
+#: apt_preferences.5.xml:144
 #, fuzzy
 msgid "Install the highest priority version."
 msgstr "Instala a instância de prioridade mais alta."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:151
+#: apt_preferences.5.xml:145
 #, fuzzy
 msgid ""
 "If two or more versions have the same priority, install the most recent one "
@@ -4067,7 +4067,7 @@ msgstr ""
 "mais recente (ou seja, aquela com o maior número de versão)."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:154
+#: apt_preferences.5.xml:148
 #, fuzzy
 msgid ""
 "If two or more versions have the same priority and version number but either "
@@ -4079,7 +4079,7 @@ msgstr ""
 "<literal>--reinstall</literal> seja fornecida, instala aquela desinstalada."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:160
+#: apt_preferences.5.xml:154
 #, fuzzy
 msgid ""
 "In a typical situation, the installed version of a package (priority 100)  "
@@ -4096,7 +4096,7 @@ msgstr ""
 "forem executados."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:167
+#: apt_preferences.5.xml:161
 #, fuzzy
 msgid ""
 "More rarely, the installed version of a package is <emphasis>more</emphasis> "
@@ -4111,7 +4111,7 @@ msgstr ""
 "upgrade</command> forem executados."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:172
+#: apt_preferences.5.xml:166
 #, fuzzy
 msgid ""
 "Sometimes the installed version of a package is more recent than the version "
@@ -4131,13 +4131,13 @@ msgstr ""
 "disponíveis possuir uma prioridade maior do que a versão instalada."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:181
+#: apt_preferences.5.xml:175
 #, fuzzy
 msgid "The Effect of APT Preferences"
 msgstr "O Efeito das Preferências do APT"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:183
+#: apt_preferences.5.xml:177
 #, fuzzy
 msgid ""
 "The APT preferences file allows the system administrator to control the "
@@ -4151,7 +4151,7 @@ msgstr ""
 "das duas formas, uma forma específica e uma forma geral."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:189
+#: apt_preferences.5.xml:183
 #, fuzzy
 msgid ""
 "The specific form assigns a priority (a \"Pin-Priority\") to one or more "
@@ -4168,7 +4168,7 @@ msgstr ""
 "com \"<literal>5.8</literal>\"."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:196
+#: apt_preferences.5.xml:190
 #, fuzzy, no-wrap
 msgid ""
 "Package: perl\n"
@@ -4181,7 +4181,7 @@ msgstr ""
 "Pin-Priority: 1001\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:202
+#: apt_preferences.5.xml:196
 #, fuzzy
 msgid ""
 "The general form assigns a priority to all of the package versions in a "
@@ -4197,7 +4197,7 @@ msgstr ""
 "identificado pelo nome de domínio totalmente qualificado do site Internet."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:208
+#: apt_preferences.5.xml:202
 #, fuzzy
 msgid ""
 "This general-form entry in the APT preferences file applies only to groups "
@@ -4210,7 +4210,7 @@ msgstr ""
 "no site local."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:213
+#: apt_preferences.5.xml:207
 #, fuzzy, no-wrap
 msgid ""
 "Package: *\n"
@@ -4223,7 +4223,7 @@ msgstr ""
 "Pin-Priority: 999\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:218
+#: apt_preferences.5.xml:212
 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 "
@@ -4232,7 +4232,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:222
+#: apt_preferences.5.xml:216
 #, fuzzy, no-wrap
 msgid ""
 "Package: *\n"
@@ -4245,7 +4245,7 @@ msgstr ""
 "Pin-Priority: 999\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:226
+#: apt_preferences.5.xml:220
 #, fuzzy
 msgid ""
 "This should <emphasis>not</emphasis> be confused with the Origin of a "
@@ -4262,7 +4262,7 @@ msgstr ""
 "como \"Debian\" ou \"Ximian\"."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:231
+#: apt_preferences.5.xml:225
 #, fuzzy
 msgid ""
 "The following record assigns a low priority to all package versions "
@@ -4274,7 +4274,7 @@ msgstr ""
 "\"<literal>unstable</literal>\"."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:235
+#: apt_preferences.5.xml:229
 #, fuzzy, no-wrap
 msgid ""
 "Package: *\n"
@@ -4287,7 +4287,7 @@ msgstr ""
 "Pin-Priority: 50\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:240
+#: apt_preferences.5.xml:234
 #, fuzzy
 msgid ""
 "The following record assigns a high priority to all package versions "
@@ -4299,7 +4299,7 @@ msgstr ""
 "\"<literal>unstable</literal>\"."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:244
+#: apt_preferences.5.xml:238
 #, fuzzy, no-wrap
 msgid ""
 "Package: *\n"
@@ -4312,7 +4312,7 @@ msgstr ""
 "Pin-Priority: 50\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:249
+#: apt_preferences.5.xml:243
 #, fuzzy
 msgid ""
 "The following record assigns a high priority to all package versions "
@@ -4325,7 +4325,7 @@ msgstr ""
 "literal>\"."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:254
+#: apt_preferences.5.xml:248
 #, fuzzy, no-wrap
 msgid ""
 "Package: *\n"
@@ -4338,12 +4338,12 @@ msgstr ""
 "Pin-Priority: 50\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:264
+#: apt_preferences.5.xml:258
 msgid "Regular expressions and &glob; syntax"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:266
+#: apt_preferences.5.xml:260
 msgid ""
 "APT also supports pinning by &glob; expressions, and regular expressions "
 "surrounded by slashes. For example, the following example assigns the "
@@ -4353,7 +4353,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:275
+#: apt_preferences.5.xml:269
 #, fuzzy, no-wrap
 msgid ""
 "Package: gnome* /kde/\n"
@@ -4366,7 +4366,7 @@ msgstr ""
 "Pin-Priority: 50\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:281
+#: apt_preferences.5.xml:275
 msgid ""
 "The rule for those expressions is that they can occur anywhere where a "
 "string can occur. Thus, the following pin assigns the priority 990 to all "
@@ -4374,7 +4374,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:287
+#: apt_preferences.5.xml:281
 #, fuzzy, no-wrap
 msgid ""
 "Package: *\n"
@@ -4387,7 +4387,7 @@ msgstr ""
 "Pin-Priority: 50\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:293
+#: apt_preferences.5.xml:287
 msgid ""
 "If a regular expression occurs in a <literal>Package</literal> field, the "
 "behavior is the same as if this regular expression were replaced with a list "
@@ -4398,13 +4398,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:309
+#: apt_preferences.5.xml:303
 #, fuzzy
 msgid "How APT Interprets Priorities"
 msgstr "Como o APT Interpreta Prioridades"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:312
+#: apt_preferences.5.xml:306
 #, fuzzy
 msgid ""
 "Priorities (P) assigned in the APT preferences file must be positive or "
@@ -4415,12 +4415,12 @@ msgstr ""
 "seguir (a grosso modo):"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:317
+#: apt_preferences.5.xml:311
 msgid "P &gt;= 1000"
 msgstr "P &gt;= 1000"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:318
+#: apt_preferences.5.xml:312
 #, fuzzy
 msgid ""
 "causes a version to be installed even if this constitutes a downgrade of the "
@@ -4430,12 +4430,12 @@ msgstr ""
 "dowgrade do pacote"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:322
+#: apt_preferences.5.xml:316
 msgid "990 &lt;= P &lt; 1000"
 msgstr "990 &lt;= P &lt; 1000"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:323
+#: apt_preferences.5.xml:317
 #, fuzzy
 msgid ""
 "causes a version to be installed even if it does not come from the target "
@@ -4445,12 +4445,12 @@ msgstr ""
 "versão alvo, a menos que a versão instalada seja mais recente"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:328
+#: apt_preferences.5.xml:322
 msgid "500 &lt;= P &lt; 990"
 msgstr "500 &lt;= P &lt; 990"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:329
+#: apt_preferences.5.xml:323
 #, fuzzy
 msgid ""
 "causes a version to be installed unless there is a version available "
@@ -4460,12 +4460,12 @@ msgstr ""
 "disponível pertencente a versão alvo ou a versão instalada seja mais recente"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:334
+#: apt_preferences.5.xml:328
 msgid "100 &lt;= P &lt; 500"
 msgstr "100 &lt;= P &lt; 500"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:335
+#: apt_preferences.5.xml:329
 #, fuzzy
 msgid ""
 "causes a version to be installed unless there is a version available "
@@ -4476,12 +4476,12 @@ msgstr ""
 "seja mais recente"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:340
+#: apt_preferences.5.xml:334
 msgid "0 &lt; P &lt; 100"
 msgstr "0 &lt; P &lt; 100"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:341
+#: apt_preferences.5.xml:335
 #, fuzzy
 msgid ""
 "causes a version to be installed only if there is no installed version of "
@@ -4491,18 +4491,18 @@ msgstr ""
 "instalada do pacote"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:345
+#: apt_preferences.5.xml:339
 msgid "P &lt; 0"
 msgstr "P &lt; 0"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:346
+#: apt_preferences.5.xml:340
 #, fuzzy
 msgid "prevents the version from being installed"
 msgstr "impede a versão de ser instalada"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:351
+#: apt_preferences.5.xml:345
 #, fuzzy
 msgid ""
 "If any specific-form records match an available package version then the "
@@ -4518,7 +4518,7 @@ msgstr ""
 "determinará a prioridade da versão do pacote."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:357
+#: apt_preferences.5.xml:351
 #, fuzzy
 msgid ""
 "For example, suppose the APT preferences file contains the three records "
@@ -4528,7 +4528,7 @@ msgstr ""
 "registros apresentados anteriormente :"
 
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:361
+#: apt_preferences.5.xml:355
 #, fuzzy, no-wrap
 msgid ""
 "Package: perl\n"
@@ -4557,12 +4557,12 @@ msgstr ""
 "Pin-Priority: 50\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:374
+#: apt_preferences.5.xml:368
 msgid "Then:"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:376
+#: apt_preferences.5.xml:370
 #, fuzzy
 msgid ""
 "The most recent available version of the <literal>perl</literal> package "
@@ -4578,7 +4578,7 @@ msgstr ""
 "será feito um downgrade do <literal>perl</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:381
+#: apt_preferences.5.xml:375
 #, fuzzy
 msgid ""
 "A version of any package other than <literal>perl</literal> that is "
@@ -4590,7 +4590,7 @@ msgstr ""
 "mesmo versões pertencentes a versão alvo."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:385
+#: apt_preferences.5.xml:379
 #, fuzzy
 msgid ""
 "A version of a package whose origin is not the local system but some other "
@@ -4605,13 +4605,13 @@ msgstr ""
 "instalada."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:395
+#: apt_preferences.5.xml:389
 #, fuzzy
 msgid "Determination of Package Version and Distribution Properties"
 msgstr "Determinação da Versão do Pacote e Propriedades da Distribuição"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:397
+#: apt_preferences.5.xml:391
 #, fuzzy
 msgid ""
 "The locations listed in the &sources-list; file should provide "
@@ -4623,7 +4623,7 @@ msgstr ""
 "os pacotes disponíveis nessas localidades."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:401
+#: apt_preferences.5.xml:395
 #, fuzzy
 msgid ""
 "The <filename>Packages</filename> file is normally found in the directory "
@@ -4644,31 +4644,31 @@ msgstr ""
 "do APT :"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:409
+#: apt_preferences.5.xml:403
 #, fuzzy
 msgid "the <literal>Package:</literal> line"
 msgstr "a linha <literal>Package:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:410
+#: apt_preferences.5.xml:404
 #, fuzzy
 msgid "gives the package name"
 msgstr "informa o nome do pacote"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:413 apt_preferences.5.xml:463
+#: apt_preferences.5.xml:407 apt_preferences.5.xml:457
 #, fuzzy
 msgid "the <literal>Version:</literal> line"
 msgstr "a linha <literal>Version:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:414
+#: apt_preferences.5.xml:408
 #, fuzzy
 msgid "gives the version number for the named package"
 msgstr "informa o número de versão do pacote"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:419
+#: apt_preferences.5.xml:413
 #, fuzzy
 msgid ""
 "The <filename>Release</filename> file is normally found in the directory "
@@ -4691,13 +4691,13 @@ msgstr ""
 "do APT :"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:430
+#: apt_preferences.5.xml:424
 #, fuzzy
 msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
 msgstr "a linha <literal>Archive:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:431
+#: apt_preferences.5.xml:425
 #, fuzzy
 msgid ""
 "names the archive to which all the packages in the directory tree belong.  "
@@ -4715,7 +4715,7 @@ msgstr ""
 "requerer a linha :"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:441
+#: apt_preferences.5.xml:435
 #, fuzzy, no-wrap
 msgid "Pin: release a=stable\n"
 msgstr ""
@@ -4723,13 +4723,13 @@ msgstr ""
 "Pin: release a=stable\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:447
+#: apt_preferences.5.xml:441
 #, fuzzy
 msgid "the <literal>Codename:</literal> line"
 msgstr "a linha <literal>Component:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:448
+#: apt_preferences.5.xml:442
 #, fuzzy
 msgid ""
 "names the codename to which all the packages in the directory tree belong.  "
@@ -4747,7 +4747,7 @@ msgstr ""
 "requerer a linha :"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:457
+#: apt_preferences.5.xml:451
 #, fuzzy, no-wrap
 msgid "Pin: release n=&testing-codename;\n"
 msgstr ""
@@ -4755,7 +4755,7 @@ msgstr ""
 "Pin: release a=stable\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:464
+#: apt_preferences.5.xml:458
 #, fuzzy
 msgid ""
 "names the release version.  For example, the packages in the tree might "
@@ -4773,7 +4773,7 @@ msgstr ""
 "linhas a seguir."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:473
+#: apt_preferences.5.xml:467
 #, fuzzy, no-wrap
 msgid ""
 "Pin: release v=&stable-version;\n"
@@ -4786,13 +4786,13 @@ msgstr ""
 "Pin: release 3.0\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:482
+#: apt_preferences.5.xml:476
 #, fuzzy
 msgid "the <literal>Component:</literal> line"
 msgstr "a linha <literal>Component:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:483
+#: apt_preferences.5.xml:477
 #, fuzzy
 msgid ""
 "names the licensing component associated with the packages in the directory "
@@ -4811,7 +4811,7 @@ msgstr ""
 "requerer a linha :"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:492
+#: apt_preferences.5.xml:486
 #, fuzzy, no-wrap
 msgid "Pin: release c=main\n"
 msgstr ""
@@ -4819,13 +4819,13 @@ msgstr ""
 "Pin: release c=main\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:498
+#: apt_preferences.5.xml:492
 #, fuzzy
 msgid "the <literal>Origin:</literal> line"
 msgstr "a linha <literal>Origin:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:499
+#: apt_preferences.5.xml:493
 #, fuzzy
 msgid ""
 "names the originator of the packages in the directory tree of the "
@@ -4839,7 +4839,7 @@ msgstr ""
 "requerer a linha :"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:505
+#: apt_preferences.5.xml:499
 #, fuzzy, no-wrap
 msgid "Pin: release o=Debian\n"
 msgstr ""
@@ -4847,13 +4847,13 @@ msgstr ""
 "Pin: release o=Debian\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:511
+#: apt_preferences.5.xml:505
 #, fuzzy
 msgid "the <literal>Label:</literal> line"
 msgstr "a linha <literal>Label:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:512
+#: apt_preferences.5.xml:506
 #, fuzzy
 msgid ""
 "names the label of the packages in the directory tree of the "
@@ -4866,7 +4866,7 @@ msgstr ""
 "arquivo de preferências do APT iria requerer a linha :"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:518
+#: apt_preferences.5.xml:512
 #, fuzzy, no-wrap
 msgid "Pin: release l=Debian\n"
 msgstr ""
@@ -4874,7 +4874,7 @@ msgstr ""
 "Pin: release l=Debian\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:525
+#: apt_preferences.5.xml:519
 #, fuzzy
 msgid ""
 "All of the <filename>Packages</filename> and <filename>Release</filename> "
@@ -4900,13 +4900,13 @@ msgstr ""
 "<literal>unstable</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:538
+#: apt_preferences.5.xml:532
 #, fuzzy
 msgid "Optional Lines in an APT Preferences Record"
 msgstr "Linhas Opcionais em um Registro de Preferências do APT"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:540
+#: apt_preferences.5.xml:534
 #, fuzzy
 msgid ""
 "Each record in the APT preferences file can optionally begin with one or "
@@ -4918,13 +4918,13 @@ msgstr ""
 "</literal>. Isto oferece um local para inserir comentários."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:549
+#: apt_preferences.5.xml:543
 #, fuzzy
 msgid "Tracking Stable"
 msgstr "Acompanhando a Stable"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:557
+#: apt_preferences.5.xml:551
 #, fuzzy, no-wrap
 msgid ""
 "Explanation: Uninstall or do not install any Debian-originated\n"
@@ -4949,7 +4949,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:551
+#: apt_preferences.5.xml:545
 #, fuzzy
 msgid ""
 "The following APT preferences file will cause APT to assign a priority "
@@ -4965,8 +4965,8 @@ msgstr ""
 "outras distribuições <literal>Debian</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:574 apt_preferences.5.xml:620
-#: apt_preferences.5.xml:678
+#: apt_preferences.5.xml:568 apt_preferences.5.xml:614
+#: apt_preferences.5.xml:672
 #, fuzzy, no-wrap
 msgid ""
 "apt-get install <replaceable>package-name</replaceable>\n"
@@ -4979,7 +4979,7 @@ msgstr ""
 "apt-get dist-upgrade\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:569
+#: apt_preferences.5.xml:563
 #, fuzzy
 msgid ""
 "With a suitable &sources-list; file and the above preferences file, any of "
@@ -4992,7 +4992,7 @@ msgstr ""
 "ulítma(s) versão(ôes) <literal>stable</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:586
+#: apt_preferences.5.xml:580
 #, fuzzy, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/testing\n"
 msgstr ""
@@ -5000,7 +5000,7 @@ msgstr ""
 "apt-get install <replaceable>pacote</replaceable>/testing\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:580
+#: apt_preferences.5.xml:574
 #, fuzzy
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
@@ -5013,13 +5013,13 @@ msgstr ""
 "atualizado novamente a menos que esse comando seja executado novamente."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:592
+#: apt_preferences.5.xml:586
 #, fuzzy
 msgid "Tracking Testing or Unstable"
 msgstr "Acompanhando a Testing"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:601
+#: apt_preferences.5.xml:595
 #, fuzzy, no-wrap
 msgid ""
 "Package: *\n"
@@ -5048,7 +5048,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:594
+#: apt_preferences.5.xml:588
 #, fuzzy
 msgid ""
 "The following APT preferences file will cause APT to assign a high priority "
@@ -5065,7 +5065,7 @@ msgstr ""
 "versões de pacotes de outras distribuições <literal>Debian</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:615
+#: apt_preferences.5.xml:609
 #, fuzzy
 msgid ""
 "With a suitable &sources-list; file and the above preferences file, any of "
@@ -5078,7 +5078,7 @@ msgstr ""
 "a(s) última(s) versão(ões) <literal>testing</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:635
+#: apt_preferences.5.xml:629
 #, fuzzy, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
 msgstr ""
@@ -5086,7 +5086,7 @@ msgstr ""
 "apt-get install <replaceable>pacote</replaceable>/unstable\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:626
+#: apt_preferences.5.xml:620
 #, fuzzy
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
@@ -5106,12 +5106,12 @@ msgstr ""
 "recente que a versão instalada."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:642
+#: apt_preferences.5.xml:636
 msgid "Tracking the evolution of a codename release"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:656
+#: apt_preferences.5.xml:650
 #, fuzzy, no-wrap
 msgid ""
 "Explanation: Uninstall or do not install any Debian-originated package versions\n"
@@ -5141,7 +5141,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:644
+#: apt_preferences.5.xml:638
 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 "
@@ -5156,7 +5156,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:673
+#: apt_preferences.5.xml:667
 #, fuzzy
 msgid ""
 "With a suitable &sources-list; file and the above preferences file, any of "
@@ -5169,7 +5169,7 @@ msgstr ""
 "ulítma(s) versão(ôes) <literal>stable</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:693
+#: apt_preferences.5.xml:687
 #, fuzzy, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/sid\n"
 msgstr ""
@@ -5177,7 +5177,7 @@ msgstr ""
 "apt-get install <replaceable>pacote</replaceable>/testing\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:684
+#: apt_preferences.5.xml:678
 #, fuzzy
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
@@ -5197,18 +5197,18 @@ msgstr ""
 "recente que a versão instalada."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:708
+#: apt_preferences.5.xml:702
 #, fuzzy
 msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: sources.list.5.xml:35
+#: sources.list.5.xml:29
 msgid "List of configured APT data sources"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:40
+#: sources.list.5.xml:34
 msgid ""
 "The source list <filename>/etc/apt/sources.list</filename> is designed to "
 "support any number of active sources and a variety of source media. The file "
@@ -5219,7 +5219,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:47
+#: sources.list.5.xml:41
 msgid ""
 "Each line specifying a source starts with type (e.g. <literal>deb-src</"
 "literal>)  followed by options and arguments for this type.  Individual "
@@ -5229,12 +5229,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:55
+#: sources.list.5.xml:49
 msgid "sources.list.d"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:56
+#: sources.list.5.xml:50
 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 "
@@ -5247,12 +5247,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:67
+#: sources.list.5.xml:61
 msgid "The deb and deb-src types"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:68
+#: sources.list.5.xml:62
 msgid ""
 "The <literal>deb</literal> type references a typical two-level Debian "
 "archive, <filename>distribution/component</filename>. The "
@@ -5267,20 +5267,20 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:79
+#: sources.list.5.xml:73
 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:82
+#: sources.list.5.xml:76
 #, no-wrap
 msgid "deb [ options ] uri suite [component1] [component2] [...]"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:86
+#: sources.list.5.xml:80
 #, no-wrap
 msgid ""
 "     Types: deb deb-src\n"
@@ -5303,14 +5303,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:84
+#: sources.list.5.xml:78
 msgid ""
 "Alternatively a rfc822 style format is also supported: <placeholder type="
 "\"literallayout\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:105
+#: sources.list.5.xml:99
 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.  "
@@ -5323,7 +5323,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:114
+#: sources.list.5.xml:108
 msgid ""
 "<literal>suite</literal> may also contain a variable, <literal>$(ARCH)</"
 "literal> which expands to the Debian architecture (such as <literal>amd64</"
@@ -5335,7 +5335,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:122
+#: sources.list.5.xml:116
 msgid ""
 "In the traditional style sources.list format since only one distribution can "
 "be specified per line it may be necessary to have multiple lines for the "
@@ -5351,7 +5351,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:136
+#: sources.list.5.xml:130
 msgid ""
 "<literal>options</literal> is always optional and needs to be surrounded by "
 "square brackets. It can consist of multiple settings in the form "
@@ -5362,7 +5362,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:142
+#: sources.list.5.xml:136
 msgid ""
 "<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
 "replaceable>,…</literal> can be used to specify for which architectures "
@@ -5372,7 +5372,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:146
+#: sources.list.5.xml:140
 msgid ""
 "<literal>arch+=<replaceable>arch1</replaceable>,<replaceable>arch2</"
 "replaceable>,…</literal> and <literal>arch-=<replaceable>arch1</replaceable>,"
@@ -5381,7 +5381,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:149
+#: sources.list.5.xml:143
 msgid ""
 "<literal>trusted=yes</literal> can be set to indicate that packages from "
 "this source are always authenticated even if the <filename>Release</"
@@ -5392,7 +5392,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:156
+#: sources.list.5.xml:150
 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 "
@@ -5401,13 +5401,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:161
+#: sources.list.5.xml:155
 #, fuzzy
 msgid "Some examples:"
 msgstr "Exemplos"
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:163
+#: sources.list.5.xml:157
 #, no-wrap
 msgid ""
 "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
@@ -5416,17 +5416,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:169
+#: sources.list.5.xml:163
 msgid "URI specification"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:171
+#: sources.list.5.xml:165
 msgid "The currently recognized URI types are:"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:175
+#: sources.list.5.xml:169
 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 "
@@ -5434,14 +5434,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:182
+#: sources.list.5.xml:176
 msgid ""
 "The cdrom scheme allows APT to use a local CD-ROM drive with media swapping. "
 "Use the &apt-cdrom; program to create cdrom entries in the source list."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:189
+#: sources.list.5.xml:183
 msgid ""
 "The http scheme specifies an HTTP server for the archive. If an environment "
 "variable <envar>http_proxy</envar> is set with the format http://server:"
@@ -5452,7 +5452,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:200
+#: sources.list.5.xml:194
 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 page. "
@@ -5465,7 +5465,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:212
+#: sources.list.5.xml:206
 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.  "
@@ -5474,7 +5474,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:219
+#: sources.list.5.xml:213
 msgid ""
 "The rsh/ssh method invokes RSH/SSH to connect to a remote host and access "
 "the files as a given user. Prior configuration of rhosts or RSA keys is "
@@ -5483,12 +5483,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:226
+#: sources.list.5.xml:220
 msgid "adding more recognizable URI types"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:228
+#: sources.list.5.xml:222
 msgid ""
 "APT can be extended with more methods shipped in other optional packages, "
 "which should follow the naming scheme <package>apt-transport-"
@@ -5500,42 +5500,42 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:240
+#: sources.list.5.xml:234
 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:242
+#: sources.list.5.xml:236
 #, no-wrap
 msgid "deb file:/home/jason/debian stable main contrib non-free"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:244
+#: sources.list.5.xml:238
 msgid "As above, except this uses the unstable (development) distribution."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:245
+#: sources.list.5.xml:239
 #, no-wrap
 msgid "deb file:/home/jason/debian unstable main contrib non-free"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:247
+#: sources.list.5.xml:241
 msgid "Source line for the above"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:248
+#: sources.list.5.xml:242
 #, 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:250
+#: sources.list.5.xml:244
 msgid ""
 "The first line gets package information for the architectures in "
 "<literal>APT::Architectures</literal> while the second always retrieves "
@@ -5543,7 +5543,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:252
+#: sources.list.5.xml:246
 #, no-wrap
 msgid ""
 "deb http://ftp.debian.org/debian &stable-codename; main\n"
@@ -5551,33 +5551,33 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:255
+#: sources.list.5.xml:249
 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:257
+#: sources.list.5.xml:251
 #, no-wrap
 msgid "deb http://archive.debian.org/debian-archive hamm main"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:259
+#: sources.list.5.xml:253
 msgid ""
 "Uses FTP to access the archive at ftp.debian.org, under the debian "
 "directory, and uses only the &stable-codename;/contrib area."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:261
+#: sources.list.5.xml:255
 #, no-wrap
 msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:263
+#: sources.list.5.xml:257
 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 "
@@ -5586,19 +5586,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:267
+#: sources.list.5.xml:261
 #, no-wrap
 msgid "deb ftp://ftp.debian.org/debian unstable contrib"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:276
+#: sources.list.5.xml:270
 #, no-wrap
 msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:269
+#: sources.list.5.xml:263
 msgid ""
 "Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe "
 "directory, and uses only files found under <filename>unstable/binary-i386</"
@@ -5610,25 +5610,25 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:281
+#: sources.list.5.xml:275
 #, fuzzy
 msgid "&apt-cache; &apt-conf;"
 msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 
 #. type: Content of: <refentry><refmeta><manvolnum>
-#: apt-extracttemplates.1.xml:28 apt-sortpkgs.1.xml:28 apt-ftparchive.1.xml:28
+#: apt-extracttemplates.1.xml:22 apt-sortpkgs.1.xml:22 apt-ftparchive.1.xml:22
 msgid "1"
 msgstr ""
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-extracttemplates.1.xml:35
+#: apt-extracttemplates.1.xml:29
 msgid ""
 "Utility to extract <command>debconf</command> config and templates from "
 "Debian packages"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:41
+#: apt-extracttemplates.1.xml:35
 msgid ""
 "<command>apt-extracttemplates</command> will take one or more Debian package "
 "files as input and write out (to a temporary directory) all associated "
@@ -5638,12 +5638,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:46
+#: apt-extracttemplates.1.xml:40
 msgid "package version template-file config-script"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:47
+#: apt-extracttemplates.1.xml:41
 msgid ""
 "template-file and config-script are written to the temporary directory "
 "specified by the <option>-t</option> or <option>--tempdir</option> "
@@ -5653,7 +5653,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-extracttemplates.1.xml:60
+#: apt-extracttemplates.1.xml:54
 msgid ""
 "Temporary directory in which to write extracted <command>debconf</command> "
 "template files and config scripts.  Configuration Item: <literal>APT::"
@@ -5661,19 +5661,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:77
+#: apt-extracttemplates.1.xml:71
 msgid ""
 "<command>apt-extracttemplates</command> returns zero on normal operation, "
 "decimal 100 on error."
 msgstr ""
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-sortpkgs.1.xml:35
+#: apt-sortpkgs.1.xml:29
 msgid "Utility to sort package index files"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-sortpkgs.1.xml:41
+#: apt-sortpkgs.1.xml:35
 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 "
@@ -5682,32 +5682,32 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-sortpkgs.1.xml:47
+#: apt-sortpkgs.1.xml:41
 msgid ""
 "All output is sent to standard output; the input must be a seekable file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-sortpkgs.1.xml:56
+#: apt-sortpkgs.1.xml:50
 msgid ""
 "Use source index field ordering.  Configuration Item: <literal>APT::"
 "SortPkgs::Source</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-sortpkgs.1.xml:70
+#: apt-sortpkgs.1.xml:64
 msgid ""
 "<command>apt-sortpkgs</command> returns zero on normal operation, decimal "
 "100 on error."
 msgstr ""
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-ftparchive.1.xml:35
+#: apt-ftparchive.1.xml:29
 msgid "Utility to generate index files"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:41
+#: apt-ftparchive.1.xml:35
 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 "
@@ -5716,7 +5716,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:45
+#: apt-ftparchive.1.xml:39
 msgid ""
 "<command>apt-ftparchive</command> is a superset of the &dpkg-scanpackages; "
 "program, incorporating its entire functionality via the <literal>packages</"
@@ -5726,7 +5726,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:51
+#: apt-ftparchive.1.xml:45
 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 "
@@ -5736,7 +5736,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:62
+#: apt-ftparchive.1.xml:56
 msgid ""
 "The packages command generates a package file from a directory tree. It "
 "takes the given directory and recursively searches it for .deb files, "
@@ -5745,13 +5745,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:67 apt-ftparchive.1.xml:91
+#: apt-ftparchive.1.xml:61 apt-ftparchive.1.xml:85
 msgid ""
 "The option <option>--db</option> can be used to specify a binary caching DB."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:72
+#: apt-ftparchive.1.xml:66
 msgid ""
 "The <literal>sources</literal> command generates a source index file from a "
 "directory tree.  It takes the given directory and recursively searches it "
@@ -5760,7 +5760,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:77
+#: apt-ftparchive.1.xml:71
 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 "
@@ -5768,7 +5768,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:84
+#: apt-ftparchive.1.xml:78
 msgid ""
 "The <literal>contents</literal> command generates a contents file from a "
 "directory tree. It takes the given directory and recursively searches it "
@@ -5779,7 +5779,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:96
+#: apt-ftparchive.1.xml:90
 msgid ""
 "The <literal>release</literal> command generates a Release file from a "
 "directory tree. It recursively searches the given directory for uncompressed "
@@ -5794,7 +5794,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:106
+#: apt-ftparchive.1.xml:100
 msgid ""
 "Values for the additional metadata fields in the Release file are taken from "
 "the corresponding variables under <literal>APT::FTPArchive::Release</"
@@ -5807,7 +5807,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:119
+#: apt-ftparchive.1.xml:113
 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 "
@@ -5817,19 +5817,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:128
+#: apt-ftparchive.1.xml:122
 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:134
+#: apt-ftparchive.1.xml:128
 msgid "The Generate Configuration"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:136
+#: apt-ftparchive.1.xml:130
 msgid ""
 "The <literal>generate</literal> command uses a configuration file to "
 "describe the archives that are going to be generated. It follows the typical "
@@ -5840,19 +5840,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:144
+#: apt-ftparchive.1.xml:138
 msgid ""
 "The generate configuration has four separate sections, each described below."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:146
+#: apt-ftparchive.1.xml:140
 #, fuzzy
 msgid "<literal>Dir</literal> Section"
 msgstr "a linha <literal>Origin:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:148
+#: apt-ftparchive.1.xml:142
 msgid ""
 "The <literal>Dir</literal> section defines the standard directories needed "
 "to locate the files required during the generation process. These "
@@ -5861,7 +5861,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:155
+#: apt-ftparchive.1.xml:149
 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 "
@@ -5869,30 +5869,30 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:162
+#: apt-ftparchive.1.xml:156
 msgid "Specifies the location of the override files."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:167
+#: apt-ftparchive.1.xml:161
 msgid "Specifies the location of the cache files."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:172
+#: apt-ftparchive.1.xml:166
 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:178
+#: apt-ftparchive.1.xml:172
 #, fuzzy
 msgid "<literal>Default</literal> Section"
 msgstr "a linha <literal>Label:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:180
+#: apt-ftparchive.1.xml:174
 msgid ""
 "The <literal>Default</literal> section specifies default values, and "
 "settings that control the operation of the generator. Other sections may "
@@ -5900,7 +5900,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:186
+#: apt-ftparchive.1.xml:180
 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 "
@@ -5909,42 +5909,42 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:194
+#: apt-ftparchive.1.xml:188
 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><listitem><para>
-#: apt-ftparchive.1.xml:200
+#: apt-ftparchive.1.xml:194
 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><listitem><para>
-#: apt-ftparchive.1.xml:206
+#: apt-ftparchive.1.xml:200
 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><listitem><para>
-#: apt-ftparchive.1.xml:212
+#: apt-ftparchive.1.xml:206
 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><listitem><para>
-#: apt-ftparchive.1.xml:218
+#: apt-ftparchive.1.xml:212
 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><listitem><para>
-#: apt-ftparchive.1.xml:224
+#: apt-ftparchive.1.xml:218
 msgid ""
 "Specifies the number of kilobytes to delink (and replace with hard links) "
 "per run. This is used in conjunction with the per-section <literal>External-"
@@ -5952,14 +5952,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:231
+#: apt-ftparchive.1.xml:225
 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><listitem><para>
-#: apt-ftparchive.1.xml:238 apt-ftparchive.1.xml:384
+#: apt-ftparchive.1.xml:232 apt-ftparchive.1.xml:378
 msgid ""
 "Specifies whether long descriptions should be included in the "
 "<filename>Packages</filename> file or split out into a master "
@@ -5967,13 +5967,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:244
+#: apt-ftparchive.1.xml:238
 #, fuzzy
 msgid "<literal>TreeDefault</literal> Section"
 msgstr "a linha <literal>Label:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:246
+#: apt-ftparchive.1.xml:240
 msgid ""
 "Sets defaults specific to <literal>Tree</literal> sections. All of these "
 "variables are substitution variables and have the strings $(DIST), "
@@ -5981,7 +5981,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:253
+#: apt-ftparchive.1.xml:247
 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 will all "
@@ -5989,7 +5989,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:260
+#: apt-ftparchive.1.xml:254
 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 updated. "
@@ -6000,35 +6000,35 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:271
+#: apt-ftparchive.1.xml:265
 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><listitem><para>
-#: apt-ftparchive.1.xml:277
+#: apt-ftparchive.1.xml:271
 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><listitem><para>
-#: apt-ftparchive.1.xml:283
+#: apt-ftparchive.1.xml:277
 msgid ""
 "Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
 "binary-$(ARCH)/Packages</filename>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:289
+#: apt-ftparchive.1.xml:283
 msgid ""
 "Sets the output Sources file. Defaults to <filename>$(DIST)/$(SECTION)/"
 "source/Sources</filename>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:295
+#: apt-ftparchive.1.xml:289
 msgid ""
 "Sets the output Translation-en master file with the long descriptions if "
 "they should be not included in the Packages file. Defaults to <filename>"
@@ -6036,7 +6036,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:302
+#: apt-ftparchive.1.xml:296
 msgid ""
 "Sets the path prefix that causes a symlink to be considered an internal link "
 "instead of an external link. Defaults to <filename>$(DIST)/$(SECTION)/</"
@@ -6044,7 +6044,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:309
+#: apt-ftparchive.1.xml:303
 msgid ""
 "Sets the output Contents file. Defaults to <filename>$(DIST)/$(SECTION)/"
 "Contents-$(ARCH)</filename>. If this setting causes multiple Packages files "
@@ -6054,19 +6054,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:318
+#: apt-ftparchive.1.xml:312
 msgid "Sets header file to prepend to the contents output."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:323
+#: apt-ftparchive.1.xml:317
 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><listitem><para>
-#: apt-ftparchive.1.xml:329
+#: apt-ftparchive.1.xml:323
 msgid ""
 "Specifies that instead of walking the directory tree, <command>apt-"
 "ftparchive</command> should read the list of files from the given file. "
@@ -6074,7 +6074,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:336
+#: apt-ftparchive.1.xml:330
 msgid ""
 "Specifies that instead of walking the directory tree, <command>apt-"
 "ftparchive</command> should read the list of files from the given file. "
@@ -6083,13 +6083,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:344
+#: apt-ftparchive.1.xml:338
 #, fuzzy
 msgid "<literal>Tree</literal> Section"
 msgstr "a linha <literal>Label:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:346
+#: apt-ftparchive.1.xml:340
 msgid ""
 "The <literal>Tree</literal> section defines a standard Debian file tree "
 "which consists of a base directory, then multiple sections in that base "
@@ -6099,7 +6099,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:351
+#: apt-ftparchive.1.xml:345
 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 "
@@ -6108,7 +6108,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:356
+#: apt-ftparchive.1.xml:350
 msgid ""
 "All of the settings defined in the <literal>TreeDefault</literal> section "
 "can be used in a <literal>Tree</literal> section as well as three new "
@@ -6116,7 +6116,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt-ftparchive.1.xml:362
+#: apt-ftparchive.1.xml:356
 #, no-wrap
 msgid ""
 "for i in Sections do \n"
@@ -6126,7 +6126,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:359
+#: apt-ftparchive.1.xml:353
 msgid ""
 "When processing a <literal>Tree</literal> section <command>apt-ftparchive</"
 "command> performs an operation similar to: <placeholder type=\"programlisting"
@@ -6134,7 +6134,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:370
+#: apt-ftparchive.1.xml:364
 msgid ""
 "This is a space separated list of sections which appear under the "
 "distribution; typically this is something like <literal>main contrib non-"
@@ -6142,7 +6142,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:377
+#: apt-ftparchive.1.xml:371
 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 "
@@ -6150,37 +6150,37 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:390
+#: apt-ftparchive.1.xml:384
 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><listitem><para>
-#: apt-ftparchive.1.xml:396
+#: apt-ftparchive.1.xml:390
 msgid ""
 "Sets the source override file. The override file contains section "
 "information."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:402 apt-ftparchive.1.xml:448
+#: apt-ftparchive.1.xml:396 apt-ftparchive.1.xml:442
 msgid "Sets the binary extra override file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:407 apt-ftparchive.1.xml:453
+#: apt-ftparchive.1.xml:401 apt-ftparchive.1.xml:447
 msgid "Sets the source extra override file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:412
+#: apt-ftparchive.1.xml:406
 #, fuzzy
 msgid "<literal>BinDirectory</literal> Section"
 msgstr "a linha <literal>Component:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:414
+#: apt-ftparchive.1.xml:408
 msgid ""
 "The <literal>bindirectory</literal> section defines a binary directory tree "
 "with no special structure. The scope tag specifies the location of the "
@@ -6190,54 +6190,54 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:422
+#: apt-ftparchive.1.xml:416
 msgid "Sets the Packages file output."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:427
+#: apt-ftparchive.1.xml:421
 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:433
+#: apt-ftparchive.1.xml:427
 msgid "Sets the Contents file output (optional)."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:438
+#: apt-ftparchive.1.xml:432
 msgid "Sets the binary override file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:443
+#: apt-ftparchive.1.xml:437
 msgid "Sets the source override file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:458
+#: apt-ftparchive.1.xml:452
 msgid "Sets the cache DB."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:463
+#: apt-ftparchive.1.xml:457
 msgid "Appends a path to all the output paths."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:468
+#: apt-ftparchive.1.xml:462
 msgid "Specifies the file list file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:475
+#: apt-ftparchive.1.xml:469
 msgid "The Binary Override File"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:476
+#: apt-ftparchive.1.xml:470
 msgid ""
 "The binary override file is fully compatible with &dpkg-scanpackages;. It "
 "contains four fields separated by spaces. The first field is the package "
@@ -6247,19 +6247,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:482
+#: apt-ftparchive.1.xml:476
 #, no-wrap
 msgid "old [// oldn]* => new"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:484
+#: apt-ftparchive.1.xml:478
 #, no-wrap
 msgid "new"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:481
+#: apt-ftparchive.1.xml:475
 msgid ""
 "The general form of the maintainer field is: <placeholder type="
 "\"literallayout\" id=\"0\"/> or simply, <placeholder type=\"literallayout\" "
@@ -6270,12 +6270,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:492
+#: apt-ftparchive.1.xml:486
 msgid "The Source Override File"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:494
+#: apt-ftparchive.1.xml:488
 msgid ""
 "The source override file is fully compatible with &dpkg-scansources;. It "
 "contains two fields separated by spaces. The first field is the source "
@@ -6283,12 +6283,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:499
+#: apt-ftparchive.1.xml:493
 msgid "The Extra Override File"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:501
+#: apt-ftparchive.1.xml:495
 msgid ""
 "The extra override file allows any arbitrary tag to be added or replaced in "
 "the output. It has three columns, the first is the package, the second is "
@@ -6296,7 +6296,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:512
+#: apt-ftparchive.1.xml:506
 msgid ""
 "Generate the given checksum. These options default to on, when turned off "
 "the generated index files will not have the checksum fields where possible.  "
@@ -6310,14 +6310,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:523
+#: apt-ftparchive.1.xml:517
 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:529
+#: apt-ftparchive.1.xml:523
 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 "
@@ -6326,7 +6326,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:537
+#: apt-ftparchive.1.xml:531
 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 "
@@ -6335,7 +6335,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:545
+#: apt-ftparchive.1.xml:539
 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 "
@@ -6345,7 +6345,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:555
+#: apt-ftparchive.1.xml:549
 msgid ""
 "Select the source override file to use with the <literal>sources</literal> "
 "command.  Configuration Item: <literal>APT::FTPArchive::SourceOverride</"
@@ -6353,14 +6353,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:561
+#: apt-ftparchive.1.xml:555
 msgid ""
 "Make the caching databases read only.  Configuration Item: <literal>APT::"
 "FTPArchive::ReadOnlyDB</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:566
+#: apt-ftparchive.1.xml:560
 msgid ""
 "Accept in the <literal>packages</literal> and <literal>contents</literal> "
 "commands only package files matching <literal>*_arch.deb</literal> or "
@@ -6369,7 +6369,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:574
+#: apt-ftparchive.1.xml:568
 msgid ""
 "&apt-ftparchive; caches as much as possible of metadata in a cachedb. If "
 "packages are recompiled and/or republished with the same version again, this "
@@ -6383,7 +6383,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:586
+#: apt-ftparchive.1.xml:580
 msgid ""
 "This configuration option defaults to \"<literal>true</literal>\" and should "
 "only be set to <literal>\"false\"</literal> if the Archive generated with "
@@ -6393,53 +6393,69 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><programlisting>
-#: apt-ftparchive.1.xml:604
+#: apt-ftparchive.1.xml:598
 #, no-wrap
 msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:600
+#: apt-ftparchive.1.xml:594
 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:614
+#: apt-ftparchive.1.xml:608
 msgid ""
 "<command>apt-ftparchive</command> returns zero on normal operation, decimal "
 "100 on error."
 msgstr ""
 
-#. type: <title></title>
-#: guide.sgml:4
+#. type: Attribute 'lang' of: <book>
+#: guide.dbk:9 offline.dbk:9
+msgid "en"
+msgstr ""
+
+#. type: Content of: <book><title>
+#: guide.dbk:11
 msgid "APT User's Guide"
 msgstr ""
 
-#. type: <author></author>
-#: guide.sgml:6 offline.sgml:6
-msgid "<name>Jason Gunthorpe </name><email>jgg@debian.org</email>"
+#. type: Content of: <book><bookinfo><authorgroup><author><personname>
+#: guide.dbk:17 offline.dbk:17
+msgid "Jason Gunthorpe"
+msgstr ""
+
+#. type: Content of: <book><bookinfo><authorgroup><author><email>
+#: guide.dbk:17 offline.dbk:17
+msgid "jgg@debian.org"
 msgstr ""
 
-#. type: <version></version>
-#: guide.sgml:7
-msgid "$Id: guide.sgml,v 1.7 2003/04/26 23:26:13 doogie Exp $"
+#. type: Content of: <book><bookinfo><releaseinfo>
+#: guide.dbk:21 offline.dbk:21
+msgid "Version &apt-product-version;"
 msgstr ""
 
-#. type: <abstract></abstract>
-#: guide.sgml:11
+#. type: Content of: <book><bookinfo><abstract><para>
+#: guide.dbk:25
 msgid ""
 "This document provides an overview of how to use the the APT package manager."
 msgstr ""
 
-#. type: <copyrightsummary></copyrightsummary>
-#: guide.sgml:15
-msgid "Copyright &copy; Jason Gunthorpe, 1998."
+#. type: Content of: <book><bookinfo>
+#: guide.dbk:29
+msgid ""
+"<copyright><year>1998</year><holder>Jason Gunthorpe</holder></copyright>"
+msgstr ""
+
+#. type: Content of: <book><bookinfo><legalnotice><title>
+#: guide.dbk:32 offline.dbk:33
+msgid "License Notice"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:21 offline.sgml:22
+#. type: Content of: <book><bookinfo><legalnotice><para>
+#: guide.dbk:34 offline.dbk:35
 msgid ""
 "\"APT\" and this document are free software; you can redistribute them and/"
 "or modify them under the terms of the GNU General Public License as "
@@ -6447,42 +6463,42 @@ msgid ""
 "or (at your option) any later version."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:24 offline.sgml:25
+#. type: Content of: <book><bookinfo><legalnotice><para>
+#: guide.dbk:43 offline.dbk:41
 msgid ""
 "For more details, on Debian systems, see the file /usr/share/common-licenses/"
 "GPL for the full license."
 msgstr ""
 
-#. type: <heading></heading>
-#: guide.sgml:32
+#. type: Content of: <book><chapter><title>
+#: guide.dbk:50
 msgid "General"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:38
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:52
 msgid ""
-"The APT package currently contains two sections, the APT <prgn>dselect</"
-"prgn> method and the <prgn>apt-get</prgn> command line user interface. Both "
-"provide a way to install and remove packages as well as download new "
-"packages from the Internet."
+"The APT package currently contains two sections, the APT <command>dselect</"
+"command> method and the <command>apt-get</command> command line user "
+"interface. Both provide a way to install and remove packages as well as "
+"download new packages from the Internet."
 msgstr ""
 
-#. type: <heading></heading>
-#: guide.sgml:39
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:58
 msgid "Anatomy of the Package System"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:44
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:60
 msgid ""
 "The Debian packaging system has a large amount of information associated "
 "with each package to help assure that it integrates cleanly and easily into "
 "the system. The most prominent of its features is the dependency system."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:52
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:65
 msgid ""
 "The dependency system allows individual programs to make use of shared "
 "elements in the system such as libraries. It simplifies placing infrequently "
@@ -6491,8 +6507,8 @@ msgid ""
 "in mail transport agents, X servers and so on."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:57
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:72
 msgid ""
 "The first step to understanding the dependency system is to grasp the "
 "concept of a simple dependency. The meaning of a simple dependency is that a "
@@ -6500,8 +6516,8 @@ msgid ""
 "properly."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:63
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:77
 msgid ""
 "For instance, mailcrypt is an emacs extension that aids in encrypting email "
 "with GPG. Without GPGP installed mailcrypt is useless, so mailcrypt has a "
@@ -6509,8 +6525,8 @@ msgid ""
 "simple dependency on emacs, without emacs it is completely useless."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:73
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:83
 msgid ""
 "The other important dependency to understand is a conflicting dependency. It "
 "means that a package, when installed with another package, will not work and "
@@ -6522,8 +6538,8 @@ msgid ""
 "other mail transport agents."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:83
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:93
 msgid ""
 "As an added complication there is the possibility for a package to pretend "
 "to be another package. Consider that exim and sendmail for many intents are "
@@ -6535,8 +6551,8 @@ msgid ""
 "trying to manually fix packages."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:88
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:103
 msgid ""
 "At any given time a single dependency may be met by packages that are "
 "already installed or it may not be. APT attempts to help resolve dependency "
@@ -6544,71 +6560,77 @@ msgid ""
 "packages for installation."
 msgstr ""
 
-#. type: <heading></heading>
-#: guide.sgml:96
+#. type: Content of: <book><chapter><title>
+#: guide.dbk:112
 msgid "apt-get"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:102
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:114
 msgid ""
-"<prgn>apt-get</prgn> provides a simple way to install packages from the "
-"command line. Unlike <prgn>dpkg</prgn>, <prgn>apt-get</prgn> does not "
-"understand .deb files, it works with the package's proper name and can only "
-"install .deb archives from a <em>Source</em>."
+"<command>apt-get</command> provides a simple way to install packages from "
+"the command line. Unlike <command>dpkg</command>, <command>apt-get</command> "
+"does not understand .deb files, it works with the package's proper name and "
+"can only install .deb archives from a <emphasis>Source</emphasis>."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:109
+#. type: Content of: <book><chapter><para><footnote><para>
+#: guide.dbk:120
 msgid ""
-"The first <footnote><p>If you are using an http proxy server you must set "
-"the http_proxy environment variable first, see sources.list(5)</p></"
-"footnote> thing that should be done before using <prgn>apt-get</prgn> is to "
-"fetch the package lists from the <em>Sources</em> so that it knows what "
-"packages are available. This is done with <tt>apt-get update</tt>. For "
-"instance,"
+"If you are using an http proxy server you must set the http_proxy "
+"environment variable first, see sources.list(5)"
 msgstr ""
 
-#. type: <example></example>
-#: guide.sgml:116
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:120
+msgid ""
+"The first <placeholder type=\"footnote\" id=\"0\"/> thing that should be "
+"done before using <command>apt-get</command> is to fetch the package lists "
+"from the <emphasis>Sources</emphasis> so that it knows what packages are "
+"available. This is done with <literal>apt-get update</literal>. For instance,"
+msgstr ""
+
+#. type: Content of: <book><chapter><screen>
+#: guide.dbk:128
 #, no-wrap
 msgid ""
 "# apt-get update\n"
 "Get http://ftp.de.debian.org/debian-non-US/ stable/binary-i386/ Packages\n"
 "Get http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n"
 "Reading Package Lists... Done\n"
-"Building Dependency Tree... Done"
+"Building Dependency Tree... Done\n"
 msgstr ""
 
-#. type: <p><taglist>
-#: guide.sgml:120
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:135
 msgid "Once updated there are several commands that can be used:"
 msgstr ""
 
-#. type: <tag></tag>
-#: guide.sgml:121
+#. type: Content of: <book><chapter><variablelist><varlistentry><term>
+#: guide.dbk:139
 msgid "upgrade"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:131
+#. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
+#: guide.dbk:142
 msgid ""
 "Upgrade will attempt to gently upgrade the whole system. Upgrade will never "
 "install a new package or remove an existing package, nor will it ever "
 "upgrade a package that might cause some other package to break. This can be "
 "used daily to relatively safely upgrade the system. Upgrade will list all of "
 "the packages that it could not upgrade, this usually means that they depend "
-"on new packages or conflict with some other package. <prgn>dselect</prgn> or "
-"<tt>apt-get install</tt> can be used to force these packages to install."
+"on new packages or conflict with some other package. <command>dselect</"
+"command> or <literal>apt-get install</literal> can be used to force these "
+"packages to install."
 msgstr ""
 
-#. type: <tag></tag>
-#: guide.sgml:131
+#. type: Content of: <book><chapter><variablelist><varlistentry><term>
+#: guide.dbk:154
 msgid "install"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:140
+#. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
+#: guide.dbk:157
 msgid ""
 "Install is used to install packages by name. The package is automatically "
 "fetched and installed. This can be useful if you already know the name of "
@@ -6619,130 +6641,134 @@ msgid ""
 "anything other than its arguments are changed."
 msgstr ""
 
-#. type: <tag></tag>
-#: guide.sgml:140
+#. type: Content of: <book><chapter><variablelist><varlistentry><term>
+#: guide.dbk:168
 msgid "dist-upgrade"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:149
+#. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
+#: guide.dbk:171
 msgid ""
 "Dist-upgrade is a complete upgrader designed to simplify upgrading between "
 "releases of Debian. It uses a sophisticated algorithm to determine the best "
 "set of packages to install, upgrade and remove to get as much of the system "
 "to the newest release. In some situations it may be desired to use dist-"
 "upgrade rather than spend the time manually resolving dependencies in "
-"<prgn>dselect</prgn>. Once dist-upgrade has completed then <prgn>dselect</"
-"prgn> can be used to install any packages that may have been left out."
+"<command>dselect</command>. Once dist-upgrade has completed then "
+"<command>dselect</command> can be used to install any packages that may have "
+"been left out."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:152
+#. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
+#: guide.dbk:181
 msgid ""
 "It is important to closely look at what dist-upgrade is going to do, its "
 "decisions may sometimes be quite surprising."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:163
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:188
 msgid ""
-"<prgn>apt-get</prgn> has several command line options that are detailed in "
-"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful "
-"option is <tt>-d</tt> which does not install the fetched files. If the "
-"system has to download a large number of package it would be undesired to "
-"start installing them in case something goes wrong. When <tt>-d</tt> is used "
-"the downloaded archives can be installed by simply running the command that "
-"caused them to be downloaded again without <tt>-d</tt>."
+"<command>apt-get</command> has several command line options that are "
+"detailed in its man page, <citerefentry><refentrytitle>apt-get</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>. The most useful "
+"option is <literal>-d</literal> which does not install the fetched files. If "
+"the system has to download a large number of package it would be undesired "
+"to start installing them in case something goes wrong. When <literal>-d</"
+"literal> is used the downloaded archives can be installed by simply running "
+"the command that caused them to be downloaded again without <literal>-d</"
+"literal>."
 msgstr ""
 
-#. type: <heading></heading>
-#: guide.sgml:168
+#. type: Content of: <book><chapter><title>
+#: guide.dbk:200
 msgid "DSelect"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:173
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:202
 msgid ""
-"The APT <prgn>dselect</prgn> method provides the complete APT system with "
-"the <prgn>dselect</prgn> package selection GUI. <prgn>dselect</prgn> is used "
-"to select the packages to be installed or removed and APT actually installs "
-"them."
+"The APT <command>dselect</command> method provides the complete APT system "
+"with the <command>dselect</command> package selection GUI. <command>dselect</"
+"command> is used to select the packages to be installed or removed and APT "
+"actually installs them."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:184
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:208
 msgid ""
-"To enable the APT method you need to select [A]ccess in <prgn>dselect</prgn> "
-"and then choose the APT method. You will be prompted for a set of "
-"<em>Sources</em> which are places to fetch archives from. These can be "
-"remote Internet sites, local Debian mirrors or CD-ROMs. Each source can "
-"provide a fragment of the total Debian archive, APT will automatically "
+"To enable the APT method you need to select [A]ccess in <command>dselect</"
+"command> and then choose the APT method. You will be prompted for a set of "
+"<emphasis>Sources</emphasis> which are places to fetch archives from. These "
+"can be remote Internet sites, local Debian mirrors or CD-ROMs. Each source "
+"can provide a fragment of the total Debian archive, APT will automatically "
 "combine them to form a complete set of packages. If you have a CD-ROM then "
 "it is a good idea to specify it first and then specify a mirror so that you "
 "have access to the latest bug fixes. APT will automatically use packages on "
 "your CD-ROM before downloading from the Internet."
 msgstr ""
 
-#. type: <example></example>
-#: guide.sgml:198
+#. type: Content of: <book><chapter><screen>
+#: guide.dbk:219
 #, no-wrap
 msgid ""
 "   Set up a list of distribution source locations\n"
-"\t \n"
+"\n"
 " Please give the base URL of the debian distribution.\n"
 " The access schemes I know about are: http file\n"
-"\t   \n"
+"\n"
 " For example:\n"
 "      file:/mnt/debian,\n"
 "      ftp://ftp.debian.org/debian,\n"
 "      http://ftp.de.debian.org/debian,\n"
-"      \n"
-"      \n"
-" URL [http://llug.sep.bnl.gov/debian]:"
+"\n"
+"\n"
+" URL [http://llug.sep.bnl.gov/debian]:\n"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:205
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:233
 msgid ""
-"The <em>Sources</em> setup starts by asking for the base of the Debian "
-"archive, defaulting to a HTTP mirror. Next it asks for the distribution to "
-"get."
+"The <emphasis>Sources</emphasis> setup starts by asking for the base of the "
+"Debian archive, defaulting to a HTTP mirror. Next it asks for the "
+"distribution to get."
 msgstr ""
 
-#. type: <example></example>
-#: guide.sgml:212
+#. type: Content of: <book><chapter><screen>
+#: guide.dbk:238
 #, no-wrap
 msgid ""
 " Please give the distribution tag to get or a path to the\n"
 " package file ending in a /. The distribution\n"
 " tags are typically something like: stable unstable testing non-US\n"
-"   \n"
-" Distribution [stable]:"
+"\n"
+" Distribution [stable]:\n"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:222
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:245
 msgid ""
-"The distribution refers to the Debian version in the archive, <em>stable</"
-"em> refers to the latest released version and <em>unstable</em> refers to "
-"the developmental version. <em>non-US</em> is only available on some mirrors "
-"and refers to packages that contain encryption technology or other things "
-"that cannot be exported from the United States. Importing these packages "
-"into the US is legal however."
+"The distribution refers to the Debian version in the archive, "
+"<emphasis>stable</emphasis> refers to the latest released version and "
+"<emphasis>unstable</emphasis> refers to the developmental version. "
+"<emphasis>non-US</emphasis> is only available on some mirrors and refers to "
+"packages that contain encryption technology or other things that cannot be "
+"exported from the United States. Importing these packages into the US is "
+"legal however."
 msgstr ""
 
-#. type: <example></example>
-#: guide.sgml:228
+#. type: Content of: <book><chapter><screen>
+#: guide.dbk:254
 #, no-wrap
 msgid ""
 " Please give the components to get\n"
 " The components are typically something like: main contrib non-free\n"
-"  \n"
-" Components [main contrib non-free]:"
+"\n"
+" Components [main contrib non-free]:\n"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:236
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:260
 msgid ""
 "The components list refers to the list of sub distributions to fetch. The "
 "distribution is split up based on software licenses, main being DFSG free "
@@ -6750,25 +6776,25 @@ msgid ""
 "restrictions placed on their use and distribution."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:240
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:266
 msgid ""
 "Any number of sources can be added, the setup script will continue to prompt "
 "until you have specified all that you want."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:247
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:270
 msgid ""
-"Before starting to use <prgn>dselect</prgn> it is necessary to update the "
-"available list by selecting [U]pdate from the menu. This is a superset of "
-"<tt>apt-get update</tt> that makes the fetched information available to "
-"<prgn>dselect</prgn>. [U]pdate must be performed even if <tt>apt-get update</"
-"tt> has been run before."
+"Before starting to use <command>dselect</command> it is necessary to update "
+"the available list by selecting [U]pdate from the menu. This is a superset "
+"of <literal>apt-get update</literal> that makes the fetched information "
+"available to <command>dselect</command>. [U]pdate must be performed even if "
+"<literal>apt-get update</literal> has been run before."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:253
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:277
 msgid ""
 "You can then go on and make your selections using [S]elect and then perform "
 "the installation using [I]nstall. When using the APT method the [C]onfig and "
@@ -6776,57 +6802,63 @@ msgid ""
 "them together."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:258
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:283
 msgid ""
 "By default APT will automatically remove the package (.deb) files once they "
-"have been successfully installed. To change this behavior place <tt>Dselect::"
-"clean \"prompt\";</tt> in /etc/apt/apt.conf."
+"have been successfully installed. To change this behavior place "
+"<literal>Dselect::clean \"prompt\";</literal> in /etc/apt/apt.conf."
 msgstr ""
 
-#. type: <heading></heading>
-#: guide.sgml:264
+#. type: Content of: <book><chapter><title>
+#: guide.dbk:289
 msgid "The Interface"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:278
+#. type: Content of: <book><chapter><para><footnote><para>
+#: guide.dbk:293
+msgid ""
+"The <command>dselect</command> method actually is a set of wrapper scripts "
+"to <command>apt-get</command>. The method actually provides more "
+"functionality than is present in <command>apt-get</command> alone."
+msgstr ""
+
+#. type: Content of: <book><chapter><para>
+#: guide.dbk:291
 msgid ""
-"Both that APT <prgn>dselect</prgn> method and <prgn>apt-get</prgn> share the "
-"same interface. It is a simple system that generally tells you what it will "
-"do and then goes and does it. <footnote><p>The <prgn>dselect</prgn> method "
-"actually is a set of wrapper scripts to <prgn>apt-get</prgn>. The method "
-"actually provides more functionality than is present in <prgn>apt-get</prgn> "
-"alone.</p></footnote> After printing out a summary of what will happen APT "
+"Both that APT <command>dselect</command> method and <command>apt-get</"
+"command> share the same interface. It is a simple system that generally "
+"tells you what it will do and then goes and does it. <placeholder type="
+"\"footnote\" id=\"0\"/> After printing out a summary of what will happen APT "
 "then will print out some informative status messages so that you can "
 "estimate how far along it is and how much is left to do."
 msgstr ""
 
-#. type: <heading></heading>
-#: guide.sgml:280
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:302
 msgid "Startup"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:284
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:304
 msgid ""
 "Before all operations except update, APT performs a number of actions to "
 "prepare its internal state. It also does some checks of the system's state. "
-"At any time these operations can be performed by running <tt>apt-get check</"
-"tt>."
+"At any time these operations can be performed by running <literal>apt-get "
+"check</literal>."
 msgstr ""
 
-#. type: <example></example>
-#: guide.sgml:289
+#. type: Content of: <book><chapter><section><screen>
+#: guide.dbk:310
 #, no-wrap
 msgid ""
 "# apt-get check\n"
 "Reading Package Lists... Done\n"
-"Building Dependency Tree... Done"
+"Building Dependency Tree... Done\n"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:297
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:315
 msgid ""
 "The first thing it does is read all the package files into memory. APT uses "
 "a caching scheme so this operation will be faster the second time it is run. "
@@ -6834,17 +6866,17 @@ msgid ""
 "warning will be printed when apt-get exits."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:303
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:321
 msgid ""
 "The final operation performs a detailed analysis of the system's "
 "dependencies. It checks every dependency of every installed or unpacked "
 "package and considers if it is OK. Should this find a problem then a report "
-"will be printed out and <prgn>apt-get</prgn> will refuse to run."
+"will be printed out and <command>apt-get</command> will refuse to run."
 msgstr ""
 
-#. type: <example></example>
-#: guide.sgml:320
+#. type: Content of: <book><chapter><section><screen>
+#: guide.dbk:327
 #, no-wrap
 msgid ""
 "# apt-get check\n"
@@ -6854,18 +6886,18 @@ msgid ""
 "Sorry, but the following packages have unmet dependencies:\n"
 "  9fonts: Depends: xlib6g but it is not installed\n"
 "  uucp: Depends: mailx but it is not installed\n"
-"  blast: Depends: xlib6g (>= 3.3-5) but it is not installed\n"
+"  blast: Depends: xlib6g (&gt;= 3.3-5) but it is not installed\n"
 "  adduser: Depends: perl-base but it is not installed\n"
 "  aumix: Depends: libgpmg1 but it is not installed\n"
 "  debiandoc-sgml: Depends: sgml-base but it is not installed\n"
-"  bash-builtins: Depends: bash (>= 2.01) but 2.0-3 is installed\n"
+"  bash-builtins: Depends: bash (&gt;= 2.01) but 2.0-3 is installed\n"
 "  cthugha: Depends: svgalibg1 but it is not installed\n"
-"           Depends: xlib6g (>= 3.3-5) but it is not installed\n"
-"  libreadlineg2: Conflicts:libreadline2 (<< 2.1-2.1)"
+"           Depends: xlib6g (&gt;= 3.3-5) but it is not installed\n"
+"  libreadlineg2: Conflicts:libreadline2 (&lt;&lt; 2.1-2.1)\n"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:329
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:344
 msgid ""
 "In this example the system has many problems, including a serious problem "
 "with libreadlineg2. For each package that has unmet dependencies a line is "
@@ -6874,61 +6906,69 @@ msgid ""
 "problem is also included."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:337
+#. type: Content of: <book><chapter><section><para><footnote><para>
+#: guide.dbk:353
+msgid ""
+"APT however considers all known dependencies and attempts to prevent broken "
+"packages"
+msgstr ""
+
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:351
 msgid ""
 "There are two ways a system can get into a broken state like this. The first "
-"is caused by <prgn>dpkg</prgn> missing some subtle relationships between "
-"packages when performing upgrades. <footnote><p>APT however considers all "
-"known dependencies and attempts to prevent broken packages</p></footnote>. "
-"The second is if a package installation fails during an operation. In this "
-"situation a package may have been unpacked without its dependents being "
-"installed."
+"is caused by <command>dpkg</command> missing some subtle relationships "
+"between packages when performing upgrades. <placeholder type=\"footnote\" id="
+"\"0\"/>. The second is if a package installation fails during an operation. "
+"In this situation a package may have been unpacked without its dependents "
+"being installed."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:345
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:360
 msgid ""
 "The second situation is much less serious than the first because APT places "
 "certain constraints on the order that packages are installed. In both cases "
-"supplying the <tt>-f</tt> option to <prgn>apt-get</prgn> will cause APT to "
-"deduce a possible solution to the problem and then continue on. The APT "
-"<prgn>dselect</prgn> method always supplies the <tt>-f</tt> option to allow "
-"for easy continuation of failed maintainer scripts."
+"supplying the <literal>-f</literal> option to <command>apt-get</command> "
+"will cause APT to deduce a possible solution to the problem and then "
+"continue on. The APT <command>dselect</command> method always supplies the "
+"<literal>-f</literal> option to allow for easy continuation of failed "
+"maintainer scripts."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:351
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:369
 msgid ""
-"However, if the <tt>-f</tt> option is used to correct a seriously broken "
-"system caused by the first case then it is possible that it will either fail "
-"immediately or the installation sequence will fail. In either case it is "
-"necessary to manually use dpkg (possibly with forcing options) to correct "
-"the situation enough to allow APT to proceed."
+"However, if the <literal>-f</literal> option is used to correct a seriously "
+"broken system caused by the first case then it is possible that it will "
+"either fail immediately or the installation sequence will fail. In either "
+"case it is necessary to manually use dpkg (possibly with forcing options) to "
+"correct the situation enough to allow APT to proceed."
 msgstr ""
 
-#. type: <heading></heading>
-#: guide.sgml:356
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:377
 msgid "The Status Report"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:363
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:379
 msgid ""
-"Before proceeding <prgn>apt-get</prgn> will present a report on what will "
-"happen. Generally the report reflects the type of operation being performed "
-"but there are several common elements. In all cases the lists reflect the "
-"final state of things, taking into account the <tt>-f</tt> option and any "
-"other relevant activities to the command being executed."
+"Before proceeding <command>apt-get</command> will present a report on what "
+"will happen. Generally the report reflects the type of operation being "
+"performed but there are several common elements. In all cases the lists "
+"reflect the final state of things, taking into account the <literal>-f</"
+"literal> option and any other relevant activities to the command being "
+"executed."
 msgstr ""
 
-#. type: <heading></heading>
-#: guide.sgml:364
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:386
 msgid "The Extra Package list"
 msgstr ""
 
-#. type: <example></example>
-#: guide.sgml:372
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:388
 #, no-wrap
 msgid ""
 "The following extra packages will be installed:\n"
@@ -6936,135 +6976,135 @@ msgid ""
 "  mailpgp xdpkg fileutils pinepgp zlib1g xlib6g perl-base\n"
 "  bin86 libgdbm1 libgdbmg1 quake-lib gmp2 bcc xbuffy\n"
 "  squake pgp-i python-base debmake ldso perl libreadlineg2\n"
-"  ssh"
+"  ssh\n"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:379
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:396
 msgid ""
 "The Extra Package list shows all of the packages that will be installed or "
 "upgraded in excess of the ones mentioned on the command line. It is only "
-"generated for an <tt>install</tt> command. The listed packages are often the "
-"result of an Auto Install."
+"generated for an <literal>install</literal> command. The listed packages are "
+"often the result of an Auto Install."
 msgstr ""
 
-#. type: <heading></heading>
-#: guide.sgml:382
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:403
 msgid "The Packages to Remove"
 msgstr ""
 
-#. type: <example></example>
-#: guide.sgml:389
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:405
 #, no-wrap
 msgid ""
 "The following packages will be REMOVED:\n"
 "  xlib6-dev xpat2 tk40-dev xkeycaps xbattle xonix\n"
 "  xdaliclock tk40 tk41 xforms0.86 ghostview xloadimage xcolorsel\n"
 "  xadmin xboard perl-debug tkined xtetris libreadline2-dev perl-suid\n"
-"  nas xpilot xfig"
+"  nas xpilot xfig\n"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:399
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:412
 msgid ""
 "The Packages to Remove list shows all of the packages that will be removed "
 "from the system. It can be shown for any of the operations and should be "
 "given a careful inspection to ensure nothing important is to be taken off. "
-"The <tt>-f</tt> option is especially good at generating packages to remove "
-"so extreme care should be used in that case. The list may contain packages "
-"that are going to be removed because they are only partially installed, "
-"possibly due to an aborted installation."
+"The <literal>-f</literal> option is especially good at generating packages "
+"to remove so extreme care should be used in that case. The list may contain "
+"packages that are going to be removed because they are only partially "
+"installed, possibly due to an aborted installation."
 msgstr ""
 
-#. type: <heading></heading>
-#: guide.sgml:402
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:422
 msgid "The New Packages list"
 msgstr ""
 
-#. type: <example></example>
-#: guide.sgml:406
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:424
 #, no-wrap
 msgid ""
 "The following NEW packages will installed:\n"
-"  zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base"
+"  zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base\n"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:411
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:428
 msgid ""
 "The New Packages list is simply a reminder of what will happen. The packages "
 "listed are not presently installed in the system but will be when APT is "
 "done."
 msgstr ""
 
-#. type: <heading></heading>
-#: guide.sgml:414
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:433
 msgid "The Kept Back list"
 msgstr ""
 
-#. type: <example></example>
-#: guide.sgml:419
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:435
 #, no-wrap
 msgid ""
 "The following packages have been kept back\n"
 "  compface man-db tetex-base msql libpaper svgalib1\n"
-"  gs snmp arena lynx xpat2 groff xscreensaver"
+"  gs snmp arena lynx xpat2 groff xscreensaver\n"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:428
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:440
 msgid ""
 "Whenever the whole system is being upgraded there is the possibility that "
 "new versions of packages cannot be installed because they require new things "
 "or conflict with already installed things. In this case the package will "
 "appear in the Kept Back list. The best way to convince packages listed there "
-"to install is with <tt>apt-get install</tt> or by using <prgn>dselect</prgn> "
-"to resolve their problems."
+"to install is with <literal>apt-get install</literal> or by using "
+"<command>dselect</command> to resolve their problems."
 msgstr ""
 
-#. type: <heading></heading>
-#: guide.sgml:431
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:449
 msgid "Held Packages warning"
 msgstr ""
 
-#. type: <example></example>
-#: guide.sgml:435
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:451
 #, no-wrap
 msgid ""
 "The following held packages will be changed:\n"
-"  cvs"
+"  cvs\n"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:441
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:455
 msgid ""
 "Sometimes you can ask APT to install a package that is on hold, in such a "
 "case it prints out a warning that the held package is going to be changed. "
 "This should only happen during dist-upgrade or install."
 msgstr ""
 
-#. type: <heading></heading>
-#: guide.sgml:444
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk:461
 msgid "Final summary"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:447
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:463
 msgid ""
 "Finally, APT will print out a summary of all the changes that will occur."
 msgstr ""
 
-#. type: <example></example>
-#: guide.sgml:452
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk:466
 #, no-wrap
 msgid ""
 "206 packages upgraded, 8 newly installed, 23 to remove and 51 not upgraded.\n"
 "12 packages not fully installed or removed.\n"
-"Need to get 65.7M/66.7M of archives. After unpacking 26.5M will be used."
+"Need to get 65.7M/66.7M of archives. After unpacking 26.5M will be used.\n"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:470
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:471
 msgid ""
 "The first line of the summary simply is a reduced version of all of the "
 "lists and includes the number of upgrades - that is packages already "
@@ -7081,27 +7121,27 @@ msgid ""
 "the amount of space that will be freed."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:473
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk:485
 msgid ""
 "Some other reports can be generated by using the -u option to show packages "
 "to upgrade, they are similar to the previous examples."
 msgstr ""
 
-#. type: <heading></heading>
-#: guide.sgml:477
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:492
 msgid "The Status Display"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:481
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:494
 msgid ""
 "During the download of archives and package files APT prints out a series of "
 "status messages."
 msgstr ""
 
-#. type: <example></example>
-#: guide.sgml:490
+#. type: Content of: <book><chapter><section><screen>
+#: guide.dbk:498
 #, no-wrap
 msgid ""
 "# apt-get update\n"
@@ -7110,110 +7150,107 @@ msgid ""
 "Hit http://llug.sep.bnl.gov/debian/ testing/main Packages\n"
 "Get:4 http://ftp.de.debian.org/debian-non-US/ unstable/binary-i386/ Packages\n"
 "Get:5 http://llug.sep.bnl.gov/debian/ testing/non-free Packages\n"
-"11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s"
+"11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s\n"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:500
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:507
 msgid ""
-"The lines starting with <em>Get</em> are printed out when APT begins to "
-"fetch a file while the last line indicates the progress of the download. The "
-"first percent value on the progress line indicates the total percent done of "
-"all files. Unfortunately since the size of the Package files is unknown "
-"<tt>apt-get update</tt> estimates the percent done which causes some "
-"inaccuracies."
+"The lines starting with <emphasis>Get</emphasis> are printed out when APT "
+"begins to fetch a file while the last line indicates the progress of the "
+"download. The first percent value on the progress line indicates the total "
+"percent done of all files. Unfortunately since the size of the Package files "
+"is unknown <literal>apt-get update</literal> estimates the percent done "
+"which causes some inaccuracies."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:509
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:515
 msgid ""
 "The next section of the status line is repeated once for each download "
 "thread and indicates the operation being performed and some useful "
 "information about what is happening. Sometimes this section will simply read "
-"<em>Forking</em> which means the OS is loading the download module. The "
-"first word after the [ is the fetch number as shown on the history lines. "
-"The next word is the short form name of the object being downloaded. For "
-"archives it will contain the name of the package that is being fetched."
+"<emphasis>Forking</emphasis> which means the OS is loading the download "
+"module. The first word after the [ is the fetch number as shown on the "
+"history lines. The next word is the short form name of the object being "
+"downloaded. For archives it will contain the name of the package that is "
+"being fetched."
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:524
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:525
 msgid ""
 "Inside of the single quote is an informative string indicating the progress "
 "of the negotiation phase of the download. Typically it progresses from "
-"<em>Connecting</em> to <em>Waiting for file</em> to <em>Downloading</em> or "
-"<em>Resuming</em>. The final value is the number of bytes downloaded from "
-"the remote site. Once the download begins this is represented as "
-"<tt>102/10.2k</tt> indicating that 102 bytes have been fetched and 10.2 "
-"kilobytes is expected. The total size is always shown in 4 figure notation "
-"to preserve space. After the size display is a percent meter for the file "
-"itself. The second last element is the instantaneous average speed. This "
-"values is updated every 5 seconds and reflects the rate of data transfer for "
-"that period. Finally is shown the estimated transfer time. This is updated "
-"regularly and reflects the time to complete everything at the shown transfer "
-"rate."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:530
+"<emphasis>Connecting</emphasis> to <emphasis>Waiting for file</emphasis> to "
+"<emphasis>Downloading</emphasis> or <emphasis>Resuming</emphasis>. The final "
+"value is the number of bytes downloaded from the remote site. Once the "
+"download begins this is represented as <literal>102/10.2k</literal> "
+"indicating that 102 bytes have been fetched and 10.2 kilobytes is expected. "
+"The total size is always shown in 4 figure notation to preserve space. After "
+"the size display is a percent meter for the file itself. The second last "
+"element is the instantaneous average speed. This values is updated every 5 "
+"seconds and reflects the rate of data transfer for that period. Finally is "
+"shown the estimated transfer time. This is updated regularly and reflects "
+"the time to complete everything at the shown transfer rate."
+msgstr ""
+
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:540
 msgid ""
 "The status display updates every half second to provide a constant feedback "
 "on the download progress while the Get lines scroll back whenever a new file "
 "is started. Since the status display is constantly updated it is unsuitable "
-"for logging to a file, use the <tt>-q</tt> option to remove the status "
-"display."
+"for logging to a file, use the <literal>-q</literal> option to remove the "
+"status display."
 msgstr ""
 
-#. type: <heading></heading>
-#: guide.sgml:535
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk:548
 msgid "Dpkg"
 msgstr ""
 
-#. type: <p></p>
-#: guide.sgml:542
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk:550
 msgid ""
-"APT uses <prgn>dpkg</prgn> for installing the archives and will switch over "
-"to the <prgn>dpkg</prgn> interface once downloading is completed. "
-"<prgn>dpkg</prgn> will also ask a number of questions as it processes the "
-"packages and the packages themselves may also ask several questions. Before "
-"each question there is usually a description of what it is asking and the "
-"questions are too varied to discuss completely here."
+"APT uses <command>dpkg</command> for installing the archives and will switch "
+"over to the <command>dpkg</command> interface once downloading is completed. "
+"<command>dpkg</command> will also ask a number of questions as it processes "
+"the packages and the packages themselves may also ask several questions. "
+"Before each question there is usually a description of what it is asking and "
+"the questions are too varied to discuss completely here."
 msgstr ""
 
-#. type: <title></title>
-#: offline.sgml:4
+#. type: Content of: <book><title>
+#: offline.dbk:11
 msgid "Using APT Offline"
 msgstr ""
 
-#. type: <version></version>
-#: offline.sgml:7
-msgid "$Id: offline.sgml,v 1.8 2003/02/12 15:06:41 doogie Exp $"
-msgstr ""
-
-#. type: <abstract></abstract>
-#: offline.sgml:12
+#. type: Content of: <book><bookinfo><abstract><para>
+#: offline.dbk:25
 msgid ""
 "This document describes how to use APT in a non-networked environment, "
 "specifically a 'sneaker-net' approach for performing upgrades."
 msgstr ""
 
-#. type: <copyrightsummary></copyrightsummary>
-#: offline.sgml:16
-msgid "Copyright &copy; Jason Gunthorpe, 1999."
+#. type: Content of: <book><bookinfo>
+#: offline.dbk:30
+msgid ""
+"<copyright><year>1999</year><holder>Jason Gunthorpe</holder></copyright>"
 msgstr ""
 
-#. type: <heading></heading>
-#: offline.sgml:32
+#. type: Content of: <book><chapter><title>
+#: offline.dbk:48
 msgid "Introduction"
 msgstr ""
 
-#. type: <heading></heading>
-#: offline.sgml:34 offline.sgml:65 offline.sgml:180
+#. type: Content of: <book><chapter><section><title>
+#: offline.dbk:50 offline.dbk:80 offline.dbk:192
 msgid "Overview"
 msgstr ""
 
-#. type: <p></p>
-#: offline.sgml:40
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:52
 msgid ""
 "Normally APT requires direct access to a Debian archive, either from a local "
 "media or through a network. Another common complaint is that a Debian "
@@ -7221,8 +7258,8 @@ msgid ""
 "fast connection but they are physically distant."
 msgstr ""
 
-#. type: <p></p>
-#: offline.sgml:51
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:58
 msgid ""
 "The solution to this is to use large removable media such as a Zip disc or a "
 "SuperDisk disc. These discs are not large enough to store the entire Debian "
@@ -7230,13 +7267,13 @@ msgid ""
 "to use APT to generate a list of packages that are required and then fetch "
 "them onto the disc using another machine with good connectivity. It is even "
 "possible to use another Debian machine with APT or to use a completely "
-"different OS and a download tool like wget. Let <em>remote host</em> mean "
-"the machine downloading the packages, and <em>target host</em> the one with "
-"bad or no connection."
+"different OS and a download tool like wget. Let <emphasis>remote host</"
+"emphasis> mean the machine downloading the packages, and <emphasis>target "
+"host</emphasis> the one with bad or no connection."
 msgstr ""
 
-#. type: <p></p>
-#: offline.sgml:57
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:69
 msgid ""
 "This is achieved by creatively manipulating the APT configuration file. The "
 "essential premise to tell APT to look on a disc for it's archive files. Note "
@@ -7244,13 +7281,13 @@ msgid ""
 "names such as ext2, fat32 or vfat."
 msgstr ""
 
-#. type: <heading></heading>
-#: offline.sgml:63
+#. type: Content of: <book><chapter><title>
+#: offline.dbk:78
 msgid "Using APT on both machines"
 msgstr ""
 
-#. type: <p><example>
-#: offline.sgml:71
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:82
 msgid ""
 "APT being available on both machines gives the simplest configuration. The "
 "basic idea is to place a copy of the status file on the disc and use the "
@@ -7258,8 +7295,8 @@ msgid ""
 "to download. The disk directory structure should look like:"
 msgstr ""
 
-#. type: <example></example>
-#: offline.sgml:80
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:88
 #, no-wrap
 msgid ""
 "  /disc/\n"
@@ -7269,34 +7306,35 @@ msgid ""
 "       partial/\n"
 "    status\n"
 "    sources.list\n"
-"    apt.conf"
+"    apt.conf\n"
 msgstr ""
 
-#. type: <heading></heading>
-#: offline.sgml:88
+#. type: Content of: <book><chapter><section><title>
+#: offline.dbk:99
 msgid "The configuration file"
 msgstr ""
 
-#. type: <p></p>
-#: offline.sgml:96
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:101
 msgid ""
 "The configuration file should tell APT to store its files on the disc and to "
 "use the configuration files on the disc as well. The sources.list should "
 "contain the proper sites that you wish to use from the remote machine, and "
-"the status file should be a copy of <em>/var/lib/dpkg/status</em> from the "
-"<em>target host</em>. Please note, if you are using a local archive you must "
-"use copy URIs, the syntax is identical to file URIs."
+"the status file should be a copy of <emphasis>/var/lib/dpkg/status</"
+"emphasis> from the <emphasis>target host</emphasis>. Please note, if you are "
+"using a local archive you must use copy URIs, the syntax is identical to "
+"file URIs."
 msgstr ""
 
-#. type: <p><example>
-#: offline.sgml:100
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:109
 msgid ""
-"<em>apt.conf</em> must contain the necessary information to make APT use the "
-"disc:"
+"<emphasis>apt.conf</emphasis> must contain the necessary information to make "
+"APT use the disc:"
 msgstr ""
 
-#. type: <example></example>
-#: offline.sgml:124
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:113
 #, no-wrap
 msgid ""
 " APT\n"
@@ -7304,10 +7342,10 @@ msgid ""
 "   /* This is not necessary if the two machines are the same arch, it tells\n"
 "      the remote APT what architecture the target machine is */\n"
 "   Architecture \"i386\";\n"
-"   \n"
+"\n"
 "   Get::Download-Only \"true\";\n"
 " };\n"
-" \n"
+"\n"
 " Dir\n"
 " {\n"
 "   /* Use the disc for state information and redirect the status file from\n"
@@ -7318,76 +7356,78 @@ msgid ""
 "   // Binary caches will be stored locally\n"
 "   Cache::archives \"/disc/archives/\";\n"
 "   Cache \"/tmp/\";\n"
-"   \n"
+"\n"
 "   // Location of the source list.\n"
 "   Etc \"/disc/\";\n"
-" };"
+" };\n"
 msgstr ""
 
-#. type: </example></p>
-#: offline.sgml:129
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:138
 msgid ""
 "More details can be seen by examining the apt.conf man page and the sample "
-"configuration file in <em>/usr/share/doc/apt/examples/apt.conf</em>."
+"configuration file in <emphasis>/usr/share/doc/apt/examples/apt.conf</"
+"emphasis>."
 msgstr ""
 
-#. type: <p><example>
-#: offline.sgml:136
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:143
 msgid ""
-"On the target machine the first thing to do is mount the disc and copy <em>/"
-"var/lib/dpkg/status</em> to it. You will also need to create the directories "
-"outlined in the Overview, <em>archives/partial/</em> and <em>lists/partial/</"
-"em>. Then take the disc to the remote machine and configure the sources."
-"list. On the remote machine execute the following:"
+"On the target machine the first thing to do is mount the disc and copy "
+"<emphasis>/var/lib/dpkg/status</emphasis> to it. You will also need to "
+"create the directories outlined in the Overview, <emphasis>archives/partial/"
+"</emphasis> and <emphasis>lists/partial/</emphasis>. Then take the disc to "
+"the remote machine and configure the sources.list. On the remote machine "
+"execute the following:"
 msgstr ""
 
-#. type: <example></example>
-#: offline.sgml:142
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:152
 #, no-wrap
 msgid ""
 " # export APT_CONFIG=\"/disc/apt.conf\"\n"
 " # apt-get update\n"
 " [ APT fetches the package files ]\n"
 " # apt-get dist-upgrade\n"
-" [ APT fetches all the packages needed to upgrade the target machine ]"
+" [ APT fetches all the packages needed to upgrade the target machine ]\n"
 msgstr ""
 
-#. type: </example></p>
-#: offline.sgml:149
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:159
 msgid ""
 "The dist-upgrade command can be replaced with any other standard APT "
 "commands, particularly dselect-upgrade. You can even use an APT front end "
-"such as <em>dselect</em>. However this presents a problem in communicating "
-"your selections back to the local computer."
+"such as <emphasis>dselect</emphasis>. However this presents a problem in "
+"communicating your selections back to the local computer."
 msgstr ""
 
-#. type: <p><example>
-#: offline.sgml:153
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:165
 msgid ""
 "Now the disc contains all of the index files and archives needed to upgrade "
 "the target machine. Take the disc back and run:"
 msgstr ""
 
-#. type: <example></example>
-#: offline.sgml:159
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:169
 #, no-wrap
 msgid ""
 "  # export APT_CONFIG=\"/disc/apt.conf\"\n"
 "  # apt-get check\n"
 "  [ APT generates a local copy of the cache files ]\n"
 "  # apt-get --no-d -o dir::state::status=/var/lib/dpkg/status dist-upgrade\n"
-"  [ Or any other APT command ]"
+"  [ Or any other APT command ]\n"
 msgstr ""
 
-#. type: <p></p>
-#: offline.sgml:165
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:176
 msgid ""
 "It is necessary for proper function to re-specify the status file to be the "
 "local one. This is very important!"
 msgstr ""
 
-#. type: <p></p>
-#: offline.sgml:172
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:180
 msgid ""
 "If you are using dselect you can do the very risky operation of copying disc/"
 "status to /var/lib/dpkg/status so that any selections you made on the remote "
@@ -7396,21 +7436,21 @@ msgid ""
 "status file if dpkg or APT have been run in the mean time!!"
 msgstr ""
 
-#. type: <heading></heading>
-#: offline.sgml:178
+#. type: Content of: <book><chapter><title>
+#: offline.dbk:190
 msgid "Using APT and wget"
 msgstr ""
 
-#. type: <p></p>
-#: offline.sgml:185
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:194
 msgid ""
-"<em>wget</em> is a popular and portable download tool that can run on nearly "
-"any machine. Unlike the method above this requires that the Debian machine "
-"already has a list of available packages."
+"<emphasis>wget</emphasis> is a popular and portable download tool that can "
+"run on nearly any machine. Unlike the method above this requires that the "
+"Debian machine already has a list of available packages."
 msgstr ""
 
-#. type: <p></p>
-#: offline.sgml:190
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:199
 msgid ""
 "The basic idea is to create a disc that has only the archive files "
 "downloaded from the remote site. This is done by using the --print-uris "
@@ -7418,38 +7458,38 @@ msgid ""
 "packages."
 msgstr ""
 
-#. type: <heading></heading>
-#: offline.sgml:196
+#. type: Content of: <book><chapter><section><title>
+#: offline.dbk:205
 #, fuzzy
 msgid "Operation"
 msgstr "Descrição"
 
-#. type: <p><example>
-#: offline.sgml:200
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:207
 msgid ""
 "Unlike the previous technique no special configuration files are required. "
 "We merely use the standard APT commands to generate the file list."
 msgstr ""
 
-#. type: <example></example>
-#: offline.sgml:205
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:211
 #, no-wrap
 msgid ""
-" # apt-get dist-upgrade \n"
+" # apt-get dist-upgrade\n"
 " [ Press no when prompted, make sure you are happy with the actions ]\n"
-" # apt-get -qq --print-uris dist-upgrade > uris\n"
-" # awk '{print \"wget -O \" $2 \" \" $1}' < uris > /disc/wget-script"
+" # apt-get -qq --print-uris dist-upgrade &gt; uris\n"
+" # awk '{print \"wget -O \" $2 \" \" $1}' &lt; uris &gt; /disc/wget-script\n"
 msgstr ""
 
-#. type: </example></p>
-#: offline.sgml:210
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:217
 msgid ""
 "Any command other than dist-upgrade could be used here, including dselect-"
 "upgrade."
 msgstr ""
 
-#. type: <p></p>
-#: offline.sgml:216
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:221
 msgid ""
 "The /disc/wget-script file will now contain a list of wget commands to "
 "execute in order to fetch the necessary archives. This script should be run "
@@ -7457,35 +7497,35 @@ msgid ""
 "output on the disc."
 msgstr ""
 
-#. type: <p><example>
-#: offline.sgml:219
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:227
 msgid "The remote machine would do something like"
 msgstr ""
 
-#. type: <example></example>
-#: offline.sgml:223
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:230
 #, no-wrap
 msgid ""
 "  # cd /disc\n"
 "  # sh -x ./wget-script\n"
-"  [ wait.. ]"
+"  [ wait.. ]\n"
 msgstr ""
 
-#. type: </example><example>
-#: offline.sgml:228
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:235
 msgid ""
 "Once the archives are downloaded and the disc returned to the Debian machine "
 "installation can proceed using,"
 msgstr ""
 
-#. type: <example></example>
-#: offline.sgml:230
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk:239
 #, no-wrap
-msgid "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade"
+msgid "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade\n"
 msgstr ""
 
-#. type: </example></p>
-#: offline.sgml:234
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk:242
 msgid "Which will use the already fetched archives on the disc."
 msgstr ""