From: David Kalnischkies <kalnischkies@gmail.com>
Date: Mon, 21 May 2012 02:40:48 +0000 (+0200)
Subject: in <term> mark all options with <option> and mark <term><option>
X-Git-Tag: 0.9.4~3^2~6
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/2b9b27c395d75a0c06e7eca65746e5567e459dac

in <term> mark all options with <option> and mark <term><option>
as untranslated for po4a removing ~200 unless "translateable" strings
---

diff --git a/debian/changelog b/debian/changelog
index 5d4f8720c..d28b525b4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -38,6 +38,8 @@ apt (0.9.4) UNRELEASED; urgency=low
   * doc/*.xml:
     - add a few translator notes and reword some paragraphs to ensure that
       translators and users alike can better understand them (Closes: #669409)
+    - in <term> mark all options with <option> and mark <term><option>
+      as untranslated for po4a removing ~200 unless "translateable" strings
   * apt-pkg/aptconfiguration.cc:
     - longcode Translation files are saved with encoded underscore,
       so make sure to pick these files up as well for Acquire::Languages
diff --git a/doc/apt-cache.8.xml b/doc/apt-cache.8.xml
index dd0ea6e9d..3029512db 100644
--- a/doc/apt-cache.8.xml
+++ b/doc/apt-cache.8.xml
@@ -45,12 +45,12 @@
    commands below must be present.</para>
 
    <variablelist>
-     <varlistentry><term>gencaches</term>
+     <varlistentry><term><option>gencaches</option></term>
      <listitem><para><literal>gencaches</literal> creates APT's package cache. This is done
      implicitly by all commands needing this cache if it is missing or outdated.</para></listitem>
      </varlistentry>
 
-     <varlistentry><term>showpkg <replaceable>&synopsis-pkg;</replaceable>…</term>
+     <varlistentry><term><option>showpkg</option> <option><replaceable>&synopsis-pkg;</replaceable>…</option></term>
      <listitem><para><literal>showpkg</literal> displays information about the packages listed on the 
      command line. Remaining arguments are package names. The available 
      versions and reverse dependencies of each package listed are listed, as 
@@ -84,7 +84,7 @@ Reverse Provides:
      is best to consult the apt source code.</para></listitem>
      </varlistentry>
 
-     <varlistentry><term>stats</term><listitem><para><literal>stats</literal> displays some statistics about the cache.
+     <varlistentry><term><option>stats</option></term><listitem><para><literal>stats</literal> displays some statistics about the cache.
      No further arguments are expected. Statistics reported are:
      <itemizedlist>
        <listitem><para><literal>Total package names</literal> is the number of package names found 
@@ -139,34 +139,34 @@ Reverse Provides:
      </para></listitem>
      </varlistentry>
      
-     <varlistentry><term>showsrc <replaceable>&synopsis-pkg;</replaceable>…</term>
+     <varlistentry><term><option>showsrc</option> <option><replaceable>&synopsis-pkg;</replaceable>…</option></term>
      <listitem><para><literal>showsrc</literal> displays all the source package records that match
      the given package names. All versions are shown, as well as all 
      records that declare the name to be a Binary.</para></listitem>
      </varlistentry>
      
-     <varlistentry><term>dump</term>
+     <varlistentry><term><option>dump</option></term>
      <listitem><para><literal>dump</literal> shows a short listing of every package in the cache. It is 
      primarily for debugging.</para></listitem>
      </varlistentry>
 
-     <varlistentry><term>dumpavail</term>
+     <varlistentry><term><option>dumpavail</option></term>
      <listitem><para><literal>dumpavail</literal> prints out an available list to stdout. This is 
      suitable for use with &dpkg; and is used by the &dselect; method.</para></listitem>
      </varlistentry>
 
-     <varlistentry><term>unmet</term>
+     <varlistentry><term><option>unmet</option></term>
      <listitem><para><literal>unmet</literal> displays a summary of all unmet dependencies in the 
      package cache.</para></listitem>
      </varlistentry>
 
-     <varlistentry><term>show <replaceable>&synopsis-pkg;</replaceable>…</term>
+     <varlistentry><term><option>show</option> <option><replaceable>&synopsis-pkg;</replaceable>…</option></term>
      <listitem><para><literal>show</literal> performs a function similar to 
      <command>dpkg --print-avail</command>; it displays the package records for the 
      named packages.</para></listitem>
      </varlistentry>
 
-     <varlistentry><term>search <replaceable>&synopsis-regex;</replaceable>…</term>
+     <varlistentry><term><option>search</option> <option><replaceable>&synopsis-regex;</replaceable>…</option></term>
      <listitem><para><literal>search</literal> performs a full text search on all available package
      lists for the POSIX regex pattern given, see 
      <citerefentry><refentrytitle><command>regex</command></refentrytitle>
@@ -184,17 +184,17 @@ Reverse Provides:
      are and'ed together.</para></listitem>
      </varlistentry>
 
-     <varlistentry><term>depends <replaceable>&synopsis-pkg;</replaceable>…</term>
+     <varlistentry><term><option>depends</option> <option><replaceable>&synopsis-pkg;</replaceable>…</option></term>
      <listitem><para><literal>depends</literal> shows a listing of each dependency a package has 
      and all the possible other packages that can fulfill that dependency.</para></listitem>
      </varlistentry>
 
-     <varlistentry><term>rdepends <replaceable>&synopsis-pkg;</replaceable>…</term>
+     <varlistentry><term><option>rdepends</option> <option><replaceable>&synopsis-pkg;</replaceable>…</option></term>
      <listitem><para><literal>rdepends</literal> shows a listing of each reverse dependency a
       package has.</para></listitem>
      </varlistentry>
 
-     <varlistentry><term>pkgnames [ <replaceable>&synopsis-prefix;</replaceable> ]</term>
+     <varlistentry><term><option>pkgnames</option> <optional><replaceable>&synopsis-prefix;</replaceable></optional></term>
      <listitem><para>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
      for use in a shell tab complete function and the output is generated 
@@ -205,7 +205,7 @@ Reverse Provides:
      </para></listitem>
      </varlistentry>
      
-     <varlistentry><term>dotty <replaceable>&synopsis-pkg;</replaceable>…</term>
+     <varlistentry><term><option>dotty</option> <option><replaceable>&synopsis-pkg;</replaceable>…</option></term>
      <listitem><para><literal>dotty</literal> takes a list of packages on the command line and 
      generates output suitable for use by dotty from the 
      <ulink url="http://www.research.att.com/sw/tools/graphviz/">GraphViz</ulink>
@@ -223,19 +223,19 @@ Reverse Provides:
      <para>Caution, dotty cannot graph larger sets of packages.</para></listitem>
      </varlistentry>
      
-     <varlistentry><term>xvcg <replaceable>&synopsis-pkg;</replaceable></term>
+     <varlistentry><term><option>xvcg</option> <option><replaceable>&synopsis-pkg;</replaceable>…</option></term>
 	 <listitem><para>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>.
 	 </para></listitem></varlistentry>
 
-     <varlistentry><term>policy [ <replaceable>&synopsis-pkg;</replaceable>… ]</term>
+	 <varlistentry><term><option>policy</option> <optional><replaceable>&synopsis-pkg;</replaceable>…</optional></term>
      <listitem><para><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 source. Otherwise it prints out detailed information
      about the priority selection of the named package.</para></listitem>
      </varlistentry>
 
-     <varlistentry><term>madison <replaceable>&synopsis-pkg;</replaceable>…</term>
+     <varlistentry><term><option>madison</option> <option><replaceable>&synopsis-pkg;</replaceable>…</option></term>
      <listitem><para><literal>apt-cache</literal>'s <literal>madison</literal> command attempts to mimic
      the output format and a subset of the functionality of the Debian
      archive management tool, <literal>madison</literal>.  It displays
diff --git a/doc/apt-cdrom.8.xml b/doc/apt-cdrom.8.xml
index 94fc6fd8b..969491740 100644
--- a/doc/apt-cdrom.8.xml
+++ b/doc/apt-cdrom.8.xml
@@ -52,7 +52,7 @@
     given one of the commands below must be present.
    
     <variablelist>
-     <varlistentry><term>add</term>
+     <varlistentry><term><option>add</option></term>
      <listitem><para><literal>add</literal> is used to add a new disc to the
      source list. It will unmount the
      CDROM device, prompt for a disk to be inserted and then proceed to 
@@ -68,7 +68,7 @@
      </listitem>
      </varlistentry>
      
-     <varlistentry><term>ident</term>
+     <varlistentry><term><option>ident</option></term>
      <listitem><para>A debugging tool to report the identity of the current
       disc as well as the stored file name
      </para>
diff --git a/doc/apt-config.8.xml b/doc/apt-config.8.xml
index 0295cb193..94c247dd1 100644
--- a/doc/apt-config.8.xml
+++ b/doc/apt-config.8.xml
@@ -46,7 +46,7 @@
    </para>
    
    <variablelist>
-     <varlistentry><term>shell</term>
+     <varlistentry><term><option>shell</option></term>
      <listitem><para>
      shell is used to access the configuration information from a shell 
      script. It is given pairs of arguments, the first being a shell 
@@ -72,7 +72,7 @@ eval $RES
      </listitem>
      </varlistentry>
 
-     <varlistentry><term>dump</term>
+     <varlistentry><term><option>dump</option></term>
      <listitem><para>
      Just show the contents of the configuration space.</para>
      </listitem>
diff --git a/doc/apt-extracttemplates.1.xml b/doc/apt-extracttemplates.1.xml
index 8f28f8c54..f1f316822 100644
--- a/doc/apt-extracttemplates.1.xml
+++ b/doc/apt-extracttemplates.1.xml
@@ -43,8 +43,9 @@
    in the format:</para>
    <para>package version template-file config-script</para>
    <para>template-file and config-script are written to the temporary directory
-   specified by the -t or --tempdir (<literal>APT::ExtractTemplates::TempDir</literal>) 
-   directory, with filenames of the form <filename>package.template.XXXX</filename> and 
+   specified by the <option>-t</option> or <option>--tempdir</option>
+   (<literal>APT::ExtractTemplates::TempDir</literal>) directory,
+   with filenames of the form <filename>package.template.XXXX</filename> and
    <filename>package.config.XXXX</filename></para>
  </refsect1>
  
diff --git a/doc/apt-ftparchive.1.xml b/doc/apt-ftparchive.1.xml
index 93b109af1..fbc3afb10 100644
--- a/doc/apt-ftparchive.1.xml
+++ b/doc/apt-ftparchive.1.xml
@@ -55,7 +55,7 @@
    commands below must be present.</para>
    
    <variablelist>
-     <varlistentry><term>packages</term>
+     <varlistentry><term><option>packages</option></term>
      <listitem><para>
      The packages command generates a package file from a directory tree. It
      takes the given directory and recursively searches it for .deb files, 
@@ -65,7 +65,7 @@
      <para>The option <option>--db</option> can be used to specify a binary caching DB.</para></listitem>
      </varlistentry>
      
-     <varlistentry><term>sources</term>
+     <varlistentry><term><option>sources</option></term>
      <listitem><para>
      The <literal>sources</literal> command generates a source index file from a directory tree. 
      It takes the given directory and recursively searches it for .dsc files,
@@ -77,7 +77,7 @@
      used to change the source override file that will be used.</para></listitem>
      </varlistentry>
 
-     <varlistentry><term>contents</term>
+     <varlistentry><term><option>contents</option></term>
      <listitem><para>
      The <literal>contents</literal> command generates a contents file from a directory tree. It
      takes the given directory and recursively searches it for .deb files, 
@@ -89,7 +89,7 @@
      The option <option>--db</option> can be used to specify a binary caching DB.</para></listitem>
      </varlistentry>
 
-     <varlistentry><term>release</term>
+     <varlistentry><term><option>release</option></term>
      <listitem><para>
      The <literal>release</literal> command generates a Release file from a
      directory tree. It recursively searches the given directory for uncompressed
@@ -112,7 +112,7 @@
 
      </varlistentry>
 
-     <varlistentry><term>generate</term>
+     <varlistentry><term><option>generate</option></term>
      <listitem><para>
      The <literal>generate</literal> command is designed to be runnable from a cron script and
      builds indexes according to the given config file. The config language
@@ -121,7 +121,7 @@
      required settings.</para></listitem>
      </varlistentry>
 
-     <varlistentry><term>clean</term>
+     <varlistentry><term><option>clean</option></term>
      <listitem><para>
      The <literal>clean</literal> command tidies the databases used by the given 
      configuration file by removing any records that are no longer necessary.</para></listitem>
@@ -148,24 +148,24 @@
      directories are prepended certain relative paths defined in later 
      sections to produce a complete an absolute path.</para>
      <variablelist>     
-      <varlistentry><term>ArchiveDir</term>
+      <varlistentry><term><option>ArchiveDir</option></term>
       <listitem><para>
       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 nodes.</para></listitem>
       </varlistentry>
 
-      <varlistentry><term>OverrideDir</term>
+      <varlistentry><term><option>OverrideDir</option></term>
       <listitem><para>
       Specifies the location of the override files.</para></listitem>
       </varlistentry>
       
-      <varlistentry><term>CacheDir</term>
+      <varlistentry><term><option>CacheDir</option></term>
       <listitem><para>
       Specifies the location of the cache files</para></listitem>
       </varlistentry>
       
-      <varlistentry><term>FileListDir</term>
+      <varlistentry><term><option>FileListDir</option></term>
       <listitem><para>
       Specifies the location of the file list files, 
       if the <literal>FileList</literal> setting is used below.</para></listitem>
@@ -179,7 +179,7 @@
      that control the operation of the generator. Other sections may override 
      these defaults with a per-section setting.</para>
      <variablelist>     
-      <varlistentry><term>Packages::Compress</term>
+      <varlistentry><term><option>Packages::Compress</option></term>
       <listitem><para>
       Sets the default compression schemes to use 
       for the Package index files. It is a string that contains a space 
@@ -187,51 +187,51 @@
       'bzip2'. The default for all compression schemes is '. gzip'.</para></listitem>
       </varlistentry>
 
-      <varlistentry><term>Packages::Extensions</term>
+      <varlistentry><term><option>Packages::Extensions</option></term>
       <listitem><para>
       Sets the default list of file extensions that are package files.
       This defaults to '.deb'.</para></listitem>
       </varlistentry>
       
-      <varlistentry><term>Sources::Compress</term>
+      <varlistentry><term><option>Sources::Compress</option></term>
       <listitem><para>
       This is similar to <literal>Packages::Compress</literal> 
       except that it controls the compression for the Sources files.</para></listitem>
       </varlistentry>
       
-      <varlistentry><term>Sources::Extensions</term>
+      <varlistentry><term><option>Sources::Extensions</option></term>
       <listitem><para>
       Sets the default list of file extensions that are source files.
       This defaults to '.dsc'.</para></listitem>
       </varlistentry>
       
-      <varlistentry><term>Contents::Compress</term>
+      <varlistentry><term><option>Contents::Compress</option></term>
       <listitem><para>
       This is similar to <literal>Packages::Compress</literal> 
       except that it controls the compression for the Contents files.</para></listitem>
       </varlistentry>
 
-      <varlistentry><term>Translation::Compress</term>
+      <varlistentry><term><option>Translation::Compress</option></term>
       <listitem><para>
       This is similar to <literal>Packages::Compress</literal> 
       except that it controls the compression for the Translation-en master file.</para></listitem>
       </varlistentry>
 
-      <varlistentry><term>DeLinkLimit</term>
+      <varlistentry><term><option>DeLinkLimit</option></term>
       <listitem><para>
       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-Links</literal> setting.</para></listitem>
       </varlistentry>
       
-      <varlistentry><term>FileMode</term>
+      <varlistentry><term><option>FileMode</option></term>
       <listitem><para>
       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.</para></listitem>
       </varlistentry>
 
-      <varlistentry><term>LongDescription</term>
+      <varlistentry><term><option>LongDescription</option></term>
       <listitem><para>
       Sets if long descriptions should be included in the Packages file or split
       out into a master Translation-en file.</para></listitem>
@@ -246,14 +246,14 @@
      $(SECTION) and $(ARCH) replaced with their respective values.</para>
      
      <variablelist>     
-      <varlistentry><term>MaxContentsChange</term>
+      <varlistentry><term><option>MaxContentsChange</option></term>
       <listitem><para>
       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 be rebuilt.</para></listitem>
       </varlistentry>
       
-      <varlistentry><term>ContentsAge</term>
+      <varlistentry><term><option>ContentsAge</option></term>
       <listitem><para>
       Controls the number of days a contents file is allowed
       to be checked without changing. If this limit is passed the mtime of the 
@@ -264,45 +264,45 @@
       the units are in days.</para></listitem>
       </varlistentry>
       
-      <varlistentry><term>Directory</term>
+      <varlistentry><term><option>Directory</option></term>
       <listitem><para>
       Sets the top of the .deb directory tree. Defaults to
       <filename>$(DIST)/$(SECTION)/binary-$(ARCH)/</filename></para></listitem>
       </varlistentry>
       
-      <varlistentry><term>SrcDirectory</term>
+      <varlistentry><term><option>SrcDirectory</option></term>
       <listitem><para>
       Sets the top of the source package directory tree. Defaults to
       <filename>$(DIST)/$(SECTION)/source/</filename></para></listitem>
       </varlistentry>
       
-      <varlistentry><term>Packages</term>
+      <varlistentry><term><option>Packages</option></term>
       <listitem><para>
       Sets the output Packages file. Defaults to 
       <filename>$(DIST)/$(SECTION)/binary-$(ARCH)/Packages</filename></para></listitem>
       </varlistentry>
       
-      <varlistentry><term>Sources</term>
+      <varlistentry><term><option>Sources</option></term>
       <listitem><para>
       Sets the output Sources file. Defaults to 
       <filename>$(DIST)/$(SECTION)/source/Sources</filename></para></listitem>
       </varlistentry>
 
-      <varlistentry><term>Translation</term>
+      <varlistentry><term><option>Translation</option></term>
       <listitem><para>
       Set the output Translation-en master file with the long descriptions if they
       should be not included in the Packages file. Defaults to
       <filename>$(DIST)/$(SECTION)/i18n/Translation-en</filename></para></listitem>
       </varlistentry>
 
-      <varlistentry><term>InternalPrefix</term>
+      <varlistentry><term><option>InternalPrefix</option></term>
       <listitem><para>
       Sets the path prefix that causes a symlink to be
       considered an internal link instead of an external link. Defaults to
       <filename>$(DIST)/$(SECTION)/</filename></para></listitem>
       </varlistentry>
       
-      <varlistentry><term>Contents</term>
+      <varlistentry><term><option>Contents</option></term>
       <listitem><para>
       Sets the output Contents file. Defaults to
       <filename>$(DIST)/Contents-$(ARCH)</filename>. If this setting causes multiple 
@@ -311,25 +311,25 @@
       together automatically.</para></listitem>
       </varlistentry>
       
-      <varlistentry><term>Contents::Header</term>
+      <varlistentry><term><option>Contents::Header</option></term>
       <listitem><para>
       Sets header file to prepend to the contents output.</para></listitem>
       </varlistentry>
 
-      <varlistentry><term>BinCacheDB</term>
+      <varlistentry><term><option>BinCacheDB</option></term>
       <listitem><para>
       Sets the binary cache database to use for this 
       section. Multiple sections can share the same database.</para></listitem>
       </varlistentry>
       
-      <varlistentry><term>FileList</term>
+      <varlistentry><term><option>FileList</option></term>
       <listitem><para>
       Specifies that instead of walking the directory tree, 
       <command>apt-ftparchive</command> should read the list of files from the given 
       file. Relative files names are prefixed with the archive directory.</para></listitem>
       </varlistentry>
       
-      <varlistentry><term>SourceFileList</term>
+      <varlistentry><term><option>SourceFileList</option></term>
       <listitem><para>
       Specifies that instead of walking the directory tree, 
       <command>apt-ftparchive</command> should read the list of files from the given 
@@ -363,44 +363,44 @@ for i in Sections do
      </programlisting></para>
 
      <variablelist>     
-      <varlistentry><term>Sections</term>
+      <varlistentry><term><option>Sections</option></term>
       <listitem><para>
       This is a space separated list of sections which appear 
       under the distribution, typically this is something like 
       <literal>main contrib non-free</literal></para></listitem>
       </varlistentry>
       
-      <varlistentry><term>Architectures</term>
+      <varlistentry><term><option>Architectures</option></term>
       <listitem><para>
       This is a space separated list of all the 
       architectures that appear under search section. The special architecture 
       'source' is used to indicate that this tree has a source archive.</para></listitem>
       </varlistentry>
 
-      <varlistentry><term>LongDescription</term>
+      <varlistentry><term><option>LongDescription</option></term>
       <listitem><para>
       Sets if long descriptions should be included in the Packages file or split
       out into a master Translation-en file.</para></listitem>
       </varlistentry>
 
-      <varlistentry><term>BinOverride</term>
+      <varlistentry><term><option>BinOverride</option></term>
       <listitem><para>
       Sets the binary override file. The override file 
       contains section, priority and maintainer address information.</para></listitem>
       </varlistentry>
 
-      <varlistentry><term>SrcOverride</term>
+      <varlistentry><term><option>SrcOverride</option></term>
       <listitem><para>
       Sets the source override file. The override file 
       contains section information.</para></listitem>
       </varlistentry>
       
-      <varlistentry><term>ExtraOverride</term>
+      <varlistentry><term><option>ExtraOverride</option></term>
       <listitem><para>
       Sets the binary extra override file.</para></listitem>
       </varlistentry>
       
-      <varlistentry><term>SrcExtraOverride</term>
+      <varlistentry><term><option>SrcExtraOverride</option></term>
       <listitem><para>
       Sets the source extra override file.</para></listitem> 
       </varlistentry>
@@ -415,53 +415,53 @@ for i in Sections do
      section with no substitution variables or
      <literal>Section</literal><literal>Architecture</literal> settings.</para>
      <variablelist>
-      <varlistentry><term>Packages</term>
+      <varlistentry><term><option>Packages</option></term>
       <listitem><para>
       Sets the Packages file output.</para></listitem>
       </varlistentry>
       
-      <varlistentry><term>Sources</term>
+      <varlistentry><term><option>Sources</option></term>
       <listitem><para>
       Sets the Sources file output. At least one of
       <literal>Packages</literal> or <literal>Sources</literal> is required.</para></listitem>
       </varlistentry>
       
-      <varlistentry><term>Contents</term>
+      <varlistentry><term><option>Contents</option></term>
       <listitem><para>
       Sets the Contents file output. (optional)</para></listitem>
       </varlistentry>
       
-      <varlistentry><term>BinOverride</term>
+      <varlistentry><term><option>BinOverride</option></term>
       <listitem><para>
       Sets the binary override file.</para></listitem>
       </varlistentry>
       
-      <varlistentry><term>SrcOverride</term>
+      <varlistentry><term><option>SrcOverride</option></term>
       <listitem><para>
       Sets the source override file.</para></listitem>
       </varlistentry>
       
-      <varlistentry><term>ExtraOverride</term>
+      <varlistentry><term><option>ExtraOverride</option></term>
       <listitem><para>
       Sets the binary extra override file.</para></listitem>
       </varlistentry>
       
-      <varlistentry><term>SrcExtraOverride</term>
+      <varlistentry><term><option>SrcExtraOverride</option></term>
       <listitem><para>
       Sets the source extra override file.</para></listitem>
       </varlistentry>
       
-      <varlistentry><term>BinCacheDB</term>
+      <varlistentry><term><option>BinCacheDB</option></term>
       <listitem><para>
       Sets the cache DB.</para></listitem>
       </varlistentry>
       
-      <varlistentry><term>PathPrefix</term>
+      <varlistentry><term><option>PathPrefix</option></term>
       <listitem><para>
       Appends a path to all the output paths.</para></listitem>
       </varlistentry>
       
-      <varlistentry><term>FileList, SourceFileList</term>
+      <varlistentry><term><option>FileList</option></term><term><option>SourceFileList</option></term>
       <listitem><para>
       Specifies the file list file.</para></listitem>
       </varlistentry>
@@ -505,7 +505,7 @@ for i in Sections do
    &apt-cmdblurb;
    
    <variablelist>
-     <varlistentry><term><option>--md5</option>, <option>--sha1</option>, <option>--sha256</option></term>
+     <varlistentry><term><option>--md5</option></term><term><option>--sha1</option></term><term><option>--sha256</option></term>
      <listitem><para>
      Generate the given checksum. These options default to on, when turned off the generated
      index files will not have the checksum fields where possible.
diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml
index 15b9701e2..5cd5a5f8d 100644
--- a/doc/apt-get.8.xml
+++ b/doc/apt-get.8.xml
@@ -45,7 +45,7 @@
    commands below must be present.</para>
    
    <variablelist>
-     <varlistentry><term>update</term>
+     <varlistentry><term><option>update</option></term>
      <listitem><para><literal>update</literal> is used to resynchronize the package index files from
      their sources. The indexes of available packages are fetched from the
      location(s) specified in <filename>/etc/apt/sources.list</filename>.
@@ -57,7 +57,7 @@
      of the package files cannot be known in advance.</para></listitem>
      </varlistentry>
      
-     <varlistentry><term>upgrade</term>
+     <varlistentry><term><option>upgrade</option></term>
      <listitem><para><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>. Packages currently installed with 
@@ -70,7 +70,7 @@
      available.</para></listitem>
      </varlistentry>
 
-     <varlistentry><term>dselect-upgrade</term>
+     <varlistentry><term><option>dselect-upgrade</option></term>
      <listitem><para><literal>dselect-upgrade</literal>
      is used in conjunction with the traditional Debian packaging
      front-end, &dselect;. <literal>dselect-upgrade</literal>
@@ -80,7 +80,7 @@
      packages).</para></listitem>
      </varlistentry>
 
-     <varlistentry><term>dist-upgrade</term>
+     <varlistentry><term><option>dist-upgrade</option></term>
      <listitem><para><literal>dist-upgrade</literal> in addition to performing the function of 
      <literal>upgrade</literal>, also intelligently handles changing dependencies 
      with new versions of packages; <command>apt-get</command> has a "smart" conflict 
@@ -93,7 +93,7 @@
      overriding the general settings for individual packages.</para></listitem>
      </varlistentry>
 
-     <varlistentry><term>install</term>
+     <varlistentry><term><option>install</option></term>
      <listitem>
 	 <para><literal>install</literal> is followed by one or more 
 	 packages desired for installation or upgrading. 
@@ -147,7 +147,7 @@
      with a '^' or '$' character, or create a more specific regular expression.</para></listitem>
      </varlistentry>
 
-     <varlistentry><term>remove</term>
+     <varlistentry><term><option>remove</option></term>
      <listitem><para><literal>remove</literal> is identical to <literal>install</literal> except that packages are 
 	 removed instead of installed. Note the removing a package leaves its
 	 configuration files in system. If a plus sign is appended to the package 
@@ -155,12 +155,12 @@
      installed instead of removed.</para></listitem>
      </varlistentry>
 
-     <varlistentry><term>purge</term>
+     <varlistentry><term><option>purge</option></term>
      <listitem><para><literal>purge</literal> is identical to <literal>remove</literal> except that packages are 
      removed and purged (any configuration files are deleted too).</para></listitem>
      </varlistentry>
 
-     <varlistentry><term>source</term>
+     <varlistentry><term><option>source</option></term>
      <listitem><para><literal>source</literal> causes <command>apt-get</command> to fetch source packages. APT 
      will examine the available packages to decide which source package to 
      fetch. It will then find and download into the current directory the 
@@ -194,25 +194,25 @@
      tar balls.</para></listitem>
      </varlistentry>
 
-     <varlistentry><term>build-dep</term>
+     <varlistentry><term><option>build-dep</option></term>
      <listitem><para><literal>build-dep</literal> causes apt-get to install/remove packages in an 
      attempt to satisfy the build dependencies for a source package. By default the dependencies are
      satisfied to build the package natively. If desired a host-architecture can be specified
      with the <option>--host-architecture</option> option instead.</para></listitem>
      </varlistentry>
 
-     <varlistentry><term>check</term>
+     <varlistentry><term><option>check</option></term>
      <listitem><para><literal>check</literal> is a diagnostic tool; it updates the package cache and checks 
      for broken dependencies.</para></listitem>
      </varlistentry>
 
-     <varlistentry><term>download</term>
+     <varlistentry><term><option>download</option></term>
        <listitem><para><literal>download</literal> will download the given
            binary package into the current directory.
        </para></listitem>
      </varlistentry>
 
-     <varlistentry><term>clean</term>
+     <varlistentry><term><option>clean</option></term>
      <listitem><para><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 
@@ -222,7 +222,7 @@
      from time to time to free up disk space.</para></listitem>
      </varlistentry>
 
-     <varlistentry><term>autoclean</term>
+     <varlistentry><term><option>autoclean</option></term>
      <listitem><para>Like <literal>clean</literal>, <literal>autoclean</literal> clears out the local 
      repository of retrieved package files. The difference is that it only 
      removes package files that can no longer be downloaded, and are largely 
@@ -232,17 +232,17 @@
      erased if it is set to off.</para></listitem>
      </varlistentry>
 
-     <varlistentry><term>autoremove</term>
+     <varlistentry><term><option>autoremove</option></term>
      <listitem><para><literal>autoremove</literal> is used to remove packages that were automatically
      installed to satisfy dependencies for other packages and are now no longer needed.</para></listitem>
      </varlistentry>
 
-     <varlistentry><term>changelog</term>
+     <varlistentry><term><option>changelog</option></term>
        <listitem><para><literal>changelog</literal> downloads a package changelog and displays
            it through <command>sensible-pager</command>. The server name and base
            directory is defined in the <literal>APT::Changelogs::Server</literal>
-           variable (e. g. <ulink>http://packages.debian.org/changelogs</ulink> for
-           Debian or <ulink>http://changelogs.ubuntu.com/changelogs</ulink> for
+	   variable (e. g. <ulink url="http://packages.debian.org/changelogs">packages.debian.org/changelogs</ulink> for
+	   Debian or <ulink url="http://changelogs.ubuntu.com/changelogs">changelogs.ubuntu.com/changelogs</ulink> for
            Ubuntu).
            By default it displays the changelog for the version that is
            installed.  However, you can specify the same options as for
diff --git a/doc/apt-key.8.xml b/doc/apt-key.8.xml
index a45ad8cd3..e5c8d5a2d 100644
--- a/doc/apt-key.8.xml
+++ b/doc/apt-key.8.xml
@@ -37,7 +37,7 @@
 
 <refsect1><title>Commands</title>
    <variablelist>
-     <varlistentry><term>add &synopsis-param-filename;</term>
+     <varlistentry><term><option>add</option> <option>&synopsis-param-filename;</option></term>
      <listitem>
      <para>
        Add a new key to the list of trusted keys.
@@ -49,7 +49,7 @@
      </listitem>
      </varlistentry>
 
-     <varlistentry><term>del &synopsis-param-keyid;</term>
+     <varlistentry><term><option>del</option> <option>&synopsis-param-keyid;</option></term>
      <listitem>
      <para>
 
@@ -60,7 +60,7 @@
      </listitem>
      </varlistentry>
 
-     <varlistentry><term>export &synopsis-param-keyid;</term>
+     <varlistentry><term><option>export</option> <option>&synopsis-param-keyid;</option></term>
      <listitem>
      <para>
 
@@ -71,7 +71,7 @@
      </listitem>
      </varlistentry>
 
-     <varlistentry><term>exportall</term>
+     <varlistentry><term><option>exportall</option></term>
      <listitem>
      <para>
 
@@ -82,7 +82,7 @@
      </listitem>
      </varlistentry>
 
-     <varlistentry><term>list</term>
+     <varlistentry><term><option>list</option></term>
      <listitem>
      <para>
 
@@ -93,7 +93,7 @@
      </listitem>
      </varlistentry>
      
-	 <varlistentry><term>finger</term>
+     <varlistentry><term><option>finger</option></term>
      <listitem>
      <para>
 
@@ -104,7 +104,7 @@
      </listitem>
      </varlistentry>
      
-	 <varlistentry><term>adv</term>
+     <varlistentry><term><option>adv</option></term>
      <listitem>
      <para>
 
@@ -116,7 +116,7 @@
      </listitem>
      </varlistentry>
 
-     <varlistentry><term>update</term>
+     <varlistentry><term><option>update</option></term>
      <listitem>
      <para>
 
@@ -130,7 +130,7 @@
      </listitem>
      </varlistentry>
      
-     <varlistentry><term>net-update</term>
+     <varlistentry><term><option>net-update</option></term>
      <listitem>
      <para>
 
@@ -153,7 +153,7 @@
  <refsect1><title>Options</title>
 <para>Note that options need to be defined before the commands described in the previous section.</para>
    <variablelist>
-      <varlistentry><term>--keyring &synopsis-param-filename;</term>
+      <varlistentry><term><option>--keyring</option> <option>&synopsis-param-filename;</option></term>
       <listitem><para>With this option it is possible to specify a specific keyring
       file the command should operate on. The default is that a command is executed
       on the <filename>trusted.gpg</filename> file as well as on all parts in the
diff --git a/doc/apt-mark.8.xml b/doc/apt-mark.8.xml
index d62731124..f56115635 100644
--- a/doc/apt-mark.8.xml
+++ b/doc/apt-mark.8.xml
@@ -48,7 +48,7 @@
      <command>apt-get</command> or <command>aptitude</command>.
    </para>
      <variablelist>
-       <varlistentry><term>auto</term>
+     <varlistentry><term><option>auto</option></term>
 	 <listitem><para><literal>auto</literal> is used to mark a
      package as being automatically installed, which will cause the
      package to be removed when no more manually installed packages
@@ -56,7 +56,7 @@
        </para></listitem>
        </varlistentry>
 
-       <varlistentry><term>manual</term>
+     <varlistentry><term><option>manual</option></term>
 	 <listitem><para><literal>manual</literal> is used to mark a
      package as being manually installed, which will prevent the
      package from being automatically removed if no other packages
@@ -64,7 +64,7 @@
        </para></listitem>
        </varlistentry>
 
-       <varlistentry><term>hold</term>
+       <varlistentry><term><option>hold</option></term>
 	 <listitem><para><literal>hold</literal> is used to mark a
        package as hold back, which will prevent the package from being
        automatically installed, upgraded or removed.
@@ -74,13 +74,13 @@
        </para></listitem>
        </varlistentry>
 
-       <varlistentry><term>unhold</term>
+       <varlistentry><term><option>unhold</option></term>
 	 <listitem><para><literal>unhold</literal> is used to cancel a
        previously set hold on a package to allow all actions again.
        </para></listitem>
        </varlistentry>
 
-       <varlistentry><term>showauto</term>
+       <varlistentry><term><option>showauto</option></term>
 	 <listitem><para><literal>showauto</literal> is used to print a
      list of automatically installed packages with each package on a new line.
      All automatically installed packages will be listed if no package is given.
@@ -88,14 +88,14 @@
        </para></listitem>
        </varlistentry>
 
-       <varlistentry><term>showmanual</term>
+       <varlistentry><term><option>showmanual</option></term>
 	 <listitem><para><literal>showmanual</literal> can be used in
      the same way as <literal>showauto</literal> except that it will print
      a list of manually installed packages instead.
        </para></listitem>
        </varlistentry>
 
-       <varlistentry><term>showhold</term>
+       <varlistentry><term><option>showhold</option></term>
 	 <listitem><para><literal>showhold</literal> is used to print a list
      of packages on hold in the same way as for the other show commands.
        </para></listitem>
@@ -109,12 +109,12 @@
    
    <variablelist>
 	<varlistentry>
-		<term><option>-f=<filename><replaceable>FILENAME</replaceable></filename></option></term>
-		<term><option>--file=<filename><replaceable>FILENAME</replaceable></filename></option></term>
+		<term><option>-f=<filename><replaceable>&synopsis-filename;</replaceable></filename></option></term>
+		<term><option>--file=<filename><replaceable>&synopsis-filename;</replaceable></filename></option></term>
      <listitem><para>
-      
-     Read/Write package stats from <filename><replaceable>FILENAME</replaceable></filename>
-     instead of the default location, which
+     Read/Write package stats from the filename given with the parameter
+     <filename><replaceable>&synopsis-filename;</replaceable></filename>
+     instead of from the default location, which
      is <filename>extended_status</filename> in the directory defined
      by the Configuration Item: <literal>Dir::State</literal>.</para></listitem>
      </varlistentry>
diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml
index ff9942e5f..b521db72c 100644
--- a/doc/apt.conf.5.xml
+++ b/doc/apt.conf.5.xml
@@ -148,13 +148,13 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
    options for all of the tools.</para>
 
    <variablelist>
-     <varlistentry><term>Architecture</term>
+     <varlistentry><term><option>Architecture</option></term>
      <listitem><para>System Architecture; sets the architecture to use when fetching files and
      parsing package lists. The internal default is the architecture apt was 
      compiled for.</para></listitem>
      </varlistentry>
 
-     <varlistentry><term>Architectures</term>
+     <varlistentry><term><option>Architectures</option></term>
      <listitem><para>All Architectures the system supports. Processors implementing the
      <literal>amd64</literal> (also called <literal>x86-64</literal>) instruction set are
      e.g. also able to execute binaries compiled for the <literal>i386</literal>
@@ -164,25 +164,25 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
      </para></listitem>
      </varlistentry>
 
-     <varlistentry><term>Default-Release</term>
+     <varlistentry><term><option>Default-Release</option></term>
      <listitem><para>Default release to install packages from if more than one
      version available. Contains release name, codename or release version. Examples: 'stable', 'testing',
      'unstable', '&stable-codename;', '&testing-codename;', '4.0', '5.0*'. See also &apt-preferences;.</para></listitem>
      </varlistentry>
 
-     <varlistentry><term>Ignore-Hold</term>
+     <varlistentry><term><option>Ignore-Hold</option></term>
      <listitem><para>Ignore Held packages; This global option causes the problem resolver to
      ignore held packages in its decision making.</para></listitem>
      </varlistentry>
 
-     <varlistentry><term>Clean-Installed</term>
+     <varlistentry><term><option>Clean-Installed</option></term>
      <listitem><para>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 then
      packages that are locally installed are also excluded from cleaning - but
      note that APT provides no direct means to reinstall them.</para></listitem>
      </varlistentry>
 
-     <varlistentry><term>Immediate-Configure</term>
+     <varlistentry><term><option>Immediate-Configure</option></term>
      <listitem><para>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
@@ -205,7 +205,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
      improving or correcting the upgrade process.</para></listitem>
      </varlistentry>
 
-     <varlistentry><term>Force-LoopBreak</term>
+     <varlistentry><term><option>Force-LoopBreak</option></term>
      <listitem><para>Never Enable this option unless you -really- know what you are doing. It
      permits APT to temporarily remove an essential package to break a
      Conflicts/Conflicts or Conflicts/Pre-Depend loop between two essential
@@ -214,7 +214,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
      anything that those packages depend on.</para></listitem>
      </varlistentry>
 
-     <varlistentry><term>Cache-Start, Cache-Grow and Cache-Limit</term>
+     <varlistentry><term><option>Cache-Start</option></term><term><option>Cache-Grow</option></term><term><option>Cache-Limit</option></term>
      <listitem><para>APT uses since version 0.7.26 a resizable memory mapped cache file to store the 'available'
      information. <literal>Cache-Start</literal> acts as a hint to which size the Cache will grow
      and is therefore the amount of memory APT will request at startup. The default value is
@@ -230,21 +230,21 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
      </para></listitem>
      </varlistentry>
 
-     <varlistentry><term>Build-Essential</term>
+     <varlistentry><term><option>Build-Essential</option></term>
      <listitem><para>Defines which package(s) are considered essential build dependencies.</para></listitem>
      </varlistentry>
 
-     <varlistentry><term>Get</term>
+     <varlistentry><term><option>Get</option></term>
      <listitem><para>The Get subsection controls the &apt-get; tool, please see its
      documentation for more information about the options here.</para></listitem>
      </varlistentry>
 
-     <varlistentry><term>Cache</term>
+     <varlistentry><term><option>Cache</option></term>
      <listitem><para>The Cache subsection controls the &apt-cache; tool, please see its
      documentation for more information about the options here.</para></listitem>
      </varlistentry>
 
-     <varlistentry><term>CDROM</term>
+     <varlistentry><term><option>CDROM</option></term>
      <listitem><para>The CDROM subsection controls the &apt-cdrom; tool, please see its
      documentation for more information about the options here.</para></listitem>
      </varlistentry>
@@ -256,7 +256,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
    and the URI handlers. 
 
    <variablelist>
-     <varlistentry><term>Check-Valid-Until</term>
+     <varlistentry><term><option>Check-Valid-Until</option></term>
 	 <listitem><para>Security related option defaulting to true as an
 	 expiring validation for a Release file prevents longtime replay attacks
 	 and can e.g. also help users to identify no longer updated mirrors -
@@ -267,7 +267,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
 	 </para></listitem>
      </varlistentry>
 
-     <varlistentry><term>Max-ValidTime</term>
+     <varlistentry><term><option>Max-ValidTime</option></term>
 	 <listitem><para>Seconds the Release file should be considered valid after
 	 it was created (indicated by the <literal>Date</literal> header).
 	 If the Release file itself includes a <literal>Valid-Until</literal> header
@@ -278,7 +278,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
 	 </para></listitem>
      </varlistentry>
 
-     <varlistentry><term>Min-ValidTime</term>
+     <varlistentry><term><option>Min-ValidTime</option></term>
 	 <listitem><para>Minimum of seconds the Release file should be considered
 	 valid after it was created (indicated by the <literal>Date</literal> header).
 	 Use this if you need to use a seldomly updated (local) mirror of a more
@@ -289,7 +289,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
 	 </para></listitem>
      </varlistentry>
 
-     <varlistentry><term>PDiffs</term>
+     <varlistentry><term><option>PDiffs</option></term>
 	 <listitem><para>Try to download deltas called <literal>PDiffs</literal> for
 	 Packages or Sources files instead of downloading whole ones. True
 	 by default.</para>
@@ -302,7 +302,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
 	 </para></listitem>
      </varlistentry>
 
-     <varlistentry><term>Queue-Mode</term>
+     <varlistentry><term><option>Queue-Mode</option></term>
      <listitem><para>Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</literal> or 
      <literal>access</literal> which determines how  APT parallelizes outgoing 
      connections. <literal>host</literal> means that one connection per target host 
@@ -310,17 +310,17 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
      will be opened.</para></listitem>
      </varlistentry>
 
-     <varlistentry><term>Retries</term>
+     <varlistentry><term><option>Retries</option></term>
      <listitem><para>Number of retries to perform. If this is non-zero APT will retry failed 
      files the given number of times.</para></listitem>
      </varlistentry>
 
-     <varlistentry><term>Source-Symlinks</term>
+     <varlistentry><term><option>Source-Symlinks</option></term>
      <listitem><para>Use symlinks for source archives. If set to true then source archives will
      be symlinked when possible instead of copying. True is the default.</para></listitem>
      </varlistentry>
 
-     <varlistentry><term>http</term>
+     <varlistentry><term><option>http</option></term>
      <listitem><para>HTTP URIs; http::Proxy is the default http proxy to use. It is in the 
      standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. Per 
      host proxies can also be specified by using the form 
@@ -363,7 +363,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
      </listitem>
      </varlistentry>
 
-     <varlistentry><term>https</term>
+     <varlistentry><term><option>https</option></term>
 	 <listitem><para>HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and
 	 proxy options are the same as for <literal>http</literal> method and will also
 	 default to the options from the <literal>http</literal> method if they are not
@@ -388,7 +388,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
 	 <literal>&lt;host&gt;::SslForceVersion</literal> is corresponding per-host option.
 	 </para></listitem></varlistentry>
 
-     <varlistentry><term>ftp</term>
+     <varlistentry><term><option>ftp</option></term>
      <listitem><para>FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the 
      standard form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. Per 
      host proxies can also be specified by using the form 
@@ -427,7 +427,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
      do not support RFC2428.</para></listitem>
      </varlistentry>
 
-     <varlistentry><term>cdrom</term>
+     <varlistentry><term><option>cdrom</option></term>
      <listitem><para>CDROM URIs; the only setting for CDROM URIs is the mount point, 
      <literal>cdrom::Mount</literal> which must be the mount point for the CDROM drive 
      as specified in <filename>/etc/fstab</filename>. It is possible to provide 
@@ -438,13 +438,13 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
      commands can be specified using UMount.</para></listitem>
      </varlistentry>
 
-     <varlistentry><term>gpgv</term>
+     <varlistentry><term><option>gpgv</option></term>
      <listitem><para>GPGV URIs; the only option for GPGV URIs is the option to pass additional parameters to gpgv.
      <literal>gpgv::Options</literal> Additional options passed to gpgv.
      </para></listitem>
      </varlistentry>
 
-     <varlistentry><term>CompressionTypes</term>
+     <varlistentry><term><option>CompressionTypes</option></term>
      <listitem><para>List of compression types which are understood by the acquire methods.
      Files like <filename>Packages</filename> can be available in various compression formats.
      Per default the acquire methods can decompress <command>bzip2</command>, <command>lzma</command>
@@ -472,7 +472,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
      useable for local mirrors.</para></listitem>
      </varlistentry>
 
-     <varlistentry><term>GzipIndexes</term>
+     <varlistentry><term><option>GzipIndexes</option></term>
 	 <listitem><para>
 	 When downloading <literal>gzip</literal> compressed indexes (Packages, Sources, or
 	 Translations), keep them gzip compressed locally instead of unpacking
@@ -481,7 +481,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
 	 </para></listitem>
      </varlistentry>
 
-     <varlistentry><term>Languages</term>
+     <varlistentry><term><option>Languages</option></term>
      <listitem><para>The Languages subsection controls which <filename>Translation</filename> files are downloaded
      and in which order APT tries to display the Description-Translations. APT will try to display the first
      available Description in the Language which is listed at first. Languages can be defined with their
@@ -574,7 +574,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
    control the default behaviour. These are in the <literal>DSelect</literal> section.</para>
    
    <variablelist>
-     <varlistentry><term>Clean</term>
+     <varlistentry><term><option>Clean</option></term>
      <listitem><para>Cache Clean mode; this value may be one of always, prompt, auto,
      pre-auto and never.  always and prompt will remove all packages from
      the cache after upgrading, prompt (the default) does so conditionally. 
@@ -583,17 +583,17 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
      action before downloading new packages.</para></listitem>
      </varlistentry>
 
-     <varlistentry><term>options</term>
+     <varlistentry><term><option>options</option></term>
      <listitem><para>The contents of this variable is passed to &apt-get; as command line
      options when it is run for the install phase.</para></listitem>
      </varlistentry>
 
-     <varlistentry><term>Updateoptions</term>
+     <varlistentry><term><option>Updateoptions</option></term>
      <listitem><para>The contents of this variable is passed to &apt-get; as command line
      options when it is run for the update phase.</para></listitem>
      </varlistentry>
 
-     <varlistentry><term>PromptAfterUpdate</term>
+     <varlistentry><term><option>PromptAfterUpdate</option></term>
      <listitem><para>If true the [U]pdate operation in &dselect; will always prompt to continue. 
      The default is to prompt only on error.</para></listitem>
      </varlistentry>
@@ -605,20 +605,20 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
    in the <literal>DPkg</literal> section.</para>
 
    <variablelist>
-     <varlistentry><term>options</term>
+     <varlistentry><term><option>options</option></term>
      <listitem><para>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 &dpkg;.</para></listitem>
      </varlistentry>
      
-     <varlistentry><term>Pre-Invoke</term><term>Post-Invoke</term>
+     <varlistentry><term><option>Pre-Invoke</option></term><term><option>Post-Invoke</option></term>
      <listitem><para>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 
      commands are invoked in order using <filename>/bin/sh</filename>, should any 
      fail APT will abort.</para></listitem>
      </varlistentry>
 
-     <varlistentry><term>Pre-Install-Pkgs</term>
+     <varlistentry><term><option>Pre-Install-Pkgs</option></term>
      <listitem><para>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 
@@ -632,12 +632,12 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
      command given to <literal>Pre-Install-Pkgs</literal>.</para></listitem>
      </varlistentry>
 
-     <varlistentry><term>Run-Directory</term>
+     <varlistentry><term><option>Run-Directory</option></term>
      <listitem><para>APT chdirs to this directory before invoking dpkg, the default is 
      <filename>/</filename>.</para></listitem>
      </varlistentry>
 
-     <varlistentry><term>Build-options</term>
+     <varlistentry><term><option>Build-options</option></term>
      <listitem><para>These options are passed to &dpkg-buildpackage; when compiling packages,
      the default is to disable signing and produce all binaries.</para></listitem>
      </varlistentry>
@@ -665,7 +665,7 @@ DPkg::ConfigurePending "true";
 DPkg::TriggersPending "true";</literallayout></para>
 
      <variablelist>
-       <varlistentry><term>DPkg::NoTriggers</term>
+       <varlistentry><term><option>DPkg::NoTriggers</option></term>
        <listitem><para>Add the no triggers flag to all dpkg calls (except the ConfigurePending call).
        See &dpkg; if you are interested in what this actually means. In short: dpkg will not run the
        triggers when this flag is present unless it is explicitly called to do so in an extra call.
@@ -673,7 +673,7 @@ DPkg::TriggersPending "true";</literallayout></para>
        meaning: Previously these option only append --no-triggers to the configure calls to dpkg -
        now apt will add these flag also to the unpack and remove calls.</para></listitem>
        </varlistentry>
-       <varlistentry><term>PackageManager::Configure</term>
+       <varlistentry><term><option>PackageManager::Configure</option></term>
        <listitem><para>Valid values are "<literal>all</literal>", "<literal>smart</literal>" and "<literal>no</literal>".
        "<literal>all</literal>" is the default value and causes APT to configure all packages explicit.
        The "<literal>smart</literal>" way is it to configure only packages which need to be configured before
@@ -684,20 +684,20 @@ DPkg::TriggersPending "true";</literallayout></para>
        default as otherwise the system could end in an unconfigured status which could be unbootable!
        </para></listitem>
        </varlistentry>
-       <varlistentry><term>DPkg::ConfigurePending</term>
+       <varlistentry><term><option>DPkg::ConfigurePending</option></term>
        <listitem><para>If this option is set apt will call <command>dpkg --configure --pending</command>
        to let dpkg handle all required configurations and triggers. This option is activated automatic
        per default if the previous option is not set to <literal>all</literal>, but deactivating could be useful
        if you want to run APT multiple times in a row - e.g. in an installer. In these sceneries you could
        deactivate this option in all but the last run.</para></listitem>
        </varlistentry>
-       <varlistentry><term>DPkg::TriggersPending</term>
+       <varlistentry><term><option>DPkg::TriggersPending</option></term>
        <listitem><para>Useful for <literal>smart</literal> configuration as a package which has pending
        triggers is not considered as <literal>installed</literal> and dpkg treats them as <literal>unpacked</literal>
        currently which is a dealbreaker for Pre-Dependencies (see debbugs #526774). Note that this will
        process all triggers, not only the triggers needed to configure this package.</para></listitem>
        </varlistentry>
-       <varlistentry><term>PackageManager::UnpackAll</term>
+       <varlistentry><term><option>PackageManager::UnpackAll</option></term>
        <listitem><para>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
@@ -705,7 +705,7 @@ DPkg::TriggersPending "true";</literallayout></para>
        this method is very experimental and needs further improvements before becoming really useful.
        </para></listitem>
        </varlistentry>
-       <varlistentry><term>OrderList::Score::Immediate</term>
+       <varlistentry><term><option>OrderList::Score::Immediate</option></term>
        <listitem><para>Essential packages (and there dependencies) should be configured immediately
        after unpacking. It will be a good idea to do this quite early in the upgrade process as these
        these configure calls require currently also <literal>DPkg::TriggersPending</literal> which
@@ -788,7 +788,7 @@ DPkg::TriggersPending "true";</literallayout></para>
 
    <variablelist>
      <varlistentry>
-       <term><literal>Debug::Acquire::cdrom</literal></term>
+       <term><option>Debug::Acquire::cdrom</option></term>
 
        <listitem>
 	 <para>
@@ -799,7 +799,7 @@ DPkg::TriggersPending "true";</literallayout></para>
      </varlistentry>
 
      <varlistentry>
-       <term><literal>Debug::Acquire::ftp</literal></term>
+       <term><option>Debug::Acquire::ftp</option></term>
 
        <listitem>
 	 <para>
@@ -810,7 +810,7 @@ DPkg::TriggersPending "true";</literallayout></para>
      </varlistentry>
 
      <varlistentry>
-       <term><literal>Debug::Acquire::http</literal></term>
+       <term><option>Debug::Acquire::http</option></term>
 
        <listitem>
 	 <para>
@@ -821,7 +821,7 @@ DPkg::TriggersPending "true";</literallayout></para>
      </varlistentry>
 
      <varlistentry>
-       <term><literal>Debug::Acquire::https</literal></term>
+       <term><option>Debug::Acquire::https</option></term>
 
        <listitem>
 	 <para>
@@ -832,7 +832,7 @@ DPkg::TriggersPending "true";</literallayout></para>
      </varlistentry>
 
      <varlistentry>
-       <term><literal>Debug::Acquire::gpgv</literal></term>
+       <term><option>Debug::Acquire::gpgv</option></term>
 
        <listitem>
 	 <para>
@@ -843,7 +843,7 @@ DPkg::TriggersPending "true";</literallayout></para>
      </varlistentry>
 
      <varlistentry>
-       <term><literal>Debug::aptcdrom</literal></term>
+       <term><option>Debug::aptcdrom</option></term>
 
        <listitem>
 	 <para>
@@ -854,7 +854,7 @@ DPkg::TriggersPending "true";</literallayout></para>
      </varlistentry>
 
      <varlistentry>
-       <term><literal>Debug::BuildDeps</literal></term>
+       <term><option>Debug::BuildDeps</option></term>
        <listitem>
 	 <para>
 	   Describes the process of resolving build-dependencies in
@@ -864,7 +864,7 @@ DPkg::TriggersPending "true";</literallayout></para>
      </varlistentry>
 
      <varlistentry>
-       <term><literal>Debug::Hashes</literal></term>
+       <term><option>Debug::Hashes</option></term>
        <listitem>
 	 <para>
 	   Output each cryptographic hash that is generated by the
@@ -874,7 +874,7 @@ DPkg::TriggersPending "true";</literallayout></para>
      </varlistentry>
 
      <varlistentry>
-       <term><literal>Debug::IdentCDROM</literal></term>
+       <term><option>Debug::IdentCDROM</option></term>
        <listitem>
 	 <para>
 	   Do not include information from <literal>statfs</literal>,
@@ -885,7 +885,7 @@ DPkg::TriggersPending "true";</literallayout></para>
      </varlistentry>
 
      <varlistentry>
-       <term><literal>Debug::NoLocking</literal></term>
+       <term><option>Debug::NoLocking</option></term>
        <listitem>
 	 <para>
 	   Disable all file locking.  For instance, this will allow
@@ -896,7 +896,7 @@ DPkg::TriggersPending "true";</literallayout></para>
      </varlistentry>
 
      <varlistentry>
-       <term><literal>Debug::pkgAcquire</literal></term>
+       <term><option>Debug::pkgAcquire</option></term>
 
        <listitem>
 	 <para>
@@ -907,7 +907,7 @@ DPkg::TriggersPending "true";</literallayout></para>
      </varlistentry>
 
      <varlistentry>
-       <term><literal>Debug::pkgAcquire::Auth</literal></term>
+       <term><option>Debug::pkgAcquire::Auth</option></term>
        <listitem>
 	 <para>
 	   Output status messages and errors related to verifying
@@ -917,7 +917,7 @@ DPkg::TriggersPending "true";</literallayout></para>
      </varlistentry>
 
      <varlistentry>
-       <term><literal>Debug::pkgAcquire::Diffs</literal></term>
+       <term><option>Debug::pkgAcquire::Diffs</option></term>
        <listitem>
 	 <para>
 	   Output information about downloading and applying package
@@ -928,7 +928,7 @@ DPkg::TriggersPending "true";</literallayout></para>
      </varlistentry>
 
      <varlistentry>
-       <term><literal>Debug::pkgAcquire::RRed</literal></term>
+       <term><option>Debug::pkgAcquire::RRed</option></term>
 
        <listitem>
 	 <para>
@@ -939,7 +939,7 @@ DPkg::TriggersPending "true";</literallayout></para>
      </varlistentry>
 
      <varlistentry>
-       <term><literal>Debug::pkgAcquire::Worker</literal></term>
+       <term><option>Debug::pkgAcquire::Worker</option></term>
 
        <listitem>
 	 <para>
@@ -950,7 +950,7 @@ DPkg::TriggersPending "true";</literallayout></para>
      </varlistentry>
 
      <varlistentry>
-       <term><literal>Debug::pkgAutoRemove</literal></term>
+       <term><option>Debug::pkgAutoRemove</option></term>
 
        <listitem>
 	 <para>
@@ -961,7 +961,7 @@ DPkg::TriggersPending "true";</literallayout></para>
      </varlistentry>
 
      <varlistentry>
-       <term><literal>Debug::pkgDepCache::AutoInstall</literal></term>
+       <term><option>Debug::pkgDepCache::AutoInstall</option></term>
        <listitem>
 	 <para>
 	   Generate debug messages describing which packages are being
@@ -975,7 +975,7 @@ DPkg::TriggersPending "true";</literallayout></para>
      </varlistentry>
 
      <varlistentry>
-       <term><literal>Debug::pkgDepCache::Marker</literal></term>
+       <term><option>Debug::pkgDepCache::Marker</option></term>
        <listitem>
         <para>
            Generate debug messages describing which package is marked
@@ -997,7 +997,7 @@ DPkg::TriggersPending "true";</literallayout></para>
 
      <!-- Question: why doesn't this do anything?  The code says it should. -->
      <varlistentry>
-       <term><literal>Debug::pkgInitConfig</literal></term>
+       <term><option>Debug::pkgInitConfig</option></term>
        <listitem>
 	 <para>
 	   Dump the default configuration to standard error on
@@ -1007,7 +1007,7 @@ DPkg::TriggersPending "true";</literallayout></para>
      </varlistentry>
 
      <varlistentry>
-       <term><literal>Debug::pkgDPkgPM</literal></term>
+       <term><option>Debug::pkgDPkgPM</option></term>
        <listitem>
 	 <para>
 	   When invoking &dpkg;, output the precise command line with
@@ -1018,7 +1018,7 @@ DPkg::TriggersPending "true";</literallayout></para>
      </varlistentry>
 
      <varlistentry>
-       <term><literal>Debug::pkgDPkgProgressReporting</literal></term>
+       <term><option>Debug::pkgDPkgProgressReporting</option></term>
        <listitem>
 	 <para>
 	   Output all the data received from &dpkg; on the status file
@@ -1028,7 +1028,7 @@ DPkg::TriggersPending "true";</literallayout></para>
      </varlistentry>
 
      <varlistentry>
-       <term><literal>Debug::pkgOrderList</literal></term>
+       <term><option>Debug::pkgOrderList</option></term>
 
        <listitem>
 	 <para>
@@ -1040,7 +1040,7 @@ DPkg::TriggersPending "true";</literallayout></para>
      </varlistentry>
 
      <varlistentry>
-       <term><literal>Debug::pkgPackageManager</literal></term>
+       <term><option>Debug::pkgPackageManager</option></term>
 
        <listitem>
 	 <para>
@@ -1051,7 +1051,7 @@ DPkg::TriggersPending "true";</literallayout></para>
      </varlistentry>
 
      <varlistentry>
-       <term><literal>Debug::pkgPolicy</literal></term>
+       <term><option>Debug::pkgPolicy</option></term>
 
        <listitem>
 	 <para>
@@ -1061,7 +1061,7 @@ DPkg::TriggersPending "true";</literallayout></para>
      </varlistentry>
 
      <varlistentry>
-       <term><literal>Debug::pkgProblemResolver</literal></term>
+       <term><option>Debug::pkgProblemResolver</option></term>
 
        <listitem>
 	 <para>
@@ -1073,7 +1073,7 @@ DPkg::TriggersPending "true";</literallayout></para>
      </varlistentry>
 
      <varlistentry>
-       <term><literal>Debug::pkgProblemResolver::ShowScores</literal></term>
+       <term><option>Debug::pkgProblemResolver::ShowScores</option></term>
        <listitem>
         <para>
           Display a list of all installed packages with their calculated score
@@ -1084,7 +1084,7 @@ DPkg::TriggersPending "true";</literallayout></para>
      </varlistentry>
 
      <varlistentry>
-       <term><literal>Debug::sourceList</literal></term>
+       <term><option>Debug::sourceList</option></term>
 
        <listitem>
 	 <para>
diff --git a/doc/apt_preferences.5.xml b/doc/apt_preferences.5.xml
index f08f92b94..b6de039c6 100644
--- a/doc/apt_preferences.5.xml
+++ b/doc/apt_preferences.5.xml
@@ -287,6 +287,7 @@ Pin: release n=karmic*
 Pin-Priority: 990
 </programlisting>
 
+<para>
 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 of all package names it matches. It is undecided whether
@@ -295,7 +296,7 @@ pins first, so later specific pins override it.
 
 The pattern "<literal>*</literal>" in a Package field is not considered
 a glob() expression in itself.
-
+</para>
 </refsect2>
 
 
diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index e7e198d5a..9500330b4 100644
--- a/doc/po/apt-doc.pot
+++ b/doc/po/apt-doc.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-05-20 18:22+0300\n"
+"POT-Creation-Date: 2012-05-21 04:13+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -678,11 +678,6 @@ msgid ""
 "one of the commands below must be present."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:48
-msgid "gencaches"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:49
 msgid ""
@@ -690,9 +685,9 @@ msgid ""
 "implicitly by all commands needing this cache if it is missing or outdated."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:53
-msgid "showpkg <replaceable>&synopsis-pkg;</replaceable>…"
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
+#: apt-cache.8.xml:53 apt-cache.8.xml:142 apt-cache.8.xml:163 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
+msgid "&synopsis-pkg;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -737,11 +732,6 @@ msgid ""
 "best to consult the apt source code."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:87
-msgid "stats"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:87
 msgid ""
@@ -822,11 +812,6 @@ msgid ""
 "relationships claimed by all of the packages in the cache."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:142
-msgid "showsrc <replaceable>&synopsis-pkg;</replaceable>…"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:143
 msgid ""
@@ -835,11 +820,6 @@ msgid ""
 "records that declare the name to be a Binary."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:148 apt-config.8.xml:75
-msgid "dump"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:149
 msgid ""
@@ -847,11 +827,6 @@ msgid ""
 "cache. It is primarily for debugging."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:153
-msgid "dumpavail"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:154
 msgid ""
@@ -859,11 +834,6 @@ msgid ""
 "suitable for use with &dpkg; and is used by the &dselect; method."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:158
-msgid "unmet"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:159
 msgid ""
@@ -871,11 +841,6 @@ msgid ""
 "package cache."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:163
-msgid "show <replaceable>&synopsis-pkg;</replaceable>…"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:164
 msgid ""
@@ -884,9 +849,9 @@ msgid ""
 "packages."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
 #: apt-cache.8.xml:169
-msgid "search <replaceable>&synopsis-regex;</replaceable>…"
+msgid "&synopsis-regex;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -911,11 +876,6 @@ msgid ""
 "and'ed together."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:187
-msgid "depends <replaceable>&synopsis-pkg;</replaceable>…"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:188
 msgid ""
@@ -923,11 +883,6 @@ msgid ""
 "and all the possible other packages that can fulfill that dependency."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:192
-msgid "rdepends <replaceable>&synopsis-pkg;</replaceable>…"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:193
 msgid ""
@@ -937,7 +892,7 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-cache.8.xml:197
-msgid "pkgnames [ <replaceable>&synopsis-prefix;</replaceable> ]"
+msgid "<optional><replaceable>&synopsis-prefix;</replaceable></optional>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -958,11 +913,6 @@ msgid ""
 "the generated list."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:208
-msgid "dotty <replaceable>&synopsis-pkg;</replaceable>…"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:209
 msgid ""
@@ -990,11 +940,6 @@ msgstr ""
 msgid "Caution, dotty cannot graph larger sets of packages."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:226
-msgid "xvcg <replaceable>&synopsis-pkg;</replaceable>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:227
 msgid ""
@@ -1005,7 +950,7 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-cache.8.xml:231
-msgid "policy [ <replaceable>&synopsis-pkg;</replaceable>… ]"
+msgid "<optional><replaceable>&synopsis-pkg;</replaceable>…</optional>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -1017,11 +962,6 @@ msgid ""
 "selection of the named package."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:238
-msgid "madison <replaceable>&synopsis-pkg;</replaceable>…"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:239
 msgid ""
@@ -1034,21 +974,11 @@ msgid ""
 "(<literal>APT::Architecture</literal>)."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:250 apt-config.8.xml:84 apt-extracttemplates.1.xml:51 apt-ftparchive.1.xml:504 apt-get.8.xml:259 apt-mark.8.xml:108 apt-sortpkgs.1.xml:48 apt.conf.5.xml:586 apt.conf.5.xml:608
+#. type: Content of: <refentry><refsect1><title>
+#: apt-cache.8.xml:250 apt-config.8.xml:84 apt-extracttemplates.1.xml:52 apt-ftparchive.1.xml:504 apt-get.8.xml:259 apt-mark.8.xml:108 apt-sortpkgs.1.xml:48
 msgid "options"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:254
-msgid "<option>-p</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:254
-msgid "<option>--pkg-cache</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:255
 msgid ""
@@ -1057,16 +987,6 @@ msgid ""
 "<literal>Dir::Cache::pkgcache</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:260 apt-ftparchive.1.xml:551 apt-get.8.xml:321 apt-sortpkgs.1.xml:52
-msgid "<option>-s</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:260
-msgid "<option>--src-cache</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:261
 msgid ""
@@ -1077,16 +997,6 @@ msgid ""
 "Item: <literal>Dir::Cache::srcpkgcache</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:268 apt-ftparchive.1.xml:525 apt-get.8.xml:311
-msgid "<option>-q</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:268 apt-ftparchive.1.xml:525 apt-get.8.xml:311
-msgid "<option>--quiet</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:269
 msgid ""
@@ -1096,16 +1006,6 @@ msgid ""
 "configuration file.  Configuration Item: <literal>quiet</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:275
-msgid "<option>-i</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:275
-msgid "<option>--important</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:276
 msgid ""
@@ -1114,46 +1014,6 @@ msgid ""
 "<literal>APT::Cache::Important</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:281
-msgid "<option>--no-pre-depends</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:282
-msgid "<option>--no-depends</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:283
-msgid "<option>--no-recommends</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:284
-msgid "<option>--no-suggests</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:285
-msgid "<option>--no-conflicts</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:286
-msgid "<option>--no-breaks</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:287
-msgid "<option>--no-replaces</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:288
-msgid "<option>--no-enhances</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:289
 msgid ""
@@ -1164,16 +1024,6 @@ msgid ""
 "e.g. <literal>APT::Cache::ShowRecommends</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:295 apt-cdrom.8.xml:111 apt-get.8.xml:278
-msgid "<option>-f</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:295
-msgid "<option>--full</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:296
 msgid ""
@@ -1181,16 +1031,6 @@ msgid ""
 "<literal>APT::Cache::ShowFull</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:300 apt-cdrom.8.xml:121 apt-ftparchive.1.xml:563 apt-get.8.xml:369
-msgid "<option>-a</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:300
-msgid "<option>--all-versions</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:301
 msgid ""
@@ -1202,16 +1042,6 @@ msgid ""
 "Configuration Item: <literal>APT::Cache::AllVersions</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:309
-msgid "<option>-g</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:309
-msgid "<option>--generate</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:310
 msgid ""
@@ -1221,16 +1051,6 @@ msgid ""
 "<literal>APT::Cache::Generate</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:315
-msgid "<option>--names-only</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:315 apt-cdrom.8.xml:129
-msgid "<option>-n</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:316
 msgid ""
@@ -1238,11 +1058,6 @@ msgid ""
 "Item: <literal>APT::Cache::NamesOnly</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:320
-msgid "<option>--all-names</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:321
 msgid ""
@@ -1251,11 +1066,6 @@ msgid ""
 "<literal>APT::Cache::AllNames</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:326
-msgid "<option>--recurse</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:327
 msgid ""
@@ -1264,11 +1074,6 @@ msgid ""
 "<literal>APT::Cache::RecurseDepends</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:332
-msgid "<option>--installed</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:334
 msgid ""
@@ -1278,12 +1083,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt-cache.8.xml:339 apt-cdrom.8.xml:140 apt-config.8.xml:104 apt-extracttemplates.1.xml:62 apt-ftparchive.1.xml:591 apt-get.8.xml:514 apt-mark.8.xml:122 apt-sortpkgs.1.xml:58
+#: apt-cache.8.xml:339 apt-cdrom.8.xml:140 apt-config.8.xml:104 apt-extracttemplates.1.xml:63 apt-ftparchive.1.xml:591 apt-get.8.xml:514 apt-mark.8.xml:122 apt-sortpkgs.1.xml:58
 msgid "&apt-commonoptions;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:344 apt-get.8.xml:519 apt-key.8.xml:167 apt-mark.8.xml:126 apt.conf.5.xml:1119 apt_preferences.5.xml:697
+#: apt-cache.8.xml:344 apt-get.8.xml:519 apt-key.8.xml:167 apt-mark.8.xml:126 apt.conf.5.xml:1119 apt_preferences.5.xml:698
 msgid "Files"
 msgstr ""
 
@@ -1293,7 +1098,7 @@ msgid "&file-sourceslist; &file-statelists;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:351 apt-cdrom.8.xml:145 apt-config.8.xml:109 apt-extracttemplates.1.xml:69 apt-ftparchive.1.xml:607 apt-get.8.xml:529 apt-key.8.xml:188 apt-mark.8.xml:132 apt-secure.8.xml:185 apt-sortpkgs.1.xml:63 apt.conf.5.xml:1125 apt_preferences.5.xml:704 sources.list.5.xml:255
+#: apt-cache.8.xml:351 apt-cdrom.8.xml:145 apt-config.8.xml:109 apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:607 apt-get.8.xml:529 apt-key.8.xml:188 apt-mark.8.xml:132 apt-secure.8.xml:185 apt-sortpkgs.1.xml:63 apt.conf.5.xml:1125 apt_preferences.5.xml:705 sources.list.5.xml:255
 msgid "See Also"
 msgstr ""
 
@@ -1303,7 +1108,7 @@ msgid "&apt-conf;, &sources-list;, &apt-get;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:114 apt-extracttemplates.1.xml:73 apt-ftparchive.1.xml:611 apt-get.8.xml:535 apt-mark.8.xml:136 apt-sortpkgs.1.xml:67
+#: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:114 apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:611 apt-get.8.xml:535 apt-mark.8.xml:136 apt-sortpkgs.1.xml:67
 msgid "Diagnostics"
 msgstr ""
 
@@ -1348,11 +1153,6 @@ msgid ""
 "must be inserted and scanned separately to account for possible mis-burns."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:55
-msgid "add"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt-cdrom.8.xml:56
 msgid ""
@@ -1371,11 +1171,6 @@ msgid ""
 "<filename>&statedir;/cdroms.list</filename>"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:71
-msgid "ident"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt-cdrom.8.xml:72
 msgid ""
@@ -1396,16 +1191,6 @@ msgstr ""
 msgid "Options"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:85 apt-ftparchive.1.xml:519 apt-get.8.xml:273
-msgid "<option>-d</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:85
-msgid "<option>--cdrom</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cdrom.8.xml:86
 msgid ""
@@ -1414,16 +1199,6 @@ msgid ""
 "Configuration Item: <literal>Acquire::cdrom::mount</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:94
-msgid "<option>-r</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:94
-msgid "<option>--rename</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cdrom.8.xml:95
 msgid ""
@@ -1432,16 +1207,6 @@ msgid ""
 "new label.  Configuration Item: <literal>APT::CDROM::Rename</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:103 apt-get.8.xml:292
-msgid "<option>-m</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:103
-msgid "<option>--no-mount</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cdrom.8.xml:104
 msgid ""
@@ -1450,11 +1215,6 @@ msgid ""
 "<literal>APT::CDROM::NoMount</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:111
-msgid "<option>--fast</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cdrom.8.xml:112
 msgid ""
@@ -1464,11 +1224,6 @@ msgid ""
 "Item: <literal>APT::CDROM::Fast</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:121
-msgid "<option>--thorough</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cdrom.8.xml:122
 msgid ""
@@ -1477,21 +1232,6 @@ msgid ""
 "longer to scan the CD but will pick them all up."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:130 apt-get.8.xml:323
-msgid "<option>--just-print</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:131 apt-get.8.xml:325
-msgid "<option>--recon</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:132 apt-get.8.xml:326
-msgid "<option>--no-act</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cdrom.8.xml:133
 msgid ""
@@ -1546,11 +1286,6 @@ msgid ""
 "one of the commands below must be present."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-config.8.xml:49
-msgid "shell"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-config.8.xml:51
 msgid ""
@@ -1590,11 +1325,6 @@ msgstr ""
 msgid "Just show the contents of the configuration space."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-config.8.xml:89
-msgid "<option>--empty</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-config.8.xml:90
 msgid ""
@@ -1602,11 +1332,9 @@ msgid ""
 "--no-empty to remove them from the output."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
 #: apt-config.8.xml:95
-msgid ""
-"<option>--format '<replaceable>&percnt;f "
-"&#x0022;&percnt;v&#x0022;;&percnt;n</replaceable>'</option>"
+msgid "&percnt;f &#x0022;&percnt;v&#x0022;;&percnt;n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -1622,7 +1350,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:110 apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:608 apt-sortpkgs.1.xml:64
+#: apt-config.8.xml:110 apt-extracttemplates.1.xml:71 apt-ftparchive.1.xml:608 apt-sortpkgs.1.xml:64
 msgid "&apt-conf;"
 msgstr ""
 
@@ -1667,24 +1395,14 @@ msgstr ""
 #: apt-extracttemplates.1.xml:45
 msgid ""
 "template-file and config-script are written to the temporary directory "
-"specified by the -t or --tempdir "
-"(<literal>APT::ExtractTemplates::TempDir</literal>)  directory, with "
+"specified by the <option>-t</option> or <option>--tempdir</option> "
+"(<literal>APT::ExtractTemplates::TempDir</literal>) directory, with "
 "filenames of the form <filename>package.template.XXXX</filename> and "
 "<filename>package.config.XXXX</filename>"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-extracttemplates.1.xml:55 apt-get.8.xml:448
-msgid "<option>-t</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-extracttemplates.1.xml:55
-msgid "<option>--tempdir</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-extracttemplates.1.xml:57
+#: apt-extracttemplates.1.xml:58
 msgid ""
 "Temporary directory in which to write extracted debconf template files and "
 "config scripts.  Configuration Item: "
@@ -1692,7 +1410,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:74
+#: apt-extracttemplates.1.xml:75
 msgid ""
 "<command>apt-extracttemplates</command> returns zero on normal operation, "
 "decimal 100 on error."
@@ -1745,11 +1463,6 @@ msgid ""
 "output files."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:58
-msgid "packages"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:60
 msgid ""
@@ -1764,11 +1477,6 @@ msgstr ""
 msgid "The option <option>--db</option> can be used to specify a binary caching DB."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:68
-msgid "sources"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:70
 msgid ""
@@ -1786,11 +1494,6 @@ msgid ""
 "change the source override file that will be used."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:80
-msgid "contents"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:82
 msgid ""
@@ -1802,11 +1505,6 @@ msgid ""
 "separated by a comma in the output."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:92
-msgid "release"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:94
 msgid ""
@@ -1837,11 +1535,6 @@ msgid ""
 "<literal>Components</literal>, <literal>Description</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:115
-msgid "generate"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:117
 msgid ""
@@ -1852,11 +1545,6 @@ msgid ""
 "maintaining the required settings."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:124 apt-get.8.xml:215
-msgid "clean"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:126
 msgid ""
@@ -1899,11 +1587,6 @@ msgid ""
 "to produce a complete an absolute path."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:151
-msgid "ArchiveDir"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:153
 msgid ""
@@ -1912,31 +1595,16 @@ msgid ""
 "nodes."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:158
-msgid "OverrideDir"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:160
 msgid "Specifies the location of the override files."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:163
-msgid "CacheDir"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:165
 msgid "Specifies the location of the cache files"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:168
-msgid "FileListDir"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:170
 msgid ""
@@ -1957,11 +1625,6 @@ msgid ""
 "override these defaults with a per-section setting."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:182
-msgid "Packages::Compress"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:184
 msgid ""
@@ -1971,11 +1634,6 @@ msgid ""
 "'. gzip'."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:190
-msgid "Packages::Extensions"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:192
 msgid ""
@@ -1983,11 +1641,6 @@ msgid ""
 "defaults to '.deb'."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:196
-msgid "Sources::Compress"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:198
 msgid ""
@@ -1995,11 +1648,6 @@ msgid ""
 "controls the compression for the Sources files."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:202
-msgid "Sources::Extensions"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:204
 msgid ""
@@ -2007,11 +1655,6 @@ msgid ""
 "defaults to '.dsc'."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:208
-msgid "Contents::Compress"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:210
 msgid ""
@@ -2019,11 +1662,6 @@ msgid ""
 "controls the compression for the Contents files."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:214
-msgid "Translation::Compress"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:216
 msgid ""
@@ -2031,11 +1669,6 @@ msgid ""
 "controls the compression for the Translation-en master file."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:220
-msgid "DeLinkLimit"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:222
 msgid ""
@@ -2044,11 +1677,6 @@ msgid ""
 "<literal>External-Links</literal> setting."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:227
-msgid "FileMode"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:229
 msgid ""
@@ -2056,11 +1684,6 @@ msgid ""
 "index files are set to this mode with no regard to the umask."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:234 apt-ftparchive.1.xml:380
-msgid "LongDescription"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:236 apt-ftparchive.1.xml:382
 msgid ""
@@ -2081,11 +1704,6 @@ msgid ""
 "$(SECTION) and $(ARCH) replaced with their respective values."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:249
-msgid "MaxContentsChange"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:251
 msgid ""
@@ -2094,11 +1712,6 @@ msgid ""
 "will all be rebuilt."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:256
-msgid "ContentsAge"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:258
 msgid ""
@@ -2110,11 +1723,6 @@ msgid ""
 "new file anyhow. The default is 10, the units are in days."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:267
-msgid "Directory"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:269
 msgid ""
@@ -2122,11 +1730,6 @@ msgid ""
 "<filename>$(DIST)/$(SECTION)/binary-$(ARCH)/</filename>"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:273
-msgid "SrcDirectory"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:275
 msgid ""
@@ -2134,11 +1737,6 @@ msgid ""
 "<filename>$(DIST)/$(SECTION)/source/</filename>"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:279 apt-ftparchive.1.xml:418
-msgid "Packages"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:281
 msgid ""
@@ -2146,11 +1744,6 @@ msgid ""
 "<filename>$(DIST)/$(SECTION)/binary-$(ARCH)/Packages</filename>"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:285 apt-ftparchive.1.xml:423
-msgid "Sources"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:287
 msgid ""
@@ -2158,11 +1751,6 @@ msgid ""
 "<filename>$(DIST)/$(SECTION)/source/Sources</filename>"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:291
-msgid "Translation"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:293
 msgid ""
@@ -2171,11 +1759,6 @@ msgid ""
 "<filename>$(DIST)/$(SECTION)/i18n/Translation-en</filename>"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:298
-msgid "InternalPrefix"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:300
 msgid ""
@@ -2184,11 +1767,6 @@ msgid ""
 "<filename>$(DIST)/$(SECTION)/</filename>"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:305 apt-ftparchive.1.xml:429
-msgid "Contents"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:307
 msgid ""
@@ -2199,21 +1777,11 @@ msgid ""
 "package files together automatically."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:314
-msgid "Contents::Header"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:316
 msgid "Sets header file to prepend to the contents output."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:319 apt-ftparchive.1.xml:454
-msgid "BinCacheDB"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:321
 msgid ""
@@ -2221,11 +1789,6 @@ msgid ""
 "can share the same database."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:325
-msgid "FileList"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:327
 msgid ""
@@ -2234,11 +1797,6 @@ msgid ""
 "given file. Relative files names are prefixed with the archive directory."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:332
-msgid "SourceFileList"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:334
 msgid ""
@@ -2298,11 +1856,6 @@ msgid ""
 "<placeholder type=\"programlisting\" id=\"0\"/>"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:366
-msgid "Sections"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:368
 msgid ""
@@ -2311,11 +1864,6 @@ msgid ""
 "non-free</literal>"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:373 apt.conf.5.xml:157
-msgid "Architectures"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:375
 msgid ""
@@ -2324,11 +1872,6 @@ msgid ""
 "this tree has a source archive."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:386 apt-ftparchive.1.xml:434
-msgid "BinOverride"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:388
 msgid ""
@@ -2336,11 +1879,6 @@ msgid ""
 "and maintainer address information."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:392 apt-ftparchive.1.xml:439
-msgid "SrcOverride"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:394
 msgid ""
@@ -2348,21 +1886,11 @@ msgid ""
 "information."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:398 apt-ftparchive.1.xml:444
-msgid "ExtraOverride"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:400 apt-ftparchive.1.xml:446
 msgid "Sets the binary extra override file."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:403 apt-ftparchive.1.xml:449
-msgid "SrcExtraOverride"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:405 apt-ftparchive.1.xml:451
 msgid "Sets the source extra override file."
@@ -2415,21 +1943,11 @@ msgstr ""
 msgid "Sets the cache DB."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:459
-msgid "PathPrefix"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:461
 msgid "Appends a path to all the output paths."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:464
-msgid "FileList, SourceFileList"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:466
 msgid "Specifies the file list file."
@@ -2499,11 +2017,6 @@ msgid ""
 "tag and the remainder of the line is the new value."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:508
-msgid "<option>--md5</option>, <option>--sha1</option>, <option>--sha256</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:510
 msgid ""
@@ -2520,11 +2033,6 @@ msgid ""
 "<literal>SHA256</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:519
-msgid "<option>--db</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:521
 msgid ""
@@ -2541,11 +2049,6 @@ msgid ""
 "file.  Configuration Item: <literal>quiet</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:533
-msgid "<option>--delink</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:535
 msgid ""
@@ -2555,11 +2058,6 @@ msgid ""
 "Item: <literal>APT::FTPArchive::DeLinkAct</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:541
-msgid "<option>--contents</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:543
 msgid ""
@@ -2570,11 +2068,6 @@ msgid ""
 "Configuration Item: <literal>APT::FTPArchive::Contents</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:551
-msgid "<option>--source-override</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:553
 msgid ""
@@ -2583,11 +2076,6 @@ msgid ""
 "<literal>APT::FTPArchive::SourceOverride</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:557
-msgid "<option>--readonly</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:559
 msgid ""
@@ -2595,11 +2083,6 @@ msgid ""
 "<literal>APT::FTPArchive::ReadOnlyDB</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:563
-msgid "<option>--arch</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:564
 msgid ""
@@ -2609,11 +2092,6 @@ msgid ""
 "path.  Configuration Item: <literal>APT::FTPArchive::Architecture</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:570
-msgid "<option>APT::FTPArchive::AlwaysStat</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:572
 msgid ""
@@ -2628,11 +2106,6 @@ msgid ""
 "are useless."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:582
-msgid "<option>APT::FTPArchive::LongDescription</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:584
 msgid ""
@@ -2644,7 +2117,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:596 apt.conf.5.xml:1113 apt_preferences.5.xml:544 sources.list.5.xml:214
+#: apt-ftparchive.1.xml:596 apt.conf.5.xml:1113 apt_preferences.5.xml:545 sources.list.5.xml:214
 msgid "Examples"
 msgstr ""
 
@@ -2698,11 +2171,6 @@ msgid ""
 "&aptitude;, &synaptic; and &wajig;."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:48 apt-key.8.xml:119
-msgid "update"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:49
 msgid ""
@@ -2718,11 +2186,6 @@ msgid ""
 "advance."
 msgstr ""
 
-#. type: <tag></tag>
-#: apt-get.8.xml:60 guide.sgml:121
-msgid "upgrade"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:61
 msgid ""
@@ -2739,11 +2202,6 @@ msgid ""
 "available."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:73
-msgid "dselect-upgrade"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:74
 msgid ""
@@ -2755,11 +2213,6 @@ msgid ""
 "removal of old and the installation of new packages)."
 msgstr ""
 
-#. type: <tag></tag>
-#: apt-get.8.xml:83 guide.sgml:140
-msgid "dist-upgrade"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:84
 msgid ""
@@ -2774,11 +2227,6 @@ msgid ""
 "for a mechanism for overriding the general settings for individual packages."
 msgstr ""
 
-#. type: <tag></tag>
-#: apt-get.8.xml:96 guide.sgml:131
-msgid "install"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:98
 msgid ""
@@ -2844,11 +2292,6 @@ msgid ""
 "expression."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:150
-msgid "remove"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:151
 msgid ""
@@ -2859,11 +2302,6 @@ msgid ""
 "installed instead of removed."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:158
-msgid "purge"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:159
 msgid ""
@@ -2872,11 +2310,6 @@ msgid ""
 "too)."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:163
-msgid "source"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:164
 msgid ""
@@ -2928,11 +2361,6 @@ msgid ""
 "balls."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:197
-msgid "build-dep"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:198
 msgid ""
@@ -2943,11 +2371,6 @@ msgid ""
 "<option>--host-architecture</option> option instead."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:204
-msgid "check"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:205
 msgid ""
@@ -2955,11 +2378,6 @@ msgid ""
 "and checks for broken dependencies."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:209
-msgid "download"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:210
 msgid ""
@@ -2979,11 +2397,6 @@ msgid ""
 "from time to time to free up disk space."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:225
-msgid "autoclean"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:226
 msgid ""
@@ -2996,11 +2409,6 @@ msgid ""
 "being erased if it is set to off."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:235
-msgid "autoremove"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:236
 msgid ""
@@ -3009,29 +2417,21 @@ msgid ""
 "now no longer needed."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:240
-msgid "changelog"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:241
 msgid ""
 "<literal>changelog</literal> downloads a package changelog and displays it "
 "through <command>sensible-pager</command>. The server name and base "
 "directory is defined in the <literal>APT::Changelogs::Server</literal> "
-"variable (e. g. <ulink>http://packages.debian.org/changelogs</ulink> for "
-"Debian or <ulink>http://changelogs.ubuntu.com/changelogs</ulink> for "
-"Ubuntu).  By default it displays the changelog for the version that is "
+"variable (e. g. <ulink "
+"url=\"http://packages.debian.org/changelogs\">packages.debian.org/changelogs</ulink> "
+"for Debian or <ulink "
+"url=\"http://changelogs.ubuntu.com/changelogs\">changelogs.ubuntu.com/changelogs</ulink> "
+"for Ubuntu).  By default it displays the changelog for the version that is "
 "installed.  However, you can specify the same options as for the "
 "<option>install</option> command."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:263
-msgid "<option>--no-install-recommends</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:264
 msgid ""
@@ -3039,11 +2439,6 @@ msgid ""
 "Configuration Item: <literal>APT::Install-Recommends</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:268
-msgid "<option>--install-suggests</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:269
 msgid ""
@@ -3051,11 +2446,6 @@ msgid ""
 "Item: <literal>APT::Install-Suggests</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:273
-msgid "<option>--download-only</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:274
 msgid ""
@@ -3063,11 +2453,6 @@ msgid ""
 "Configuration Item: <literal>APT::Get::Download-Only</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:278
-msgid "<option>--fix-broken</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:279
 msgid ""
@@ -3084,16 +2469,6 @@ msgid ""
 "Item: <literal>APT::Get::Fix-Broken</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:292
-msgid "<option>--ignore-missing</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:293
-msgid "<option>--fix-missing</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:294
 msgid ""
@@ -3106,11 +2481,6 @@ msgid ""
 "Configuration Item: <literal>APT::Get::Fix-Missing</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:304
-msgid "<option>--no-download</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:305
 msgid ""
@@ -3132,16 +2502,6 @@ msgid ""
 "<literal>quiet</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:322
-msgid "<option>--simulate</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:324
-msgid "<option>--dry-run</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:327
 msgid ""
@@ -3171,21 +2531,6 @@ msgid ""
 "that are of no consequence (rare)."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:344
-msgid "<option>-y</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:344
-msgid "<option>--yes</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:345
-msgid "<option>--assume-yes</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:346
 msgid ""
@@ -3196,11 +2541,6 @@ msgid ""
 "Configuration Item: <literal>APT::Get::Assume-Yes</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:353
-msgid "<option>--assume-no</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:354
 msgid ""
@@ -3208,16 +2548,6 @@ msgid ""
 "<literal>APT::Get::Assume-No</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:358
-msgid "<option>-u</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:358
-msgid "<option>--show-upgraded</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:359
 msgid ""
@@ -3225,16 +2555,6 @@ msgid ""
 "upgraded.  Configuration Item: <literal>APT::Get::Show-Upgraded</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:364
-msgid "<option>-V</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:364
-msgid "<option>--verbose-versions</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:365
 msgid ""
@@ -3242,11 +2562,6 @@ msgid ""
 "<literal>APT::Get::Show-Versions</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:370
-msgid "<option>--host-architecture</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:371
 msgid ""
@@ -3258,21 +2573,6 @@ msgid ""
 "<literal>APT::Get::Host-Architecture</literal>"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:379
-msgid "<option>-b</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:379
-msgid "<option>--compile</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:380
-msgid "<option>--build</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:381
 msgid ""
@@ -3280,11 +2580,6 @@ msgid ""
 "<literal>APT::Get::Compile</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:385
-msgid "<option>--ignore-hold</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:386
 msgid ""
@@ -3294,11 +2589,6 @@ msgid ""
 "holds.  Configuration Item: <literal>APT::Ignore-Hold</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:392
-msgid "<option>--no-upgrade</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:393
 msgid ""
@@ -3308,11 +2598,6 @@ msgid ""
 "installed.  Configuration Item: <literal>APT::Get::Upgrade</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:399
-msgid "<option>--only-upgrade</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:400
 msgid ""
@@ -3323,11 +2608,6 @@ msgid ""
 "<literal>APT::Get::Only-Upgrade</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:407
-msgid "<option>--force-yes</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:408
 msgid ""
@@ -3338,11 +2618,6 @@ msgid ""
 "Configuration Item: <literal>APT::Get::force-yes</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:415
-msgid "<option>--print-uris</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:416
 msgid ""
@@ -3356,11 +2631,6 @@ msgid ""
 "<literal>APT::Get::Print-URIs</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:426
-msgid "<option>--purge</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:427
 msgid ""
@@ -3371,11 +2641,6 @@ msgid ""
 "<literal>APT::Get::Purge</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:434
-msgid "<option>--reinstall</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:435
 msgid ""
@@ -3383,11 +2648,6 @@ msgid ""
 "Configuration Item: <literal>APT::Get::ReInstall</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:439
-msgid "<option>--list-cleanup</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:440
 msgid ""
@@ -3399,16 +2659,6 @@ msgid ""
 "<literal>APT::Get::List-Cleanup</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:449
-msgid "<option>--target-release</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:450
-msgid "<option>--default-release</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:451
 msgid ""
@@ -3424,11 +2674,6 @@ msgid ""
 "manual page."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:464
-msgid "<option>--trivial-only</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:466
 msgid ""
@@ -3439,11 +2684,6 @@ msgid ""
 "<literal>APT::Get::Trivial-Only</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:472
-msgid "<option>--no-remove</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:473
 msgid ""
@@ -3451,11 +2691,6 @@ msgid ""
 "prompting.  Configuration Item: <literal>APT::Get::Remove</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:478
-msgid "<option>--auto-remove</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:479
 msgid ""
@@ -3465,11 +2700,6 @@ msgid ""
 "packages. Configuration Item: <literal>APT::Get::AutomaticRemove</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:485
-msgid "<option>--only-source</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:486
 msgid ""
@@ -3482,21 +2712,6 @@ msgid ""
 "<literal>APT::Get::Only-Source</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:496
-msgid "<option>--diff-only</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:496
-msgid "<option>--dsc-only</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:496
-msgid "<option>--tar-only</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:497
 msgid ""
@@ -3506,11 +2721,6 @@ msgid ""
 "<literal>APT::Get::Tar-Only</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:502
-msgid "<option>--arch-only</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:503
 msgid ""
@@ -3518,11 +2728,6 @@ msgid ""
 "<literal>APT::Get::Arch-Only</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:507
-msgid "<option>--allow-unauthenticated</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:508
 msgid ""
@@ -3596,11 +2801,6 @@ msgstr ""
 msgid "Commands"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:40
-msgid "add &synopsis-param-filename;"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml:43
 msgid ""
@@ -3609,61 +2809,31 @@ msgid ""
 "filename is <literal>-</literal> from standard input."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:52
-msgid "del &synopsis-param-keyid;"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml:56
 msgid "Remove a key from the list of trusted keys."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:63
-msgid "export &synopsis-param-keyid;"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml:67
 msgid "Output the key &synopsis-param-keyid; to standard output."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:74
-msgid "exportall"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml:78
 msgid "Output all trusted keys to standard output."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:85
-msgid "list"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml:89
 msgid "List trusted keys."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:96
-msgid "finger"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml:100
 msgid "List fingerprints of trusted keys."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:107
-msgid "adv"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml:111
 msgid ""
@@ -3681,11 +2851,6 @@ msgid ""
 "Debian."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:133
-msgid "net-update"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml:137
 msgid ""
@@ -3704,11 +2869,6 @@ msgid ""
 "previous section."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:156
-msgid "--keyring &synopsis-param-filename;"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml:157
 msgid ""
@@ -3795,11 +2955,6 @@ msgid ""
 "removed by e.g.  <command>apt-get</command> or <command>aptitude</command>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:51
-msgid "auto"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml:52
 msgid ""
@@ -3808,11 +2963,6 @@ msgid ""
 "installed packages depend on this package."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:59
-msgid "manual"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml:60
 msgid ""
@@ -3821,11 +2971,6 @@ msgid ""
 "if no other packages depend on it."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:67
-msgid "hold"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml:68
 msgid ""
@@ -3836,11 +2981,6 @@ msgid ""
 "and not effected by the <option>--filename</option> option."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:77
-msgid "unhold"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml:78
 msgid ""
@@ -3848,11 +2988,6 @@ msgid ""
 "package to allow all actions again."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:83
-msgid "showauto"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml:84
 msgid ""
@@ -3862,11 +2997,6 @@ msgid ""
 "given only those which are automatically installed will be shown."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:91
-msgid "showmanual"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml:92
 msgid ""
@@ -3875,11 +3005,6 @@ msgid ""
 "installed packages instead."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:98
-msgid "showhold"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml:99
 msgid ""
@@ -3887,23 +3012,19 @@ msgid ""
 "the same way as for the other show commands."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:112
-msgid "<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:113
-msgid "<option>--file=<filename><replaceable>FILENAME</replaceable></filename></option>"
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><filename>
+#: apt-mark.8.xml:112 apt-mark.8.xml:113
+msgid "<replaceable>&synopsis-filename;</replaceable>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:116
+#: apt-mark.8.xml:115
 msgid ""
-"Read/Write package stats from "
-"<filename><replaceable>FILENAME</replaceable></filename> instead of the "
-"default location, which is <filename>extended_status</filename> in the "
-"directory defined by the Configuration Item: <literal>Dir::State</literal>."
+"Read/Write package stats from the filename given with the parameter "
+"<filename><replaceable>&synopsis-filename;</replaceable></filename> instead "
+"of from the default location, which is <filename>extended_status</filename> "
+"in the directory defined by the Configuration Item: "
+"<literal>Dir::State</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist>
@@ -4174,11 +3295,6 @@ msgstr ""
 msgid "All output is sent to stdout, the input must be a seekable file."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-sortpkgs.1.xml:52
-msgid "<option>--source</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-sortpkgs.1.xml:54
 msgid ""
@@ -4410,11 +3526,6 @@ msgid ""
 "options for all of the tools."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:151
-msgid "Architecture"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:152
 msgid ""
@@ -4436,11 +3547,6 @@ msgid ""
 "--print-foreign-architectures</command>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:167
-msgid "Default-Release"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:168
 msgid ""
@@ -4450,11 +3556,6 @@ msgid ""
 "'4.0', '5.0*'. See also &apt-preferences;."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:173
-msgid "Ignore-Hold"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:174
 msgid ""
@@ -4462,11 +3563,6 @@ msgid ""
 "ignore held packages in its decision making."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:178
-msgid "Clean-Installed"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:179
 msgid ""
@@ -4476,11 +3572,6 @@ msgid ""
 "but note that APT provides no direct means to reinstall them."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:185
-msgid "Immediate-Configure"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:186
 msgid ""
@@ -4514,11 +3605,6 @@ msgid ""
 "work on improving or correcting the upgrade process."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:208
-msgid "Force-LoopBreak"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:209
 msgid ""
@@ -4530,11 +3616,6 @@ msgid ""
 "anything that those packages depend on."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:217
-msgid "Cache-Start, Cache-Grow and Cache-Limit"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:218
 msgid ""
@@ -4556,21 +3637,11 @@ msgid ""
 "disabled."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:233
-msgid "Build-Essential"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:234
 msgid "Defines which package(s) are considered essential build dependencies."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:237
-msgid "Get"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:238
 msgid ""
@@ -4578,11 +3649,6 @@ msgid ""
 "for more information about the options here."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:242
-msgid "Cache"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:243
 msgid ""
@@ -4590,11 +3656,6 @@ msgid ""
 "documentation for more information about the options here."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:247
-msgid "CDROM"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:248
 msgid ""
@@ -4607,11 +3668,6 @@ msgstr ""
 msgid "The Acquire Group"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:259
-msgid "Check-Valid-Until"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:260
 msgid ""
@@ -4624,11 +3680,6 @@ msgid ""
 "<literal>Max-ValidTime</literal> option can be used."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:270
-msgid "Max-ValidTime"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:271
 msgid ""
@@ -4641,11 +3692,6 @@ msgid ""
 "name."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:281
-msgid "Min-ValidTime"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:282
 msgid ""
@@ -4657,11 +3703,6 @@ msgid ""
 "should be used by appending the label of the archive to the option name."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:292
-msgid "PDiffs"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:293
 msgid ""
@@ -4680,11 +3721,6 @@ msgid ""
 "complete file is downloaded instead of the patches."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:305
-msgid "Queue-Mode"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:306
 msgid ""
@@ -4695,11 +3731,6 @@ msgid ""
 "means that one connection per URI type will be opened."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:313
-msgid "Retries"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:314
 msgid ""
@@ -4707,11 +3738,6 @@ msgid ""
 "files the given number of times."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:318
-msgid "Source-Symlinks"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:319
 msgid ""
@@ -4719,11 +3745,6 @@ msgid ""
 "be symlinked when possible instead of copying. True is the default."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:323 sources.list.5.xml:160
-msgid "http"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:324
 msgid ""
@@ -4795,11 +3816,6 @@ msgid ""
 "clients only if the client uses a known identifier."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:366
-msgid "https"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:367
 msgid ""
@@ -4832,11 +3848,6 @@ msgid ""
 "option."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:391 sources.list.5.xml:171
-msgid "ftp"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:392
 msgid ""
@@ -4887,11 +3898,6 @@ msgid ""
 "that most FTP servers do not support RFC2428."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:430 sources.list.5.xml:153
-msgid "cdrom"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
 #: apt.conf.5.xml:436
 #, no-wrap
@@ -4911,11 +3917,6 @@ msgid ""
 "can be specified using UMount."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:441
-msgid "gpgv"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:442
 msgid ""
@@ -4924,11 +3925,6 @@ msgid ""
 "passed to gpgv."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:447
-msgid "CompressionTypes"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
 #: apt.conf.5.xml:453
 #, no-wrap
@@ -5007,11 +4003,6 @@ msgid ""
 "uncompressed files so this is mostly only useable for local mirrors."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:475
-msgid "GzipIndexes"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:477
 msgid ""
@@ -5021,11 +4012,6 @@ msgid ""
 "CPU requirements when building the local package caches. False by default."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:484
-msgid "Languages"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:485
 msgid ""
@@ -5183,11 +4169,6 @@ msgid ""
 "section."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:577
-msgid "Clean"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:578
 msgid ""
@@ -5206,11 +4187,6 @@ msgid ""
 "when it is run for the install phase."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:591
-msgid "Updateoptions"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:592
 msgid ""
@@ -5218,11 +4194,6 @@ msgid ""
 "when it is run for the update phase."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:596
-msgid "PromptAfterUpdate"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:597
 msgid ""
@@ -5250,16 +4221,6 @@ msgid ""
 "&dpkg;."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:614
-msgid "Pre-Invoke"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:614
-msgid "Post-Invoke"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:615
 msgid ""
@@ -5269,11 +4230,6 @@ msgid ""
 "fail APT will abort."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:621
-msgid "Pre-Install-Pkgs"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:622
 msgid ""
@@ -5295,11 +4251,6 @@ msgid ""
 "<literal>Pre-Install-Pkgs</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:635
-msgid "Run-Directory"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:636
 msgid ""
@@ -5307,11 +4258,6 @@ msgid ""
 "<filename>/</filename>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:640
-msgid "Build-options"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:641
 msgid ""
@@ -5363,11 +4309,6 @@ msgid ""
 "would be <placeholder type=\"literallayout\" id=\"0\"/>"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:668
-msgid "DPkg::NoTriggers"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:669
 msgid ""
@@ -5380,11 +4321,6 @@ msgid ""
 "dpkg - now apt will add these flag also to the unpack and remove calls."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:676
-msgid "PackageManager::Configure"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:677
 msgid ""
@@ -5402,11 +4338,6 @@ msgid ""
 "could be unbootable!"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:687
-msgid "DPkg::ConfigurePending"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:688
 msgid ""
@@ -5419,11 +4350,6 @@ msgid ""
 "the last run."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:694
-msgid "DPkg::TriggersPending"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:695
 msgid ""
@@ -5434,11 +4360,6 @@ msgid ""
 "triggers, not only the triggers needed to configure this package."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:700
-msgid "PackageManager::UnpackAll"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:701
 msgid ""
@@ -5451,11 +4372,6 @@ msgid ""
 "really useful."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:708
-msgid "OrderList::Score::Immediate"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
 #: apt.conf.5.xml:716
 #, no-wrap
@@ -5550,51 +4466,26 @@ msgstr ""
 msgid "A full list of debugging options to apt follows."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:791
-msgid "<literal>Debug::Acquire::cdrom</literal>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:795
 msgid "Print information related to accessing <literal>cdrom://</literal> sources."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:802
-msgid "<literal>Debug::Acquire::ftp</literal>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:806
 msgid "Print information related to downloading packages using FTP."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:813
-msgid "<literal>Debug::Acquire::http</literal>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:817
 msgid "Print information related to downloading packages using HTTP."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:824
-msgid "<literal>Debug::Acquire::https</literal>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:828
 msgid "Print information related to downloading packages using HTTPS."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:835
-msgid "<literal>Debug::Acquire::gpgv</literal>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:839
 msgid ""
@@ -5602,11 +4493,6 @@ msgid ""
 "<literal>gpg</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:846
-msgid "<literal>Debug::aptcdrom</literal>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:850
 msgid ""
@@ -5614,21 +4500,11 @@ msgid ""
 "stored on CD-ROMs."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:857
-msgid "<literal>Debug::BuildDeps</literal>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:860
 msgid "Describes the process of resolving build-dependencies in &apt-get;."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:867
-msgid "<literal>Debug::Hashes</literal>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:870
 msgid ""
@@ -5636,11 +4512,6 @@ msgid ""
 "<literal>apt</literal> libraries."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:877
-msgid "<literal>Debug::IdentCDROM</literal>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:880
 msgid ""
@@ -5649,11 +4520,6 @@ msgid ""
 "a CD-ROM."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:888
-msgid "<literal>Debug::NoLocking</literal>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:891
 msgid ""
@@ -5661,21 +4527,11 @@ msgid ""
 "<quote><literal>apt-get update</literal></quote> to run at the same time."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:899
-msgid "<literal>Debug::pkgAcquire</literal>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:903
 msgid "Log when items are added to or removed from the global download queue."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:910
-msgid "<literal>Debug::pkgAcquire::Auth</literal>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:913
 msgid ""
@@ -5683,11 +4539,6 @@ msgid ""
 "cryptographic signatures of downloaded files."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:920
-msgid "<literal>Debug::pkgAcquire::Diffs</literal>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:923
 msgid ""
@@ -5695,11 +4546,6 @@ msgid ""
 "and errors relating to package index list diffs."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:931
-msgid "<literal>Debug::pkgAcquire::RRed</literal>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:935
 msgid ""
@@ -5707,21 +4553,11 @@ msgid ""
 "index diffs instead of full indices."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:942
-msgid "<literal>Debug::pkgAcquire::Worker</literal>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:946
 msgid "Log all interactions with the sub-processes that actually perform downloads."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:953
-msgid "<literal>Debug::pkgAutoRemove</literal>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:957
 msgid ""
@@ -5729,11 +4565,6 @@ msgid ""
 "the removal of unused packages."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:964
-msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:967
 msgid ""
@@ -5744,11 +4575,6 @@ msgid ""
 "<literal>Debug::pkgProblemResolver</literal> for that."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:978
-msgid "<literal>Debug::pkgDepCache::Marker</literal>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:981
 msgid ""
@@ -5767,21 +4593,11 @@ msgid ""
 "section the package appears in."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1000
-msgid "<literal>Debug::pkgInitConfig</literal>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:1003
 msgid "Dump the default configuration to standard error on startup."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1010
-msgid "<literal>Debug::pkgDPkgPM</literal>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:1013
 msgid ""
@@ -5789,11 +4605,6 @@ msgid ""
 "invoked, with arguments separated by a single space character."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1021
-msgid "<literal>Debug::pkgDPkgProgressReporting</literal>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:1024
 msgid ""
@@ -5801,11 +4612,6 @@ msgid ""
 "any errors encountered while parsing it."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1031
-msgid "<literal>Debug::pkgOrderList</literal>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:1035
 msgid ""
@@ -5813,31 +4619,16 @@ msgid ""
 "<literal>apt</literal> should pass packages to &dpkg;."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1043
-msgid "<literal>Debug::pkgPackageManager</literal>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:1047
 msgid "Output status messages tracing the steps performed when invoking &dpkg;."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1054
-msgid "<literal>Debug::pkgPolicy</literal>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:1058
 msgid "Output the priority of each package list on startup."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1064
-msgid "<literal>Debug::pkgProblemResolver</literal>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:1068
 msgid ""
@@ -5845,11 +4636,6 @@ msgid ""
 "happens when a complex dependency problem is encountered)."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1076
-msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:1079
 msgid ""
@@ -5858,11 +4644,6 @@ msgid ""
 "described in <literal>Debug::pkgDepCache::Marker</literal>"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1087
-msgid "<literal>Debug::sourceList</literal>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:1091
 msgid ""
@@ -6318,93 +5099,94 @@ msgid ""
 "Pin-Priority: 990\n"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><literal>
-#: apt_preferences.5.xml:290
-msgid "Package"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><literal>
-#: apt_preferences.5.xml:296
-msgid "*"
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt_preferences.5.xml:291
+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 "
+"of all package names it matches. It is undecided whether this will change in "
+"the future, thus you should always list wild-card pins first, so later "
+"specific pins override it.  The pattern \"<literal>*</literal>\" in a "
+"Package field is not considered a glob() expression in itself."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:306
+#: apt_preferences.5.xml:307
 msgid "How APT Interprets Priorities"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:314
+#: apt_preferences.5.xml:315
 msgid "P &gt; 1000"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:315
+#: apt_preferences.5.xml:316
 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:319
+#: apt_preferences.5.xml:320
 msgid "990 &lt; P &lt;=1000"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:320
+#: apt_preferences.5.xml:321
 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:325
+#: apt_preferences.5.xml:326
 msgid "500 &lt; P &lt;=990"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:326
+#: apt_preferences.5.xml:327
 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:331
+#: apt_preferences.5.xml:332
 msgid "100 &lt; P &lt;=500"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:332
+#: apt_preferences.5.xml:333
 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:337
+#: apt_preferences.5.xml:338
 msgid "0 &lt; P &lt;=100"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:338
+#: apt_preferences.5.xml:339
 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:342
+#: apt_preferences.5.xml:343
 msgid "P &lt; 0"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:343
+#: apt_preferences.5.xml:344
 msgid "prevents the version from being installed"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:309
+#: apt_preferences.5.xml:310
 msgid ""
 "Priorities (P) assigned in the APT preferences file must be positive or "
 "negative integers.  They are interpreted as follows (roughly speaking): "
@@ -6412,7 +5194,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:348
+#: apt_preferences.5.xml:349
 msgid ""
 "If any specific-form records match an available package version then the "
 "first such record determines the priority of the package version.  Failing "
@@ -6421,14 +5203,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:354
+#: apt_preferences.5.xml:355
 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:358
+#: apt_preferences.5.xml:359
 #, no-wrap
 msgid ""
 "Package: perl\n"
@@ -6445,12 +5227,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:371
+#: apt_preferences.5.xml:372
 msgid "Then:"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:373
+#: apt_preferences.5.xml:374
 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 "
@@ -6460,7 +5242,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:378
+#: apt_preferences.5.xml:379
 msgid ""
 "A version of any package other than <literal>perl</literal> that is "
 "available from the local system has priority over other versions, even "
@@ -6468,7 +5250,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:382
+#: apt_preferences.5.xml:383
 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 "
@@ -6477,12 +5259,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:392
+#: apt_preferences.5.xml:393
 msgid "Determination of Package Version and Distribution Properties"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:394
+#: apt_preferences.5.xml:395
 msgid ""
 "The locations listed in the &sources-list; file should provide "
 "<filename>Packages</filename> and <filename>Release</filename> files to "
@@ -6490,27 +5272,27 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:406
+#: apt_preferences.5.xml:407
 msgid "the <literal>Package:</literal> line"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:407
+#: apt_preferences.5.xml:408
 msgid "gives the package name"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:410 apt_preferences.5.xml:460
+#: apt_preferences.5.xml:411 apt_preferences.5.xml:461
 msgid "the <literal>Version:</literal> line"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:411
+#: apt_preferences.5.xml:412
 msgid "gives the version number for the named package"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:398
+#: apt_preferences.5.xml:399
 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>: "
@@ -6522,12 +5304,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:427
+#: apt_preferences.5.xml:428
 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:428
+#: apt_preferences.5.xml:429
 msgid ""
 "names the archive to which all the packages in the directory tree belong.  "
 "For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@ -6538,18 +5320,18 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:438
+#: apt_preferences.5.xml:439
 #, no-wrap
 msgid "Pin: release a=stable\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:444
+#: apt_preferences.5.xml:445
 msgid "the <literal>Codename:</literal> line"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:445
+#: apt_preferences.5.xml:446
 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 "
@@ -6560,13 +5342,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:454
+#: apt_preferences.5.xml:455
 #, 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:461
+#: apt_preferences.5.xml:462
 msgid ""
 "names the release version.  For example, the packages in the tree might "
 "belong to Debian GNU/Linux release version 3.0.  Note that there is normally "
@@ -6577,7 +5359,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:470
+#: apt_preferences.5.xml:471
 #, no-wrap
 msgid ""
 "Pin: release v=3.0\n"
@@ -6586,12 +5368,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:479
+#: apt_preferences.5.xml:480
 msgid "the <literal>Component:</literal> line"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:480
+#: apt_preferences.5.xml:481
 msgid ""
 "names the licensing component associated with the packages in the directory "
 "tree of the <filename>Release</filename> file.  For example, the line "
@@ -6603,18 +5385,18 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:489
+#: apt_preferences.5.xml:490
 #, no-wrap
 msgid "Pin: release c=main\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:495
+#: apt_preferences.5.xml:496
 msgid "the <literal>Origin:</literal> line"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:496
+#: apt_preferences.5.xml:497
 msgid ""
 "names the originator of the packages in the directory tree of the "
 "<filename>Release</filename> file.  Most commonly, this is "
@@ -6623,18 +5405,18 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:502
+#: apt_preferences.5.xml:503
 #, no-wrap
 msgid "Pin: release o=Debian\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:508
+#: apt_preferences.5.xml:509
 msgid "the <literal>Label:</literal> line"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:509
+#: apt_preferences.5.xml:510
 msgid ""
 "names the label of the packages in the directory tree of the "
 "<filename>Release</filename> file.  Most commonly, this is "
@@ -6643,13 +5425,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:515
+#: apt_preferences.5.xml:516
 #, no-wrap
 msgid "Pin: release l=Debian\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:416
+#: apt_preferences.5.xml:417
 msgid ""
 "The <filename>Release</filename> file is normally found in the directory "
 "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
@@ -6663,7 +5445,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:522
+#: apt_preferences.5.xml:523
 msgid ""
 "All of the <filename>Packages</filename> and <filename>Release</filename> "
 "files retrieved from locations listed in the &sources-list; file are stored "
@@ -6678,12 +5460,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:535
+#: apt_preferences.5.xml:536
 msgid "Optional Lines in an APT Preferences Record"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:537
+#: apt_preferences.5.xml:538
 msgid ""
 "Each record in the APT preferences file can optionally begin with one or "
 "more lines beginning with the word <literal>Explanation:</literal>.  This "
@@ -6691,12 +5473,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:546
+#: apt_preferences.5.xml:547
 msgid "Tracking Stable"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:554
+#: apt_preferences.5.xml:555
 #, no-wrap
 msgid ""
 "Explanation: Uninstall or do not install any Debian-originated\n"
@@ -6711,7 +5493,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:548
+#: apt_preferences.5.xml:549
 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 "
@@ -6721,7 +5503,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:571 apt_preferences.5.xml:617 apt_preferences.5.xml:675
+#: apt_preferences.5.xml:572 apt_preferences.5.xml:618 apt_preferences.5.xml:676
 #, no-wrap
 msgid ""
 "apt-get install <replaceable>package-name</replaceable>\n"
@@ -6730,7 +5512,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:566
+#: apt_preferences.5.xml:567
 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 "
@@ -6739,13 +5521,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:583
+#: apt_preferences.5.xml:584
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/testing\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:577
+#: apt_preferences.5.xml:578
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>testing</literal> distribution; the package "
@@ -6754,12 +5536,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:589
+#: apt_preferences.5.xml:590
 msgid "Tracking Testing or Unstable"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:598
+#: apt_preferences.5.xml:599
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -6776,7 +5558,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:591
+#: apt_preferences.5.xml:592
 msgid ""
 "The following APT preferences file will cause APT to assign a high priority "
 "to package versions from the <literal>testing</literal> distribution, a "
@@ -6787,7 +5569,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:612
+#: apt_preferences.5.xml:613
 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 "
@@ -6796,13 +5578,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:632
+#: apt_preferences.5.xml:633
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:623
+#: apt_preferences.5.xml:624
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>unstable</literal> distribution.  "
@@ -6814,12 +5596,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:639
+#: apt_preferences.5.xml:640
 msgid "Tracking the evolution of a codename release"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:653
+#: apt_preferences.5.xml:654
 #, no-wrap
 msgid ""
 "Explanation: Uninstall or do not install any Debian-originated package "
@@ -6841,7 +5623,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:641
+#: apt_preferences.5.xml:642
 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 "
@@ -6856,7 +5638,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:670
+#: apt_preferences.5.xml:671
 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 "
@@ -6865,13 +5647,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:690
+#: apt_preferences.5.xml:691
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/sid\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:681
+#: apt_preferences.5.xml:682
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>sid</literal> distribution.  Thereafter, "
@@ -6883,12 +5665,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt_preferences.5.xml:699
+#: apt_preferences.5.xml:700
 msgid "&file-preferences;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:705
+#: apt_preferences.5.xml:706
 msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 msgstr ""
 
@@ -7090,6 +5872,11 @@ msgid ""
 "archives."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+#: sources.list.5.xml:153
+msgid "cdrom"
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml:155
 msgid ""
@@ -7098,6 +5885,11 @@ msgid ""
 "list."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+#: sources.list.5.xml:160
+msgid "http"
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml:162
 msgid ""
@@ -7109,6 +5901,11 @@ msgid ""
 "method of authentication."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+#: sources.list.5.xml:171
+msgid "ftp"
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml:173
 msgid ""
@@ -7464,6 +6261,11 @@ msgstr ""
 msgid "Once updated there are several commands that can be used:"
 msgstr ""
 
+#. type: <tag></tag>
+#: guide.sgml:121
+msgid "upgrade"
+msgstr ""
+
 #. type: <p></p>
 #: guide.sgml:131
 msgid ""
@@ -7476,6 +6278,11 @@ msgid ""
 "<tt>apt-get install</tt> can be used to force these packages to install."
 msgstr ""
 
+#. type: <tag></tag>
+#: guide.sgml:131
+msgid "install"
+msgstr ""
+
 #. type: <p></p>
 #: guide.sgml:140
 msgid ""
@@ -7488,6 +6295,11 @@ msgid ""
 "anything other than its arguments are changed."
 msgstr ""
 
+#. type: <tag></tag>
+#: guide.sgml:140
+msgid "dist-upgrade"
+msgstr ""
+
 #. type: <p></p>
 #: guide.sgml:149
 msgid ""
diff --git a/doc/po/de.po b/doc/po/de.po
index b0508e911..f87e7e73e 100644
--- a/doc/po/de.po
+++ b/doc/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 0.8.15-9\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-05-20 18:22+0300\n"
+"POT-Creation-Date: 2012-05-21 04:13+0300\n"
 "PO-Revision-Date: 2011-11-13 11:21+0100\n"
 "Last-Translator: Chris Leick <c.leick@vollbio.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -852,11 +852,6 @@ msgstr ""
 "Sofern nicht die <option>-h</option>-, oder <option>--help</option>-Option "
 "angegeben ist, muss einer der unten aufgeführten Befehle vorkommen."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:48
-msgid "gencaches"
-msgstr "gencaches"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:49
 msgid ""
@@ -864,12 +859,14 @@ msgid ""
 "implicitly by all commands needing this cache if it is missing or outdated."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:53
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
+#: apt-cache.8.xml:53 apt-cache.8.xml:142 apt-cache.8.xml:163
+#: 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
 #, fuzzy
-#| msgid "showpkg <replaceable>pkg(s)</replaceable>"
-msgid "showpkg <replaceable>&synopsis-pkg;</replaceable>…"
-msgstr "showpkg <replaceable>Paket(e)</replaceable>"
+#| msgid "del &synopsis-param-keyid;"
+msgid "&synopsis-pkg;"
+msgstr "del &synopsis-param-keyid;"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:54
@@ -939,11 +936,6 @@ msgstr ""
 "und ncurses3.0 (und ldso) installiert sein. Für die spezielle Bedeutung der "
 "restlichen Ausgabe ist es am besten, den apt-Quelltext zu konsultieren."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:87
-msgid "stats"
-msgstr "stats"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:87
 msgid ""
@@ -1060,13 +1052,6 @@ msgstr ""
 "<literal>Total dependencies</literal> ist die Anzahl der "
 "Abhängigkeitsbeziehungen, den alle Pakete im Zwischenspeicher beanspruchen."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:142
-#, fuzzy
-#| msgid "showsrc <replaceable>pkg(s)</replaceable>"
-msgid "showsrc <replaceable>&synopsis-pkg;</replaceable>…"
-msgstr "showsrc <replaceable>Paket(e)</replaceable>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:143
 msgid ""
@@ -1078,11 +1063,6 @@ msgstr ""
 "angegebenen Paketnamen entsprechen. Alle Versionen werden ebenso angezeigt, "
 "wie alle Datensätze, die den Namen für ein Programm deklarieren."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:148 apt-config.8.xml:75
-msgid "dump"
-msgstr "dump"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:149
 msgid ""
@@ -1092,11 +1072,6 @@ msgstr ""
 "<literal>dump</literal> zeigt einen kurzen Programmausdruck von jedem Paket "
 "im Zwischenspeicher. Es dient in erster Linie der Fehlersuche."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:153
-msgid "dumpavail"
-msgstr "dumpavail"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:154
 msgid ""
@@ -1107,11 +1082,6 @@ msgstr ""
 "ist geeignet für die Benutzung mit &dpkg; und wird für die &dselect;-Methode "
 "benutzt."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:158
-msgid "unmet"
-msgstr "unmet"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:159
 msgid ""
@@ -1121,13 +1091,6 @@ msgstr ""
 "<literal>unmet</literal> zeigt die Zusammenfassung aller unerfüllten "
 "Abhängigkeiten im Paketzwischenspeicher."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:163
-#, fuzzy
-#| msgid "show <replaceable>pkg(s)</replaceable>"
-msgid "show <replaceable>&synopsis-pkg;</replaceable>…"
-msgstr "show <replaceable>Paket(e)</replaceable>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:164
 msgid ""
@@ -1138,12 +1101,12 @@ msgstr ""
 "avail</command> ähnlich ist. Es zeigt die Paketdatensätze für die genannten "
 "Pakete."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
 #: apt-cache.8.xml:169
 #, fuzzy
-#| msgid "search <replaceable>regex [ regex ... ]</replaceable>"
-msgid "search <replaceable>&synopsis-regex;</replaceable>…"
-msgstr "search <replaceable>regex [ regex … ]</replaceable>"
+#| msgid "add &synopsis-param-filename;"
+msgid "&synopsis-regex;"
+msgstr "add &synopsis-param-filename;"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:170
@@ -1179,13 +1142,6 @@ msgstr ""
 "Separate Argumente können benutzt werden, um mehrere Suchmuster anzugeben, "
 "die »und«-verknüpft werden."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:187
-#, fuzzy
-#| msgid "depends <replaceable>pkg(s)</replaceable>"
-msgid "depends <replaceable>&synopsis-pkg;</replaceable>…"
-msgstr "depends <replaceable>Paket(e)</replaceable>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:188
 msgid ""
@@ -1196,13 +1152,6 @@ msgstr ""
 "Paket hat und alle möglichen anderen Pakete, die die Abhängigkeit erfüllen "
 "können."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:192
-#, fuzzy
-#| msgid "rdepends <replaceable>pkg(s)</replaceable>"
-msgid "rdepends <replaceable>&synopsis-pkg;</replaceable>…"
-msgstr "rdepends <replaceable>Paket(e)</replaceable>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:193
 msgid ""
@@ -1216,7 +1165,7 @@ msgstr ""
 #: apt-cache.8.xml:197
 #, fuzzy
 #| msgid "pkgnames <replaceable>[ prefix ]</replaceable>"
-msgid "pkgnames [ <replaceable>&synopsis-prefix;</replaceable> ]"
+msgid "<optional><replaceable>&synopsis-prefix;</replaceable></optional>"
 msgstr "pkgnames <replaceable>[ Präfix ]</replaceable>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -1245,13 +1194,6 @@ msgstr ""
 "Herunterladen verfügbar, installierbar oder installiert ist, virtuelle "
 "Pakete sind z.B. auch in der generierten Liste aufgeführt."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:208
-#, fuzzy
-#| msgid "dotty <replaceable>pkg(s)</replaceable>"
-msgid "dotty <replaceable>&synopsis-pkg;</replaceable>…"
-msgstr "dotty <replaceable>Paket(e)</replaceable>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:209
 msgid ""
@@ -1295,13 +1237,6 @@ msgstr ""
 "Vorsicht, dotty kann keine größeren Zusammenstellungen von Paketen grafisch "
 "darstellen."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:226
-#, fuzzy
-#| msgid "xvcg <replaceable>pkg(s)</replaceable>"
-msgid "xvcg <replaceable>&synopsis-pkg;</replaceable>"
-msgstr "xvcg <replaceable>Paket(e)</replaceable>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:227
 msgid ""
@@ -1315,9 +1250,9 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-cache.8.xml:231
 #, fuzzy
-#| msgid "policy <replaceable>[ pkg(s) ]</replaceable>"
-msgid "policy [ <replaceable>&synopsis-pkg;</replaceable>… ]"
-msgstr "policy <replaceable>[ Paket(e) ]</replaceable>"
+#| msgid "madison <replaceable>[ pkg(s) ]</replaceable>"
+msgid "<optional><replaceable>&synopsis-pkg;</replaceable>…</optional>"
+msgstr "madison <replaceable>[ Paket(e) ]</replaceable>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:232
@@ -1332,13 +1267,6 @@ msgstr ""
 "die Prioritäten von jeder Quelle aus. Ansonsten gibt es umfangreiche "
 "Informationen über die Prioritätenauswahl der genannten Pakete aus."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:238
-#, fuzzy
-#| msgid "madison <replaceable>[ pkg(s) ]</replaceable>"
-msgid "madison <replaceable>&synopsis-pkg;</replaceable>…"
-msgstr "madison <replaceable>[ Paket(e) ]</replaceable>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:239
 msgid ""
@@ -1358,23 +1286,13 @@ msgstr ""
 "Architektur anzeigen, für die APT Paketlisten heruntergeladen hat "
 "(<literal>APT::Architecture</literal>)."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:250 apt-config.8.xml:84 apt-extracttemplates.1.xml:51
+#. type: Content of: <refentry><refsect1><title>
+#: apt-cache.8.xml:250 apt-config.8.xml:84 apt-extracttemplates.1.xml:52
 #: apt-ftparchive.1.xml:504 apt-get.8.xml:259 apt-mark.8.xml:108
-#: apt-sortpkgs.1.xml:48 apt.conf.5.xml:586 apt.conf.5.xml:608
+#: apt-sortpkgs.1.xml:48
 msgid "options"
 msgstr "options"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:254
-msgid "<option>-p</option>"
-msgstr "<option>-p</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:254
-msgid "<option>--pkg-cache</option>"
-msgstr "<option>--pkg-cache</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:255
 msgid ""
@@ -1387,17 +1305,6 @@ msgstr ""
 "Operationen benutzt wird. Konfigurationselement: <literal>Dir::Cache::"
 "pkgcache</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:260 apt-ftparchive.1.xml:551 apt-get.8.xml:321
-#: apt-sortpkgs.1.xml:52
-msgid "<option>-s</option>"
-msgstr "<option>-s</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:260
-msgid "<option>--src-cache</option>"
-msgstr "<option>--src-cache</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:261
 msgid ""
@@ -1415,16 +1322,6 @@ msgstr ""
 "Paketdateien zu vermeiden. Konfigurationselement: <literal>Dir::Cache::"
 "srcpkgcache</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:268 apt-ftparchive.1.xml:525 apt-get.8.xml:311
-msgid "<option>-q</option>"
-msgstr "<option>-q</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:268 apt-ftparchive.1.xml:525 apt-get.8.xml:311
-msgid "<option>--quiet</option>"
-msgstr "<option>--quiet</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:269
 msgid ""
@@ -1439,16 +1336,6 @@ msgstr ""
 "die Stillestufe zu setzen, was die Konfigurationsdatei überschreibt. "
 "Konfigurationselement: <literal>quiet</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:275
-msgid "<option>-i</option>"
-msgstr "<option>-i</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:275
-msgid "<option>--important</option>"
-msgstr "<option>--important</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:276
 msgid ""
@@ -1460,46 +1347,6 @@ msgstr ""
 "Veranlasst, dass nur Depends- und Pre-Depends-Beziehungen ausgegeben werden. "
 "Konfigurationselement: <literal>APT::Cache::Important</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:281
-msgid "<option>--no-pre-depends</option>"
-msgstr "<option>--no-pre-depends</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:282
-msgid "<option>--no-depends</option>"
-msgstr "<option>--no-depends</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:283
-msgid "<option>--no-recommends</option>"
-msgstr "<option>--no-recommends</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:284
-msgid "<option>--no-suggests</option>"
-msgstr "<option>--no-suggests</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:285
-msgid "<option>--no-conflicts</option>"
-msgstr "<option>--no-conflicts</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:286
-msgid "<option>--no-breaks</option>"
-msgstr "<option>--no-breaks</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:287
-msgid "<option>--no-replaces</option>"
-msgstr "<option>--no-replaces</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:288
-msgid "<option>--no-enhances</option>"
-msgstr "<option>--no-enhances</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:289
 msgid ""
@@ -1516,16 +1363,6 @@ msgstr ""
 "Show<replaceable>Abhängigkeitstyp</replaceable></literal> z.B. <literal>APT::"
 "Cache::ShowRecommends</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:295 apt-cdrom.8.xml:111 apt-get.8.xml:278
-msgid "<option>-f</option>"
-msgstr "<option>-f</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:295
-msgid "<option>--full</option>"
-msgstr "<option>--full</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:296
 msgid ""
@@ -1535,17 +1372,6 @@ msgstr ""
 "Gibt die vollständigen Paketdatensätze beim Suchen aus. "
 "Konfigurationselement: <literal>APT::Cache::ShowFull</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:300 apt-cdrom.8.xml:121 apt-ftparchive.1.xml:563
-#: apt-get.8.xml:369
-msgid "<option>-a</option>"
-msgstr "<option>-a</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:300
-msgid "<option>--all-versions</option>"
-msgstr "<option>--all-versions</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:301
 msgid ""
@@ -1563,16 +1389,6 @@ msgstr ""
 "würde). Diese Option ist nur für den <literal>show</literal>-Befehl "
 "anwendbar. Konfigurationselement: <literal>APT::Cache::AllVersions</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:309
-msgid "<option>-g</option>"
-msgstr "<option>-g</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:309
-msgid "<option>--generate</option>"
-msgstr "<option>--generate</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:310
 msgid ""
@@ -1585,16 +1401,6 @@ msgstr ""
 "auszuschalten benutzen Sie <option>--no-generate</option>. "
 "Konfigurationselement: <literal>APT::Cache::Generate</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:315
-msgid "<option>--names-only</option>"
-msgstr "<option>--names-only</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:315 apt-cdrom.8.xml:129
-msgid "<option>-n</option>"
-msgstr "<option>-n</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:316
 msgid ""
@@ -1604,11 +1410,6 @@ msgstr ""
 "Durchsucht nur die Paketnamen, nicht die Langbeschreibungen. "
 "Konfigurationselement: <literal>APT::Cache::NamesOnly</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:320
-msgid "<option>--all-names</option>"
-msgstr "<option>--all-names</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:321
 msgid ""
@@ -1620,11 +1421,6 @@ msgstr ""
 "Pakete und fehlender Abhängigkeiten, ausgeben. Konfigurationselement: "
 "<literal>APT::Cache::AllNames</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:326
-msgid "<option>--recurse</option>"
-msgstr "<option>--recurse</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:327
 msgid ""
@@ -1636,11 +1432,6 @@ msgstr ""
 "so dass alle erwähnten Pakete einmal ausgegeben werden. "
 "Konfigurationselement: <literal>APT::Cache::RecurseDepends</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:332
-msgid "<option>--installed</option>"
-msgstr "<option>--installed</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:334
 msgid ""
@@ -1654,14 +1445,14 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist>
 #: apt-cache.8.xml:339 apt-cdrom.8.xml:140 apt-config.8.xml:104
-#: apt-extracttemplates.1.xml:62 apt-ftparchive.1.xml:591 apt-get.8.xml:514
+#: apt-extracttemplates.1.xml:63 apt-ftparchive.1.xml:591 apt-get.8.xml:514
 #: apt-mark.8.xml:122 apt-sortpkgs.1.xml:58
 msgid "&apt-commonoptions;"
 msgstr "&apt-commonoptions;"
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-cache.8.xml:344 apt-get.8.xml:519 apt-key.8.xml:167 apt-mark.8.xml:126
-#: apt.conf.5.xml:1119 apt_preferences.5.xml:697
+#: apt.conf.5.xml:1119 apt_preferences.5.xml:698
 msgid "Files"
 msgstr "Dateien"
 
@@ -1672,9 +1463,9 @@ msgstr "&file-sourceslist; &file-statelists;"
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-cache.8.xml:351 apt-cdrom.8.xml:145 apt-config.8.xml:109
-#: apt-extracttemplates.1.xml:69 apt-ftparchive.1.xml:607 apt-get.8.xml:529
+#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:607 apt-get.8.xml:529
 #: apt-key.8.xml:188 apt-mark.8.xml:132 apt-secure.8.xml:185
-#: apt-sortpkgs.1.xml:63 apt.conf.5.xml:1125 apt_preferences.5.xml:704
+#: apt-sortpkgs.1.xml:63 apt.conf.5.xml:1125 apt_preferences.5.xml:705
 #: sources.list.5.xml:255
 msgid "See Also"
 msgstr "Siehe auch"
@@ -1686,7 +1477,7 @@ msgstr "&apt-conf;, &sources-list;, &apt-get;"
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:114
-#: apt-extracttemplates.1.xml:73 apt-ftparchive.1.xml:611 apt-get.8.xml:535
+#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:611 apt-get.8.xml:535
 #: apt-mark.8.xml:136 apt-sortpkgs.1.xml:67
 msgid "Diagnostics"
 msgstr "Diagnose"
@@ -1744,11 +1535,6 @@ msgstr ""
 "Medium in einer Zusammenstellung aus mehreren CDs einzeln eingelegt und "
 "gescannt werden, um auf mögliche Fehlbrennungen zu testen."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:55
-msgid "add"
-msgstr "add"
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt-cdrom.8.xml:56
 msgid ""
@@ -1775,11 +1561,6 @@ msgstr ""
 "Laufwerk ist und verwaltet eine Datenbank mit diesen IDs in "
 "<filename>&statedir;/cdroms.list</filename>"
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:71
-msgid "ident"
-msgstr "ident"
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt-cdrom.8.xml:72
 msgid ""
@@ -1805,16 +1586,6 @@ msgstr ""
 msgid "Options"
 msgstr "Optionen"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:85 apt-ftparchive.1.xml:519 apt-get.8.xml:273
-msgid "<option>-d</option>"
-msgstr "<option>-d</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:85
-msgid "<option>--cdrom</option>"
-msgstr "<option>--cdrom</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cdrom.8.xml:86
 msgid ""
@@ -1827,16 +1598,6 @@ msgstr ""
 "angemessen konfiguriert sein. Konfigurationselement: <literal>Acquire::"
 "cdrom::mount</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:94
-msgid "<option>-r</option>"
-msgstr "<option>-r</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:94
-msgid "<option>--rename</option>"
-msgstr "<option>--rename</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cdrom.8.xml:95
 msgid ""
@@ -1849,16 +1610,6 @@ msgstr ""
 "command> veranlassen, nach einem neuen Namen zu fragen. "
 "Konfigurationselement: <literal>APT::CDROM::Rename</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:103 apt-get.8.xml:292
-msgid "<option>-m</option>"
-msgstr "<option>-m</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:103
-msgid "<option>--no-mount</option>"
-msgstr "<option>--no-mount</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cdrom.8.xml:104
 msgid ""
@@ -1870,11 +1621,6 @@ msgstr ""
 "des Einhängepunkts. Konfigurationselement: <literal>APT::CDROM::NoMount</"
 "literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:111
-msgid "<option>--fast</option>"
-msgstr "<option>--fast</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cdrom.8.xml:112
 msgid ""
@@ -1888,11 +1634,6 @@ msgstr ""
 "cdrom</command> vorher für dieses Medium ausgeführt wurde und keine Fehler "
 "festgestellt hat. Konfigurationselement: <literal>APT::CDROM::Fast</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:121
-msgid "<option>--thorough</option>"
-msgstr "<option>--thorough</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cdrom.8.xml:122
 msgid ""
@@ -1904,21 +1645,6 @@ msgstr ""
 "Debian-1.1/1.2-Medien nötig sein, die Paketdateien an seltsamen Orten haben. "
 "Dies verlängert das Durchsuchen des Mediums deutlich, nimmt aber alle auf."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:130 apt-get.8.xml:323
-msgid "<option>--just-print</option>"
-msgstr "<option>--just-print</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:131 apt-get.8.xml:325
-msgid "<option>--recon</option>"
-msgstr "<option>--recon</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:132 apt-get.8.xml:326
-msgid "<option>--no-act</option>"
-msgstr "<option>--no-act</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cdrom.8.xml:133
 msgid ""
@@ -1988,11 +1714,6 @@ msgstr ""
 "Außer, wenn die <option>-h</option>- oder <option>--help</option>-Option "
 "angegeben wurde, muss einer der Befehle unterhalb vorkommen."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-config.8.xml:49
-msgid "shell"
-msgstr "shell"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-config.8.xml:51
 msgid ""
@@ -2046,11 +1767,6 @@ msgstr ""
 msgid "Just show the contents of the configuration space."
 msgstr "Nur der Inhalt des Konfigurationsbereichs wird angezeigt."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-config.8.xml:89
-msgid "<option>--empty</option>"
-msgstr "<option>-empty</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-config.8.xml:90
 msgid ""
@@ -2060,11 +1776,13 @@ msgstr ""
 "schließt Optionen ein, die einen leeren Wert haben. Dies ist die Vorgabe, "
 "benutzen Sie daher --no-empty, um sie aus der Ausgabe zu entfernen."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
 #: apt-config.8.xml:95
-msgid ""
-"<option>--format '<replaceable>&percnt;f &#x0022;&percnt;v&#x0022;;&percnt;"
-"n</replaceable>'</option>"
+#, fuzzy
+#| msgid ""
+#| "<option>--format '<replaceable>&percnt;f &#x0022;&percnt;v&#x0022;;"
+#| "&percnt;n</replaceable>'</option>"
+msgid "&percnt;f &#x0022;&percnt;v&#x0022;;&percnt;n"
 msgstr ""
 "<option>--format '<replaceable>&percnt;f &#x0022;&percnt;v&#x0022;;&percnt;"
 "n</replaceable>'</option>"
@@ -2096,7 +1814,7 @@ msgstr ""
 "werden."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:110 apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:608
+#: apt-config.8.xml:110 apt-extracttemplates.1.xml:71 apt-ftparchive.1.xml:608
 #: apt-sortpkgs.1.xml:64
 msgid "&apt-conf;"
 msgstr "&apt-conf;"
@@ -2150,11 +1868,19 @@ msgstr "Paket Version Schablonendatei Konfigurationsskript"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-extracttemplates.1.xml:45
+#, fuzzy
+#| msgid ""
+#| "template-file and config-script are written to the temporary directory "
+#| "specified by the -t or --tempdir (<literal>APT::ExtractTemplates::"
+#| "TempDir</literal>)  directory, with filenames of the form "
+#| "<filename>package.template.XXXX</filename> and <filename>package.config."
+#| "XXXX</filename>"
 msgid ""
 "template-file and config-script are written to the temporary directory "
-"specified by the -t or --tempdir (<literal>APT::ExtractTemplates::TempDir</"
-"literal>)  directory, with filenames of the form <filename>package.template."
-"XXXX</filename> and <filename>package.config.XXXX</filename>"
+"specified by the <option>-t</option> or <option>--tempdir</option> "
+"(<literal>APT::ExtractTemplates::TempDir</literal>) directory, with "
+"filenames of the form <filename>package.template.XXXX</filename> and "
+"<filename>package.config.XXXX</filename>"
 msgstr ""
 "Schablonendatei und Konfigurationsskript werden in das temporäre Verzeichnis "
 "geschrieben, das durch »-t« oder »--tempdir« (<literal>APT::"
@@ -2162,18 +1888,8 @@ msgstr ""
 "<filename>package. template.XXXX</filename> und <filename>package.config."
 "XXXX</filename> angegeben wurde"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-extracttemplates.1.xml:55 apt-get.8.xml:448
-msgid "<option>-t</option>"
-msgstr "<option>-t</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-extracttemplates.1.xml:55
-msgid "<option>--tempdir</option>"
-msgstr "<option>--tempdir</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-extracttemplates.1.xml:57
+#: apt-extracttemplates.1.xml:58
 msgid ""
 "Temporary directory in which to write extracted debconf template files and "
 "config scripts.  Configuration Item: <literal>APT::ExtractTemplates::"
@@ -2184,7 +1900,7 @@ msgstr ""
 "<literal>APT::ExtractTemplates::TempDir</literal>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:74
+#: apt-extracttemplates.1.xml:75
 msgid ""
 "<command>apt-extracttemplates</command> returns zero on normal operation, "
 "decimal 100 on error."
@@ -2255,11 +1971,6 @@ msgstr ""
 "Dateiänderungsprüfungen durchgeführt und die gewünschten gepackten "
 "Ausgabedateien erzeugt."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:58
-msgid "packages"
-msgstr "packages"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:60
 msgid ""
@@ -2281,11 +1992,6 @@ msgstr ""
 "Die Option <option>--db</option> kann benutzt werden, um eine Datenbank zum "
 "Zwischenspeichern von Programmen anzugeben."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:68
-msgid "sources"
-msgstr "sources"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:70
 msgid ""
@@ -2311,11 +2017,6 @@ msgstr ""
 "kann benutzt werden, um die Quellen-Override-Datei, die benutzt wird, zu "
 "ändern."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:80
-msgid "contents"
-msgstr "contents"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:82
 msgid ""
@@ -2334,11 +2035,6 @@ msgstr ""
 "die gleiche Datei besitzen, dann befindet sich jedes Paket durch Komma "
 "getrennt in der Ausgabe."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:92
-msgid "release"
-msgstr "release"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:94
 msgid ""
@@ -2387,11 +2083,6 @@ msgstr ""
 "literal>, <literal>Architectures</literal>, <literal>Components</literal>, "
 "<literal>Description</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:115
-msgid "generate"
-msgstr "generate"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:117
 msgid ""
@@ -2408,11 +2099,6 @@ msgstr ""
 "Verzeichnissen gebildet wurden, ebenso wie sie eine einfache Möglichkeit zur "
 "Verwaltung der erforderlichen Einstellungen bereitstellt."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:124 apt-get.8.xml:215
-msgid "clean"
-msgstr "clean"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:126
 msgid ""
@@ -2473,11 +2159,6 @@ msgstr ""
 "späteren Abschnitten definiert werden, vorangestellt, um einen vollständigen "
 "absoluten Pfad zu bilden."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:151
-msgid "ArchiveDir"
-msgstr "ArchiveDir"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:153
 msgid ""
@@ -2489,31 +2170,16 @@ msgstr ""
 "ist das das Verzeichnis, das die <filename>ls-LR</filename>- und dist-Knoten "
 "enthält."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:158
-msgid "OverrideDir"
-msgstr "OverrideDir"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:160
 msgid "Specifies the location of the override files."
 msgstr "Gibt den Ort der Override-Dateien an"
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:163
-msgid "CacheDir"
-msgstr "CacheDir"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:165
 msgid "Specifies the location of the cache files"
 msgstr "Gibt den Ort der Zwischenspeicherdateien an"
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:168
-msgid "FileListDir"
-msgstr "FileListDir"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:170
 msgid ""
@@ -2539,11 +2205,6 @@ msgstr ""
 "Einstellungen, die den Betrieb des Generators steuern. Andere Abschnitte "
 "können diese Vorgaben mit einer Einstellung pro Abschnitt überschreiben."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:182
-msgid "Packages::Compress"
-msgstr "Packages::Compress"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:184
 msgid ""
@@ -2558,11 +2219,6 @@ msgstr ""
 "Kompression), »gzip« und »bzip2«. Die Vorgabe für alle Kompressionsschemata "
 "ist ». gzip«."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:190
-msgid "Packages::Extensions"
-msgstr "Packages::Extensions"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:192
 msgid ""
@@ -2572,11 +2228,6 @@ msgstr ""
 "Setzt die Vorgabeliste von Dateierweiterungen, die Paketdateien sind. "
 "Vorgabe ist ».deb«."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:196
-msgid "Sources::Compress"
-msgstr "Sources::Compress"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:198
 msgid ""
@@ -2586,11 +2237,6 @@ msgstr ""
 "Dies ist <literal>Packages::Compress</literal> ähnlich, außer dass es die "
 "Kompression der Quelldateien steuert."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:202
-msgid "Sources::Extensions"
-msgstr "Sources::Extensions"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:204
 msgid ""
@@ -2600,11 +2246,6 @@ msgstr ""
 "Setzt die Vorgabeliste von Dateierweiterungen, die Quelldateien sind. "
 "Vorgabe ist ».dsc«."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:208
-msgid "Contents::Compress"
-msgstr "Contents::Compress"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:210
 msgid ""
@@ -2614,11 +2255,6 @@ msgstr ""
 "Dies ist <literal>Packages::Compress</literal> ähnlich, außer dass es die "
 "Kompression der Inhaltsdateien steuert."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:214
-msgid "Translation::Compress"
-msgstr "Translation::Compress"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:216
 msgid ""
@@ -2628,11 +2264,6 @@ msgstr ""
 "Dies ist <literal>Packages::Compress</literal> ähnlich, außer dass es die "
 "Kompression der Translation-en-Hauptdatei steuert."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:220
-msgid "DeLinkLimit"
-msgstr "DeLinkLimit"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:222
 msgid ""
@@ -2644,11 +2275,6 @@ msgstr ""
 "Hardlinks ersetzt) werden sollen. Dies wird in Verbindung mit der "
 "<literal>External-Links</literal>-Einstellung pro Abschnitt benutzt."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:227
-msgid "FileMode"
-msgstr "FileMode"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:229
 msgid ""
@@ -2658,11 +2284,6 @@ msgstr ""
 "Gibt die Rechte für alle erstellten Indexdateien an. Vorgabe ist 0644. Alle "
 "Indexdateien werden ohne Beachtung von umask auf diese Rechte gesetzt."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:234 apt-ftparchive.1.xml:380
-msgid "LongDescription"
-msgstr "LongDescription"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:236 apt-ftparchive.1.xml:382
 msgid ""
@@ -2688,11 +2309,6 @@ msgstr ""
 "Variablen sind Platzhaltervariablen und haben die Zeichenketten $(DIST), "
 "$(SECTION) und $(ARCH) durch ihre jeweiligen Werte ersetzt."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:249
-msgid "MaxContentsChange"
-msgstr "MaxContentsChange"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:251
 msgid ""
@@ -2704,11 +2320,6 @@ msgstr ""
 "werden. Die Inhaltdateien werden reihum ersetzt, so dass sie über mehrere "
 "Tage alle neu gebildet werden."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:256
-msgid "ContentsAge"
-msgstr "ContentsAge"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:258
 msgid ""
@@ -2727,11 +2338,6 @@ msgstr ""
 "erlaubt, in der Hoffnung dass neue .debs installiert werden, die sowieso "
 "eine neue Datei benötigen. Die Vorgabe ist 10, die Einheiten sind Tage."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:267
-msgid "Directory"
-msgstr "Directory"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:269
 msgid ""
@@ -2741,11 +2347,6 @@ msgstr ""
 "Setzt den Beginn des .deb-Verzeichnisbaumes. Vorgabe ist <filename>$(DIST)/"
 "$(SECTION)/binary-$(ARCH)/</filename>"
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:273
-msgid "SrcDirectory"
-msgstr "SrcDirectory"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:275
 msgid ""
@@ -2755,11 +2356,6 @@ msgstr ""
 "Setzt den Beginn des Quellpaketverzeichnisbaumes. Vorgabe ist <filename>"
 "$(DIST)/$(SECTION)/source/</filename>"
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:279 apt-ftparchive.1.xml:418
-msgid "Packages"
-msgstr "Packages"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:281
 msgid ""
@@ -2769,11 +2365,6 @@ msgstr ""
 "Setzt die Ausgabe-Packages-Datei. Vorgabe ist <filename>$(DIST)/$(SECTION)/"
 "binary-$(ARCH)/Packages</filename>"
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:285 apt-ftparchive.1.xml:423
-msgid "Sources"
-msgstr "Sources"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:287
 msgid ""
@@ -2783,11 +2374,6 @@ msgstr ""
 "Setzt die Ausgabe-Quelldatei. Vorgabe ist <filename>$(DIST)/$(SECTION)/"
 "source/Sources</filename>"
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:291
-msgid "Translation"
-msgstr "Übersetzung"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:293
 msgid ""
@@ -2799,11 +2385,6 @@ msgstr ""
 "Beschreibungen falls Sie nicht in der Packages-Datei enthalten sind. Vorgabe "
 "ist <filename>$(DIST)/$(SECTION)/i18n/Translation-en</filename>."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:298
-msgid "InternalPrefix"
-msgstr "InternalPrefix"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:300
 msgid ""
@@ -2815,11 +2396,6 @@ msgstr ""
 "interner anstatt wie ein externer Verweis behandelt wird. Vorgabe ist "
 "<filename>$(DIST)/$(SECTION)/</filename>"
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:305 apt-ftparchive.1.xml:429
-msgid "Contents"
-msgstr "Contents"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:307
 msgid ""
@@ -2834,21 +2410,11 @@ msgstr ""
 "Vorgabe ist), dann wird <command>apt-ftparchive</command> diese Dateien "
 "automatisch integrieren."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:314
-msgid "Contents::Header"
-msgstr "Contents::Header"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:316
 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><term>
-#: apt-ftparchive.1.xml:319 apt-ftparchive.1.xml:454
-msgid "BinCacheDB"
-msgstr "BinCacheDB"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:321
 msgid ""
@@ -2858,11 +2424,6 @@ msgstr ""
 "Setzt die Programmzwischenspeicherdatenbank zur Benutzung in diesem "
 "Abschnitt. Mehrere Abschnitte können sich die gleiche Datenbank teilen."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:325
-msgid "FileList"
-msgstr "FileList"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:327
 msgid ""
@@ -2874,11 +2435,6 @@ msgstr ""
 "der vorgegebenen Datei liest, anstatt den Verzeichnisbaum zu durchlaufen. "
 "Relativen Dateinamen wird das Archivverzeichnis vorangestellt."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:332
-msgid "SourceFileList"
-msgstr "SourceFileList"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:334
 msgid ""
@@ -2962,11 +2518,6 @@ msgstr ""
 "<command>apt-ftparchive</command> eine Operation aus, die folgender ähnelt:"
 "<placeholder type=\"programlisting\" id=\"0\"/>"
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:366
-msgid "Sections"
-msgstr "Abschnitte"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:368
 msgid ""
@@ -2978,11 +2529,6 @@ msgstr ""
 "der Distribution erscheint, typischerweise etwas wie <literal>main contrib "
 "non-free</literal>"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:373 apt.conf.5.xml:157
-msgid "Architectures"
-msgstr "Architekturen"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:375
 msgid ""
@@ -2994,11 +2540,6 @@ msgstr ""
 "unter dem Suchabschnitt erscheinen. Die spezielle Architektur »source« wird "
 "benutzt, um anzugeben, dass dieser Baum ein Quellarchiv besitzt."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:386 apt-ftparchive.1.xml:434
-msgid "BinOverride"
-msgstr "BinOverride"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:388
 msgid ""
@@ -3008,11 +2549,6 @@ msgstr ""
 "Setzt die Programm-Override-Datei. Die Override-Datei enthält Abschnitt, "
 "Priorität und Adressinformationen des Betreuers."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:392 apt-ftparchive.1.xml:439
-msgid "SrcOverride"
-msgstr "SrcOverride"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:394
 msgid ""
@@ -3022,21 +2558,11 @@ msgstr ""
 "Setzt die Quell-Override-Datei. Die Override-Datei enthält "
 "Abschnittsinformationen."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:398 apt-ftparchive.1.xml:444
-msgid "ExtraOverride"
-msgstr "ExtraOverride"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:400 apt-ftparchive.1.xml:446
 msgid "Sets the binary extra override file."
 msgstr "Setzt die zusätzliche Programm-Override-Datei."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:403 apt-ftparchive.1.xml:449
-msgid "SrcExtraOverride"
-msgstr "SrcExtraOverride"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:405 apt-ftparchive.1.xml:451
 msgid "Sets the source extra override file."
@@ -3096,21 +2622,11 @@ msgstr "Setzt die Quell-Override-Datei."
 msgid "Sets the cache DB."
 msgstr "Setzt die Zwischenspeicherdatenbank."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:459
-msgid "PathPrefix"
-msgstr "PathPrefix"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:461
 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><term>
-#: apt-ftparchive.1.xml:464
-msgid "FileList, SourceFileList"
-msgstr "FileList, SourceFileList"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:466
 msgid "Specifies the file list file."
@@ -3198,13 +2714,6 @@ msgstr ""
 "erste ist das Paket, die zweite ist die Markierung und der Rest der Zeile "
 "ist der neue Wert."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:508
-msgid ""
-"<option>--md5</option>, <option>--sha1</option>, <option>--sha256</option>"
-msgstr ""
-"<option>--md5</option>, <option>--sha1</option>, <option>--sha256</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:510
 msgid ""
@@ -3230,11 +2739,6 @@ msgstr ""
 "<literal>MD5</literal>, <literal>SHA1</literal> oder <literal>SHA256</"
 "literal> sein kann."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:519
-msgid "<option>--db</option>"
-msgstr "<option>--db</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:521
 msgid ""
@@ -3259,11 +2763,6 @@ msgstr ""
 "die Stillestufe zu setzen, was die Konfigurationsdatei überschreibt. "
 "Konfigurationselement: <literal>quiet</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:533
-msgid "<option>--delink</option>"
-msgstr "<option>--delink</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:535
 msgid ""
@@ -3278,11 +2777,6 @@ msgstr ""
 "ausgeschaltet werden. Konfigurationselement: <literal>APT::FTPArchive::"
 "DeLinkAct</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:541
-msgid "<option>--contents</option>"
-msgstr "<option>--contents</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:543
 msgid ""
@@ -3299,11 +2793,6 @@ msgstr ""
 "außerdem die Erzeugung beliebiger Contents-Dateien. Die Vorgabe ist an. "
 "Konfigurationselement: <literal>APT::FTPArchive::Contents</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:551
-msgid "<option>--source-override</option>"
-msgstr "<option>--source-override</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:553
 msgid ""
@@ -3315,11 +2804,6 @@ msgstr ""
 "Befehl benutzt wird. Konfigurationselement: <literal>APT::FTPArchive::"
 "SourceOverride</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:557
-msgid "<option>--readonly</option>"
-msgstr "<option>--readonly</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:559
 msgid ""
@@ -3329,11 +2813,6 @@ msgstr ""
 "Gibt der Zwischenspeicherdatenbank nur Lesezugriff. Konfigurationselement: "
 "<literal>APT::FTPArchive::ReadOnlyDB</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:563
-msgid "<option>--arch</option>"
-msgstr "<option>--arch</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:564
 msgid ""
@@ -3348,11 +2827,6 @@ msgstr ""
 "angegebenen Pfad. Konfigurationselement: <literal>APT::FTPArchive::"
 "Architecture</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:570
-msgid "<option>APT::FTPArchive::AlwaysStat</option>"
-msgstr "<option>APT::FTPArchive::AlwaysStat</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:572
 msgid ""
@@ -3377,11 +2851,6 @@ msgstr ""
 "Versionsnummer hochzuladen, so dass theoretisch niemand dieses Probleme "
 "haben sollte und all diese zusätzlichen Prüfungen daher nutzlos sind."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:582
-msgid "<option>APT::FTPArchive::LongDescription</option>"
-msgstr "<option>APT::FTPArchive::LongDescription</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:584
 msgid ""
@@ -3399,7 +2868,7 @@ msgstr ""
 "werden kann."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:596 apt.conf.5.xml:1113 apt_preferences.5.xml:544
+#: apt-ftparchive.1.xml:596 apt.conf.5.xml:1113 apt_preferences.5.xml:545
 #: sources.list.5.xml:214
 msgid "Examples"
 msgstr "Beispiele"
@@ -3462,11 +2931,6 @@ msgstr ""
 "die APT-Bibliothek benutzen. Es existieren mehrere "
 "Oberflächenschnittstellen, wie &dselect;, &aptitude;, &synaptic; und &wajig;."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:48 apt-key.8.xml:119
-msgid "update"
-msgstr "update"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:49
 msgid ""
@@ -3491,11 +2955,6 @@ msgstr ""
 "bewusst, dass die Gesamtfortschrittsanzeige nicht richtig sein wird, da die "
 "Größe der Pakete nicht im voraus bekannt ist."
 
-#. type: <tag></tag>
-#: apt-get.8.xml:60 guide.sgml:121
-msgid "upgrade"
-msgstr "upgrade"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:61
 msgid ""
@@ -3522,11 +2981,6 @@ msgstr ""
 "muss ein <literal>update</literal> durchgeführt werden, so dass <command>apt-"
 "get</command> die neuen Versionen der verfügbaren Pakete kennt."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:73
-msgid "dselect-upgrade"
-msgstr "dselect-upgrade"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:74
 msgid ""
@@ -3544,11 +2998,6 @@ msgstr ""
 "diesen Status zu realisieren (zum Beispiel das Entfernen von alten und "
 "Installieren von neuen Paketen)."
 
-#. type: <tag></tag>
-#: apt-get.8.xml:83 guide.sgml:140
-msgid "dist-upgrade"
-msgstr "dist-upgrade"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:84
 msgid ""
@@ -3573,11 +3022,6 @@ msgstr ""
 "abgerufen werden. Siehe auch &apt-preferences; für einen Mechanismus zum "
 "überschreiben der allgemeinen Einstellungen für einzelne Pakete."
 
-#. type: <tag></tag>
-#: apt-get.8.xml:96 guide.sgml:131
-msgid "install"
-msgstr "install"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:98
 msgid ""
@@ -3684,11 +3128,6 @@ msgstr ""
 "nicht gewünscht wird, hängen Sie an den regulären Ausdruck ein »^«- oder »$«-"
 "Zeichen, um genauere reguläre Ausdruck zu erstellen."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:150
-msgid "remove"
-msgstr "remove"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:151
 msgid ""
@@ -3704,11 +3143,6 @@ msgstr ""
 "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><term>
-#: apt-get.8.xml:158
-msgid "purge"
-msgstr "purge"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:159
 msgid ""
@@ -3720,11 +3154,6 @@ msgstr ""
 "Ausnahme, dass Pakete entfernt und vollständig gelöscht werden (jegliche "
 "Konfigurationsdateien werden mitgelöscht)."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:163
-msgid "source"
-msgstr "source"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:164
 msgid ""
@@ -3803,11 +3232,6 @@ msgstr ""
 "werden, sie existieren nur im aktuellen Verzeichnis und sind "
 "heruntergeladenen Tarballs ähnlich."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:197
-msgid "build-dep"
-msgstr "build-dep"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:198
 msgid ""
@@ -3824,11 +3248,6 @@ msgstr ""
 "Rechnerarchitektur mit der Option <option>--host-architecture</option> "
 "angegeben werden."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:204
-msgid "check"
-msgstr "check"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:205
 msgid ""
@@ -3838,11 +3257,6 @@ msgstr ""
 "<literal>check</literal> ist ein Diagnosewerkzeug. Es aktualisiert den "
 "Paketzwischenspeicher und prüft, ob beschädigte Abhängigkeiten vorliegen."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:209
-msgid "download"
-msgstr "download"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:210
 msgid ""
@@ -3871,11 +3285,6 @@ msgstr ""
 "nicht benutzen, werden <literal>apt-get clean</literal> wahrscheinlich von "
 "Zeit zu Zeit ausführen, um Plattenplatz freizugeben."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:225
-msgid "autoclean"
-msgstr "autoclean"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:226
 msgid ""
@@ -3896,11 +3305,6 @@ msgstr ""
 "Installed</literal> wird installierte Pakete vor der Löschung bewahren, wenn "
 "sie auf »off« gesetzt ist."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:235
-msgid "autoremove"
-msgstr "autoremove"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:236
 msgid ""
@@ -3912,20 +3316,26 @@ msgstr ""
 "automatisch installiert wurden, um Abhängigkeiten für andere Pakete zu "
 "erfüllen und die nicht mehr benötigt werden."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:240
-msgid "changelog"
-msgstr "changelog"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:241
+#, fuzzy
+#| msgid ""
+#| "<literal>changelog</literal> downloads a package changelog and displays "
+#| "it through <command>sensible-pager</command>. The server name and base "
+#| "directory is defined in the <literal>APT::Changelogs::Server</literal> "
+#| "variable (e. g. <ulink>http://packages.debian.org/changelogs</ulink> for "
+#| "Debian or <ulink>http://changelogs.ubuntu.com/changelogs</ulink> for "
+#| "Ubuntu).  By default it displays the changelog for the version that is "
+#| "installed.  However, you can specify the same options as for the "
+#| "<option>install</option> command."
 msgid ""
 "<literal>changelog</literal> downloads a package changelog and displays it "
 "through <command>sensible-pager</command>. The server name and base "
 "directory is defined in the <literal>APT::Changelogs::Server</literal> "
-"variable (e. g. <ulink>http://packages.debian.org/changelogs</ulink> for "
-"Debian or <ulink>http://changelogs.ubuntu.com/changelogs</ulink> for "
-"Ubuntu).  By default it displays the changelog for the version that is "
+"variable (e. g. <ulink url=\"http://packages.debian.org/changelogs"
+"\">packages.debian.org/changelogs</ulink> for Debian or <ulink url=\"http://"
+"changelogs.ubuntu.com/changelogs\">changelogs.ubuntu.com/changelogs</ulink> "
+"for Ubuntu).  By default it displays the changelog for the version that is "
 "installed.  However, you can specify the same options as for the "
 "<option>install</option> command."
 msgstr ""
@@ -3938,11 +3348,6 @@ msgstr ""
 "installierte Version. Sie können jedoch die gleichen Optionen wie für den "
 "Befehl <option>install</option> angeben."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:263
-msgid "<option>--no-install-recommends</option>"
-msgstr "<option>--no-install-recommends</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:264
 msgid ""
@@ -3952,11 +3357,6 @@ msgstr ""
 "Empfohlene Pakete nicht als Abhängigkeit für die Installation betrachten. "
 "Konfigurationselement: <literal>APT::Install-Recommends</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:268
-msgid "<option>--install-suggests</option>"
-msgstr "<option>--install-suggests</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:269
 msgid ""
@@ -3966,11 +3366,6 @@ msgstr ""
 "Empfohlene Pakete als Abhängigkeit für die Installation betrachten. "
 "Konfigurationselement: <literal>APT::Install-Suggests</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:273
-msgid "<option>--download-only</option>"
-msgstr "<option>--download-only</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:274
 msgid ""
@@ -3981,11 +3376,6 @@ msgstr ""
 "oder installiert. Konfigurationselement: <literal>APT::Get::Download-Only</"
 "literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:278
-msgid "<option>--fix-broken</option>"
-msgstr "<option>--fix-broken</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:279
 msgid ""
@@ -4015,16 +3405,6 @@ msgstr ""
 "benutzen, könnte das in einigen Situationen zu Fehlern führen. "
 "Konfigurationselement: <literal>APT::Get::Fix-Broken</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:292
-msgid "<option>--ignore-missing</option>"
-msgstr "<option>--ignore-missing</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:293
-msgid "<option>--fix-missing</option>"
-msgstr "<option>--fix-missing</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:294
 msgid ""
@@ -4046,11 +3426,6 @@ msgstr ""
 "zurückgehalten. Konfigurationselement: <literal>APT::Get::Fix-Missing</"
 "literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:304
-msgid "<option>--no-download</option>"
-msgstr "<option>--no-download</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:305
 msgid ""
@@ -4083,16 +3458,6 @@ msgstr ""
 "benutzen, da APT entscheiden könnte, etwas zu tun, das Sie nicht erwarten. "
 "Konfigurationselement: <literal>quiet</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:322
-msgid "<option>--simulate</option>"
-msgstr "<option>--simulate</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:324
-msgid "<option>--dry-run</option>"
-msgstr "<option>--dry-run</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:327
 msgid ""
@@ -4135,21 +3500,6 @@ msgstr ""
 "(Inst). Eckige Klammern zeigen beschädigte Pakete an und ein leeres Paar "
 "eckiger Klammern bedeutet Unterbrechungen, die keine Folgen haben (selten)."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:344
-msgid "<option>-y</option>"
-msgstr "<option>-y</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:344
-msgid "<option>--yes</option>"
-msgstr "<option>--yes</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:345
-msgid "<option>--assume-yes</option>"
-msgstr "<option>--assume-yes</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:346
 msgid ""
@@ -4166,11 +3516,6 @@ msgstr ""
 "<literal>apt-get</literal> abgebrochen. Konfigurationselement: <literal>APT::"
 "Get::Assume-Yes</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:353
-msgid "<option>--assume-no</option>"
-msgstr "<option>--assume-no</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:354
 msgid ""
@@ -4180,16 +3525,6 @@ msgstr ""
 "automatisches »nein« auf alle Anfragen. Konfigurationselement: <literal>APT::"
 "Get::Assume-No</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:358
-msgid "<option>-u</option>"
-msgstr "<option>-u</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:358
-msgid "<option>--show-upgraded</option>"
-msgstr "<option>--show-upgraded</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:359
 msgid ""
@@ -4200,16 +3535,6 @@ msgstr ""
 "Liste aller Pakete aus, von denen ein Upgrade gemacht wurde. "
 "Konfigurationselement: <literal>APT::Get::Show-Upgraded</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:364
-msgid "<option>-V</option>"
-msgstr "<option>-V</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:364
-msgid "<option>--verbose-versions</option>"
-msgstr "<option>--verbose-versions</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:365
 msgid ""
@@ -4220,11 +3545,6 @@ msgstr ""
 "oder die installiert wurden. Konfigurationselement: <literal>APT::Get::Show-"
 "Versions</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:370
-msgid "<option>--host-architecture</option>"
-msgstr "<option>--host-architecture</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:371
 msgid ""
@@ -4242,21 +3562,6 @@ msgstr ""
 "<literal>APT::Architecture</literal>) definiert wird). "
 "Konfigurationselement: <literal>APT::Get::Host-Architecture</literal>"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:379
-msgid "<option>-b</option>"
-msgstr "<option>-b</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:379
-msgid "<option>--compile</option>"
-msgstr "<option>--compile</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:380
-msgid "<option>--build</option>"
-msgstr "<option>--build</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:381
 msgid ""
@@ -4266,11 +3571,6 @@ msgstr ""
 "Kompiliert Quellpakete, nachdem sie heruntergeladen wurden. "
 "Konfigurationselement: <literal>APT::Get::Compile</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:385
-msgid "<option>--ignore-hold</option>"
-msgstr "<option>--ignore-hold</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:386
 msgid ""
@@ -4285,11 +3585,6 @@ msgstr ""
 "Anzahl ungewünschter »Halten« zu überschreiben. Konfigurationselement: "
 "<literal>APT::Ignore-Hold</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:392
-msgid "<option>--no-upgrade</option>"
-msgstr "<option>--no-upgrade</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:393
 msgid ""
@@ -4304,11 +3599,6 @@ msgstr ""
 "installiert sind. Konfigurationselement: <literal>APT::Get::Upgrade</"
 "literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:399
-msgid "<option>--only-upgrade</option>"
-msgstr "<option>--only-upgrade</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:400
 #, fuzzy
@@ -4329,11 +3619,6 @@ msgstr ""
 "installiert sind. Konfigurationselement: <literal>APT::Get::Only-Upgrade</"
 "literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:407
-msgid "<option>--force-yes</option>"
-msgstr "<option>--force-yes</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:408
 msgid ""
@@ -4349,11 +3634,6 @@ msgstr ""
 "<literal>force-yes</literal> zu benutzen, kann möglicherweise ihr System "
 "zerstören! Konfigurationselement: <literal>APT::Get::force-yes</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:415
-msgid "<option>--print-uris</option>"
-msgstr "<option>--print-uris</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:416
 msgid ""
@@ -4376,11 +3656,6 @@ msgstr ""
 "komprimierte Dateien zu dekomprimieren. Konfigurationselement: <literal>APT::"
 "Get::Print-URIs</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:426
-msgid "<option>--purge</option>"
-msgstr "<option>--purge</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:427
 msgid ""
@@ -4394,11 +3669,6 @@ msgstr ""
 "sind. <option>remove --purge</option> entspricht dem Befehl <option>purge</"
 "option>. Konfigurationselement: <literal>APT::Get::Purge</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:434
-msgid "<option>--reinstall</option>"
-msgstr "<option>--reinstall</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:435
 msgid ""
@@ -4408,11 +3678,6 @@ msgstr ""
 "Paket erneut installieren, die bereits installiert und in der neuesten "
 "Version sind. Konfigurationselement: <literal>APT::Get::ReInstall</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:439
-msgid "<option>--list-cleanup</option>"
-msgstr "<option>--list-cleanup</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:440
 msgid ""
@@ -4431,16 +3696,6 @@ msgstr ""
 "Grund zum Ausschalten der Option dar. Konfigurationselement: <literal>APT::"
 "Get::List-Cleanup</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:449
-msgid "<option>--target-release</option>"
-msgstr "<option>--target-release</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:450
-msgid "<option>--default-release</option>"
-msgstr "<option>--default-release</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:451
 msgid ""
@@ -4464,12 +3719,7 @@ msgstr ""
 "sollen. Einige typische Beispiele könnten <option>-t '2.1*'</option>, "
 "<option>-t unstable</option> oder <option>-t sid</option> sein. "
 "Konfigurationselement: <literal>APT::Default-Release</literal>; Lesen Sie "
-"auch die &apt-preferences;-Handbuchseite."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:464
-msgid "<option>--trivial-only</option>"
-msgstr "<option>--trivial-only</option>"
+"auch die &apt-preferences;-Handbuchseite."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:466
@@ -4485,11 +3735,6 @@ msgstr ""
 "option> mit »Nein« antworten wird. Konfigurationselement: <literal>APT::Get::"
 "Trivial-Only</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:472
-msgid "<option>--no-remove</option>"
-msgstr "<option>--no-remove</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:473
 msgid ""
@@ -4499,11 +3744,6 @@ msgstr ""
 "Wenn irgendwelche Pakete entfernt werden sollen, bricht apt-get sofort ohne "
 "Nachfrage ab. Konfigurationselement: <literal>APT::Get::Remove</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:478
-msgid "<option>--auto-remove</option>"
-msgstr "<option>--auto-remove</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:479
 msgid ""
@@ -4518,11 +3758,6 @@ msgstr ""
 "Abhhängigkeitspakete. Konfigurationselement: <literal>APT::Get::"
 "AutomaticRemove</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:485
-msgid "<option>--only-source</option>"
-msgstr "<option>--only-source</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:486
 msgid ""
@@ -4542,21 +3777,6 @@ msgstr ""
 "entsprechenden Quellpaketen zu suchen. Konfigurationselement: <literal>APT::"
 "Get::Only-Source</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:496
-msgid "<option>--diff-only</option>"
-msgstr "<option>--diff-only</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:496
-msgid "<option>--dsc-only</option>"
-msgstr "<option>--dsc-only</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:496
-msgid "<option>--tar-only</option>"
-msgstr "<option>--tar-only</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:497
 msgid ""
@@ -4569,11 +3789,6 @@ msgstr ""
 "<literal>APT::Get::Dsc-Only</literal> und <literal>APT::Get::Tar-Only</"
 "literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:502
-msgid "<option>--arch-only</option>"
-msgstr "<option>--arch-only</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:503
 msgid ""
@@ -4583,11 +3798,6 @@ msgstr ""
 "Nur architekturabhängige Bauabhängigkeiten verarbeiten. "
 "Konfigurationselement: <literal>APT::Get::Arch-Only</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:507
-msgid "<option>--allow-unauthenticated</option>"
-msgstr "<option>--allow-unauthenticated</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:508
 msgid ""
@@ -4675,11 +3885,6 @@ msgstr ""
 msgid "Commands"
 msgstr "Befehle"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:40
-msgid "add &synopsis-param-filename;"
-msgstr "add &synopsis-param-filename;"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml:43
 #, fuzzy
@@ -4697,62 +3902,32 @@ msgstr ""
 "wenn <replaceable>Dateiname</replaceable> <literal>-</literal> ist, von der "
 "Standardeingabe."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:52
-msgid "del &synopsis-param-keyid;"
-msgstr "del &synopsis-param-keyid;"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml:56
 msgid "Remove a key from the list of trusted keys."
 msgstr ""
 "Einen Schlüssel von der Liste der vertrauenswürdigen Schlüssel entfernen."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:63
-msgid "export &synopsis-param-keyid;"
-msgstr "export &synopsis-param-keyid;"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml:67
 msgid "Output the key &synopsis-param-keyid; to standard output."
 msgstr "Den Schlüssel &synopsis-param-keyid; auf der Standardausgabe ausgeben."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:74
-msgid "exportall"
-msgstr "exportall"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml:78
 msgid "Output all trusted keys to standard output."
 msgstr "Alle vertrauenswürdigen Schlüssel auf der Standardausgabe ausgeben."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:85
-msgid "list"
-msgstr "list"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml:89
 msgid "List trusted keys."
 msgstr "Vertrauenswürdige Schlüssel auflisten."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:96
-msgid "finger"
-msgstr "finger"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml:100
 msgid "List fingerprints of trusted keys."
 msgstr "Fingerabdrücke vertrauenswürdiger Schlüssel auflisten."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:107
-msgid "adv"
-msgstr "adv"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml:111
 msgid ""
@@ -4777,11 +3952,6 @@ msgstr ""
 "keyring</literal> Ihrer Distribution mitgeliefert, z.B. dem Paket "
 "<literal>debian-archive-keyring</literal> in Debian."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:133
-msgid "net-update"
-msgstr "net-update"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml:137
 msgid ""
@@ -4809,11 +3979,6 @@ msgstr ""
 "Beachten Sie, dass Optionen vor den im vorherigen Abschnitt beschriebenen "
 "Befehlen definiert sein müssen."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:156
-msgid "--keyring &synopsis-param-filename;"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml:157
 msgid ""
@@ -4921,11 +4086,6 @@ msgstr ""
 "abhängen, werden sie z.B durch <command>apt-get</command> oder "
 "<command>aptitude</command> entfernt."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:51
-msgid "auto"
-msgstr "auto"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml:52
 msgid ""
@@ -4937,11 +4097,6 @@ msgstr ""
 "installiert zu markieren, was veranlasst, dass das Paket entfernt wird, wenn "
 "keine manuell installierten Pakete von ihm abhängen."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:59
-msgid "manual"
-msgstr "manual"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml:60
 msgid ""
@@ -4953,11 +4108,6 @@ msgstr ""
 "zu markieren, was verhindert, dass das Paket automatisch entfernt wird, wenn "
 "kein anderes Paket von ihm abhängt."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:67
-msgid "hold"
-msgstr "hold"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml:68
 msgid ""
@@ -4974,11 +4124,6 @@ msgstr ""
 "daher durch &dpkg; verwaltet und nicht durch die Option <option>--filename</"
 "option>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:77
-msgid "unhold"
-msgstr "unhold"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml:78
 msgid ""
@@ -4988,11 +4133,6 @@ msgstr ""
 "<literal>unhold</literal> wird benutzt, um ein vorher gesetztes »hold« auf "
 "ein Paket aufzuheben, um alle Aktionen wieder zu erlauben."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:83
-msgid "showauto"
-msgstr "showauto"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml:84
 msgid ""
@@ -5007,11 +4147,6 @@ msgstr ""
 "aufgelistet. Falls Pakete angegeben sind, werden nur diejenigen angezeigt, "
 "die automatisch installiert wurden."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:91
-msgid "showmanual"
-msgstr "showmanual"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml:92
 msgid ""
@@ -5023,11 +4158,6 @@ msgstr ""
 "<literal>showauto</literal> benutzt werden, mit der Ausnahme, dass es "
 "stattdessen eine Liste manuell installierter Pakete ausgibt."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:98
-msgid "showhold"
-msgstr "showhold"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml:99
 msgid ""
@@ -5037,29 +4167,27 @@ msgstr ""
 "<literal>showhold</literal> wird benutzt, um eine Liste auf »hold« gesetzter "
 "Pakete auf die gleiche Art wie für andere Anzeigebefehle auszugeben."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:112
-msgid ""
-"<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>"
-msgstr ""
-"<option>-f=<filename><replaceable>DATEINAME</replaceable></filename></option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:113
-msgid ""
-"<option>--file=<filename><replaceable>FILENAME</replaceable></filename></"
-"option>"
-msgstr ""
-"<option>--file=<filename><replaceable>DATEINAME</replaceable></filename></"
-"option>"
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><filename>
+#: apt-mark.8.xml:112 apt-mark.8.xml:113
+#, fuzzy
+#| msgid "xvcg <replaceable>pkg(s)</replaceable>"
+msgid "<replaceable>&synopsis-filename;</replaceable>"
+msgstr "xvcg <replaceable>Paket(e)</replaceable>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:116
-msgid ""
-"Read/Write package stats from <filename><replaceable>FILENAME</replaceable></"
-"filename> instead of the default location, which is "
-"<filename>extended_status</filename> in the directory defined by the "
-"Configuration Item: <literal>Dir::State</literal>."
+#: apt-mark.8.xml:115
+#, fuzzy
+#| msgid ""
+#| "Read/Write package stats from <filename><replaceable>FILENAME</"
+#| "replaceable></filename> instead of the default location, which is "
+#| "<filename>extended_status</filename> in the directory defined by the "
+#| "Configuration Item: <literal>Dir::State</literal>."
+msgid ""
+"Read/Write package stats from the filename given with the parameter "
+"<filename><replaceable>&synopsis-filename;</replaceable></filename> instead "
+"of from the default location, which is <filename>extended_status</filename> "
+"in the directory defined by the Configuration Item: <literal>Dir::State</"
+"literal>."
 msgstr ""
 "Paketstatus von <filename><replaceable>DATEINAME</replaceable></filename> "
 "lesen/schreiben, anstatt vom Standardort, der <filename>extended_status</"
@@ -5435,11 +4563,6 @@ msgstr ""
 "Alle Ausgaben werden an stdout gesendet, die Eingabe muss eine durchsuchbare "
 "Datei sein."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-sortpkgs.1.xml:52
-msgid "<option>--source</option>"
-msgstr "<option>--source</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-sortpkgs.1.xml:54
 msgid ""
@@ -5800,11 +4923,6 @@ msgstr ""
 "Diese Gruppe von Optionen steuert das allgemeine Verhalten von APT, ebenso "
 "wie es die Optionen für alle Werkzeuge enthält."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:151
-msgid "Architecture"
-msgstr "Architecture"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:152
 msgid ""
@@ -5846,11 +4964,6 @@ msgstr ""
 "durch Aufruf von <command>dpkg --print-foreign-architectures</command> "
 "abgefragt werden können."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:167
-msgid "Default-Release"
-msgstr "Default-Release"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:168
 msgid ""
@@ -5864,11 +4977,6 @@ msgstr ""
 "Beispiele: »stable«, »testing, »unstable«, »&stable-codename;«, »&testing-"
 "codename;«, »4.0«, »5.0*«. Siehe auch &apt-preferences;."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:173
-msgid "Ignore-Hold"
-msgstr "Ignore-Hold"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:174
 msgid ""
@@ -5878,11 +4986,6 @@ msgstr ""
 "Halten von Paketen ignorieren; Diese globale Option veranlasst den "
 "Problemlöser, gehaltene Pakete beim Treffen von Entscheidungen zu ignorieren."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:178
-msgid "Clean-Installed"
-msgstr "Clean-Installed"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:179
 msgid ""
@@ -5898,11 +5001,6 @@ msgstr ""
 "vom Bereinigen ausgeschlossen – beachten Sie jedoch, dass APT keine direkten "
 "Möglichkeiten bereitstellt, um sie erneut zu installieren."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:185
-msgid "Immediate-Configure"
-msgstr "Immediate-Configure"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:186
 msgid ""
@@ -5971,11 +5069,6 @@ msgstr ""
 "nachstehendem Fehlerverweis, so dass es am Verbessern oder Korrigieren des "
 "Upgrade-Prozesses arbeiten kann."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:208
-msgid "Force-LoopBreak"
-msgstr "Force-LoopBreak"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:209
 msgid ""
@@ -5994,11 +5087,6 @@ msgstr ""
 "funktionieren, wenn die essentiellen Pakete nicht tar, gzip, libc, dpkg, "
 "bash oder etwas, was davon abhängt, sind."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:217
-msgid "Cache-Start, Cache-Grow and Cache-Limit"
-msgstr "Cache-Start, Cache-Grow und Cache-Limit"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:218
 #, fuzzy
@@ -6054,11 +5142,6 @@ msgstr ""
 "was bedeutet, dass es kein Limit gibt. Falls <literal>Cache-Grow</literal> "
 "auf 0 gesetzt ist, kann der Zwischenspeicher nicht automatisch wachsen."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:233
-msgid "Build-Essential"
-msgstr "Build-Essential"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:234
 msgid "Defines which package(s) are considered essential build dependencies."
@@ -6066,11 +5149,6 @@ msgstr ""
 "Definiert, welche(s) Paket(e) als essentielle Bauabhängigkeiten betrachtet "
 "werde."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:237
-msgid "Get"
-msgstr "Get"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:238
 msgid ""
@@ -6081,11 +5159,6 @@ msgstr ""
 "dessen Dokumentation, um weitere Informationen über die Optionen hier zu "
 "erhalten."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:242
-msgid "Cache"
-msgstr "Cache"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:243
 msgid ""
@@ -6096,11 +5169,6 @@ msgstr ""
 "dessen Dokumentation, um weitere Informationen über die Optionen hier zu "
 "erhalten."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:247
-msgid "CDROM"
-msgstr "CD-ROM"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:248
 msgid ""
@@ -6116,11 +5184,6 @@ msgstr ""
 msgid "The Acquire Group"
 msgstr "Die Erwerbgruppe"
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:259
-msgid "Check-Valid-Until"
-msgstr "Check-Valid-Until"
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:260
 msgid ""
@@ -6141,11 +5204,6 @@ msgstr ""
 "literal> zu erstellen. Falls sie das nicht tun oder ein strengerer Wert "
 "gewollt ist, kann die Option <literal>Max-ValidTime</literal> benutzt werden."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:270
-msgid "Max-ValidTime"
-msgstr "Max-ValidTime"
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:271
 #, fuzzy
@@ -6173,11 +5231,6 @@ msgstr ""
 "Einstellungen können durch Anhängen des Archivetiketts an den Optionsnamen "
 "vorgenommen werden."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:281
-msgid "Min-ValidTime"
-msgstr "Min-ValidTime"
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:282
 msgid ""
@@ -6197,11 +5250,6 @@ msgstr ""
 "Einstellungen können und sollten durch Anhängen des Archivetiketts an die "
 "Option »name« vorgenommen werden."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:292
-msgid "PDiffs"
-msgstr "PDiffs"
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:293
 msgid ""
@@ -6238,11 +5286,6 @@ msgstr ""
 "dieser Begrenzungen überschritten wird, wird die komplette Datei anstelle "
 "der Patche heruntergeladen."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:305
-msgid "Queue-Mode"
-msgstr "Queue-Mode"
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:306
 msgid ""
@@ -6259,11 +5302,6 @@ msgstr ""
 "geöffnet wird, <literal>access</literal> bedeutet, dass eine Verbindung pro "
 "URI-Art geöffnet wird."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:313
-msgid "Retries"
-msgstr "Retries"
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:314
 msgid ""
@@ -6273,11 +5311,6 @@ msgstr ""
 "Anzahl der auszuführenden erneuten Versuche. Wenn dies nicht Null ist, wird "
 "APT fehlgeschlagene Dateien in der angegebenen Zahl erneut versuchen."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:318
-msgid "Source-Symlinks"
-msgstr "Source-Symlinks"
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:319
 msgid ""
@@ -6288,11 +5321,6 @@ msgstr ""
 "ist, werden Quellarchive, wenn möglich, symbolisch verknüpft, anstatt "
 "kopiert zu werden. True ist die Vorgabe."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:323 sources.list.5.xml:160
-msgid "http"
-msgstr "http"
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:324
 msgid ""
@@ -6395,11 +5423,6 @@ msgstr ""
 "einige Proxys den Clients nur dann Zugriff gewähren, wenn der Client einen "
 "bekannten Bezeichner verwendet."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:366
-msgid "https"
-msgstr "https"
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:367
 msgid ""
@@ -6454,11 +5477,6 @@ msgstr ""
 "Zeichenketten »TLSv1« oder »SSLv3« enthalten. <literal>&lt;host&gt;::"
 "SslForceVersion</literal> ist die entsprechende per-Host-Option."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:391 sources.list.5.xml:171
-msgid "ftp"
-msgstr "ftp"
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:392
 msgid ""
@@ -6541,11 +5559,6 @@ msgstr ""
 "Benutzung selbst auf IPv4-Verbindungen. Beachten Sie, dass die wenigsten FTP-"
 "Server RFC2428 unterstützen."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:430 sources.list.5.xml:153
-msgid "cdrom"
-msgstr "cdrom"
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
 #: apt.conf.5.xml:436
 #, no-wrap
@@ -6574,11 +5587,6 @@ msgstr ""
 "einzufügen. Der abschließende Schrägstrich ist wichtig. Aushängebefehle "
 "können per UMount angegeben werden."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:441
-msgid "gpgv"
-msgstr "gpgv"
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:442
 msgid ""
@@ -6590,11 +5598,6 @@ msgstr ""
 "Parameter an gpgv weiterzuleiten. <literal>gpgv::Options</literal> "
 "Zusätzliche Parameter werden an gpgv weitergeleitet."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:447
-msgid "CompressionTypes"
-msgstr "CompressionTypes"
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
 #: apt.conf.5.xml:453
 #, no-wrap
@@ -6708,11 +5711,6 @@ msgstr ""
 "die meisten Archive keine unkomprimierten Dateien bereitstellen, so dass "
 "dies meist nur für lokale Spiegel benutzt werden kann."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:475
-msgid "GzipIndexes"
-msgstr "GzipIndexes"
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:477
 msgid ""
@@ -6727,11 +5725,6 @@ msgstr ""
 "CPU-Ressourcen bei der Erstellung des lokalen Paket-Caches. Vorgabe ist "
 "False."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:484
-msgid "Languages"
-msgstr "Sprachen"
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:485
 msgid ""
@@ -6977,11 +5970,6 @@ msgstr ""
 "Konfigurationsdirektiven das Standardverhalten. Diese stehen im Abschnitt "
 "<literal>DSelect</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:577
-msgid "Clean"
-msgstr "Clean"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:578
 msgid ""
@@ -7009,11 +5997,6 @@ msgstr ""
 "Die Inhalte dieser Variablen werden als Befehlszeilenoptionen an &apt-get; "
 "übermittelt, wenn es für die Installationsphase durchlaufen wird."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:591
-msgid "Updateoptions"
-msgstr "Updateoptions"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:592
 msgid ""
@@ -7023,11 +6006,6 @@ msgstr ""
 "Die Inhalte dieser Variable werden als Befehlszeilenoptionen an &apt-get; "
 "übermittelt, wenn es für die Aktualisierungsphase durchlaufen wird."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:596
-msgid "PromptAfterUpdate"
-msgstr "PromptAfterUpdate"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:597
 msgid ""
@@ -7062,16 +6040,6 @@ msgstr ""
 "Optionen müssen unter Benutzung der Listenschreibweise angegeben werden und "
 "jedes Listenelement wird als einzelnes Argument an &dpkg; übermittelt."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:614
-msgid "Pre-Invoke"
-msgstr "Pre-Invoke"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:614
-msgid "Post-Invoke"
-msgstr "Post-Invoke"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:615
 msgid ""
@@ -7086,11 +6054,6 @@ msgstr ""
 "mit <filename>/bin/sh</filename> aufgerufen, sollte einer fehlschlagen, wird "
 "APT abgebrochen."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:621
-msgid "Pre-Install-Pkgs"
-msgstr "Pre-Install-Pkgs"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:622
 msgid ""
@@ -7124,11 +6087,6 @@ msgstr ""
 "<literal>cmd</literal> ist ein Befehl, der an <literal>Pre-Install-Pkgs</"
 "literal> gegeben wird."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:635
-msgid "Run-Directory"
-msgstr "Run-Directory"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:636
 msgid ""
@@ -7138,11 +6096,6 @@ msgstr ""
 "APT wechselt mit chdir in dieses Verzeichnis, bevor Dpkg aufgerufen wird, "
 "die Vorgabe ist <filename>/</filename>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:640
-msgid "Build-options"
-msgstr "Build-options"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:641
 msgid ""
@@ -7224,11 +6177,6 @@ msgstr ""
 "Sie z.B. <command>dpkg --audit</command>. Eine defensive Optionenkombination "
 "wäre <placeholder type=\"literallayout\" id=\"0\"/>"
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:668
-msgid "DPkg::NoTriggers"
-msgstr "DPkg::NoTriggers"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:669
 msgid ""
@@ -7250,11 +6198,6 @@ msgstr ""
 "an die Konfigurationsaufrufe für Dpkg an – nun wird APT diese Markierung "
 "außerdem an die »unpack«- und »remove«-Aufrufe anhängen."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:676
-msgid "PackageManager::Configure"
-msgstr "PackageManager::Configure"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:677
 msgid ""
@@ -7284,11 +6227,6 @@ msgstr ""
 "anderenfalls in einem nicht konfigurierten Status enden könnte, der nicht "
 "mehr startbar sein könnte."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:687
-msgid "DPkg::ConfigurePending"
-msgstr "DPkg::ConfigurePending"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:688
 msgid ""
@@ -7308,11 +6246,6 @@ msgstr ""
 "könnten Sie diese Option außer in allen außer der letzten Ausführung "
 "deaktivieren."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:694
-msgid "DPkg::TriggersPending"
-msgstr "DPkg::TriggersPending"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:695
 msgid ""
@@ -7329,11 +6262,6 @@ msgstr ""
 "Trigger ausführt, nicht nur die Trigger, die zum Konfigurieren dieses Pakets "
 "benötigt werden."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:700
-msgid "PackageManager::UnpackAll"
-msgstr "PackageManager::UnpackAll"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:701
 msgid ""
@@ -7353,11 +6281,6 @@ msgstr ""
 "literal>-Methode nicht benutzt, so dass diese Methode sehr experimentell ist "
 "und weitere Verbesserungen benötigt, bevor sie wirklich nützlich wird."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:708
-msgid "OrderList::Score::Immediate"
-msgstr "OrderList::Score::Immediate"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
 #: apt.conf.5.xml:716
 #, no-wrap
@@ -7490,11 +6413,6 @@ msgstr ""
 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><term>
-#: apt.conf.5.xml:791
-msgid "<literal>Debug::Acquire::cdrom</literal>"
-msgstr "<literal>Debug::Acquire::cdrom</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:795
 msgid ""
@@ -7503,11 +6421,6 @@ msgstr ""
 "Gibt Informationen aus, die sich auf Zugriffe von <literal>cdrom://</"
 "literal>-Quellen beziehen."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:802
-msgid "<literal>Debug::Acquire::ftp</literal>"
-msgstr "<literal>Debug::Acquire::ftp</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:806
 msgid "Print information related to downloading packages using FTP."
@@ -7515,11 +6428,6 @@ msgstr ""
 "Gibt Informationen aus, die sich auf das Herunterladen von Paketen per FTP "
 "beziehen."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:813
-msgid "<literal>Debug::Acquire::http</literal>"
-msgstr "<literal>Debug::Acquire::http</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:817
 msgid "Print information related to downloading packages using HTTP."
@@ -7527,11 +6435,6 @@ msgstr ""
 "Gibt Informationen aus, die sich auf das Herunterladen von Paketen per HTTP "
 "beziehen."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:824
-msgid "<literal>Debug::Acquire::https</literal>"
-msgstr "<literal>Debug::Acquire::https</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:828
 msgid "Print information related to downloading packages using HTTPS."
@@ -7539,11 +6442,6 @@ msgstr ""
 "Gibt Informationen aus, die sich auf das Herunterladen von Paketen per HTTPS "
 "beziehen."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:835
-msgid "<literal>Debug::Acquire::gpgv</literal>"
-msgstr "<literal>Debug::Acquire::gpgv</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:839
 msgid ""
@@ -7553,11 +6451,6 @@ msgstr ""
 "Gibt Informationen aus, die sich auf das Prüfen kryptografischer Signaturen "
 "mittels <literal>gpg</literal> beziehen."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:846
-msgid "<literal>Debug::aptcdrom</literal>"
-msgstr "<literal>Debug::aptcdrom</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:850
 msgid ""
@@ -7567,22 +6460,12 @@ msgstr ""
 "Informationen über den Zugriffsprozess auf Paketsammlungen ausgeben, die auf "
 "CD-ROMs gespeichert sind."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:857
-msgid "<literal>Debug::BuildDeps</literal>"
-msgstr "<literal>Debug::BuildDeps</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:860
 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><term>
-#: apt.conf.5.xml:867
-msgid "<literal>Debug::Hashes</literal>"
-msgstr "<literal>Debug::Hashes</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:870
 msgid ""
@@ -7592,11 +6475,6 @@ msgstr ""
 "Jeden kryptografischen Hash ausgeben, der von den <literal>apt</literal>-"
 "Bibliotheken generiert wurde."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:877
-msgid "<literal>Debug::IdentCDROM</literal>"
-msgstr "<literal>Debug::IdentCDROM</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:880
 msgid ""
@@ -7608,11 +6486,6 @@ msgstr ""
 "Anzahl der benutzten und freien Blöcke auf dem CD-ROM-Dateisystem, wenn eine "
 "ID für eine CD-ROM generiert wird."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:888
-msgid "<literal>Debug::NoLocking</literal>"
-msgstr "<literal>Debug::NoLocking</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:891
 msgid ""
@@ -7623,11 +6496,6 @@ msgstr ""
 "dass zwei Instanzen von <quote><literal>apt-get update</literal></quote> zur "
 "gleichen Zeit laufen."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:899
-msgid "<literal>Debug::pkgAcquire</literal>"
-msgstr "<literal>Debug::pkgAcquire</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:903
 msgid "Log when items are added to or removed from the global download queue."
@@ -7635,11 +6503,6 @@ msgstr ""
 "Protokollieren, wenn Elemente aus der globalen Warteschlange zum "
 "Herunterladen hinzugefügt oder entfernt werden."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:910
-msgid "<literal>Debug::pkgAcquire::Auth</literal>"
-msgstr "<literal>Debug::pkgAcquire::Auth</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:913
 msgid ""
@@ -7649,11 +6512,6 @@ msgstr ""
 "Statusmeldungen und Fehler ausgeben, die sich auf das Prüfen von Prüfsummen "
 "und kryptografischen Signaturen von heruntergeladenen Dateien beziehen."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:920
-msgid "<literal>Debug::pkgAcquire::Diffs</literal>"
-msgstr "<literal>Debug::pkgAcquire::Diffs</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:923
 msgid ""
@@ -7663,11 +6521,6 @@ msgstr ""
 "Informationen über das Herunterladen und Anwenden von Paketindexlisten-Diffs "
 "und Fehler, die die Paketindexlisten-Diffs betreffen, ausgeben."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:931
-msgid "<literal>Debug::pkgAcquire::RRed</literal>"
-msgstr "<literal>Debug::pkgAcquire::RRed</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:935
 msgid ""
@@ -7678,11 +6531,6 @@ msgstr ""
 "beziehen, wenn Index-Diffs anstelle vollständiger Indizes heruntergeladen "
 "werden."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:942
-msgid "<literal>Debug::pkgAcquire::Worker</literal>"
-msgstr "<literal>Debug::pkgAcquire::Worker</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:946
 msgid ""
@@ -7691,11 +6539,6 @@ msgstr ""
 "Alle Interaktionen mit Unterprozessen protokollieren, die aktuell Downloads "
 "durchführen."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:953
-msgid "<literal>Debug::pkgAutoRemove</literal>"
-msgstr "<literal>Debug::pkgAutoRemove</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:957
 msgid ""
@@ -7706,11 +6549,6 @@ msgstr ""
 "Status von Paketen und auf das Entfernen von nicht benutzten Paketen "
 "beziehen."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:964
-msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>"
-msgstr "<literal>Debug::pkgDepCache::AutoInstall</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:967
 msgid ""
@@ -7727,11 +6565,6 @@ msgstr ""
 "Abhängigkeitsauflöser. Lesen Sie dafür <literal>Debug::pkgProblemResolver</"
 "literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:978
-msgid "<literal>Debug::pkgDepCache::Marker</literal>"
-msgstr "<literal>Debug::pkgDepCache::Marker</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:981
 msgid ""
@@ -7764,22 +6597,12 @@ msgstr ""
 "<literal>section</literal> ist der Name des Abschnitts, in dem das Paket "
 "erscheint."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1000
-msgid "<literal>Debug::pkgInitConfig</literal>"
-msgstr "<literal>Debug::pkgInitConfig</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:1003
 msgid "Dump the default configuration to standard error on startup."
 msgstr ""
 "Die Vorgabekonfiguration beim Start auf der Standardfehlerausgabe ausgeben."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1010
-msgid "<literal>Debug::pkgDPkgPM</literal>"
-msgstr "<literal>Debug::pkgDPkgPM</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:1013
 msgid ""
@@ -7790,11 +6613,6 @@ msgstr ""
 "aufgerufen wurde, mit Argumenten, die durch einzelne Leerzeichen getrennt "
 "sind."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1021
-msgid "<literal>Debug::pkgDPkgProgressReporting</literal>"
-msgstr "<literal>Debug::pkgDPkgProgressReporting</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:1024
 msgid ""
@@ -7804,11 +6622,6 @@ msgstr ""
 "Alle von &dpkg; empfangenen Daten über einen Status-Datei-Deskriptor und "
 "alle während deren Auswertung gefundenen Fehler ausgeben."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1031
-msgid "<literal>Debug::pkgOrderList</literal>"
-msgstr "<literal>Debug::pkgOrderList</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:1035
 msgid ""
@@ -7819,11 +6632,6 @@ msgstr ""
 "entscheidet, in der <literal>apt</literal> Pakete an &dpkg; weiterleiten "
 "soll."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1043
-msgid "<literal>Debug::pkgPackageManager</literal>"
-msgstr "<literal>Debug::pkgPackageManager</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:1047
 msgid ""
@@ -7832,21 +6640,11 @@ msgstr ""
 "Statusmeldungen ausgeben, die die Schritte nachverfolgen, die beim Aufruf "
 "von &dpkg; ausgeführt werden."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1054
-msgid "<literal>Debug::pkgPolicy</literal>"
-msgstr "<literal>Debug::pkgPolicy</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:1058
 msgid "Output the priority of each package list on startup."
 msgstr "Die Priorität jeder Paketliste beim Start ausgeben."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1064
-msgid "<literal>Debug::pkgProblemResolver</literal>"
-msgstr "<literal>Debug::pkgProblemResolver</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:1068
 msgid ""
@@ -7857,11 +6655,6 @@ msgstr ""
 "das angewandt, was geschieht, wenn ein komplexes Abhängigkeitsproblem "
 "aufgetreten ist)."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1076
-msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>"
-msgstr "<literal>Debug::pkgProblemResolver::ShowScores</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:1079
 msgid ""
@@ -7874,11 +6667,6 @@ msgstr ""
 "ist die gleiche, wie in <literal>Debug::pkgDepCache::Marker</literal> "
 "beschrieben."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1087
-msgid "<literal>Debug::sourceList</literal>"
-msgstr "<literal>Debug::sourceList</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:1091
 msgid ""
@@ -8513,28 +7301,29 @@ msgstr ""
 "Pin: release n=karmic*\n"
 "Pin-Priority: 990\n"
 
-#. type: Content of: <refentry><refsect1><refsect2><literal>
-#: apt_preferences.5.xml:290
-msgid "Package"
-msgstr "Package"
-
-#. type: Content of: <refentry><refsect1><refsect2><literal>
-#: apt_preferences.5.xml:296
-msgid "*"
-msgstr "*"
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt_preferences.5.xml:291
+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 "
+"of all package names it matches. It is undecided whether this will change in "
+"the future, thus you should always list wild-card pins first, so later "
+"specific pins override it.  The pattern \"<literal>*</literal>\" in a "
+"Package field is not considered a glob() expression in itself."
+msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:306
+#: apt_preferences.5.xml:307
 msgid "How APT Interprets Priorities"
 msgstr "Wie APT Prioritäten interpretiert"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:314
+#: apt_preferences.5.xml:315
 msgid "P &gt; 1000"
 msgstr "P &gt; 1000"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:315
+#: apt_preferences.5.xml:316
 msgid ""
 "causes a version to be installed even if this constitutes a downgrade of the "
 "package"
@@ -8543,12 +7332,12 @@ msgstr ""
 "des Pakets durchführt"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:319
+#: apt_preferences.5.xml:320
 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:320
+#: apt_preferences.5.xml:321
 msgid ""
 "causes a version to be installed even if it does not come from the target "
 "release, unless the installed version is more recent"
@@ -8557,12 +7346,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:325
+#: apt_preferences.5.xml:326
 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:326
+#: apt_preferences.5.xml:327
 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"
@@ -8572,12 +7361,12 @@ msgstr ""
 "neuer ist"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:331
+#: apt_preferences.5.xml:332
 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:332
+#: apt_preferences.5.xml:333
 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"
@@ -8587,12 +7376,12 @@ msgstr ""
 "installierte Version neuer ist"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:337
+#: apt_preferences.5.xml:338
 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:338
+#: apt_preferences.5.xml:339
 msgid ""
 "causes a version to be installed only if there is no installed version of "
 "the package"
@@ -8601,17 +7390,17 @@ msgstr ""
 "installierte Version des Pakets gibt"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:342
+#: apt_preferences.5.xml:343
 msgid "P &lt; 0"
 msgstr "P &lt; 0"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:343
+#: apt_preferences.5.xml:344
 msgid "prevents the version from being installed"
 msgstr "verhindert das Installieren der Version"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:309
+#: apt_preferences.5.xml:310
 msgid ""
 "Priorities (P) assigned in the APT preferences file must be positive or "
 "negative integers.  They are interpreted as follows (roughly speaking): "
@@ -8622,7 +7411,7 @@ msgstr ""
 "(grob gesagt): <placeholder type=\"variablelist\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:348
+#: apt_preferences.5.xml:349
 msgid ""
 "If any specific-form records match an available package version then the "
 "first such record determines the priority of the package version.  Failing "
@@ -8636,7 +7425,7 @@ msgstr ""
 "erste dieser Datensätze die Priorität der Paketversion fest."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:354
+#: apt_preferences.5.xml:355
 msgid ""
 "For example, suppose the APT preferences file contains the three records "
 "presented earlier:"
@@ -8645,7 +7434,7 @@ msgstr ""
 "bereits gezeigten Datensätze:"
 
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:358
+#: apt_preferences.5.xml:359
 #, no-wrap
 msgid ""
 "Package: perl\n"
@@ -8673,12 +7462,12 @@ msgstr ""
 "Pin-Priority: 50\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:371
+#: apt_preferences.5.xml:372
 msgid "Then:"
 msgstr "Dann:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:373
+#: apt_preferences.5.xml:374
 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 "
@@ -8693,7 +7482,7 @@ msgstr ""
 "dann wird von <literal>perl</literal> ein Downgrade durchgeführt."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:378
+#: apt_preferences.5.xml:379
 msgid ""
 "A version of any package other than <literal>perl</literal> that is "
 "available from the local system has priority over other versions, even "
@@ -8704,7 +7493,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:382
+#: apt_preferences.5.xml:383
 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</"
@@ -8718,12 +7507,12 @@ msgstr ""
 "Pakets installiert ist."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:392
+#: apt_preferences.5.xml:393
 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:394
+#: apt_preferences.5.xml:395
 msgid ""
 "The locations listed in the &sources-list; file should provide "
 "<filename>Packages</filename> and <filename>Release</filename> files to "
@@ -8734,27 +7523,27 @@ msgstr ""
 "bereitstellen, um die an diesem Ort verfügbaren Pakete zu beschreiben."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:406
+#: apt_preferences.5.xml:407
 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:407
+#: apt_preferences.5.xml:408
 msgid "gives the package name"
 msgstr "gibt den Paketnamen an"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:410 apt_preferences.5.xml:460
+#: apt_preferences.5.xml:411 apt_preferences.5.xml:461
 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:411
+#: apt_preferences.5.xml:412
 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:398
+#: apt_preferences.5.xml:399
 msgid ""
 "The <filename>Packages</filename> file is normally found in the directory "
 "<filename>.../dists/<replaceable>dist-name</replaceable>/"
@@ -8775,12 +7564,12 @@ msgstr ""
 "<placeholder type=\"variablelist\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:427
+#: apt_preferences.5.xml:428
 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:428
+#: apt_preferences.5.xml:429
 msgid ""
 "names the archive to which all the packages in the directory tree belong.  "
 "For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@ -8797,18 +7586,18 @@ msgstr ""
 "die folgende Zeile benötigen:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:438
+#: apt_preferences.5.xml:439
 #, 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:444
+#: apt_preferences.5.xml:445
 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:445
+#: apt_preferences.5.xml:446
 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 "
@@ -8825,13 +7614,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:454
+#: apt_preferences.5.xml:455
 #, 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:461
+#: apt_preferences.5.xml:462
 msgid ""
 "names the release version.  For example, the packages in the tree might "
 "belong to Debian GNU/Linux release version 3.0.  Note that there is normally "
@@ -8847,7 +7636,7 @@ msgstr ""
 "eine der folgenden Zeilen benötigen:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:470
+#: apt_preferences.5.xml:471
 #, no-wrap
 msgid ""
 "Pin: release v=3.0\n"
@@ -8859,12 +7648,12 @@ msgstr ""
 "Pin: release 3.0\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:479
+#: apt_preferences.5.xml:480
 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:480
+#: apt_preferences.5.xml:481
 msgid ""
 "names the licensing component associated with the packages in the directory "
 "tree of the <filename>Release</filename> file.  For example, the line "
@@ -8882,18 +7671,18 @@ msgstr ""
 "Zeilen benötigen:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:489
+#: apt_preferences.5.xml:490
 #, 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:495
+#: apt_preferences.5.xml:496
 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:496
+#: apt_preferences.5.xml:497
 msgid ""
 "names the originator of the packages in the directory tree of the "
 "<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"
@@ -8905,18 +7694,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:502
+#: apt_preferences.5.xml:503
 #, 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:508
+#: apt_preferences.5.xml:509
 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:509
+#: apt_preferences.5.xml:510
 msgid ""
 "names the label of the packages in the directory tree of the "
 "<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"
@@ -8929,13 +7718,13 @@ msgstr ""
 "die folgende Zeile benötigen:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:515
+#: apt_preferences.5.xml:516
 #, 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:416
+#: apt_preferences.5.xml:417
 msgid ""
 "The <filename>Release</filename> file is normally found in the directory "
 "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
@@ -8958,7 +7747,7 @@ msgstr ""
 "APT-Prioritäten relevant: <placeholder type=\"variablelist\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:522
+#: apt_preferences.5.xml:523
 msgid ""
 "All of the <filename>Packages</filename> and <filename>Release</filename> "
 "files retrieved from locations listed in the &sources-list; file are stored "
@@ -8984,12 +7773,12 @@ msgstr ""
 "Distribution heruntergeladen wurde."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:535
+#: apt_preferences.5.xml:536
 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:537
+#: apt_preferences.5.xml:538
 msgid ""
 "Each record in the APT preferences file can optionally begin with one or "
 "more lines beginning with the word <literal>Explanation:</literal>.  This "
@@ -9000,12 +7789,12 @@ msgstr ""
 "anfangen. Dieses stellt einen Platz für Kommentare bereit."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:546
+#: apt_preferences.5.xml:547
 msgid "Tracking Stable"
 msgstr "Stable verfolgen"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:554
+#: apt_preferences.5.xml:555
 #, no-wrap
 msgid ""
 "Explanation: Uninstall or do not install any Debian-originated\n"
@@ -9029,7 +7818,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:548
+#: apt_preferences.5.xml:549
 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 "
@@ -9044,8 +7833,8 @@ msgstr ""
 "Distributionen gehören. <placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:571 apt_preferences.5.xml:617
-#: apt_preferences.5.xml:675
+#: apt_preferences.5.xml:572 apt_preferences.5.xml:618
+#: apt_preferences.5.xml:676
 #, no-wrap
 msgid ""
 "apt-get install <replaceable>package-name</replaceable>\n"
@@ -9057,7 +7846,7 @@ msgstr ""
 "apt-get dist-upgrade\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:566
+#: apt_preferences.5.xml:567
 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 "
@@ -9070,13 +7859,13 @@ msgstr ""
 "\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:583
+#: apt_preferences.5.xml:584
 #, 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:577
+#: apt_preferences.5.xml:578
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>testing</literal> distribution; the package "
@@ -9090,12 +7879,12 @@ msgstr ""
 "\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:589
+#: apt_preferences.5.xml:590
 msgid "Tracking Testing or Unstable"
 msgstr "Testing oder Unstable verfolgen"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:598
+#: apt_preferences.5.xml:599
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -9123,7 +7912,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:591
+#: apt_preferences.5.xml:592
 msgid ""
 "The following APT preferences file will cause APT to assign a high priority "
 "to package versions from the <literal>testing</literal> distribution, a "
@@ -9140,7 +7929,7 @@ msgstr ""
 "\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:612
+#: apt_preferences.5.xml:613
 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 "
@@ -9153,13 +7942,13 @@ msgstr ""
 "\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:632
+#: apt_preferences.5.xml:633
 #, 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:623
+#: apt_preferences.5.xml:624
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>unstable</literal> distribution.  "
@@ -9179,12 +7968,12 @@ msgstr ""
 "\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:639
+#: apt_preferences.5.xml:640
 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:653
+#: apt_preferences.5.xml:654
 #, no-wrap
 msgid ""
 "Explanation: Uninstall or do not install any Debian-originated package versions\n"
@@ -9219,7 +8008,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:641
+#: apt_preferences.5.xml:642
 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 "
@@ -9245,7 +8034,7 @@ msgstr ""
 "benutzen. <placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:670
+#: apt_preferences.5.xml:671
 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 "
@@ -9258,13 +8047,13 @@ msgstr ""
 "literal> durchzuführen. <placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:690
+#: apt_preferences.5.xml:691
 #, 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:681
+#: apt_preferences.5.xml:682
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>sid</literal> distribution.  Thereafter, "
@@ -9284,12 +8073,12 @@ msgstr ""
 "\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt_preferences.5.xml:699
+#: apt_preferences.5.xml:700
 msgid "&file-preferences;"
 msgstr "&file-preferences;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:705
+#: apt_preferences.5.xml:706
 msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 
@@ -9582,6 +8371,11 @@ msgstr ""
 "Archiv betrachtet zu werden. Dies ist nützlich für eingehängtes NFS und "
 "lokale Spiegel oder Archive."
 
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+#: sources.list.5.xml:153
+msgid "cdrom"
+msgstr "cdrom"
+
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml:155
 msgid ""
@@ -9592,6 +8386,11 @@ msgstr ""
 "zu benutzen. Benutzen Sie das Programm &apt-cdrom;, um CD-ROM-Einträge in "
 "der Quellenliste zu erstellen."
 
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+#: sources.list.5.xml:160
+msgid "http"
+msgstr "http"
+
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml:162
 msgid ""
@@ -9609,6 +8408,11 @@ msgstr ""
 "Zeichenkette mit dem Format http://Anwender:Passwort@Server:Port/ benutzt. "
 "Beachten Sie, dass dies eine unsichere Authentifizierungsmethode ist."
 
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+#: sources.list.5.xml:171
+msgid "ftp"
+msgstr "ftp"
+
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml:173
 msgid ""
@@ -10089,6 +8893,11 @@ msgstr ""
 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
+msgid "upgrade"
+msgstr "upgrade"
+
 #. type: <p></p>
 #: guide.sgml:131
 msgid ""
@@ -10111,6 +8920,11 @@ msgstr ""
 "tt> können benutzt werden, um die Installation von diesen Paketen zu "
 "erzwingen."
 
+#. type: <tag></tag>
+#: guide.sgml:131
+msgid "install"
+msgstr "install"
+
 #. type: <p></p>
 #: guide.sgml:140
 msgid ""
@@ -10131,6 +8945,11 @@ 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
+msgid "dist-upgrade"
+msgstr "dist-upgrade"
+
 #. type: <p></p>
 #: guide.sgml:149
 msgid ""
diff --git a/doc/po/es.po b/doc/po/es.po
index c4a6b44a4..75d260e7e 100644
--- a/doc/po/es.po
+++ b/doc/po/es.po
@@ -36,7 +36,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.7.25\n"
-"POT-Creation-Date: 2012-05-20 18:22+0300\n"
+"POT-Creation-Date: 2012-05-21 04:13+0300\n"
 "PO-Revision-Date: 2010-08-25 03:25+0200\n"
 "Last-Translator: Omar Campagne <ocampagne@gmail.com>\n"
 "Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -898,11 +898,6 @@ msgstr ""
 "A menos que se use la opción <option>-h</option> o <option>--help</option>, "
 "una de las siguientes órdenes debe estar presente."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:48
-msgid "gencaches"
-msgstr "gencaches"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:49
 msgid ""
@@ -910,12 +905,12 @@ msgid ""
 "implicitly by all commands needing this cache if it is missing or outdated."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:53
-#, fuzzy
-#| msgid "showpkg <replaceable>pkg(s)</replaceable>"
-msgid "showpkg <replaceable>&synopsis-pkg;</replaceable>…"
-msgstr "showpkg <replaceable>paquete(s)</replaceable>"
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
+#: apt-cache.8.xml:53 apt-cache.8.xml:142 apt-cache.8.xml:163
+#: 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
+msgid "&synopsis-pkg;"
+msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:54
@@ -986,11 +981,6 @@ msgstr ""
 "altdev no tienen que estarlo. Para el significado específico del resto de la "
 "salida lo mejor es consultar el código fuente de apt."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:87
-msgid "stats"
-msgstr "stats"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:87
 msgid ""
@@ -1107,13 +1097,6 @@ msgstr ""
 "<literal>Total de dependencias</literal> es el número total de relaciones de "
 "dependencia de todos los paquetes de la caché."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:142
-#, fuzzy
-#| msgid "showsrc <replaceable>pkg(s)</replaceable>"
-msgid "showsrc <replaceable>&synopsis-pkg;</replaceable>…"
-msgstr "showsrc <replaceable>paquete(s)</replaceable>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:143
 msgid ""
@@ -1126,11 +1109,6 @@ msgstr ""
 "todas las versiones, así como todos los campos cuyo nombre manifiesta que "
 "son binarios."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:148 apt-config.8.xml:75
-msgid "dump"
-msgstr "dump"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:149
 msgid ""
@@ -1140,11 +1118,6 @@ msgstr ""
 "<literal>dump</literal> muestra una pequeña lista de todos los paquetes en "
 "la caché. Fundamentalmente para depuración."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:153
-msgid "dumpavail"
-msgstr "dumpavail"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:154
 msgid ""
@@ -1155,11 +1128,6 @@ msgstr ""
 "paquetes disponibles. Esta lista es apropiada para su uso con &dpkg; y, "
 "además, la usa el método &dselect;."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:158
-msgid "unmet"
-msgstr "unmet"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:159
 msgid ""
@@ -1169,13 +1137,6 @@ msgstr ""
 "<literal>unmet</literal> muestra un resumen de todas las dependencias no "
 "satisfechas en la caché de paquetes."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:163
-#, fuzzy
-#| msgid "show <replaceable>pkg(s)</replaceable>"
-msgid "show <replaceable>&synopsis-pkg;</replaceable>…"
-msgstr "show <replaceable>paquete(s)</replaceable>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:164
 msgid ""
@@ -1185,12 +1146,10 @@ msgstr ""
 "<literal>show</literal> realiza una función similar a <command>dpkg --print-"
 "avail</command>, muestra los campos del paquete para los paquetes nombrados."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
 #: apt-cache.8.xml:169
-#, fuzzy
-#| msgid "search <replaceable>regex [ regex ... ]</replaceable>"
-msgid "search <replaceable>&synopsis-regex;</replaceable>…"
-msgstr "search <replaceable>exp-regular [exp-regular ...]</replaceable>"
+msgid "&synopsis-regex;"
+msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:170
@@ -1226,13 +1185,6 @@ msgstr ""
 "Se pueden usar argumentos separados para especificar varios patrones de "
 "búsqueda que se juntarán mediante una «Y lógica»."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:187
-#, fuzzy
-#| msgid "depends <replaceable>pkg(s)</replaceable>"
-msgid "depends <replaceable>&synopsis-pkg;</replaceable>…"
-msgstr "depends <replaceable>paquete(s)</replaceable>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:188
 msgid ""
@@ -1242,13 +1194,6 @@ msgstr ""
 "<literal>depends</literal> muestra una lista de todas la dependencias de un "
 "paquete y de todos los demás paquetes que la pueden satisfacer."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:192
-#, fuzzy
-#| msgid "rdepends <replaceable>pkg(s)</replaceable>"
-msgid "rdepends <replaceable>&synopsis-pkg;</replaceable>…"
-msgstr "rdepends <replaceable>paquete(s)</replaceable>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:193
 msgid ""
@@ -1261,7 +1206,7 @@ msgstr ""
 #: apt-cache.8.xml:197
 #, fuzzy
 #| msgid "pkgnames <replaceable>[ prefix ]</replaceable>"
-msgid "pkgnames [ <replaceable>&synopsis-prefix;</replaceable> ]"
+msgid "<optional><replaceable>&synopsis-prefix;</replaceable></optional>"
 msgstr "pkgnames <replaceable>[ prefijo ]</replaceable>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -1291,13 +1236,6 @@ msgstr ""
 "disponible para descargar, instalar o instalado, por ejemplo: los paquetes "
 "virtuales también aparecen en la lista generada."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:208
-#, fuzzy
-#| msgid "dotty <replaceable>pkg(s)</replaceable>"
-msgid "dotty <replaceable>&synopsis-pkg;</replaceable>…"
-msgstr "dotty <replaceable>paquete(s)</replaceable>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:209
 msgid ""
@@ -1339,13 +1277,6 @@ msgstr ""
 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><term>
-#: apt-cache.8.xml:226
-#, fuzzy
-#| msgid "xvcg <replaceable>pkg(s)</replaceable>"
-msgid "xvcg <replaceable>&synopsis-pkg;</replaceable>"
-msgstr "xvcg <replaceable>paquete(s)</replaceable>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:227
 msgid ""
@@ -1359,9 +1290,9 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-cache.8.xml:231
 #, fuzzy
-#| msgid "policy <replaceable>[ pkg(s) ]</replaceable>"
-msgid "policy [ <replaceable>&synopsis-pkg;</replaceable>… ]"
-msgstr "policy <replaceable>[ paquete(s) ]</replaceable>"
+#| msgid "madison <replaceable>[ pkg(s) ]</replaceable>"
+msgid "<optional><replaceable>&synopsis-pkg;</replaceable>…</optional>"
+msgstr "madison <replaceable>[ paquete(s) ]</replaceable>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:232
@@ -1376,13 +1307,6 @@ msgstr ""
 "prioridades de cada fuente. De forma alternativa, muestra una información "
 "detallada acerca de la prioridad de selección del paquete nombrado."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:238
-#, fuzzy
-#| msgid "madison <replaceable>[ pkg(s) ]</replaceable>"
-msgid "madison <replaceable>&synopsis-pkg;</replaceable>…"
-msgstr "madison <replaceable>[ paquete(s) ]</replaceable>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:239
 msgid ""
@@ -1402,23 +1326,13 @@ msgstr ""
 "información para la arquitectura para la que APT obtuvo las listas de "
 "paquetes (<literal>APT::Architecture</literal>)."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:250 apt-config.8.xml:84 apt-extracttemplates.1.xml:51
+#. type: Content of: <refentry><refsect1><title>
+#: apt-cache.8.xml:250 apt-config.8.xml:84 apt-extracttemplates.1.xml:52
 #: apt-ftparchive.1.xml:504 apt-get.8.xml:259 apt-mark.8.xml:108
-#: apt-sortpkgs.1.xml:48 apt.conf.5.xml:586 apt.conf.5.xml:608
+#: apt-sortpkgs.1.xml:48
 msgid "options"
 msgstr "Opciones"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:254
-msgid "<option>-p</option>"
-msgstr "<option>-p</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:254
-msgid "<option>--pkg-cache</option>"
-msgstr "<option>--pkg-cache</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:255
 msgid ""
@@ -1430,17 +1344,6 @@ msgstr ""
 "es la caché primaria usada para todas las operaciones. Opción de "
 "configuración: <literal>Dir::Cache::pkgcache</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:260 apt-ftparchive.1.xml:551 apt-get.8.xml:321
-#: apt-sortpkgs.1.xml:52
-msgid "<option>-s</option>"
-msgstr "<option>-s</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:260
-msgid "<option>--src-cache</option>"
-msgstr "<option>--src-cache</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:261
 msgid ""
@@ -1456,16 +1359,6 @@ msgstr ""
 "la caché fuente se usa para evitar analizar todos los ficheros de paquetes. "
 "Opción de configuración: <literal>Dir::Cache::srcpkgcache</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:268 apt-ftparchive.1.xml:525 apt-get.8.xml:311
-msgid "<option>-q</option>"
-msgstr "<option>-q</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:268 apt-ftparchive.1.xml:525 apt-get.8.xml:311
-msgid "<option>--quiet</option>"
-msgstr "<option>--quiet</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:269
 msgid ""
@@ -1480,16 +1373,6 @@ msgstr ""
 "el nivel de silencio, ignorando el fichero de configuración. Opción de "
 "configuración: <literal>quiet</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:275
-msgid "<option>-i</option>"
-msgstr "<option>-i</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:275
-msgid "<option>--important</option>"
-msgstr "<option>--important</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:276
 msgid ""
@@ -1501,46 +1384,6 @@ msgstr ""
 "Hace que sólo se muestren las dependencias y pre-dependencias. Opción de "
 "configuración: <literal>APT::Cache::Important</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:281
-msgid "<option>--no-pre-depends</option>"
-msgstr "<option>--no-pre-depends</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:282
-msgid "<option>--no-depends</option>"
-msgstr "<option>--no-depends</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:283
-msgid "<option>--no-recommends</option>"
-msgstr "<option>--no-recommends</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:284
-msgid "<option>--no-suggests</option>"
-msgstr "<option>--no-suggests</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:285
-msgid "<option>--no-conflicts</option>"
-msgstr "<option>--no-conflicts</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:286
-msgid "<option>--no-breaks</option>"
-msgstr "<option>--no-breaks</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:287
-msgid "<option>--no-replaces</option>"
-msgstr "<option>--no-replaces</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:288
-msgid "<option>--no-enhances</option>"
-msgstr "<option>--no-enhances</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:289
 #, fuzzy
@@ -1564,16 +1407,6 @@ msgstr ""
 "Show<replaceable>Tipo-de Dependencia</replaceable></literal>. Por ejemplo, "
 "<literal>APT::Cache::ShowRecommends</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:295 apt-cdrom.8.xml:111 apt-get.8.xml:278
-msgid "<option>-f</option>"
-msgstr "<option>-f</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:295
-msgid "<option>--full</option>"
-msgstr "<option>--full</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:296
 msgid ""
@@ -1583,17 +1416,6 @@ msgstr ""
 "Muestra todos los campos de información cuando se realiza una búsqueda. "
 "Opción de configuración: <literal>APT::Cache::ShowFull</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:300 apt-cdrom.8.xml:121 apt-ftparchive.1.xml:563
-#: apt-get.8.xml:369
-msgid "<option>-a</option>"
-msgstr "<option>-a</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:300
-msgid "<option>--all-versions</option>"
-msgstr "<option>--all-versions</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:301
 msgid ""
@@ -1611,16 +1433,6 @@ msgstr ""
 "opción sólo se aplica a la orden <literal>show</literal>. Opción de "
 "configuración: <literal>APT::Cache::AllVersions</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:309
-msgid "<option>-g</option>"
-msgstr "<option>-g</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:309
-msgid "<option>--generate</option>"
-msgstr "<option>--generate</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:310
 msgid ""
@@ -1633,16 +1445,6 @@ msgstr ""
 "<option>--no-generate</option>. Opción de configuración: <literal>APT::"
 "Cache::Generate</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:315
-msgid "<option>--names-only</option>"
-msgstr "<option>--names-only</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:315 apt-cdrom.8.xml:129
-msgid "<option>-n</option>"
-msgstr "<option>-n</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:316
 msgid ""
@@ -1652,11 +1454,6 @@ msgstr ""
 "Sólo busca en los nombres de paquetes, no en las descripciones largas. "
 "Opción de configuración: <literal>APT::Cache::NamesOnly</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:320
-msgid "<option>--all-names</option>"
-msgstr "<option>--all-names</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:321
 msgid ""
@@ -1668,11 +1465,6 @@ msgstr ""
 "los paquetes virtuales y las dependencias no encontradas. Opción de "
 "configuración: <literal>APT::Cache::AllNames</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:326
-msgid "<option>--recurse</option>"
-msgstr "<option>--recurse</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:327
 msgid ""
@@ -1684,11 +1476,6 @@ msgstr ""
 "recursivos de modo que todos los paquetes mencionados se muestran sólo una "
 "vez. Opción de configuración <literal>APT::Cache::RecurseDepends</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:332
-msgid "<option>--installed</option>"
-msgstr "<option>--installed</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:334
 msgid ""
@@ -1702,14 +1489,14 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist>
 #: apt-cache.8.xml:339 apt-cdrom.8.xml:140 apt-config.8.xml:104
-#: apt-extracttemplates.1.xml:62 apt-ftparchive.1.xml:591 apt-get.8.xml:514
+#: apt-extracttemplates.1.xml:63 apt-ftparchive.1.xml:591 apt-get.8.xml:514
 #: apt-mark.8.xml:122 apt-sortpkgs.1.xml:58
 msgid "&apt-commonoptions;"
 msgstr "&apt-commonoptions;"
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-cache.8.xml:344 apt-get.8.xml:519 apt-key.8.xml:167 apt-mark.8.xml:126
-#: apt.conf.5.xml:1119 apt_preferences.5.xml:697
+#: apt.conf.5.xml:1119 apt_preferences.5.xml:698
 msgid "Files"
 msgstr "Ficheros"
 
@@ -1720,9 +1507,9 @@ msgstr "&file-sourceslist; &file-statelists;"
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-cache.8.xml:351 apt-cdrom.8.xml:145 apt-config.8.xml:109
-#: apt-extracttemplates.1.xml:69 apt-ftparchive.1.xml:607 apt-get.8.xml:529
+#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:607 apt-get.8.xml:529
 #: apt-key.8.xml:188 apt-mark.8.xml:132 apt-secure.8.xml:185
-#: apt-sortpkgs.1.xml:63 apt.conf.5.xml:1125 apt_preferences.5.xml:704
+#: apt-sortpkgs.1.xml:63 apt.conf.5.xml:1125 apt_preferences.5.xml:705
 #: sources.list.5.xml:255
 msgid "See Also"
 msgstr "Véase también"
@@ -1734,7 +1521,7 @@ msgstr "&apt-conf;, &sources-list;, &apt-get;"
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:114
-#: apt-extracttemplates.1.xml:73 apt-ftparchive.1.xml:611 apt-get.8.xml:535
+#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:611 apt-get.8.xml:535
 #: apt-mark.8.xml:136 apt-sortpkgs.1.xml:67
 msgid "Diagnostics"
 msgstr "Diagnósticos"
@@ -1792,11 +1579,6 @@ msgstr ""
 "cada disco de un conjunto de discos por separado, para poder detectar los "
 "posibles errores de grabación."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:55
-msgid "add"
-msgstr "add"
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt-cdrom.8.xml:56
 msgid ""
@@ -1823,11 +1605,6 @@ msgstr ""
 "en la unidad lectora y mantiene una lista de estos identificadores en "
 "<filename>&statedir;/cdroms.list</filename>"
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:71
-msgid "ident"
-msgstr "ident"
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt-cdrom.8.xml:72
 msgid ""
@@ -1853,16 +1630,6 @@ msgstr ""
 msgid "Options"
 msgstr "Opciones"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:85 apt-ftparchive.1.xml:519 apt-get.8.xml:273
-msgid "<option>-d</option>"
-msgstr "<option>-d</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:85
-msgid "<option>--cdrom</option>"
-msgstr "<option>--cdrom</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cdrom.8.xml:86
 msgid ""
@@ -1875,16 +1642,6 @@ msgstr ""
 "correctamente configurado. Opción de configuración: <literal>Acquire::cdrom::"
 "mount</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:94
-msgid "<option>-r</option>"
-msgstr "<option>-r</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:94
-msgid "<option>--rename</option>"
-msgstr "<option>--rename</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cdrom.8.xml:95
 msgid ""
@@ -1897,16 +1654,6 @@ msgstr ""
 "etiqueta nueva. Opción de configuración: <literal>APT::CDROM::Rename</"
 "literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:103 apt-get.8.xml:292
-msgid "<option>-m</option>"
-msgstr "<option>-m</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:103
-msgid "<option>--no-mount</option>"
-msgstr "<option>--no-mount</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cdrom.8.xml:104
 msgid ""
@@ -1917,11 +1664,6 @@ msgstr ""
 "No montar. Evita que <command>apt-cdrom</command> monte y desmonte el punto "
 "de montaje. Opción de configuración: <literal>APT::CDROM::NoMount</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:111
-msgid "<option>--fast</option>"
-msgstr "<option>--fast</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cdrom.8.xml:112
 msgid ""
@@ -1935,11 +1677,6 @@ msgstr ""
 "command> comprobó el disco anteriormente y no detectó ningún error. Opción "
 "de configuración: <literal>APT::CDROM::Fast</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:121
-msgid "<option>--thorough</option>"
-msgstr "<option>--thorough</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cdrom.8.xml:122
 msgid ""
@@ -1952,21 +1689,6 @@ msgstr ""
 "en lugares extraños. El análisis del disco óptico lleva mucho más tiempo, "
 "pero encontrará todo el contenido."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:130 apt-get.8.xml:323
-msgid "<option>--just-print</option>"
-msgstr "<option>--just-print</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:131 apt-get.8.xml:325
-msgid "<option>--recon</option>"
-msgstr "<option>--recon</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:132 apt-get.8.xml:326
-msgid "<option>--no-act</option>"
-msgstr "<option>--no-act</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cdrom.8.xml:133
 msgid ""
@@ -2037,11 +1759,6 @@ msgstr ""
 "proporcione una de las opciones <option>-h</option> o <option>--help</"
 "option>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-config.8.xml:49
-msgid "shell"
-msgstr "shell"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-config.8.xml:51
 msgid ""
@@ -2097,13 +1814,6 @@ msgstr ""
 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><term>
-#: apt-config.8.xml:89
-#, fuzzy
-#| msgid "<option>--help</option>"
-msgid "<option>--empty</option>"
-msgstr "<option>--help</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-config.8.xml:90
 msgid ""
@@ -2111,11 +1821,9 @@ msgid ""
 "empty to remove them from the output."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
 #: apt-config.8.xml:95
-msgid ""
-"<option>--format '<replaceable>&percnt;f &#x0022;&percnt;v&#x0022;;&percnt;"
-"n</replaceable>'</option>"
+msgid "&percnt;f &#x0022;&percnt;v&#x0022;;&percnt;n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -2131,7 +1839,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:110 apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:608
+#: apt-config.8.xml:110 apt-extracttemplates.1.xml:71 apt-ftparchive.1.xml:608
 #: apt-sortpkgs.1.xml:64
 msgid "&apt-conf;"
 msgstr "&apt-conf;"
@@ -2184,11 +1892,19 @@ msgstr "paquete versión fichero-de-plantilla script-de-configuración"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-extracttemplates.1.xml:45
+#, fuzzy
+#| msgid ""
+#| "template-file and config-script are written to the temporary directory "
+#| "specified by the -t or --tempdir (<literal>APT::ExtractTemplates::"
+#| "TempDir</literal>)  directory, with filenames of the form "
+#| "<filename>package.template.XXXX</filename> and <filename>package.config."
+#| "XXXX</filename>"
 msgid ""
 "template-file and config-script are written to the temporary directory "
-"specified by the -t or --tempdir (<literal>APT::ExtractTemplates::TempDir</"
-"literal>)  directory, with filenames of the form <filename>package.template."
-"XXXX</filename> and <filename>package.config.XXXX</filename>"
+"specified by the <option>-t</option> or <option>--tempdir</option> "
+"(<literal>APT::ExtractTemplates::TempDir</literal>) directory, with "
+"filenames of the form <filename>package.template.XXXX</filename> and "
+"<filename>package.config.XXXX</filename>"
 msgstr ""
 "El fichero de plantilla y el script de configuración se escribirán en el "
 "directorio temporal definido mediante la opción «-t» o «--"
@@ -2196,18 +1912,8 @@ msgstr ""
 "los ficheros tendrán la forma <filename>paquete.template.XXXX</filename> y "
 "<filename>paquete.config.XXXX</filename>"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-extracttemplates.1.xml:55 apt-get.8.xml:448
-msgid "<option>-t</option>"
-msgstr "<option>-t</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-extracttemplates.1.xml:55
-msgid "<option>--tempdir</option>"
-msgstr "<option>--tempdir</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-extracttemplates.1.xml:57
+#: apt-extracttemplates.1.xml:58
 msgid ""
 "Temporary directory in which to write extracted debconf template files and "
 "config scripts.  Configuration Item: <literal>APT::ExtractTemplates::"
@@ -2218,7 +1924,7 @@ msgstr ""
 "<literal>APT::ExtractTemplates::TempDir</literal>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:74
+#: apt-extracttemplates.1.xml:75
 msgid ""
 "<command>apt-extracttemplates</command> returns zero on normal operation, "
 "decimal 100 on error."
@@ -2289,11 +1995,6 @@ msgstr ""
 "generación completa, automáticamente realiza comprobaciones de cambios en "
 "los ficheros y genera los ficheros de salida comprimidos deseados."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:58
-msgid "packages"
-msgstr "packages"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:60
 msgid ""
@@ -2315,11 +2016,6 @@ msgstr ""
 "La opción <option>--db</option> se puede usar para especificar una base de "
 "datos binaria para la caché (registro de paquetes)."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:68
-msgid "sources"
-msgstr "sources"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:70
 msgid ""
@@ -2345,11 +2041,6 @@ msgstr ""
 "alternativo con la extensión «.src». Puede usar la opción --source-override "
 "para cambiar el fichero de fuentes alternativo que se usará."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:80
-msgid "contents"
-msgstr "contents"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:82
 msgid ""
@@ -2368,11 +2059,6 @@ msgstr ""
 "varios paquetes tienen el mismo fichero, entonces cada paquete se separará "
 "por una coma en la salida."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:92
-msgid "release"
-msgstr "release"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:94
 msgid ""
@@ -2409,11 +2095,6 @@ msgstr ""
 "<literal>Valid-Until</literal>, <literal>Architectures</literal>, "
 "<literal>Components</literal> y <literal>Description</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:115
-msgid "generate"
-msgstr "generate"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:117
 msgid ""
@@ -2430,11 +2111,6 @@ msgstr ""
 "directorios, así como proporcionar una forma sencilla de mantener la "
 "configuración necesaria."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:124 apt-get.8.xml:215
-msgid "clean"
-msgstr "clean"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:126
 msgid ""
@@ -2494,11 +2170,6 @@ msgstr ""
 "estos directorios se les añaden ciertas rutas relativas definidas en "
 "secciones posteriores para producir una ruta absoluta."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:151
-msgid "ArchiveDir"
-msgstr "Sección ArchiveDir"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:153
 msgid ""
@@ -2510,31 +2181,16 @@ msgstr ""
 "es el directorio que contiene el <filename>ls-LR</filename> y los nodos "
 "«dist»."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:158
-msgid "OverrideDir"
-msgstr "Sección OverrideDir"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:160
 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><term>
-#: apt-ftparchive.1.xml:163
-msgid "CacheDir"
-msgstr "Sección CacheDir"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:165
 msgid "Specifies the location of the cache files"
 msgstr "Define la ubicación de los ficheros de la caché."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:168
-msgid "FileListDir"
-msgstr "Sección FileListDir"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:170
 msgid ""
@@ -2560,11 +2216,6 @@ msgstr ""
 "los ajustes que controlan la operación del generador. Otras secciones pueden "
 "sobrescribir estos valores predeterminados con un valor de la sección."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:182
-msgid "Packages::Compress"
-msgstr "Packages::Compress"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:184
 msgid ""
@@ -2579,11 +2230,6 @@ msgstr ""
 "«gzip» y «bzip2». El valor predeterminado para todos los esquemas de "
 "compresión es «. gzip»."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:190
-msgid "Packages::Extensions"
-msgstr "Packages::Extensions"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:192
 msgid ""
@@ -2593,11 +2239,6 @@ msgstr ""
 "Define la lista predeterminada de extensiones de fichero que son ficheros de "
 "paquete. El valor predeterminado es «.deb»."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:196
-msgid "Sources::Compress"
-msgstr "Sources::Compress"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:198
 msgid ""
@@ -2607,11 +2248,6 @@ msgstr ""
 "Esta opción es similar a <literal>Packages::Compress</literal> excepto que "
 "controla la compresión para los ficheros «Sources»."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:202
-msgid "Sources::Extensions"
-msgstr "Sources::Extensions"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:204
 msgid ""
@@ -2621,11 +2257,6 @@ msgstr ""
 "Define la lista predeterminada de las extensiones de fichero que son "
 "ficheros de fuentes. El valor predeterminado es «.dsc»."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:208
-msgid "Contents::Compress"
-msgstr "Contents::Compress"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:210
 msgid ""
@@ -2635,11 +2266,6 @@ msgstr ""
 "Esta opción es similar a <literal>Packages::Compress</literal> excepto que "
 "controla la compresión para los ficheros «Contents»."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:214
-msgid "Translation::Compress"
-msgstr "Translation::Compress"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:216
 msgid ""
@@ -2649,11 +2275,6 @@ msgstr ""
 "Esta opción es similar a <literal>Packages::Compress</literal> excepto que "
 "controla la compresión para el fichero maestro Translation-en."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:220
-msgid "DeLinkLimit"
-msgstr "DeLinkLimit"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:222
 msgid ""
@@ -2665,11 +2286,6 @@ msgstr ""
 "por ejecución. Se usa junto al valor <literal>External-Links</literal> de "
 "cada sección."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:227
-msgid "FileMode"
-msgstr "FileMode"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:229
 msgid ""
@@ -2680,11 +2296,6 @@ msgstr ""
 "predeterminado es 0644. Todos los ficheros de índice se ajustan a este modo "
 "sin tener en cuenta la máscara de usuario («umask»)."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:234 apt-ftparchive.1.xml:380
-msgid "LongDescription"
-msgstr "LongDescription"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:236 apt-ftparchive.1.xml:382
 msgid ""
@@ -2711,11 +2322,6 @@ msgstr ""
 "Todas estas variables son variables de sustitución y reemplazan las cadenas "
 "$(DIST), $(SECTION) y $(ARCH) con sus valores respectivos."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:249
-msgid "MaxContentsChange"
-msgstr "MaxContentsChange"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:251
 msgid ""
@@ -2727,11 +2333,6 @@ msgstr ""
 "cada día. Los ficheros de contenido están en una cola «round-robin», de modo "
 "que durante varios días todos se regenerarán."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:256
-msgid "ContentsAge"
-msgstr "ContentsAge"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:258
 msgid ""
@@ -2751,11 +2352,6 @@ msgstr ""
 "un fichero nuevo de todos modos. El valor predeterminado es diez, las "
 "unidades usadas son días."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:267
-msgid "Directory"
-msgstr "Directory"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:269
 msgid ""
@@ -2765,11 +2361,6 @@ msgstr ""
 "Define la raíz del directorio «.deb». El valor predeterminado es <filename>"
 "$(DIST)/$(SECTION)/binary-$(ARCH)/</filename>"
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:273
-msgid "SrcDirectory"
-msgstr "SrcDirectory"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:275
 msgid ""
@@ -2779,11 +2370,6 @@ msgstr ""
 "Define la raíz del directorio de los paquetes de fuentes. El valor "
 "predeterminado es <filename>$(DIST)/$(SECTION)/source/</filename>"
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:279 apt-ftparchive.1.xml:418
-msgid "Packages"
-msgstr "Packages"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:281
 msgid ""
@@ -2793,11 +2379,6 @@ msgstr ""
 "Define el fichero «Packages» de salida. El valor predeterminado es <filename>"
 "$(DIST)/$(SECTION)/binary-$(ARCH)/Packages</filename>"
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:285 apt-ftparchive.1.xml:423
-msgid "Sources"
-msgstr "Sources"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:287
 msgid ""
@@ -2807,11 +2388,6 @@ msgstr ""
 "Define el fichero «Sources» de salida. El valor predeterminado es <filename>"
 "$(DIST)/$(SECTION)/source/Sources</filename>"
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:291
-msgid "Translation"
-msgstr "Translation"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:293
 msgid ""
@@ -2824,11 +2400,6 @@ msgstr ""
 "valor predeterminado es <filename>$(DIST)/$(SECTION)/i18n/Translation-en</"
 "filename>"
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:298
-msgid "InternalPrefix"
-msgstr "InternalPrefix"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:300
 msgid ""
@@ -2840,11 +2411,6 @@ msgstr ""
 "un enlace interno en lugar de un enlace externo. El valor predeterminado es "
 "<filename>$(DIST)/$(SECTION)/</filename>"
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:305 apt-ftparchive.1.xml:429
-msgid "Contents"
-msgstr "Contents"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:307
 msgid ""
@@ -2859,22 +2425,12 @@ msgstr ""
 "predeterminado), <command>apt-ftparchive</command> integrará automáticamente "
 "esos ficheros de paquete juntos."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:314
-msgid "Contents::Header"
-msgstr "Contents::Header"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:316
 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><term>
-#: apt-ftparchive.1.xml:319 apt-ftparchive.1.xml:454
-msgid "BinCacheDB"
-msgstr "BinCacheDB"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:321
 msgid ""
@@ -2884,11 +2440,6 @@ msgstr ""
 "Define la base de datos binaria de la caché para usar en esta sección. "
 "Varias secciones pueden compartir la misma base de datos."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:325
-msgid "FileList"
-msgstr "FileList"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:327
 msgid ""
@@ -2901,11 +2452,6 @@ msgstr ""
 "árbol de directorios. A los nombres de los ficheros relativos se les añade "
 "como prefijo el directorio del archivo."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:332
-msgid "SourceFileList"
-msgstr "SourceFileList"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:334
 msgid ""
@@ -2989,11 +2535,6 @@ msgstr ""
 "ftparchive</command> realiza una operación similar a la siguiente: "
 "<placeholder type=\"programlisting\" id=\"0\"/>"
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:366
-msgid "Sections"
-msgstr "Secciones"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:368
 msgid ""
@@ -3005,11 +2546,6 @@ msgstr ""
 "distribución, generalmente es similar a <literal>main contrib non-free</"
 "literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:373 apt.conf.5.xml:157
-msgid "Architectures"
-msgstr "Arquitecturas"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:375
 msgid ""
@@ -3021,11 +2557,6 @@ msgstr ""
 "bajo la sección de búsqueda. La arquitectura especial «source» se usa para "
 "indicar que este árbol tiene un fichero de fuentes."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:386 apt-ftparchive.1.xml:434
-msgid "BinOverride"
-msgstr "BinOverride"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:388
 msgid ""
@@ -3035,11 +2566,6 @@ msgstr ""
 "Define el fichero binario alternativo. Éste contiene la información sobre la "
 "sección, la prioridad y la dirección del mantenedor."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:392 apt-ftparchive.1.xml:439
-msgid "SrcOverride"
-msgstr "SrcOverride"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:394
 msgid ""
@@ -3049,21 +2575,11 @@ msgstr ""
 "Define el fichero de fuentes alternativo. Éste contiene la información sobre "
 "la sección."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:398 apt-ftparchive.1.xml:444
-msgid "ExtraOverride"
-msgstr "ExtraOverride"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:400 apt-ftparchive.1.xml:446
 msgid "Sets the binary extra override file."
 msgstr "Define el fichero binario alternativo adicional."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:403 apt-ftparchive.1.xml:449
-msgid "SrcExtraOverride"
-msgstr "SrcExtraOverride"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:405 apt-ftparchive.1.xml:451
 msgid "Sets the source extra override file."
@@ -3123,21 +2639,11 @@ msgstr "Define el fichero de fuentes alternativo."
 msgid "Sets the cache DB."
 msgstr "Define la base de datos de la caché."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:459
-msgid "PathPrefix"
-msgstr "PathPrefix"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:461
 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><term>
-#: apt-ftparchive.1.xml:464
-msgid "FileList, SourceFileList"
-msgstr "FileList, SourceFileList"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:466
 msgid "Specifies the file list file."
@@ -3224,12 +2730,6 @@ msgstr ""
 "cualquier etiqueta arbitraria. Tiene tres columnas, la primera es el "
 "paquete, la segunda es la etiqueta y el resto de la línea es el nuevo valor."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:508
-msgid ""
-"<option>--md5</option>, <option>--sha1</option>, <option>--sha256</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:510
 #, fuzzy
@@ -3262,11 +2762,6 @@ msgstr ""
 "<literal>Valid-Until</literal>, <literal>Architectures</literal>, "
 "<literal>Components</literal> y <literal>Description</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:519
-msgid "<option>--db</option>"
-msgstr "<option>--db</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:521
 msgid ""
@@ -3290,11 +2785,6 @@ msgstr ""
 "q=#</option> para ajustar el nivel de silencio, ignorando el fichero de "
 "configuración. Opción de configuración: <literal>quiet</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:533
-msgid "<option>--delink</option>"
-msgstr "<option>--delink</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:535
 msgid ""
@@ -3308,11 +2798,6 @@ msgstr ""
 "predeterminada y se puede desactivar mediante <option>--no-delink</option>. "
 "Opción de configuración: <literal>APT::FTPArchive::DeLinkAct</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:541
-msgid "<option>--contents</option>"
-msgstr "<option>--contents</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:543
 msgid ""
@@ -3330,11 +2815,6 @@ msgstr ""
 "forma predeterminada. Opción de configuración: <literal>APT::FTPArchive::"
 "Contents</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:551
-msgid "<option>--source-override</option>"
-msgstr "<option>--source-override</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:553
 msgid ""
@@ -3346,11 +2826,6 @@ msgstr ""
 "<literal>sources</literal>. Opción de configuración: <literal>APT::"
 "FTPArchive::SourceOverride</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:557
-msgid "<option>--readonly</option>"
-msgstr "<option>--readonly</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:559
 msgid ""
@@ -3360,11 +2835,6 @@ msgstr ""
 "Define los permisos de las bases de datos de la caché como sólo lectura. "
 "Opción de configuración: <literal>APT::FTPArchive::ReadOnlyDB</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:563
-msgid "<option>--arch</option>"
-msgstr "<option>--arch</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:564
 msgid ""
@@ -3379,11 +2849,6 @@ msgstr ""
 "de paquete en la ruta dada. Elemento de configuración: <literal>APT::"
 "FTPArchive::Architecture</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:570
-msgid "<option>APT::FTPArchive::AlwaysStat</option>"
-msgstr "<option>APT::FTPArchive::AlwaysStat</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:572
 msgid ""
@@ -3408,11 +2873,6 @@ msgstr ""
 "que en teoría nadie debería tener problemas y por ello todas estas "
 "comprobaciones adicionales son innecesarias."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:582
-msgid "<option>APT::FTPArchive::LongDescription</option>"
-msgstr "<option>APT::FTPArchive::LongDescription</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:584
 msgid ""
@@ -3430,7 +2890,7 @@ msgstr ""
 "con la orden «generate»."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:596 apt.conf.5.xml:1113 apt_preferences.5.xml:544
+#: apt-ftparchive.1.xml:596 apt.conf.5.xml:1113 apt_preferences.5.xml:545
 #: sources.list.5.xml:214
 msgid "Examples"
 msgstr "Ejemplos"
@@ -3494,11 +2954,6 @@ msgstr ""
 "varias interfaces de «alto nivel», tales como &dselect;, &aptitude;, "
 "&synaptic; y &wajig;."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:48 apt-key.8.xml:119
-msgid "update"
-msgstr "update"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:49
 msgid ""
@@ -3523,11 +2978,6 @@ msgstr ""
 "indicador de progreso será incorrecto, ya que se desconoce de antemano el "
 "tamaño de los archivos de paquete."
 
-#. type: <tag></tag>
-#: apt-get.8.xml:60 guide.sgml:121
-msgid "upgrade"
-msgstr "upgrade"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:61
 msgid ""
@@ -3553,11 +3003,6 @@ msgstr ""
 "<literal>update</literal> antes para que <command>apt-get</command> sepa que "
 "hay nuevas versiones disponibles."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:73
-msgid "dselect-upgrade"
-msgstr "dselect-upgrade"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:74
 msgid ""
@@ -3575,11 +3020,6 @@ msgstr ""
 "necesarias para que los cambios se lleven a cabo (por ejemplo, borrar "
 "paquetes antiguos e instalar las nuevas versiones)."
 
-#. type: <tag></tag>
-#: apt-get.8.xml:83 guide.sgml:140
-msgid "dist-upgrade"
-msgstr "dist-upgrade"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:84
 msgid ""
@@ -3603,11 +3043,6 @@ msgstr ""
 "paquetes. También puede consultar &apt-preferences; si quiere invalidar este "
 "comportamiento para paquetes individuales."
 
-#. type: <tag></tag>
-#: apt-get.8.xml:96 guide.sgml:131
-msgid "install"
-msgstr "install"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:98
 msgid ""
@@ -3712,11 +3147,6 @@ msgstr ""
 "comportamiento deseado, debe anclar la expresión regular con un «^» o un "
 "«$», o bien crear una expresión regular más específica."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:150
-msgid "remove"
-msgstr "remove"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:151
 msgid ""
@@ -3733,11 +3163,6 @@ msgstr ""
 "del paquete (sin ningún espacio en blanco entre los dos), el paquete en "
 "cuestión será instalado en vez de eliminado."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:158
-msgid "purge"
-msgstr "purge"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:159
 msgid ""
@@ -3749,11 +3174,6 @@ msgstr ""
 "diferencia de que los paquetes se eliminarán y purgarán (se eliminará "
 "también cualquier fichero de configuración)."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:163
-msgid "source"
-msgstr "source"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:164
 msgid ""
@@ -3835,11 +3255,6 @@ msgstr ""
 "sólo existen en el directorio actual y es parecido a descargar los paquetes "
 "tar comprimidos con las fuentes."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:197
-msgid "build-dep"
-msgstr "build-dep"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:198
 #, fuzzy
@@ -3857,11 +3272,6 @@ msgstr ""
 "un intento de satisfacer las dependencias de compilación de un paquete "
 "fuente."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:204
-msgid "check"
-msgstr "check"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:205
 msgid ""
@@ -3871,11 +3281,6 @@ msgstr ""
 "<literal>check</literal> es una herramienta de diagnóstico, actualiza la "
 "caché de paquetes y revisa la existencia de dependencias rotas."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:209
-msgid "download"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:210
 msgid ""
@@ -3902,11 +3307,6 @@ msgstr ""
 "no usa dselect es probable que desee ejecutar <literal>apt-get clean</"
 "literal> de vez en cuando para liberar algo de espacio en disco."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:225
-msgid "autoclean"
-msgstr "autoclean"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:226
 msgid ""
@@ -3926,11 +3326,6 @@ msgstr ""
 "opción de configuración <literal>APT::Clean-Installed</literal> está "
 "desactivada impedirá que se borren los paquetes instalados."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:235
-msgid "autoremove"
-msgstr "autoremove"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:236
 #, fuzzy
@@ -3947,29 +3342,20 @@ msgstr ""
 "instalaron automáticamente para satisfacer las dependencias de algún "
 "paquete, pero que ya no son necesarios."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:240
-msgid "changelog"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:241
 msgid ""
 "<literal>changelog</literal> downloads a package changelog and displays it "
 "through <command>sensible-pager</command>. The server name and base "
 "directory is defined in the <literal>APT::Changelogs::Server</literal> "
-"variable (e. g. <ulink>http://packages.debian.org/changelogs</ulink> for "
-"Debian or <ulink>http://changelogs.ubuntu.com/changelogs</ulink> for "
-"Ubuntu).  By default it displays the changelog for the version that is "
+"variable (e. g. <ulink url=\"http://packages.debian.org/changelogs"
+"\">packages.debian.org/changelogs</ulink> for Debian or <ulink url=\"http://"
+"changelogs.ubuntu.com/changelogs\">changelogs.ubuntu.com/changelogs</ulink> "
+"for Ubuntu).  By default it displays the changelog for the version that is "
 "installed.  However, you can specify the same options as for the "
 "<option>install</option> command."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:263
-msgid "<option>--no-install-recommends</option>"
-msgstr "<option>--no-install-recommends</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:264
 msgid ""
@@ -3979,13 +3365,6 @@ msgstr ""
 "No considera los paquetes recomendados como dependencia al instalar. Opción "
 "de configuración: <literal>APT::Install-Recommends</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:268
-#, fuzzy
-#| msgid "<option>--no-suggests</option>"
-msgid "<option>--install-suggests</option>"
-msgstr "<option>--no-suggests</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:269
 #, fuzzy
@@ -3999,11 +3378,6 @@ msgstr ""
 "No considera los paquetes recomendados como dependencia al instalar. Opción "
 "de configuración: <literal>APT::Install-Recommends</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:273
-msgid "<option>--download-only</option>"
-msgstr "<option>--download-only</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:274
 msgid ""
@@ -4013,11 +3387,6 @@ msgstr ""
 "Sólo descarga los ficheros de los paquetes, no los desempaqueta ni los "
 "instala. Opción de configuración: <literal>APT::Get::Download-Only</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:278
-msgid "<option>--fix-broken</option>"
-msgstr "<option>--fix-broken</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:279
 msgid ""
@@ -4046,16 +3415,6 @@ msgstr ""
 "producir un error en algunas situaciones. Opción de configuración: "
 "<literal>APT::Get::Fix-Broken</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:292
-msgid "<option>--ignore-missing</option>"
-msgstr "<option>--ignore-missing</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:293
-msgid "<option>--fix-missing</option>"
-msgstr "<option>--fix-missing</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:294
 msgid ""
@@ -4076,11 +3435,6 @@ msgstr ""
 "descargar, se le retendrá silenciosamente. Opción de configuración: "
 "<literal>APT::Get::Fix-Missing</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:304
-msgid "<option>--no-download</option>"
-msgstr "<option>--no-download</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:305
 msgid ""
@@ -4114,16 +3468,6 @@ msgstr ""
 "APT realice algo que usted no espera. Opción de configuración: "
 "<literal>quiet</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:322
-msgid "<option>--simulate</option>"
-msgstr "<option>--simulate</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:324
-msgid "<option>--dry-run</option>"
-msgstr "<option>--dry-run</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:327
 msgid ""
@@ -4167,21 +3511,6 @@ msgstr ""
 "dependencias rotas, si no hay nada entre ellos significa que no hay ningún "
 "problema (poco probable)."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:344
-msgid "<option>-y</option>"
-msgstr "<option>-y</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:344
-msgid "<option>--yes</option>"
-msgstr "<option>--yes</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:345
-msgid "<option>--assume-yes</option>"
-msgstr "<option>--assume-yes</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:346
 msgid ""
@@ -4198,13 +3527,6 @@ msgstr ""
 "sin autenticar o desinstalar un paquete esencial. Opción de configuración: "
 "<literal>APT::Get::Assume-Yes</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:353
-#, fuzzy
-#| msgid "<option>--assume-yes</option>"
-msgid "<option>--assume-no</option>"
-msgstr "<option>--assume-yes</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:354
 #, fuzzy
@@ -4218,16 +3540,6 @@ msgstr ""
 "Descarga los paquetes fuente y luego los compila. Opción de configuración: "
 "<literal>APT::Get::Compile</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:358
-msgid "<option>-u</option>"
-msgstr "<option>-u</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:358
-msgid "<option>--show-upgraded</option>"
-msgstr "<option>--show-upgraded</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:359
 msgid ""
@@ -4237,16 +3549,6 @@ msgstr ""
 "Muestra los paquetes que se van a actualizar. Opción de configuración: "
 "<literal>APT::Get::Show-Upgraded</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:364
-msgid "<option>-V</option>"
-msgstr "<option>-V</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:364
-msgid "<option>--verbose-versions</option>"
-msgstr "<option>--verbose-versions</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:365
 msgid ""
@@ -4256,13 +3558,6 @@ msgstr ""
 "Muestra las versiones completas para los paquetes actualizados e instalados. "
 "Opción de configuración: <literal>APT::Get::Show-Versions</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:370
-#, fuzzy
-#| msgid "<option>--recurse</option>"
-msgid "<option>--host-architecture</option>"
-msgstr "<option>--recurse</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:371
 msgid ""
@@ -4274,21 +3569,6 @@ msgid ""
 "Architecture</literal>"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:379
-msgid "<option>-b</option>"
-msgstr "<option>-b</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:379
-msgid "<option>--compile</option>"
-msgstr "<option>--compile</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:380
-msgid "<option>--build</option>"
-msgstr "<option>--build</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:381
 msgid ""
@@ -4298,11 +3578,6 @@ msgstr ""
 "Descarga los paquetes fuente y luego los compila. Opción de configuración: "
 "<literal>APT::Get::Compile</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:385
-msgid "<option>--ignore-hold</option>"
-msgstr "<option>--ignore-hold</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:386
 msgid ""
@@ -4317,11 +3592,6 @@ msgstr ""
 "retenidos de manera no deseada. Opción de configuración: <literal>APT::"
 "Ignore-Hold</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:392
-msgid "<option>--no-upgrade</option>"
-msgstr "<option>--no-upgrade</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:393
 msgid ""
@@ -4335,11 +3605,6 @@ msgstr ""
 "en la línea de órdenes si ya están instalados. Opción de configuración: "
 "<literal>APT::Get::Upgrade</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:399
-msgid "<option>--only-upgrade</option>"
-msgstr "<option>--only-upgrade</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:400
 #, fuzzy
@@ -4359,11 +3624,6 @@ msgstr ""
 "paquetes listados en la línea de órdenes si no están ya instalados. Opción "
 "de configuración: <literal>APT::Get::Only-Upgrade</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:407
-msgid "<option>--force-yes</option>"
-msgstr "<option>--force-yes</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:408
 msgid ""
@@ -4380,11 +3640,6 @@ msgstr ""
 "destruir su sistema! Opción de configuración: <literal>APT::Get::force-yes</"
 "literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:415
-msgid "<option>--print-uris</option>"
-msgstr "<option>--print-uris</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:416
 msgid ""
@@ -4407,11 +3662,6 @@ msgstr ""
 "usuario descomprimir cualquier fichero comprimido. Opción de configuración: "
 "<literal>APT::Get::Print-URIs</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:426
-msgid "<option>--purge</option>"
-msgstr "<option>--purge</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:427
 msgid ""
@@ -4426,11 +3676,6 @@ msgstr ""
 "<option>purge</option>. Opción de configuración: <literal>APT::Get::Purge</"
 "literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:434
-msgid "<option>--reinstall</option>"
-msgstr "<option>--reinstall</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:435
 msgid ""
@@ -4441,11 +3686,6 @@ msgstr ""
 "disponible del paquete. Opción de configuración: <literal>APT::Get::"
 "ReInstall</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:439
-msgid "<option>--list-cleanup</option>"
-msgstr "<option>--list-cleanup</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:440
 msgid ""
@@ -4464,16 +3704,6 @@ msgstr ""
 "frecuentemente cambios en la lista de fuentes. Opción de configuración: "
 "<literal>APT::Get::List-Cleanup</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:449
-msgid "<option>--target-release</option>"
-msgstr "<option>--target-release</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:450
-msgid "<option>--default-release</option>"
-msgstr "<option>--default-release</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:451
 msgid ""
@@ -4498,11 +3728,6 @@ msgstr ""
 "Opción de configuración: <literal>APT::Default-Release</literal>. Vea "
 "también la página del manual de &apt-preferences;."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:464
-msgid "<option>--trivial-only</option>"
-msgstr "<option>--trivial-only</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:466
 msgid ""
@@ -4517,11 +3742,6 @@ msgstr ""
 "only</option> responderá negativamente. Opción de configuración: "
 "<literal>APT::Get::Trivial-Only</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:472
-msgid "<option>--no-remove</option>"
-msgstr "<option>--no-remove</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:473
 msgid ""
@@ -4531,11 +3751,6 @@ msgstr ""
 "Si se va a desinstalar algún paquete, apt-get terminará inmediatamente sin "
 "preguntar. Opción de configuración: <literal>APT::Get::Remove</literal>"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:478
-msgid "<option>--auto-remove</option>"
-msgstr "<option>--auto-remove</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:479
 msgid ""
@@ -4549,11 +3764,6 @@ msgstr ""
 "paquetes que son dependencia de otro, pero que estén en desuso. Opción de "
 "configuración: <literal>APT::Get::AutomaticRemove</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:485
-msgid "<option>--only-source</option>"
-msgstr "<option>--only-source</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:486
 msgid ""
@@ -4574,21 +3784,6 @@ msgstr ""
 "correspondiente. Opción de configuración: <literal>APT::Get::Only-Source</"
 "literal>"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:496
-msgid "<option>--diff-only</option>"
-msgstr "<option>--diff-only</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:496
-msgid "<option>--dsc-only</option>"
-msgstr "<option>--dsc-only</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:496
-msgid "<option>--tar-only</option>"
-msgstr "<option>--tar-only</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:497
 msgid ""
@@ -4600,11 +3795,6 @@ msgstr ""
 "configuración: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::"
 "Dsc-Only</literal> y <literal>APT::Get::Tar-Only</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:502
-msgid "<option>--arch-only</option>"
-msgstr "<option>--arch-only</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:503
 msgid ""
@@ -4614,11 +3804,6 @@ msgstr ""
 "Procesa sólo las dependencias de construcción dependientes de la "
 "arquitectura. Opción de configuración: <literal>APT::Get::Arch-Only</literal>"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:507
-msgid "<option>--allow-unauthenticated</option>"
-msgstr "<option>--allow-unauthenticated</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:508
 msgid ""
@@ -4705,11 +3890,6 @@ msgstr ""
 msgid "Commands"
 msgstr "Órdenes"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:40
-msgid "add &synopsis-param-filename;"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml:43
 #, fuzzy
@@ -4727,21 +3907,11 @@ msgstr ""
 "por la entrada estándar si <replaceable>nombre-de-fichero</replaceable> es "
 "<literal>-</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:52
-msgid "del &synopsis-param-keyid;"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml:56
 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><term>
-#: apt-key.8.xml:63
-msgid "export &synopsis-param-keyid;"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml:67
 #, fuzzy
@@ -4751,41 +3921,21 @@ msgstr ""
 "Devuelve la clave identificada por el <replaceable>identificador-de-la-"
 "clave</replaceable> por la salida estándar."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:74
-msgid "exportall"
-msgstr "exportall"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml:78
 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><term>
-#: apt-key.8.xml:85
-msgid "list"
-msgstr "list"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml:89
 msgid "List trusted keys."
 msgstr "Lista las claves de confianza."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:96
-msgid "finger"
-msgstr "finger"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml:100
 msgid "List fingerprints of trusted keys."
 msgstr "Lista las huellas digitales de las claves de confianza."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:107
-msgid "adv"
-msgstr "adv"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml:111
 msgid ""
@@ -4805,13 +3955,6 @@ msgid ""
 "Debian."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:133
-#, fuzzy
-#| msgid "update"
-msgid "net-update"
-msgstr "update"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml:137
 msgid ""
@@ -4832,11 +3975,6 @@ msgstr ""
 "Tenga en cuenta que las opciones se deben definir antes de las órdenes "
 "descritas en el sección anterior."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:156
-msgid "--keyring &synopsis-param-filename;"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml:157
 #, fuzzy
@@ -4953,13 +4091,6 @@ msgstr ""
 "manualmente, <command>apt-get</command> o <command>aptitude</command> los "
 "eliminará."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:51
-#, fuzzy
-#| msgid "markauto"
-msgid "auto"
-msgstr "markauto"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml:52
 #, fuzzy
@@ -4976,11 +4107,6 @@ msgstr ""
 "automáticamente, lo que provocará que el paquete se elimine cuando ningún "
 "paquete instalado manualmente dependa de este paquete."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:59
-msgid "manual"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml:60
 #, fuzzy
@@ -4997,24 +4123,14 @@ msgstr ""
 "manualmente, lo que impedirá la eliminación automática de este paquete si "
 "ningún otro depende de él."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:67
-msgid "hold"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml:68
 msgid ""
 "<literal>hold</literal> is used to mark a package as hold back, which will "
 "prevent the package from being automatically installed, upgraded or "
 "removed.  The command is only a wrapper around <command>dpkg --set-"
-"selections</command> and the state is therefore maintained by &dpkg; and not "
-"effected by the <option>--filename</option> option."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:77
-msgid "unhold"
+"selections</command> and the state is therefore maintained by &dpkg; and not "
+"effected by the <option>--filename</option> option."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -5030,11 +4146,6 @@ msgstr ""
 "<literal>showauto</literal> se usa para mostrar una lista de paquetes "
 "instalados automáticamente, un paquete por línea."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:83
-msgid "showauto"
-msgstr "showauto"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml:84
 #, fuzzy
@@ -5050,13 +4161,6 @@ msgstr ""
 "<literal>showauto</literal> se usa para mostrar una lista de paquetes "
 "instalados automáticamente, un paquete por línea."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:91
-#, fuzzy
-#| msgid "showauto"
-msgid "showmanual"
-msgstr "showauto"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml:92
 msgid ""
@@ -5065,13 +4169,6 @@ msgid ""
 "installed packages instead."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:98
-#, fuzzy
-#| msgid "showauto"
-msgid "showhold"
-msgstr "showauto"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml:99
 #, fuzzy
@@ -5085,30 +4182,27 @@ msgstr ""
 "<literal>showauto</literal> se usa para mostrar una lista de paquetes "
 "instalados automáticamente, un paquete por línea."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:112
-msgid ""
-"<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>"
-msgstr ""
-"<option>-f=<filename><replaceable>NOMBRE-DE-FICHERO</replaceable></"
-"filename></option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:113
-msgid ""
-"<option>--file=<filename><replaceable>FILENAME</replaceable></filename></"
-"option>"
-msgstr ""
-"<option>--file=<filename><replaceable>nombre-de-fichero</replaceable></"
-"filename></option>"
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><filename>
+#: apt-mark.8.xml:112 apt-mark.8.xml:113
+#, fuzzy
+#| msgid "xvcg <replaceable>pkg(s)</replaceable>"
+msgid "<replaceable>&synopsis-filename;</replaceable>"
+msgstr "xvcg <replaceable>paquete(s)</replaceable>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:116
-msgid ""
-"Read/Write package stats from <filename><replaceable>FILENAME</replaceable></"
-"filename> instead of the default location, which is "
-"<filename>extended_status</filename> in the directory defined by the "
-"Configuration Item: <literal>Dir::State</literal>."
+#: apt-mark.8.xml:115
+#, fuzzy
+#| msgid ""
+#| "Read/Write package stats from <filename><replaceable>FILENAME</"
+#| "replaceable></filename> instead of the default location, which is "
+#| "<filename>extended_status</filename> in the directory defined by the "
+#| "Configuration Item: <literal>Dir::State</literal>."
+msgid ""
+"Read/Write package stats from the filename given with the parameter "
+"<filename><replaceable>&synopsis-filename;</replaceable></filename> instead "
+"of from the default location, which is <filename>extended_status</filename> "
+"in the directory defined by the Configuration Item: <literal>Dir::State</"
+"literal>."
 msgstr ""
 "Escribe y lee las estadísticas de los paquetes desde "
 "<filename><replaceable>nombre-de-fichero</replaceable></filename> en lugar "
@@ -5501,11 +4595,6 @@ msgstr ""
 "Toda la salida se muestra por la salida estándar, la entrada debe ser un "
 "fichero ubicable."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-sortpkgs.1.xml:52
-msgid "<option>--source</option>"
-msgstr "<option>--source</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-sortpkgs.1.xml:54
 msgid ""
@@ -5863,11 +4952,6 @@ msgstr ""
 "Este grupo de opciones controla el comportamiento general de APT así como "
 "mantiene las opciones para todas las herramientas."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:151
-msgid "Architecture"
-msgstr "Arquitectura"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:152
 msgid ""
@@ -5892,11 +4976,6 @@ msgid ""
 "architectures</command>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:167
-msgid "Default-Release"
-msgstr "Default-Release"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:168
 msgid ""
@@ -5911,11 +4990,6 @@ msgstr ""
 "«testing», «unstable», «&stable-codename;», «&testing-codename;», «4.0», "
 "«5.0*». Vea también &apt-preferences;."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:173
-msgid "Ignore-Hold"
-msgstr "Ignore-Hold"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:174
 msgid ""
@@ -5925,11 +4999,6 @@ msgstr ""
 "Ignora paquetes retenidos, esta opción global causa que el solucionador de "
 "problemas ignore los paquetes retenidos en la toma de decisiones."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:178
-msgid "Clean-Installed"
-msgstr "Clean-Installed"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:179
 msgid ""
@@ -5944,11 +5013,6 @@ msgstr ""
 "excluidos de la limpieza - tenga en cuenta que APT no proporciona ningún "
 "mecanismo directo para reinstalarlos."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:185
-msgid "Immediate-Configure"
-msgstr "Immediate-Configure"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:186
 msgid ""
@@ -6013,11 +5077,6 @@ msgstr ""
 "de fallo a continuación para que así puedan mejorar o corregir el proceso de "
 "actualización."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:208
-msgid "Force-LoopBreak"
-msgstr "Force-LoopBreak"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:209
 msgid ""
@@ -6035,11 +5094,6 @@ msgstr ""
 "Esta opción funcionará si el paquete esencial no es ni tar, ni gzip, ni "
 "libc, ni dpkg, ni bash, ni cualquier otro del que dependan estos paquetes."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:217
-msgid "Cache-Start, Cache-Grow and Cache-Limit"
-msgstr "Cache-Start, Cache-Grow y Cache-Limit"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:218
 #, fuzzy
@@ -6095,22 +5149,12 @@ msgstr ""
 "<literal>Cache-Grow</literal> con un valor de cero se desactivará el "
 "crecimiento automático del cache."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:233
-msgid "Build-Essential"
-msgstr "Build-Essential"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:234
 msgid "Defines which package(s) are considered essential build dependencies."
 msgstr ""
 "Define qué paquete(s) se consideran dependencias de creación esenciales."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:237
-msgid "Get"
-msgstr "Get"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:238
 msgid ""
@@ -6120,11 +5164,6 @@ msgstr ""
 "La subsección Get controla la herramienta &apt-get;, por favor, consulte la "
 "documentación para más información sobre esta opción."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:242
-msgid "Cache"
-msgstr "Cache"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:243
 msgid ""
@@ -6134,11 +5173,6 @@ msgstr ""
 "La subsección Cache controla la herramienta &apt-cache;, por favor, consulte "
 "la documentación para más información sobre esta opción."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:247
-msgid "CDROM"
-msgstr "CDROM"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:248
 msgid ""
@@ -6153,11 +5187,6 @@ msgstr ""
 msgid "The Acquire Group"
 msgstr "El grupo Acquire"
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:259
-msgid "Check-Valid-Until"
-msgstr "Check-Valid-Until"
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:260
 msgid ""
@@ -6178,11 +5207,6 @@ msgstr ""
 "se hace, o si un valor más estricto es opcional, se puede usar la opción "
 "<literal>Max-ValidTime</literal>."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:270
-msgid "Max-ValidTime"
-msgstr "Max-ValidTime"
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:271
 #, fuzzy
@@ -6216,13 +5240,6 @@ msgstr ""
 "específicas al archivo añadiendo la etiqueta del archivo al nombre de la "
 "opción."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:281
-#, fuzzy
-#| msgid "Max-ValidTime"
-msgid "Min-ValidTime"
-msgstr "Max-ValidTime"
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:282
 #, fuzzy
@@ -6256,11 +5273,6 @@ msgstr ""
 "específicas al archivo añadiendo la etiqueta del archivo al nombre de la "
 "opción."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:292
-msgid "PDiffs"
-msgstr "PDiffs"
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:293
 msgid ""
@@ -6296,11 +5308,6 @@ msgstr ""
 "parches comparados con el tamaño del fichero destino. Si se supera uno de "
 "estos límites, se descargará el fichero completo en lugar de los parches."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:305
-msgid "Queue-Mode"
-msgstr "Queue-Mode"
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:306
 msgid ""
@@ -6316,11 +5323,6 @@ msgstr ""
 "una conexión por máquina de destino, <literal>access</literal> significa que "
 "se abrirá una conexión por cada tipo de URI."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:313
-msgid "Retries"
-msgstr "Retries"
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:314
 msgid ""
@@ -6330,11 +5332,6 @@ msgstr ""
 "El número de reintentos a realizar. Si es distinto de cero APT volverá a "
 "intentar obtener los ficheros fallidos el número de veces proporcionado."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:318
-msgid "Source-Symlinks"
-msgstr "Source-Symlinks"
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:319
 msgid ""
@@ -6345,11 +5342,6 @@ msgstr ""
 "fuente se enlazarán cuando sea posible, en vez de copiarse. Es «true» de "
 "forma predeterminada."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:323 sources.list.5.xml:160
-msgid "http"
-msgstr "http"
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:324
 msgid ""
@@ -6449,11 +5441,6 @@ msgstr ""
 "«User-Agent» distinto para la descarga http ya que algunos proxys sólo "
 "permiten el acceso para clientes que usan un identificador conocido."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:366
-msgid "https"
-msgstr "https"
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:367
 msgid ""
@@ -6506,11 +5493,6 @@ msgstr ""
 "ser «TLSv1» o «SSLv3». <literal>&lt;host&gt;::SslForceVersion</literal> "
 "corresponde a la opción por máquina."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:391 sources.list.5.xml:171
-msgid "ftp"
-msgstr "ftp"
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:392
 msgid ""
@@ -6591,11 +5573,6 @@ msgstr ""
 "IPv4. Tenga en cuenta que la mayoría de los servidores de FTP no son "
 "compatibles con la RFC 2428."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:430 sources.list.5.xml:153
-msgid "cdrom"
-msgstr "cdrom"
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
 #: apt.conf.5.xml:436
 #, no-wrap
@@ -6624,11 +5601,6 @@ msgstr ""
 "cdrom. Es importante dejar una barra al final. Puede especificar órdenes "
 "para desmontar usando UMount."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:441
-msgid "gpgv"
-msgstr "gpgv"
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:442
 msgid ""
@@ -6640,11 +5612,6 @@ msgstr ""
 "adicionales a gpgv. <literal>gpgv::Options</literal> Parámetros adicionales "
 "introducidos a gpgv."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:447
-msgid "CompressionTypes"
-msgstr "CompressionTypes"
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
 #: apt.conf.5.xml:453
 #, no-wrap
@@ -6766,11 +5733,6 @@ msgid ""
 "uncompressed files so this is mostly only useable for local mirrors."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:475
-msgid "GzipIndexes"
-msgstr "GzipIndexes"
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:477
 msgid ""
@@ -6785,11 +5747,6 @@ msgstr ""
 "a costa de mayores requerimientos del procesador al generar los almacenes de "
 "paquetes locales. El valor predeterminado es «false»."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:484
-msgid "Languages"
-msgstr "Languages"
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:485
 msgid ""
@@ -7032,11 +5989,6 @@ msgstr ""
 "predeterminado cuando APT se usa como método de &dselect;. Éstas se "
 "encuentran en la sección <literal>DSelect</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:577
-msgid "Clean"
-msgstr "Clean"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:578
 msgid ""
@@ -7064,11 +6016,6 @@ msgstr ""
 "Los contenidos de esta variable se introducen a &apt-get; como opciones de "
 "la línea de ordenes al ejecutar la fase de instalación."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:591
-msgid "Updateoptions"
-msgstr "Updateoptions"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:592
 msgid ""
@@ -7078,11 +6025,6 @@ msgstr ""
 "Los contenidos de esta variable se introducen a &apt-get; como opciones de "
 "la línea de ordenes al ejecutar la fase de actualización."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:596
-msgid "PromptAfterUpdate"
-msgstr "PromptAfterUpdate"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:597
 msgid ""
@@ -7118,16 +6060,6 @@ msgstr ""
 "especificar usando la notación de lista y cada elemento de la lista se "
 "introduce a &dpkg; como un sólo argumento."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:614
-msgid "Pre-Invoke"
-msgstr "Pre-Invoke"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:614
-msgid "Post-Invoke"
-msgstr "Post-Invoke"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:615
 msgid ""
@@ -7141,11 +6073,6 @@ msgstr ""
 "notación de lista. Las órdenes se ejecutarán en orden usando <filename>/bin/"
 "sh</filename>, y APT finalizará en caso de fallo."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:621
-msgid "Pre-Install-Pkgs"
-msgstr "Pre-Install-Pkgs"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:622
 msgid ""
@@ -7178,11 +6105,6 @@ msgstr ""
 "<literal>cmd</literal> es una orden que se pasa a <literal>Pre-Install-Pkgs</"
 "literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:635
-msgid "Run-Directory"
-msgstr "Run-Directory"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:636
 msgid ""
@@ -7192,11 +6114,6 @@ msgstr ""
 "APT cambia a este directorio antes de invocar a dpkg, el valor "
 "predeterminado es <filename>/</filename>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:640
-msgid "Build-options"
-msgstr "Build-options"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:641
 msgid ""
@@ -7289,11 +6206,6 @@ msgstr ""
 "command>. Una combinación de opciones defensivas sería <placeholder type="
 "\"literallayout\" id=\"0\"/>"
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:668
-msgid "DPkg::NoTriggers"
-msgstr "DPkg::NoTriggers"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:669
 msgid ""
@@ -7315,11 +6227,6 @@ msgstr ""
 "triggers» a las llamadas de la configuración para dpkg, ahora apt también "
 "añadirá esta opción a las llamadas de desempaquetado y borrado."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:676
-msgid "PackageManager::Configure"
-msgstr "PackageManager::Configure"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:677
 msgid ""
@@ -7349,11 +6256,6 @@ msgstr ""
 "mal configurado qué podría derivar en la imposibilidad de arrancar el "
 "sistema. "
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:687
-msgid "DPkg::ConfigurePending"
-msgstr "DPkg::ConfigurePending"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:688
 msgid ""
@@ -7372,11 +6274,6 @@ msgstr ""
 "veces seguidas, por ejemplo: en un instalador. En estas situaciones podría "
 "desactivar esta opción en todas las ejecuciones menos la última."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:694
-msgid "DPkg::TriggersPending"
-msgstr "DPkg::TriggersPending"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:695
 msgid ""
@@ -7393,11 +6290,6 @@ msgstr ""
 "cuenta que esto procesará todos los disparadores, no sólo los disparadores "
 "necesarios para configurar este paquete."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:700
-msgid "PackageManager::UnpackAll"
-msgstr "PackageManager::UnpackAll"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:701
 msgid ""
@@ -7418,11 +6310,6 @@ msgstr ""
 "ya que este método es experimental y necesita más mejoras antes de llegar a "
 "ser realmente útil."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:708
-msgid "OrderList::Score::Immediate"
-msgstr "OrderList::Score::Immediate"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
 #: apt.conf.5.xml:716
 #, no-wrap
@@ -7557,11 +6444,6 @@ msgstr ""
 "A continuación, se muestra la lista completa de las opciones de depuración "
 "de apt."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:791
-msgid "<literal>Debug::Acquire::cdrom</literal>"
-msgstr "<literal>Debug::Acquire::cdrom</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:795
 msgid ""
@@ -7570,33 +6452,18 @@ msgstr ""
 "Muestra la información relacionada al acceso de las fuentes de "
 "<literal>cdrom://</literal>"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:802
-msgid "<literal>Debug::Acquire::ftp</literal>"
-msgstr "<literal>Debug::Acquire::ftp</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:806
 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><term>
-#: apt.conf.5.xml:813
-msgid "<literal>Debug::Acquire::http</literal>"
-msgstr "<literal>Debug::Acquire::http</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:817
 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><term>
-#: apt.conf.5.xml:824
-msgid "<literal>Debug::Acquire::https</literal>"
-msgstr "<literal>Debug::Acquire::https</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:828
 msgid "Print information related to downloading packages using HTTPS."
@@ -7604,11 +6471,6 @@ msgstr ""
 "Muestra la información relacionada con la descarga de paquetes mediante "
 "HTTPS."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:835
-msgid "<literal>Debug::Acquire::gpgv</literal>"
-msgstr "<literal>Debug::Acquire::gpgv</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:839
 msgid ""
@@ -7618,11 +6480,6 @@ msgstr ""
 "Muestra la información relacionada con la comprobación de las firmas "
 "criptográficas mediante <literal>gpg</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:846
-msgid "<literal>Debug::aptcdrom</literal>"
-msgstr "<literal>Debug::aptcdrom</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:850
 msgid ""
@@ -7632,11 +6489,6 @@ msgstr ""
 "Muestra la información sobre el proceso de acceso a las colecciones de "
 "paquetes almacenadas en CD-ROM."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:857
-msgid "<literal>Debug::BuildDeps</literal>"
-msgstr "<literal>Debug::BuildDeps</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:860
 msgid "Describes the process of resolving build-dependencies in &apt-get;."
@@ -7644,11 +6496,6 @@ msgstr ""
 "Describe el proceso de resolución de dependencias de compilación en &apt-"
 "get;."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:867
-msgid "<literal>Debug::Hashes</literal>"
-msgstr "<literal>Debug::Hashes</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:870
 msgid ""
@@ -7658,11 +6505,6 @@ msgstr ""
 "Muestra los «hashes» criptográficos que generan las bibliotecas de "
 "<literal>apt</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:877
-msgid "<literal>Debug::IdentCDROM</literal>"
-msgstr "<literal>Debug::IdentCDROM</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:880
 msgid ""
@@ -7674,11 +6516,6 @@ msgstr ""
 "libres y usados del sistema de ficheros del CD-ROM, cuando se genera un "
 "identificador de un CD-ROM."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:888
-msgid "<literal>Debug::NoLocking</literal>"
-msgstr "<literal>Debug::NoLocking</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:891
 msgid ""
@@ -7689,11 +6526,6 @@ msgstr ""
 "ejecutar dos instancias de <quote><literal>apt-get update</literal></quote> "
 "a la vez."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:899
-msgid "<literal>Debug::pkgAcquire</literal>"
-msgstr "<literal>Debug::pkgAcquire</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:903
 msgid "Log when items are added to or removed from the global download queue."
@@ -7701,11 +6533,6 @@ msgstr ""
 "Registra los elementos que se añaden o se borran de la cola de descarga "
 "global."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:910
-msgid "<literal>Debug::pkgAcquire::Auth</literal>"
-msgstr "<literal>Debug::pkgAcquire::Auth</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:913
 msgid ""
@@ -7716,11 +6543,6 @@ msgstr ""
 "comprobación de las sumas de verificación y las firmas criptográficas de los "
 "ficheros descargados."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:920
-msgid "<literal>Debug::pkgAcquire::Diffs</literal>"
-msgstr "<literal>Debug::pkgAcquire::Diffs</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:923
 msgid ""
@@ -7730,11 +6552,6 @@ msgstr ""
 "Muestra la información de la descarga y la aplicación de los diffs de la "
 "lista de índices de paquetes, y los errores relacionados con éstos."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:931
-msgid "<literal>Debug::pkgAcquire::RRed</literal>"
-msgstr "<literal>Debug::pkgAcquire::RRed</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:935
 msgid ""
@@ -7745,11 +6562,6 @@ msgstr ""
 "paquetes de apt cuando se descargan los diffs de los índices en lugar de los "
 "índices completos."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:942
-msgid "<literal>Debug::pkgAcquire::Worker</literal>"
-msgstr "<literal>Debug::pkgAcquire::Worker</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:946
 msgid ""
@@ -7758,11 +6570,6 @@ msgstr ""
 "Registra todas las interacciones de los sub-procesos que están realizando "
 "descargas."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:953
-msgid "<literal>Debug::pkgAutoRemove</literal>"
-msgstr "<literal>Debug::pkgAutoRemove</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:957
 msgid ""
@@ -7772,11 +6579,6 @@ msgstr ""
 "Registra los eventos relacionados con el estado «instalado automáticamente» "
 "de los paquetes y con la eliminación de los paquetes sin usar."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:964
-msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>"
-msgstr "<literal>Debug::pkgDepCache::AutoInstall</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:967
 msgid ""
@@ -7792,11 +6594,6 @@ msgstr ""
 "install</literal> y no el solucionador completo de dependencias de "
 "<literal>apt</literal>. Véase <literal>Debug::pkgProblemResolver</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:978
-msgid "<literal>Debug::pkgDepCache::Marker</literal>"
-msgstr "<literal>Debug::pkgDepCache::Marker</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:981
 msgid ""
@@ -7827,11 +6624,6 @@ msgstr ""
 "misma versión que la instalada. <literal>sección</literal> es el nombre de "
 "la sección en la que aparece el paquete."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1000
-msgid "<literal>Debug::pkgInitConfig</literal>"
-msgstr "<literal>Debug::pkgInitConfig</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:1003
 msgid "Dump the default configuration to standard error on startup."
@@ -7839,11 +6631,6 @@ msgstr ""
 "Vuelca la configuración predeterminada a la salida estándar durante al "
 "iniciarse."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1010
-msgid "<literal>Debug::pkgDPkgPM</literal>"
-msgstr "<literal>Debug::pkgDPkgPM</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:1013
 msgid ""
@@ -7853,11 +6640,6 @@ msgstr ""
 "Cuando se invoca a &dpkg; muestra la línea de órdenes exacta con la que se "
 "invocó, con los argumentos separados por un espacio."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1021
-msgid "<literal>Debug::pkgDPkgProgressReporting</literal>"
-msgstr "<literal>Debug::pkgDPkgProgressReporting</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:1024
 msgid ""
@@ -7867,11 +6649,6 @@ msgstr ""
 "Muestra todos los datos recibidos de &dpkg; en el descriptor del fichero de "
 "estado y cualquier error encontrado durante el análisis."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1031
-msgid "<literal>Debug::pkgOrderList</literal>"
-msgstr "<literal>Debug::pkgOrderList</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:1035
 msgid ""
@@ -7881,11 +6658,6 @@ msgstr ""
 "Genera una traza del algoritmo que decide el orden en el que <literal>apt</"
 "literal> debería entregar los paquetes a &dpkg;."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1043
-msgid "<literal>Debug::pkgPackageManager</literal>"
-msgstr "<literal>Debug::pkgPackageManager</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:1047
 msgid ""
@@ -7894,21 +6666,11 @@ msgstr ""
 "Muestra los mensajes de estado siguiendo los pasos realizados al invocar a "
 "&dpkg;."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1054
-msgid "<literal>Debug::pkgPolicy</literal>"
-msgstr "<literal>Debug::pkgPolicy</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:1058
 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><term>
-#: apt.conf.5.xml:1064
-msgid "<literal>Debug::pkgProblemResolver</literal>"
-msgstr "<literal>Debug::pkgProblemResolver</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:1068
 msgid ""
@@ -7918,11 +6680,6 @@ msgstr ""
 "Muestra la ejecución del solucionador de dependencias (esto se aplica sólo a "
 "lo que ocurre cuando se encuentra un problema de dependencias complejo)."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1076
-msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>"
-msgstr "<literal>Debug::pkgProblemResolver::ShowScores</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:1079
 msgid ""
@@ -7934,11 +6691,6 @@ msgstr ""
 "calculadas y usadas por pkgProblemResolver. La descripción del paquete es la "
 "misma que la descrita en <literal>Debug::pkgDepCache::Marker</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1087
-msgid "<literal>Debug::sourceList</literal>"
-msgstr "<literal>Debug::sourceList</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:1091
 msgid ""
@@ -8586,30 +7338,29 @@ msgstr ""
 "Pin: release a=unstable\n"
 "Pin-Priority: 50\n"
 
-#. type: Content of: <refentry><refsect1><refsect2><literal>
-#: apt_preferences.5.xml:290
-#, fuzzy
-#| msgid "Packages"
-msgid "Package"
-msgstr "Packages"
-
-#. type: Content of: <refentry><refsect1><refsect2><literal>
-#: apt_preferences.5.xml:296
-msgid "*"
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt_preferences.5.xml:291
+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 "
+"of all package names it matches. It is undecided whether this will change in "
+"the future, thus you should always list wild-card pins first, so later "
+"specific pins override it.  The pattern \"<literal>*</literal>\" in a "
+"Package field is not considered a glob() expression in itself."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:306
+#: apt_preferences.5.xml:307
 msgid "How APT Interprets Priorities"
 msgstr "¿Cómo interpreta APT las prioridades?"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:314
+#: apt_preferences.5.xml:315
 msgid "P &gt; 1000"
 msgstr "P &gt; 1000"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:315
+#: apt_preferences.5.xml:316
 msgid ""
 "causes a version to be installed even if this constitutes a downgrade of the "
 "package"
@@ -8618,12 +7369,12 @@ msgstr ""
 "el sistema."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:319
+#: apt_preferences.5.xml:320
 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:320
+#: apt_preferences.5.xml:321
 msgid ""
 "causes a version to be installed even if it does not come from the target "
 "release, unless the installed version is more recent"
@@ -8632,12 +7383,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:325
+#: apt_preferences.5.xml:326
 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:326
+#: apt_preferences.5.xml:327
 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"
@@ -8647,12 +7398,12 @@ msgstr ""
 "más reciente."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:331
+#: apt_preferences.5.xml:332
 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:332
+#: apt_preferences.5.xml:333
 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"
@@ -8661,12 +7412,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:337
+#: apt_preferences.5.xml:338
 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:338
+#: apt_preferences.5.xml:339
 msgid ""
 "causes a version to be installed only if there is no installed version of "
 "the package"
@@ -8674,17 +7425,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:342
+#: apt_preferences.5.xml:343
 msgid "P &lt; 0"
 msgstr "P &lt; 0"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:343
+#: apt_preferences.5.xml:344
 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:309
+#: apt_preferences.5.xml:310
 msgid ""
 "Priorities (P) assigned in the APT preferences file must be positive or "
 "negative integers.  They are interpreted as follows (roughly speaking): "
@@ -8695,7 +7446,7 @@ msgstr ""
 "siguiente modo: <placeholder type=\"variablelist\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:348
+#: apt_preferences.5.xml:349
 msgid ""
 "If any specific-form records match an available package version then the "
 "first such record determines the priority of the package version.  Failing "
@@ -8709,7 +7460,7 @@ msgstr ""
 "versión del paquete."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:354
+#: apt_preferences.5.xml:355
 msgid ""
 "For example, suppose the APT preferences file contains the three records "
 "presented earlier:"
@@ -8718,7 +7469,7 @@ msgstr ""
 "registros antes mencionados:"
 
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:358
+#: apt_preferences.5.xml:359
 #, no-wrap
 msgid ""
 "Package: perl\n"
@@ -8746,12 +7497,12 @@ msgstr ""
 "Pin-Priority: 50\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:371
+#: apt_preferences.5.xml:372
 msgid "Then:"
 msgstr "Por ello:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:373
+#: apt_preferences.5.xml:374
 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 "
@@ -8766,7 +7517,7 @@ msgstr ""
 "la versión 5.8*, desactualizando el paquete."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:378
+#: apt_preferences.5.xml:379
 msgid ""
 "A version of any package other than <literal>perl</literal> that is "
 "available from the local system has priority over other versions, even "
@@ -8777,7 +7528,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:382
+#: apt_preferences.5.xml:383
 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</"
@@ -8790,12 +7541,12 @@ msgstr ""
 "hay ninguna versión del paquete ya instalado."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:392
+#: apt_preferences.5.xml:393
 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:394
+#: apt_preferences.5.xml:395
 msgid ""
 "The locations listed in the &sources-list; file should provide "
 "<filename>Packages</filename> and <filename>Release</filename> files to "
@@ -8806,27 +7557,27 @@ msgstr ""
 "describen los paquetes disponibles en cada uno de los sitios."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:406
+#: apt_preferences.5.xml:407
 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:407
+#: apt_preferences.5.xml:408
 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:410 apt_preferences.5.xml:460
+#: apt_preferences.5.xml:411 apt_preferences.5.xml:461
 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:411
+#: apt_preferences.5.xml:412
 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:398
+#: apt_preferences.5.xml:399
 msgid ""
 "The <filename>Packages</filename> file is normally found in the directory "
 "<filename>.../dists/<replaceable>dist-name</replaceable>/"
@@ -8847,12 +7598,12 @@ msgstr ""
 "de APT: <placeholder type=\"variablelist\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:427
+#: apt_preferences.5.xml:428
 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:428
+#: apt_preferences.5.xml:429
 msgid ""
 "names the archive to which all the packages in the directory tree belong.  "
 "For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@ -8870,18 +7621,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:438
+#: apt_preferences.5.xml:439
 #, 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:444
+#: apt_preferences.5.xml:445
 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:445
+#: apt_preferences.5.xml:446
 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 "
@@ -8900,13 +7651,13 @@ msgstr ""
 "de APT:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:454
+#: apt_preferences.5.xml:455
 #, 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:461
+#: apt_preferences.5.xml:462
 msgid ""
 "names the release version.  For example, the packages in the tree might "
 "belong to Debian GNU/Linux release version 3.0.  Note that there is normally "
@@ -8922,7 +7673,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:470
+#: apt_preferences.5.xml:471
 #, no-wrap
 msgid ""
 "Pin: release v=3.0\n"
@@ -8934,12 +7685,12 @@ msgstr ""
 "Pin: release 3.0\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:479
+#: apt_preferences.5.xml:480
 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:480
+#: apt_preferences.5.xml:481
 msgid ""
 "names the licensing component associated with the packages in the directory "
 "tree of the <filename>Release</filename> file.  For example, the line "
@@ -8958,18 +7709,18 @@ msgstr ""
 "de APT:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:489
+#: apt_preferences.5.xml:490
 #, 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:495
+#: apt_preferences.5.xml:496
 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:496
+#: apt_preferences.5.xml:497
 msgid ""
 "names the originator of the packages in the directory tree of the "
 "<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"
@@ -8982,18 +7733,18 @@ msgstr ""
 "mediante la siguiente línea:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:502
+#: apt_preferences.5.xml:503
 #, 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:508
+#: apt_preferences.5.xml:509
 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:509
+#: apt_preferences.5.xml:510
 msgid ""
 "names the label of the packages in the directory tree of the "
 "<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"
@@ -9006,13 +7757,13 @@ msgstr ""
 "siguiente línea:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:515
+#: apt_preferences.5.xml:516
 #, 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:416
+#: apt_preferences.5.xml:417
 msgid ""
 "The <filename>Release</filename> file is normally found in the directory "
 "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
@@ -9035,7 +7786,7 @@ msgstr ""
 "\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:522
+#: apt_preferences.5.xml:523
 msgid ""
 "All of the <filename>Packages</filename> and <filename>Release</filename> "
 "files retrieved from locations listed in the &sources-list; file are stored "
@@ -9060,12 +7811,12 @@ msgstr ""
 "la distribución «<literal>unstable</literal>» (inestable)."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:535
+#: apt_preferences.5.xml:536
 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:537
+#: apt_preferences.5.xml:538
 msgid ""
 "Each record in the APT preferences file can optionally begin with one or "
 "more lines beginning with the word <literal>Explanation:</literal>.  This "
@@ -9076,12 +7827,12 @@ msgstr ""
 "Útil para comentarios."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:546
+#: apt_preferences.5.xml:547
 msgid "Tracking Stable"
 msgstr "Seguir la distribución «stable» (estable)"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:554
+#: apt_preferences.5.xml:555
 #, no-wrap
 msgid ""
 "Explanation: Uninstall or do not install any Debian-originated\n"
@@ -9105,7 +7856,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:548
+#: apt_preferences.5.xml:549
 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 "
@@ -9120,8 +7871,8 @@ msgstr ""
 "<literal>Debian</literal>.  <placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:571 apt_preferences.5.xml:617
-#: apt_preferences.5.xml:675
+#: apt_preferences.5.xml:572 apt_preferences.5.xml:618
+#: apt_preferences.5.xml:676
 #, no-wrap
 msgid ""
 "apt-get install <replaceable>package-name</replaceable>\n"
@@ -9133,7 +7884,7 @@ msgstr ""
 "apt-get dist-upgrade\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:566
+#: apt_preferences.5.xml:567
 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 "
@@ -9147,13 +7898,13 @@ msgstr ""
 "\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:583
+#: apt_preferences.5.xml:584
 #, 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:577
+#: apt_preferences.5.xml:578
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>testing</literal> distribution; the package "
@@ -9166,12 +7917,12 @@ msgstr ""
 "\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:589
+#: apt_preferences.5.xml:590
 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:598
+#: apt_preferences.5.xml:599
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -9199,7 +7950,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:591
+#: apt_preferences.5.xml:592
 msgid ""
 "The following APT preferences file will cause APT to assign a high priority "
 "to package versions from the <literal>testing</literal> distribution, a "
@@ -9216,7 +7967,7 @@ msgstr ""
 ">"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:612
+#: apt_preferences.5.xml:613
 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 "
@@ -9229,13 +7980,13 @@ msgstr ""
 "<placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:632
+#: apt_preferences.5.xml:633
 #, 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:623
+#: apt_preferences.5.xml:624
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>unstable</literal> distribution.  "
@@ -9254,12 +8005,12 @@ msgstr ""
 "instalada.  <placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:639
+#: apt_preferences.5.xml:640
 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:653
+#: apt_preferences.5.xml:654
 #, no-wrap
 msgid ""
 "Explanation: Uninstall or do not install any Debian-originated package versions\n"
@@ -9293,7 +8044,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:641
+#: apt_preferences.5.xml:642
 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 "
@@ -9320,7 +8071,7 @@ msgstr ""
 "\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:670
+#: apt_preferences.5.xml:671
 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 "
@@ -9334,13 +8085,13 @@ msgstr ""
 "id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:690
+#: apt_preferences.5.xml:691
 #, 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:681
+#: apt_preferences.5.xml:682
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>sid</literal> distribution.  Thereafter, "
@@ -9359,12 +8110,12 @@ msgstr ""
 "instalada.  <placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt_preferences.5.xml:699
+#: apt_preferences.5.xml:700
 msgid "&file-preferences;"
 msgstr "&file-preferences;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:705
+#: apt_preferences.5.xml:706
 msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 
@@ -9651,6 +8402,11 @@ msgstr ""
 "ficheros como un archivo de paquetes adicional. Esto es útil para "
 "particiones montadas mediante NFS y réplicas o archivos de paquetes locales."
 
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+#: sources.list.5.xml:153
+msgid "cdrom"
+msgstr "cdrom"
+
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml:155
 msgid ""
@@ -9661,6 +8417,11 @@ msgstr ""
 "programa &apt-cdrom; para añadir entradas de un disco óptico a «sources."
 "list»."
 
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+#: sources.list.5.xml:160
+msgid "http"
+msgstr "http"
+
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml:162
 msgid ""
@@ -9678,6 +8439,11 @@ msgstr ""
 "usar la cadena de caracteres «http://usuario:contraseña@servidor:puerto/». "
 "Tenga en cuenta que este método de autenticación no es seguro."
 
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+#: sources.list.5.xml:171
+msgid "ftp"
+msgstr "ftp"
+
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml:173
 msgid ""
@@ -10156,6 +8922,11 @@ msgstr ""
 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
+msgid "upgrade"
+msgstr "upgrade"
+
 #. type: <p></p>
 #: guide.sgml:131
 msgid ""
@@ -10176,6 +8947,11 @@ msgstr ""
 "prgn> o <tt>apt-get install</tt> para forzar la instalación de tales "
 "paquetes."
 
+#. type: <tag></tag>
+#: guide.sgml:131
+msgid "install"
+msgstr "install"
+
 #. type: <p></p>
 #: guide.sgml:140
 msgid ""
@@ -10195,6 +8971,11 @@ 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
+msgid "dist-upgrade"
+msgstr "dist-upgrade"
+
 #. type: <p></p>
 #: guide.sgml:149
 msgid ""
@@ -11472,252 +10253,6 @@ msgstr "Ésto usará los archivos del disco previamente obtenidos."
 #~ "apropiadamente las conexiones TCP, de otro modo los datos se corromperán. "
 #~ "Las máquinas que necesitan esto violan la RFC 2068."
 
-#, fuzzy
-#~| msgid ""
-#~| "<command>apt-cache</command> <arg><option>-hvsn</option></arg> "
-#~| "<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
-#~| "<arg><option>-c=<replaceable>file</replaceable></option></arg> <group "
-#~| "choice=\"req\"> <arg>add <arg choice=\"plain\" rep=\"repeat"
-#~| "\"><replaceable>file</replaceable></arg></arg> <arg>gencaches</arg> "
-#~| "<arg>showpkg <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
-#~| "replaceable></arg></arg> <arg>showsrc <arg choice=\"plain\" rep=\"repeat"
-#~| "\"><replaceable>pkg</replaceable></arg></arg> <arg>stats</arg> "
-#~| "<arg>dump</arg> <arg>dumpavail</arg> <arg>unmet</arg> <arg>search <arg "
-#~| "choice=\"plain\"><replaceable>regex</replaceable></arg></arg> <arg>show "
-#~| "<arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></"
-#~| "arg></arg> <arg>depends <arg choice=\"plain\" rep=\"repeat"
-#~| "\"><replaceable>pkg</replaceable></arg></arg> <arg>rdepends <arg choice="
-#~| "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
-#~| "<arg>pkgnames <arg choice=\"plain\"><replaceable>prefix</replaceable></"
-#~| "arg></arg> <arg>dotty <arg choice=\"plain\" rep=\"repeat"
-#~| "\"><replaceable>pkg</replaceable></arg></arg> <arg>xvcg <arg choice="
-#~| "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
-#~| "<arg>policy <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkgs</"
-#~| "replaceable></arg></arg> <arg>madison <arg choice=\"plain\" rep=\"repeat"
-#~| "\"><replaceable>pkgs</replaceable></arg></arg> </group>"
-#~ msgid ""
-#~ "<command>apt-cache</command> <arg><option>-hvsn</option></arg> "
-#~ "<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
-#~ "<arg><option>-c=<replaceable>file</replaceable></option></arg> <group "
-#~ "choice=\"req\"> <arg>gencaches</arg> <arg>showpkg <arg choice=\"plain\" "
-#~ "rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg>showsrc "
-#~ "<arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></"
-#~ "arg></arg> <arg>stats</arg> <arg>dump</arg> <arg>dumpavail</arg> "
-#~ "<arg>unmet</arg> <arg>search <arg choice=\"plain\"><replaceable>regex</"
-#~ "replaceable></arg></arg> <arg>show <arg choice=\"plain\" rep=\"repeat"
-#~ "\"><replaceable>pkg</replaceable></arg></arg> <arg>depends <arg choice="
-#~ "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
-#~ "<arg>rdepends <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
-#~ "replaceable></arg></arg> <arg>pkgnames <arg choice=\"plain"
-#~ "\"><replaceable>prefix</replaceable></arg></arg> <arg>dotty <arg choice="
-#~ "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
-#~ "<arg>xvcg <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
-#~ "replaceable></arg></arg> <arg>policy <arg choice=\"plain\" rep=\"repeat"
-#~ "\"><replaceable>pkgs</replaceable></arg></arg> <arg>madison <arg choice="
-#~ "\"plain\" rep=\"repeat\"><replaceable>pkgs</replaceable></arg></arg> </"
-#~ "group>"
-#~ msgstr ""
-#~ "<command>apt-cache</command> <arg><option>-hvsn</option></arg> "
-#~ "<arg><option>-o=<replaceable>cadena-de-configuración</replaceable></"
-#~ "option></arg> <arg><option>-c=<replaceable>fichero</replaceable></"
-#~ "option></arg> <group choice=\"req\"> <arg>add <arg choice=\"plain\" rep="
-#~ "\"repeat\"><replaceable>fichero</replaceable></arg></arg> <arg>gencaches</"
-#~ "arg> <arg>showpkg <arg choice=\"plain\" rep=\"repeat"
-#~ "\"><replaceable>paquete</replaceable></arg></arg> <arg>showsrc <arg "
-#~ "choice=\"plain\" rep=\"repeat\"><replaceable>paquete</replaceable></arg></"
-#~ "arg> <arg>stats</arg> <arg>dump</arg> <arg>dumpavail</arg> <arg>unmet</"
-#~ "arg> <arg>search <arg choice=\"plain\"><replaceable>exp_regular</"
-#~ "replaceable></arg></arg> <arg>show <arg choice=\"plain\" rep=\"repeat"
-#~ "\"><replaceable></replaceable></arg></arg> <arg>depends <arg choice="
-#~ "\"plain\" rep=\"repeat\"><replaceable>paquete</replaceable></arg></arg> "
-#~ "<arg>rdepends <arg choice=\"plain\" rep=\"repeat\"><replaceable>paquete</"
-#~ "replaceable></arg></arg> <arg>pkgnames <arg choice=\"plain"
-#~ "\"><replaceable>prefijo</replaceable></arg></arg> <arg>dotty <arg choice="
-#~ "\"plain\" rep=\"repeat\"><replaceable>paquete</replaceable></arg></arg> "
-#~ "<arg>xvcg <arg choice=\"plain\" rep=\"repeat\"><replaceable>paquete</"
-#~ "replaceable></arg></arg> <arg>policy <arg choice=\"plain\" rep=\"repeat"
-#~ "\"><replaceable>paquetes</replaceable></arg></arg> <arg>madison <arg "
-#~ "choice=\"plain\" rep=\"repeat\"><replaceable>paquetes</replaceable></"
-#~ "arg></arg> </group>"
-
-#~ msgid ""
-#~ "<command>apt-cdrom</command> <arg><option>-hvrmfan</option></arg> "
-#~ "<arg><option>-d=<replaceable>cdrom mount point</replaceable></option></"
-#~ "arg> <arg><option>-o=<replaceable>config string</replaceable></option></"
-#~ "arg> <arg><option>-c=<replaceable>file</replaceable></option></arg> "
-#~ "<group> <arg>add</arg> <arg>ident</arg> </group>"
-#~ msgstr ""
-#~ "<command>apt-cdrom</command> <arg><option>-hvrmfan</option></arg> "
-#~ "<arg><option>-d=<replaceable>punto-de-montaje</replaceable></option></"
-#~ "arg> <arg><option>-o=<replaceable>cadena-de-configuración</replaceable></"
-#~ "option></arg> <arg><option>-c=<replaceable>fichero</replaceable></"
-#~ "option></arg> <group> <arg>add</arg> <arg>ident</arg> </group>"
-
-#~ msgid ""
-#~ "<command>apt-config</command> <arg><option>-hv</option></arg> "
-#~ "<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
-#~ "<arg><option>-c=<replaceable>file</replaceable></option></arg> <group "
-#~ "choice=\"req\"> <arg>shell</arg> <arg>dump</arg> </group>"
-#~ msgstr ""
-#~ "<command>apt-config</command> <arg><option>-hv</option></arg> "
-#~ "<arg><option>-o=<replaceable>cadena-de-configuración</replaceable></"
-#~ "option></arg> <arg><option>-c=<replaceable>fichero</replaceable></"
-#~ "option></arg> <group choice=\"req\"> <arg>shell</arg> <arg>dump</arg> </"
-#~ "group>"
-
-#~ msgid ""
-#~ "<command>apt-extracttemplates</command> <arg><option>-hv</option></arg> "
-#~ "<arg><option>-t=<replaceable>temporary directory</replaceable></option></"
-#~ "arg> <arg choice=\"plain\" rep=\"repeat\"><replaceable>file</"
-#~ "replaceable></arg>"
-#~ msgstr ""
-#~ "<command>apt-extracttemplates</command> <arg><option>-hv</option></arg> "
-#~ "<arg><option>-t=<replaceable>directorio-temporal</replaceable></option></"
-#~ "arg> <arg choice=\"plain\" rep=\"repeat\"><replaceable>fichero</"
-#~ "replaceable></arg>"
-
-#~ msgid ""
-#~ "<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> "
-#~ "<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> "
-#~ "<arg><option>--readonly</option></arg> <arg><option>--contents</option></"
-#~ "arg> <arg><option>--arch <replaceable>architecture</replaceable></"
-#~ "option></arg> <arg><option>-o <replaceable>config</"
-#~ "replaceable>=<replaceable>string</replaceable></option></arg> "
-#~ "<arg><option>-c=<replaceable>file</replaceable></option></arg> <group "
-#~ "choice=\"req\"> <arg>packages<arg choice=\"plain\" rep=\"repeat"
-#~ "\"><replaceable>path</replaceable></arg><arg><replaceable>override</"
-#~ "replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> "
-#~ "<arg>sources<arg choice=\"plain\" rep=\"repeat\"><replaceable>path</"
-#~ "replaceable></arg><arg><replaceable>override</"
-#~ "replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> "
-#~ "<arg>contents <arg choice=\"plain\"><replaceable>path</replaceable></"
-#~ "arg></arg> <arg>release <arg choice=\"plain\"><replaceable>path</"
-#~ "replaceable></arg></arg> <arg>generate <arg choice=\"plain"
-#~ "\"><replaceable>config-file</replaceable></arg> <arg choice=\"plain\" rep="
-#~ "\"repeat\"><replaceable>section</replaceable></arg></arg> <arg>clean <arg "
-#~ "choice=\"plain\"><replaceable>config-file</replaceable></arg></arg> </"
-#~ "group>"
-#~ msgstr ""
-#~ "<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> "
-#~ "<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> "
-#~ "<arg><option>--readonly</option></arg> <arg><option>--contents</option></"
-#~ "arg> <arg><option>--arch <replaceable>arquitectura</replaceable></"
-#~ "option></arg> <arg><option>-o <replaceable>configuración</"
-#~ "replaceable>=<replaceable>cadena</replaceable></option></arg> "
-#~ "<arg><option>-c=<replaceable>fichero</replaceable></option></arg> <group "
-#~ "choice=\"req\"> <arg>packages<arg choice=\"plain\" rep=\"repeat"
-#~ "\"><replaceable>ruta</replaceable></arg><arg><replaceable>fichero-"
-#~ "alternativo</replaceable><arg><replaceable>prefijo-ruta</replaceable></"
-#~ "arg></arg></arg> <arg>sources<arg choice=\"plain\" rep=\"repeat"
-#~ "\"><replaceable>ruta</replaceable></arg><arg><replaceable>fichero-"
-#~ "alternativo</replaceable><arg><replaceable>prefijo-ruta</replaceable></"
-#~ "arg></arg></arg> <arg>contents <arg choice=\"plain\"><replaceable>ruta</"
-#~ "replaceable></arg></arg> <arg>release <arg choice=\"plain"
-#~ "\"><replaceable>ruta</replaceable></arg></arg> <arg>generate <arg choice="
-#~ "\"plain\"><replaceable>fichero-configuración</replaceable></arg> <arg "
-#~ "choice=\"plain\" rep=\"repeat\"><replaceable>sección</replaceable></arg></"
-#~ "arg> <arg>clean <arg choice=\"plain\"><replaceable>fichero-configuración</"
-#~ "replaceable></arg></arg> </group>"
-
-#, fuzzy
-#~| msgid ""
-#~| "<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
-#~| "<option>-o= <replaceable>config_string</replaceable> </option> </arg> "
-#~| "<arg> <option>-c= <replaceable>config_file</replaceable> </option> </"
-#~| "arg> <arg> <option>-t=</option> <arg choice='plain'> "
-#~| "<replaceable>target_release</replaceable> </arg> </arg> <group choice="
-#~| "\"req\"> <arg choice='plain'>update</arg> <arg choice='plain'>upgrade</"
-#~| "arg> <arg choice='plain'>dselect-upgrade</arg> <arg choice='plain'>dist-"
-#~| "upgrade</arg> <arg choice='plain'>install <arg choice=\"plain\" rep="
-#~| "\"repeat\"><replaceable>pkg</replaceable> <arg> <group choice='req'> "
-#~| "<arg choice='plain'> =<replaceable>pkg_version_number</replaceable> </"
-#~| "arg> <arg choice='plain'> /<replaceable>target_release</replaceable> </"
-#~| "arg> </group> </arg> </arg> </arg> <arg choice='plain'>remove <arg "
-#~| "choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></"
-#~| "arg> <arg choice='plain'>purge <arg choice=\"plain\" rep=\"repeat"
-#~| "\"><replaceable>pkg</replaceable></arg></arg> <arg choice='plain'>source "
-#~| "<arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable> "
-#~| "<arg> <group choice='req'> <arg choice='plain'> "
-#~| "=<replaceable>pkg_version_number</replaceable> </arg> <arg "
-#~| "choice='plain'> /<replaceable>target_release</replaceable> </arg> </"
-#~| "group> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg choice="
-#~| "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
-#~| "choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg "
-#~| "choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> <arg "
-#~| "choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> <arg "
-#~| "choice='plain'>--version</arg> </group> </arg> <arg choice='plain'> "
-#~| "<group choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--"
-#~| "help</arg> </group> </arg> </group>"
-#~ msgid ""
-#~ "<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
-#~ "<option>-o= <replaceable>config_string</replaceable> </option> </arg> "
-#~ "<arg> <option>-c= <replaceable>config_file</replaceable> </option> </arg> "
-#~ "<arg> <option>-t=</option> <arg choice='plain'> "
-#~ "<replaceable>target_release</replaceable> </arg> </arg> <group choice="
-#~ "\"req\"> <arg choice='plain'>update</arg> <arg choice='plain'>upgrade</"
-#~ "arg> <arg choice='plain'>dselect-upgrade</arg> <arg choice='plain'>dist-"
-#~ "upgrade</arg> <arg choice='plain'>install <arg choice=\"plain\" rep="
-#~ "\"repeat\"><replaceable>pkg</replaceable> <arg> <group choice='req'> <arg "
-#~ "choice='plain'> =<replaceable>pkg_version_number</replaceable> </arg> "
-#~ "<arg choice='plain'> /<replaceable>target_release</replaceable> </arg> </"
-#~ "group> </arg> </arg> </arg> <arg choice='plain'>remove <arg choice=\"plain"
-#~ "\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
-#~ "choice='plain'>purge <arg choice=\"plain\" rep=\"repeat"
-#~ "\"><replaceable>pkg</replaceable></arg></arg> <arg choice='plain'>source "
-#~ "<arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable> <arg> "
-#~ "<group choice='req'> <arg choice='plain'> "
-#~ "=<replaceable>pkg_version_number</replaceable> </arg> <arg "
-#~ "choice='plain'> /<replaceable>target_release</replaceable> </arg> </"
-#~ "group> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg choice="
-#~ "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
-#~ "choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg "
-#~ "choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> <arg "
-#~ "choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> <arg "
-#~ "choice='plain'>--version</arg> </group> </arg> <arg choice='plain'> "
-#~ "<group choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--"
-#~ "help</arg> </group> </arg> </group>"
-#~ msgstr ""
-#~ "<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
-#~ "<option>-o= <replaceable>cadena-de-configuración</replaceable> </option> "
-#~ "</arg> <arg> <option>-c= <replaceable>fichero-de-configuración</"
-#~ "replaceable> </option> </arg> <arg> <option>-t=</option> <arg "
-#~ "choice='plain'> <replaceable>nombre-de-la-versión-objetivo</replaceable> "
-#~ "</arg> </arg> <group choice=\"req\"> <arg choice='plain'>update</arg> "
-#~ "<arg choice='plain'>upgrade</arg> <arg choice='plain'>dselect-upgrade</"
-#~ "arg> <arg choice='plain'>dist-upgrade</arg> <arg choice='plain'>install "
-#~ "<arg choice=\"plain\" rep=\"repeat\"><replaceable>paquete</replaceable> "
-#~ "<arg> <group choice='req'> <arg choice='plain'> =<replaceable>versión-del-"
-#~ "paquete</replaceable> </arg> <arg choice='plain'> /<replaceable>nombre-de-"
-#~ "la-versión-objetivo</replaceable> </arg> </group> </arg> </arg> </arg> "
-#~ "<arg choice='plain'>remove <arg choice=\"plain\" rep=\"repeat"
-#~ "\"><replaceable>paquete</replaceable></arg></arg> <arg "
-#~ "choice='plain'>purge <arg choice=\"plain\" rep=\"repeat"
-#~ "\"><replaceable>paquete</replaceable></arg></arg> <arg "
-#~ "choice='plain'>source <arg choice=\"plain\" rep=\"repeat"
-#~ "\"><replaceable>paquete</replaceable> <arg> <group choice='req'> <arg "
-#~ "choice='plain'> =<replaceable>versión-del-paquete</replaceable> </arg> "
-#~ "<arg choice='plain'> /<replaceable>nombre-de-la-versión-objetivo</"
-#~ "replaceable> </arg> </group> </arg> </arg> </arg> <arg "
-#~ "choice='plain'>build-dep <arg choice=\"plain\" rep=\"repeat"
-#~ "\"><replaceable>paquete</replaceable></arg></arg> <arg "
-#~ "choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg "
-#~ "choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> <arg "
-#~ "choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> <arg "
-#~ "choice='plain'>--version</arg> </group> </arg> <arg choice='plain'> "
-#~ "<group choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--"
-#~ "help</arg> </group> </arg> </group>"
-
-#~ msgid ""
-#~ "<command>apt-key</command> <arg><option>--keyring <replaceable>filename</"
-#~ "replaceable></option></arg> <arg><replaceable>command</replaceable></arg> "
-#~ "<arg rep=\"repeat\"><option><replaceable>arguments</replaceable></"
-#~ "option></arg>"
-#~ msgstr ""
-#~ "<command>apt-key</command> <arg><option>--keyring <replaceable>nombre-de-"
-#~ "fichero</replaceable></option></arg> <arg><replaceable>orden</"
-#~ "replaceable></arg> <arg rep=\"repeat\"><option><replaceable>argumentis</"
-#~ "replaceable></option></arg>"
-
 #~ msgid "add <replaceable>filename</replaceable>"
 #~ msgstr "add <replaceable>nombre-de-fichero</replaceable>"
 
@@ -11738,43 +10273,6 @@ msgstr "Ésto usará los archivos del disco previamente obtenidos."
 #~ msgid "--keyring <replaceable>filename</replaceable>"
 #~ msgstr "--keyring <replaceable>nombre-de-fichero</replaceable>"
 
-#, fuzzy
-#~| msgid ""
-#~| "  <command>apt-mark</command> <arg><option>-hv</option></arg> "
-#~| "<arg><option>-f=<replaceable>FILENAME</replaceable></option></arg> "
-#~| "<group choice=\"plain\"> <arg choice=\"plain\"> <group choice=\"req\"> "
-#~| "<arg choice=\"plain\">markauto</arg> <arg choice=\"plain\">unmarkauto</"
-#~| "arg> </group> <arg choice=\"plain\" rep=\"repeat\"><replaceable>package</"
-#~| "replaceable></arg> </arg> <arg choice=\"plain\">showauto</arg> </group>"
-#~ msgid ""
-#~ "  <command>apt-mark</command> <arg><option>-hv</option></arg> "
-#~ "<arg><option>-f=<replaceable>FILENAME</replaceable></option></arg> <group "
-#~ "choice=\"plain\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg "
-#~ "choice=\"plain\">auto</arg> <arg choice=\"plain\">manual</arg> <arg "
-#~ "choice=\"plain\">showauto</arg> <arg choice=\"plain\">showmanual</arg> </"
-#~ "group> <arg choice=\"plain\" rep=\"repeat\"><replaceable>package</"
-#~ "replaceable></arg> </arg> </group>"
-#~ msgstr ""
-#~ " <command>apt-mark</command> <arg><option>-hv</option></arg> "
-#~ "<arg><option>-f=<replaceable>nombre-de-fichero</replaceable></option></"
-#~ "arg> <group choice=\"plain\"> <arg choice=\"plain\"> <group choice=\"req"
-#~ "\"> <arg choice=\"plain\">markauto</arg> <arg choice=\"plain"
-#~ "\">unmarkauto</arg> </group> <arg choice=\"plain\" rep=\"repeat"
-#~ "\"><replaceable>paquete</replaceable></arg> </arg> <arg choice=\"plain"
-#~ "\">showauto</arg> </group>"
-
-#~ msgid ""
-#~ "<command>apt-sortpkgs</command> <arg><option>-hvs</option></arg> "
-#~ "<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
-#~ "<arg><option>-c=<replaceable>file</replaceable></option></arg> <arg "
-#~ "choice=\"plain\" rep=\"repeat\"><replaceable>file</replaceable></arg>"
-#~ msgstr ""
-#~ "<command>apt-sortpkgs</command> <arg><option>-hvs</option></arg> "
-#~ "<arg><option>-o=<replaceable>cadena-de-configuración</replaceable></"
-#~ "option></arg> <arg><option>-c=<replaceable>fichero</replaceable></"
-#~ "option></arg> <arg choice=\"plain\" rep=\"repeat\"><replaceable>fichero</"
-#~ "replaceable></arg>"
-
 #, fuzzy
 #~| msgid ""
 #~| "Seconds the Release file should be considered valid after it was "
@@ -11809,9 +10307,6 @@ msgstr "Ésto usará los archivos del disco previamente obtenidos."
 #~ "específicas al archivo añadiendo la etiqueta del archivo al nombre de la "
 #~ "opción."
 
-#~ msgid "<option>--md5</option>"
-#~ msgstr "<option>--md5</option>"
-
 #~ msgid ""
 #~ "Generate MD5 sums. This defaults to on, when turned off the generated "
 #~ "index files will not have MD5Sum fields where possible.  Configuration "
@@ -11822,21 +10317,9 @@ msgstr "Ésto usará los archivos del disco previamente obtenidos."
 #~ "campos MD5Sum cuando sea posible. Opción de configuración: <literal>APT::"
 #~ "FTPArchive::MD5</literal>"
 
-#~ msgid "unmarkauto"
-#~ msgstr "unmarkauto"
-
-#~ msgid "<option>-h</option>"
-#~ msgstr "<option>-h</option>"
-
 #~ msgid "Show a short usage summary."
 #~ msgstr "Muestra un breve resumen de uso."
 
-#~ msgid "<option>-v</option>"
-#~ msgstr "<option>-v</option>"
-
-#~ msgid "<option>--version</option>"
-#~ msgstr "<option>--version</option>"
-
 #~ msgid "Show the program version."
 #~ msgstr "Muestra la versión del programa."
 
@@ -11871,9 +10354,6 @@ msgstr "Ésto usará los archivos del disco previamente obtenidos."
 #~ "en la salida estándar un fichero «Release» que contiene un resumen MD5 y "
 #~ "SHA1 para cada fichero."
 
-#~ msgid "<option>--install-recommends</option>"
-#~ msgstr "<option>--install-recommends</option>"
-
 #~ msgid "Also install recommended packages."
 #~ msgstr "También instala los paquetes recomendados."
 
@@ -11930,9 +10410,6 @@ msgstr "Ésto usará los archivos del disco previamente obtenidos."
 #~ "configuración: <literal>Dir::State</literal> define la ruta del fichero "
 #~ "<filename>extended_states</filename>."
 
-#~ msgid "Cache-Limit"
-#~ msgstr "Cache-Limit"
-
 #~ msgid ""
 #~ "APT uses a fixed size memory mapped cache file to store the 'available' "
 #~ "information. This sets the size of that cache (in bytes)."
@@ -11955,9 +10432,6 @@ msgstr "Ésto usará los archivos del disco previamente obtenidos."
 #~ "especificada en una línea que empiece con <literal>Pin-Priority: "
 #~ "release ...</literal>."
 
-#~ msgid "<filename>/etc/apt/trusted.gpg</filename>"
-#~ msgstr "<filename>/etc/apt/trusted.gpg</filename>"
-
 #~ msgid "Keyring of local trusted keys, new keys will be added here."
 #~ msgstr ""
 #~ "El registro local de las claves de confianza. Las claves nuevas se "
diff --git a/doc/po/fr.po b/doc/po/fr.po
index 5bf580d65..6f078bcb6 100644
--- a/doc/po/fr.po
+++ b/doc/po/fr.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2012-05-20 18:22+0300\n"
+"POT-Creation-Date: 2012-05-21 04:13+0300\n"
 "PO-Revision-Date: 2011-02-17 07:50+0100\n"
 "Last-Translator: Christian Perrier <bubulle@debian.org>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -845,11 +845,6 @@ msgstr ""
 "À moins que l'option <option>-h</option> ou <option>--help</option> ne soit "
 "donnée, l'une des commandes suivantes doit être présente."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:48
-msgid "gencaches"
-msgstr "gencaches"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:49
 msgid ""
@@ -857,12 +852,12 @@ msgid ""
 "implicitly by all commands needing this cache if it is missing or outdated."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:53
-#, fuzzy
-#| msgid "showpkg <replaceable>pkg(s)</replaceable>"
-msgid "showpkg <replaceable>&synopsis-pkg;</replaceable>…"
-msgstr "showpkg <replaceable>paquet(s)</replaceable>"
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
+#: apt-cache.8.xml:53 apt-cache.8.xml:142 apt-cache.8.xml:163
+#: 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
+msgid "&synopsis-pkg;"
+msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:54
@@ -933,11 +928,6 @@ msgstr ""
 "l'être. Pour connaître le sens de la fin de chaîne, il est préférable de "
 "consulter le code source d'APT."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:87
-msgid "stats"
-msgstr "stats"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:87
 msgid ""
@@ -1053,13 +1043,6 @@ msgstr ""
 "<literal>Total dependencies</literal> est le nombre de relations de "
 "dépendances déclarées par tous les paquets présents dans le cache."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:142
-#, fuzzy
-#| msgid "showsrc <replaceable>pkg(s)</replaceable>"
-msgid "showsrc <replaceable>&synopsis-pkg;</replaceable>…"
-msgstr "showsrc <replaceable>paquet(s)</replaceable>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:143
 msgid ""
@@ -1071,11 +1054,6 @@ msgstr ""
 "correspondent aux noms donnés. Toutes les versions sont affichées et toutes "
 "les entrées qui déclarent que ces noms correspondent à des paquets binaires."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:148 apt-config.8.xml:75
-msgid "dump"
-msgstr "dump"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:149
 msgid ""
@@ -1085,11 +1063,6 @@ msgstr ""
 "La commande <literal>dump</literal> affiche un court résumé sur chaque "
 "paquet du cache. Elle est d'abord destinée au débogage."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:153
-msgid "dumpavail"
-msgstr "dumpavail"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:154
 msgid ""
@@ -1100,11 +1073,6 @@ msgstr ""
 "liste des paquets disponibles. Elle convient à une utilisation avec &dpkg; "
 "et la méthode &dselect; s'en sert."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:158
-msgid "unmet"
-msgstr "unmet"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:159
 msgid ""
@@ -1114,13 +1082,6 @@ msgstr ""
 "La commande <literal>unmet</literal> affiche un résumé concernant toutes les "
 "dépendances absentes dans le cache de paquets."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:163
-#, fuzzy
-#| msgid "show <replaceable>pkg(s)</replaceable>"
-msgid "show <replaceable>&synopsis-pkg;</replaceable>…"
-msgstr "show <replaceable>paquet(s)</replaceable>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:164
 msgid ""
@@ -1131,12 +1092,10 @@ msgstr ""
 "avail</command> ; elle affiche des informations sur les paquets donnés en "
 "argument."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
 #: apt-cache.8.xml:169
-#, fuzzy
-#| msgid "search <replaceable>regex [ regex ... ]</replaceable>"
-msgid "search <replaceable>&synopsis-regex;</replaceable>…"
-msgstr "search <replaceable>expression [ expression ... ]</replaceable>"
+msgid "&synopsis-regex;"
+msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:170
@@ -1170,13 +1129,6 @@ msgstr ""
 "On peut utiliser des arguments distincts pour indiquer des expressions "
 "rationnelles différentes sur lesquelles seront réalisées un « et » logique."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:187
-#, fuzzy
-#| msgid "depends <replaceable>pkg(s)</replaceable>"
-msgid "depends <replaceable>&synopsis-pkg;</replaceable>…"
-msgstr "depends <replaceable>paquet(s)</replaceable>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:188
 msgid ""
@@ -1187,13 +1139,6 @@ msgstr ""
 "dépendances d'un paquet et la liste de tous les paquets possibles qui "
 "satisfont ces dépendances."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:192
-#, fuzzy
-#| msgid "rdepends <replaceable>pkg(s)</replaceable>"
-msgid "rdepends <replaceable>&synopsis-pkg;</replaceable>…"
-msgstr "rdepends <replaceable>paquet(s)</replaceable>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:193
 msgid ""
@@ -1207,7 +1152,7 @@ msgstr ""
 #: apt-cache.8.xml:197
 #, fuzzy
 #| msgid "pkgnames <replaceable>[ prefix ]</replaceable>"
-msgid "pkgnames [ <replaceable>&synopsis-prefix;</replaceable> ]"
+msgid "<optional><replaceable>&synopsis-prefix;</replaceable></optional>"
 msgstr "pkgnames <replaceable>[ préfixe ]</replaceable>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -1236,13 +1181,6 @@ msgstr ""
 "installable ou installé. Par exemple, les paquets virtuels sont également "
 "affichés dans la liste créée."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:208
-#, fuzzy
-#| msgid "dotty <replaceable>pkg(s)</replaceable>"
-msgid "dotty <replaceable>&synopsis-pkg;</replaceable>…"
-msgstr "dotty <replaceable>paquet(s)</replaceable>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:209
 msgid ""
@@ -1287,13 +1225,6 @@ msgstr ""
 "Attention, dotty ne peut pas représenter des ensembles très grands de "
 "paquets."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:226
-#, fuzzy
-#| msgid "xvcg <replaceable>pkg(s)</replaceable>"
-msgid "xvcg <replaceable>&synopsis-pkg;</replaceable>"
-msgstr "xvcg <replaceable>paquet(s)</replaceable>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:227
 msgid ""
@@ -1307,9 +1238,9 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-cache.8.xml:231
 #, fuzzy
-#| msgid "policy <replaceable>[ pkg(s) ]</replaceable>"
-msgid "policy [ <replaceable>&synopsis-pkg;</replaceable>… ]"
-msgstr "policy <replaceable>[ paquet(s) ]</replaceable>"
+#| msgid "madison <replaceable>[ pkg(s) ]</replaceable>"
+msgid "<optional><replaceable>&synopsis-pkg;</replaceable>…</optional>"
+msgstr "madison <replaceable>[ paquet(s) ]</replaceable>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:232
@@ -1324,13 +1255,6 @@ msgstr ""
 "source. Sinon, elle affiche des informations précises sur la priorité du "
 "paquet donné en argument."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:238
-#, fuzzy
-#| msgid "madison <replaceable>[ pkg(s) ]</replaceable>"
-msgid "madison <replaceable>&synopsis-pkg;</replaceable>…"
-msgstr "madison <replaceable>[ paquet(s) ]</replaceable>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:239
 msgid ""
@@ -1351,23 +1275,13 @@ msgstr ""
 "Apt a lu la liste des paquets disponibles (<literal>APT::Architecture</"
 "literal>)."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:250 apt-config.8.xml:84 apt-extracttemplates.1.xml:51
+#. type: Content of: <refentry><refsect1><title>
+#: apt-cache.8.xml:250 apt-config.8.xml:84 apt-extracttemplates.1.xml:52
 #: apt-ftparchive.1.xml:504 apt-get.8.xml:259 apt-mark.8.xml:108
-#: apt-sortpkgs.1.xml:48 apt.conf.5.xml:586 apt.conf.5.xml:608
+#: apt-sortpkgs.1.xml:48
 msgid "options"
 msgstr "options"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:254
-msgid "<option>-p</option>"
-msgstr "<option>-p</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:254
-msgid "<option>--pkg-cache</option>"
-msgstr "<option>--pkg-cache</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:255
 msgid ""
@@ -1379,17 +1293,6 @@ msgstr ""
 "cache primaire utilisé par toutes les opérations. Élément de configuration : "
 "<literal>Dir::Cache::pkgcache</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:260 apt-ftparchive.1.xml:551 apt-get.8.xml:321
-#: apt-sortpkgs.1.xml:52
-msgid "<option>-s</option>"
-msgstr "<option>-s</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:260
-msgid "<option>--src-cache</option>"
-msgstr "<option>--src-cache</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:261
 msgid ""
@@ -1406,16 +1309,6 @@ msgstr ""
 "d'analyser à nouveau tous les paquets. Élément de configuration : "
 "<literal>Dir::Cache::srcpkgcache</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:268 apt-ftparchive.1.xml:525 apt-get.8.xml:311
-msgid "<option>-q</option>"
-msgstr "<option>-q</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:268 apt-ftparchive.1.xml:525 apt-get.8.xml:311
-msgid "<option>--quiet</option>"
-msgstr "<option>--quiet</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:269
 msgid ""
@@ -1431,16 +1324,6 @@ msgstr ""
 "silence, annulant le fichier de configuration. Élément de configuration : "
 "<literal>quiet</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:275
-msgid "<option>-i</option>"
-msgstr "<option>-i</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:275
-msgid "<option>--important</option>"
-msgstr "<option>--important</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:276
 msgid ""
@@ -1452,46 +1335,6 @@ msgstr ""
 "unmet et depends pour n'afficher que les relations Depends et Pre-Depends. "
 "Élément de configuration : <literal>APT::Cache::Important</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:281
-msgid "<option>--no-pre-depends</option>"
-msgstr "<option>--no-pre-depends</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:282
-msgid "<option>--no-depends</option>"
-msgstr "<option>--no-depends</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:283
-msgid "<option>--no-recommends</option>"
-msgstr "<option>--no-recommends</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:284
-msgid "<option>--no-suggests</option>"
-msgstr "<option>--no-suggests</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:285
-msgid "<option>--no-conflicts</option>"
-msgstr "<option>--no-conflicts</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:286
-msgid "<option>--no-breaks</option>"
-msgstr "<option>--no-breaks</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:287
-msgid "<option>--no-replaces</option>"
-msgstr "<option>--no-replaces</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:288
-msgid "<option>--no-enhances</option>"
-msgstr "<option>--no-enhances</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:289
 #, fuzzy
@@ -1514,16 +1357,6 @@ msgstr ""
 "configuration : <literal>APT::Cache::Show<replaceable>TypeDépendance</"
 "replaceable></literal>, p. ex. <literal>APT::Cache::ShowRecommends</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:295 apt-cdrom.8.xml:111 apt-get.8.xml:278
-msgid "<option>-f</option>"
-msgstr "<option>-f</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:295
-msgid "<option>--full</option>"
-msgstr "<option>--full</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:296
 msgid ""
@@ -1534,17 +1367,6 @@ msgstr ""
 "recherche. Élément de configuration : <literal>APT::Cache::ShowFull</"
 "literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:300 apt-cdrom.8.xml:121 apt-ftparchive.1.xml:563
-#: apt-get.8.xml:369
-msgid "<option>-a</option>"
-msgstr "<option>-a</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:300
-msgid "<option>--all-versions</option>"
-msgstr "<option>--all-versions</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:301
 msgid ""
@@ -1563,16 +1385,6 @@ msgstr ""
 "seulement la commande <literal>show</literal>. Élément de configuration : "
 "<literal>APT::Cache::AllVersions</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:309
-msgid "<option>-g</option>"
-msgstr "<option>-g</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:309
-msgid "<option>--generate</option>"
-msgstr "<option>--generate</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:310
 msgid ""
@@ -1585,16 +1397,6 @@ msgstr ""
 "défaut), utilisez l'option <option>--no-generate</option>. Élément de "
 "configuration : <literal>APT::Cache::Generate</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:315
-msgid "<option>--names-only</option>"
-msgstr "<option>--names-only</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:315 apt-cdrom.8.xml:129
-msgid "<option>-n</option>"
-msgstr "<option>-n</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:316
 msgid ""
@@ -1605,11 +1407,6 @@ msgstr ""
 "descriptions longues. Élément de configuration : <literal>APT::Cache::"
 "NamesOnly</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:320
-msgid "<option>--all-names</option>"
-msgstr "<option>--all-names</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:321
 msgid ""
@@ -1621,11 +1418,6 @@ msgstr ""
 "noms des paquets virtuels et les dépendances manquantes. Élément de "
 "configuration : <literal>APT::Cache::AllNames</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:326
-msgid "<option>--recurse</option>"
-msgstr "<option>--recurse</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:327
 msgid ""
@@ -1638,11 +1430,6 @@ msgstr ""
 "mentionnés. Élément de configuration : <literal>APT::Cache::RecurseDepends</"
 "literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:332
-msgid "<option>--installed</option>"
-msgstr "<option>--installed</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:334
 msgid ""
@@ -1656,14 +1443,14 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist>
 #: apt-cache.8.xml:339 apt-cdrom.8.xml:140 apt-config.8.xml:104
-#: apt-extracttemplates.1.xml:62 apt-ftparchive.1.xml:591 apt-get.8.xml:514
+#: apt-extracttemplates.1.xml:63 apt-ftparchive.1.xml:591 apt-get.8.xml:514
 #: apt-mark.8.xml:122 apt-sortpkgs.1.xml:58
 msgid "&apt-commonoptions;"
 msgstr "&apt-commonoptions;"
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-cache.8.xml:344 apt-get.8.xml:519 apt-key.8.xml:167 apt-mark.8.xml:126
-#: apt.conf.5.xml:1119 apt_preferences.5.xml:697
+#: apt.conf.5.xml:1119 apt_preferences.5.xml:698
 msgid "Files"
 msgstr "Fichiers"
 
@@ -1674,9 +1461,9 @@ msgstr "&file-sourceslist; &file-statelists;"
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-cache.8.xml:351 apt-cdrom.8.xml:145 apt-config.8.xml:109
-#: apt-extracttemplates.1.xml:69 apt-ftparchive.1.xml:607 apt-get.8.xml:529
+#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:607 apt-get.8.xml:529
 #: apt-key.8.xml:188 apt-mark.8.xml:132 apt-secure.8.xml:185
-#: apt-sortpkgs.1.xml:63 apt.conf.5.xml:1125 apt_preferences.5.xml:704
+#: apt-sortpkgs.1.xml:63 apt.conf.5.xml:1125 apt_preferences.5.xml:705
 #: sources.list.5.xml:255
 msgid "See Also"
 msgstr "Voir aussi"
@@ -1688,7 +1475,7 @@ msgstr "&apt-conf;, &sources-list;, &apt-get;."
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:114
-#: apt-extracttemplates.1.xml:73 apt-ftparchive.1.xml:611 apt-get.8.xml:535
+#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:611 apt-get.8.xml:535
 #: apt-mark.8.xml:136 apt-sortpkgs.1.xml:67
 msgid "Diagnostics"
 msgstr "Diagnostics"
@@ -1746,11 +1533,6 @@ msgstr ""
 "chaque disque d'un ensemble de CD doit être séparément inséré et parcouru "
 "pour prendre en compte de possibles erreurs de gravure."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:55
-msgid "add"
-msgstr "add"
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt-cdrom.8.xml:56
 msgid ""
@@ -1777,11 +1559,6 @@ msgstr ""
 "actuellement dans le lecteur et maintient une base de données de ces "
 "identifiants dans <filename>&statedir;/cdroms.list</filename>."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:71
-msgid "ident"
-msgstr "ident"
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt-cdrom.8.xml:72
 msgid ""
@@ -1807,16 +1584,6 @@ msgstr ""
 msgid "Options"
 msgstr "Options"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:85 apt-ftparchive.1.xml:519 apt-get.8.xml:273
-msgid "<option>-d</option>"
-msgstr "<option>-d</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:85
-msgid "<option>--cdrom</option>"
-msgstr "<option>--cdrom</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cdrom.8.xml:86
 msgid ""
@@ -1829,16 +1596,6 @@ msgstr ""
 "correctement configuré. Élément de configuration : <literal>Acquire::cdrom::"
 "mount</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:94
-msgid "<option>-r</option>"
-msgstr "<option>-r</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:94
-msgid "<option>--rename</option>"
-msgstr "<option>--rename</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cdrom.8.xml:95
 msgid ""
@@ -1851,16 +1608,6 @@ msgstr ""
 "demander un nouveau nom à l'utilisateur. Élément de configuration : "
 "<literal>APT::CDROM::Rename</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:103 apt-get.8.xml:292
-msgid "<option>-m</option>"
-msgstr "<option>-m</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:103
-msgid "<option>--no-mount</option>"
-msgstr "<option>--no-mount</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cdrom.8.xml:104
 msgid ""
@@ -1872,11 +1619,6 @@ msgstr ""
 "le point de montage. Élément de configuration : <literal >APT::CDROM::"
 "NoMount</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:111
-msgid "<option>--fast</option>"
-msgstr "<option>--fast</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cdrom.8.xml:112
 msgid ""
@@ -1891,11 +1633,6 @@ msgstr ""
 "aucune erreur. Élément de configuration : <literal>APT::CDROM::Fast</"
 "literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:121
-msgid "<option>--thorough</option>"
-msgstr "<option>--thorough</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cdrom.8.xml:122
 msgid ""
@@ -1908,21 +1645,6 @@ msgstr ""
 "situés dans des endroits inhabituels. Il faudra plus de temps pour parcourir "
 "le CD mais tous les paquets seront repérés."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:130 apt-get.8.xml:323
-msgid "<option>--just-print</option>"
-msgstr "<option>--just-print</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:131 apt-get.8.xml:325
-msgid "<option>--recon</option>"
-msgstr "<option>--recon</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:132 apt-get.8.xml:326
-msgid "<option>--no-act</option>"
-msgstr "<option>--no-act</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cdrom.8.xml:133
 msgid ""
@@ -1992,11 +1714,6 @@ msgstr ""
 "À moins que l'option <option>-h</option> ou <option>--help</option> ne soit "
 "donnée, l'une des commandes suivantes doit être présente."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-config.8.xml:49
-msgid "shell"
-msgstr "shell"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-config.8.xml:51
 msgid ""
@@ -2051,13 +1768,6 @@ msgstr ""
 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><term>
-#: apt-config.8.xml:89
-#, fuzzy
-#| msgid "<option>--help</option>"
-msgid "<option>--empty</option>"
-msgstr "<option>--help</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-config.8.xml:90
 msgid ""
@@ -2065,11 +1775,9 @@ msgid ""
 "empty to remove them from the output."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
 #: apt-config.8.xml:95
-msgid ""
-"<option>--format '<replaceable>&percnt;f &#x0022;&percnt;v&#x0022;;&percnt;"
-"n</replaceable>'</option>"
+msgid "&percnt;f &#x0022;&percnt;v&#x0022;;&percnt;n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -2085,7 +1793,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:110 apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:608
+#: apt-config.8.xml:110 apt-extracttemplates.1.xml:71 apt-ftparchive.1.xml:608
 #: apt-sortpkgs.1.xml:64
 msgid "&apt-conf;"
 msgstr "&apt-conf;"
@@ -2138,11 +1846,19 @@ msgstr "paquet version guide-de-configuration script-de-configuration"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-extracttemplates.1.xml:45
+#, fuzzy
+#| msgid ""
+#| "template-file and config-script are written to the temporary directory "
+#| "specified by the -t or --tempdir (<literal>APT::ExtractTemplates::"
+#| "TempDir</literal>)  directory, with filenames of the form "
+#| "<filename>package.template.XXXX</filename> and <filename>package.config."
+#| "XXXX</filename>"
 msgid ""
 "template-file and config-script are written to the temporary directory "
-"specified by the -t or --tempdir (<literal>APT::ExtractTemplates::TempDir</"
-"literal>)  directory, with filenames of the form <filename>package.template."
-"XXXX</filename> and <filename>package.config.XXXX</filename>"
+"specified by the <option>-t</option> or <option>--tempdir</option> "
+"(<literal>APT::ExtractTemplates::TempDir</literal>) directory, with "
+"filenames of the form <filename>package.template.XXXX</filename> and "
+"<filename>package.config.XXXX</filename>"
 msgstr ""
 "Les scripts et guides de configuration sont écrits dans le répertoire "
 "temporaire indiqué par l'option <option>-t</option> ou <option>--tempdir</"
@@ -2150,18 +1866,8 @@ msgstr ""
 "fichier sont de la forme <filename>package.template.XXXX</filename> ou "
 "<filename>package.config.XXXX</filename>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-extracttemplates.1.xml:55 apt-get.8.xml:448
-msgid "<option>-t</option>"
-msgstr "<option>-t</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-extracttemplates.1.xml:55
-msgid "<option>--tempdir</option>"
-msgstr "<option>--tempdir</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-extracttemplates.1.xml:57
+#: apt-extracttemplates.1.xml:58
 msgid ""
 "Temporary directory in which to write extracted debconf template files and "
 "config scripts.  Configuration Item: <literal>APT::ExtractTemplates::"
@@ -2172,7 +1878,7 @@ msgstr ""
 "ExtractTemplates::TempDir</literal>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:74
+#: apt-extracttemplates.1.xml:75
 msgid ""
 "<command>apt-extracttemplates</command> returns zero on normal operation, "
 "decimal 100 on error."
@@ -2242,11 +1948,6 @@ msgstr ""
 "vérifie les changements dans les fichiers et crée les fichiers compressés "
 "voulus."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:58
-msgid "packages"
-msgstr "packages"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:60
 msgid ""
@@ -2269,11 +1970,6 @@ msgstr ""
 "On peut se servir de l'option <option>--db</option> pour demander un cache "
 "binaire."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:68
-msgid "sources"
-msgstr "sources"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:70
 msgid ""
@@ -2299,11 +1995,6 @@ msgstr ""
 "extension .src qui est recherché. On peut se servir de l'option --source-"
 "override pour changer de fichier source d'« override »."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:80
-msgid "contents"
-msgstr "contents"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:82
 msgid ""
@@ -2322,11 +2013,6 @@ msgstr ""
 "partie du résultat. Quand un fichier appartient à plusieurs paquets, une "
 "virgule sépare les paquets."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:92
-msgid "release"
-msgstr "release"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:94
 msgid ""
@@ -2374,11 +2060,6 @@ msgstr ""
 "<literal>Architectures</literal>, <literal>Components</literal>, "
 "<literal>Description</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:115
-msgid "generate"
-msgstr "generate"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:117
 msgid ""
@@ -2393,11 +2074,6 @@ msgstr ""
 "configuration donné. Le langage de configuration fournit un moyen souple de "
 "préciser index et répertoires aussi bien que les paramètres requis."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:124 apt-get.8.xml:215
-msgid "clean"
-msgstr "clean"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:126
 msgid ""
@@ -2455,11 +2131,6 @@ msgstr ""
 "sont précédés de chemins relatifs définis dans les sections suivantes de "
 "manière à produire un chemin absolu et complet."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:151
-msgid "ArchiveDir"
-msgstr "ArchiveDir"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:153
 msgid ""
@@ -2471,31 +2142,16 @@ msgstr ""
 "classique, c'est le répertoire qui contient le fichier <filename>ls-LR</"
 "filename> et les noeuds des distributions."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:158
-msgid "OverrideDir"
-msgstr "OverrideDir"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:160
 msgid "Specifies the location of the override files."
 msgstr "Indique l'emplacement des fichiers d'« override »."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:163
-msgid "CacheDir"
-msgstr "CacheDir"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:165
 msgid "Specifies the location of the cache files"
 msgstr "Indique l'emplacement des fichiers de cache."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:168
-msgid "FileListDir"
-msgstr "FileListDir"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:170
 msgid ""
@@ -2521,11 +2177,6 @@ msgstr ""
 "paramètres qui contrôlent la marche du générateur. Ces valeurs peuvent être "
 "annulées dans d'autres sections (paramètrage par section)."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:182
-msgid "Packages::Compress"
-msgstr "Packages::Compress"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:184
 msgid ""
@@ -2539,11 +2190,6 @@ msgstr ""
 "des valeurs suivantes : « . » (pas de compression), « gzip », « bzip2 ».  "
 "Par défaut, c'est la chaîne « . gzip »."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:190
-msgid "Packages::Extensions"
-msgstr "Packages::Extensions"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:192
 msgid ""
@@ -2553,11 +2199,6 @@ msgstr ""
 "Indique la liste par défaut des extensions de fichier qui constituent des "
 "paquets. Par défaut, c'est « .deb »."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:196
-msgid "Sources::Compress"
-msgstr "Sources::Compress"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:198
 msgid ""
@@ -2567,11 +2208,6 @@ msgstr ""
 "Identique à <literal>Packages::Compress</literal> mais précise comment sont "
 "compressés les fichiers sources."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:202
-msgid "Sources::Extensions"
-msgstr "Sources::Extensions"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:204
 msgid ""
@@ -2581,11 +2217,6 @@ msgstr ""
 "Indique la liste par défaut des extensions de fichier qui constituent des "
 "fichiers sources. Par défaut, c'est « .dsc »."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:208
-msgid "Contents::Compress"
-msgstr "Contents::Compress"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:210
 msgid ""
@@ -2595,11 +2226,6 @@ msgstr ""
 "Identique à <literal>Packages::Compress</literal> mais précise comment sont "
 "compressés les fichiers « Contents »."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:214
-msgid "Translation::Compress"
-msgstr "Translation::Compress"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:216
 msgid ""
@@ -2609,11 +2235,6 @@ msgstr ""
 "Identique à <literal>Packages::Compress</literal> mais précise comment est "
 "compressé le fichier maître Translations-en."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:220
-msgid "DeLinkLimit"
-msgstr "DeLinkLimit"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:222
 msgid ""
@@ -2625,11 +2246,6 @@ msgstr ""
 "dur) pour chaque exécution. On s'en sert, pour chaque section, avec le "
 "paramètre <literal>External-Links</literal>."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:227
-msgid "FileMode"
-msgstr "FileMode"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:229
 msgid ""
@@ -2640,11 +2256,6 @@ msgstr ""
 "c'est le mode 0644. Tous les fichiers d'index ont ce mode et le masque "
 "utilisateur (umasq) est ignoré."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:234 apt-ftparchive.1.xml:380
-msgid "LongDescription"
-msgstr "LongDescription"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:236 apt-ftparchive.1.xml:382
 msgid ""
@@ -2671,11 +2282,6 @@ msgstr ""
 "chaînes $(DIST), $(SECTION) et $(ARCH) sont remplacées par leur valeur "
 "respective."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:249
-msgid "MaxContentsChange"
-msgstr "MaxContentsChange"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:251
 msgid ""
@@ -2687,11 +2293,6 @@ msgstr ""
 "chaque jour. Les fichiers « Contents » sont choisis selon le système « round-"
 "robin » de manière que, sur plusieurs jours, tous soient reconstruits."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:256
-msgid "ContentsAge"
-msgstr "ContentsAge"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:258
 msgid ""
@@ -2710,11 +2311,6 @@ msgstr ""
 "nouveaux « .deb » seront installés, exigeant un nouveau « Contents ». Par "
 "défaut ce nombre vaut 10, l'unité étant le jour."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:267
-msgid "Directory"
-msgstr "Directory"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:269
 msgid ""
@@ -2724,11 +2320,6 @@ msgstr ""
 "Indique la racine de l'arborescence des « .deb ». Par défaut, c'est "
 "<filename>$(DIST)/$(SECTION)/binary-$(ARCH)/</filename>."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:273
-msgid "SrcDirectory"
-msgstr "SrcDirectory"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:275
 msgid ""
@@ -2738,11 +2329,6 @@ msgstr ""
 "Indique la racine de l'arborescence des paquets source. Par défaut, c'est "
 "<filename>$(DIST)/$(SECTION)/source/</filename>."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:279 apt-ftparchive.1.xml:418
-msgid "Packages"
-msgstr "Packages"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:281
 msgid ""
@@ -2752,11 +2338,6 @@ msgstr ""
 "Indique le fichier « Packages » créé. Par défaut, c'est <filename>$(DIST)/"
 "$(SECTION)/binary-$(ARCH)/Packages</filename>."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:285 apt-ftparchive.1.xml:423
-msgid "Sources"
-msgstr "Sources"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:287
 msgid ""
@@ -2766,11 +2347,6 @@ msgstr ""
 "Indique le fichier « Sources » créé. Par défaut, c'est <filename>$(DIST)/"
 "$(SECTION)/source/Sources</filename>."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:291
-msgid "Translation"
-msgstr "Translation"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:293
 msgid ""
@@ -2782,11 +2358,6 @@ msgstr ""
 "longues si elles ne sont pas incluses dans le fichier Packages. Valeur par "
 "défaut : <filename>$(DIST)/$(SECTION)/i18n/Translation-en</filename>"
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:298
-msgid "InternalPrefix"
-msgstr "InternalPrefix"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:300
 msgid ""
@@ -2798,11 +2369,6 @@ msgstr ""
 "considéré comme un lien interne plutôt que comme un lien externe. Par "
 "défaut, c'est <filename>$(DIST)/$(SECTION)/</filename>."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:305 apt-ftparchive.1.xml:429
-msgid "Contents"
-msgstr "Contents"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:307
 msgid ""
@@ -2816,21 +2382,11 @@ msgstr ""
 "fichiers « Packages » se réfèrent à un seul fichier « Contents », "
 "<command>apt-ftparchive</command> les intègre automatiquement."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:314
-msgid "Contents::Header"
-msgstr "Contents::Header"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:316
 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><term>
-#: apt-ftparchive.1.xml:319 apt-ftparchive.1.xml:454
-msgid "BinCacheDB"
-msgstr "BinCacheDB"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:321
 msgid ""
@@ -2840,11 +2396,6 @@ msgstr ""
 "Indique la base de données binaire servant de cache pour cette section.  "
 "Différentes sections peuvent partager cette base de données."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:325
-msgid "FileList"
-msgstr "FileList"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:327
 msgid ""
@@ -2856,11 +2407,6 @@ msgstr ""
 "doit lire la liste de fichiers dans le fichier donné en paramètre. Les noms "
 "relatifs sont préfixés par le répertoire de l'archive."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:332
-msgid "SourceFileList"
-msgstr "SourceFileList"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:334
 msgid ""
@@ -2942,11 +2488,6 @@ msgstr ""
 "ftparchive</command> effectue une opération analogue à : <placeholder type="
 "\"programlisting\" id=\"0\"/>"
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:366
-msgid "Sections"
-msgstr "Sections"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:368
 msgid ""
@@ -2958,11 +2499,6 @@ msgstr ""
 "distribution ; classiquement, on trouve <literal>main contrib non-free</"
 "literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:373 apt.conf.5.xml:157
-msgid "Architectures"
-msgstr "Architectures"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:375
 msgid ""
@@ -2974,11 +2510,6 @@ msgstr ""
 "appartiennent à chaque section. L'architecture spéciale « source » indique "
 "que l'arborescence est une arborescence de sources."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:386 apt-ftparchive.1.xml:434
-msgid "BinOverride"
-msgstr "BinOverride"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:388
 msgid ""
@@ -2988,11 +2519,6 @@ msgstr ""
 "Indique le fichier binaire d'« override ». Ce fichier contient des "
 "informations sur la section, la priorité et le responsable du paquet."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:392 apt-ftparchive.1.xml:439
-msgid "SrcOverride"
-msgstr "SrcOverride"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:394
 msgid ""
@@ -3002,21 +2528,11 @@ msgstr ""
 "Indique le fichier source d'« override ». Ce fichier contient des "
 "informations sur la section."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:398 apt-ftparchive.1.xml:444
-msgid "ExtraOverride"
-msgstr "ExtraOverride"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:400 apt-ftparchive.1.xml:446
 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><term>
-#: apt-ftparchive.1.xml:403 apt-ftparchive.1.xml:449
-msgid "SrcExtraOverride"
-msgstr "SrcExtraOverride"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:405 apt-ftparchive.1.xml:451
 msgid "Sets the source extra override file."
@@ -3076,21 +2592,11 @@ msgstr "Définit le fichier d'« override » pour les sources."
 msgid "Sets the cache DB."
 msgstr "Définit la base de données cache."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:459
-msgid "PathPrefix"
-msgstr "PathPrefix"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:461
 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><term>
-#: apt-ftparchive.1.xml:464
-msgid "FileList, SourceFileList"
-msgstr "FileList, SourceFileList"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:466
 msgid "Specifies the file list file."
@@ -3178,12 +2684,6 @@ msgstr ""
 "représente le paquet, la seconde est une étiquette et la troisième en fin de "
 "ligne est la nouvelle valeur."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:508
-msgid ""
-"<option>--md5</option>, <option>--sha1</option>, <option>--sha256</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:510
 #, fuzzy
@@ -3216,11 +2716,6 @@ msgstr ""
 "<literal>Architectures</literal>, <literal>Components</literal>, "
 "<literal>Description</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:519
-msgid "<option>--db</option>"
-msgstr "<option>--db</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:521
 msgid ""
@@ -3246,11 +2741,6 @@ msgstr ""
 "niveau de silence, et annuler le fichier de configuration. Élément de "
 "configuration : <literal>quiet</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:533
-msgid "<option>--delink</option>"
-msgstr "<option>--delink</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:535
 msgid ""
@@ -3265,11 +2755,6 @@ msgstr ""
 "option>. Élément de configuration : <literal>APT::FTPArchive::DeLinkAct</"
 "literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:541
-msgid "<option>--contents</option>"
-msgstr "<option>--contents</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:543
 msgid ""
@@ -3286,11 +2771,6 @@ msgstr ""
 "la création de fichiers « Contents ». Par défaut, elle est activée. Élément "
 "de configuration : <literal>APT::FTPArchive::Contents</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:551
-msgid "<option>--source-override</option>"
-msgstr "<option>--source-override</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:553
 msgid ""
@@ -3302,11 +2782,6 @@ msgstr ""
 "<literal>sources</literal>. Élément de configuration : <literal>APT::"
 "FTPArchive::SourceOverride</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:557
-msgid "<option>--readonly</option>"
-msgstr "<option>--readonly</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:559
 msgid ""
@@ -3316,11 +2791,6 @@ msgstr ""
 "N'autoriser que la lecture pour les bases de données de cache. Élément de "
 "configuration : <literal>APT::FTPArchive::ReadOnlyDB</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:563
-msgid "<option>--arch</option>"
-msgstr "<option>--arch</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:564
 msgid ""
@@ -3335,11 +2805,6 @@ msgstr ""
 "tous les fichiers de paquets du chemin indiqué.Élément de configuration : "
 "<literal>APT::FTPArchive::Architecture</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:570
-msgid "<option>APT::FTPArchive::AlwaysStat</option>"
-msgstr "<option>APT::FTPArchive::AlwaysStat</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:572
 msgid ""
@@ -3363,11 +2828,6 @@ msgstr ""
 "versions identiques. En théorie, donc, ces problème ne devraient pas "
 "survenir et l'ensemble de ces contrôles devient inutile."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:582
-msgid "<option>APT::FTPArchive::LongDescription</option>"
-msgstr "<option>APT::FTPArchive::LongDescription</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:584
 msgid ""
@@ -3385,7 +2845,7 @@ msgstr ""
 "generate."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:596 apt.conf.5.xml:1113 apt_preferences.5.xml:544
+#: apt-ftparchive.1.xml:596 apt.conf.5.xml:1113 apt_preferences.5.xml:545
 #: sources.list.5.xml:214
 msgid "Examples"
 msgstr "Exemples"
@@ -3448,11 +2908,6 @@ msgstr ""
 "autres programmes de la bibliothèque APT.  Plusieurs interfaces utilisateur "
 "existent, comme &dselect;, &aptitude;, &synaptic; and &wajig;."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:48 apt-key.8.xml:119
-msgid "update"
-msgstr "update"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:49
 msgid ""
@@ -3478,11 +2933,6 @@ msgstr ""
 "progression d'ensemble peut être imprécis puisque la taille de ces fichiers "
 "ne peut être connue à l'avance."
 
-#. type: <tag></tag>
-#: apt-get.8.xml:60 guide.sgml:121
-msgid "upgrade"
-msgstr "upgrade"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:61
 msgid ""
@@ -3509,11 +2959,6 @@ msgstr ""
 "<literal>update</literal> pour que <command>apt-get</command> connaisse "
 "l'existence de nouvelles versions des paquets."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:73
-msgid "dselect-upgrade"
-msgstr "dselect-upgrade"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:74
 msgid ""
@@ -3532,11 +2977,6 @@ msgstr ""
 "réalisation de cet état (par exemple, suppression d'anciens paquets, "
 "installation de nouveaux paquets)."
 
-#. type: <tag></tag>
-#: apt-get.8.xml:83 guide.sgml:140
-msgid "dist-upgrade"
-msgstr "dist-upgrade"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:84
 msgid ""
@@ -3560,11 +3000,6 @@ msgstr ""
 "sources où récupérer les paquets désirés. Voyez aussi &apt-preferences; pour "
 "un mécanisme de remplacement des paramètres généraux pour certains paquets."
 
-#. type: <tag></tag>
-#: apt-get.8.xml:96 guide.sgml:131
-msgid "install"
-msgstr "install"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:98
 msgid ""
@@ -3670,11 +3105,6 @@ msgstr ""
 "un caractère « ^ » ou un caractère « $ », une autre possibilité étant "
 "d'utiliser une expression plus précise."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:150
-msgid "remove"
-msgstr "remove"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:151
 msgid ""
@@ -3691,11 +3121,6 @@ msgstr ""
 "(sans espace intermédiaire) au nom du paquet, le paquet est installé au lieu "
 "d'être supprimé."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:158
-msgid "purge"
-msgstr "purge"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:159
 msgid ""
@@ -3707,11 +3132,6 @@ msgstr ""
 "literal> mais les paquets indiqués sont supprimés et purgés (leurs fichiers "
 "de configuration sont également effacés)."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:163
-msgid "source"
-msgstr "source"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:164
 msgid ""
@@ -3793,11 +3213,6 @@ msgstr ""
 "paquets binaires. Ils ne sont présents que dans le répertoire courant et "
 "sont semblables à des sources téléchargées sous forme d'archives tar."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:197
-msgid "build-dep"
-msgstr "build-dep"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:198
 #, fuzzy
@@ -3815,11 +3230,6 @@ msgstr ""
 "des paquets dans le but de satisfaire les dépendances de construction d'un "
 "paquet source."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:204
-msgid "check"
-msgstr "check"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:205
 msgid ""
@@ -3829,11 +3239,6 @@ msgstr ""
 "La commande <literal>check</literal> est un outil de diagnostic ; il met à "
 "jour le cache des paquets et cherche les dépendances défectueuses."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:209
-msgid "download"
-msgstr "download"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:210
 #, fuzzy
@@ -3866,11 +3271,6 @@ msgstr ""
 "n'utilise pas dselect, il faut exécuter <literal>apt-get clean</literal> de "
 "temps en temps si l'on veut libérer de l'espace disque."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:225
-msgid "autoclean"
-msgstr "autoclean"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:226
 msgid ""
@@ -3890,11 +3290,6 @@ msgstr ""
 "<literal>APT::Clean-Installed</literal> empêche la suppression de paquets "
 "installés."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:235
-msgid "autoremove"
-msgstr "autoremove"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:236
 #, fuzzy
@@ -3911,20 +3306,26 @@ msgstr ""
 "installés dans le but de satisfaire les dépendances d'un paquet donné et qui "
 "ne sont plus nécessaires."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:240
-msgid "changelog"
-msgstr "changelog"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:241
+#, fuzzy
+#| msgid ""
+#| "<literal>changelog</literal> downloads a package changelog and displays "
+#| "it through <command>sensible-pager</command>. The server name and base "
+#| "directory is defined in the <literal>APT::Changelogs::Server</literal> "
+#| "variable (e. g. <ulink>http://packages.debian.org/changelogs</ulink> for "
+#| "Debian or <ulink>http://changelogs.ubuntu.com/changelogs</ulink> for "
+#| "Ubuntu).  By default it displays the changelog for the version that is "
+#| "installed.  However, you can specify the same options as for the "
+#| "<option>install</option> command."
 msgid ""
 "<literal>changelog</literal> downloads a package changelog and displays it "
 "through <command>sensible-pager</command>. The server name and base "
 "directory is defined in the <literal>APT::Changelogs::Server</literal> "
-"variable (e. g. <ulink>http://packages.debian.org/changelogs</ulink> for "
-"Debian or <ulink>http://changelogs.ubuntu.com/changelogs</ulink> for "
-"Ubuntu).  By default it displays the changelog for the version that is "
+"variable (e. g. <ulink url=\"http://packages.debian.org/changelogs"
+"\">packages.debian.org/changelogs</ulink> for Debian or <ulink url=\"http://"
+"changelogs.ubuntu.com/changelogs\">changelogs.ubuntu.com/changelogs</ulink> "
+"for Ubuntu).  By default it displays the changelog for the version that is "
 "installed.  However, you can specify the same options as for the "
 "<option>install</option> command."
 msgstr ""
@@ -3938,11 +3339,6 @@ msgstr ""
 "il est possible d'utiliser les mêmes options que pour la commande "
 "<option>install</option>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:263
-msgid "<option>--no-install-recommends</option>"
-msgstr "<option>--no-install-recommends</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:264
 msgid ""
@@ -3952,11 +3348,6 @@ msgstr ""
 "Ne pas considérer les paquets recommandés comme des dépendances à installer. "
 "Élément de configuration : <literal>APT::Install-Recommends</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:268
-msgid "<option>--install-suggests</option>"
-msgstr "<option>--install-suggests</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:269
 msgid ""
@@ -3966,11 +3357,6 @@ msgstr ""
 "Considérer les paquets suggérés comme des dépendances à installer. Élément "
 "de configuration : <literal>APT::Install-Suggests</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:273
-msgid "<option>--download-only</option>"
-msgstr "<option>--download-only</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:274
 msgid ""
@@ -3981,11 +3367,6 @@ msgstr ""
 "ni installés. Élément de configuration : <literal>APT::Get::Download-Only</"
 "literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:278
-msgid "<option>--fix-broken</option>"
-msgstr "<option>--fix-broken</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:279
 msgid ""
@@ -4014,16 +3395,6 @@ msgstr ""
 "m</option> peut produire une erreur dans certaines situations. Élément de "
 "configuration : <literal>APT::Get::Fix-Broken</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:292
-msgid "<option>--ignore-missing</option>"
-msgstr "<option>--ignore-missing</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:293
-msgid "<option>--fix-missing</option>"
-msgstr "<option>--fix-missing</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:294
 msgid ""
@@ -4044,11 +3415,6 @@ msgstr ""
 "récupéré, il est mis silencieusement de côté. Élément de configuration : "
 "<literal>APT::Get::Fix-Missing</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:304
-msgid "<option>--no-download</option>"
-msgstr "<option>--no-download</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:305
 msgid ""
@@ -4083,16 +3449,6 @@ msgstr ""
 "option> : APT pourrait alors exécuter des actions inattendues. Élément de "
 "configuration : <literal>quiet</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:322
-msgid "<option>--simulate</option>"
-msgstr "<option>--simulate</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:324
-msgid "<option>--dry-run</option>"
-msgstr "<option>--dry-run</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:327
 msgid ""
@@ -4136,21 +3492,6 @@ msgstr ""
 "encadrent des paquets endommagés et des crochets n'encadrant rien indiquent "
 "que les dommages n'ont aucune conséquence (rare)."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:344
-msgid "<option>-y</option>"
-msgstr "<option>-y</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:344
-msgid "<option>--yes</option>"
-msgstr "<option>--yes</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:345
-msgid "<option>--assume-yes</option>"
-msgstr "<option>--assume-yes</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:346
 msgid ""
@@ -4167,13 +3508,6 @@ msgstr ""
 "essentiel, <literal>apt-get</literal> s'interrompt.  Élément de "
 "configuration : <literal>APT::Get::Assume-Yes</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:353
-#, fuzzy
-#| msgid "<option>--assume-yes</option>"
-msgid "<option>--assume-no</option>"
-msgstr "<option>--assume-yes</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:354
 #, fuzzy
@@ -4187,16 +3521,6 @@ msgstr ""
 "Emplacements où aller chercher les paquets. Élément de configuration : "
 "<literal>Dir::Etc::SourceList</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:358
-msgid "<option>-u</option>"
-msgstr "<option>-u</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:358
-msgid "<option>--show-upgraded</option>"
-msgstr "<option>--show-upgraded</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:359
 msgid ""
@@ -4207,16 +3531,6 @@ msgstr ""
 "mettre à niveau. Élément de configuration : <literal>APT::Get::Show-"
 "Upgraded</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:364
-msgid "<option>-V</option>"
-msgstr "<option>-V</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:364
-msgid "<option>--verbose-versions</option>"
-msgstr "<option>--verbose-versions</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:365
 msgid ""
@@ -4226,13 +3540,6 @@ msgstr ""
 "Afficher les versions complètes des paquets installés ou mis à niveau.  "
 "Élément de configuration : <literal>APT::Get::Show-Versions</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:370
-#, fuzzy
-#| msgid "<option>--recurse</option>"
-msgid "<option>--host-architecture</option>"
-msgstr "<option>--recurse</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:371
 msgid ""
@@ -4244,21 +3551,6 @@ msgid ""
 "Architecture</literal>"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:379
-msgid "<option>-b</option>"
-msgstr "<option>-b</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:379
-msgid "<option>--compile</option>"
-msgstr "<option>--compile</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:380
-msgid "<option>--build</option>"
-msgstr "<option>--build</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:381
 msgid ""
@@ -4268,11 +3560,6 @@ msgstr ""
 "Cette commande compile un paquet source après l'avoir récupéré. Élément de "
 "configuration : <literal>APT::Get::Compile</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:385
-msgid "<option>--ignore-hold</option>"
-msgstr "<option>--ignore-hold</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:386
 msgid ""
@@ -4287,11 +3574,6 @@ msgstr ""
 "grand nombre de « hold » indésirables. Élément de configuration : "
 "<literal>APT::Ignore-Hold</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:392
-msgid "<option>--no-upgrade</option>"
-msgstr "<option>--no-upgrade</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:393
 msgid ""
@@ -4305,11 +3587,6 @@ msgstr ""
 "commande d'être mis à niveau. Élément de configuration : <literal>APT::Get::"
 "Upgrade</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:399
-msgid "<option>--only-upgrade</option>"
-msgstr "<option>--only-upgrade</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:400
 #, fuzzy
@@ -4330,11 +3607,6 @@ msgstr ""
 "sont pas déjà installés. Élément de configuration : <literal>APT::Get::Only-"
 "Upgrade</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:407
-msgid "<option>--force-yes</option>"
-msgstr "<option>--force-yes</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:408
 msgid ""
@@ -4351,11 +3623,6 @@ msgstr ""
 "détruire le système... Élément de configuration : <literal>APT::Get::force-"
 "yes</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:415
-msgid "<option>--print-uris</option>"
-msgstr "<option>--print-uris</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:416
 msgid ""
@@ -4378,11 +3645,6 @@ msgstr ""
 "décompresser les fichiers compressés. Élément de configuration : "
 "<literal>APT::Get::Print-URIs</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:426
-msgid "<option>--purge</option>"
-msgstr "<option>--purge</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:427
 msgid ""
@@ -4397,11 +3659,6 @@ msgstr ""
 "<option>purge</option>. Élément de configuration : <literal>APT::Get::Purge</"
 "literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:434
-msgid "<option>--reinstall</option>"
-msgstr "<option>--reinstall</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:435
 msgid ""
@@ -4411,11 +3668,6 @@ msgstr ""
 "Réinstaller les paquets déjà installés avec leur version la plus récente.  "
 "Élément de configuration : <literal>APT::Get::ReInstall</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:439
-msgid "<option>--list-cleanup</option>"
-msgstr "<option>--list-cleanup</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:440
 msgid ""
@@ -4434,16 +3686,6 @@ msgstr ""
 "sources. Élément de configuration : <literal>APT::Get::List-Cleanup</"
 "literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:449
-msgid "<option>--target-release</option>"
-msgstr "<option>--target-release</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:450
-msgid "<option>--default-release</option>"
-msgstr "<option>--default-release</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:451
 msgid ""
@@ -4466,11 +3708,6 @@ msgstr ""
 "<option>-t sid</option>.  Élément de configuration : <literal>APT::Default-"
 "Release</literal>.  Voyez aussi la page de manuel d'&apt-preferences;."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:464
-msgid "<option>--trivial-only</option>"
-msgstr "<option>--trivial-only</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:466
 msgid ""
@@ -4485,11 +3722,6 @@ msgstr ""
 "trivial-only</option> répond non. Élément de configuration : <literal>APT::"
 "Get::Trivial-Only</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:472
-msgid "<option>--no-remove</option>"
-msgstr "<option>--no-remove</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:473
 msgid ""
@@ -4500,11 +3732,6 @@ msgstr ""
 "doivent être supprimés. Élément de configuration : <literal>APT::Get::"
 "Remove</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:478
-msgid "<option>--auto-remove</option>"
-msgstr "<option>--auto-remove</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:479
 msgid ""
@@ -4518,11 +3745,6 @@ msgstr ""
 "qu'<literal>autoremove</literal> et supprime les paquets de dépendance "
 "inutilisés. Élément de configuration : <literal>APT::Get::Upgrade</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:485
-msgid "<option>--only-source</option>"
-msgstr "<option>--only-source</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:486
 msgid ""
@@ -4543,21 +3765,6 @@ msgstr ""
 "correspondants. Élément de configuration : <literal>APT::Get::Only-Source</"
 "literal>"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:496
-msgid "<option>--diff-only</option>"
-msgstr "<option>--diff-only</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:496
-msgid "<option>--dsc-only</option>"
-msgstr "<option>--dsc-only</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:496
-msgid "<option>--tar-only</option>"
-msgstr "<option>--tar-only</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:497
 msgid ""
@@ -4570,11 +3777,6 @@ msgstr ""
 "<literal>APT::Get::Dsc-Only</literal> et <literal>APT::Get::Tar-Only</"
 "literal>, "
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:502
-msgid "<option>--arch-only</option>"
-msgstr "<option>--arch-only</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:503
 msgid ""
@@ -4585,11 +3787,6 @@ msgstr ""
 "l'architecture. Élément de configuration : <literal>APT::Get::Arch-Only</"
 "literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:507
-msgid "<option>--allow-unauthenticated</option>"
-msgstr "<option>--allow-unauthenticated</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:508
 msgid ""
@@ -4676,11 +3873,6 @@ msgstr ""
 msgid "Commands"
 msgstr "Commandes"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:40
-msgid "add &synopsis-param-filename;"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml:43
 #, fuzzy
@@ -4697,21 +3889,11 @@ msgstr ""
 "<replaceable>fichier</replaceable>, ou sur l'entrée standard si "
 "<replaceable>fichier</replaceable> est <literal>-</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:52
-msgid "del &synopsis-param-keyid;"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml:56
 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><term>
-#: apt-key.8.xml:63
-msgid "export &synopsis-param-keyid;"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml:67
 #, fuzzy
@@ -4719,41 +3901,21 @@ msgstr ""
 msgid "Output the key &synopsis-param-keyid; to standard output."
 msgstr "Afficher la clé <replaceable>clé</replaceable> sur la sortie standard."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:74
-msgid "exportall"
-msgstr "exportall"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml:78
 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><term>
-#: apt-key.8.xml:85
-msgid "list"
-msgstr "list"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml:89
 msgid "List trusted keys."
 msgstr "Afficher la liste des clés fiables."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:96
-msgid "finger"
-msgstr "finger"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml:100
 msgid "List fingerprints of trusted keys."
 msgstr "Afficher les empreintes des clés fiables."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:107
-msgid "adv"
-msgstr "adv"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml:111
 msgid ""
@@ -4773,13 +3935,6 @@ msgid ""
 "Debian."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:133
-#, fuzzy
-#| msgid "update"
-msgid "net-update"
-msgstr "update"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml:137
 msgid ""
@@ -4800,11 +3955,6 @@ msgstr ""
 "Veuillez noter que les options doivent être utilisées avant les commandes "
 "décrites dans la section suivante."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:156
-msgid "--keyring &synopsis-param-filename;"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml:157
 #, fuzzy
@@ -4921,13 +4071,6 @@ msgstr ""
 "supprimés par un appel à <command>apt-get</command> ou <command>aptitude</"
 "command>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:51
-#, fuzzy
-#| msgid "markauto"
-msgid "auto"
-msgstr "markauto"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml:52
 #, fuzzy
@@ -4944,11 +4087,6 @@ msgstr ""
 "installé automatiquement. Un tel paquet sera supprimé automatiquement dès "
 "que plus aucun paquet installé manuellement ne dépend de lui."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:59
-msgid "manual"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml:60
 #, fuzzy
@@ -4962,13 +4100,8 @@ msgid ""
 "if no other packages depend on it."
 msgstr ""
 "<literal>unmarkauto</literal> permet de marquer un paquet comme installé "
-"manuellement. Un tel paquet ne sera pas supprimé automatiquement, même si "
-"aucun autre paquet n'en dépend."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:67
-msgid "hold"
-msgstr ""
+"manuellement. Un tel paquet ne sera pas supprimé automatiquement, même si "
+"aucun autre paquet n'en dépend."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml:68
@@ -4980,11 +4113,6 @@ msgid ""
 "effected by the <option>--filename</option> option."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:77
-msgid "unhold"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml:78
 #, fuzzy
@@ -4998,11 +4126,6 @@ msgstr ""
 "<literal>showauto</literal>, affiche les paquets installés automatiquement, "
 "un paquet par ligne."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:83
-msgid "showauto"
-msgstr "showauto"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml:84
 #, fuzzy
@@ -5018,13 +4141,6 @@ msgstr ""
 "<literal>showauto</literal>, affiche les paquets installés automatiquement, "
 "un paquet par ligne."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:91
-#, fuzzy
-#| msgid "showauto"
-msgid "showmanual"
-msgstr "showauto"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml:92
 msgid ""
@@ -5033,13 +4149,6 @@ msgid ""
 "installed packages instead."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:98
-#, fuzzy
-#| msgid "showauto"
-msgid "showhold"
-msgstr "showauto"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml:99
 #, fuzzy
@@ -5053,29 +4162,27 @@ msgstr ""
 "<literal>showauto</literal>, affiche les paquets installés automatiquement, "
 "un paquet par ligne."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:112
-msgid ""
-"<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>"
-msgstr ""
-"<option>-f=<filename><replaceable>FICHIER</replaceable></filename></option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:113
-msgid ""
-"<option>--file=<filename><replaceable>FILENAME</replaceable></filename></"
-"option>"
-msgstr ""
-"<option>--file=<filename><replaceable>FICHIER</replaceable></filename></"
-"option>"
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><filename>
+#: apt-mark.8.xml:112 apt-mark.8.xml:113
+#, fuzzy
+#| msgid "xvcg <replaceable>pkg(s)</replaceable>"
+msgid "<replaceable>&synopsis-filename;</replaceable>"
+msgstr "xvcg <replaceable>paquet(s)</replaceable>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:116
-msgid ""
-"Read/Write package stats from <filename><replaceable>FILENAME</replaceable></"
-"filename> instead of the default location, which is "
-"<filename>extended_status</filename> in the directory defined by the "
-"Configuration Item: <literal>Dir::State</literal>."
+#: apt-mark.8.xml:115
+#, fuzzy
+#| msgid ""
+#| "Read/Write package stats from <filename><replaceable>FILENAME</"
+#| "replaceable></filename> instead of the default location, which is "
+#| "<filename>extended_status</filename> in the directory defined by the "
+#| "Configuration Item: <literal>Dir::State</literal>."
+msgid ""
+"Read/Write package stats from the filename given with the parameter "
+"<filename><replaceable>&synopsis-filename;</replaceable></filename> instead "
+"of from the default location, which is <filename>extended_status</filename> "
+"in the directory defined by the Configuration Item: <literal>Dir::State</"
+"literal>."
 msgstr ""
 "Lecture/écriture des statistiques d'un paquet dans "
 "<filename><replaceable>FICHIER</replaceable></filename> au lieu du fichier "
@@ -5453,11 +4560,6 @@ msgstr ""
 "Le résultat est envoyé sur la sortie standard ; l'entrée doit être un "
 "fichier analysable."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-sortpkgs.1.xml:52
-msgid "<option>--source</option>"
-msgstr "<option>--source</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-sortpkgs.1.xml:54
 msgid ""
@@ -5827,11 +4929,6 @@ msgstr ""
 "Ce groupe d'options contrôle le comportement global d'APT et contient "
 "également des options communes à tous les outils."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:151
-msgid "Architecture"
-msgstr "Architecture"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:152
 msgid ""
@@ -5856,11 +4953,6 @@ msgid ""
 "architectures</command>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:167
-msgid "Default-Release"
-msgstr "Default-Release"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:168
 msgid ""
@@ -5875,11 +4967,6 @@ msgstr ""
 "« &stable-codename; », « &testing-codename; », « 4.0 », « 5.0* ». Voir aussi "
 "&apt-preferences;."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:173
-msgid "Ignore-Hold"
-msgstr "Ignore-Hold"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:174
 msgid ""
@@ -5890,11 +4977,6 @@ msgstr ""
 "résolution de ne pas tenir compte des paquets « gelés » dans sa prise de "
 "décision."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:178
-msgid "Clean-Installed"
-msgstr "Clean-Installed"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:179
 msgid ""
@@ -5909,11 +4991,6 @@ msgstr ""
 "sont aussi exclus du nettoyage - mais notez que APT ne fournit aucun moyen "
 "direct pour les réinstaller."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:185
-msgid "Immediate-Configure"
-msgstr "Immediate-Configure"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:186
 msgid ""
@@ -5978,11 +5055,6 @@ msgstr ""
 "type de problème dans le système de suivi de bogues de la distribution "
 "utilisée afin qu'il soit étudié et corrigé."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:208
-msgid "Force-LoopBreak"
-msgstr "Force-LoopBreak"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:209
 msgid ""
@@ -6001,11 +5073,6 @@ msgstr ""
 "si les paquets essentiels ne sont pas tar, gzip, libc, dpkg, bash ou tous "
 "les paquets dont ces paquets dépendent."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:217
-msgid "Cache-Start, Cache-Grow and Cache-Limit"
-msgstr "Cache-Start, Cache-Grow et Cache-Limit"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:218
 #, fuzzy
@@ -6064,11 +5131,6 @@ msgstr ""
 "la taille maximale du cache). Si <literal>Cache-Grow</literal> est égal à 0, "
 "l'augmentation automatique de la taille du cache est désactivée."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:233
-msgid "Build-Essential"
-msgstr "Build-Essential"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:234
 msgid "Defines which package(s) are considered essential build dependencies."
@@ -6076,11 +5138,6 @@ 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><term>
-#: apt.conf.5.xml:237
-msgid "Get"
-msgstr "Get"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:238
 msgid ""
@@ -6091,11 +5148,6 @@ msgstr ""
 "consulter sa documentation pour avoir plus d'informations sur les options en "
 "question."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:242
-msgid "Cache"
-msgstr "Cache"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:243
 msgid ""
@@ -6106,11 +5158,6 @@ msgstr ""
 "veuillez consulter sa documentation pour avoir plus d'informations sur les "
 "options en question."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:247
-msgid "CDROM"
-msgstr "CDROM"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:248
 msgid ""
@@ -6126,11 +5173,6 @@ msgstr ""
 msgid "The Acquire Group"
 msgstr "Le groupe Acquire"
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:259
-msgid "Check-Valid-Until"
-msgstr "Check-Valid-Until"
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:260
 msgid ""
@@ -6151,11 +5193,6 @@ msgstr ""
 "Cependant, si cet en-tête est absent, la valeur du paramètre <literal>Max-"
 "ValidTime</literal> est alors utilisée."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:270
-msgid "Max-ValidTime"
-msgstr "Max-ValidTime"
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:271
 #, fuzzy
@@ -6188,13 +5225,6 @@ msgstr ""
 "obsolète ou pas. Un réglage spécifique pour une archive donnée peut être "
 "défini en ajoutant l'étiquette de l'archive au nom de l'option."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:281
-#, fuzzy
-#| msgid "Max-ValidTime"
-msgid "Min-ValidTime"
-msgstr "Max-ValidTime"
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:282
 #, fuzzy
@@ -6227,11 +5257,6 @@ msgstr ""
 "obsolète ou pas. Un réglage spécifique pour une archive donnée peut être "
 "défini en ajoutant l'étiquette de l'archive au nom de l'option."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:292
-msgid "PDiffs"
-msgstr "PDiffs"
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:293
 msgid ""
@@ -6269,11 +5294,6 @@ msgstr ""
 "dépassée, le fichier complet est téléchargé au lieu de télécharger les "
 "fichiers de différences."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:305
-msgid "Queue-Mode"
-msgstr "Queue-Mode"
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:306
 msgid ""
@@ -6290,11 +5310,6 @@ msgstr ""
 "<literal>access</literal> signifie qu'une connexion par type d'URI sera "
 "initiée."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:313
-msgid "Retries"
-msgstr "Retries"
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:314
 msgid ""
@@ -6305,11 +5320,6 @@ msgstr ""
 "récupérer, le nombre donné de fois, les fichiers dont la récupération a "
 "échoué."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:318
-msgid "Source-Symlinks"
-msgstr "Source-Symlinks"
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:319
 msgid ""
@@ -6320,11 +5330,6 @@ msgstr ""
 "« true », cette option crée si possible des liens symboliques vers les "
 "archives de sources au lieu de les copier.  Par défaut à « true »."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:323 sources.list.5.xml:160
-msgid "http"
-msgstr "http"
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:324
 msgid ""
@@ -6427,11 +5432,6 @@ msgstr ""
 "ce qui peut par exemple être utile avec certains mandataires HTTP qui "
 "n'autorisent l'accès qu'aux client s'identifiant de manière spécifique.."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:366
-msgid "https"
-msgstr "https"
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:367
 msgid ""
@@ -6480,11 +5480,6 @@ msgstr ""
 "pour la version de SSL à utiliser et peut contenir l'une des chaînes 'TLSv1' "
 "ou 'SSLv3'."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:391 sources.list.5.xml:171
-msgid "ftp"
-msgstr "ftp"
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:392
 msgid ""
@@ -6568,11 +5563,6 @@ msgstr ""
 "« true », on les utilise même si la connexion est de type IPv4. La plupart "
 "des serveurs FTP ne suivent pas la RFC 2428."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:430 sources.list.5.xml:153
-msgid "cdrom"
-msgstr "cdrom"
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
 #: apt.conf.5.xml:436
 #, no-wrap
@@ -6601,11 +5591,6 @@ msgstr ""
 "oblique finale est importante. Les commandes de démontage peuvent être "
 "spécifiées en utilisant <literal>UMount</literal>."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:441
-msgid "gpgv"
-msgstr "gpgv"
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:442
 msgid ""
@@ -6617,11 +5602,6 @@ msgstr ""
 "des paramètres à gpgv.  <literal>gpgv::Options</literal> : options "
 "supplémentaires passées à gpgv."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:447
-msgid "CompressionTypes"
-msgstr "CompressionTypes"
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
 #: apt.conf.5.xml:453
 #, no-wrap
@@ -6753,11 +5733,6 @@ msgstr ""
 "archives ne fournissent pas de fichiers non compressés, donc ce réglage est "
 "surtout destiné aux miroirs locaux."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:475
-msgid "GzipIndexes"
-msgstr "GzipIndexes"
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:477
 msgid ""
@@ -6773,11 +5748,6 @@ msgstr ""
 "processeur lorsque les caches locaux sont créés. Valeur par défaut : Faux "
 "(« False »)."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:484
-msgid "Languages"
-msgstr "Langues"
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:485
 msgid ""
@@ -7024,11 +5994,6 @@ msgstr ""
 "contrôlent le comportement par défaut. On les trouve dans la section "
 "<literal>DSelect</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:577
-msgid "Clean"
-msgstr "Clean"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:578
 msgid ""
@@ -7056,11 +6021,6 @@ msgstr ""
 "Le contenu de cette variable est passé comme options de ligne de commande à "
 "&apt-get; lors de la phase d'installation."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:591
-msgid "Updateoptions"
-msgstr "UpdateOptions"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:592
 msgid ""
@@ -7070,11 +6030,6 @@ msgstr ""
 "Le contenu de cette variable est passé comme options de ligne de commande à "
 "&apt-get; lors de la phase de mise à jour."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:596
-msgid "PromptAfterUpdate"
-msgstr "PromptAfterUpdate"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:597
 msgid ""
@@ -7110,16 +6065,6 @@ msgstr ""
 "déclarées en utilisant la notation de liste et chaque élément de la liste "
 "est passé comme un seul paramètre à &dpkg;."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:614
-msgid "Pre-Invoke"
-msgstr "Pre-Invoke"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:614
-msgid "Post-Invoke"
-msgstr "Post-Invoke"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:615
 msgid ""
@@ -7133,11 +6078,6 @@ msgstr ""
 "notation de liste. Les commandes sont appelées dans l'ordre, en utilisant "
 "<filename>/bin/sh</filename> : APT s'arrête dès que l'une d'elles échoue."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:621
-msgid "Pre-Install-Pkgs"
-msgstr "Pre-Install-Pkgs"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:622
 msgid ""
@@ -7170,11 +6110,6 @@ msgstr ""
 "<literal>cmd</literal> est une commande passée à <literal>Pre-Install-Pkgs</"
 "literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:635
-msgid "Run-Directory"
-msgstr "Run-Directory"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:636
 msgid ""
@@ -7184,11 +6119,6 @@ msgstr ""
 "APT se place dans ce répertoire avant d'appeler &dpkg; ; par défaut, c'est "
 "le répertoire <filename>/</filename>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:640
-msgid "Build-options"
-msgstr "Build-options"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:641
 msgid ""
@@ -7271,11 +6201,6 @@ msgstr ""
 "command>. Une combinaison intéressante d'options pourrait être <placeholder "
 "type=\"literallayout\" id=\"0\"/>."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:668
-msgid "DPkg::NoTriggers"
-msgstr "DPkg::NoTriggers"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:669
 msgid ""
@@ -7298,11 +6223,6 @@ msgstr ""
 "que cela sera désormais utilisé également avec les appels à dpkg avec les "
 "options « unpack » et « remove »."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:676
-msgid "PackageManager::Configure"
-msgstr "PackageManager::Configure"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:677
 msgid ""
@@ -7331,11 +6251,6 @@ msgstr ""
 "activée par défaut pour éviter de placer le système dans un état non "
 "configuré et donc éventuellement non amorçable."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:687
-msgid "DPkg::ConfigurePending"
-msgstr "DPkg::ConfigurePending"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:688
 msgid ""
@@ -7355,11 +6270,6 @@ msgstr ""
 "d'installation. Dans ce cas, seul le dernier de tous les appels successifs "
 "peut conserver l'option active."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:694
-msgid "DPkg::TriggersPending"
-msgstr "DPkg::TriggersPending"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:695
 msgid ""
@@ -7378,11 +6288,6 @@ msgstr ""
 "option provoquera la gestion de toutes les actions différées, pas seulement "
 "celles concernant le paquet en cours de traitement."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:700
-msgid "PackageManager::UnpackAll"
-msgstr "PackageManager::UnpackAll"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:701
 msgid ""
@@ -7408,11 +6313,6 @@ msgstr ""
 "est donc conseillé de s'y reporter en cas de doute car le contresens de "
 "traduction n'est pas exclu...)."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:708
-msgid "OrderList::Score::Immediate"
-msgstr "OrderList::Score::Immediate"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
 #: apt.conf.5.xml:716
 #, no-wrap
@@ -7546,11 +6446,6 @@ msgstr ""
 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><term>
-#: apt.conf.5.xml:791
-msgid "<literal>Debug::Acquire::cdrom</literal>"
-msgstr "<literal>Debug::Acquire::cdrom</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:795
 msgid ""
@@ -7559,43 +6454,23 @@ msgstr ""
 "Affiche les informations concernant les sources de type <literal>cdrom://</"
 "literal>"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:802
-msgid "<literal>Debug::Acquire::ftp</literal>"
-msgstr "<literal>Debug::Acquire::ftp</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:806
 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><term>
-#: apt.conf.5.xml:813
-msgid "<literal>Debug::Acquire::http</literal>"
-msgstr "<literal>Debug::Acquire::http</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:817
 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><term>
-#: apt.conf.5.xml:824
-msgid "<literal>Debug::Acquire::https</literal>"
-msgstr "<literal>Debug::Acquire::https</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:828
 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><term>
-#: apt.conf.5.xml:835
-msgid "<literal>Debug::Acquire::gpgv</literal>"
-msgstr "<literal>Debug::Acquire::gpgv</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:839
 msgid ""
@@ -7605,11 +6480,6 @@ msgstr ""
 "Affiche les informations relatives à la vérification de signatures "
 "cryptographiques avec <literal>gpg</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:846
-msgid "<literal>Debug::aptcdrom</literal>"
-msgstr "<literal>Debug::aptcdrom</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:850
 msgid ""
@@ -7619,11 +6489,6 @@ msgstr ""
 "Affiche des informations concernant l'accès aux collections de paquets "
 "stockées sur CD."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:857
-msgid "<literal>Debug::BuildDeps</literal>"
-msgstr "<literal>Debug::BuildDeps</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:860
 msgid "Describes the process of resolving build-dependencies in &apt-get;."
@@ -7631,11 +6496,6 @@ 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><term>
-#: apt.conf.5.xml:867
-msgid "<literal>Debug::Hashes</literal>"
-msgstr "<literal>Debug::Hashes</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:870
 msgid ""
@@ -7645,11 +6505,6 @@ msgstr ""
 "Affiche toutes les clefs de hachage cryptographiques créées par les "
 "librairies d'<literal>apt</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:877
-msgid "<literal>Debug::IdentCDROM</literal>"
-msgstr "<literal>Debug::IdentCDROM</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:880
 msgid ""
@@ -7661,11 +6516,6 @@ msgstr ""
 "génération des identifiants de CD, c'est-à-dire le nombre de blocs libres et "
 "utilisés sur le système de fichier du CD."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:888
-msgid "<literal>Debug::NoLocking</literal>"
-msgstr "<literal>Debug::NoLocking</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:891
 msgid ""
@@ -7676,11 +6526,6 @@ msgstr ""
 "deux instances de <quote><literal>apt-get update</literal></quote> en même "
 "temps."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:899
-msgid "<literal>Debug::pkgAcquire</literal>"
-msgstr "<literal>Debug::pkgAcquire</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:903
 msgid "Log when items are added to or removed from the global download queue."
@@ -7688,11 +6533,6 @@ msgstr ""
 "Trace les ajouts et suppressions d'éléments de la queue globale de "
 "téléchargement."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:910
-msgid "<literal>Debug::pkgAcquire::Auth</literal>"
-msgstr "<literal>Debug::pkgAcquire::Auth</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:913
 msgid ""
@@ -7703,11 +6543,6 @@ msgstr ""
 "signatures cryptographiques des fichiers téléchargés, ainsi que les erreurs "
 "éventuelles."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:920
-msgid "<literal>Debug::pkgAcquire::Diffs</literal>"
-msgstr "<literal>Debug::pkgAcquire::Diffs</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:923
 msgid ""
@@ -7718,11 +6553,6 @@ msgstr ""
 "fichiers différentiels des indexes de paquets, ainsi que les erreurs "
 "éventuelles."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:931
-msgid "<literal>Debug::pkgAcquire::RRed</literal>"
-msgstr "<literal>Debug::pkgAcquire::RRed</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:935
 msgid ""
@@ -7733,11 +6563,6 @@ msgstr ""
 "de paquets d'APT quand ces fichiers de différences sont téléchargés à la "
 "place des fichiers complets."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:942
-msgid "<literal>Debug::pkgAcquire::Worker</literal>"
-msgstr "<literal>Debug::pkgAcquire::Worker</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:946
 msgid ""
@@ -7746,11 +6571,6 @@ msgstr ""
 "Affiche toutes les interactions avec les processus enfants qui se chargent "
 "effectivement des téléchargements."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:953
-msgid "<literal>Debug::pkgAutoRemove</literal>"
-msgstr "<literal>Debug::pkgAutoRemove</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:957
 msgid ""
@@ -7760,11 +6580,6 @@ msgstr ""
 "Affiche les changements concernant le marquage des paquets comme installés "
 "automatiquement, et la suppression des paquets inutiles."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:964
-msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>"
-msgstr "<literal>Debug::pkgDepCache::AutoInstall</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:967
 msgid ""
@@ -7780,11 +6595,6 @@ msgstr ""
 "get install</literal> et pas le système de résolution de dépendances complet "
 "de APT ; voir <literal>Debug::pkgProblemResolver</literal> pour ce dernier."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:978
-msgid "<literal>Debug::pkgDepCache::Marker</literal>"
-msgstr "<literal>Debug::pkgDepCache::Marker</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:981
 msgid ""
@@ -7820,11 +6630,6 @@ msgstr ""
 "get install</literal> et pas le système de résolution de dépendances complet "
 "de APT ; voir <literal>Debug::pkgProblemResolver</literal> pour ce dernier."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1000
-msgid "<literal>Debug::pkgInitConfig</literal>"
-msgstr "<literal>Debug::pkgInitConfig</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:1003
 msgid "Dump the default configuration to standard error on startup."
@@ -7832,11 +6637,6 @@ msgstr ""
 "Affiche, au lancement, l'ensemble de la configuration sur la sortie d'erreur "
 "standard."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1010
-msgid "<literal>Debug::pkgDPkgPM</literal>"
-msgstr "<literal>Debug::pkgDPkgPM</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:1013
 msgid ""
@@ -7846,11 +6646,6 @@ msgstr ""
 "Affiche la commande exacte d'invocation de &dpkg; à chaque appel ; les "
 "paramètres sont séparés par des espaces."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1021
-msgid "<literal>Debug::pkgDPkgProgressReporting</literal>"
-msgstr "<literal>Debug::pkgDPkgProgressReporting</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:1024
 msgid ""
@@ -7861,11 +6656,6 @@ msgstr ""
 "descripteur de fichier d'état, et les éventuelles erreurs d'analyse de ce "
 "fichier."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1031
-msgid "<literal>Debug::pkgOrderList</literal>"
-msgstr "<literal>Debug::pkgOrderList</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:1035
 msgid ""
@@ -7875,32 +6665,17 @@ msgstr ""
 "Affiche les étapes de l'algorithme utilisé pour choisir l'ordre dans lequel "
 "<literal>apt</literal> passe les paquets à &dpkg;."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1043
-msgid "<literal>Debug::pkgPackageManager</literal>"
-msgstr "<literal>Debug::pkgPackageManager</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:1047
 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><term>
-#: apt.conf.5.xml:1054
-msgid "<literal>Debug::pkgPolicy</literal>"
-msgstr "<literal>Debug::pkgPolicy</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:1058
 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><term>
-#: apt.conf.5.xml:1064
-msgid "<literal>Debug::pkgProblemResolver</literal>"
-msgstr "<literal>Debug::pkgProblemResolver</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:1068
 msgid ""
@@ -7910,11 +6685,6 @@ msgstr ""
 "Affiche la trace d'exécution du système de résolution de dépendances (ne "
 "concerne que les cas où un problème de dépendances complexe se présente)."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1076
-msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>"
-msgstr "<literal>Debug::pkgProblemResolver::ShowScores</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:1079
 msgid ""
@@ -7926,11 +6696,6 @@ msgstr ""
 "l'outil de résolution de problèmes. La description du paquet est celle qui "
 "est décrite dans <literal>Debug::pkgDepCache::Marker</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1087
-msgid "<literal>Debug::sourceList</literal>"
-msgstr "<literal>Debug::sourceList</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:1091
 msgid ""
@@ -8575,30 +7340,29 @@ msgstr ""
 "Pin: release a=unstable\n"
 "Pin-Priority: 50\n"
 
-#. type: Content of: <refentry><refsect1><refsect2><literal>
-#: apt_preferences.5.xml:290
-#, fuzzy
-#| msgid "Packages"
-msgid "Package"
-msgstr "Packages"
-
-#. type: Content of: <refentry><refsect1><refsect2><literal>
-#: apt_preferences.5.xml:296
-msgid "*"
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt_preferences.5.xml:291
+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 "
+"of all package names it matches. It is undecided whether this will change in "
+"the future, thus you should always list wild-card pins first, so later "
+"specific pins override it.  The pattern \"<literal>*</literal>\" in a "
+"Package field is not considered a glob() expression in itself."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:306
+#: apt_preferences.5.xml:307
 msgid "How APT Interprets Priorities"
 msgstr "Méthode d'interprétation des priorités par APT"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:314
+#: apt_preferences.5.xml:315
 msgid "P &gt; 1000"
 msgstr "P &gt; 1000"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:315
+#: apt_preferences.5.xml:316
 msgid ""
 "causes a version to be installed even if this constitutes a downgrade of the "
 "package"
@@ -8607,12 +7371,12 @@ msgstr ""
 "retour en arrière."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:319
+#: apt_preferences.5.xml:320
 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:320
+#: apt_preferences.5.xml:321
 msgid ""
 "causes a version to be installed even if it does not come from the target "
 "release, unless the installed version is more recent"
@@ -8622,12 +7386,12 @@ msgstr ""
 "plus récente."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:325
+#: apt_preferences.5.xml:326
 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:326
+#: apt_preferences.5.xml:327
 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"
@@ -8636,12 +7400,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:331
+#: apt_preferences.5.xml:332
 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:332
+#: apt_preferences.5.xml:333
 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"
@@ -8650,29 +7414,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:337
+#: apt_preferences.5.xml:338
 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:338
+#: apt_preferences.5.xml:339
 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:342
+#: apt_preferences.5.xml:343
 msgid "P &lt; 0"
 msgstr "P &lt; 0"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:343
+#: apt_preferences.5.xml:344
 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:309
+#: apt_preferences.5.xml:310
 msgid ""
 "Priorities (P) assigned in the APT preferences file must be positive or "
 "negative integers.  They are interpreted as follows (roughly speaking): "
@@ -8683,7 +7447,7 @@ msgstr ""
 "<placeholder type=\"variablelist\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:348
+#: apt_preferences.5.xml:349
 msgid ""
 "If any specific-form records match an available package version then the "
 "first such record determines the priority of the package version.  Failing "
@@ -8697,7 +7461,7 @@ msgstr ""
 "trouvée détermine la priorité."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:354
+#: apt_preferences.5.xml:355
 msgid ""
 "For example, suppose the APT preferences file contains the three records "
 "presented earlier:"
@@ -8706,7 +7470,7 @@ msgstr ""
 "entrées décrites ci-dessous :"
 
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:358
+#: apt_preferences.5.xml:359
 #, no-wrap
 msgid ""
 "Package: perl\n"
@@ -8734,12 +7498,12 @@ msgstr ""
 "Pin-Priority: 50\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:371
+#: apt_preferences.5.xml:372
 msgid "Then:"
 msgstr "Alors :"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:373
+#: apt_preferences.5.xml:374
 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 "
@@ -8753,7 +7517,7 @@ msgstr ""
 "installée est une version 5.9*, il y aura un retour en arrière."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:378
+#: apt_preferences.5.xml:379
 msgid ""
 "A version of any package other than <literal>perl</literal> that is "
 "available from the local system has priority over other versions, even "
@@ -8764,7 +7528,7 @@ msgstr ""
 "appartenant à la distribution par défaut."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:382
+#: apt_preferences.5.xml:383
 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</"
@@ -8777,13 +7541,13 @@ msgstr ""
 "paquet n'est déjà installée."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:392
+#: apt_preferences.5.xml:393
 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:394
+#: apt_preferences.5.xml:395
 msgid ""
 "The locations listed in the &sources-list; file should provide "
 "<filename>Packages</filename> and <filename>Release</filename> files to "
@@ -8794,27 +7558,27 @@ msgstr ""
 "décrivent les paquets disponibles à cet endroit."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:406
+#: apt_preferences.5.xml:407
 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:407
+#: apt_preferences.5.xml:408
 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:410 apt_preferences.5.xml:460
+#: apt_preferences.5.xml:411 apt_preferences.5.xml:461
 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:411
+#: apt_preferences.5.xml:412
 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:398
+#: apt_preferences.5.xml:399
 msgid ""
 "The <filename>Packages</filename> file is normally found in the directory "
 "<filename>.../dists/<replaceable>dist-name</replaceable>/"
@@ -8835,12 +7599,12 @@ msgstr ""
 "\"variablelist\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:427
+#: apt_preferences.5.xml:428
 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:428
+#: apt_preferences.5.xml:429
 msgid ""
 "names the archive to which all the packages in the directory tree belong.  "
 "For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@ -8857,18 +7621,18 @@ msgstr ""
 "préférences demanderait cette ligne :"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:438
+#: apt_preferences.5.xml:439
 #, 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:444
+#: apt_preferences.5.xml:445
 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:445
+#: apt_preferences.5.xml:446
 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 "
@@ -8886,13 +7650,13 @@ msgstr ""
 "ligne :"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:454
+#: apt_preferences.5.xml:455
 #, 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:461
+#: apt_preferences.5.xml:462
 msgid ""
 "names the release version.  For example, the packages in the tree might "
 "belong to Debian GNU/Linux release version 3.0.  Note that there is normally "
@@ -8908,7 +7672,7 @@ msgstr ""
 "préférences demanderait ces lignes :"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:470
+#: apt_preferences.5.xml:471
 #, no-wrap
 msgid ""
 "Pin: release v=3.0\n"
@@ -8920,12 +7684,12 @@ msgstr ""
 "Pin: release 3.0\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:479
+#: apt_preferences.5.xml:480
 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:480
+#: apt_preferences.5.xml:481
 msgid ""
 "names the licensing component associated with the packages in the directory "
 "tree of the <filename>Release</filename> file.  For example, the line "
@@ -8943,18 +7707,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:489
+#: apt_preferences.5.xml:490
 #, 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:495
+#: apt_preferences.5.xml:496
 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:496
+#: apt_preferences.5.xml:497
 msgid ""
 "names the originator of the packages in the directory tree of the "
 "<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"
@@ -8967,18 +7731,18 @@ msgstr ""
 "ligne :"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:502
+#: apt_preferences.5.xml:503
 #, 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:508
+#: apt_preferences.5.xml:509
 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:509
+#: apt_preferences.5.xml:510
 msgid ""
 "names the label of the packages in the directory tree of the "
 "<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"
@@ -8991,13 +7755,13 @@ msgstr ""
 "préférences demanderait cette ligne :"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:515
+#: apt_preferences.5.xml:516
 #, 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:416
+#: apt_preferences.5.xml:417
 msgid ""
 "The <filename>Release</filename> file is normally found in the directory "
 "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
@@ -9021,7 +7785,7 @@ msgstr ""
 "\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:522
+#: apt_preferences.5.xml:523
 msgid ""
 "All of the <filename>Packages</filename> and <filename>Release</filename> "
 "files retrieved from locations listed in the &sources-list; file are stored "
@@ -9046,12 +7810,12 @@ msgstr ""
 "<literal>unstable</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:535
+#: apt_preferences.5.xml:536
 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:537
+#: apt_preferences.5.xml:538
 msgid ""
 "Each record in the APT preferences file can optionally begin with one or "
 "more lines beginning with the word <literal>Explanation:</literal>.  This "
@@ -9062,12 +7826,12 @@ msgstr ""
 "commentaires."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:546
+#: apt_preferences.5.xml:547
 msgid "Tracking Stable"
 msgstr "Méthode pour suivre Stable"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:554
+#: apt_preferences.5.xml:555
 #, no-wrap
 msgid ""
 "Explanation: Uninstall or do not install any Debian-originated\n"
@@ -9091,7 +7855,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:548
+#: apt_preferences.5.xml:549
 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 "
@@ -9106,8 +7870,8 @@ msgstr ""
 "literal>.  <placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:571 apt_preferences.5.xml:617
-#: apt_preferences.5.xml:675
+#: apt_preferences.5.xml:572 apt_preferences.5.xml:618
+#: apt_preferences.5.xml:676
 #, no-wrap
 msgid ""
 "apt-get install <replaceable>package-name</replaceable>\n"
@@ -9119,7 +7883,7 @@ msgstr ""
 "apt-get dist-upgrade\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:566
+#: apt_preferences.5.xml:567
 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 "
@@ -9132,13 +7896,13 @@ msgstr ""
 "\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:583
+#: apt_preferences.5.xml:584
 #, 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:577
+#: apt_preferences.5.xml:578
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>testing</literal> distribution; the package "
@@ -9151,12 +7915,12 @@ msgstr ""
 "de relancer la commande.  <placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:589
+#: apt_preferences.5.xml:590
 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:598
+#: apt_preferences.5.xml:599
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -9184,7 +7948,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:591
+#: apt_preferences.5.xml:592
 msgid ""
 "The following APT preferences file will cause APT to assign a high priority "
 "to package versions from the <literal>testing</literal> distribution, a "
@@ -9201,7 +7965,7 @@ msgstr ""
 "<placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:612
+#: apt_preferences.5.xml:613
 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 "
@@ -9214,13 +7978,13 @@ msgstr ""
 "type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:632
+#: apt_preferences.5.xml:633
 #, 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:623
+#: apt_preferences.5.xml:624
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>unstable</literal> distribution.  "
@@ -9239,12 +8003,12 @@ msgstr ""
 "installée.  <placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:639
+#: apt_preferences.5.xml:640
 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:653
+#: apt_preferences.5.xml:654
 #, no-wrap
 msgid ""
 "Explanation: Uninstall or do not install any Debian-originated package versions\n"
@@ -9278,7 +8042,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:641
+#: apt_preferences.5.xml:642
 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 "
@@ -9302,7 +8066,7 @@ msgstr ""
 "exemples précédents.  <placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:670
+#: apt_preferences.5.xml:671
 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 "
@@ -9315,13 +8079,13 @@ msgstr ""
 "<placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:690
+#: apt_preferences.5.xml:691
 #, 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:681
+#: apt_preferences.5.xml:682
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>sid</literal> distribution.  Thereafter, "
@@ -9340,12 +8104,12 @@ msgstr ""
 "<placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt_preferences.5.xml:699
+#: apt_preferences.5.xml:700
 msgid "&file-preferences;"
 msgstr "&file-preferences;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:705
+#: apt_preferences.5.xml:706
 msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 
@@ -9618,6 +8382,11 @@ msgstr ""
 "sein du système de fichier soit considéré comme une archive. On s'en sert "
 "avec les montages NFS, les miroirs et les archives locaux."
 
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+#: sources.list.5.xml:153
+msgid "cdrom"
+msgstr "cdrom"
+
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml:155
 msgid ""
@@ -9628,6 +8397,11 @@ msgstr ""
 "avec la possibilité de changer de media. Utilisez le programme &apt-cdrom; "
 "pour créer des entrées dans la liste des sources."
 
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+#: sources.list.5.xml:160
+msgid "http"
+msgstr "http"
+
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml:162
 msgid ""
@@ -9645,6 +8419,11 @@ msgstr ""
 "authentification, on peut utiliser la chaîne http://user:pass@server:port/. "
 "Notez qu'il s'agit d'une méthode d'authentification peu sûre."
 
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+#: sources.list.5.xml:171
+msgid "ftp"
+msgstr "ftp"
+
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml:173
 msgid ""
@@ -10129,6 +8908,11 @@ msgstr ""
 "Une fois cette mise à jour effectuée, plusieurs commandes peuvent être "
 "utilisées :"
 
+#. type: <tag></tag>
+#: guide.sgml:121
+msgid "upgrade"
+msgstr "upgrade"
+
 #. type: <p></p>
 #: guide.sgml:131
 msgid ""
@@ -10152,6 +8936,11 @@ msgstr ""
 "prgn> ou la commande <tt>apt-get install</tt> peuvet être utilisés pour "
 "forcer l'installation de tels paquets."
 
+#. type: <tag></tag>
+#: guide.sgml:131
+msgid "install"
+msgstr "install"
+
 #. type: <p></p>
 #: guide.sgml:140
 msgid ""
@@ -10173,6 +8962,11 @@ 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
+msgid "dist-upgrade"
+msgstr "dist-upgrade"
+
 #. type: <p></p>
 #: guide.sgml:149
 msgid ""
@@ -11476,227 +10270,6 @@ msgstr "Cette commande utilisera les fichiers récupérés sur le disque."
 #~ "Dans le cas contraire, des données seront corrompues. Les machines qui "
 #~ "ont besoin de cette option ne respectent pas la RFC 2068."
 
-#~ msgid ""
-#~ "<command>apt-cache</command> <arg><option>-hvsn</option></arg> "
-#~ "<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
-#~ "<arg><option>-c=<replaceable>file</replaceable></option></arg> <group "
-#~ "choice=\"req\"> <arg>gencaches</arg> <arg>showpkg <arg choice=\"plain\" "
-#~ "rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg>showsrc "
-#~ "<arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></"
-#~ "arg></arg> <arg>stats</arg> <arg>dump</arg> <arg>dumpavail</arg> "
-#~ "<arg>unmet</arg> <arg>search <arg choice=\"plain\"><replaceable>regex</"
-#~ "replaceable></arg></arg> <arg>show <arg choice=\"plain\" rep=\"repeat"
-#~ "\"><replaceable>pkg</replaceable></arg></arg> <arg>depends <arg choice="
-#~ "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
-#~ "<arg>rdepends <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
-#~ "replaceable></arg></arg> <arg>pkgnames <arg choice=\"plain"
-#~ "\"><replaceable>prefix</replaceable></arg></arg> <arg>dotty <arg choice="
-#~ "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
-#~ "<arg>xvcg <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
-#~ "replaceable></arg></arg> <arg>policy <arg choice=\"plain\" rep=\"repeat"
-#~ "\"><replaceable>pkgs</replaceable></arg></arg> <arg>madison <arg choice="
-#~ "\"plain\" rep=\"repeat\"><replaceable>pkgs</replaceable></arg></arg> </"
-#~ "group>"
-#~ msgstr ""
-#~ "<command>apt-cache</command> <arg><option>-hvsn</option></arg> "
-#~ "<arg><option>-o=<replaceable>option de configuration</replaceable></"
-#~ "option></arg> <arg><option>-c=<replaceable>fichier</replaceable></"
-#~ "option></arg> <group choice=\"req\"> <arg>gencaches</arg> <arg>showpkg "
-#~ "<arg choice=\"plain\" rep=\"repeat\"><replaceable>paquet</replaceable></"
-#~ "arg></arg> <arg>showsrc <arg choice=\"plain\" rep=\"repeat"
-#~ "\"><replaceable>paquet</replaceable></arg></arg> <arg>stats</arg> "
-#~ "<arg>dump</arg> <arg>dumpavail</arg> <arg>unmet</arg> <arg>search <arg "
-#~ "choice=\"plain\"><replaceable>regex</replaceable></arg></arg> <arg>show "
-#~ "<arg choice=\"plain\" rep=\"repeat\"><replaceable>paquet</replaceable></"
-#~ "arg></arg> <arg>depends <arg choice=\"plain\" rep=\"repeat"
-#~ "\"><replaceable>paquet</replaceable></arg></arg> <arg>rdepends <arg "
-#~ "choice=\"plain\" rep=\"repeat\"><replaceable>paquet</replaceable></arg></"
-#~ "arg> <arg>pkgnames <arg choice=\"plain\"><replaceable>prefix</"
-#~ "replaceable></arg></arg> <arg>dotty <arg choice=\"plain\" rep=\"repeat"
-#~ "\"><replaceable>paquet</replaceable></arg></arg> <arg>policy <arg choice="
-#~ "\"plain\" rep=\"repeat\"><replaceable>paquets</replaceable></arg></arg> "
-#~ "<arg>madison <arg choice=\"plain\" rep=\"repeat\"><replaceable>paquets</"
-#~ "replaceable></arg></arg> </group>"
-
-#~ msgid ""
-#~ "<command>apt-cdrom</command> <arg><option>-hvrmfan</option></arg> "
-#~ "<arg><option>-d=<replaceable>cdrom mount point</replaceable></option></"
-#~ "arg> <arg><option>-o=<replaceable>config string</replaceable></option></"
-#~ "arg> <arg><option>-c=<replaceable>file</replaceable></option></arg> "
-#~ "<group> <arg>add</arg> <arg>ident</arg> </group>"
-#~ msgstr ""
-#~ "<command>apt-cdrom</command> <arg><option>-hvrmfan</option></arg> "
-#~ "<arg><option>-d=<replaceable>point de montage du CD</replaceable></"
-#~ "option></arg> <arg><option>-o=<replaceable>option de configuration</"
-#~ "replaceable></option></arg> <arg><option>-c=<replaceable>fichier</"
-#~ "replaceable></option></arg> <group> <arg>add</arg> <arg>ident</arg> </"
-#~ "group>"
-
-#~ msgid ""
-#~ "<command>apt-config</command> <arg><option>-hv</option></arg> "
-#~ "<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
-#~ "<arg><option>-c=<replaceable>file</replaceable></option></arg> <group "
-#~ "choice=\"req\"> <arg>shell</arg> <arg>dump</arg> </group>"
-#~ msgstr ""
-#~ "<command>apt-config</command> <arg><option>-hv</option></arg> "
-#~ "<arg><option>-o=<replaceable>option de configuration</replaceable></"
-#~ "option></arg> <arg><option>-c=<replaceable>fichier</replaceable></"
-#~ "option></arg> <group choice=\"req\"> <arg>shell</arg> <arg>dump</arg> </"
-#~ "group>"
-
-#~ msgid ""
-#~ "<command>apt-extracttemplates</command> <arg><option>-hv</option></arg> "
-#~ "<arg><option>-t=<replaceable>temporary directory</replaceable></option></"
-#~ "arg> <arg choice=\"plain\" rep=\"repeat\"><replaceable>file</"
-#~ "replaceable></arg>"
-#~ msgstr ""
-#~ "<command>apt-extracttemplates</command> <arg><option>-hv</option></arg> "
-#~ "<arg><option>-t=<replaceable>répertoire temporaire</replaceable></"
-#~ "option></arg> <arg choice=\"plain\" rep=\"repeat\"><replaceable>fichier</"
-#~ "replaceable></arg>"
-
-#~ msgid ""
-#~ "<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> "
-#~ "<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> "
-#~ "<arg><option>--readonly</option></arg> <arg><option>--contents</option></"
-#~ "arg> <arg><option>--arch <replaceable>architecture</replaceable></"
-#~ "option></arg> <arg><option>-o <replaceable>config</"
-#~ "replaceable>=<replaceable>string</replaceable></option></arg> "
-#~ "<arg><option>-c=<replaceable>file</replaceable></option></arg> <group "
-#~ "choice=\"req\"> <arg>packages<arg choice=\"plain\" rep=\"repeat"
-#~ "\"><replaceable>path</replaceable></arg><arg><replaceable>override</"
-#~ "replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> "
-#~ "<arg>sources<arg choice=\"plain\" rep=\"repeat\"><replaceable>path</"
-#~ "replaceable></arg><arg><replaceable>override</"
-#~ "replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> "
-#~ "<arg>contents <arg choice=\"plain\"><replaceable>path</replaceable></"
-#~ "arg></arg> <arg>release <arg choice=\"plain\"><replaceable>path</"
-#~ "replaceable></arg></arg> <arg>generate <arg choice=\"plain"
-#~ "\"><replaceable>config-file</replaceable></arg> <arg choice=\"plain\" rep="
-#~ "\"repeat\"><replaceable>section</replaceable></arg></arg> <arg>clean <arg "
-#~ "choice=\"plain\"><replaceable>config-file</replaceable></arg></arg> </"
-#~ "group>"
-#~ msgstr ""
-#~ "<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg><arg> "
-#~ "<option>--md5</option></arg><arg> <option>--delink</option></arg> "
-#~ "<arg><option>--readonly</option></arg> <arg><option>--contents</option></"
-#~ "arg> <arg><option>--arch <replaceable>architecture</replaceable></"
-#~ "option></arg> <arg><option>-o <replaceable>option de configuration</"
-#~ "replaceable>=<replaceable>chaîne</replaceable></option></arg> "
-#~ "<arg><option>-c=<replaceable>fichier</replaceable></option></arg> <group "
-#~ "choice=\"req\"> <arg>packages<arg choice=\"plain\" rep=\"repeat"
-#~ "\"><replaceable>chemin</replaceable></arg><arg><replaceable>override</"
-#~ "replaceable><arg><replaceable>préfixe-de-chemin</replaceable></arg></"
-#~ "arg></arg> <arg>sources<arg choice=\"plain\" rep=\"repeat"
-#~ "\"><replaceable>chemin</replaceable></arg><arg><replaceable>override</"
-#~ "replaceable><arg><replaceable>préfixe-de-chemin</replaceable></arg></"
-#~ "arg></arg> <arg>contents <arg choice=\"plain\"><replaceable>chemin</"
-#~ "replaceable></arg></arg> <arg>release <arg choice=\"plain"
-#~ "\"><replaceable>chemin</replaceable></arg></arg> <arg>generate <arg "
-#~ "choice=\"plain\"><replaceable>fichier-de-configuration</replaceable></"
-#~ "arg><arg choice=\"plain\" rep=\"repeat\"><replaceable>section</"
-#~ "replaceable></arg></arg> <arg>clean <arg choice=\"plain"
-#~ "\"><replaceable>fichier-de-configuration</replaceable></arg></arg> </"
-#~ "group>"
-
-#, fuzzy
-#~| msgid ""
-#~| "<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
-#~| "<option>-o= <replaceable>config_string</replaceable> </option> </arg> "
-#~| "<arg> <option>-c= <replaceable>config_file</replaceable> </option> </"
-#~| "arg> <arg> <option>-t=</option> <arg choice='plain'> "
-#~| "<replaceable>target_release</replaceable> </arg> </arg> <group choice="
-#~| "\"req\"> <arg choice='plain'>update</arg> <arg choice='plain'>upgrade</"
-#~| "arg> <arg choice='plain'>dselect-upgrade</arg> <arg choice='plain'>dist-"
-#~| "upgrade</arg> <arg choice='plain'>install <arg choice=\"plain\" rep="
-#~| "\"repeat\"><replaceable>pkg</replaceable> <arg> <group choice='req'> "
-#~| "<arg choice='plain'> =<replaceable>pkg_version_number</replaceable> </"
-#~| "arg> <arg choice='plain'> /<replaceable>target_release</replaceable> </"
-#~| "arg> </group> </arg> </arg> </arg> <arg choice='plain'>remove <arg "
-#~| "choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></"
-#~| "arg> <arg choice='plain'>purge <arg choice=\"plain\" rep=\"repeat"
-#~| "\"><replaceable>pkg</replaceable></arg></arg> <arg choice='plain'>source "
-#~| "<arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable> "
-#~| "<arg> <group choice='req'> <arg choice='plain'> "
-#~| "=<replaceable>pkg_version_number</replaceable> </arg> <arg "
-#~| "choice='plain'> /<replaceable>target_release</replaceable> </arg> </"
-#~| "group> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg choice="
-#~| "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
-#~| "choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg "
-#~| "choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> <arg "
-#~| "choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> <arg "
-#~| "choice='plain'>--version</arg> </group> </arg> <arg choice='plain'> "
-#~| "<group choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--"
-#~| "help</arg> </group> </arg> </group>"
-#~ msgid ""
-#~ "<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
-#~ "<option>-o= <replaceable>config_string</replaceable> </option> </arg> "
-#~ "<arg> <option>-c= <replaceable>config_file</replaceable> </option> </arg> "
-#~ "<arg> <option>-t=</option> <arg choice='plain'> "
-#~ "<replaceable>target_release</replaceable> </arg> </arg> <group choice="
-#~ "\"req\"> <arg choice='plain'>update</arg> <arg choice='plain'>upgrade</"
-#~ "arg> <arg choice='plain'>dselect-upgrade</arg> <arg choice='plain'>dist-"
-#~ "upgrade</arg> <arg choice='plain'>install <arg choice=\"plain\" rep="
-#~ "\"repeat\"><replaceable>pkg</replaceable> <arg> <group choice='req'> <arg "
-#~ "choice='plain'> =<replaceable>pkg_version_number</replaceable> </arg> "
-#~ "<arg choice='plain'> /<replaceable>target_release</replaceable> </arg> </"
-#~ "group> </arg> </arg> </arg> <arg choice='plain'>remove <arg choice=\"plain"
-#~ "\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
-#~ "choice='plain'>purge <arg choice=\"plain\" rep=\"repeat"
-#~ "\"><replaceable>pkg</replaceable></arg></arg> <arg choice='plain'>source "
-#~ "<arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable> <arg> "
-#~ "<group choice='req'> <arg choice='plain'> "
-#~ "=<replaceable>pkg_version_number</replaceable> </arg> <arg "
-#~ "choice='plain'> /<replaceable>target_release</replaceable> </arg> </"
-#~ "group> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg choice="
-#~ "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
-#~ "choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg "
-#~ "choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> <arg "
-#~ "choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> <arg "
-#~ "choice='plain'>--version</arg> </group> </arg> <arg choice='plain'> "
-#~ "<group choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--"
-#~ "help</arg> </group> </arg> </group>"
-#~ msgstr ""
-#~ "<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
-#~ "<option>-o= <replaceable>options_de_configuration</replaceable> </option> "
-#~ "</arg> <arg> <option>-c= <replaceable>fichier_de_configuration</"
-#~ "replaceable> </option> </arg> <arg> <option>-t=</option> <arg "
-#~ "choice='plain'> <replaceable>nom_version_cible</replaceable> </arg> </"
-#~ "arg> <group choice=\"req\"> <arg choice='plain'>update</arg> <arg "
-#~ "choice='plain'>upgrade</arg> <arg choice='plain'>dselect-upgrade</arg> "
-#~ "<arg choice='plain'>dist-upgrade</arg> <arg choice='plain'>install <arg "
-#~ "choice=\"plain\" rep=\"repeat\"><replaceable>paquet</replaceable> <arg> "
-#~ "<group choice='req'> <arg choice='plain'> "
-#~ "=<replaceable>numéro_version_paquet</replaceable> </arg> <arg "
-#~ "choice='plain'> /<replaceable>nom_version_cible</replaceable> </arg> </"
-#~ "group> </arg> </arg> </arg> <arg choice='plain'>remove <arg choice=\"plain"
-#~ "\" rep=\"repeat\"><replaceable>paquet</replaceable></arg></arg> <arg "
-#~ "choice='plain'>purge <arg choice=\"plain\" rep=\"repeat"
-#~ "\"><replaceable>paquet</replaceable></arg></arg> <arg "
-#~ "choice='plain'>source <arg choice=\"plain\" rep=\"repeat"
-#~ "\"><replaceable>paquet</replaceable> <arg> <group choice='req'> <arg "
-#~ "choice='plain'> =<replaceable>numéro_version_paquet</replaceable> </arg> "
-#~ "<arg choice='plain'> /<replaceable>nom_version_cible</replaceable> </arg> "
-#~ "</group> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg choice="
-#~ "\"plain\" rep=\"repeat\"><replaceable>paquet</replaceable></arg></arg> "
-#~ "<arg choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg "
-#~ "choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> <arg "
-#~ "choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> <arg "
-#~ "choice='plain'>--version</arg> </group> </arg> <arg choice='plain'> "
-#~ "<group choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--"
-#~ "help</arg> </group> </arg> </group>"
-
-#~ msgid ""
-#~ "<command>apt-key</command> <arg><option>--keyring <replaceable>filename</"
-#~ "replaceable></option></arg> <arg><replaceable>command</replaceable></arg> "
-#~ "<arg rep=\"repeat\"><option><replaceable>arguments</replaceable></"
-#~ "option></arg>"
-#~ msgstr ""
-#~ "<command>apt-key</command> <arg><option>--keyring <replaceable>fichier</"
-#~ "replaceable></option></arg> <arg><replaceable>commande</replaceable></"
-#~ "arg> <arg rep=\"repeat\"><option><replaceable>paramètres</replaceable></"
-#~ "option></arg>"
-
 #~ msgid "add <replaceable>filename</replaceable>"
 #~ msgstr "add <replaceable>fichier</replaceable>"
 
@@ -11716,42 +10289,6 @@ msgstr "Cette commande utilisera les fichiers récupérés sur le disque."
 #~ msgid "--keyring <replaceable>filename</replaceable>"
 #~ msgstr "--keyring <replaceable>fichier</replaceable>"
 
-#, fuzzy
-#~| msgid ""
-#~| "  <command>apt-mark</command> <arg><option>-hv</option></arg> "
-#~| "<arg><option>-f=<replaceable>FILENAME</replaceable></option></arg> "
-#~| "<group choice=\"plain\"> <arg choice=\"plain\"> <group choice=\"req\"> "
-#~| "<arg choice=\"plain\">markauto</arg> <arg choice=\"plain\">unmarkauto</"
-#~| "arg> </group> <arg choice=\"plain\" rep=\"repeat\"><replaceable>package</"
-#~| "replaceable></arg> </arg> <arg choice=\"plain\">showauto</arg> </group>"
-#~ msgid ""
-#~ "  <command>apt-mark</command> <arg><option>-hv</option></arg> "
-#~ "<arg><option>-f=<replaceable>FILENAME</replaceable></option></arg> <group "
-#~ "choice=\"plain\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg "
-#~ "choice=\"plain\">auto</arg> <arg choice=\"plain\">manual</arg> <arg "
-#~ "choice=\"plain\">showauto</arg> <arg choice=\"plain\">showmanual</arg> </"
-#~ "group> <arg choice=\"plain\" rep=\"repeat\"><replaceable>package</"
-#~ "replaceable></arg> </arg> </group>"
-#~ msgstr ""
-#~ "  <command>apt-mark</command> <arg><option>-hv</option></arg> "
-#~ "<arg><option>-f=<replaceable>FICHIER</replaceable></option></arg> <group "
-#~ "choice=\"plain\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg "
-#~ "choice=\"plain\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> </"
-#~ "group> <arg choice=\"plain\" rep=\"repeat\"><replaceable>paquet</"
-#~ "replaceable></arg> </arg> <arg choice=\"plain\">showauto</arg> </group>"
-
-#~ msgid ""
-#~ "<command>apt-sortpkgs</command> <arg><option>-hvs</option></arg> "
-#~ "<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
-#~ "<arg><option>-c=<replaceable>file</replaceable></option></arg> <arg "
-#~ "choice=\"plain\" rep=\"repeat\"><replaceable>file</replaceable></arg>"
-#~ msgstr ""
-#~ "<command>apt-sortpkgs</command> <arg><option>-hvs</option></arg> "
-#~ "<arg><option>-o=<replaceable>option de configuration</replaceable></"
-#~ "option></arg> <arg><option>-c=<replaceable>fichier</replaceable></"
-#~ "option></arg> <arg choice=\"plain\" rep=\"repeat\"><replaceable>fichier</"
-#~ "replaceable></arg>"
-
 #, fuzzy
 #~| msgid ""
 #~| "Seconds the Release file should be considered valid after it was "
@@ -11785,9 +10322,6 @@ msgstr "Cette commande utilisera les fichiers récupérés sur le disque."
 #~ "est obsolète ou pas. Un réglage spécifique pour une archive donnée peut "
 #~ "être défini en ajoutant l'étiquette de l'archive au nom de l'option."
 
-#~ msgid "<option>--md5</option>"
-#~ msgstr "<option>--md5</option>"
-
 #~ msgid ""
 #~ "Generate MD5 sums. This defaults to on, when turned off the generated "
 #~ "index files will not have MD5Sum fields where possible.  Configuration "
@@ -11798,21 +10332,9 @@ msgstr "Cette commande utilisera les fichiers récupérés sur le disque."
 #~ "MD5Sum là où c'est possible. Élément de configuration : <literal>APT::"
 #~ "FTPArchive::MD5</literal>."
 
-#~ msgid "unmarkauto"
-#~ msgstr "unmarkauto"
-
-#~ msgid "<option>-h</option>"
-#~ msgstr "<option>-h</option>"
-
 #~ msgid "Show a short usage summary."
 #~ msgstr "Affiche un résumé de l'aide"
 
-#~ msgid "<option>-v</option>"
-#~ msgstr "<option>-v</option>"
-
-#~ msgid "<option>--version</option>"
-#~ msgstr "<option>--version</option>"
-
 #~ msgid "Show the program version."
 #~ msgstr "Affiche la version du programme."
 
@@ -11846,9 +10368,6 @@ msgstr "Cette commande utilisera les fichiers récupérés sur le disque."
 #~ "sur la sortie standard avec un résumé MD5 et un résumé SHA1 pour chaque "
 #~ "fichier."
 
-#~ msgid "<option>--install-recommends</option>"
-#~ msgstr "<option>--install-recommends</option>"
-
 #~ msgid "Also install recommended packages."
 #~ msgstr "Installer également les paquets recommandés."
 
@@ -11905,9 +10424,6 @@ msgstr "Cette commande utilisera les fichiers récupérés sur le disque."
 #~ "<literal>Dir::State</literal> définit le chemin d'accès au fichier "
 #~ "<filename>extended_states</filename>."
 
-#~ msgid "Cache-Limit"
-#~ msgstr "Cache-Limit"
-
 #~ msgid ""
 #~ "APT uses a fixed size memory mapped cache file to store the 'available' "
 #~ "information. This sets the size of that cache (in bytes)."
diff --git a/doc/po/it.po b/doc/po/it.po
index 7c0d1a121..0555f56eb 100644
--- a/doc/po/it.po
+++ b/doc/po/it.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2012-05-20 18:22+0300\n"
+"POT-Creation-Date: 2012-05-21 04:13+0300\n"
 "PO-Revision-Date: 2003-04-26 23:26+0100\n"
 "Last-Translator: Traduzione di Eugenia Franzoni <eugenia@linuxcare.com>\n"
 "Language-Team: <debian-l10n-italian@lists.debian.org>\n"
@@ -646,11 +646,6 @@ msgid ""
 "one of the commands below must be present."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:48
-msgid "gencaches"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:49
 msgid ""
@@ -658,9 +653,11 @@ msgid ""
 "implicitly by all commands needing this cache if it is missing or outdated."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:53
-msgid "showpkg <replaceable>&synopsis-pkg;</replaceable>…"
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
+#: apt-cache.8.xml:53 apt-cache.8.xml:142 apt-cache.8.xml:163
+#: 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
+msgid "&synopsis-pkg;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -705,11 +702,6 @@ msgid ""
 "best to consult the apt source code."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:87
-msgid "stats"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:87
 msgid ""
@@ -789,11 +781,6 @@ msgid ""
 "relationships claimed by all of the packages in the cache."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:142
-msgid "showsrc <replaceable>&synopsis-pkg;</replaceable>…"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:143
 msgid ""
@@ -802,11 +789,6 @@ msgid ""
 "records that declare the name to be a Binary."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:148 apt-config.8.xml:75
-msgid "dump"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:149
 msgid ""
@@ -814,11 +796,6 @@ msgid ""
 "It is primarily for debugging."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:153
-msgid "dumpavail"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:154
 msgid ""
@@ -826,11 +803,6 @@ msgid ""
 "suitable for use with &dpkg; and is used by the &dselect; method."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:158
-msgid "unmet"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:159
 msgid ""
@@ -838,11 +810,6 @@ msgid ""
 "package cache."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:163
-msgid "show <replaceable>&synopsis-pkg;</replaceable>…"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:164
 msgid ""
@@ -850,9 +817,9 @@ msgid ""
 "avail</command>; it displays the package records for the named packages."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
 #: apt-cache.8.xml:169
-msgid "search <replaceable>&synopsis-regex;</replaceable>…"
+msgid "&synopsis-regex;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -877,11 +844,6 @@ msgid ""
 "and'ed together."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:187
-msgid "depends <replaceable>&synopsis-pkg;</replaceable>…"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:188
 msgid ""
@@ -889,11 +851,6 @@ msgid ""
 "and all the possible other packages that can fulfill that dependency."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:192
-msgid "rdepends <replaceable>&synopsis-pkg;</replaceable>…"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:193
 msgid ""
@@ -903,7 +860,7 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-cache.8.xml:197
-msgid "pkgnames [ <replaceable>&synopsis-prefix;</replaceable> ]"
+msgid "<optional><replaceable>&synopsis-prefix;</replaceable></optional>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -924,11 +881,6 @@ msgid ""
 "the generated list."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:208
-msgid "dotty <replaceable>&synopsis-pkg;</replaceable>…"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:209
 msgid ""
@@ -956,11 +908,6 @@ msgstr ""
 msgid "Caution, dotty cannot graph larger sets of packages."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:226
-msgid "xvcg <replaceable>&synopsis-pkg;</replaceable>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:227
 msgid ""
@@ -970,7 +917,7 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-cache.8.xml:231
-msgid "policy [ <replaceable>&synopsis-pkg;</replaceable>… ]"
+msgid "<optional><replaceable>&synopsis-pkg;</replaceable>…</optional>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -982,11 +929,6 @@ msgid ""
 "selection of the named package."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:238
-msgid "madison <replaceable>&synopsis-pkg;</replaceable>…"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:239
 msgid ""
@@ -999,23 +941,13 @@ msgid ""
 "Architecture</literal>)."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:250 apt-config.8.xml:84 apt-extracttemplates.1.xml:51
+#. type: Content of: <refentry><refsect1><title>
+#: apt-cache.8.xml:250 apt-config.8.xml:84 apt-extracttemplates.1.xml:52
 #: apt-ftparchive.1.xml:504 apt-get.8.xml:259 apt-mark.8.xml:108
-#: apt-sortpkgs.1.xml:48 apt.conf.5.xml:586 apt.conf.5.xml:608
+#: apt-sortpkgs.1.xml:48
 msgid "options"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:254
-msgid "<option>-p</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:254
-msgid "<option>--pkg-cache</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:255
 msgid ""
@@ -1024,17 +956,6 @@ msgid ""
 "pkgcache</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:260 apt-ftparchive.1.xml:551 apt-get.8.xml:321
-#: apt-sortpkgs.1.xml:52
-msgid "<option>-s</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:260
-msgid "<option>--src-cache</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:261
 msgid ""
@@ -1045,16 +966,6 @@ msgid ""
 "Item: <literal>Dir::Cache::srcpkgcache</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:268 apt-ftparchive.1.xml:525 apt-get.8.xml:311
-msgid "<option>-q</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:268 apt-ftparchive.1.xml:525 apt-get.8.xml:311
-msgid "<option>--quiet</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:269
 msgid ""
@@ -1064,16 +975,6 @@ msgid ""
 "configuration file.  Configuration Item: <literal>quiet</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:275
-msgid "<option>-i</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:275
-msgid "<option>--important</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:276
 msgid ""
@@ -1082,46 +983,6 @@ msgid ""
 "<literal>APT::Cache::Important</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:281
-msgid "<option>--no-pre-depends</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:282
-msgid "<option>--no-depends</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:283
-msgid "<option>--no-recommends</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:284
-msgid "<option>--no-suggests</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:285
-msgid "<option>--no-conflicts</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:286
-msgid "<option>--no-breaks</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:287
-msgid "<option>--no-replaces</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:288
-msgid "<option>--no-enhances</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:289
 msgid ""
@@ -1132,16 +993,6 @@ msgid ""
 "Cache::ShowRecommends</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:295 apt-cdrom.8.xml:111 apt-get.8.xml:278
-msgid "<option>-f</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:295
-msgid "<option>--full</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:296
 msgid ""
@@ -1149,17 +1000,6 @@ msgid ""
 "<literal>APT::Cache::ShowFull</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:300 apt-cdrom.8.xml:121 apt-ftparchive.1.xml:563
-#: apt-get.8.xml:369
-msgid "<option>-a</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:300
-msgid "<option>--all-versions</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:301
 msgid ""
@@ -1171,16 +1011,6 @@ msgid ""
 "<literal>APT::Cache::AllVersions</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:309
-msgid "<option>-g</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:309
-msgid "<option>--generate</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:310
 msgid ""
@@ -1189,16 +1019,6 @@ msgid ""
 "option>.  Configuration Item: <literal>APT::Cache::Generate</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:315
-msgid "<option>--names-only</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:315 apt-cdrom.8.xml:129
-msgid "<option>-n</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:316
 msgid ""
@@ -1206,11 +1026,6 @@ msgid ""
 "Item: <literal>APT::Cache::NamesOnly</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:320
-msgid "<option>--all-names</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:321
 msgid ""
@@ -1219,11 +1034,6 @@ msgid ""
 "AllNames</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:326
-msgid "<option>--recurse</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:327
 msgid ""
@@ -1232,11 +1042,6 @@ msgid ""
 "<literal>APT::Cache::RecurseDepends</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:332
-msgid "<option>--installed</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:334
 msgid ""
@@ -1247,14 +1052,14 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist>
 #: apt-cache.8.xml:339 apt-cdrom.8.xml:140 apt-config.8.xml:104
-#: apt-extracttemplates.1.xml:62 apt-ftparchive.1.xml:591 apt-get.8.xml:514
+#: apt-extracttemplates.1.xml:63 apt-ftparchive.1.xml:591 apt-get.8.xml:514
 #: apt-mark.8.xml:122 apt-sortpkgs.1.xml:58
 msgid "&apt-commonoptions;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-cache.8.xml:344 apt-get.8.xml:519 apt-key.8.xml:167 apt-mark.8.xml:126
-#: apt.conf.5.xml:1119 apt_preferences.5.xml:697
+#: apt.conf.5.xml:1119 apt_preferences.5.xml:698
 msgid "Files"
 msgstr ""
 
@@ -1265,9 +1070,9 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-cache.8.xml:351 apt-cdrom.8.xml:145 apt-config.8.xml:109
-#: apt-extracttemplates.1.xml:69 apt-ftparchive.1.xml:607 apt-get.8.xml:529
+#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:607 apt-get.8.xml:529
 #: apt-key.8.xml:188 apt-mark.8.xml:132 apt-secure.8.xml:185
-#: apt-sortpkgs.1.xml:63 apt.conf.5.xml:1125 apt_preferences.5.xml:704
+#: apt-sortpkgs.1.xml:63 apt.conf.5.xml:1125 apt_preferences.5.xml:705
 #: sources.list.5.xml:255
 msgid "See Also"
 msgstr ""
@@ -1279,7 +1084,7 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:114
-#: apt-extracttemplates.1.xml:73 apt-ftparchive.1.xml:611 apt-get.8.xml:535
+#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:611 apt-get.8.xml:535
 #: apt-mark.8.xml:136 apt-sortpkgs.1.xml:67
 msgid "Diagnostics"
 msgstr ""
@@ -1325,11 +1130,6 @@ msgid ""
 "must be inserted and scanned separately to account for possible mis-burns."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:55
-msgid "add"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt-cdrom.8.xml:56
 msgid ""
@@ -1348,11 +1148,6 @@ msgid ""
 "filename>"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:71
-msgid "ident"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt-cdrom.8.xml:72
 msgid ""
@@ -1373,16 +1168,6 @@ msgstr ""
 msgid "Options"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:85 apt-ftparchive.1.xml:519 apt-get.8.xml:273
-msgid "<option>-d</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:85
-msgid "<option>--cdrom</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cdrom.8.xml:86
 msgid ""
@@ -1391,16 +1176,6 @@ msgid ""
 "Configuration Item: <literal>Acquire::cdrom::mount</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:94
-msgid "<option>-r</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:94
-msgid "<option>--rename</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cdrom.8.xml:95
 msgid ""
@@ -1409,16 +1184,6 @@ msgid ""
 "label.  Configuration Item: <literal>APT::CDROM::Rename</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:103 apt-get.8.xml:292
-msgid "<option>-m</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:103
-msgid "<option>--no-mount</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cdrom.8.xml:104
 msgid ""
@@ -1427,11 +1192,6 @@ msgid ""
 "NoMount</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:111
-msgid "<option>--fast</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cdrom.8.xml:112
 msgid ""
@@ -1441,11 +1201,6 @@ msgid ""
 "Item: <literal>APT::CDROM::Fast</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:121
-msgid "<option>--thorough</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cdrom.8.xml:122
 msgid ""
@@ -1454,21 +1209,6 @@ msgid ""
 "longer to scan the CD but will pick them all up."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:130 apt-get.8.xml:323
-msgid "<option>--just-print</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:131 apt-get.8.xml:325
-msgid "<option>--recon</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:132 apt-get.8.xml:326
-msgid "<option>--no-act</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cdrom.8.xml:133
 msgid ""
@@ -1524,11 +1264,6 @@ msgid ""
 "one of the commands below must be present."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-config.8.xml:49
-msgid "shell"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-config.8.xml:51
 msgid ""
@@ -1568,11 +1303,6 @@ msgstr ""
 msgid "Just show the contents of the configuration space."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-config.8.xml:89
-msgid "<option>--empty</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-config.8.xml:90
 msgid ""
@@ -1580,11 +1310,9 @@ msgid ""
 "empty to remove them from the output."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
 #: apt-config.8.xml:95
-msgid ""
-"<option>--format '<replaceable>&percnt;f &#x0022;&percnt;v&#x0022;;&percnt;"
-"n</replaceable>'</option>"
+msgid "&percnt;f &#x0022;&percnt;v&#x0022;;&percnt;n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -1600,7 +1328,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:110 apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:608
+#: apt-config.8.xml:110 apt-extracttemplates.1.xml:71 apt-ftparchive.1.xml:608
 #: apt-sortpkgs.1.xml:64
 msgid "&apt-conf;"
 msgstr ""
@@ -1646,23 +1374,14 @@ msgstr ""
 #: apt-extracttemplates.1.xml:45
 msgid ""
 "template-file and config-script are written to the temporary directory "
-"specified by the -t or --tempdir (<literal>APT::ExtractTemplates::TempDir</"
-"literal>)  directory, with filenames of the form <filename>package.template."
-"XXXX</filename> and <filename>package.config.XXXX</filename>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-extracttemplates.1.xml:55 apt-get.8.xml:448
-msgid "<option>-t</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-extracttemplates.1.xml:55
-msgid "<option>--tempdir</option>"
+"specified by the <option>-t</option> or <option>--tempdir</option> "
+"(<literal>APT::ExtractTemplates::TempDir</literal>) directory, with "
+"filenames of the form <filename>package.template.XXXX</filename> and "
+"<filename>package.config.XXXX</filename>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-extracttemplates.1.xml:57
+#: apt-extracttemplates.1.xml:58
 msgid ""
 "Temporary directory in which to write extracted debconf template files and "
 "config scripts.  Configuration Item: <literal>APT::ExtractTemplates::"
@@ -1670,7 +1389,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:74
+#: apt-extracttemplates.1.xml:75
 msgid ""
 "<command>apt-extracttemplates</command> returns zero on normal operation, "
 "decimal 100 on error."
@@ -1723,11 +1442,6 @@ msgid ""
 "output files."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:58
-msgid "packages"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:60
 msgid ""
@@ -1743,11 +1457,6 @@ msgid ""
 "The option <option>--db</option> can be used to specify a binary caching DB."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:68
-msgid "sources"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:70
 msgid ""
@@ -1765,11 +1474,6 @@ msgid ""
 "change the source override file that will be used."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:80
-msgid "contents"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:82
 msgid ""
@@ -1781,11 +1485,6 @@ msgid ""
 "package is separated by a comma in the output."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:92
-msgid "release"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:94
 msgid ""
@@ -1814,12 +1513,6 @@ msgid ""
 "<literal>Description</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:115
-#, fuzzy
-msgid "generate"
-msgstr "Descrizione generale"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:117
 msgid ""
@@ -1830,11 +1523,6 @@ msgid ""
 "maintaining the required settings."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:124 apt-get.8.xml:215
-msgid "clean"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:126
 msgid ""
@@ -1878,11 +1566,6 @@ msgid ""
 "to produce a complete an absolute path."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:151
-msgid "ArchiveDir"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:153
 msgid ""
@@ -1891,31 +1574,16 @@ msgid ""
 "nodes."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:158
-msgid "OverrideDir"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:160
 msgid "Specifies the location of the override files."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:163
-msgid "CacheDir"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:165
 msgid "Specifies the location of the cache files"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:168
-msgid "FileListDir"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:170
 msgid ""
@@ -1936,11 +1604,6 @@ msgid ""
 "override these defaults with a per-section setting."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:182
-msgid "Packages::Compress"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:184
 msgid ""
@@ -1950,11 +1613,6 @@ msgid ""
 "'. gzip'."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:190
-msgid "Packages::Extensions"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:192
 msgid ""
@@ -1962,11 +1620,6 @@ msgid ""
 "defaults to '.deb'."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:196
-msgid "Sources::Compress"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:198
 msgid ""
@@ -1974,11 +1627,6 @@ msgid ""
 "controls the compression for the Sources files."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:202
-msgid "Sources::Extensions"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:204
 msgid ""
@@ -1986,11 +1634,6 @@ msgid ""
 "defaults to '.dsc'."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:208
-msgid "Contents::Compress"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:210
 msgid ""
@@ -1998,11 +1641,6 @@ msgid ""
 "controls the compression for the Contents files."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:214
-msgid "Translation::Compress"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:216
 msgid ""
@@ -2010,11 +1648,6 @@ msgid ""
 "controls the compression for the Translation-en master file."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:220
-msgid "DeLinkLimit"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:222
 msgid ""
@@ -2023,11 +1656,6 @@ msgid ""
 "Links</literal> setting."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:227
-msgid "FileMode"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:229
 msgid ""
@@ -2035,11 +1663,6 @@ msgid ""
 "index files are set to this mode with no regard to the umask."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:234 apt-ftparchive.1.xml:380
-msgid "LongDescription"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:236 apt-ftparchive.1.xml:382
 msgid ""
@@ -2060,11 +1683,6 @@ msgid ""
 "$(SECTION) and $(ARCH) replaced with their respective values."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:249
-msgid "MaxContentsChange"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:251
 msgid ""
@@ -2073,11 +1691,6 @@ msgid ""
 "be rebuilt."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:256
-msgid "ContentsAge"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:258
 msgid ""
@@ -2089,11 +1702,6 @@ msgid ""
 "anyhow. The default is 10, the units are in days."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:267
-msgid "Directory"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:269
 msgid ""
@@ -2101,11 +1709,6 @@ msgid ""
 "$(SECTION)/binary-$(ARCH)/</filename>"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:273
-msgid "SrcDirectory"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:275
 msgid ""
@@ -2113,11 +1716,6 @@ msgid ""
 "$(DIST)/$(SECTION)/source/</filename>"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:279 apt-ftparchive.1.xml:418
-msgid "Packages"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:281
 msgid ""
@@ -2125,11 +1723,6 @@ msgid ""
 "binary-$(ARCH)/Packages</filename>"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:285 apt-ftparchive.1.xml:423
-msgid "Sources"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:287
 msgid ""
@@ -2137,11 +1730,6 @@ msgid ""
 "source/Sources</filename>"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:291
-msgid "Translation"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:293
 msgid ""
@@ -2150,11 +1738,6 @@ msgid ""
 "$(SECTION)/i18n/Translation-en</filename>"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:298
-msgid "InternalPrefix"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:300
 msgid ""
@@ -2163,11 +1746,6 @@ msgid ""
 "filename>"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:305 apt-ftparchive.1.xml:429
-msgid "Contents"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:307
 msgid ""
@@ -2177,21 +1755,11 @@ msgid ""
 "command> will integrate those package files together automatically."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:314
-msgid "Contents::Header"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:316
 msgid "Sets header file to prepend to the contents output."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:319 apt-ftparchive.1.xml:454
-msgid "BinCacheDB"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:321
 msgid ""
@@ -2199,11 +1767,6 @@ msgid ""
 "can share the same database."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:325
-msgid "FileList"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:327
 msgid ""
@@ -2212,11 +1775,6 @@ msgid ""
 "Relative files names are prefixed with the archive directory."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:332
-msgid "SourceFileList"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:334
 msgid ""
@@ -2276,11 +1834,6 @@ msgid ""
 "\" id=\"0\"/>"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:366
-msgid "Sections"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:368
 msgid ""
@@ -2289,11 +1842,6 @@ msgid ""
 "free</literal>"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:373 apt.conf.5.xml:157
-msgid "Architectures"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:375
 msgid ""
@@ -2302,11 +1850,6 @@ msgid ""
 "this tree has a source archive."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:386 apt-ftparchive.1.xml:434
-msgid "BinOverride"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:388
 msgid ""
@@ -2314,11 +1857,6 @@ msgid ""
 "and maintainer address information."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:392 apt-ftparchive.1.xml:439
-msgid "SrcOverride"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:394
 msgid ""
@@ -2326,21 +1864,11 @@ msgid ""
 "information."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:398 apt-ftparchive.1.xml:444
-msgid "ExtraOverride"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:400 apt-ftparchive.1.xml:446
 msgid "Sets the binary extra override file."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:403 apt-ftparchive.1.xml:449
-msgid "SrcExtraOverride"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:405 apt-ftparchive.1.xml:451
 msgid "Sets the source extra override file."
@@ -2393,21 +1921,11 @@ msgstr ""
 msgid "Sets the cache DB."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:459
-msgid "PathPrefix"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:461
 msgid "Appends a path to all the output paths."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:464
-msgid "FileList, SourceFileList"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:466
 msgid "Specifies the file list file."
@@ -2473,14 +1991,8 @@ msgstr ""
 #: apt-ftparchive.1.xml:499
 msgid ""
 "The extra override file allows any arbitrary tag to be added or replaced in "
-"the output. It has 3 columns, the first is the package, the second is the "
-"tag and the remainder of the line is the new value."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:508
-msgid ""
-"<option>--md5</option>, <option>--sha1</option>, <option>--sha256</option>"
+"the output. It has 3 columns, the first is the package, the second is the "
+"tag and the remainder of the line is the new value."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -2497,11 +2009,6 @@ msgid ""
 "<literal>MD5</literal>, <literal>SHA1</literal> or <literal>SHA256</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:519
-msgid "<option>--db</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:521
 msgid ""
@@ -2518,11 +2025,6 @@ msgid ""
 "file.  Configuration Item: <literal>quiet</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:533
-msgid "<option>--delink</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:535
 msgid ""
@@ -2532,11 +2034,6 @@ msgid ""
 "Item: <literal>APT::FTPArchive::DeLinkAct</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:541
-msgid "<option>--contents</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:543
 msgid ""
@@ -2547,11 +2044,6 @@ msgid ""
 "Configuration Item: <literal>APT::FTPArchive::Contents</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:551
-msgid "<option>--source-override</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:553
 msgid ""
@@ -2560,11 +2052,6 @@ msgid ""
 "literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:557
-msgid "<option>--readonly</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:559
 msgid ""
@@ -2572,11 +2059,6 @@ msgid ""
 "FTPArchive::ReadOnlyDB</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:563
-msgid "<option>--arch</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:564
 msgid ""
@@ -2586,11 +2068,6 @@ msgid ""
 "path.  Configuration Item: <literal>APT::FTPArchive::Architecture</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:570
-msgid "<option>APT::FTPArchive::AlwaysStat</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:572
 msgid ""
@@ -2605,11 +2082,6 @@ msgid ""
 "are useless."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:582
-msgid "<option>APT::FTPArchive::LongDescription</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:584
 msgid ""
@@ -2621,7 +2093,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:596 apt.conf.5.xml:1113 apt_preferences.5.xml:544
+#: apt-ftparchive.1.xml:596 apt.conf.5.xml:1113 apt_preferences.5.xml:545
 #: sources.list.5.xml:214
 msgid "Examples"
 msgstr ""
@@ -2674,12 +2146,6 @@ msgid ""
 "&aptitude;, &synaptic; and &wajig;."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:48 apt-key.8.xml:119
-#, fuzzy
-msgid "update"
-msgstr "upgrade"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:49
 msgid ""
@@ -2694,12 +2160,6 @@ msgid ""
 "as the size of the package files cannot be known in advance."
 msgstr ""
 
-#. type: <tag></tag>
-#: apt-get.8.xml:60 guide.sgml:121
-#, fuzzy
-msgid "upgrade"
-msgstr "upgrade"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:61
 msgid ""
@@ -2715,12 +2175,6 @@ msgid ""
 "command> knows that new versions of packages are available."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:73
-#, fuzzy
-msgid "dselect-upgrade"
-msgstr "dist-upgrade"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:74
 msgid ""
@@ -2732,12 +2186,6 @@ msgid ""
 "new packages)."
 msgstr ""
 
-#. type: <tag></tag>
-#: apt-get.8.xml:83 guide.sgml:140
-#, fuzzy
-msgid "dist-upgrade"
-msgstr "dist-upgrade"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:84
 msgid ""
@@ -2752,12 +2200,6 @@ msgid ""
 "for a mechanism for overriding the general settings for individual packages."
 msgstr ""
 
-#. type: <tag></tag>
-#: apt-get.8.xml:96 guide.sgml:131
-#, fuzzy
-msgid "install"
-msgstr "install"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:98
 msgid ""
@@ -2823,11 +2265,6 @@ msgid ""
 "expression."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:150
-msgid "remove"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:151
 msgid ""
@@ -2838,11 +2275,6 @@ msgid ""
 "installed instead of removed."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:158
-msgid "purge"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:159
 msgid ""
@@ -2851,11 +2283,6 @@ msgid ""
 "too)."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:163
-msgid "source"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:164
 msgid ""
@@ -2906,11 +2333,6 @@ msgid ""
 "balls."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:197
-msgid "build-dep"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:198
 msgid ""
@@ -2921,11 +2343,6 @@ msgid ""
 "option> option instead."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:204
-msgid "check"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:205
 msgid ""
@@ -2933,11 +2350,6 @@ msgid ""
 "and checks for broken dependencies."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:209
-msgid "download"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:210
 msgid ""
@@ -2957,11 +2369,6 @@ msgid ""
 "disk space."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:225
-msgid "autoclean"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:226
 msgid ""
@@ -2974,11 +2381,6 @@ msgid ""
 "is set to off."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:235
-msgid "autoremove"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:236
 msgid ""
@@ -2987,29 +2389,20 @@ msgid ""
 "now no longer needed."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:240
-msgid "changelog"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:241
 msgid ""
 "<literal>changelog</literal> downloads a package changelog and displays it "
 "through <command>sensible-pager</command>. The server name and base "
 "directory is defined in the <literal>APT::Changelogs::Server</literal> "
-"variable (e. g. <ulink>http://packages.debian.org/changelogs</ulink> for "
-"Debian or <ulink>http://changelogs.ubuntu.com/changelogs</ulink> for "
-"Ubuntu).  By default it displays the changelog for the version that is "
+"variable (e. g. <ulink url=\"http://packages.debian.org/changelogs"
+"\">packages.debian.org/changelogs</ulink> for Debian or <ulink url=\"http://"
+"changelogs.ubuntu.com/changelogs\">changelogs.ubuntu.com/changelogs</ulink> "
+"for Ubuntu).  By default it displays the changelog for the version that is "
 "installed.  However, you can specify the same options as for the "
 "<option>install</option> command."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:263
-msgid "<option>--no-install-recommends</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:264
 msgid ""
@@ -3017,11 +2410,6 @@ msgid ""
 "Configuration Item: <literal>APT::Install-Recommends</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:268
-msgid "<option>--install-suggests</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:269
 msgid ""
@@ -3029,11 +2417,6 @@ msgid ""
 "Item: <literal>APT::Install-Suggests</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:273
-msgid "<option>--download-only</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:274
 msgid ""
@@ -3041,11 +2424,6 @@ msgid ""
 "Configuration Item: <literal>APT::Get::Download-Only</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:278
-msgid "<option>--fix-broken</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:279
 msgid ""
@@ -3062,16 +2440,6 @@ msgid ""
 "<literal>APT::Get::Fix-Broken</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:292
-msgid "<option>--ignore-missing</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:293
-msgid "<option>--fix-missing</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:294
 msgid ""
@@ -3084,11 +2452,6 @@ msgid ""
 "Configuration Item: <literal>APT::Get::Fix-Missing</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:304
-msgid "<option>--no-download</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:305
 msgid ""
@@ -3109,16 +2472,6 @@ msgid ""
 "<literal>quiet</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:322
-msgid "<option>--simulate</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:324
-msgid "<option>--dry-run</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:327
 msgid ""
@@ -3147,21 +2500,6 @@ msgid ""
 "that are of no consequence (rare)."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:344
-msgid "<option>-y</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:344
-msgid "<option>--yes</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:345
-msgid "<option>--assume-yes</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:346
 msgid ""
@@ -3172,11 +2510,6 @@ msgid ""
 "Configuration Item: <literal>APT::Get::Assume-Yes</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:353
-msgid "<option>--assume-no</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:354
 msgid ""
@@ -3184,16 +2517,6 @@ msgid ""
 "Assume-No</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:358
-msgid "<option>-u</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:358
-msgid "<option>--show-upgraded</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:359
 msgid ""
@@ -3201,16 +2524,6 @@ msgid ""
 "upgraded.  Configuration Item: <literal>APT::Get::Show-Upgraded</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:364
-msgid "<option>-V</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:364
-msgid "<option>--verbose-versions</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:365
 msgid ""
@@ -3218,11 +2531,6 @@ msgid ""
 "<literal>APT::Get::Show-Versions</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:370
-msgid "<option>--host-architecture</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:371
 msgid ""
@@ -3234,21 +2542,6 @@ msgid ""
 "Architecture</literal>"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:379
-msgid "<option>-b</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:379
-msgid "<option>--compile</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:380
-msgid "<option>--build</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:381
 msgid ""
@@ -3256,11 +2549,6 @@ msgid ""
 "<literal>APT::Get::Compile</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:385
-msgid "<option>--ignore-hold</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:386
 msgid ""
@@ -3270,11 +2558,6 @@ msgid ""
 "holds.  Configuration Item: <literal>APT::Ignore-Hold</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:392
-msgid "<option>--no-upgrade</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:393
 msgid ""
@@ -3284,11 +2567,6 @@ msgid ""
 "<literal>APT::Get::Upgrade</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:399
-msgid "<option>--only-upgrade</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:400
 msgid ""
@@ -3298,11 +2576,6 @@ msgid ""
 "Configuration Item: <literal>APT::Get::Only-Upgrade</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:407
-msgid "<option>--force-yes</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:408
 msgid ""
@@ -3313,11 +2586,6 @@ msgid ""
 "<literal>APT::Get::force-yes</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:415
-msgid "<option>--print-uris</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:416
 msgid ""
@@ -3331,11 +2599,6 @@ msgid ""
 "Print-URIs</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:426
-msgid "<option>--purge</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:427
 msgid ""
@@ -3345,11 +2608,6 @@ msgid ""
 "command.  Configuration Item: <literal>APT::Get::Purge</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:434
-msgid "<option>--reinstall</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:435
 msgid ""
@@ -3357,11 +2615,6 @@ msgid ""
 "Configuration Item: <literal>APT::Get::ReInstall</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:439
-msgid "<option>--list-cleanup</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:440
 msgid ""
@@ -3373,16 +2626,6 @@ msgid ""
 "Cleanup</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:449
-msgid "<option>--target-release</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:450
-msgid "<option>--default-release</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:451
 msgid ""
@@ -3397,11 +2640,6 @@ msgid ""
 "also the &apt-preferences; manual page."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:464
-msgid "<option>--trivial-only</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:466
 msgid ""
@@ -3411,11 +2649,6 @@ msgid ""
 "answer no.  Configuration Item: <literal>APT::Get::Trivial-Only</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:472
-msgid "<option>--no-remove</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:473
 msgid ""
@@ -3423,11 +2656,6 @@ msgid ""
 "prompting.  Configuration Item: <literal>APT::Get::Remove</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:478
-msgid "<option>--auto-remove</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:479
 msgid ""
@@ -3437,11 +2665,6 @@ msgid ""
 "<literal>APT::Get::AutomaticRemove</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:485
-msgid "<option>--only-source</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:486
 msgid ""
@@ -3454,21 +2677,6 @@ msgid ""
 "Source</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:496
-msgid "<option>--diff-only</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:496
-msgid "<option>--dsc-only</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:496
-msgid "<option>--tar-only</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:497
 msgid ""
@@ -3477,11 +2685,6 @@ msgid ""
 "literal>, and <literal>APT::Get::Tar-Only</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:502
-msgid "<option>--arch-only</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:503
 msgid ""
@@ -3489,11 +2692,6 @@ msgid ""
 "<literal>APT::Get::Arch-Only</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:507
-msgid "<option>--allow-unauthenticated</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:508
 msgid ""
@@ -3568,11 +2766,6 @@ msgstr ""
 msgid "Commands"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:40
-msgid "add &synopsis-param-filename;"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml:43
 msgid ""
@@ -3581,61 +2774,31 @@ msgid ""
 "filename is <literal>-</literal> from standard input."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:52
-msgid "del &synopsis-param-keyid;"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml:56
 msgid "Remove a key from the list of trusted keys."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:63
-msgid "export &synopsis-param-keyid;"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml:67
 msgid "Output the key &synopsis-param-keyid; to standard output."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:74
-msgid "exportall"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml:78
 msgid "Output all trusted keys to standard output."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:85
-msgid "list"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml:89
 msgid "List trusted keys."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:96
-msgid "finger"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml:100
 msgid "List fingerprints of trusted keys."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:107
-msgid "adv"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml:111
 msgid ""
@@ -3653,12 +2816,6 @@ msgid ""
 "Debian."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:133
-#, fuzzy
-msgid "net-update"
-msgstr "upgrade"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml:137
 msgid ""
@@ -3677,11 +2834,6 @@ msgid ""
 "previous section."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:156
-msgid "--keyring &synopsis-param-filename;"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml:157
 msgid ""
@@ -3769,11 +2921,6 @@ msgid ""
 "removed by e.g.  <command>apt-get</command> or <command>aptitude</command>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:51
-msgid "auto"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml:52
 msgid ""
@@ -3782,11 +2929,6 @@ msgid ""
 "installed packages depend on this package."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:59
-msgid "manual"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml:60
 msgid ""
@@ -3795,11 +2937,6 @@ msgid ""
 "if no other packages depend on it."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:67
-msgid "hold"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml:68
 msgid ""
@@ -3810,11 +2947,6 @@ msgid ""
 "effected by the <option>--filename</option> option."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:77
-msgid "unhold"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml:78
 msgid ""
@@ -3822,11 +2954,6 @@ msgid ""
 "package to allow all actions again."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:83
-msgid "showauto"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml:84
 msgid ""
@@ -3836,11 +2963,6 @@ msgid ""
 "given only those which are automatically installed will be shown."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:91
-msgid "showmanual"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml:92
 msgid ""
@@ -3849,11 +2971,6 @@ msgid ""
 "installed packages instead."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:98
-msgid "showhold"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml:99
 msgid ""
@@ -3861,26 +2978,19 @@ msgid ""
 "the same way as for the other show commands."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:112
-msgid ""
-"<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:113
-msgid ""
-"<option>--file=<filename><replaceable>FILENAME</replaceable></filename></"
-"option>"
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><filename>
+#: apt-mark.8.xml:112 apt-mark.8.xml:113
+msgid "<replaceable>&synopsis-filename;</replaceable>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:116
+#: apt-mark.8.xml:115
 msgid ""
-"Read/Write package stats from <filename><replaceable>FILENAME</replaceable></"
-"filename> instead of the default location, which is "
-"<filename>extended_status</filename> in the directory defined by the "
-"Configuration Item: <literal>Dir::State</literal>."
+"Read/Write package stats from the filename given with the parameter "
+"<filename><replaceable>&synopsis-filename;</replaceable></filename> instead "
+"of from the default location, which is <filename>extended_status</filename> "
+"in the directory defined by the Configuration Item: <literal>Dir::State</"
+"literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist>
@@ -4148,12 +3258,7 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-sortpkgs.1.xml:45
-msgid "All output is sent to stdout, the input must be a seekable file."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-sortpkgs.1.xml:52
-msgid "<option>--source</option>"
+msgid "All output is sent to stdout, the input must be a seekable file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -4386,11 +3491,6 @@ msgid ""
 "options for all of the tools."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:151
-msgid "Architecture"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:152
 msgid ""
@@ -4412,11 +3512,6 @@ msgid ""
 "architectures</command>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:167
-msgid "Default-Release"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:168
 msgid ""
@@ -4426,11 +3521,6 @@ msgid ""
 "'5.0*'. See also &apt-preferences;."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:173
-msgid "Ignore-Hold"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:174
 msgid ""
@@ -4438,11 +3528,6 @@ msgid ""
 "ignore held packages in its decision making."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:178
-msgid "Clean-Installed"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:179
 msgid ""
@@ -4452,11 +3537,6 @@ msgid ""
 "but note that APT provides no direct means to reinstall them."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:185
-msgid "Immediate-Configure"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:186
 msgid ""
@@ -4490,11 +3570,6 @@ msgid ""
 "improving or correcting the upgrade process."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:208
-msgid "Force-LoopBreak"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:209
 msgid ""
@@ -4506,11 +3581,6 @@ msgid ""
 "those packages depend on."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:217
-msgid "Cache-Start, Cache-Grow and Cache-Limit"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:218
 msgid ""
@@ -4531,21 +3601,11 @@ msgid ""
 "automatic grow of the cache is disabled."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:233
-msgid "Build-Essential"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:234
 msgid "Defines which package(s) are considered essential build dependencies."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:237
-msgid "Get"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:238
 msgid ""
@@ -4553,11 +3613,6 @@ msgid ""
 "for more information about the options here."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:242
-msgid "Cache"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:243
 msgid ""
@@ -4565,11 +3620,6 @@ msgid ""
 "documentation for more information about the options here."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:247
-msgid "CDROM"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:248
 msgid ""
@@ -4582,11 +3632,6 @@ msgstr ""
 msgid "The Acquire Group"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:259
-msgid "Check-Valid-Until"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:260
 msgid ""
@@ -4599,11 +3644,6 @@ msgid ""
 "<literal>Max-ValidTime</literal> option can be used."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:270
-msgid "Max-ValidTime"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:271
 msgid ""
@@ -4615,11 +3655,6 @@ msgid ""
 "be made by appending the label of the archive to the option name."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:281
-msgid "Min-ValidTime"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:282
 msgid ""
@@ -4631,11 +3666,6 @@ msgid ""
 "should be used by appending the label of the archive to the option name."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:292
-msgid "PDiffs"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:293
 msgid ""
@@ -4654,11 +3684,6 @@ msgid ""
 "complete file is downloaded instead of the patches."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:305
-msgid "Queue-Mode"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:306
 msgid ""
@@ -4669,11 +3694,6 @@ msgid ""
 "connection per URI type will be opened."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:313
-msgid "Retries"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:314
 msgid ""
@@ -4681,11 +3701,6 @@ msgid ""
 "files the given number of times."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:318
-msgid "Source-Symlinks"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:319
 msgid ""
@@ -4693,11 +3708,6 @@ msgid ""
 "be symlinked when possible instead of copying. True is the default."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:323 sources.list.5.xml:160
-msgid "http"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:324
 msgid ""
@@ -4768,11 +3778,6 @@ msgid ""
 "clients only if the client uses a known identifier."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:366
-msgid "https"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:367
 msgid ""
@@ -4804,11 +3809,6 @@ msgid ""
 "option."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:391 sources.list.5.xml:171
-msgid "ftp"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:392
 msgid ""
@@ -4857,11 +3857,6 @@ msgid ""
 "that most FTP servers do not support RFC2428."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:430 sources.list.5.xml:153
-msgid "cdrom"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
 #: apt.conf.5.xml:436
 #, no-wrap
@@ -4881,11 +3876,6 @@ msgid ""
 "can be specified using UMount."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:441
-msgid "gpgv"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:442
 msgid ""
@@ -4894,11 +3884,6 @@ msgid ""
 "passed to gpgv."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:447
-msgid "CompressionTypes"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
 #: apt.conf.5.xml:453
 #, no-wrap
@@ -4975,11 +3960,6 @@ msgid ""
 "uncompressed files so this is mostly only useable for local mirrors."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:475
-msgid "GzipIndexes"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:477
 msgid ""
@@ -4989,11 +3969,6 @@ msgid ""
 "CPU requirements when building the local package caches. False by default."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:484
-msgid "Languages"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:485
 msgid ""
@@ -5149,11 +4124,6 @@ msgid ""
 "section."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:577
-msgid "Clean"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:578
 msgid ""
@@ -5172,11 +4142,6 @@ msgid ""
 "when it is run for the install phase."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:591
-msgid "Updateoptions"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:592
 msgid ""
@@ -5184,11 +4149,6 @@ msgid ""
 "when it is run for the update phase."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:596
-msgid "PromptAfterUpdate"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:597
 msgid ""
@@ -5216,16 +4176,6 @@ msgid ""
 "&dpkg;."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:614
-msgid "Pre-Invoke"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:614
-msgid "Post-Invoke"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:615
 msgid ""
@@ -5235,11 +4185,6 @@ msgid ""
 "fail APT will abort."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:621
-msgid "Pre-Install-Pkgs"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:622
 msgid ""
@@ -5260,11 +4205,6 @@ msgid ""
 "given to <literal>Pre-Install-Pkgs</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:635
-msgid "Run-Directory"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:636
 msgid ""
@@ -5272,11 +4212,6 @@ msgid ""
 "</filename>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:640
-msgid "Build-options"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:641
 msgid ""
@@ -5328,11 +4263,6 @@ msgid ""
 "would be <placeholder type=\"literallayout\" id=\"0\"/>"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:668
-msgid "DPkg::NoTriggers"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:669
 msgid ""
@@ -5345,11 +4275,6 @@ msgid ""
 "dpkg - now apt will add these flag also to the unpack and remove calls."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:676
-msgid "PackageManager::Configure"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:677
 msgid ""
@@ -5366,11 +4291,6 @@ msgid ""
 "the system could end in an unconfigured status which could be unbootable!"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:687
-msgid "DPkg::ConfigurePending"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:688
 msgid ""
@@ -5382,11 +4302,6 @@ msgid ""
 "you could deactivate this option in all but the last run."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:694
-msgid "DPkg::TriggersPending"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:695
 msgid ""
@@ -5397,11 +4312,6 @@ msgid ""
 "triggers, not only the triggers needed to configure this package."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:700
-msgid "PackageManager::UnpackAll"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:701
 msgid ""
@@ -5414,11 +4324,6 @@ msgid ""
 "really useful."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:708
-msgid "OrderList::Score::Immediate"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
 #: apt.conf.5.xml:716
 #, no-wrap
@@ -5513,52 +4418,27 @@ msgstr ""
 msgid "A full list of debugging options to apt follows."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:791
-msgid "<literal>Debug::Acquire::cdrom</literal>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:795
 msgid ""
 "Print information related to accessing <literal>cdrom://</literal> sources."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:802
-msgid "<literal>Debug::Acquire::ftp</literal>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:806
 msgid "Print information related to downloading packages using FTP."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:813
-msgid "<literal>Debug::Acquire::http</literal>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:817
 msgid "Print information related to downloading packages using HTTP."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:824
-msgid "<literal>Debug::Acquire::https</literal>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:828
 msgid "Print information related to downloading packages using HTTPS."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:835
-msgid "<literal>Debug::Acquire::gpgv</literal>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:839
 msgid ""
@@ -5566,11 +4446,6 @@ msgid ""
 "<literal>gpg</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:846
-msgid "<literal>Debug::aptcdrom</literal>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:850
 msgid ""
@@ -5578,21 +4453,11 @@ msgid ""
 "stored on CD-ROMs."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:857
-msgid "<literal>Debug::BuildDeps</literal>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:860
 msgid "Describes the process of resolving build-dependencies in &apt-get;."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:867
-msgid "<literal>Debug::Hashes</literal>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:870
 msgid ""
@@ -5600,11 +4465,6 @@ msgid ""
 "literal> libraries."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:877
-msgid "<literal>Debug::IdentCDROM</literal>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:880
 msgid ""
@@ -5613,11 +4473,6 @@ msgid ""
 "a CD-ROM."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:888
-msgid "<literal>Debug::NoLocking</literal>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:891
 msgid ""
@@ -5625,21 +4480,11 @@ msgid ""
 "<quote><literal>apt-get update</literal></quote> to run at the same time."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:899
-msgid "<literal>Debug::pkgAcquire</literal>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:903
 msgid "Log when items are added to or removed from the global download queue."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:910
-msgid "<literal>Debug::pkgAcquire::Auth</literal>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:913
 msgid ""
@@ -5647,11 +4492,6 @@ msgid ""
 "cryptographic signatures of downloaded files."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:920
-msgid "<literal>Debug::pkgAcquire::Diffs</literal>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:923
 msgid ""
@@ -5659,11 +4499,6 @@ msgid ""
 "and errors relating to package index list diffs."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:931
-msgid "<literal>Debug::pkgAcquire::RRed</literal>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:935
 msgid ""
@@ -5671,22 +4506,12 @@ msgid ""
 "index diffs instead of full indices."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:942
-msgid "<literal>Debug::pkgAcquire::Worker</literal>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:946
 msgid ""
 "Log all interactions with the sub-processes that actually perform downloads."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:953
-msgid "<literal>Debug::pkgAutoRemove</literal>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:957
 msgid ""
@@ -5694,11 +4519,6 @@ msgid ""
 "the removal of unused packages."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:964
-msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:967
 msgid ""
@@ -5709,11 +4529,6 @@ msgid ""
 "pkgProblemResolver</literal> for that."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:978
-msgid "<literal>Debug::pkgDepCache::Marker</literal>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:981
 msgid ""
@@ -5731,21 +4546,11 @@ msgid ""
 "<literal>section</literal> is the name of the section the package appears in."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1000
-msgid "<literal>Debug::pkgInitConfig</literal>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:1003
 msgid "Dump the default configuration to standard error on startup."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1010
-msgid "<literal>Debug::pkgDPkgPM</literal>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:1013
 msgid ""
@@ -5753,11 +4558,6 @@ msgid ""
 "invoked, with arguments separated by a single space character."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1021
-msgid "<literal>Debug::pkgDPkgProgressReporting</literal>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:1024
 msgid ""
@@ -5765,11 +4565,6 @@ msgid ""
 "any errors encountered while parsing it."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1031
-msgid "<literal>Debug::pkgOrderList</literal>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:1035
 msgid ""
@@ -5777,32 +4572,17 @@ msgid ""
 "<literal>apt</literal> should pass packages to &dpkg;."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1043
-msgid "<literal>Debug::pkgPackageManager</literal>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:1047
 msgid ""
 "Output status messages tracing the steps performed when invoking &dpkg;."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1054
-msgid "<literal>Debug::pkgPolicy</literal>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:1058
 msgid "Output the priority of each package list on startup."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1064
-msgid "<literal>Debug::pkgProblemResolver</literal>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:1068
 msgid ""
@@ -5810,11 +4590,6 @@ msgid ""
 "happens when a complex dependency problem is encountered)."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1076
-msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:1079
 msgid ""
@@ -5823,11 +4598,6 @@ msgid ""
 "described in <literal>Debug::pkgDepCache::Marker</literal>"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1087
-msgid "<literal>Debug::sourceList</literal>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:1091
 msgid ""
@@ -6280,93 +5050,94 @@ msgid ""
 "Pin-Priority: 990\n"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><literal>
-#: apt_preferences.5.xml:290
-msgid "Package"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><literal>
-#: apt_preferences.5.xml:296
-msgid "*"
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt_preferences.5.xml:291
+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 "
+"of all package names it matches. It is undecided whether this will change in "
+"the future, thus you should always list wild-card pins first, so later "
+"specific pins override it.  The pattern \"<literal>*</literal>\" in a "
+"Package field is not considered a glob() expression in itself."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:306
+#: apt_preferences.5.xml:307
 msgid "How APT Interprets Priorities"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:314
+#: apt_preferences.5.xml:315
 msgid "P &gt; 1000"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:315
+#: apt_preferences.5.xml:316
 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:319
+#: apt_preferences.5.xml:320
 msgid "990 &lt; P &lt;=1000"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:320
+#: apt_preferences.5.xml:321
 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:325
+#: apt_preferences.5.xml:326
 msgid "500 &lt; P &lt;=990"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:326
+#: apt_preferences.5.xml:327
 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:331
+#: apt_preferences.5.xml:332
 msgid "100 &lt; P &lt;=500"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:332
+#: apt_preferences.5.xml:333
 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:337
+#: apt_preferences.5.xml:338
 msgid "0 &lt; P &lt;=100"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:338
+#: apt_preferences.5.xml:339
 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:342
+#: apt_preferences.5.xml:343
 msgid "P &lt; 0"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:343
+#: apt_preferences.5.xml:344
 msgid "prevents the version from being installed"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:309
+#: apt_preferences.5.xml:310
 msgid ""
 "Priorities (P) assigned in the APT preferences file must be positive or "
 "negative integers.  They are interpreted as follows (roughly speaking): "
@@ -6374,7 +5145,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:348
+#: apt_preferences.5.xml:349
 msgid ""
 "If any specific-form records match an available package version then the "
 "first such record determines the priority of the package version.  Failing "
@@ -6383,14 +5154,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:354
+#: apt_preferences.5.xml:355
 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:358
+#: apt_preferences.5.xml:359
 #, no-wrap
 msgid ""
 "Package: perl\n"
@@ -6407,12 +5178,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:371
+#: apt_preferences.5.xml:372
 msgid "Then:"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:373
+#: apt_preferences.5.xml:374
 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 "
@@ -6422,7 +5193,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:378
+#: apt_preferences.5.xml:379
 msgid ""
 "A version of any package other than <literal>perl</literal> that is "
 "available from the local system has priority over other versions, even "
@@ -6430,7 +5201,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:382
+#: apt_preferences.5.xml:383
 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</"
@@ -6439,12 +5210,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:392
+#: apt_preferences.5.xml:393
 msgid "Determination of Package Version and Distribution Properties"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:394
+#: apt_preferences.5.xml:395
 msgid ""
 "The locations listed in the &sources-list; file should provide "
 "<filename>Packages</filename> and <filename>Release</filename> files to "
@@ -6452,27 +5223,27 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:406
+#: apt_preferences.5.xml:407
 msgid "the <literal>Package:</literal> line"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:407
+#: apt_preferences.5.xml:408
 msgid "gives the package name"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:410 apt_preferences.5.xml:460
+#: apt_preferences.5.xml:411 apt_preferences.5.xml:461
 msgid "the <literal>Version:</literal> line"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:411
+#: apt_preferences.5.xml:412
 msgid "gives the version number for the named package"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:398
+#: apt_preferences.5.xml:399
 msgid ""
 "The <filename>Packages</filename> file is normally found in the directory "
 "<filename>.../dists/<replaceable>dist-name</replaceable>/"
@@ -6485,12 +5256,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:427
+#: apt_preferences.5.xml:428
 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:428
+#: apt_preferences.5.xml:429
 msgid ""
 "names the archive to which all the packages in the directory tree belong.  "
 "For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@ -6501,18 +5272,18 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:438
+#: apt_preferences.5.xml:439
 #, no-wrap
 msgid "Pin: release a=stable\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:444
+#: apt_preferences.5.xml:445
 msgid "the <literal>Codename:</literal> line"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:445
+#: apt_preferences.5.xml:446
 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 "
@@ -6523,13 +5294,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:454
+#: apt_preferences.5.xml:455
 #, 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:461
+#: apt_preferences.5.xml:462
 msgid ""
 "names the release version.  For example, the packages in the tree might "
 "belong to Debian GNU/Linux release version 3.0.  Note that there is normally "
@@ -6539,7 +5310,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:470
+#: apt_preferences.5.xml:471
 #, no-wrap
 msgid ""
 "Pin: release v=3.0\n"
@@ -6548,12 +5319,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:479
+#: apt_preferences.5.xml:480
 msgid "the <literal>Component:</literal> line"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:480
+#: apt_preferences.5.xml:481
 msgid ""
 "names the licensing component associated with the packages in the directory "
 "tree of the <filename>Release</filename> file.  For example, the line "
@@ -6564,18 +5335,18 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:489
+#: apt_preferences.5.xml:490
 #, no-wrap
 msgid "Pin: release c=main\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:495
+#: apt_preferences.5.xml:496
 msgid "the <literal>Origin:</literal> line"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:496
+#: apt_preferences.5.xml:497
 msgid ""
 "names the originator of the packages in the directory tree of the "
 "<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"
@@ -6584,18 +5355,18 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:502
+#: apt_preferences.5.xml:503
 #, no-wrap
 msgid "Pin: release o=Debian\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:508
+#: apt_preferences.5.xml:509
 msgid "the <literal>Label:</literal> line"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:509
+#: apt_preferences.5.xml:510
 msgid ""
 "names the label of the packages in the directory tree of the "
 "<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"
@@ -6604,13 +5375,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:515
+#: apt_preferences.5.xml:516
 #, no-wrap
 msgid "Pin: release l=Debian\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:416
+#: apt_preferences.5.xml:417
 msgid ""
 "The <filename>Release</filename> file is normally found in the directory "
 "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
@@ -6624,7 +5395,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:522
+#: apt_preferences.5.xml:523
 msgid ""
 "All of the <filename>Packages</filename> and <filename>Release</filename> "
 "files retrieved from locations listed in the &sources-list; file are stored "
@@ -6639,12 +5410,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:535
+#: apt_preferences.5.xml:536
 msgid "Optional Lines in an APT Preferences Record"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:537
+#: apt_preferences.5.xml:538
 msgid ""
 "Each record in the APT preferences file can optionally begin with one or "
 "more lines beginning with the word <literal>Explanation:</literal>.  This "
@@ -6652,12 +5423,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:546
+#: apt_preferences.5.xml:547
 msgid "Tracking Stable"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:554
+#: apt_preferences.5.xml:555
 #, no-wrap
 msgid ""
 "Explanation: Uninstall or do not install any Debian-originated\n"
@@ -6672,7 +5443,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:548
+#: apt_preferences.5.xml:549
 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 "
@@ -6682,8 +5453,8 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:571 apt_preferences.5.xml:617
-#: apt_preferences.5.xml:675
+#: apt_preferences.5.xml:572 apt_preferences.5.xml:618
+#: apt_preferences.5.xml:676
 #, no-wrap
 msgid ""
 "apt-get install <replaceable>package-name</replaceable>\n"
@@ -6692,7 +5463,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:566
+#: apt_preferences.5.xml:567
 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 "
@@ -6701,13 +5472,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:583
+#: apt_preferences.5.xml:584
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/testing\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:577
+#: apt_preferences.5.xml:578
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>testing</literal> distribution; the package "
@@ -6716,12 +5487,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:589
+#: apt_preferences.5.xml:590
 msgid "Tracking Testing or Unstable"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:598
+#: apt_preferences.5.xml:599
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -6738,7 +5509,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:591
+#: apt_preferences.5.xml:592
 msgid ""
 "The following APT preferences file will cause APT to assign a high priority "
 "to package versions from the <literal>testing</literal> distribution, a "
@@ -6749,7 +5520,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:612
+#: apt_preferences.5.xml:613
 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 "
@@ -6758,13 +5529,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:632
+#: apt_preferences.5.xml:633
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:623
+#: apt_preferences.5.xml:624
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>unstable</literal> distribution.  "
@@ -6776,12 +5547,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:639
+#: apt_preferences.5.xml:640
 msgid "Tracking the evolution of a codename release"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:653
+#: apt_preferences.5.xml:654
 #, no-wrap
 msgid ""
 "Explanation: Uninstall or do not install any Debian-originated package versions\n"
@@ -6801,7 +5572,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:641
+#: apt_preferences.5.xml:642
 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 "
@@ -6816,7 +5587,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:670
+#: apt_preferences.5.xml:671
 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 "
@@ -6825,13 +5596,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:690
+#: apt_preferences.5.xml:691
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/sid\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:681
+#: apt_preferences.5.xml:682
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>sid</literal> distribution.  Thereafter, "
@@ -6843,12 +5614,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt_preferences.5.xml:699
+#: apt_preferences.5.xml:700
 msgid "&file-preferences;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:705
+#: apt_preferences.5.xml:706
 msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 msgstr ""
 
@@ -7047,6 +5818,11 @@ msgid ""
 "archives."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+#: sources.list.5.xml:153
+msgid "cdrom"
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml:155
 msgid ""
@@ -7054,6 +5830,11 @@ msgid ""
 "Use the &apt-cdrom; program to create cdrom entries in the source list."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+#: sources.list.5.xml:160
+msgid "http"
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml:162
 msgid ""
@@ -7065,6 +5846,11 @@ msgid ""
 "authentication."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+#: sources.list.5.xml:171
+msgid "ftp"
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml:173
 msgid ""
@@ -7501,6 +6287,12 @@ msgstr ""
 msgid "Once updated there are several commands that can be used:"
 msgstr "Dopo aver aggiornato l'elenco si possono usare molti comandi:"
 
+#. type: <tag></tag>
+#: guide.sgml:121
+#, fuzzy
+msgid "upgrade"
+msgstr "upgrade"
+
 #. type: <p></p>
 #: guide.sgml:131
 #, fuzzy
@@ -7521,6 +6313,12 @@ msgstr ""
 "altri. Per forzare la loro installazione si può usare <prgn>dselect</prgn> o "
 "<tt>apt-get install</tt>."
 
+#. type: <tag></tag>
+#: guide.sgml:131
+#, fuzzy
+msgid "install"
+msgstr "install"
+
 #. type: <p></p>
 #: guide.sgml:140
 #, fuzzy
@@ -7542,6 +6340,12 @@ msgstr ""
 "conferma se si devono modificare altri pacchetti che non siano quelli sulla "
 "linea di comando."
 
+#. type: <tag></tag>
+#: guide.sgml:140
+#, fuzzy
+msgid "dist-upgrade"
+msgstr "dist-upgrade"
+
 #. type: <p></p>
 #: guide.sgml:149
 #, fuzzy
diff --git a/doc/po/ja.po b/doc/po/ja.po
index 1c516263e..91de3b0bf 100644
--- a/doc/po/ja.po
+++ b/doc/po/ja.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.7.25.3\n"
-"POT-Creation-Date: 2012-05-20 18:22+0300\n"
+"POT-Creation-Date: 2012-05-21 04:13+0300\n"
 "PO-Revision-Date: 2010-09-07 07:38+0900\n"
 "Last-Translator: KURASAWA Nozomu <nabetaro@caldron.jp>\n"
 "Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n"
@@ -882,11 +882,6 @@ msgstr ""
 "<option>-h</option> オプションや <option>--help</option> オプションを除き、以"
 "下に挙げるコマンドが必要です。"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:48
-msgid "gencaches"
-msgstr "gencaches"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:49
 msgid ""
@@ -894,13 +889,12 @@ msgid ""
 "implicitly by all commands needing this cache if it is missing or outdated."
 msgstr ""
 
-# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:53
-#, fuzzy
-#| msgid "showpkg <replaceable>pkg(s)</replaceable>"
-msgid "showpkg <replaceable>&synopsis-pkg;</replaceable>…"
-msgstr "showpkg <replaceable>pkg(s)</replaceable>"
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
+#: apt-cache.8.xml:53 apt-cache.8.xml:142 apt-cache.8.xml:163
+#: 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
+msgid "&synopsis-pkg;"
+msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -973,11 +967,6 @@ msgstr ""
 "altdev はインストールする必要はありません。出力の残りの部分の意味については、"
 "apt のソースコードを調べるのが最良でしょう。"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:87
-msgid "stats"
-msgstr "stats"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:87
@@ -1098,14 +1087,6 @@ msgstr ""
 "<literal>依存関係総数</literal>は、キャッシュにあるすべてのパッケージで要求さ"
 "れた依存関係の数です。"
 
-# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:142
-#, fuzzy
-#| msgid "showsrc <replaceable>pkg(s)</replaceable>"
-msgid "showsrc <replaceable>&synopsis-pkg;</replaceable>…"
-msgstr "showsrc <replaceable>pkg(s)</replaceable>"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:143
@@ -1118,11 +1099,6 @@ msgstr ""
 "を、すべて表示します。バイナリになるときの名称を宣言したレコードと同様に、す"
 "べてのバージョンについて表示します。"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:148 apt-config.8.xml:75
-msgid "dump"
-msgstr "dump"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:149
@@ -1133,11 +1109,6 @@ msgstr ""
 "<literal>dump</literal> は、キャッシュ内のパッケージそれぞれについて、短い一"
 "覧を表示します。主にデバッグ用です。"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:153
-msgid "dumpavail"
-msgstr "dumpavail"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:154
@@ -1148,11 +1119,6 @@ msgstr ""
 "<literal>dumpavail</literal> は、標準出力に利用可能なものの一覧を出力しま"
 "す。 &dpkg; と共に使用すると便利ですし、&dselect; でも使用されます。"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:158
-msgid "unmet"
-msgstr "unmet"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:159
@@ -1163,14 +1129,6 @@ msgstr ""
 "<literal>unmet</literal> は、パッケージキャッシュ内にある、不適当な依存関係の"
 "概要を表示します。"
 
-# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:163
-#, fuzzy
-#| msgid "show <replaceable>pkg(s)</replaceable>"
-msgid "show <replaceable>&synopsis-pkg;</replaceable>…"
-msgstr "show <replaceable>pkg(s)</replaceable>"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:164
@@ -1181,12 +1139,10 @@ msgstr ""
 "<literal>show</literal> は、<command>dpkg --print-avail</command> と同様の機"
 "能を実行します。これは、指定したパッケージのパッケージレコードの表示です。"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
 #: apt-cache.8.xml:169
-#, fuzzy
-#| msgid "search <replaceable>regex [ regex ... ]</replaceable>"
-msgid "search <replaceable>&synopsis-regex;</replaceable>…"
-msgstr "search <replaceable>regex [ regex ... ]</replaceable>"
+msgid "&synopsis-regex;"
+msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -1221,14 +1177,6 @@ msgid ""
 "and'ed together."
 msgstr "空白で区切った引数で、複数の検索パターンの and をとることができます。"
 
-# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:187
-#, fuzzy
-#| msgid "depends <replaceable>pkg(s)</replaceable>"
-msgid "depends <replaceable>&synopsis-pkg;</replaceable>…"
-msgstr "depends <replaceable>pkg(s)</replaceable>"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:188
@@ -1239,14 +1187,6 @@ msgstr ""
 "<literal>depends</literal> は、パッケージが持っている依存関係と、その依存関係"
 "を満たす他のパッケージの一覧を表示します。"
 
-# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:192
-#, fuzzy
-#| msgid "rdepends <replaceable>pkg(s)</replaceable>"
-msgid "rdepends <replaceable>&synopsis-pkg;</replaceable>…"
-msgstr "rdepends <replaceable>pkg(s)</replaceable>"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:193
@@ -1261,7 +1201,7 @@ msgstr ""
 #: apt-cache.8.xml:197
 #, fuzzy
 #| msgid "pkgnames <replaceable>[ prefix ]</replaceable>"
-msgid "pkgnames [ <replaceable>&synopsis-prefix;</replaceable> ]"
+msgid "<optional><replaceable>&synopsis-prefix;</replaceable></optional>"
 msgstr "pkgnames <replaceable>[ prefix ]</replaceable>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -1290,14 +1230,6 @@ msgstr ""
 "ル済みである必要がないことに注意してください。つまり、仮想パッケージも生成し"
 "た一覧にあります。"
 
-# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:208
-#, fuzzy
-#| msgid "dotty <replaceable>pkg(s)</replaceable>"
-msgid "dotty <replaceable>&synopsis-pkg;</replaceable>…"
-msgstr "dotty <replaceable>pkg(s)</replaceable>"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:209
@@ -1338,14 +1270,6 @@ msgstr ""
 msgid "Caution, dotty cannot graph larger sets of packages."
 msgstr "注意) dotty は、パッケージのより大きなセットのグラフは描けません。"
 
-# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:226
-#, fuzzy
-#| msgid "xvcg <replaceable>pkg(s)</replaceable>"
-msgid "xvcg <replaceable>&synopsis-pkg;</replaceable>"
-msgstr "xvcg <replaceable>pkg(s)</replaceable>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:227
 msgid ""
@@ -1359,9 +1283,9 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-cache.8.xml:231
 #, fuzzy
-#| msgid "policy <replaceable>[ pkg(s) ]</replaceable>"
-msgid "policy [ <replaceable>&synopsis-pkg;</replaceable>… ]"
-msgstr "policy <replaceable>[ pkg(s) ]</replaceable>"
+#| msgid "madison <replaceable>[ pkg(s) ]</replaceable>"
+msgid "<optional><replaceable>&synopsis-pkg;</replaceable>…</optional>"
+msgstr "madison <replaceable>[ pkg(s) ]</replaceable>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -1376,14 +1300,6 @@ msgstr ""
 "します。引数を指定しなかった場合、取得元ごとの優先順位を表示します。一方、"
 "パッケージ名を指定した場合、優先順の詳細情報を表示します。"
 
-# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:238
-#, fuzzy
-#| msgid "madison <replaceable>[ pkg(s) ]</replaceable>"
-msgid "madison <replaceable>&synopsis-pkg;</replaceable>…"
-msgstr "madison <replaceable>[ pkg(s) ]</replaceable>"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:239
@@ -1404,23 +1320,13 @@ msgstr ""
 "表示するだけです。"
 
 # type: Content of: <refentry><refsect1><title>
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:250 apt-config.8.xml:84 apt-extracttemplates.1.xml:51
+#. type: Content of: <refentry><refsect1><title>
+#: apt-cache.8.xml:250 apt-config.8.xml:84 apt-extracttemplates.1.xml:52
 #: apt-ftparchive.1.xml:504 apt-get.8.xml:259 apt-mark.8.xml:108
-#: apt-sortpkgs.1.xml:48 apt.conf.5.xml:586 apt.conf.5.xml:608
+#: apt-sortpkgs.1.xml:48
 msgid "options"
 msgstr "オプション"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:254
-msgid "<option>-p</option>"
-msgstr "<option>-p</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:254
-msgid "<option>--pkg-cache</option>"
-msgstr "<option>--pkg-cache</option>"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:255
@@ -1433,17 +1339,6 @@ msgstr ""
 "すべての操作で使用される一次キャッシュです。設定項目 - <literal>Dir::Cache::"
 "pkgcache</literal>"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:260 apt-ftparchive.1.xml:551 apt-get.8.xml:321
-#: apt-sortpkgs.1.xml:52
-msgid "<option>-s</option>"
-msgstr "<option>-s</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:260
-msgid "<option>--src-cache</option>"
-msgstr "<option>--src-cache</option>"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:261
@@ -1460,16 +1355,6 @@ msgstr ""
 "シュは、全パッケージファイルを再解析を避ける上で便利です。設定項目 - "
 "<literal>Dir::Cache::srcpkgcache</literal>"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:268 apt-ftparchive.1.xml:525 apt-get.8.xml:311
-msgid "<option>-q</option>"
-msgstr "<option>-q</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:268 apt-ftparchive.1.xml:525 apt-get.8.xml:311
-msgid "<option>--quiet</option>"
-msgstr "<option>--quiet</option>"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:269
@@ -1484,16 +1369,6 @@ msgstr ""
 "レベルを指定して、設定ファイルを上書きすることもできます。設定項目 - "
 "<literal>quiet</literal>"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:275
-msgid "<option>-i</option>"
-msgstr "<option>-i</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:275
-msgid "<option>--important</option>"
-msgstr "<option>--important</option>"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:276
@@ -1506,46 +1381,6 @@ msgstr ""
 "関係と「先行依存」関係のみを表示するためです。設定項目 - <literal>APT::"
 "Cache::Important</literal>"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:281
-msgid "<option>--no-pre-depends</option>"
-msgstr "<option>--no-pre-depends</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:282
-msgid "<option>--no-depends</option>"
-msgstr "<option>--no-depends</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:283
-msgid "<option>--no-recommends</option>"
-msgstr "<option>--no-recommends</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:284
-msgid "<option>--no-suggests</option>"
-msgstr "<option>--no-suggests</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:285
-msgid "<option>--no-conflicts</option>"
-msgstr "<option>--no-conflicts</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:286
-msgid "<option>--no-breaks</option>"
-msgstr "<option>--no-breaks</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:287
-msgid "<option>--no-replaces</option>"
-msgstr "<option>--no-replaces</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:288
-msgid "<option>--no-enhances</option>"
-msgstr "<option>--no-enhances</option>"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:289
@@ -1561,16 +1396,6 @@ msgstr ""
 "ケージを再帰的に一度に表示します。設定項目 - <literal>APT::Cache::"
 "RecurseDepends</literal>"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:295 apt-cdrom.8.xml:111 apt-get.8.xml:278
-msgid "<option>-f</option>"
-msgstr "<option>-f</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:295
-msgid "<option>--full</option>"
-msgstr "<option>--full</option>"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:296
@@ -1581,17 +1406,6 @@ msgstr ""
 "search 時に全パッケージレコードを表示します。設定項目 - <literal>APT::Cache::"
 "ShowFull</literal>"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:300 apt-cdrom.8.xml:121 apt-ftparchive.1.xml:563
-#: apt-get.8.xml:369
-msgid "<option>-a</option>"
-msgstr "<option>-a</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:300
-msgid "<option>--all-versions</option>"
-msgstr "<option>--all-versions</option>"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:301
@@ -1609,16 +1423,6 @@ msgstr ""
 "の際に選択されるもの) だけ表示します。このオプションは、show コマンドでのみ適"
 "用できます。設定項目 - <literal>APT::Cache::AllVersions</literal>"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:309
-msgid "<option>-g</option>"
-msgstr "<option>-g</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:309
-msgid "<option>--generate</option>"
-msgstr "<option>--generate</option>"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:310
@@ -1632,16 +1436,6 @@ msgstr ""
 "option> を使用してください。設定項目 - <literal>APT::Cache::Generate</"
 "literal>"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:315
-msgid "<option>--names-only</option>"
-msgstr "<option>--names-only</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:315 apt-cdrom.8.xml:129
-msgid "<option>-n</option>"
-msgstr "<option>-n</option>"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:316
@@ -1652,11 +1446,6 @@ msgstr ""
 "説明文ではなく、パッケージ名からのみ検索します。設定項目 - <literal>APT::"
 "Cache::NamesOnly</literal>"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:320
-msgid "<option>--all-names</option>"
-msgstr "<option>--all-names</option>"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:321
@@ -1668,11 +1457,6 @@ msgstr ""
 "<literal>pkgnames</literal> で、仮想パッケージや欠落依存関係を含めた全名称を"
 "表示します。設定項目 - <literal>APT::Cache::AllNames</literal>"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:326
-msgid "<option>--recurse</option>"
-msgstr "<option>--recurse</option>"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:327
@@ -1685,11 +1469,6 @@ msgstr ""
 "ケージを再帰的に一度に表示します。設定項目 - <literal>APT::Cache::"
 "RecurseDepends</literal>"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:332
-msgid "<option>--installed</option>"
-msgstr "<option>--installed</option>"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:334
@@ -1705,7 +1484,7 @@ msgstr ""
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><variablelist>
 #: apt-cache.8.xml:339 apt-cdrom.8.xml:140 apt-config.8.xml:104
-#: apt-extracttemplates.1.xml:62 apt-ftparchive.1.xml:591 apt-get.8.xml:514
+#: apt-extracttemplates.1.xml:63 apt-ftparchive.1.xml:591 apt-get.8.xml:514
 #: apt-mark.8.xml:122 apt-sortpkgs.1.xml:58
 msgid "&apt-commonoptions;"
 msgstr "&apt-commonoptions;"
@@ -1713,7 +1492,7 @@ msgstr "&apt-commonoptions;"
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>
 #: apt-cache.8.xml:344 apt-get.8.xml:519 apt-key.8.xml:167 apt-mark.8.xml:126
-#: apt.conf.5.xml:1119 apt_preferences.5.xml:697
+#: apt.conf.5.xml:1119 apt_preferences.5.xml:698
 msgid "Files"
 msgstr "ファイル"
 
@@ -1725,9 +1504,9 @@ msgstr "&file-sourceslist; &file-statelists;"
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>
 #: apt-cache.8.xml:351 apt-cdrom.8.xml:145 apt-config.8.xml:109
-#: apt-extracttemplates.1.xml:69 apt-ftparchive.1.xml:607 apt-get.8.xml:529
+#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:607 apt-get.8.xml:529
 #: apt-key.8.xml:188 apt-mark.8.xml:132 apt-secure.8.xml:185
-#: apt-sortpkgs.1.xml:63 apt.conf.5.xml:1125 apt_preferences.5.xml:704
+#: apt-sortpkgs.1.xml:63 apt.conf.5.xml:1125 apt_preferences.5.xml:705
 #: sources.list.5.xml:255
 msgid "See Also"
 msgstr "関連項目"
@@ -1741,7 +1520,7 @@ msgstr "&apt-conf;, &sources-list;, &apt-get;"
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>
 #: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:114
-#: apt-extracttemplates.1.xml:73 apt-ftparchive.1.xml:611 apt-get.8.xml:535
+#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:611 apt-get.8.xml:535
 #: apt-mark.8.xml:136 apt-sortpkgs.1.xml:67
 msgid "Diagnostics"
 msgstr "診断メッセージ"
@@ -1803,11 +1582,6 @@ msgstr ""
 "command> が必要になります。その上、CD セットのディスクを 1 枚づつ、焼き損じを"
 "補正できるか評価しなければなりません。"
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:55
-msgid "add"
-msgstr "add"
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt-cdrom.8.xml:56
 msgid ""
@@ -1834,11 +1608,6 @@ msgstr ""
 "す。またその ID を、<filename>&statedir;/cdroms.list</filename> 内のデータ"
 "ベースで管理します。"
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:71
-msgid "ident"
-msgstr "ident"
-
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt-cdrom.8.xml:72
@@ -1866,16 +1635,6 @@ msgstr ""
 msgid "Options"
 msgstr "オプション"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:85 apt-ftparchive.1.xml:519 apt-get.8.xml:273
-msgid "<option>-d</option>"
-msgstr "<option>-d</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:85
-msgid "<option>--cdrom</option>"
-msgstr "<option>--cdrom</option>"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cdrom.8.xml:86
@@ -1888,16 +1647,6 @@ msgstr ""
 "は、<filename>/etc/fstab</filename> に正しく設定されている必要があります。設"
 "定項目 - <literal>Acquire::cdrom::mount</literal>"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:94
-msgid "<option>-r</option>"
-msgstr "<option>-r</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:94
-msgid "<option>--rename</option>"
-msgstr "<option>--rename</option>"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cdrom.8.xml:95
@@ -1910,16 +1659,6 @@ msgstr ""
 "プションにより、<command>apt-cdrom</command> が新しいラベルを入力するよう促し"
 "ます。設定項目 - <literal>APT::CDROM::Rename</literal>"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:103 apt-get.8.xml:292
-msgid "<option>-m</option>"
-msgstr "<option>-m</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:103
-msgid "<option>--no-mount</option>"
-msgstr "<option>--no-mount</option>"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cdrom.8.xml:104
@@ -1932,11 +1671,6 @@ msgstr ""
 "アンマウントしないようにします。設定項目 - <literal>APT::CDROM::NoMount</"
 "literal>"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:111
-msgid "<option>--fast</option>"
-msgstr "<option>--fast</option>"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cdrom.8.xml:112
@@ -1951,11 +1685,6 @@ msgstr ""
 "ており、エラーを検出しなかった場合のみ使用すべきです。設定項目 - "
 "<literal>APT::CDROM::Fast</literal>"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:121
-msgid "<option>--thorough</option>"
-msgstr "<option>--thorough</option>"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cdrom.8.xml:122
@@ -1969,21 +1698,6 @@ msgstr ""
 "キャンするのに非常に時間がかかりますが、全パッケージファイルを抽出することが"
 "できます。"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:130 apt-get.8.xml:323
-msgid "<option>--just-print</option>"
-msgstr "<option>--just-print</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:131 apt-get.8.xml:325
-msgid "<option>--recon</option>"
-msgstr "<option>--recon</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:132 apt-get.8.xml:326
-msgid "<option>--no-act</option>"
-msgstr "<option>--no-act</option>"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cdrom.8.xml:133
@@ -2059,11 +1773,6 @@ msgstr ""
 "<option>-h</option> オプションや <option>--help</option> オプションを除き、以"
 "下に挙げるコマンドが必要です。"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-config.8.xml:49
-msgid "shell"
-msgstr "shell"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-config.8.xml:51
@@ -2121,13 +1830,6 @@ msgstr ""
 msgid "Just show the contents of the configuration space."
 msgstr "設定箇所の内容を表示するだけです。"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-config.8.xml:89
-#, fuzzy
-#| msgid "<option>--help</option>"
-msgid "<option>--empty</option>"
-msgstr "<option>--help</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-config.8.xml:90
 msgid ""
@@ -2135,11 +1837,9 @@ msgid ""
 "empty to remove them from the output."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
 #: apt-config.8.xml:95
-msgid ""
-"<option>--format '<replaceable>&percnt;f &#x0022;&percnt;v&#x0022;;&percnt;"
-"n</replaceable>'</option>"
+msgid "&percnt;f &#x0022;&percnt;v&#x0022;;&percnt;n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -2156,7 +1856,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:110 apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:608
+#: apt-config.8.xml:110 apt-extracttemplates.1.xml:71 apt-ftparchive.1.xml:608
 #: apt-sortpkgs.1.xml:64
 msgid "&apt-conf;"
 msgstr "&apt-conf;"
@@ -2214,30 +1914,28 @@ msgstr "package version template-file config-script"
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
 #: apt-extracttemplates.1.xml:45
+#, fuzzy
+#| msgid ""
+#| "template-file and config-script are written to the temporary directory "
+#| "specified by the -t or --tempdir (<literal>APT::ExtractTemplates::"
+#| "TempDir</literal>)  directory, with filenames of the form "
+#| "<filename>package.template.XXXX</filename> and <filename>package.config."
+#| "XXXX</filename>"
 msgid ""
 "template-file and config-script are written to the temporary directory "
-"specified by the -t or --tempdir (<literal>APT::ExtractTemplates::TempDir</"
-"literal>)  directory, with filenames of the form <filename>package.template."
-"XXXX</filename> and <filename>package.config.XXXX</filename>"
+"specified by the <option>-t</option> or <option>--tempdir</option> "
+"(<literal>APT::ExtractTemplates::TempDir</literal>) directory, with "
+"filenames of the form <filename>package.template.XXXX</filename> and "
+"<filename>package.config.XXXX</filename>"
 msgstr ""
 "テンプレートファイルや、設定スクリプトは、-t や --tempdir で指定した一時ディ"
 "レクトリ (<literal>APT::ExtractTemplates::TempDir</literal>) に書き出され、"
 "ファイル名は、<filename>package.template.XXXX</filename> や "
 "<filename>package.config.XXXX</filename> と言った形になります。"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-extracttemplates.1.xml:55 apt-get.8.xml:448
-msgid "<option>-t</option>"
-msgstr "<option>-t</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-extracttemplates.1.xml:55
-msgid "<option>--tempdir</option>"
-msgstr "<option>--tempdir</option>"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-extracttemplates.1.xml:57
+#: apt-extracttemplates.1.xml:58
 msgid ""
 "Temporary directory in which to write extracted debconf template files and "
 "config scripts.  Configuration Item: <literal>APT::ExtractTemplates::"
@@ -2248,7 +1946,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:74
+#: apt-extracttemplates.1.xml:75
 msgid ""
 "<command>apt-extracttemplates</command> returns zero on normal operation, "
 "decimal 100 on error."
@@ -2321,12 +2019,6 @@ msgstr ""
 "部プログラムにも依存しません。すべて生成する際には、ファイル変更点の検出と希"
 "望した圧縮出力ファイルの作成を自動的に実行します。"
 
-# type: <tag></tag>
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:58
-msgid "packages"
-msgstr "packages"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:60
@@ -2348,12 +2040,6 @@ msgid ""
 "The option <option>--db</option> can be used to specify a binary caching DB."
 msgstr "<option>--db</option> オプションで、キャッシュ DB を指定できます。"
 
-# type: Content of: <refentry><refnamediv><refname>
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:68
-msgid "sources"
-msgstr "sources"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:70
@@ -2380,11 +2066,6 @@ msgstr ""
 "ルを探します。使用するソースオーバーライドファイルを変更するのには、--source-"
 "override オプションを使用します。"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:80
-msgid "contents"
-msgstr "contents"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:82
@@ -2403,11 +2084,6 @@ msgstr ""
 "ません。複数のパッケージが同じファイルを持つ場合、パッケージ名をカンマ区切り"
 "で出力します。"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:92
-msgid "release"
-msgstr "release"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:94
 msgid ""
@@ -2443,11 +2119,6 @@ msgstr ""
 "literal>, <literal>Valid-Until</literal>, <literal>Architectures</literal>, "
 "<literal>Components</literal>, <literal>Description</literal> です。"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:115
-msgid "generate"
-msgstr "generate"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:117
@@ -2463,11 +2134,6 @@ msgstr ""
 "は、必要な設定を維持する簡単な方法を提供すると共に、インデックスファイルをど"
 "のディレクトリから作成するかを指定する、柔軟な方法を提供します。"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:124 apt-get.8.xml:215
-msgid "clean"
-msgstr "clean"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:126
@@ -2530,12 +2196,6 @@ msgstr ""
 "めに必要な、標準ディレクトリを定義します。このディレクトリは、完全な絶対パス"
 "を生成するため、後のセクションで定義される相対パスの前に結合されます。"
 
-# type: <tag></tag>
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:151
-msgid "ArchiveDir"
-msgstr "ArchiveDir"
-
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:153
@@ -2547,34 +2207,18 @@ msgstr ""
 "FTP アーカイブのルートを指定します。標準的な Debian 設定では、このディレクト"
 "リには <filename>ls-LR</filename> と dist ノードがあります。"
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:158
-msgid "OverrideDir"
-msgstr "OverrideDir"
-
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:160
 msgid "Specifies the location of the override files."
 msgstr "オーバーライドファイルの場所を指定します。"
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:163
-msgid "CacheDir"
-msgstr "CacheDir"
-
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:165
 msgid "Specifies the location of the cache files"
 msgstr "キャッシュファイルの場所を指定します。"
 
-# type: Content of: <refentry><refsect1><title>
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:168
-msgid "FileListDir"
-msgstr "FileListDir"
-
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:170
@@ -2603,12 +2247,6 @@ msgstr ""
 "器の動作を制御する設定も行います。他のセクションでは、ここにあるデフォルト値"
 "を、セクションごとの設定で上書きします。"
 
-# type: <tag></tag>
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:182
-msgid "Packages::Compress"
-msgstr "Packages::Compress"
-
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:184
@@ -2622,11 +2260,6 @@ msgstr ""
 "とつは '.' (圧縮なし), 'gzip', 'bzip2' が入る、空白区切りの文字列です。圧縮方"
 "法のデフォルトはすべて '. gzip' です。"
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:190
-msgid "Packages::Extensions"
-msgstr "Packages::Extensions"
-
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:192
@@ -2637,11 +2270,6 @@ msgstr ""
 "パッケージファイル拡張子のデフォルト値を列挙します。このデフォルト値は '."
 "deb' です。"
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:196
-msgid "Sources::Compress"
-msgstr "Sources::Compress"
-
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:198
@@ -2652,11 +2280,6 @@ msgstr ""
 "<literal>Packages::Compress</literal> と同様に、Sources ファイルの圧縮方法を"
 "指定します。"
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:202
-msgid "Sources::Extensions"
-msgstr "Sources::Extensions"
-
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:204
@@ -2667,11 +2290,6 @@ msgstr ""
 "ソースファイル拡張子のデフォルト値を列挙します。このデフォルト値は '.dsc' で"
 "す。"
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:208
-msgid "Contents::Compress"
-msgstr "Contents::Compress"
-
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:210
@@ -2682,11 +2300,6 @@ msgstr ""
 "<literal>Packages::Compress</literal> と同様に、Contents ファイルの圧縮方法を"
 "指定します。"
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:214
-msgid "Translation::Compress"
-msgstr "Translation::Compress"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:216
 msgid ""
@@ -2696,11 +2309,6 @@ msgstr ""
 "<literal>Packages::Compress</literal> と同様に、Translation-en マスターファイ"
 "ルの圧縮を制御します。"
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:220
-msgid "DeLinkLimit"
-msgstr "DeLinkLimit"
-
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:222
@@ -2713,12 +2321,6 @@ msgstr ""
 "指定します。セクションごとの <literal>External-Links</literal> 設定と合わせて"
 "使います。"
 
-# type: Content of: <refentry><refsect1><title>
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:227
-msgid "FileMode"
-msgstr "FileMode"
-
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:229
@@ -2729,12 +2331,6 @@ msgstr ""
 "作成したインデックスファイルのモードを指定します。デフォルトは 0644 です。全"
 "インデックスファイルは、umask を無視してこのモードを使用します。"
 
-# type: Content of: <refentry><refsect1><title>
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:234 apt-ftparchive.1.xml:380
-msgid "LongDescription"
-msgstr "LongDescription"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:236 apt-ftparchive.1.xml:382
 msgid ""
@@ -2760,11 +2356,6 @@ msgstr ""
 "数はすべて置換変数であり、文字列 $(DIST), $(SECTION), $(ARCH) をそれぞれの値"
 "に展開します。"
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:249
-msgid "MaxContentsChange"
-msgstr "MaxContentsChange"
-
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:251
@@ -2776,12 +2367,6 @@ msgstr ""
 "日毎に生成する contents ファイルをキロバイト単位で設定します。contents ファイ"
 "ルをラウンドロビンし、数日経つとすべて再生成します。"
 
-# type: Content of: <refentry><refsect1><title>
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:256
-msgid "ContentsAge"
-msgstr "ContentsAge"
-
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:258
@@ -2799,12 +2384,6 @@ msgstr ""
 "とが発生します。新しい .deb ファイルをインストールしたい場合、保留を解除で"
 "き、少なくとも新しいファイルが必要です。デフォルトは 10 で、単位は日です。"
 
-# type: Content of: <refentry><refsect1><refsect2><title>
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:267
-msgid "Directory"
-msgstr "Directory"
-
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:269
@@ -2815,12 +2394,6 @@ msgstr ""
 ".deb ディレクトリツリーの先頭を設定します。デフォルトは <filename>$(DIST)/"
 "$(SECTION)/binary-$(ARCH)/</filename> です。"
 
-# type: Content of: <refentry><refsect1><refsect2><title>
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:273
-msgid "SrcDirectory"
-msgstr "SrcDirectory"
-
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:275
@@ -2831,12 +2404,6 @@ msgstr ""
 "ソースパッケージディレクトリツリーの先頭を設定します。デフォルトは <filename>"
 "$(DIST)/$(SECTION)/source/</filename> です。"
 
-# type: <tag></tag>
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:279 apt-ftparchive.1.xml:418
-msgid "Packages"
-msgstr "Packages"
-
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:281
@@ -2847,12 +2414,6 @@ msgstr ""
 "Packages ファイルの出力先を設定します。デフォルトは <filename>$(DIST)/"
 "$(SECTION)/binary-$(ARCH)/Packages</filename> です。"
 
-# type: Content of: <refentry><refnamediv><refname>
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:285 apt-ftparchive.1.xml:423
-msgid "Sources"
-msgstr "Sources"
-
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:287
@@ -2863,12 +2424,6 @@ msgstr ""
 "Sources ファイルの出力先を設定します。デフォルトは <filename>$(DIST)/"
 "$(SECTION)/source/Sources</filename> です。"
 
-# type: Content of: <refentry><refsect1><title>
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:291
-msgid "Translation"
-msgstr "Translation"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:293
 msgid ""
@@ -2877,11 +2432,6 @@ msgid ""
 "$(SECTION)/i18n/Translation-en</filename>"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:298
-msgid "InternalPrefix"
-msgstr "InternalPrefix"
-
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:300
@@ -2893,12 +2443,6 @@ msgstr ""
 "外部リンクではなく、内部リンクと見なす判断材料となる、パスのプレフィックスを"
 "設定します。デフォルトは、<filename>$(DIST)/$(SECTION)/</filename> です。"
 
-# type: Content of: <refentry><refsect1><title>
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:305 apt-ftparchive.1.xml:429
-msgid "Contents"
-msgstr "Contents"
-
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:307
@@ -2913,22 +2457,12 @@ msgstr ""
 "Contents ファイルにまとめられる設定 (デフォルト) の場合、<command>apt-"
 "ftparchive</command> は自動でパッケージファイルをまとめます。"
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:314
-msgid "Contents::Header"
-msgstr "Contents::Header"
-
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:316
 msgid "Sets header file to prepend to the contents output."
 msgstr "contents の出力に付けるヘッダファイルを設定します。"
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:319 apt-ftparchive.1.xml:454
-msgid "BinCacheDB"
-msgstr "BinCacheDB"
-
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:321
@@ -2939,12 +2473,6 @@ msgstr ""
 "このセクションで使用するバイナリキャッシュデータベースを設定します。複数のセ"
 "クションで同じデータベースを共有できます。"
 
-# type: Content of: <refentry><refsect1><title>
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:325
-msgid "FileList"
-msgstr "FileList"
-
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:327
@@ -2957,12 +2485,6 @@ msgstr ""
 "み込むファイル一覧ファイルを指定します。相対ファイル名は、アーカイブディレク"
 "トリが先頭につきます。"
 
-# type: Content of: <refentry><refsect1><title>
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:332
-msgid "SourceFileList"
-msgstr "SourceFileList"
-
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:334
@@ -3048,12 +2570,6 @@ msgstr ""
 "command> は以下のような操作を行います。<placeholder type=\"programlisting\" "
 "id=\"0\"/>"
 
-# type: Content of: <refentry><refsect1><refsect2><title>
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:366
-msgid "Sections"
-msgstr "Sections"
-
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:368
@@ -3065,12 +2581,6 @@ msgstr ""
 "distribution 以下に現れるセクションを、空白区切りで指定したリストです。通常、"
 "<literal>main contrib non-free</literal>のようになります。"
 
-# type: <tag></tag>
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:373 apt.conf.5.xml:157
-msgid "Architectures"
-msgstr "Architectures"
-
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:375
@@ -3083,12 +2593,6 @@ msgstr ""
 "す。特殊アーキテクチャ 'source' は、ソースアーカイブのツリーであることを示し"
 "ます。"
 
-# type: Content of: <refentry><refsect1><title>
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:386 apt-ftparchive.1.xml:434
-msgid "BinOverride"
-msgstr "BinOverride"
-
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:388
@@ -3099,12 +2603,6 @@ msgstr ""
 "バイナリオーバーライドファイルを設定します。このオーバーライドファイルには、"
 "セクション、優先度、メンテナのアドレスといった情報が含まれています。"
 
-# type: Content of: <refentry><refsect1><title>
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:392 apt-ftparchive.1.xml:439
-msgid "SrcOverride"
-msgstr "SrcOverride"
-
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:394
@@ -3115,24 +2613,12 @@ msgstr ""
 "ソースオーバーライドファイルを設定します。このオーバーライドファイルには、セ"
 "クションの情報が含まれています。"
 
-# type: Content of: <refentry><refsect1><title>
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:398 apt-ftparchive.1.xml:444
-msgid "ExtraOverride"
-msgstr "ExtraOverride"
-
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:400 apt-ftparchive.1.xml:446
 msgid "Sets the binary extra override file."
 msgstr "バイナリ特別オーバーライドファイルを設定します。"
 
-# type: Content of: <refentry><refsect1><title>
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:403 apt-ftparchive.1.xml:449
-msgid "SrcExtraOverride"
-msgstr "SrcExtraOverride"
-
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:405 apt-ftparchive.1.xml:451
@@ -3200,22 +2686,12 @@ msgstr "ソースオーバーライドファイルを設定します。"
 msgid "Sets the cache DB."
 msgstr "キャッシュ DB を設定します。"
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:459
-msgid "PathPrefix"
-msgstr "PathPrefix"
-
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:461
 msgid "Appends a path to all the output paths."
 msgstr "全出力パスに付加するパス。"
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:464
-msgid "FileList, SourceFileList"
-msgstr "FileList, SourceFileList"
-
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:466
@@ -3309,12 +2785,6 @@ msgstr ""
 "特別オーバーライドファイルは、出力中に任意のタグを追加・置換できるようにしま"
 "す。3 列からなり、先頭はパッケージ、2番目はタグ、残りは新しい値です。"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:508
-msgid ""
-"<option>--md5</option>, <option>--sha1</option>, <option>--sha256</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:510
 #, fuzzy
@@ -3346,11 +2816,6 @@ msgstr ""
 "literal>, <literal>Valid-Until</literal>, <literal>Architectures</literal>, "
 "<literal>Components</literal>, <literal>Description</literal> です。"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:519
-msgid "<option>--db</option>"
-msgstr "<option>--db</option>"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:521
@@ -3375,11 +2840,6 @@ msgstr ""
 "ベルを指定して、設定ファイルを上書きすることもできます。設定項目 - "
 "<literal>quiet</literal>"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:533
-msgid "<option>--delink</option>"
-msgstr "<option>--delink</option>"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:535
@@ -3394,11 +2854,6 @@ msgstr ""
 "off にするには <option>--no-delink</option> としてください。設定項目 - "
 "<literal>APT::FTPArchive::DeLinkAct</literal>"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:541
-msgid "<option>--contents</option>"
-msgstr "<option>--contents</option>"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:543
@@ -3415,11 +2870,6 @@ msgstr ""
 "Contents ファイルも作成できます。デフォルトは on です。設定項目 - "
 "<literal>APT::FTPArchive::Contents</literal>"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:551
-msgid "<option>--source-override</option>"
-msgstr "<option>--source-override</option>"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:553
@@ -3431,11 +2881,6 @@ msgstr ""
 "<literal>sources</literal> コマンドで使用する、ソースオーバーライドファイルを"
 "選択します。設定項目 - <literal>APT::FTPArchive::SourceOverride</literal>"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:557
-msgid "<option>--readonly</option>"
-msgstr "<option>--readonly</option>"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:559
@@ -3446,11 +2891,6 @@ msgstr ""
 "キャッシュデータベースを読み取り専用にします。設定項目 - <literal>APT::"
 "FTPArchive::ReadOnlyDB</literal>"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:563
-msgid "<option>--arch</option>"
-msgstr "<option>--arch</option>"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:564
@@ -3466,11 +2906,6 @@ msgstr ""
 "literal> のように動作します。設定項目 - <literal>APT::Get::AutomaticRemove</"
 "literal>"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:570
-msgid "<option>APT::FTPArchive::AlwaysStat</option>"
-msgstr "<option>--version</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:572
 msgid ""
@@ -3485,11 +2920,6 @@ msgid ""
 "are useless."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:582
-msgid "<option>APT::FTPArchive::LongDescription</option>"
-msgstr "<option>APT::FTPArchive::LongDescription</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:584
 #, fuzzy
@@ -3507,7 +2937,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:596 apt.conf.5.xml:1113 apt_preferences.5.xml:544
+#: apt-ftparchive.1.xml:596 apt.conf.5.xml:1113 apt_preferences.5.xml:545
 #: sources.list.5.xml:214
 msgid "Examples"
 msgstr "サンプル"
@@ -3576,11 +3006,6 @@ msgstr ""
 "「フロントエンド」インターフェースには、&dselect;, &aptitude;, &synaptic;, "
 "&wajig; などがあります。"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:48 apt-key.8.xml:119
-msgid "update"
-msgstr "update"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:49
@@ -3604,12 +3029,6 @@ msgstr ""
 "upgrade</literal> を行う前に常に実行してください。前もってパッケージファイル"
 "のサイズを知ることができないため、全体の進捗メータは正しく表示されません。"
 
-# type: <tag></tag>
-#. type: <tag></tag>
-#: apt-get.8.xml:60 guide.sgml:121
-msgid "upgrade"
-msgstr "upgrade"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:61
@@ -3634,12 +3053,6 @@ msgstr ""
 "<literal>update</literal> を実行しておき、<command>apt-get</command> にパッ"
 "ケージの新しいバージョンがあることを知らせる必要があります。"
 
-# type: <tag></tag>
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:73
-msgid "dselect-upgrade"
-msgstr "dselect-upgrade"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:74
@@ -3658,12 +3071,6 @@ msgstr ""
 "実行します。(例えば、古いパッケージの削除や新しいパッケージのインストールな"
 "ど)"
 
-# type: <tag></tag>
-#. type: <tag></tag>
-#: apt-get.8.xml:83 guide.sgml:140
-msgid "dist-upgrade"
-msgstr "dist-upgrade"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:84
@@ -3688,12 +3095,6 @@ msgstr ""
 "向けに、一般的な設定を上書きする機構については、&apt-preferences; をご覧くだ"
 "さい。"
 
-# type: <tag></tag>
-#. type: <tag></tag>
-#: apt-get.8.xml:96 guide.sgml:131
-msgid "install"
-msgstr "install"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:98
@@ -3796,11 +3197,6 @@ msgstr ""
 "は、'how-lo' や 'lowest' にマッチすることに注意してください。そうしたくなけれ"
 "ば、'^' や '$' を付けるか、もっと詳しい正規表現を指定してください。"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:150
-msgid "remove"
-msgstr "remove"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:151
@@ -3817,11 +3213,6 @@ msgstr ""
 "(間に空白を含まずに) 付加されると、識別されたパッケージを、削除ではなくインス"
 "トールします。"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:158
-msgid "purge"
-msgstr "purge"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:159
@@ -3833,12 +3224,6 @@ msgstr ""
 "パッケージが削除かつ完全削除 (すべての設定ファイルも削除) されるのを除き、"
 "<literal>purge</literal> は <literal>remove</literal> と同じです。"
 
-# type: Content of: <refentry><refnamediv><refname>
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:163
-msgid "source"
-msgstr "source"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:164
@@ -3920,11 +3305,6 @@ msgstr ""
 "tar ball はカレントディレクトリにのみダウンロードされ、カレントディレクトリに"
 "展開されることに注意してください。"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:197
-msgid "build-dep"
-msgstr "build-dep"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:198
@@ -3942,11 +3322,6 @@ msgstr ""
 "<literal>build-dep</literal> は、ソースパッケージの構築依存関係を満たすよう"
 "に、パッケージのインストール・削除を行います。"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:204
-msgid "check"
-msgstr "check"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:205
@@ -3957,11 +3332,6 @@ msgstr ""
 "<literal>check</literal> は、パッケージキャッシュの更新や壊れた依存関係を"
 "チェックする診断ツールです。"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:209
-msgid "download"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:210
 msgid ""
@@ -3988,11 +3358,6 @@ msgstr ""
 "ます。dselectを使用しない場合は、ディスクスペースを解放するため、時々 "
 "<literal>apt-get clean</literal> を実行したくなるでしょう。"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:225
-msgid "autoclean"
-msgstr "autoclean"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:226
@@ -4013,11 +3378,6 @@ msgstr ""
 "に off をセットしていれば、インストール済のパッケージファイルが削除されるのを"
 "防げます。"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:235
-msgid "autoremove"
-msgstr "autoremove"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:236
@@ -4034,29 +3394,20 @@ msgstr ""
 "<literal>autoremove</literal> は、依存関係を満たすために自動的にインストール"
 "され、もう必要なくなったパッケージを削除するのに使用します。"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:240
-msgid "changelog"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:241
 msgid ""
 "<literal>changelog</literal> downloads a package changelog and displays it "
 "through <command>sensible-pager</command>. The server name and base "
 "directory is defined in the <literal>APT::Changelogs::Server</literal> "
-"variable (e. g. <ulink>http://packages.debian.org/changelogs</ulink> for "
-"Debian or <ulink>http://changelogs.ubuntu.com/changelogs</ulink> for "
-"Ubuntu).  By default it displays the changelog for the version that is "
+"variable (e. g. <ulink url=\"http://packages.debian.org/changelogs"
+"\">packages.debian.org/changelogs</ulink> for Debian or <ulink url=\"http://"
+"changelogs.ubuntu.com/changelogs\">changelogs.ubuntu.com/changelogs</ulink> "
+"for Ubuntu).  By default it displays the changelog for the version that is "
 "installed.  However, you can specify the same options as for the "
 "<option>install</option> command."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:263
-msgid "<option>--no-install-recommends</option>"
-msgstr "<option>--no-install-recommends</option>"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:264
@@ -4067,13 +3418,6 @@ msgstr ""
 "「推奨」パッケージをインストールする依存関係と見なしません。設定項目 - "
 "<literal>APT::Install-Recommends</literal>"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:268
-#, fuzzy
-#| msgid "<option>--no-suggests</option>"
-msgid "<option>--install-suggests</option>"
-msgstr "<option>--no-suggests</option>"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:269
@@ -4088,11 +3432,6 @@ msgstr ""
 "「推奨」パッケージをインストールする依存関係と見なしません。設定項目 - "
 "<literal>APT::Install-Recommends</literal>"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:273
-msgid "<option>--download-only</option>"
-msgstr "<option>--download-only</option>"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:274
@@ -4103,11 +3442,6 @@ msgstr ""
 "ダウンロードのみ - パッケージファイルの取得のみを行い、展開・インストールを行"
 "いません。設定項目 - <literal>APT::Get::Download-Only</literal>"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:278
-msgid "<option>--fix-broken</option>"
-msgstr "<option>--fix-broken</option>"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:279
@@ -4135,16 +3469,6 @@ msgstr ""
 "ションと同時に使用すると、エラーになる状況があるかもしれません。設定項目 - "
 "<literal>APT::Get::Fix-Broken</literal>"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:292
-msgid "<option>--ignore-missing</option>"
-msgstr "<option>--ignore-missing</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:293
-msgid "<option>--fix-missing</option>"
-msgstr "<option>--fix-missing</option>"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:294
@@ -4165,11 +3489,6 @@ msgstr ""
 "かった場合に、なにも表示せず保留することになります。設定項目 - <literal>APT::"
 "Get::Fix-Missing</literal>"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:304
-msgid "<option>--no-download</option>"
-msgstr "<option>--no-download</option>"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:305
@@ -4202,16 +3521,6 @@ msgstr ""
 "をつけずに -qq を使用するべきではありません。設定項目 - <literal>quiet</"
 "literal>"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:322
-msgid "<option>--simulate</option>"
-msgstr "<option>--simulate</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:324
-msgid "<option>--dry-run</option>"
-msgstr "<option>--dry-run</option>"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:327
@@ -4253,21 +3562,6 @@ msgstr ""
 "(Remv)、展開 (Inst) を表示します。角カッコは壊れたパッケージを表し、(まれに) "
 "空の角カッコは大した問題ではないことを表します。"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:344
-msgid "<option>-y</option>"
-msgstr "<option>-y</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:344
-msgid "<option>--yes</option>"
-msgstr "<option>--yes</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:345
-msgid "<option>--assume-yes</option>"
-msgstr "<option>--assume-yes</option>"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:346
@@ -4283,13 +3577,6 @@ msgstr ""
 "るような不適切な状況の場合、<literal>apt-get</literal> は処理を中断します。設"
 "定項目 - <literal>APT::Get::Assume-Yes</literal>"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:353
-#, fuzzy
-#| msgid "<option>--assume-yes</option>"
-msgid "<option>--assume-no</option>"
-msgstr "<option>--assume-yes</option>"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:354
@@ -4304,16 +3591,6 @@ msgstr ""
 "ソースパッケージをダウンロード後、コンパイルします。設定項目 - <literal>APT::"
 "Get::Compile</literal>"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:358
-msgid "<option>-u</option>"
-msgstr "<option>-u</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:358
-msgid "<option>--show-upgraded</option>"
-msgstr "<option>--show-upgraded</option>"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:359
@@ -4324,16 +3601,6 @@ msgstr ""
 "更新パッケージ表示 - 更新される全パッケージを一覧表示します。設定項目 - "
 "<literal>APT::Get::Show-Upgraded</literal>"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:364
-msgid "<option>-V</option>"
-msgstr "<option>-V</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:364
-msgid "<option>--verbose-versions</option>"
-msgstr "<option>--verbose-versions</option>"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:365
@@ -4344,13 +3611,6 @@ msgstr ""
 "更新・インストールするパッケージのバージョンをすべて表示します。設定項目 - "
 "<literal>APT::Get::Show-Versions</literal>"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:370
-#, fuzzy
-#| msgid "<option>--recurse</option>"
-msgid "<option>--host-architecture</option>"
-msgstr "<option>--recurse</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:371
 msgid ""
@@ -4362,21 +3622,6 @@ msgid ""
 "Architecture</literal>"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:379
-msgid "<option>-b</option>"
-msgstr "<option>-b</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:379
-msgid "<option>--compile</option>"
-msgstr "<option>--compile</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:380
-msgid "<option>--build</option>"
-msgstr "<option>--build</option>"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:381
@@ -4387,11 +3632,6 @@ msgstr ""
 "ソースパッケージをダウンロード後、コンパイルします。設定項目 - <literal>APT::"
 "Get::Compile</literal>"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:385
-msgid "<option>--ignore-hold</option>"
-msgstr "<option>--ignore-hold</option>"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:386
@@ -4406,11 +3646,6 @@ msgstr ""
 "を保留の解除をするのに使用すると便利です。設定項目 - <literal>APT::Ignore-"
 "Hold</literal>"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:392
-msgid "<option>--no-upgrade</option>"
-msgstr "<option>--no-upgrade</option>"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:393
@@ -4424,11 +3659,6 @@ msgstr ""
 "<literal>no-upgrade</literal> は、指定したパッケージがすでにインストールして"
 "ある場合に更新を行いません。設定項目 - <literal>APT::Get::Upgrade</literal>"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:399
-msgid "<option>--only-upgrade</option>"
-msgstr "<option>--only-upgrade</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:400
 #, fuzzy
@@ -4442,11 +3672,6 @@ msgstr ""
 "<literal>no-upgrade</literal> は、指定したパッケージがすでにインストールして"
 "ある場合に更新を行いません。設定項目 - <literal>APT::Get::Upgrade</literal>"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:407
-msgid "<option>--force-yes</option>"
-msgstr "<option>--force-yes</option>"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:408
@@ -4462,11 +3687,6 @@ msgstr ""
 "方がいいでしょう。<literal>force-yes</literal> は、あなたのシステムを破壊しか"
 "ねません! 設定項目 - <literal>APT::Get::force-yes</literal>"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:415
-msgid "<option>--print-uris</option>"
-msgstr "<option>--print-uris</option>"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:416
@@ -4489,11 +3709,6 @@ msgstr ""
 "の展開はユーザの責任において行ってください。設定項目 - <literal>APT::Get::"
 "Print-URIs</literal>"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:426
-msgid "<option>--purge</option>"
-msgstr "<option>--purge</option>"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:427
@@ -4508,11 +3723,6 @@ msgstr ""
 "purge</option> は <option>purge</option> コマンドと等価です。 設定項目 - "
 "<literal>APT::Get::Purge</literal>"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:434
-msgid "<option>--reinstall</option>"
-msgstr "<option>--reinstall</option>"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:435
@@ -4523,11 +3733,6 @@ msgstr ""
 "すでに最新版がインストールされていても、パッケージを再インストールします。設"
 "定項目 - <literal>APT::Get::ReInstall</literal>"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:439
-msgid "<option>--list-cleanup</option>"
-msgstr "<option>--list-cleanup</option>"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:440
@@ -4545,16 +3750,6 @@ msgstr ""
 "filename> の中身を管理します。これを OFF にするのは、取得元リストを頻繁に変更"
 "する時ぐらいでしょう。設定項目 - <literal>APT::Get::List-Cleanup</literal>"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:449
-msgid "<option>--target-release</option>"
-msgstr "<option>--target-release</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:450
-msgid "<option>--default-release</option>"
-msgstr "<option>--default-release</option>"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:451
@@ -4578,11 +3773,6 @@ msgstr ""
 "option>、<option>-t sid</option> でしょう。設定項目 - <literal>APT::Default-"
 "Release</literal>。&apt-preferences; のマニュアルページもご覧ください。"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:464
-msgid "<option>--trivial-only</option>"
-msgstr "<option>--trivial-only</option>"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:466
@@ -4597,11 +3787,6 @@ msgstr ""
 "と答えますが、<option>--trivial-only</option> はすべて no と答えます。設定項"
 "目 - <literal>APT::Get::Trivial-Only</literal>"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:472
-msgid "<option>--no-remove</option>"
-msgstr "<option>--no-remove</option>"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:473
@@ -4612,11 +3797,6 @@ msgstr ""
 "パッケージが削除される状況になったとき、プロンプトを表示せず中断します。設定"
 "項目 - <literal>APT::Get::Remove</literal>"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:478
-msgid "<option>--auto-remove</option>"
-msgstr "<option>--auto-remove</option>"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:479
@@ -4631,11 +3811,6 @@ msgstr ""
 "literal> のように動作します。設定項目 - <literal>APT::Get::AutomaticRemove</"
 "literal>"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:485
-msgid "<option>--only-source</option>"
-msgstr "<option>--only-source</option>"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:486
@@ -4655,21 +3830,6 @@ msgstr ""
 "付けなくなる、ということです。設定項目 - <literal>APT::Get::Only-Source</"
 "literal>"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:496
-msgid "<option>--diff-only</option>"
-msgstr "<option>--diff-only</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:496
-msgid "<option>--dsc-only</option>"
-msgstr "<option>--dsc-only</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:496
-msgid "<option>--tar-only</option>"
-msgstr "<option>--tar-only</option>"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:497
@@ -4682,11 +3842,6 @@ msgstr ""
 "設定項目 - <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Tar-"
 "Only</literal>"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:502
-msgid "<option>--arch-only</option>"
-msgstr "<option>--arch-only</option>"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:503
@@ -4697,11 +3852,6 @@ msgstr ""
 "構築依存関係の解決を、アーキテクチャに依存したもののみ行います。設定項目 - "
 "<literal>APT::Get::Arch-Only</literal>"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:507
-msgid "<option>--allow-unauthenticated</option>"
-msgstr "<option>--allow-unauthenticated</option>"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:508
@@ -4795,11 +3945,6 @@ msgstr ""
 msgid "Commands"
 msgstr "コマンド"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:40
-msgid "add &synopsis-param-filename;"
-msgstr ""
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml:43
@@ -4817,22 +3962,12 @@ msgstr ""
 "replaceable> から読み込みますが、<replaceable>filename</replaceable> を "
 "<literal>-</literal> とすると、標準入力から読み込みます。"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:52
-msgid "del &synopsis-param-keyid;"
-msgstr ""
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml:56
 msgid "Remove a key from the list of trusted keys."
 msgstr "信頼キー一覧からキーを削除します。"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:63
-msgid "export &synopsis-param-keyid;"
-msgstr ""
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml:67
@@ -4841,46 +3976,24 @@ msgstr ""
 msgid "Output the key &synopsis-param-keyid; to standard output."
 msgstr "キー <replaceable>keyid</replaceable> を標準出力に出力します。"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:74
-msgid "exportall"
-msgstr "exportall"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml:78
 msgid "Output all trusted keys to standard output."
 msgstr "信頼するキーをすべて標準出力に出力します。"
 
-# type: Content of: <refentry><refsect1><title>
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:85
-msgid "list"
-msgstr "list"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml:89
 msgid "List trusted keys."
 msgstr "信頼キーを一覧表示します。"
 
-# type: Content of: <refentry><refsect1><title>
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:96
-msgid "finger"
-msgstr "finger"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml:100
 msgid "List fingerprints of trusted keys."
 msgstr "信頼キーのフィンガープリントを一覧表示します。"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:107
-msgid "adv"
-msgstr "adv"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml:111
 msgid ""
@@ -4900,13 +4013,6 @@ msgid ""
 "Debian."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:133
-#, fuzzy
-#| msgid "update"
-msgid "net-update"
-msgstr "update"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml:137
 msgid ""
@@ -4927,11 +4033,6 @@ msgstr ""
 "前節で説明したコマンドの前に、このオプションを定義する必要があることに注意し"
 "てください。"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:156
-msgid "--keyring &synopsis-param-filename;"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml:157
 #, fuzzy
@@ -5055,13 +4156,6 @@ msgstr ""
 "たパッケージに依存されなくなると、そのパッケージは、例えば <command>apt-get</"
 "command> や <command>aptitude</command> により削除されます。"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:51
-#, fuzzy
-#| msgid "markauto"
-msgid "auto"
-msgstr "markauto"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml:52
@@ -5079,11 +4173,6 @@ msgstr ""
 "マークします。このパッケージに依存する、手動でインストールされたパッケージが"
 "なくなると、このパッケージを削除します。"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:59
-msgid "manual"
-msgstr ""
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml:60
@@ -5101,11 +4190,6 @@ msgstr ""
 "マークします。このパッケージに依存する他のパッケージがなくなっても、このパッ"
 "ケージを自動的に削除するのを防ぎます。"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:67
-msgid "hold"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml:68
 msgid ""
@@ -5116,11 +4200,6 @@ msgid ""
 "effected by the <option>--filename</option> option."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:77
-msgid "unhold"
-msgstr ""
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml:78
@@ -5135,11 +4214,6 @@ msgstr ""
 "<literal>showauto</literal> は、自動的にインストールされたパッケージを、パッ"
 "ケージごとに改行して表示します。"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:83
-msgid "showauto"
-msgstr "showauto"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml:84
@@ -5156,13 +4230,6 @@ msgstr ""
 "<literal>showauto</literal> は、自動的にインストールされたパッケージを、パッ"
 "ケージごとに改行して表示します。"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:91
-#, fuzzy
-#| msgid "showauto"
-msgid "showmanual"
-msgstr "showauto"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml:92
 msgid ""
@@ -5171,13 +4238,6 @@ msgid ""
 "installed packages instead."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:98
-#, fuzzy
-#| msgid "showauto"
-msgid "showhold"
-msgstr "showauto"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml:99
@@ -5192,30 +4252,29 @@ msgstr ""
 "<literal>showauto</literal> は、自動的にインストールされたパッケージを、パッ"
 "ケージごとに改行して表示します。"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:112
-msgid ""
-"<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>"
-msgstr ""
-"<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:113
-msgid ""
-"<option>--file=<filename><replaceable>FILENAME</replaceable></filename></"
-"option>"
-msgstr ""
-"<option>--file=<filename><replaceable>FILENAME</replaceable></filename></"
-"option>"
+# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><filename>
+#: apt-mark.8.xml:112 apt-mark.8.xml:113
+#, fuzzy
+#| msgid "xvcg <replaceable>pkg(s)</replaceable>"
+msgid "<replaceable>&synopsis-filename;</replaceable>"
+msgstr "xvcg <replaceable>pkg(s)</replaceable>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:116
-msgid ""
-"Read/Write package stats from <filename><replaceable>FILENAME</replaceable></"
-"filename> instead of the default location, which is "
-"<filename>extended_status</filename> in the directory defined by the "
-"Configuration Item: <literal>Dir::State</literal>."
+#: apt-mark.8.xml:115
+#, fuzzy
+#| msgid ""
+#| "Read/Write package stats from <filename><replaceable>FILENAME</"
+#| "replaceable></filename> instead of the default location, which is "
+#| "<filename>extended_status</filename> in the directory defined by the "
+#| "Configuration Item: <literal>Dir::State</literal>."
+msgid ""
+"Read/Write package stats from the filename given with the parameter "
+"<filename><replaceable>&synopsis-filename;</replaceable></filename> instead "
+"of from the default location, which is <filename>extended_status</filename> "
+"in the directory defined by the Configuration Item: <literal>Dir::State</"
+"literal>."
 msgstr ""
 "デフォルトの場所 (設定項目: <literal>Dir::State</literal> で定義したディレク"
 "トリの <filename>extended_status</filename>) に代えて、<filename>FILENAME</"
@@ -5629,11 +4688,6 @@ msgid "All output is sent to stdout, the input must be a seekable file."
 msgstr ""
 "出力はすべて標準出力に送られ、入力は検索できるファイルでなければなりません。"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-sortpkgs.1.xml:52
-msgid "<option>--source</option>"
-msgstr "<option>--source</option>"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-sortpkgs.1.xml:54
@@ -5986,12 +5040,6 @@ msgstr ""
 "このオプショングループは、ツール全体に影響のある、一般的な APT の振る舞いを制"
 "御します。"
 
-# type: <tag></tag>
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:151
-msgid "Architecture"
-msgstr "Architecture"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:152
@@ -6017,12 +5065,6 @@ msgid ""
 "architectures</command>."
 msgstr ""
 
-# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:167
-msgid "Default-Release"
-msgstr "Default-Release"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:168
 msgid ""
@@ -6036,11 +5078,6 @@ msgstr ""
 "'stable', 'testing', 'unstable', '&stable-codename;', '&testing-codename;', "
 "'4.0', '5.0*'  となります。&apt-preferences; も参照してください。"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:173
-msgid "Ignore-Hold"
-msgstr "Ignore-Hold"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:174
@@ -6051,12 +5088,6 @@ msgstr ""
 "保留パッケージの無視 - このグローバルオプションは、問題解決器に保留と指定した"
 "パッケージを無視します。"
 
-# type: <tag></tag>
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:178
-msgid "Clean-Installed"
-msgstr "Clean-Installed"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:179
@@ -6072,12 +5103,6 @@ msgstr ""
 "たパッケージの再インストール方法を、直接提供するわけではないことに注意してく"
 "ださい。"
 
-# type: Content of: <refentry><refnamediv><refname>
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:185
-msgid "Immediate-Configure"
-msgstr "Immediate-Configure"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:186
 msgid ""
@@ -6134,11 +5159,6 @@ msgstr ""
 "改善のため、バグのリンクにあるディストリビューションと APT チームにも、問題の"
 "レポートをおねがいします。"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:208
-msgid "Force-LoopBreak"
-msgstr "Force-LoopBreak"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:209
@@ -6158,11 +5178,6 @@ msgstr ""
 "ションは、tar, gzip, libc, dpkg, bash とそれらが依存しているパッケージ以外の"
 "不可欠パッケージで動作します。"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:217
-msgid "Cache-Start, Cache-Grow and Cache-Limit"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:218
 msgid ""
@@ -6183,22 +5198,12 @@ msgid ""
 "automatic grow of the cache is disabled."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:233
-msgid "Build-Essential"
-msgstr "Build-Essential"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:234
 msgid "Defines which package(s) are considered essential build dependencies."
 msgstr "構築依存関係で不可欠なパッケージを定義します。"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:237
-msgid "Get"
-msgstr "Get"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:238
@@ -6209,11 +5214,6 @@ msgstr ""
 "Get サブセクションは &apt-get; ツールを制御します。このオプションの詳細は "
 "&apt-get; の文書を参照してください。"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:242
-msgid "Cache"
-msgstr "Cache"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:243
@@ -6224,11 +5224,6 @@ msgstr ""
 "Cache サブセクションは &apt-cache; ツールを制御します。このオプションの詳細"
 "は &apt-cache; の文書を参照してください。"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:247
-msgid "CDROM"
-msgstr "CDROM"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:248
@@ -6245,11 +5240,6 @@ msgstr ""
 msgid "The Acquire Group"
 msgstr "Acquire グループ"
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:259
-msgid "Check-Valid-Until"
-msgstr "Check-Valid-Until"
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:260
 msgid ""
@@ -6262,11 +5252,6 @@ msgid ""
 "<literal>Max-ValidTime</literal> option can be used."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:270
-msgid "Max-ValidTime"
-msgstr "Max-ValidTime"
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:271
 msgid ""
@@ -6278,13 +5263,6 @@ msgid ""
 "be made by appending the label of the archive to the option name."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:281
-#, fuzzy
-#| msgid "Max-ValidTime"
-msgid "Min-ValidTime"
-msgstr "Max-ValidTime"
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:282
 msgid ""
@@ -6296,11 +5274,6 @@ msgid ""
 "should be used by appending the label of the archive to the option name."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:292
-msgid "PDiffs"
-msgstr "PDiffs"
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:293
 msgid ""
@@ -6335,11 +5308,6 @@ msgstr ""
 "パッチサイズの最大パーセンテージを指定します。どちらの制限を超えても、パッチ"
 "をダウンロードする代わりに、完全なファイルをダウンロードします。"
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:305
-msgid "Queue-Mode"
-msgstr "Queue-Mode"
-
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:306
@@ -6355,12 +5323,6 @@ msgstr ""
 "<literal>host</literal> は、ターゲットホストごとに 1 接続を開きます。"
 "<literal>access</literal> は、URI タイプごとに 1 接続を開きます。"
 
-# type: Content of: <refentry><refsect1><refsect2><title>
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:313
-msgid "Retries"
-msgstr "Retries"
-
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:314
@@ -6371,11 +5333,6 @@ msgstr ""
 "リトライの回数を設定します。0 でない場合、APT は失敗したファイルに対して、与"
 "えられた回数だけリトライを行います。"
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:318
-msgid "Source-Symlinks"
-msgstr "Source-Symlinks"
-
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:319
@@ -6387,12 +5344,6 @@ msgstr ""
 "き、可能ならコピーの代わりにシンボリックリンクを張ります。true がデフォルトで"
 "す。"
 
-# type: <tag></tag>
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:323 sources.list.5.xml:160
-msgid "http"
-msgstr "http"
-
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:324
@@ -6492,12 +5443,6 @@ msgstr ""
 "場合、<literal>Acquire::http::User-Agent</literal> を使用して、http でダウン"
 "ロードするための、異なる User-Agent を設定できます。"
 
-# type: <tag></tag>
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:366
-msgid "https"
-msgstr "https"
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:367
 msgid ""
@@ -6549,12 +5494,6 @@ msgstr ""
 "を上書きします。'TLSv1' か 'SSLv3' という文字列を指定できます。<literal>&lt;"
 "host&gt;::SslForceVersion</literal> は、対応するホストごとのオプションです。"
 
-# type: <tag></tag>
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:391 sources.list.5.xml:171
-msgid "ftp"
-msgstr "ftp"
-
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:392
@@ -6635,12 +5574,6 @@ msgstr ""
 "このコマンドを使用します。ほとんどの FTP サーバは RFC2428 をサポートしていな"
 "いことに注意してください。"
 
-# type: Content of: <refentry><refnamediv><refname>
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:430 sources.list.5.xml:153
-msgid "cdrom"
-msgstr "cdrom"
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
 #: apt.conf.5.xml:436
 #, no-wrap
@@ -6669,11 +5602,6 @@ msgstr ""
 "後につけるのが重要です。アンマウントコマンドは UMount で指定することができま"
 "す。"
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:441
-msgid "gpgv"
-msgstr "gpgv"
-
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:442
@@ -6686,11 +5614,6 @@ msgstr ""
 "ションです。<literal>gpgv::Options</literal> が gpgv に渡す追加オプションで"
 "す。"
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:447
-msgid "CompressionTypes"
-msgstr "CompressionTypes"
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
 #: apt.conf.5.xml:453
 #, no-wrap
@@ -6805,12 +5728,6 @@ msgid ""
 "uncompressed files so this is mostly only useable for local mirrors."
 msgstr ""
 
-# type: <tag></tag>
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:475
-msgid "GzipIndexes"
-msgstr "GzipIndexes"
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:477
 msgid ""
@@ -6820,11 +5737,6 @@ msgid ""
 "CPU requirements when building the local package caches. False by default."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:484
-msgid "Languages"
-msgstr "Languages"
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:485
 msgid ""
@@ -7038,11 +5950,6 @@ msgstr ""
 "&dselect; 上で APT を使用する際、<literal>DSelect</literal> セクション以下の"
 "設定項目で、デフォルトの動作を制御します。"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:577
-msgid "Clean"
-msgstr "Clean"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:578
@@ -7070,12 +5977,6 @@ msgstr ""
 "この変数の内容は、install 時のコマンドラインオプションと同様に &apt-get; に渡"
 "されます。"
 
-# type: Content of: <refentry><refsect1><title>
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:591
-msgid "Updateoptions"
-msgstr "Updateoptions"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:592
@@ -7086,11 +5987,6 @@ msgstr ""
 "この変数の内容は、update 時のコマンドラインオプションと同様に &apt-get; に渡"
 "されます。"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:596
-msgid "PromptAfterUpdate"
-msgstr "PromptAfterUpdate"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:597
@@ -7128,16 +6024,6 @@ msgstr ""
 "dpkg に渡すオプションのリストです。オプションは、リスト記法を使用して指定しな"
 "ければなりません。また、各リストは単一の引数として &dpkg; に渡されます。"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:614
-msgid "Pre-Invoke"
-msgstr "Pre-Invoke"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:614
-msgid "Post-Invoke"
-msgstr "Post-Invoke"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:615
@@ -7152,12 +6038,6 @@ msgstr ""
 "bin/sh</filename> を使用して呼び出され、何か問題があれば APT は異常終了しま"
 "す。"
 
-# type: <tag></tag>
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:621
-msgid "Pre-Install-Pkgs"
-msgstr "Pre-Install-Pkgs"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:622
@@ -7190,12 +6070,6 @@ msgstr ""
 "バージョン 2 を有効にできます。<literal>cmd</literal> は <literal>Pre-"
 "Install-Pkgs</literal> で与えられるコマンドです。"
 
-# type: Content of: <refentry><refsect1><refsect2><title>
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:635
-msgid "Run-Directory"
-msgstr "Run-Directory"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:636
@@ -7206,12 +6080,6 @@ msgstr ""
 "APT は dpkg を呼び出す前にこのディレクトリに移動します。デフォルトは "
 "<filename>/</filename> です。"
 
-# type: Content of: <refentry><refsect1><title>
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:640
-msgid "Build-options"
-msgstr "Build-options"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:641
@@ -7270,11 +6138,6 @@ msgid ""
 "would be <placeholder type=\"literallayout\" id=\"0\"/>"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:668
-msgid "DPkg::NoTriggers"
-msgstr "DPkg::NoTriggers"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:669
 msgid ""
@@ -7287,12 +6150,6 @@ msgid ""
 "dpkg - now apt will add these flag also to the unpack and remove calls."
 msgstr ""
 
-# type: <tag></tag>
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:676
-msgid "PackageManager::Configure"
-msgstr "PackageManager::Configure"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:677
 msgid ""
@@ -7309,12 +6166,6 @@ msgid ""
 "the system could end in an unconfigured status which could be unbootable!"
 msgstr ""
 
-# type: Content of: <refentry><refsect1><title>
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:687
-msgid "DPkg::ConfigurePending"
-msgstr "DPkg::ConfigurePending"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:688
 msgid ""
@@ -7326,11 +6177,6 @@ msgid ""
 "you could deactivate this option in all but the last run."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:694
-msgid "DPkg::TriggersPending"
-msgstr "DPkg::TriggersPending"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:695
 msgid ""
@@ -7341,11 +6187,6 @@ msgid ""
 "triggers, not only the triggers needed to configure this package."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:700
-msgid "PackageManager::UnpackAll"
-msgstr "PackageManager::UnpackAll"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:701
 msgid ""
@@ -7358,11 +6199,6 @@ msgid ""
 "really useful."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:708
-msgid "OrderList::Score::Immediate"
-msgstr "OrderList::Score::Immediate"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
 #: apt.conf.5.xml:716
 #, no-wrap
@@ -7478,11 +6314,6 @@ msgstr ""
 msgid "A full list of debugging options to apt follows."
 msgstr "以下は apt に対するデバッグオプションのすべてです。"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:791
-msgid "<literal>Debug::Acquire::cdrom</literal>"
-msgstr "<literal>Debug::Acquire::cdrom</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:795
 msgid ""
@@ -7490,41 +6321,21 @@ msgid ""
 msgstr ""
 "<literal>cdrom://</literal> ソースへのアクセスに関する情報を出力します。"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:802
-msgid "<literal>Debug::Acquire::ftp</literal>"
-msgstr "<literal>Debug::Acquire::ftp</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:806
 msgid "Print information related to downloading packages using FTP."
 msgstr "FTP を用いたパッケージのダウンロードに関する情報を出力します。"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:813
-msgid "<literal>Debug::Acquire::http</literal>"
-msgstr "<literal>Debug::Acquire::http</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:817
 msgid "Print information related to downloading packages using HTTP."
 msgstr "HTTP を用いたパッケージのダウンロードに関する情報を出力します。"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:824
-msgid "<literal>Debug::Acquire::https</literal>"
-msgstr "<literal>Debug::Acquire::https</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:828
 msgid "Print information related to downloading packages using HTTPS."
 msgstr "HTTPS を用いたパッケージのダウンロードに関する情報を出力します。"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:835
-msgid "<literal>Debug::Acquire::gpgv</literal>"
-msgstr "<literal>Debug::Acquire::gpgv</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:839
 msgid ""
@@ -7533,11 +6344,6 @@ msgid ""
 msgstr ""
 "<literal>gpg</literal> を用いた暗号署名の検証に関する情報を出力します。"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:846
-msgid "<literal>Debug::aptcdrom</literal>"
-msgstr "<literal>Debug::aptcdrom</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:850
 msgid ""
@@ -7547,21 +6353,11 @@ msgstr ""
 "CD-ROM にあるパッケージ集合に対して、アクセスするプロセスについての情報を出力"
 "します。"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:857
-msgid "<literal>Debug::BuildDeps</literal>"
-msgstr "<literal>Debug::BuildDeps</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:860
 msgid "Describes the process of resolving build-dependencies in &apt-get;."
 msgstr "&apt-get; での構築依存関係解決のプロセスを説明します。"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:867
-msgid "<literal>Debug::Hashes</literal>"
-msgstr "<literal>Debug::Hashes</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:870
 msgid ""
@@ -7570,11 +6366,6 @@ msgid ""
 msgstr ""
 "<literal>apt</literal> ライブラリが生成した、暗号化ハッシュを出力します。"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:877
-msgid "<literal>Debug::IdentCDROM</literal>"
-msgstr "<literal>Debug::IdentCDROM</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:880
 msgid ""
@@ -7585,11 +6376,6 @@ msgstr ""
 "CD-ROM の ID を生成する際に <literal>statfs</literal> という、CD-ROM ファイル"
 "システムにある使用済・未使用ブロックの数からの情報を含めないようにします。"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:888
-msgid "<literal>Debug::NoLocking</literal>"
-msgstr "<literal>Debug::NoLocking</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:891
 msgid ""
@@ -7599,22 +6385,12 @@ msgstr ""
 "ファイルのロックをすべて無効にします。例えば、同時にふたつの "
 "<quote><literal>apt-get update</literal></quote> を実行できるようになります。"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:899
-msgid "<literal>Debug::pkgAcquire</literal>"
-msgstr "<literal>Debug::pkgAcquire</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:903
 msgid "Log when items are added to or removed from the global download queue."
 msgstr ""
 "グローバルダウンロードキューに対する項目の追加・削除の際にログを出力します。"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:910
-msgid "<literal>Debug::pkgAcquire::Auth</literal>"
-msgstr "<literal>Debug::pkgAcquire::Auth</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:913
 msgid ""
@@ -7624,11 +6400,6 @@ msgstr ""
 "ダウンロードしたファイルのチェックサムや暗号署名の確認に関する、状態メッセー"
 "ジやエラーを出力します。"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:920
-msgid "<literal>Debug::pkgAcquire::Diffs</literal>"
-msgstr "<literal>Debug::pkgAcquire::Diffs</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:923
 msgid ""
@@ -7638,11 +6409,6 @@ msgstr ""
 "パッケージインデックスリスト差分のダウンロード・適用時の、情報やエラーを出力"
 "します。"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:931
-msgid "<literal>Debug::pkgAcquire::RRed</literal>"
-msgstr "<literal>Debug::pkgAcquire::RRed</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:935
 msgid ""
@@ -7652,11 +6418,6 @@ msgstr ""
 "インデックス全体ではなくインデックス差分のダウンロードの際に、apt パッケージ"
 "リストへのパッチ適用に関する情報を出力します。"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:942
-msgid "<literal>Debug::pkgAcquire::Worker</literal>"
-msgstr "<literal>Debug::pkgAcquire::Worker</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:946
 msgid ""
@@ -7664,11 +6425,6 @@ msgid ""
 msgstr ""
 "実際のダウンロードを行う際の、サブプロセスとのやりとりをログに出力します。"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:953
-msgid "<literal>Debug::pkgAutoRemove</literal>"
-msgstr "<literal>Debug::pkgAutoRemove</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:957
 msgid ""
@@ -7678,11 +6434,6 @@ msgstr ""
 "パッケージの自動インストールや、不要パッケージの削除に関するイベントを、ログ"
 "に出力します。"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:964
-msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>"
-msgstr "<literal>Debug::pkgDepCache::AutoInstall</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:967
 msgid ""
@@ -7698,11 +6449,6 @@ msgstr ""
 "ば <literal>apt-get install</literal> で実行された、初期の自動インストール経"
 "路に対応しています。"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:978
-msgid "<literal>Debug::pkgDepCache::Marker</literal>"
-msgstr "<literal>Debug::pkgDepCache::Marker</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:981
 msgid ""
@@ -7720,21 +6466,11 @@ msgid ""
 "<literal>section</literal> is the name of the section the package appears in."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1000
-msgid "<literal>Debug::pkgInitConfig</literal>"
-msgstr "<literal>Debug::pkgInitConfig</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:1003
 msgid "Dump the default configuration to standard error on startup."
 msgstr "起動時に、標準エラー出力へデフォルト設定を出力します。"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1010
-msgid "<literal>Debug::pkgDPkgPM</literal>"
-msgstr "<literal>Debug::pkgDPkgPM</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:1013
 msgid ""
@@ -7744,11 +6480,6 @@ msgstr ""
 "&dpkg; 起動時に、起動した際の正確なコマンドラインを出力します。引数は空白で区"
 "切られます。"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1021
-msgid "<literal>Debug::pkgDPkgProgressReporting</literal>"
-msgstr "<literal>Debug::pkgDPkgProgressReporting</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:1024
 msgid ""
@@ -7758,11 +6489,6 @@ msgstr ""
 "状態ファイルディスクリプタに、&dpkg; から受信したすべてのデータと、そのデータ"
 "を解析中に発生したエラーを出力します。"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1031
-msgid "<literal>Debug::pkgOrderList</literal>"
-msgstr "<literal>Debug::pkgOrderList</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:1035
 msgid ""
@@ -7772,32 +6498,17 @@ msgstr ""
 "<literal>apt</literal> が &dpkg; にパッケージを渡す順番を決める、アルゴリズム"
 "のトレースを生成します。"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1043
-msgid "<literal>Debug::pkgPackageManager</literal>"
-msgstr "<literal>Debug::pkgPackageManager</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:1047
 msgid ""
 "Output status messages tracing the steps performed when invoking &dpkg;."
 msgstr "&dpkg; を呼び出す際に、実行手順を追跡した状態メッセージを出力します。"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1054
-msgid "<literal>Debug::pkgPolicy</literal>"
-msgstr "<literal>Debug::pkgPolicy</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:1058
 msgid "Output the priority of each package list on startup."
 msgstr "起動時の各パッケージの優先度を表示します。"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1064
-msgid "<literal>Debug::pkgProblemResolver</literal>"
-msgstr "<literal>Debug::pkgProblemResolver</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:1068
 msgid ""
@@ -7807,11 +6518,6 @@ msgstr ""
 "依存関係解決システムの実行内容を追跡します (これは複雑な依存関係の問題に遭遇"
 "した場合にのみ、適用されます)。"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1076
-msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>"
-msgstr "<literal>Debug::pkgProblemResolver::ShowScores</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:1079
 msgid ""
@@ -7820,11 +6526,6 @@ msgid ""
 "described in <literal>Debug::pkgDepCache::Marker</literal>"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1087
-msgid "<literal>Debug::sourceList</literal>"
-msgstr "<literal>Debug::sourceList</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:1091
 msgid ""
@@ -8469,33 +7170,31 @@ msgstr ""
 "Pin-Priority: 50\n"
 "\n"
 
-# type: <tag></tag>
-#. type: Content of: <refentry><refsect1><refsect2><literal>
-#: apt_preferences.5.xml:290
-#, fuzzy
-#| msgid "Packages"
-msgid "Package"
-msgstr "Packages"
-
-#. type: Content of: <refentry><refsect1><refsect2><literal>
-#: apt_preferences.5.xml:296
-msgid "*"
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt_preferences.5.xml:291
+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 "
+"of all package names it matches. It is undecided whether this will change in "
+"the future, thus you should always list wild-card pins first, so later "
+"specific pins override it.  The pattern \"<literal>*</literal>\" in a "
+"Package field is not considered a glob() expression in itself."
 msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><title>
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:306
+#: apt_preferences.5.xml:307
 msgid "How APT Interprets Priorities"
 msgstr "APT が優先度に割り込む方法"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:314
+#: apt_preferences.5.xml:315
 msgid "P &gt; 1000"
 msgstr "P &gt; 1000"
 
 # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:315
+#: apt_preferences.5.xml:316
 msgid ""
 "causes a version to be installed even if this constitutes a downgrade of the "
 "package"
@@ -8503,13 +7202,13 @@ msgstr ""
 "パッケージがダウングレードしても、このバージョンのパッケージをインストール"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:319
+#: apt_preferences.5.xml:320
 msgid "990 &lt; P &lt;=1000"
 msgstr "990 &lt; P &lt;=1000"
 
 # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:320
+#: apt_preferences.5.xml:321
 msgid ""
 "causes a version to be installed even if it does not come from the target "
 "release, unless the installed version is more recent"
@@ -8518,13 +7217,13 @@ msgstr ""
 "含まれなくても、このバージョンのパッケージをインストール"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:325
+#: apt_preferences.5.xml:326
 msgid "500 &lt; P &lt;=990"
 msgstr "500 &lt; P &lt;=990"
 
 # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:326
+#: apt_preferences.5.xml:327
 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"
@@ -8533,13 +7232,13 @@ msgstr ""
 "ジョンの方が新しいのでなければ、このバージョンのパッケージをインストール"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:331
+#: apt_preferences.5.xml:332
 msgid "100 &lt; P &lt;=500"
 msgstr "100 &lt; P &lt;=500"
 
 # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:332
+#: apt_preferences.5.xml:333
 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"
@@ -8549,13 +7248,13 @@ msgstr ""
 "ル"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:337
+#: apt_preferences.5.xml:338
 msgid "0 &lt; P &lt;=100"
 msgstr "0 &lt; P &lt;=100"
 
 # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:338
+#: apt_preferences.5.xml:339
 msgid ""
 "causes a version to be installed only if there is no installed version of "
 "the package"
@@ -8564,19 +7263,19 @@ msgstr ""
 "ンストール"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:342
+#: apt_preferences.5.xml:343
 msgid "P &lt; 0"
 msgstr "P &lt; 0"
 
 # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:343
+#: apt_preferences.5.xml:344
 msgid "prevents the version from being installed"
 msgstr "このバージョンのインストール禁止"
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:309
+#: apt_preferences.5.xml:310
 msgid ""
 "Priorities (P) assigned in the APT preferences file must be positive or "
 "negative integers.  They are interpreted as follows (roughly speaking): "
@@ -8588,7 +7287,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:348
+#: apt_preferences.5.xml:349
 msgid ""
 "If any specific-form records match an available package version then the "
 "first such record determines the priority of the package version.  Failing "
@@ -8602,7 +7301,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:354
+#: apt_preferences.5.xml:355
 msgid ""
 "For example, suppose the APT preferences file contains the three records "
 "presented earlier:"
@@ -8612,7 +7311,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><programlisting>
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:358
+#: apt_preferences.5.xml:359
 #, no-wrap
 msgid ""
 "Package: perl\n"
@@ -8642,13 +7341,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:371
+#: apt_preferences.5.xml:372
 msgid "Then:"
 msgstr "すると、以下のように動作します。"
 
 # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:373
+#: apt_preferences.5.xml:374
 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 "
@@ -8663,7 +7362,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:378
+#: apt_preferences.5.xml:379
 msgid ""
 "A version of any package other than <literal>perl</literal> that is "
 "available from the local system has priority over other versions, even "
@@ -8675,7 +7374,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:382
+#: apt_preferences.5.xml:383
 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</"
@@ -8689,13 +7388,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><title>
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:392
+#: apt_preferences.5.xml:393
 msgid "Determination of Package Version and Distribution Properties"
 msgstr "パッケージのバージョンとディストリビューションプロパティの決定"
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:394
+#: apt_preferences.5.xml:395
 msgid ""
 "The locations listed in the &sources-list; file should provide "
 "<filename>Packages</filename> and <filename>Release</filename> files to "
@@ -8706,30 +7405,30 @@ msgstr ""
 "filename> ファイルを提供します。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:406
+#: apt_preferences.5.xml:407
 msgid "the <literal>Package:</literal> line"
 msgstr "<literal>Package:</literal> 行"
 
 # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:407
+#: apt_preferences.5.xml:408
 msgid "gives the package name"
 msgstr "パッケージ名"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:410 apt_preferences.5.xml:460
+#: apt_preferences.5.xml:411 apt_preferences.5.xml:461
 msgid "the <literal>Version:</literal> line"
 msgstr "<literal>Version:</literal> 行"
 
 # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:411
+#: apt_preferences.5.xml:412
 msgid "gives the version number for the named package"
 msgstr "その名前のパッケージのバージョン番号"
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:398
+#: apt_preferences.5.xml:399
 msgid ""
 "The <filename>Packages</filename> file is normally found in the directory "
 "<filename>.../dists/<replaceable>dist-name</replaceable>/"
@@ -8749,13 +7448,13 @@ msgstr ""
 "type=\"variablelist\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:427
+#: apt_preferences.5.xml:428
 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>
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:428
+#: apt_preferences.5.xml:429
 msgid ""
 "names the archive to which all the packages in the directory tree belong.  "
 "For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@ -8772,19 +7471,19 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:438
+#: apt_preferences.5.xml:439
 #, 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:444
+#: apt_preferences.5.xml:445
 msgid "the <literal>Codename:</literal> line"
 msgstr "<literal>Codename:</literal> 行"
 
 # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:445
+#: apt_preferences.5.xml:446
 #, fuzzy
 msgid ""
 "names the codename to which all the packages in the directory tree belong.  "
@@ -8802,14 +7501,14 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:454
+#: apt_preferences.5.xml:455
 #, 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>
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:461
+#: apt_preferences.5.xml:462
 msgid ""
 "names the release version.  For example, the packages in the tree might "
 "belong to Debian GNU/Linux release version 3.0.  Note that there is normally "
@@ -8825,7 +7524,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:470
+#: apt_preferences.5.xml:471
 #, no-wrap
 msgid ""
 "Pin: release v=3.0\n"
@@ -8838,13 +7537,13 @@ msgstr ""
 "\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:479
+#: apt_preferences.5.xml:480
 msgid "the <literal>Component:</literal> line"
 msgstr "<literal>Component:</literal> 行"
 
 # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:480
+#: apt_preferences.5.xml:481
 msgid ""
 "names the licensing component associated with the packages in the directory "
 "tree of the <filename>Release</filename> file.  For example, the line "
@@ -8862,19 +7561,19 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:489
+#: apt_preferences.5.xml:490
 #, 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:495
+#: apt_preferences.5.xml:496
 msgid "the <literal>Origin:</literal> line"
 msgstr "<literal>Origin:</literal> 行"
 
 # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:496
+#: apt_preferences.5.xml:497
 msgid ""
 "names the originator of the packages in the directory tree of the "
 "<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"
@@ -8887,7 +7586,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:502
+#: apt_preferences.5.xml:503
 #, no-wrap
 msgid "Pin: release o=Debian\n"
 msgstr ""
@@ -8895,13 +7594,13 @@ msgstr ""
 "\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:508
+#: apt_preferences.5.xml:509
 msgid "the <literal>Label:</literal> line"
 msgstr "<literal>Label:</literal> 行"
 
 # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:509
+#: apt_preferences.5.xml:510
 msgid ""
 "names the label of the packages in the directory tree of the "
 "<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"
@@ -8914,7 +7613,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:515
+#: apt_preferences.5.xml:516
 #, no-wrap
 msgid "Pin: release l=Debian\n"
 msgstr ""
@@ -8923,7 +7622,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:416
+#: apt_preferences.5.xml:417
 #, fuzzy
 msgid ""
 "The <filename>Release</filename> file is normally found in the directory "
@@ -8947,7 +7646,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:522
+#: apt_preferences.5.xml:523
 msgid ""
 "All of the <filename>Packages</filename> and <filename>Release</filename> "
 "files retrieved from locations listed in the &sources-list; file are stored "
@@ -8973,13 +7672,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><title>
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:535
+#: apt_preferences.5.xml:536
 msgid "Optional Lines in an APT Preferences Record"
 msgstr "APT 設定レコードのオプション行"
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:537
+#: apt_preferences.5.xml:538
 msgid ""
 "Each record in the APT preferences file can optionally begin with one or "
 "more lines beginning with the word <literal>Explanation:</literal>.  This "
@@ -8990,13 +7689,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><title>
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:546
+#: apt_preferences.5.xml:547
 msgid "Tracking Stable"
 msgstr "安定版の追跡"
 
 # type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:554
+#: apt_preferences.5.xml:555
 #, no-wrap
 msgid ""
 "Explanation: Uninstall or do not install any Debian-originated\n"
@@ -9022,7 +7721,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:548
+#: apt_preferences.5.xml:549
 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 "
@@ -9038,8 +7737,8 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:571 apt_preferences.5.xml:617
-#: apt_preferences.5.xml:675
+#: apt_preferences.5.xml:572 apt_preferences.5.xml:618
+#: apt_preferences.5.xml:676
 #, no-wrap
 msgid ""
 "apt-get install <replaceable>package-name</replaceable>\n"
@@ -9052,7 +7751,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:566
+#: apt_preferences.5.xml:567
 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 "
@@ -9065,14 +7764,14 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:583
+#: apt_preferences.5.xml:584
 #, 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>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:577
+#: apt_preferences.5.xml:578
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>testing</literal> distribution; the package "
@@ -9086,13 +7785,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><title>
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:589
+#: apt_preferences.5.xml:590
 msgid "Tracking Testing or Unstable"
 msgstr "テスト版や不安定版の追跡"
 
 # type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:598
+#: apt_preferences.5.xml:599
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -9121,7 +7820,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:591
+#: apt_preferences.5.xml:592
 msgid ""
 "The following APT preferences file will cause APT to assign a high priority "
 "to package versions from the <literal>testing</literal> distribution, a "
@@ -9139,7 +7838,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:612
+#: apt_preferences.5.xml:613
 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 "
@@ -9152,14 +7851,14 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:632
+#: apt_preferences.5.xml:633
 #, 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>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:623
+#: apt_preferences.5.xml:624
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>unstable</literal> distribution.  "
@@ -9178,13 +7877,13 @@ msgstr ""
 "\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:639
+#: apt_preferences.5.xml:640
 msgid "Tracking the evolution of a codename release"
 msgstr "コード名リリースの進化の追跡"
 
 # type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:653
+#: apt_preferences.5.xml:654
 #, no-wrap
 msgid ""
 "Explanation: Uninstall or do not install any Debian-originated package versions\n"
@@ -9218,7 +7917,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:641
+#: apt_preferences.5.xml:642
 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 "
@@ -9242,7 +7941,7 @@ msgstr ""
 "id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:670
+#: apt_preferences.5.xml:671
 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 "
@@ -9255,14 +7954,14 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:690
+#: apt_preferences.5.xml:691
 #, 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>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:681
+#: apt_preferences.5.xml:682
 #, fuzzy
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
@@ -9282,13 +7981,13 @@ msgstr ""
 
 # type: Content of: <refentry><refnamediv><refname>
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt_preferences.5.xml:699
+#: apt_preferences.5.xml:700
 msgid "&file-preferences;"
 msgstr "&file-preferences;"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:705
+#: apt_preferences.5.xml:706
 msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 
@@ -9585,6 +8284,12 @@ msgstr ""
 "file スキームは、システム内の任意のディレクトリを、アーカイブとして扱えるよう"
 "にします。これは NFS マウントやローカルミラーで便利です。"
 
+# type: Content of: <refentry><refnamediv><refname>
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+#: sources.list.5.xml:153
+msgid "cdrom"
+msgstr "cdrom"
+
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml:155
@@ -9596,6 +8301,12 @@ msgstr ""
 "るようにします。取得元リストに cdrom エントリを追加するには、&apt-cdrom; プロ"
 "グラムを使用してください。"
 
+# type: <tag></tag>
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+#: sources.list.5.xml:160
+msgid "http"
+msgstr "http"
+
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml:162
@@ -9613,6 +8324,12 @@ msgstr ""
 "証が必要な HTTP/1.1 プロキシの場合、http://user:pass@server:port/ という形で"
 "指定してください。この認証方法は安全ではないことに注意してください。"
 
+# type: <tag></tag>
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+#: sources.list.5.xml:171
+msgid "ftp"
+msgstr "ftp"
+
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml:173
@@ -10046,6 +8763,12 @@ msgstr ""
 msgid "Once updated there are several commands that can be used:"
 msgstr ""
 
+# type: <tag></tag>
+#. type: <tag></tag>
+#: guide.sgml:121
+msgid "upgrade"
+msgstr "upgrade"
+
 #. type: <p></p>
 #: guide.sgml:131
 msgid ""
@@ -10058,6 +8781,12 @@ msgid ""
 "<tt>apt-get install</tt> can be used to force these packages to install."
 msgstr ""
 
+# type: <tag></tag>
+#. type: <tag></tag>
+#: guide.sgml:131
+msgid "install"
+msgstr "install"
+
 #. type: <p></p>
 #: guide.sgml:140
 msgid ""
@@ -10070,6 +8799,12 @@ msgid ""
 "anything other than its arguments are changed."
 msgstr ""
 
+# type: <tag></tag>
+#. type: <tag></tag>
+#: guide.sgml:140
+msgid "dist-upgrade"
+msgstr "dist-upgrade"
+
 #. type: <p></p>
 #: guide.sgml:149
 msgid ""
@@ -11077,254 +9812,6 @@ msgstr "これで、disc にある取得済みのアーカイブを使用する
 #~ "なければなりません。そうでなければデータが破損してしまいます。これが必要な"
 #~ "ホストは RFC 2068 に違反しています。"
 
-# type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#, fuzzy
-#~| msgid ""
-#~| "<command>apt-cache</command> <arg><option>-hvsn</option></arg> "
-#~| "<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
-#~| "<arg><option>-c=<replaceable>file</replaceable></option></arg> <group "
-#~| "choice=\"req\"> <arg>add <arg choice=\"plain\" rep=\"repeat"
-#~| "\"><replaceable>file</replaceable></arg></arg> <arg>gencaches</arg> "
-#~| "<arg>showpkg <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
-#~| "replaceable></arg></arg> <arg>showsrc <arg choice=\"plain\" rep=\"repeat"
-#~| "\"><replaceable>pkg</replaceable></arg></arg> <arg>stats</arg> "
-#~| "<arg>dump</arg> <arg>dumpavail</arg> <arg>unmet</arg> <arg>search <arg "
-#~| "choice=\"plain\"><replaceable>regex</replaceable></arg></arg> <arg>show "
-#~| "<arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></"
-#~| "arg></arg> <arg>depends <arg choice=\"plain\" rep=\"repeat"
-#~| "\"><replaceable>pkg</replaceable></arg></arg> <arg>rdepends <arg choice="
-#~| "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
-#~| "<arg>pkgnames <arg choice=\"plain\"><replaceable>prefix</replaceable></"
-#~| "arg></arg> <arg>dotty <arg choice=\"plain\" rep=\"repeat"
-#~| "\"><replaceable>pkg</replaceable></arg></arg> <arg>xvcg <arg choice="
-#~| "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
-#~| "<arg>policy <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkgs</"
-#~| "replaceable></arg></arg> <arg>madison <arg choice=\"plain\" rep=\"repeat"
-#~| "\"><replaceable>pkgs</replaceable></arg></arg> </group>"
-#~ msgid ""
-#~ "<command>apt-cache</command> <arg><option>-hvsn</option></arg> "
-#~ "<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
-#~ "<arg><option>-c=<replaceable>file</replaceable></option></arg> <group "
-#~ "choice=\"req\"> <arg>gencaches</arg> <arg>showpkg <arg choice=\"plain\" "
-#~ "rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg>showsrc "
-#~ "<arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></"
-#~ "arg></arg> <arg>stats</arg> <arg>dump</arg> <arg>dumpavail</arg> "
-#~ "<arg>unmet</arg> <arg>search <arg choice=\"plain\"><replaceable>regex</"
-#~ "replaceable></arg></arg> <arg>show <arg choice=\"plain\" rep=\"repeat"
-#~ "\"><replaceable>pkg</replaceable></arg></arg> <arg>depends <arg choice="
-#~ "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
-#~ "<arg>rdepends <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
-#~ "replaceable></arg></arg> <arg>pkgnames <arg choice=\"plain"
-#~ "\"><replaceable>prefix</replaceable></arg></arg> <arg>dotty <arg choice="
-#~ "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
-#~ "<arg>xvcg <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
-#~ "replaceable></arg></arg> <arg>policy <arg choice=\"plain\" rep=\"repeat"
-#~ "\"><replaceable>pkgs</replaceable></arg></arg> <arg>madison <arg choice="
-#~ "\"plain\" rep=\"repeat\"><replaceable>pkgs</replaceable></arg></arg> </"
-#~ "group>"
-#~ msgstr ""
-#~ "<command>apt-cache</command> <arg><option>-hvsn</option></arg> "
-#~ "<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
-#~ "<arg><option>-c=<replaceable>file</replaceable></option></arg> <group "
-#~ "choice=\"req\"> <arg>add <arg choice=\"plain\" rep=\"repeat"
-#~ "\"><replaceable>file</replaceable></arg></arg> <arg>gencaches</arg> "
-#~ "<arg>showpkg <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
-#~ "replaceable></arg></arg> <arg>showsrc <arg choice=\"plain\" rep=\"repeat"
-#~ "\"><replaceable>pkg</replaceable></arg></arg> <arg>stats</arg> <arg>dump</"
-#~ "arg> <arg>dumpavail</arg> <arg>unmet</arg> <arg>search <arg choice=\"plain"
-#~ "\"><replaceable>regex</replaceable></arg></arg> <arg>show <arg choice="
-#~ "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
-#~ "<arg>depends <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
-#~ "replaceable></arg></arg> <arg>rdepends <arg choice=\"plain\" rep=\"repeat"
-#~ "\"><replaceable>pkg</replaceable></arg></arg> <arg>pkgnames <arg choice="
-#~ "\"plain\"><replaceable>prefix</replaceable></arg></arg> <arg>dotty <arg "
-#~ "choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></"
-#~ "arg> <arg>xvcg <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
-#~ "replaceable></arg></arg> <arg>policy <arg choice=\"plain\" rep=\"repeat"
-#~ "\"><replaceable>pkgs</replaceable></arg></arg> <arg>madison <arg choice="
-#~ "\"plain\" rep=\"repeat\"><replaceable>pkgs</replaceable></arg></arg> </"
-#~ "group>"
-
-# type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#~ msgid ""
-#~ "<command>apt-cdrom</command> <arg><option>-hvrmfan</option></arg> "
-#~ "<arg><option>-d=<replaceable>cdrom mount point</replaceable></option></"
-#~ "arg> <arg><option>-o=<replaceable>config string</replaceable></option></"
-#~ "arg> <arg><option>-c=<replaceable>file</replaceable></option></arg> "
-#~ "<group> <arg>add</arg> <arg>ident</arg> </group>"
-#~ msgstr ""
-#~ "<command>apt-cdrom</command> <arg><option>-hvrmfan</option></arg> "
-#~ "<arg><option>-d=<replaceable>cdrom mount point</replaceable></option></"
-#~ "arg> <arg><option>-o=<replaceable>config string</replaceable></option></"
-#~ "arg> <arg><option>-c=<replaceable>file</replaceable></option></arg> "
-#~ "<group> <arg>add</arg> <arg>ident</arg> </group>"
-
-# type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#~ msgid ""
-#~ "<command>apt-config</command> <arg><option>-hv</option></arg> "
-#~ "<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
-#~ "<arg><option>-c=<replaceable>file</replaceable></option></arg> <group "
-#~ "choice=\"req\"> <arg>shell</arg> <arg>dump</arg> </group>"
-#~ msgstr ""
-#~ "<command>apt-config</command> <arg><option>-hv</option></arg> "
-#~ "<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
-#~ "<arg><option>-c=<replaceable>file</replaceable></option></arg> <group "
-#~ "choice=\"req\"> <arg>shell</arg> <arg>dump</arg> </group>"
-
-# type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#~ msgid ""
-#~ "<command>apt-extracttemplates</command> <arg><option>-hv</option></arg> "
-#~ "<arg><option>-t=<replaceable>temporary directory</replaceable></option></"
-#~ "arg> <arg choice=\"plain\" rep=\"repeat\"><replaceable>file</"
-#~ "replaceable></arg>"
-#~ msgstr ""
-#~ "<command>apt-extracttemplates</command> <arg><option>-hv</option></arg> "
-#~ "<arg><option>-t=<replaceable>temporary directory</replaceable></option></"
-#~ "arg> <arg choice=\"plain\" rep=\"repeat\"><replaceable>file</"
-#~ "replaceable></arg>"
-
-# type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#~ msgid ""
-#~ "<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> "
-#~ "<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> "
-#~ "<arg><option>--readonly</option></arg> <arg><option>--contents</option></"
-#~ "arg> <arg><option>--arch <replaceable>architecture</replaceable></"
-#~ "option></arg> <arg><option>-o <replaceable>config</"
-#~ "replaceable>=<replaceable>string</replaceable></option></arg> "
-#~ "<arg><option>-c=<replaceable>file</replaceable></option></arg> <group "
-#~ "choice=\"req\"> <arg>packages<arg choice=\"plain\" rep=\"repeat"
-#~ "\"><replaceable>path</replaceable></arg><arg><replaceable>override</"
-#~ "replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> "
-#~ "<arg>sources<arg choice=\"plain\" rep=\"repeat\"><replaceable>path</"
-#~ "replaceable></arg><arg><replaceable>override</"
-#~ "replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> "
-#~ "<arg>contents <arg choice=\"plain\"><replaceable>path</replaceable></"
-#~ "arg></arg> <arg>release <arg choice=\"plain\"><replaceable>path</"
-#~ "replaceable></arg></arg> <arg>generate <arg choice=\"plain"
-#~ "\"><replaceable>config-file</replaceable></arg> <arg choice=\"plain\" rep="
-#~ "\"repeat\"><replaceable>section</replaceable></arg></arg> <arg>clean <arg "
-#~ "choice=\"plain\"><replaceable>config-file</replaceable></arg></arg> </"
-#~ "group>"
-#~ msgstr ""
-#~ "<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> "
-#~ "<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> "
-#~ "<arg><option>--readonly</option></arg> <arg><option>--contents</option></"
-#~ "arg> <arg><option>--arch <replaceable>architecture</replaceable></"
-#~ "option></arg> <arg><option>-o <replaceable>config</"
-#~ "replaceable>=<replaceable>string</replaceable></option></arg> "
-#~ "<arg><option>-c=<replaceable>file</replaceable></option></arg> <group "
-#~ "choice=\"req\"> <arg>packages<arg choice=\"plain\" rep=\"repeat"
-#~ "\"><replaceable>path</replaceable></arg><arg><replaceable>override</"
-#~ "replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> "
-#~ "<arg>sources<arg choice=\"plain\" rep=\"repeat\"><replaceable>path</"
-#~ "replaceable></arg><arg><replaceable>override</"
-#~ "replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> "
-#~ "<arg>contents <arg choice=\"plain\"><replaceable>path</replaceable></"
-#~ "arg></arg> <arg>release <arg choice=\"plain\"><replaceable>path</"
-#~ "replaceable></arg></arg> <arg>generate <arg choice=\"plain"
-#~ "\"><replaceable>config-file</replaceable></arg> <arg choice=\"plain\" rep="
-#~ "\"repeat\"><replaceable>section</replaceable></arg></arg> <arg>clean <arg "
-#~ "choice=\"plain\"><replaceable>config-file</replaceable></arg></arg> </"
-#~ "group>"
-
-#, fuzzy
-#~| msgid ""
-#~| "<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
-#~| "<option>-o= <replaceable>config_string</replaceable> </option> </arg> "
-#~| "<arg> <option>-c= <replaceable>config_file</replaceable> </option> </"
-#~| "arg> <arg> <option>-t=</option> <arg choice='plain'> "
-#~| "<replaceable>target_release</replaceable> </arg> </arg> <group choice="
-#~| "\"req\"> <arg choice='plain'>update</arg> <arg choice='plain'>upgrade</"
-#~| "arg> <arg choice='plain'>dselect-upgrade</arg> <arg choice='plain'>dist-"
-#~| "upgrade</arg> <arg choice='plain'>install <arg choice=\"plain\" rep="
-#~| "\"repeat\"><replaceable>pkg</replaceable> <arg> <group choice='req'> "
-#~| "<arg choice='plain'> =<replaceable>pkg_version_number</replaceable> </"
-#~| "arg> <arg choice='plain'> /<replaceable>target_release</replaceable> </"
-#~| "arg> </group> </arg> </arg> </arg> <arg choice='plain'>remove <arg "
-#~| "choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></"
-#~| "arg> <arg choice='plain'>purge <arg choice=\"plain\" rep=\"repeat"
-#~| "\"><replaceable>pkg</replaceable></arg></arg> <arg choice='plain'>source "
-#~| "<arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable> "
-#~| "<arg> <group choice='req'> <arg choice='plain'> "
-#~| "=<replaceable>pkg_version_number</replaceable> </arg> <arg "
-#~| "choice='plain'> /<replaceable>target_release</replaceable> </arg> </"
-#~| "group> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg choice="
-#~| "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
-#~| "choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg "
-#~| "choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> <arg "
-#~| "choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> <arg "
-#~| "choice='plain'>--version</arg> </group> </arg> <arg choice='plain'> "
-#~| "<group choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--"
-#~| "help</arg> </group> </arg> </group>"
-#~ msgid ""
-#~ "<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
-#~ "<option>-o= <replaceable>config_string</replaceable> </option> </arg> "
-#~ "<arg> <option>-c= <replaceable>config_file</replaceable> </option> </arg> "
-#~ "<arg> <option>-t=</option> <arg choice='plain'> "
-#~ "<replaceable>target_release</replaceable> </arg> </arg> <group choice="
-#~ "\"req\"> <arg choice='plain'>update</arg> <arg choice='plain'>upgrade</"
-#~ "arg> <arg choice='plain'>dselect-upgrade</arg> <arg choice='plain'>dist-"
-#~ "upgrade</arg> <arg choice='plain'>install <arg choice=\"plain\" rep="
-#~ "\"repeat\"><replaceable>pkg</replaceable> <arg> <group choice='req'> <arg "
-#~ "choice='plain'> =<replaceable>pkg_version_number</replaceable> </arg> "
-#~ "<arg choice='plain'> /<replaceable>target_release</replaceable> </arg> </"
-#~ "group> </arg> </arg> </arg> <arg choice='plain'>remove <arg choice=\"plain"
-#~ "\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
-#~ "choice='plain'>purge <arg choice=\"plain\" rep=\"repeat"
-#~ "\"><replaceable>pkg</replaceable></arg></arg> <arg choice='plain'>source "
-#~ "<arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable> <arg> "
-#~ "<group choice='req'> <arg choice='plain'> "
-#~ "=<replaceable>pkg_version_number</replaceable> </arg> <arg "
-#~ "choice='plain'> /<replaceable>target_release</replaceable> </arg> </"
-#~ "group> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg choice="
-#~ "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
-#~ "choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg "
-#~ "choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> <arg "
-#~ "choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> <arg "
-#~ "choice='plain'>--version</arg> </group> </arg> <arg choice='plain'> "
-#~ "<group choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--"
-#~ "help</arg> </group> </arg> </group>"
-#~ msgstr ""
-#~ "<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
-#~ "<option>-o= <replaceable>config_string</replaceable> </option> </arg> "
-#~ "<arg> <option>-c= <replaceable>config_file</replaceable> </option> </arg> "
-#~ "<arg> <option>-t=</option> <arg choice='plain'> "
-#~ "<replaceable>target_release</replaceable> </arg> </arg> <group choice="
-#~ "\"req\"> <arg choice='plain'>update</arg> <arg choice='plain'>upgrade</"
-#~ "arg> <arg choice='plain'>dselect-upgrade</arg> <arg choice='plain'>dist-"
-#~ "upgrade</arg> <arg choice='plain'>install <arg choice=\"plain\" rep="
-#~ "\"repeat\"><replaceable>pkg</replaceable> <arg> <group choice='req'> <arg "
-#~ "choice='plain'> =<replaceable>pkg_version_number</replaceable> </arg> "
-#~ "<arg choice='plain'> /<replaceable>target_release</replaceable> </arg> </"
-#~ "group> </arg> </arg> </arg> <arg choice='plain'>remove <arg choice=\"plain"
-#~ "\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
-#~ "choice='plain'>purge <arg choice=\"plain\" rep=\"repeat"
-#~ "\"><replaceable>pkg</replaceable></arg></arg> <arg choice='plain'>source "
-#~ "<arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable> <arg> "
-#~ "<group choice='req'> <arg choice='plain'> "
-#~ "=<replaceable>pkg_version_number</replaceable> </arg> <arg "
-#~ "choice='plain'> /<replaceable>target_release</replaceable> </arg> </"
-#~ "group> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg choice="
-#~ "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
-#~ "choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg "
-#~ "choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> <arg "
-#~ "choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> <arg "
-#~ "choice='plain'>--version</arg> </group> </arg> <arg choice='plain'> "
-#~ "<group choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--"
-#~ "help</arg> </group> </arg> </group>"
-
-# type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#~ msgid ""
-#~ "<command>apt-key</command> <arg><option>--keyring <replaceable>filename</"
-#~ "replaceable></option></arg> <arg><replaceable>command</replaceable></arg> "
-#~ "<arg rep=\"repeat\"><option><replaceable>arguments</replaceable></"
-#~ "option></arg>"
-#~ msgstr ""
-#~ "<command>apt-key</command> <arg><option>--keyring <replaceable>filename</"
-#~ "replaceable></option></arg> <arg><replaceable>command</replaceable></arg> "
-#~ "<arg rep=\"repeat\"><option><replaceable>arguments</replaceable></"
-#~ "option></arg>"
-
 # type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 #~ msgid "add <replaceable>filename</replaceable>"
 #~ msgstr "add <replaceable>filename</replaceable>"
@@ -11349,46 +9836,6 @@ msgstr "これで、disc にある取得済みのアーカイブを使用する
 #~ msgid "--keyring <replaceable>filename</replaceable>"
 #~ msgstr "--keyring <replaceable>filename</replaceable>"
 
-# type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#, fuzzy
-#~| msgid ""
-#~| "  <command>apt-mark</command> <arg><option>-hv</option></arg> "
-#~| "<arg><option>-f=<replaceable>FILENAME</replaceable></option></arg> "
-#~| "<group choice=\"plain\"> <arg choice=\"plain\"> <group choice=\"req\"> "
-#~| "<arg choice=\"plain\">markauto</arg> <arg choice=\"plain\">unmarkauto</"
-#~| "arg> </group> <arg choice=\"plain\" rep=\"repeat\"><replaceable>package</"
-#~| "replaceable></arg> </arg> <arg choice=\"plain\">showauto</arg> </group>"
-#~ msgid ""
-#~ "  <command>apt-mark</command> <arg><option>-hv</option></arg> "
-#~ "<arg><option>-f=<replaceable>FILENAME</replaceable></option></arg> <group "
-#~ "choice=\"plain\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg "
-#~ "choice=\"plain\">auto</arg> <arg choice=\"plain\">manual</arg> <arg "
-#~ "choice=\"plain\">showauto</arg> <arg choice=\"plain\">showmanual</arg> </"
-#~ "group> <arg choice=\"plain\" rep=\"repeat\"><replaceable>package</"
-#~ "replaceable></arg> </arg> </group>"
-#~ msgstr ""
-#~ "  <command>apt-mark</command> <arg><option>-hv</option></arg> "
-#~ "<arg><option>-f=<replaceable>FILENAME</replaceable></option></arg> <group "
-#~ "choice=\"plain\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg "
-#~ "choice=\"plain\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> </"
-#~ "group> <arg choice=\"plain\" rep=\"repeat\"><replaceable>package</"
-#~ "replaceable></arg> </arg> <arg choice=\"plain\">showauto</arg> </group>"
-
-# type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#~ msgid ""
-#~ "<command>apt-sortpkgs</command> <arg><option>-hvs</option></arg> "
-#~ "<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
-#~ "<arg><option>-c=<replaceable>file</replaceable></option></arg> <arg "
-#~ "choice=\"plain\" rep=\"repeat\"><replaceable>file</replaceable></arg>"
-#~ msgstr ""
-#~ "<command>apt-sortpkgs</command> <arg><option>-hvs</option></arg> "
-#~ "<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
-#~ "<arg><option>-c=<replaceable>file</replaceable></option></arg> <arg "
-#~ "choice=\"plain\" rep=\"repeat\"><replaceable>file</replaceable></arg>"
-
-#~ msgid "<option>--md5</option>"
-#~ msgstr "<option>--md5</option>"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #~ msgid ""
 #~ "Generate MD5 sums. This defaults to on, when turned off the generated "
@@ -11399,22 +9846,10 @@ msgstr "これで、disc にある取得済みのアーカイブを使用する
 #~ "ンデックスファイルに MD5Sum フィールドがありません。設定項目 - "
 #~ "<literal>APT::FTPArchive::MD5</literal>"
 
-#~ msgid "unmarkauto"
-#~ msgstr "unmarkauto"
-
-#~ msgid "<option>-h</option>"
-#~ msgstr "<option>-h</option>"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #~ msgid "Show a short usage summary."
 #~ msgstr "短い使用方法を表示します。"
 
-#~ msgid "<option>-v</option>"
-#~ msgstr "<option>-v</option>"
-
-#~ msgid "<option>--version</option>"
-#~ msgstr "<option>--version</option>"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #~ msgid "Show the program version."
 #~ msgstr "プログラムのバージョン情報を表示します"
@@ -11453,9 +9888,6 @@ msgstr "これで、disc にある取得済みのアーカイブを使用する
 #~ "たファイルを再帰検索します。その後、ファイルごとの MD5 ダイジェストと "
 #~ "SHA1 ダイジェストを含んだ Release ファイルを、標準出力に書き出します。"
 
-#~ msgid "<option>--install-recommends</option>"
-#~ msgstr "<option>--install-recommends</option>"
-
 #~ msgid "Also install recommended packages."
 #~ msgstr "「推奨」パッケージもインストールします。"
 
diff --git a/doc/po/pl.po b/doc/po/pl.po
index d9cd4331d..5b769dc71 100644
--- a/doc/po/pl.po
+++ b/doc/po/pl.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.7.25.3\n"
-"POT-Creation-Date: 2012-05-20 18:22+0300\n"
+"POT-Creation-Date: 2012-05-21 04:13+0300\n"
 "PO-Revision-Date: 2010-03-18 22:00+0100\n"
 "Last-Translator: Robert Luberda <robert@debian.org>\n"
 "Language-Team: <debian-l10n-polish@lists.debian.org>\n"
@@ -878,11 +878,6 @@ msgstr ""
 "Jedno z poniższych poleceń musi być użyte, chyba że została podana opcja "
 "<option>-h</option> albo <option>--help</option>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:48
-msgid "gencaches"
-msgstr "gencaches"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:49
 msgid ""
@@ -890,12 +885,12 @@ msgid ""
 "implicitly by all commands needing this cache if it is missing or outdated."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:53
-#, fuzzy
-#| msgid "showpkg <replaceable>pkg(s)</replaceable>"
-msgid "showpkg <replaceable>&synopsis-pkg;</replaceable>…"
-msgstr "showpkg <replaceable>pakiet(y)</replaceable>"
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
+#: apt-cache.8.xml:53 apt-cache.8.xml:142 apt-cache.8.xml:163
+#: 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
+msgid "&synopsis-pkg;"
+msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -967,11 +962,6 @@ msgstr ""
 "zainstalowane. W celu zrozumienia, co oznaczają pozostałe linie, najlepiej "
 "przejrzeć kod źródłowy programu apt."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:87
-msgid "stats"
-msgstr "stats"
-
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:87
@@ -1098,13 +1088,6 @@ msgstr ""
 "<literal>Całkowite zależności (Total dependencies)</literal> to liczba "
 "więzów zależności wymaganych przez wszystkie pakiety w buforze."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:142
-#, fuzzy
-#| msgid "showsrc <replaceable>pkg(s)</replaceable>"
-msgid "showsrc <replaceable>&synopsis-pkg;</replaceable>…"
-msgstr "showsrc <replaceable>pakiet(y)</replaceable>"
-
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:143
@@ -1117,11 +1100,6 @@ msgstr ""
 "odpowiadają podanym nazwom pakietów. Wyświetlone zostaną wszystkie wersje "
 "tych pakietów oraz pakiety binarne, które są z tych pakietów budowane."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:148 apt-config.8.xml:75
-msgid "dump"
-msgstr "dump"
-
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:149
@@ -1132,11 +1110,6 @@ msgstr ""
 "<literal>dump</literal> pokazuje krótką listę wszystkich pakietów w buforze. "
 "Jest używany głównie w celu odpluskwiania."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:153
-msgid "dumpavail"
-msgstr "dumpavail"
-
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:154
@@ -1148,11 +1121,6 @@ msgstr ""
 "dostępnych pakietów. Jest to polecenie odpowiednie do użycia z programem "
 "&dpkg;  i jest używane w metodzie &dselect; tego programu."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:158
-msgid "unmet"
-msgstr "unmet"
-
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:159
@@ -1163,13 +1131,6 @@ msgstr ""
 "<literal>unmet</literal> pokazuje podsumowanie wszystkich niespełnionych "
 "zależności w buforze pakietów"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:163
-#, fuzzy
-#| msgid "show <replaceable>pkg(s)</replaceable>"
-msgid "show <replaceable>&synopsis-pkg;</replaceable>…"
-msgstr "show <replaceable>pakiet(y)</replaceable>"
-
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:164
@@ -1180,14 +1141,10 @@ msgstr ""
 "<literal>show</literal>  spełnia funkcje podobne do <command>dpkg --print-"
 "avail</command>; pokazuje szczegółowe informacje o podanych pakietach."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
 #: apt-cache.8.xml:169
-#, fuzzy
-#| msgid "search <replaceable>regex [ regex ... ]</replaceable>"
-msgid "search <replaceable>&synopsis-regex;</replaceable>…"
+msgid "&synopsis-regex;"
 msgstr ""
-"search <replaceable>wyrażenie regularne [ wyrażenie regularne ... ]</"
-"replaceable>"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -1226,13 +1183,6 @@ msgstr ""
 "Oddzielne argumenty mogą być używane do podania kilku wzorców, które będą "
 "traktowane jakby były połączone spójnikiem logicznym \"i\"."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:187
-#, fuzzy
-#| msgid "depends <replaceable>pkg(s)</replaceable>"
-msgid "depends <replaceable>&synopsis-pkg;</replaceable>…"
-msgstr "depends <replaceable>pakiet(y)</replaceable>"
-
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:188
@@ -1243,13 +1193,6 @@ msgstr ""
 "<literal>depends</literal> wyświetla listę wszystkich zależności danego "
 "pakietu i wszystkie możliwe pakiety, które mogą spełnić te zależności."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:192
-#, fuzzy
-#| msgid "rdepends <replaceable>pkg(s)</replaceable>"
-msgid "rdepends <replaceable>&synopsis-pkg;</replaceable>…"
-msgstr "rdepends <replaceable>pakiet(y)</replaceable>"
-
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:193
@@ -1264,7 +1207,7 @@ msgstr ""
 #: apt-cache.8.xml:197
 #, fuzzy
 #| msgid "pkgnames <replaceable>[ prefix ]</replaceable>"
-msgid "pkgnames [ <replaceable>&synopsis-prefix;</replaceable> ]"
+msgid "<optional><replaceable>&synopsis-prefix;</replaceable></optional>"
 msgstr "pkgnames <replaceable>[ prefiks ]</replaceable>"
 
 #
@@ -1295,13 +1238,6 @@ msgstr ""
 "Może być np. pakietem wirtualnym, które także są wypisane w wygenerowanej "
 "liście."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:208
-#, fuzzy
-#| msgid "dotty <replaceable>pkg(s)</replaceable>"
-msgid "dotty <replaceable>&synopsis-pkg;</replaceable>…"
-msgstr "dotty <replaceable>pakiet(y)</replaceable>"
-
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:209
@@ -1345,13 +1281,6 @@ msgstr ""
 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><term>
-#: apt-cache.8.xml:226
-#, fuzzy
-#| msgid "xvcg <replaceable>pkg(s)</replaceable>"
-msgid "xvcg <replaceable>&synopsis-pkg;</replaceable>"
-msgstr "xvcg <replaceable>pakiet(y)</replaceable>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:227
 msgid ""
@@ -1365,9 +1294,9 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-cache.8.xml:231
 #, fuzzy
-#| msgid "policy <replaceable>[ pkg(s) ]</replaceable>"
-msgid "policy [ <replaceable>&synopsis-pkg;</replaceable>… ]"
-msgstr "policy <replaceable>[ pakiet(y) ]</replaceable>"
+#| msgid "madison <replaceable>[ pkg(s) ]</replaceable>"
+msgid "<optional><replaceable>&synopsis-pkg;</replaceable>…</optional>"
+msgstr "madison <replaceable>[ pakiet(y) ]</replaceable>"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -1383,13 +1312,6 @@ msgstr ""
 "zostaną informacje o priorytecie każdego źródła. W przeciwnym wypadku, "
 "wypisuje szczegółowe informacje o priorytecie danego pakietu."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:238
-#, fuzzy
-#| msgid "madison <replaceable>[ pkg(s) ]</replaceable>"
-msgid "madison <replaceable>&synopsis-pkg;</replaceable>…"
-msgstr "madison <replaceable>[ pakiet(y) ]</replaceable>"
-
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:239
@@ -1409,23 +1331,13 @@ msgstr ""
 "informacje tylko dla tych architektur, dla których APT pobrało listy "
 "pakietów (<literal>APT::Architecture</literal>)."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:250 apt-config.8.xml:84 apt-extracttemplates.1.xml:51
+#. type: Content of: <refentry><refsect1><title>
+#: apt-cache.8.xml:250 apt-config.8.xml:84 apt-extracttemplates.1.xml:52
 #: apt-ftparchive.1.xml:504 apt-get.8.xml:259 apt-mark.8.xml:108
-#: apt-sortpkgs.1.xml:48 apt.conf.5.xml:586 apt.conf.5.xml:608
+#: apt-sortpkgs.1.xml:48
 msgid "options"
 msgstr "opcje"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:254
-msgid "<option>-p</option>"
-msgstr "<option>-p</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:254
-msgid "<option>--pkg-cache</option>"
-msgstr "<option>--pkg-cache</option>"
-
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:255
@@ -1438,17 +1350,6 @@ msgstr ""
 "buforem używanym we wszystkich operacjach.  Pozycja w pliku konfiguracyjnym: "
 "<literal>Dir::Cache::pkgcache</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:260 apt-ftparchive.1.xml:551 apt-get.8.xml:321
-#: apt-sortpkgs.1.xml:52
-msgid "<option>-s</option>"
-msgstr "<option>-s</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:260
-msgid "<option>--src-cache</option>"
-msgstr "<option>--src-cache</option>"
-
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:261
@@ -1466,16 +1367,6 @@ msgstr ""
 "wszystkich plików pakietów.  Pozycja w pliku konfiguracyjnym: <literal>Dir::"
 "Cache::srcpkgcache</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:268 apt-ftparchive.1.xml:525 apt-get.8.xml:311
-msgid "<option>-q</option>"
-msgstr "<option>-q</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:268 apt-ftparchive.1.xml:525 apt-get.8.xml:311
-msgid "<option>--quiet</option>"
-msgstr "<option>--quiet</option>"
-
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:269
@@ -1491,16 +1382,6 @@ msgstr ""
 "option>,nadpisując tym samym opcję z pliku konfiguracyjnego.  Pozycja w "
 "pliku konfiguracyjnym: <literal>quiet</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:275
-msgid "<option>-i</option>"
-msgstr "<option>-i</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:275
-msgid "<option>--important</option>"
-msgstr "<option>--important</option>"
-
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:276
@@ -1513,62 +1394,6 @@ msgstr ""
 "wypisanie tylko zależności typu Depends i Pre-Depends.  Pozycja w pliku "
 "konfiguracyjnym: <literal>APT::Cache::Important</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:281
-#, fuzzy
-#| msgid "<option>--no-upgrade</option>"
-msgid "<option>--no-pre-depends</option>"
-msgstr "<option>--no-upgrade</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:282
-#, fuzzy
-#| msgid "<option>--no-download</option>"
-msgid "<option>--no-depends</option>"
-msgstr "<option>--no-download</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:283
-#, fuzzy
-#| msgid "<option>--install-recommends</option>"
-msgid "<option>--no-recommends</option>"
-msgstr "<option>--install-recommends</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:284
-#, fuzzy
-#| msgid "<option>--no-upgrade</option>"
-msgid "<option>--no-suggests</option>"
-msgstr "<option>--no-upgrade</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:285
-#, fuzzy
-#| msgid "<option>--no-mount</option>"
-msgid "<option>--no-conflicts</option>"
-msgstr "<option>--no-mount</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:286
-#, fuzzy
-#| msgid "<option>--no-act</option>"
-msgid "<option>--no-breaks</option>"
-msgstr "<option>--no-act</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:287
-#, fuzzy
-#| msgid "<option>--no-act</option>"
-msgid "<option>--no-replaces</option>"
-msgstr "<option>--no-act</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:288
-#, fuzzy
-#| msgid "<option>--no-act</option>"
-msgid "<option>--no-enhances</option>"
-msgstr "<option>--no-act</option>"
-
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:289
@@ -1589,16 +1414,6 @@ msgstr ""
 "wszystkie wymienione pakiety zostaną wypisane tylko raz. Pozycja w pliku "
 "konfiguracyjnym: <literal>APT::Cache::RecurseDepends</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:295 apt-cdrom.8.xml:111 apt-get.8.xml:278
-msgid "<option>-f</option>"
-msgstr "<option>-f</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:295
-msgid "<option>--full</option>"
-msgstr "<option>--full</option>"
-
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:296
@@ -1609,17 +1424,6 @@ msgstr ""
 "Podczas szukania wypisuj pełną informację o pakiecie. Pozycja w pliku "
 "konfiguracyjnym: <literal>APT::Cache::ShowFull</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:300 apt-cdrom.8.xml:121 apt-ftparchive.1.xml:563
-#: apt-get.8.xml:369
-msgid "<option>-a</option>"
-msgstr "<option>-a</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:300
-msgid "<option>--all-versions</option>"
-msgstr "<option>--all-versions</option>"
-
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:301
@@ -1639,16 +1443,6 @@ msgstr ""
 "literal>.  Pozycja w pliku konfiguracyjnym: <literal>APT::Cache::"
 "AllVersions</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:309
-msgid "<option>-g</option>"
-msgstr "<option>-g</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:309
-msgid "<option>--generate</option>"
-msgstr "<option>--generate</option>"
-
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:310
@@ -1662,16 +1456,6 @@ msgstr ""
 "<option>--no-generate</option>. Pozycja w pliku konfiguracyjnym: "
 "<literal>APT::Cache::Generate</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:315
-msgid "<option>--names-only</option>"
-msgstr "<option>--names-only</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:315 apt-cdrom.8.xml:129
-msgid "<option>-n</option>"
-msgstr "<option>-n</option>"
-
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:316
@@ -1682,11 +1466,6 @@ msgstr ""
 "Przeszukaj tylko nazwy pakietów, pomijając szczegółowe opisy.  Pozycja w "
 "pliku konfiguracyjnym: <literal>APT::Cache::NamesOnly</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:320
-msgid "<option>--all-names</option>"
-msgstr "<option>--all-names</option>"
-
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:321
@@ -1700,11 +1479,6 @@ msgstr ""
 "zależności.  Pozycja w pliku konfiguracyjnym: <literal>APT::Cache::AllNames</"
 "literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:326
-msgid "<option>--recurse</option>"
-msgstr "<option>--recurse</option>"
-
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:327
@@ -1718,11 +1492,6 @@ msgstr ""
 "wszystkie wymienione pakiety zostaną wypisane tylko raz. Pozycja w pliku "
 "konfiguracyjnym: <literal>APT::Cache::RecurseDepends</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:332
-msgid "<option>--installed</option>"
-msgstr "<option>--installed</option>"
-
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:334
@@ -1737,14 +1506,14 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist>
 #: apt-cache.8.xml:339 apt-cdrom.8.xml:140 apt-config.8.xml:104
-#: apt-extracttemplates.1.xml:62 apt-ftparchive.1.xml:591 apt-get.8.xml:514
+#: apt-extracttemplates.1.xml:63 apt-ftparchive.1.xml:591 apt-get.8.xml:514
 #: apt-mark.8.xml:122 apt-sortpkgs.1.xml:58
 msgid "&apt-commonoptions;"
 msgstr "&apt-commonoptions;"
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-cache.8.xml:344 apt-get.8.xml:519 apt-key.8.xml:167 apt-mark.8.xml:126
-#: apt.conf.5.xml:1119 apt_preferences.5.xml:697
+#: apt.conf.5.xml:1119 apt_preferences.5.xml:698
 msgid "Files"
 msgstr "Pliki"
 
@@ -1755,9 +1524,9 @@ msgstr "&file-sourceslist; &file-statelists;"
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-cache.8.xml:351 apt-cdrom.8.xml:145 apt-config.8.xml:109
-#: apt-extracttemplates.1.xml:69 apt-ftparchive.1.xml:607 apt-get.8.xml:529
+#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:607 apt-get.8.xml:529
 #: apt-key.8.xml:188 apt-mark.8.xml:132 apt-secure.8.xml:185
-#: apt-sortpkgs.1.xml:63 apt.conf.5.xml:1125 apt_preferences.5.xml:704
+#: apt-sortpkgs.1.xml:63 apt.conf.5.xml:1125 apt_preferences.5.xml:705
 #: sources.list.5.xml:255
 msgid "See Also"
 msgstr "Zobacz także"
@@ -1770,7 +1539,7 @@ msgstr "&apt-conf;, &sources-list;, &apt-get;"
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:114
-#: apt-extracttemplates.1.xml:73 apt-ftparchive.1.xml:611 apt-get.8.xml:535
+#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:611 apt-get.8.xml:535
 #: apt-mark.8.xml:136 apt-sortpkgs.1.xml:67
 msgid "Diagnostics"
 msgstr "Diagnostyka"
@@ -1831,11 +1600,6 @@ msgstr ""
 "używanie <command>apt-cdrom</command> jest konieczne. Co więcej, każdy dysk "
 "w wielodyskowym archiwum musi być włożony i zeskanowany oddzielnie."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:55
-msgid "add"
-msgstr "add"
-
 #
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt-cdrom.8.xml:56
@@ -1871,11 +1635,6 @@ msgstr ""
 "się w napędzie, oraz przechowuje bazę tych identyfikatorów w pliku "
 "<filename>&statedir;/cdroms.list</filename>"
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:71
-msgid "ident"
-msgstr "ident"
-
 #
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt-cdrom.8.xml:72
@@ -1903,16 +1662,6 @@ msgstr ""
 msgid "Options"
 msgstr "Opcje"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:85 apt-ftparchive.1.xml:519 apt-get.8.xml:273
-msgid "<option>-d</option>"
-msgstr "<option>-d</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:85
-msgid "<option>--cdrom</option>"
-msgstr "<option>--cdrom</option>"
-
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cdrom.8.xml:86
@@ -1926,16 +1675,6 @@ msgstr ""
 "pliku <filename>/etc/fstab</filename>. Pozycja w pliku konfiguracyjnym: "
 "<literal>Acquire::cdrom::mount</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:94
-msgid "<option>-r</option>"
-msgstr "<option>-r</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:94
-msgid "<option>--rename</option>"
-msgstr "<option>--rename</option>"
-
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cdrom.8.xml:95
@@ -1949,16 +1688,6 @@ msgstr ""
 "spyta się o nową etykietę.  Pozycja w pliku konfiguracyjnym: <literal>APT::"
 "CDROM::Rename</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:103 apt-get.8.xml:292
-msgid "<option>-m</option>"
-msgstr "<option>-m</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:103
-msgid "<option>--no-mount</option>"
-msgstr "<option>--no-mount</option>"
-
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cdrom.8.xml:104
@@ -1971,11 +1700,6 @@ msgstr ""
 "i odmontowywanie CDROM-u.  Pozycja w pliku konfiguracyjnym: <literal>APT::"
 "CDROM::NoMount</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:111
-msgid "<option>--fast</option>"
-msgstr "<option>--fast</option>"
-
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cdrom.8.xml:112
@@ -1991,11 +1715,6 @@ msgstr ""
 "na nim żadnych błędów.  Pozycja w pliku konfiguracyjnym: <literal>APT::"
 "CDROM::Fast</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:121
-msgid "<option>--thorough</option>"
-msgstr "<option>--thorough</option>"
-
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cdrom.8.xml:122
@@ -2009,21 +1728,6 @@ msgstr ""
 "w dziwnych miejscach. Indeksowanie całego CD zabiera więcej czasu, ale "
 "znajdzie wszystkie takie pliki."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:130 apt-get.8.xml:323
-msgid "<option>--just-print</option>"
-msgstr "<option>--just-print</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:131 apt-get.8.xml:325
-msgid "<option>--recon</option>"
-msgstr "<option>--recon</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:132 apt-get.8.xml:326
-msgid "<option>--no-act</option>"
-msgstr "<option>--no-act</option>"
-
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cdrom.8.xml:133
@@ -2096,11 +1800,6 @@ msgstr ""
 "Jedno z poniższych poleceń musi być użyte, chyba że została podana opcja "
 "<option>-h</option> albo <option>--help</option>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-config.8.xml:49
-msgid "shell"
-msgstr "shell"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-config.8.xml:51
 msgid ""
@@ -2153,13 +1852,6 @@ msgstr ""
 msgid "Just show the contents of the configuration space."
 msgstr "Wyświetla zawartość przestrzeni konfiguracji."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-config.8.xml:89
-#, fuzzy
-#| msgid "<option>--help</option>"
-msgid "<option>--empty</option>"
-msgstr "<option>--help</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-config.8.xml:90
 msgid ""
@@ -2167,11 +1859,9 @@ msgid ""
 "empty to remove them from the output."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
 #: apt-config.8.xml:95
-msgid ""
-"<option>--format '<replaceable>&percnt;f &#x0022;&percnt;v&#x0022;;&percnt;"
-"n</replaceable>'</option>"
+msgid "&percnt;f &#x0022;&percnt;v&#x0022;;&percnt;n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -2187,7 +1877,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:110 apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:608
+#: apt-config.8.xml:110 apt-extracttemplates.1.xml:71 apt-ftparchive.1.xml:608
 #: apt-sortpkgs.1.xml:64
 msgid "&apt-conf;"
 msgstr "&apt-conf;"
@@ -2240,11 +1930,19 @@ msgstr "pakiet wersja plik-template skrypt-config"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-extracttemplates.1.xml:45
+#, fuzzy
+#| msgid ""
+#| "template-file and config-script are written to the temporary directory "
+#| "specified by the -t or --tempdir (<literal>APT::ExtractTemplates::"
+#| "TempDir</literal>)  directory, with filenames of the form "
+#| "<filename>package.template.XXXX</filename> and <filename>package.config."
+#| "XXXX</filename>"
 msgid ""
 "template-file and config-script are written to the temporary directory "
-"specified by the -t or --tempdir (<literal>APT::ExtractTemplates::TempDir</"
-"literal>)  directory, with filenames of the form <filename>package.template."
-"XXXX</filename> and <filename>package.config.XXXX</filename>"
+"specified by the <option>-t</option> or <option>--tempdir</option> "
+"(<literal>APT::ExtractTemplates::TempDir</literal>) directory, with "
+"filenames of the form <filename>package.template.XXXX</filename> and "
+"<filename>package.config.XXXX</filename>"
 msgstr ""
 "plik-template i skrypt-config są zapisywane w katalogu tymczasowym podanym "
 "jako argument opcji <option>-t</option> lub <option>--tempdir</option> "
@@ -2252,18 +1950,8 @@ msgstr ""
 "postaci <filename>pakiet.template.XXXX</filename> oraz <filename>pakiet."
 "config.XXXX</filename>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-extracttemplates.1.xml:55 apt-get.8.xml:448
-msgid "<option>-t</option>"
-msgstr "<option>-t</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-extracttemplates.1.xml:55
-msgid "<option>--tempdir</option>"
-msgstr "<option>--tempdir</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-extracttemplates.1.xml:57
+#: apt-extracttemplates.1.xml:58
 msgid ""
 "Temporary directory in which to write extracted debconf template files and "
 "config scripts.  Configuration Item: <literal>APT::ExtractTemplates::"
@@ -2275,7 +1963,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:74
+#: apt-extracttemplates.1.xml:75
 msgid ""
 "<command>apt-extracttemplates</command> returns zero on normal operation, "
 "decimal 100 on error."
@@ -2332,11 +2020,6 @@ msgid ""
 "output files."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:58
-msgid "packages"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:60
 msgid ""
@@ -2352,11 +2035,6 @@ msgid ""
 "The option <option>--db</option> can be used to specify a binary caching DB."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:68
-msgid "sources"
-msgstr "sources"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:70
 msgid ""
@@ -2374,11 +2052,6 @@ msgid ""
 "change the source override file that will be used."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:80
-msgid "contents"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:82
 msgid ""
@@ -2390,11 +2063,6 @@ msgid ""
 "package is separated by a comma in the output."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:92
-msgid "release"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:94
 msgid ""
@@ -2423,11 +2091,6 @@ msgid ""
 "<literal>Description</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:115
-msgid "generate"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:117
 msgid ""
@@ -2438,11 +2101,6 @@ msgid ""
 "maintaining the required settings."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:124 apt-get.8.xml:215
-msgid "clean"
-msgstr "clean"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:126
 msgid ""
@@ -2487,11 +2145,6 @@ msgid ""
 "to produce a complete an absolute path."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:151
-msgid "ArchiveDir"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:153
 msgid ""
@@ -2500,31 +2153,16 @@ msgid ""
 "nodes."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:158
-msgid "OverrideDir"
-msgstr "OverrideDir"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:160
 msgid "Specifies the location of the override files."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:163
-msgid "CacheDir"
-msgstr "CacheDir"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:165
 msgid "Specifies the location of the cache files"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:168
-msgid "FileListDir"
-msgstr "FileListDir"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:170
 msgid ""
@@ -2545,11 +2183,6 @@ msgid ""
 "override these defaults with a per-section setting."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:182
-msgid "Packages::Compress"
-msgstr "Packages::Compress"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:184
 msgid ""
@@ -2559,11 +2192,6 @@ msgid ""
 "'. gzip'."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:190
-msgid "Packages::Extensions"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:192
 msgid ""
@@ -2571,11 +2199,6 @@ msgid ""
 "defaults to '.deb'."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:196
-msgid "Sources::Compress"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:198
 msgid ""
@@ -2583,11 +2206,6 @@ msgid ""
 "controls the compression for the Sources files."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:202
-msgid "Sources::Extensions"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:204
 msgid ""
@@ -2595,11 +2213,6 @@ msgid ""
 "defaults to '.dsc'."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:208
-msgid "Contents::Compress"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:210
 msgid ""
@@ -2607,13 +2220,6 @@ msgid ""
 "controls the compression for the Contents files."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:214
-#, fuzzy
-#| msgid "Packages::Compress"
-msgid "Translation::Compress"
-msgstr "Packages::Compress"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:216
 msgid ""
@@ -2621,11 +2227,6 @@ msgid ""
 "controls the compression for the Translation-en master file."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:220
-msgid "DeLinkLimit"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:222
 msgid ""
@@ -2634,11 +2235,6 @@ msgid ""
 "Links</literal> setting."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:227
-msgid "FileMode"
-msgstr "FileMode"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:229
 msgid ""
@@ -2646,13 +2242,6 @@ msgid ""
 "index files are set to this mode with no regard to the umask."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:234 apt-ftparchive.1.xml:380
-#, fuzzy
-#| msgid "Description"
-msgid "LongDescription"
-msgstr "Opis"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:236 apt-ftparchive.1.xml:382
 msgid ""
@@ -2673,11 +2262,6 @@ msgid ""
 "$(SECTION) and $(ARCH) replaced with their respective values."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:249
-msgid "MaxContentsChange"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:251
 msgid ""
@@ -2686,11 +2270,6 @@ msgid ""
 "be rebuilt."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:256
-msgid "ContentsAge"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:258
 msgid ""
@@ -2702,11 +2281,6 @@ msgid ""
 "anyhow. The default is 10, the units are in days."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:267
-msgid "Directory"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:269
 msgid ""
@@ -2714,11 +2288,6 @@ msgid ""
 "$(SECTION)/binary-$(ARCH)/</filename>"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:273
-msgid "SrcDirectory"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:275
 msgid ""
@@ -2726,11 +2295,6 @@ msgid ""
 "$(DIST)/$(SECTION)/source/</filename>"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:279 apt-ftparchive.1.xml:418
-msgid "Packages"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:281
 msgid ""
@@ -2738,11 +2302,6 @@ msgid ""
 "binary-$(ARCH)/Packages</filename>"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:285 apt-ftparchive.1.xml:423
-msgid "Sources"
-msgstr "Sources"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:287
 msgid ""
@@ -2750,13 +2309,6 @@ msgid ""
 "source/Sources</filename>"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:291
-#, fuzzy
-#| msgid "Operation"
-msgid "Translation"
-msgstr "Kolejne kroki"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:293
 msgid ""
@@ -2765,11 +2317,6 @@ msgid ""
 "$(SECTION)/i18n/Translation-en</filename>"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:298
-msgid "InternalPrefix"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:300
 msgid ""
@@ -2778,11 +2325,6 @@ msgid ""
 "filename>"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:305 apt-ftparchive.1.xml:429
-msgid "Contents"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:307
 msgid ""
@@ -2792,21 +2334,11 @@ msgid ""
 "command> will integrate those package files together automatically."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:314
-msgid "Contents::Header"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:316
 msgid "Sets header file to prepend to the contents output."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:319 apt-ftparchive.1.xml:454
-msgid "BinCacheDB"
-msgstr "BinCacheDB"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:321
 msgid ""
@@ -2814,11 +2346,6 @@ msgid ""
 "can share the same database."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:325
-msgid "FileList"
-msgstr "FileList"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:327
 msgid ""
@@ -2827,11 +2354,6 @@ msgid ""
 "Relative files names are prefixed with the archive directory."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:332
-msgid "SourceFileList"
-msgstr "SourceFileList"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:334
 msgid ""
@@ -2895,11 +2417,6 @@ msgid ""
 "\" id=\"0\"/>"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:366
-msgid "Sections"
-msgstr "Sections"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:368
 msgid ""
@@ -2908,11 +2425,6 @@ msgid ""
 "free</literal>"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:373 apt.conf.5.xml:157
-msgid "Architectures"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:375
 msgid ""
@@ -2921,12 +2433,6 @@ msgid ""
 "this tree has a source archive."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:386 apt-ftparchive.1.xml:434
-#, fuzzy
-msgid "BinOverride"
-msgstr "BinOverride"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:388
 msgid ""
@@ -2934,11 +2440,6 @@ msgid ""
 "and maintainer address information."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:392 apt-ftparchive.1.xml:439
-msgid "SrcOverride"
-msgstr "SrcOverride"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:394
 msgid ""
@@ -2946,21 +2447,11 @@ msgid ""
 "information."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:398 apt-ftparchive.1.xml:444
-msgid "ExtraOverride"
-msgstr "ExtraOverride"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:400 apt-ftparchive.1.xml:446
 msgid "Sets the binary extra override file."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:403 apt-ftparchive.1.xml:449
-msgid "SrcExtraOverride"
-msgstr "SrcExtraOverride"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:405 apt-ftparchive.1.xml:451
 msgid "Sets the source extra override file."
@@ -3013,21 +2504,11 @@ msgstr ""
 msgid "Sets the cache DB."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:459
-msgid "PathPrefix"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:461
 msgid "Appends a path to all the output paths."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:464
-msgid "FileList, SourceFileList"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:466
 msgid "Specifies the file list file."
@@ -3099,12 +2580,6 @@ msgid ""
 "tag and the remainder of the line is the new value."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:508
-msgid ""
-"<option>--md5</option>, <option>--sha1</option>, <option>--sha256</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:510
 msgid ""
@@ -3119,11 +2594,6 @@ msgid ""
 "<literal>MD5</literal>, <literal>SHA1</literal> or <literal>SHA256</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:519
-msgid "<option>--db</option>"
-msgstr "<option>--db</option>"
-
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:521
@@ -3150,11 +2620,6 @@ msgstr ""
 "option>, nadpisując tym samym opcję z pliku konfiguracyjnego.  Pozycja w "
 "pliku konfiguracyjnym: <literal>quiet</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:533
-msgid "<option>--delink</option>"
-msgstr "<option>--delink</option>"
-
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:535
@@ -3170,11 +2635,6 @@ msgstr ""
 "<option>--no-generate</option>. Pozycja w pliku konfiguracyjnym: "
 "<literal>APT::Cache::Generate</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:541
-msgid "<option>--contents</option>"
-msgstr "<option>--contents</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:543
 msgid ""
@@ -3185,11 +2645,6 @@ msgid ""
 "Configuration Item: <literal>APT::FTPArchive::Contents</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:551
-msgid "<option>--source-override</option>"
-msgstr "<option>--source-override</option>"
-
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:553
@@ -3203,11 +2658,6 @@ msgstr ""
 "literal> tylko do pakietów, które są obecnie zainstalowane.  Pozycja w pliku "
 "konfiguracyjnym: <literal>APT::Cache::Installed</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:557
-msgid "<option>--readonly</option>"
-msgstr "<option>--readonly</option>"
-
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:559
@@ -3219,13 +2669,6 @@ msgstr ""
 "Przeszukaj tylko nazwy pakietów, pomijając szczegółowe opisy.  Pozycja w "
 "pliku konfiguracyjnym: <literal>APT::Cache::NamesOnly</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:563
-#, fuzzy
-#| msgid "<option>-a</option>"
-msgid "<option>--arch</option>"
-msgstr "<option>-a</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:564
 #, fuzzy
@@ -3246,12 +2689,6 @@ msgstr ""
 "zależności. Pozycja w pliku konfiguracyjnym: <literal>APT::Get::"
 "AutomaticRemove</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:570
-#, fuzzy
-msgid "<option>APT::FTPArchive::AlwaysStat</option>"
-msgstr "<option>--version</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:572
 msgid ""
@@ -3266,12 +2703,6 @@ msgid ""
 "are useless."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:582
-#, fuzzy
-msgid "<option>APT::FTPArchive::LongDescription</option>"
-msgstr "<option>--version</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:584
 msgid ""
@@ -3283,7 +2714,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:596 apt.conf.5.xml:1113 apt_preferences.5.xml:544
+#: apt-ftparchive.1.xml:596 apt.conf.5.xml:1113 apt_preferences.5.xml:545
 #: sources.list.5.xml:214
 msgid "Examples"
 msgstr "Przykłady"
@@ -3353,11 +2784,6 @@ msgstr ""
 "użytkownika, takich jak &dselect;, &aptitude;, &synaptic;, &gnome-apt; oraz "
 "&wajig;."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:48 apt-key.8.xml:119
-msgid "update"
-msgstr "update"
-
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:49
@@ -3383,11 +2809,6 @@ msgstr ""
 "całkowitego postępu operacji jest błędny, ponieważ rozmiar plików "
 "<filename>Packages.gz</filename> nie jest wcześniej znany."
 
-#. type: <tag></tag>
-#: apt-get.8.xml:60 guide.sgml:121
-msgid "upgrade"
-msgstr "upgrade"
-
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:61
@@ -3414,11 +2835,6 @@ msgstr ""
 "get</command> wiedział, że są dostępne nowe wersje pakietów, należy "
 "wcześniej wykonać <literal>update</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:73
-msgid "dselect-upgrade"
-msgstr "dselect-upgrade"
-
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:74
@@ -3438,11 +2854,6 @@ msgstr ""
 "zrealizowania tych zmian (na przykład: usunięcie starych pakietów i dodanie "
 "nowych)."
 
-#. type: <tag></tag>
-#: apt-get.8.xml:83 guide.sgml:140
-msgid "dist-upgrade"
-msgstr "dist-upgrade"
-
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:84
@@ -3468,11 +2879,6 @@ msgstr ""
 "znajduje się tam opis mechanizmu nadpisywania globalnych ustawień dla "
 "poszczególnych pakietów."
 
-#. type: <tag></tag>
-#: apt-get.8.xml:96 guide.sgml:131
-msgid "install"
-msgstr "install"
-
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:98
@@ -3584,11 +2990,6 @@ msgstr ""
 "początek lub koniec dopasowania wyrażenia regularnego, używając znaków \"^| "
 "lub \"$\", można też stworzyć bardziej specyficzne wyrażenie regularne."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:150
-msgid "remove"
-msgstr "remove"
-
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:151
@@ -3604,11 +3005,6 @@ msgstr ""
 "zostanie poprzedzona znakiem plusa (bez rozdzielającej spacji), wskazany "
 "pakiet zostanie zainstalowany zamiast zostać usunięty."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:158
-msgid "purge"
-msgstr "purge"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:159
 msgid ""
@@ -3620,11 +3016,6 @@ msgstr ""
 "różnicą, że pakiety są po usunięciu czyszczone (czyli usuwane są również "
 "wszystkie pliki konfiguracyjne)."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:163
-msgid "source"
-msgstr "source"
-
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:164
@@ -3710,11 +3101,6 @@ msgstr ""
 "przechowywane tylko w bieżącym katalogu, mniej więcej tak, jakby zostały "
 "ściągnięte oryginalne źródła programu ze strony jego autorów."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:197
-msgid "build-dep"
-msgstr "build-dep"
-
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:198
@@ -3733,11 +3119,6 @@ msgstr ""
 "tak, żeby spełnić zależności wymagane do zbudowania danego pakietu "
 "źródłowego."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:204
-msgid "check"
-msgstr "check"
-
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:205
@@ -3748,11 +3129,6 @@ msgstr ""
 "<literal>check</literal> jest poleceniem diagnostycznym, które odświeża "
 "bufor (cache) pakietów i szuka zepsutych pakietów."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:209
-msgid "download"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:210
 msgid ""
@@ -3780,11 +3156,6 @@ msgstr ""
 "dselect, powinny od czasu do czasu uruchamiać <literal>apt-get clean</"
 "literal>, aby zwolnić trochę miejsca na dysku."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:225
-msgid "autoclean"
-msgstr "autoclean"
-
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:226
@@ -3806,11 +3177,6 @@ msgstr ""
 "<literal>APT::Clean-Installed</literal> zapobiegnie usuwaniu plików "
 "zawierających zainstalowane pakiety."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:235
-msgid "autoremove"
-msgstr "autoremove"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:236
 #, fuzzy
@@ -3827,29 +3193,20 @@ msgstr ""
 "zostały zainstalowane automatycznie, żeby rozwiązać zależności, i nie są już "
 "potrzebne."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:240
-msgid "changelog"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:241
 msgid ""
 "<literal>changelog</literal> downloads a package changelog and displays it "
 "through <command>sensible-pager</command>. The server name and base "
 "directory is defined in the <literal>APT::Changelogs::Server</literal> "
-"variable (e. g. <ulink>http://packages.debian.org/changelogs</ulink> for "
-"Debian or <ulink>http://changelogs.ubuntu.com/changelogs</ulink> for "
-"Ubuntu).  By default it displays the changelog for the version that is "
+"variable (e. g. <ulink url=\"http://packages.debian.org/changelogs"
+"\">packages.debian.org/changelogs</ulink> for Debian or <ulink url=\"http://"
+"changelogs.ubuntu.com/changelogs\">changelogs.ubuntu.com/changelogs</ulink> "
+"for Ubuntu).  By default it displays the changelog for the version that is "
 "installed.  However, you can specify the same options as for the "
 "<option>install</option> command."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:263
-msgid "<option>--no-install-recommends</option>"
-msgstr "<option>--no-install-recommends</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:264
 msgid ""
@@ -3859,13 +3216,6 @@ msgstr ""
 "Nie rozpatruje rekomendowanych pakietów jako zależności do instalacji. "
 "Pozycja w pliku konfiguracyjnym: <literal>APT::Install-Recommends</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:268
-#, fuzzy
-#| msgid "<option>--no-upgrade</option>"
-msgid "<option>--install-suggests</option>"
-msgstr "<option>--no-upgrade</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:269
 #, fuzzy
@@ -3879,11 +3229,6 @@ msgstr ""
 "Nie rozpatruje rekomendowanych pakietów jako zależności do instalacji. "
 "Pozycja w pliku konfiguracyjnym: <literal>APT::Install-Recommends</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:273
-msgid "<option>--download-only</option>"
-msgstr "<option>--download-only</option>"
-
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:274
@@ -3895,11 +3240,6 @@ msgstr ""
 "czy instalowane.  Pozycja w pliku konfiguracyjnym: <literal>APT::Get::"
 "Download-Only</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:278
-msgid "<option>--fix-broken</option>"
-msgstr "<option>--fix-broken</option>"
-
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:279
@@ -3928,16 +3268,6 @@ msgstr ""
 "opcji łącznie z <option>-m</option> może spowodować błąd. Pozycja w pliku "
 "konfiguracyjnym: <literal>APT::Get::Fix-Broken</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:292
-msgid "<option>--ignore-missing</option>"
-msgstr "<option>--ignore-missing</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:293
-msgid "<option>--fix-missing</option>"
-msgstr "<option>--fix-missing</option>"
-
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:294
@@ -3958,11 +3288,6 @@ msgstr ""
 "ale nie może zostać pobrany, zostanie pominięty. Pozycja w pliku "
 "konfiguracyjnym: <literal>APT::Get::Fix-Missing</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:304
-msgid "<option>--no-download</option>"
-msgstr "<option>--no-download</option>"
-
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:305
@@ -3997,16 +3322,6 @@ msgstr ""
 "gdyż APT może zadecydować o zrobieniu czegoś, czego użytkownik się nie "
 "spodziewa.  Pozycja w pliku konfiguracyjnym: <literal>quiet</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:322
-msgid "<option>--simulate</option>"
-msgstr "<option>--simulate</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:324
-msgid "<option>--dry-run</option>"
-msgstr "<option>--dry-run</option>"
-
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:327
@@ -4053,21 +3368,6 @@ msgstr ""
 "puste nawiasy kwadratowe oznaczają, że przyczyna zepsucia pakietu nie jest "
 "znana (rzadkość)."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:344
-msgid "<option>-y</option>"
-msgstr "<option>-y</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:344
-msgid "<option>--yes</option>"
-msgstr "<option>--yes</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:345
-msgid "<option>--assume-yes</option>"
-msgstr "<option>--assume-yes</option>"
-
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:346
@@ -4085,13 +3385,6 @@ msgstr ""
 "przerwie działanie.  Pozycja w pliku konfiguracyjnym: <literal>APT::Get::"
 "Assume-Yes</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:353
-#, fuzzy
-#| msgid "<option>--assume-yes</option>"
-msgid "<option>--assume-no</option>"
-msgstr "<option>--assume-yes</option>"
-
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:354
@@ -4106,16 +3399,6 @@ msgstr ""
 "Skompiluj pakiety źródłowe po ich ściągnięciu.  Pozycja w pliku "
 "konfiguracyjnym: <literal>APT::Get::Compile</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:358
-msgid "<option>-u</option>"
-msgstr "<option>-u</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:358
-msgid "<option>--show-upgraded</option>"
-msgstr "<option>--show-upgraded</option>"
-
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:359
@@ -4127,16 +3410,6 @@ msgstr ""
 "będą uaktualnione. Pozycja w pliku konfiguracyjnym: <literal>APT::Get::Show-"
 "Upgraded</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:364
-msgid "<option>-V</option>"
-msgstr "<option>-V</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:364
-msgid "<option>--verbose-versions</option>"
-msgstr "<option>--verbose-versions</option>"
-
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:365
@@ -4147,13 +3420,6 @@ msgstr ""
 "Wyświetla pełne wersje aktualizowanych pakietów Pozycja w pliku "
 "konfiguracyjnym: <literal>APT::Get::Show-Versions</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:370
-#, fuzzy
-#| msgid "<option>--recurse</option>"
-msgid "<option>--host-architecture</option>"
-msgstr "<option>--recurse</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:371
 msgid ""
@@ -4165,21 +3431,6 @@ msgid ""
 "Architecture</literal>"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:379
-msgid "<option>-b</option>"
-msgstr "<option>-b</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:379
-msgid "<option>--compile</option>"
-msgstr "<option>--compile</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:380
-msgid "<option>--build</option>"
-msgstr "<option>--build</option>"
-
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:381
@@ -4190,11 +3441,6 @@ msgstr ""
 "Skompiluj pakiety źródłowe po ich ściągnięciu.  Pozycja w pliku "
 "konfiguracyjnym: <literal>APT::Get::Compile</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:385
-msgid "<option>--ignore-hold</option>"
-msgstr "<option>--ignore-hold</option>"
-
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:386
@@ -4210,11 +3456,6 @@ msgstr ""
 "dużej liczby niepożądanych wstrzymań.  Pozycja w pliku konfiguracyjnym: "
 "<literal>APT::Ignore-Hold</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:392
-msgid "<option>--no-upgrade</option>"
-msgstr "<option>--no-upgrade</option>"
-
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:393
@@ -4229,13 +3470,6 @@ msgstr ""
 "zainstalowane, nie zostaną zaktualizowane.  Pozycja w pliku konfiguracyjnym: "
 "<literal>APT::Get::Upgrade</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:399
-#, fuzzy
-#| msgid "<option>--no-upgrade</option>"
-msgid "<option>--only-upgrade</option>"
-msgstr "<option>--no-upgrade</option>"
-
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:400
@@ -4256,11 +3490,6 @@ msgstr ""
 "zainstalowane, nie zostaną zaktualizowane.  Pozycja w pliku konfiguracyjnym: "
 "<literal>APT::Get::Upgrade</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:407
-msgid "<option>--force-yes</option>"
-msgstr "<option>--force-yes</option>"
-
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:408
@@ -4278,11 +3507,6 @@ msgstr ""
 "zniszczyć Twój system! Pozycja w pliku konfiguracyjnym: <literal>APT::Get::"
 "force-yes</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:415
-msgid "<option>--print-uris</option>"
-msgstr "<option>--print-uris</option>"
-
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:416
@@ -4306,11 +3530,6 @@ msgstr ""
 "plików. Pozycja w pliku konfiguracyjnym: <literal>APT::Get::Print-URIs</"
 "literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:426
-msgid "<option>--purge</option>"
-msgstr "<option>--purge</option>"
-
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:427
@@ -4326,11 +3545,6 @@ msgstr ""
 "option> jest odpowiednikiem polecenia <option>purge</option>. Pozycja w "
 "pliku konfiguracyjnym: <literal>APT::Get::Purge</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:434
-msgid "<option>--reinstall</option>"
-msgstr "<option>--reinstall</option>"
-
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:435
@@ -4341,11 +3555,6 @@ msgstr ""
 "Ponownie instaluje pakiety, których najnowsza wersja już jest zainstalowana "
 "Pozycja w pliku konfiguracyjnym: <literal>APT::Get::ReInstall</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:439
-msgid "<option>--list-cleanup</option>"
-msgstr "<option>--list-cleanup</option>"
-
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:440
@@ -4364,16 +3573,6 @@ msgstr ""
 "wyłączenia mogłyby być częste zmiany w sources.list.  Pozycja w pliku "
 "konfiguracyjnym: <literal>APT::Get::List-Cleanup</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:449
-msgid "<option>--target-release</option>"
-msgstr "<option>--target-release</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:450
-msgid "<option>--default-release</option>"
-msgstr "<option>--default-release</option>"
-
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:451
@@ -4398,11 +3597,6 @@ msgstr ""
 "pliku konfiguracyjnym: <literal>APT::Default-Release</literal>; zobacz także "
 "stronę podręcznika &apt-preferences;."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:464
-msgid "<option>--trivial-only</option>"
-msgstr "<option>--trivial-only</option>"
-
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:466
@@ -4418,11 +3612,6 @@ msgstr ""
 "option> odpowie \"nie\".  Pozycja w pliku konfiguracyjnym: <literal>APT::"
 "Get::Trivial-Only</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:472
-msgid "<option>--no-remove</option>"
-msgstr "<option>--no-remove</option>"
-
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:473
@@ -4434,11 +3623,6 @@ msgstr ""
 "działanie.  Pozycja w pliku konfiguracyjnym: <literal>APT::Get::Remove</"
 "literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:478
-msgid "<option>--auto-remove</option>"
-msgstr "<option>--auto-remove</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:479
 msgid ""
@@ -4453,11 +3637,6 @@ msgstr ""
 "zależności. Pozycja w pliku konfiguracyjnym: <literal>APT::Get::"
 "AutomaticRemove</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:485
-msgid "<option>--only-source</option>"
-msgstr "<option>--only-source</option>"
-
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:486
@@ -4478,21 +3657,6 @@ msgstr ""
 "im pakietów źródłowych. Pozycja w pliku konfiguracyjnym: <literal>APT::Get::"
 "Only-Source</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:496
-msgid "<option>--diff-only</option>"
-msgstr "<option>--diff-only</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:496
-msgid "<option>--dsc-only</option>"
-msgstr "<option>--dsc-only</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:496
-msgid "<option>--tar-only</option>"
-msgstr "<option>--tar-only</option>"
-
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:497
@@ -4505,11 +3669,6 @@ msgstr ""
 "konfiguracyjnym:  <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::"
 "Dsc-Only</literal> oraz <literal>APT::Get::Tar-Only</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:502
-msgid "<option>--arch-only</option>"
-msgstr "<option>--arch-only</option>"
-
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:503
@@ -4522,11 +3681,6 @@ msgstr ""
 "komputera.  Pozycja w pliku konfiguracyjnym: <literal>APT::Get::Arch-Only</"
 "literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:507
-msgid "<option>--allow-unauthenticated</option>"
-msgstr "<option>--allow-unauthenticated</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:508
 msgid ""
@@ -4617,11 +3771,6 @@ msgstr ""
 msgid "Commands"
 msgstr "Polecenia"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:40
-msgid "add &synopsis-param-filename;"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml:43
 #, fuzzy
@@ -4638,21 +3787,11 @@ msgstr ""
 "<replaceable>nazwy_pliku</replaceable> lub ze standardowego wejścia, jeśli "
 "zamiast <replaceable>nazwy_pliku</replaceable> podano <literal>-</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:52
-msgid "del &synopsis-param-keyid;"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml:56
 msgid "Remove a key from the list of trusted keys."
 msgstr "Usuwa klucz z listy zaufanych kluczy."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:63
-msgid "export &synopsis-param-keyid;"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml:67
 #, fuzzy
@@ -4662,41 +3801,21 @@ msgstr ""
 "Wyświetla klucz o podanym <replaceable>id_klucza</replaceable> na "
 "standardowe wyjście."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:74
-msgid "exportall"
-msgstr "exportall"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml:78
 msgid "Output all trusted keys to standard output."
 msgstr "Wypisuje na standardowe wyjście wszystkie zaufane klucze."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:85
-msgid "list"
-msgstr "list"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml:89
 msgid "List trusted keys."
 msgstr "Wyświetla listę zaufanych kluczy."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:96
-msgid "finger"
-msgstr "finger"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml:100
 msgid "List fingerprints of trusted keys."
 msgstr "Wyświetla listę odcisków zaufanych kluczy."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:107
-msgid "adv"
-msgstr "adv"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml:111
 msgid ""
@@ -4716,13 +3835,6 @@ msgid ""
 "Debian."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:133
-#, fuzzy
-#| msgid "update"
-msgid "net-update"
-msgstr "update"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml:137
 msgid ""
@@ -4743,11 +3855,6 @@ msgstr ""
 "Proszę zauważyć, że poniższe opcje muszą być podane przed poleceniami "
 "opisanymi w poprzednim rozdziale."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:156
-msgid "--keyring &synopsis-param-filename;"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml:157
 #, fuzzy
@@ -4863,13 +3970,6 @@ msgstr ""
 "pakiet od nich nie zależy), zostaną usunięte przez na przykład <command>apt-"
 "get</command> lub <command>aptitude</command>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:51
-#, fuzzy
-#| msgid "markauto"
-msgid "auto"
-msgstr "markauto"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml:52
 #, fuzzy
@@ -4886,11 +3986,6 @@ msgstr ""
 "zainstalowanego automatycznie, co spowoduje jego usunięcie, w sytuacji gdy "
 "żaden inny ręcznie zainstalowany pakiet nie będzie od niego zależał."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:59
-msgid "manual"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml:60
 #, fuzzy
@@ -4907,11 +4002,6 @@ msgstr ""
 "zainstalowanego ręcznie, co go uchroni przed automatycznym usunięciem, w "
 "sytuacji gdy żaden inny pakiet nie będzie od niego zależał."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:67
-msgid "hold"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml:68
 msgid ""
@@ -4922,11 +4012,6 @@ msgid ""
 "effected by the <option>--filename</option> option."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:77
-msgid "unhold"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml:78
 #, fuzzy
@@ -4941,11 +4026,6 @@ msgstr ""
 "pakietów zainstalowanych automatycznie. Każdy pakiet jest wypisywany w "
 "osobnej linii."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:83
-msgid "showauto"
-msgstr "showauto"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml:84
 #, fuzzy
@@ -4962,13 +4042,6 @@ msgstr ""
 "pakietów zainstalowanych automatycznie. Każdy pakiet jest wypisywany w "
 "osobnej linii."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:91
-#, fuzzy
-#| msgid "showauto"
-msgid "showmanual"
-msgstr "showauto"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml:92
 msgid ""
@@ -4977,13 +4050,6 @@ msgid ""
 "installed packages instead."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:98
-#, fuzzy
-#| msgid "showauto"
-msgid "showhold"
-msgstr "showauto"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml:99
 #, fuzzy
@@ -4998,30 +4064,27 @@ msgstr ""
 "pakietów zainstalowanych automatycznie. Każdy pakiet jest wypisywany w "
 "osobnej linii."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:112
-msgid ""
-"<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>"
-msgstr ""
-"<option>-f=<filename><replaceable>nazwa-pliku</replaceable></filename></"
-"option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:113
-msgid ""
-"<option>--file=<filename><replaceable>FILENAME</replaceable></filename></"
-"option>"
-msgstr ""
-"<option>--file=<filename><replaceable>NAZWA_PLIKU</replaceable></filename></"
-"option>"
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><filename>
+#: apt-mark.8.xml:112 apt-mark.8.xml:113
+#, fuzzy
+#| msgid "xvcg <replaceable>pkg(s)</replaceable>"
+msgid "<replaceable>&synopsis-filename;</replaceable>"
+msgstr "xvcg <replaceable>pakiet(y)</replaceable>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:116
-msgid ""
-"Read/Write package stats from <filename><replaceable>FILENAME</replaceable></"
-"filename> instead of the default location, which is "
-"<filename>extended_status</filename> in the directory defined by the "
-"Configuration Item: <literal>Dir::State</literal>."
+#: apt-mark.8.xml:115
+#, fuzzy
+#| msgid ""
+#| "Read/Write package stats from <filename><replaceable>FILENAME</"
+#| "replaceable></filename> instead of the default location, which is "
+#| "<filename>extended_status</filename> in the directory defined by the "
+#| "Configuration Item: <literal>Dir::State</literal>."
+msgid ""
+"Read/Write package stats from the filename given with the parameter "
+"<filename><replaceable>&synopsis-filename;</replaceable></filename> instead "
+"of from the default location, which is <filename>extended_status</filename> "
+"in the directory defined by the Configuration Item: <literal>Dir::State</"
+"literal>."
 msgstr ""
 "Informacje o stanie pakietów są czytane z (lub zapisywane do) pliku o "
 "podanej <replaceable>NAZWIE_PLIKU</replaceable>. Nie jest wtedy używana "
@@ -5309,11 +4372,6 @@ msgstr ""
 "Wyjście programu jest wypisywane na standardowe wyjście, wejście musi "
 "pochodzić z pliku."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-sortpkgs.1.xml:52
-msgid "<option>--source</option>"
-msgstr "<option>--source</option>"
-
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-sortpkgs.1.xml:54
@@ -5576,11 +4634,6 @@ msgid ""
 "options for all of the tools."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:151
-msgid "Architecture"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:152
 msgid ""
@@ -5602,11 +4655,6 @@ msgid ""
 "architectures</command>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:167
-msgid "Default-Release"
-msgstr "Default-Release"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:168
 msgid ""
@@ -5616,11 +4664,6 @@ msgid ""
 "'5.0*'. See also &apt-preferences;."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:173
-msgid "Ignore-Hold"
-msgstr "Ignore-Hold"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:174
 msgid ""
@@ -5628,12 +4671,6 @@ msgid ""
 "ignore held packages in its decision making."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:178
-#, fuzzy
-msgid "Clean-Installed"
-msgstr "B<--installed>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:179
 msgid ""
@@ -5643,11 +4680,6 @@ msgid ""
 "but note that APT provides no direct means to reinstall them."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:185
-msgid "Immediate-Configure"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:186
 msgid ""
@@ -5681,11 +4713,6 @@ msgid ""
 "improving or correcting the upgrade process."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:208
-msgid "Force-LoopBreak"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:209
 msgid ""
@@ -5697,11 +4724,6 @@ msgid ""
 "those packages depend on."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:217
-msgid "Cache-Start, Cache-Grow and Cache-Limit"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:218
 msgid ""
@@ -5722,21 +4744,11 @@ msgid ""
 "automatic grow of the cache is disabled."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:233
-msgid "Build-Essential"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:234
 msgid "Defines which package(s) are considered essential build dependencies."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:237
-msgid "Get"
-msgstr "Get"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:238
 msgid ""
@@ -5744,11 +4756,6 @@ msgid ""
 "for more information about the options here."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:242
-msgid "Cache"
-msgstr "Cache"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:243
 msgid ""
@@ -5756,11 +4763,6 @@ msgid ""
 "documentation for more information about the options here."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:247
-msgid "CDROM"
-msgstr "CDROM"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:248
 msgid ""
@@ -5773,11 +4775,6 @@ msgstr ""
 msgid "The Acquire Group"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:259
-msgid "Check-Valid-Until"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:260
 msgid ""
@@ -5790,11 +4787,6 @@ msgid ""
 "<literal>Max-ValidTime</literal> option can be used."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:270
-msgid "Max-ValidTime"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:271
 msgid ""
@@ -5806,11 +4798,6 @@ msgid ""
 "be made by appending the label of the archive to the option name."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:281
-msgid "Min-ValidTime"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:282
 msgid ""
@@ -5822,11 +4809,6 @@ msgid ""
 "should be used by appending the label of the archive to the option name."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:292
-msgid "PDiffs"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:293
 msgid ""
@@ -5845,11 +4827,6 @@ msgid ""
 "complete file is downloaded instead of the patches."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:305
-msgid "Queue-Mode"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:306
 msgid ""
@@ -5860,11 +4837,6 @@ msgid ""
 "connection per URI type will be opened."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:313
-msgid "Retries"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:314
 msgid ""
@@ -5872,12 +4844,6 @@ msgid ""
 "files the given number of times."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:318
-#, fuzzy
-msgid "Source-Symlinks"
-msgstr "Sources"
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:319
 msgid ""
@@ -5885,11 +4851,6 @@ msgid ""
 "be symlinked when possible instead of copying. True is the default."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:323 sources.list.5.xml:160
-msgid "http"
-msgstr "http"
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:324
 msgid ""
@@ -5960,11 +4921,6 @@ msgid ""
 "clients only if the client uses a known identifier."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:366
-msgid "https"
-msgstr "https"
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:367
 msgid ""
@@ -5996,11 +4952,6 @@ msgid ""
 "option."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:391 sources.list.5.xml:171
-msgid "ftp"
-msgstr "ftp"
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:392
 msgid ""
@@ -6049,11 +5000,6 @@ msgid ""
 "that most FTP servers do not support RFC2428."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:430 sources.list.5.xml:153
-msgid "cdrom"
-msgstr "cdrom"
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
 #: apt.conf.5.xml:436
 #, no-wrap
@@ -6073,11 +5019,6 @@ msgid ""
 "can be specified using UMount."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:441
-msgid "gpgv"
-msgstr "gpgv"
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:442
 msgid ""
@@ -6086,11 +5027,6 @@ msgid ""
 "passed to gpgv."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:447
-msgid "CompressionTypes"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
 #: apt.conf.5.xml:453
 #, no-wrap
@@ -6167,11 +5103,6 @@ msgid ""
 "uncompressed files so this is mostly only useable for local mirrors."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:475
-msgid "GzipIndexes"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:477
 msgid ""
@@ -6181,11 +5112,6 @@ msgid ""
 "CPU requirements when building the local package caches. False by default."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:484
-msgid "Languages"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:485
 msgid ""
@@ -6340,12 +5266,6 @@ msgid ""
 "section."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:577
-#, fuzzy
-msgid "Clean"
-msgstr "B<clean>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:578
 msgid ""
@@ -6364,12 +5284,6 @@ msgid ""
 "when it is run for the install phase."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:591
-#, fuzzy
-msgid "Updateoptions"
-msgstr "opcje"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:592
 msgid ""
@@ -6377,11 +5291,6 @@ msgid ""
 "when it is run for the update phase."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:596
-msgid "PromptAfterUpdate"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:597
 msgid ""
@@ -6409,16 +5318,6 @@ msgid ""
 "&dpkg;."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:614
-msgid "Pre-Invoke"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:614
-msgid "Post-Invoke"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:615
 msgid ""
@@ -6428,11 +5327,6 @@ msgid ""
 "fail APT will abort."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:621
-msgid "Pre-Install-Pkgs"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:622
 msgid ""
@@ -6453,11 +5347,6 @@ msgid ""
 "given to <literal>Pre-Install-Pkgs</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:635
-msgid "Run-Directory"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:636
 msgid ""
@@ -6465,12 +5354,6 @@ msgid ""
 "</filename>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:640
-#, fuzzy
-msgid "Build-options"
-msgstr "opcje"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:641
 msgid ""
@@ -6526,11 +5409,6 @@ msgid ""
 "would be <placeholder type=\"literallayout\" id=\"0\"/>"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:668
-msgid "DPkg::NoTriggers"
-msgstr "DPkg::NoTriggers"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:669
 msgid ""
@@ -6543,11 +5421,6 @@ msgid ""
 "dpkg - now apt will add these flag also to the unpack and remove calls."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:676
-msgid "PackageManager::Configure"
-msgstr "PackageManager::Configure"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:677
 msgid ""
@@ -6564,11 +5437,6 @@ msgid ""
 "the system could end in an unconfigured status which could be unbootable!"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:687
-msgid "DPkg::ConfigurePending"
-msgstr "DPkg::ConfigurePending"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:688
 msgid ""
@@ -6580,11 +5448,6 @@ msgid ""
 "you could deactivate this option in all but the last run."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:694
-msgid "DPkg::TriggersPending"
-msgstr "DPkg::TriggersPending"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:695
 msgid ""
@@ -6595,11 +5458,6 @@ msgid ""
 "triggers, not only the triggers needed to configure this package."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:700
-msgid "PackageManager::UnpackAll"
-msgstr "PackageManager::UnpackAll"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:701
 msgid ""
@@ -6612,11 +5470,6 @@ msgid ""
 "really useful."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:708
-msgid "OrderList::Score::Immediate"
-msgstr "OrderList::Score::Immediate"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
 #: apt.conf.5.xml:716
 #, no-wrap
@@ -6721,52 +5574,27 @@ msgstr ""
 msgid "A full list of debugging options to apt follows."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:791
-msgid "<literal>Debug::Acquire::cdrom</literal>"
-msgstr "<literal>Debug::Acquire::cdrom</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:795
 msgid ""
 "Print information related to accessing <literal>cdrom://</literal> sources."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:802
-msgid "<literal>Debug::Acquire::ftp</literal>"
-msgstr "<literal>Debug::Acquire::ftp</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:806
 msgid "Print information related to downloading packages using FTP."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:813
-msgid "<literal>Debug::Acquire::http</literal>"
-msgstr "<literal>Debug::Acquire::http</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:817
 msgid "Print information related to downloading packages using HTTP."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:824
-msgid "<literal>Debug::Acquire::https</literal>"
-msgstr "<literal>Debug::Acquire::https</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:828
 msgid "Print information related to downloading packages using HTTPS."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:835
-msgid "<literal>Debug::Acquire::gpgv</literal>"
-msgstr "<literal>Debug::Acquire::gpgv</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:839
 msgid ""
@@ -6774,11 +5602,6 @@ msgid ""
 "<literal>gpg</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:846
-msgid "<literal>Debug::aptcdrom</literal>"
-msgstr "<literal>Debug::aptcdrom</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:850
 msgid ""
@@ -6786,21 +5609,11 @@ msgid ""
 "stored on CD-ROMs."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:857
-msgid "<literal>Debug::BuildDeps</literal>"
-msgstr "<literal>Debug::BuildDeps</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:860
 msgid "Describes the process of resolving build-dependencies in &apt-get;."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:867
-msgid "<literal>Debug::Hashes</literal>"
-msgstr "<literal>Debug::Hashes</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:870
 msgid ""
@@ -6808,11 +5621,6 @@ msgid ""
 "literal> libraries."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:877
-msgid "<literal>Debug::IdentCDROM</literal>"
-msgstr "<literal>Debug::IdentCDROM</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:880
 msgid ""
@@ -6821,11 +5629,6 @@ msgid ""
 "a CD-ROM."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:888
-msgid "<literal>Debug::NoLocking</literal>"
-msgstr "<literal>Debug::NoLocking</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:891
 msgid ""
@@ -6833,21 +5636,11 @@ msgid ""
 "<quote><literal>apt-get update</literal></quote> to run at the same time."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:899
-msgid "<literal>Debug::pkgAcquire</literal>"
-msgstr "<literal>Debug::pkgAcquire</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:903
 msgid "Log when items are added to or removed from the global download queue."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:910
-msgid "<literal>Debug::pkgAcquire::Auth</literal>"
-msgstr "<literal>Debug::pkgAcquire::Auth</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:913
 msgid ""
@@ -6855,11 +5648,6 @@ msgid ""
 "cryptographic signatures of downloaded files."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:920
-msgid "<literal>Debug::pkgAcquire::Diffs</literal>"
-msgstr "<literal>Debug::pkgAcquire::Diffs</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:923
 msgid ""
@@ -6867,11 +5655,6 @@ msgid ""
 "and errors relating to package index list diffs."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:931
-msgid "<literal>Debug::pkgAcquire::RRed</literal>"
-msgstr "<literal>Debug::pkgAcquire::RRed</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:935
 msgid ""
@@ -6879,22 +5662,12 @@ msgid ""
 "index diffs instead of full indices."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:942
-msgid "<literal>Debug::pkgAcquire::Worker</literal>"
-msgstr "<literal>Debug::pkgAcquire::Worker</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:946
 msgid ""
 "Log all interactions with the sub-processes that actually perform downloads."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:953
-msgid "<literal>Debug::pkgAutoRemove</literal>"
-msgstr "<literal>Debug::pkgAutoRemove</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:957
 msgid ""
@@ -6902,11 +5675,6 @@ msgid ""
 "the removal of unused packages."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:964
-msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>"
-msgstr "<literal>Debug::pkgDepCache::AutoInstall</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:967
 msgid ""
@@ -6917,11 +5685,6 @@ msgid ""
 "pkgProblemResolver</literal> for that."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:978
-msgid "<literal>Debug::pkgDepCache::Marker</literal>"
-msgstr "<literal>Debug::pkgDepCache::Marker</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:981
 msgid ""
@@ -6939,21 +5702,11 @@ msgid ""
 "<literal>section</literal> is the name of the section the package appears in."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1000
-msgid "<literal>Debug::pkgInitConfig</literal>"
-msgstr "<literal>Debug::pkgInitConfig</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:1003
 msgid "Dump the default configuration to standard error on startup."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1010
-msgid "<literal>Debug::pkgDPkgPM</literal>"
-msgstr "<literal>Debug::pkgDPkgPM</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:1013
 msgid ""
@@ -6961,11 +5714,6 @@ msgid ""
 "invoked, with arguments separated by a single space character."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1021
-msgid "<literal>Debug::pkgDPkgProgressReporting</literal>"
-msgstr "<literal>Debug::pkgDPkgProgressReporting</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:1024
 msgid ""
@@ -6973,11 +5721,6 @@ msgid ""
 "any errors encountered while parsing it."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1031
-msgid "<literal>Debug::pkgOrderList</literal>"
-msgstr "<literal>Debug::pkgOrderList</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:1035
 msgid ""
@@ -6985,32 +5728,17 @@ msgid ""
 "<literal>apt</literal> should pass packages to &dpkg;."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1043
-msgid "<literal>Debug::pkgPackageManager</literal>"
-msgstr "<literal>Debug::pkgPackageManager</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:1047
 msgid ""
 "Output status messages tracing the steps performed when invoking &dpkg;."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1054
-msgid "<literal>Debug::pkgPolicy</literal>"
-msgstr "<literal>Debug::pkgPolicy</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:1058
 msgid "Output the priority of each package list on startup."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1064
-msgid "<literal>Debug::pkgProblemResolver</literal>"
-msgstr "<literal>Debug::pkgProblemResolver</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:1068
 msgid ""
@@ -7018,11 +5746,6 @@ msgid ""
 "happens when a complex dependency problem is encountered)."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1076
-msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>"
-msgstr "<literal>Debug::pkgProblemResolver::ShowScores</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:1079
 msgid ""
@@ -7031,11 +5754,6 @@ msgid ""
 "described in <literal>Debug::pkgDepCache::Marker</literal>"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1087
-msgid "<literal>Debug::sourceList</literal>"
-msgstr "<literal>Debug::sourceList</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:1091
 msgid ""
@@ -7546,28 +6264,29 @@ msgstr ""
 "Pin: release a=unstable\n"
 "Pin-Priority: 50\n"
 
-#. type: Content of: <refentry><refsect1><refsect2><literal>
-#: apt_preferences.5.xml:290
-msgid "Package"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><literal>
-#: apt_preferences.5.xml:296
-msgid "*"
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt_preferences.5.xml:291
+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 "
+"of all package names it matches. It is undecided whether this will change in "
+"the future, thus you should always list wild-card pins first, so later "
+"specific pins override it.  The pattern \"<literal>*</literal>\" in a "
+"Package field is not considered a glob() expression in itself."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:306
+#: apt_preferences.5.xml:307
 msgid "How APT Interprets Priorities"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:314
+#: apt_preferences.5.xml:315
 msgid "P &gt; 1000"
 msgstr "P &gt; 1000"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:315
+#: apt_preferences.5.xml:316
 #, fuzzy
 msgid ""
 "causes a version to be installed even if this constitutes a downgrade of the "
@@ -7577,12 +6296,12 @@ msgstr ""
 "pakietu nie jest jeszcze zainstalowana"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:319
+#: apt_preferences.5.xml:320
 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:320
+#: apt_preferences.5.xml:321
 #, fuzzy
 msgid ""
 "causes a version to be installed even if it does not come from the target "
@@ -7592,12 +6311,12 @@ msgstr ""
 "pakietu nie jest jeszcze zainstalowana"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:325
+#: apt_preferences.5.xml:326
 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:326
+#: apt_preferences.5.xml:327
 #, fuzzy
 msgid ""
 "causes a version to be installed unless there is a version available "
@@ -7607,12 +6326,12 @@ msgstr ""
 "pakietu nie jest jeszcze zainstalowana"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:331
+#: apt_preferences.5.xml:332
 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:332
+#: apt_preferences.5.xml:333
 #, fuzzy
 msgid ""
 "causes a version to be installed unless there is a version available "
@@ -7622,12 +6341,12 @@ msgstr ""
 "pakietu nie jest jeszcze zainstalowana"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:337
+#: apt_preferences.5.xml:338
 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:338
+#: apt_preferences.5.xml:339
 msgid ""
 "causes a version to be installed only if there is no installed version of "
 "the package"
@@ -7636,17 +6355,17 @@ msgstr ""
 "pakietu nie jest jeszcze zainstalowana"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:342
+#: apt_preferences.5.xml:343
 msgid "P &lt; 0"
 msgstr "P &lt; 0"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:343
+#: apt_preferences.5.xml:344
 msgid "prevents the version from being installed"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:309
+#: apt_preferences.5.xml:310
 msgid ""
 "Priorities (P) assigned in the APT preferences file must be positive or "
 "negative integers.  They are interpreted as follows (roughly speaking): "
@@ -7654,7 +6373,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:348
+#: apt_preferences.5.xml:349
 msgid ""
 "If any specific-form records match an available package version then the "
 "first such record determines the priority of the package version.  Failing "
@@ -7663,14 +6382,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:354
+#: apt_preferences.5.xml:355
 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:358
+#: apt_preferences.5.xml:359
 #, no-wrap
 msgid ""
 "Package: perl\n"
@@ -7698,12 +6417,12 @@ msgstr ""
 "Pin-Priority: 50\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:371
+#: apt_preferences.5.xml:372
 msgid "Then:"
 msgstr "Wtedy:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:373
+#: apt_preferences.5.xml:374
 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 "
@@ -7713,7 +6432,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:378
+#: apt_preferences.5.xml:379
 msgid ""
 "A version of any package other than <literal>perl</literal> that is "
 "available from the local system has priority over other versions, even "
@@ -7721,7 +6440,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:382
+#: apt_preferences.5.xml:383
 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</"
@@ -7730,12 +6449,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:392
+#: apt_preferences.5.xml:393
 msgid "Determination of Package Version and Distribution Properties"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:394
+#: apt_preferences.5.xml:395
 msgid ""
 "The locations listed in the &sources-list; file should provide "
 "<filename>Packages</filename> and <filename>Release</filename> files to "
@@ -7743,27 +6462,27 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:406
+#: apt_preferences.5.xml:407
 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:407
+#: apt_preferences.5.xml:408
 msgid "gives the package name"
 msgstr "podaje nazwę pakietu"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:410 apt_preferences.5.xml:460
+#: apt_preferences.5.xml:411 apt_preferences.5.xml:461
 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:411
+#: apt_preferences.5.xml:412
 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:398
+#: apt_preferences.5.xml:399
 msgid ""
 "The <filename>Packages</filename> file is normally found in the directory "
 "<filename>.../dists/<replaceable>dist-name</replaceable>/"
@@ -7776,12 +6495,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:427
+#: apt_preferences.5.xml:428
 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:428
+#: apt_preferences.5.xml:429
 msgid ""
 "names the archive to which all the packages in the directory tree belong.  "
 "For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@ -7792,18 +6511,18 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:438
+#: apt_preferences.5.xml:439
 #, 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:444
+#: apt_preferences.5.xml:445
 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:445
+#: apt_preferences.5.xml:446
 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 "
@@ -7814,14 +6533,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:454
+#: apt_preferences.5.xml:455
 #, fuzzy, no-wrap
 #| msgid "Pin: release a=stable\n"
 msgid "Pin: release n=&testing-codename;\n"
 msgstr "Pin: release a=stable\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:461
+#: apt_preferences.5.xml:462
 msgid ""
 "names the release version.  For example, the packages in the tree might "
 "belong to Debian GNU/Linux release version 3.0.  Note that there is normally "
@@ -7831,7 +6550,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:470
+#: apt_preferences.5.xml:471
 #, no-wrap
 msgid ""
 "Pin: release v=3.0\n"
@@ -7843,12 +6562,12 @@ msgstr ""
 "Pin: release 3.0\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:479
+#: apt_preferences.5.xml:480
 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:480
+#: apt_preferences.5.xml:481
 msgid ""
 "names the licensing component associated with the packages in the directory "
 "tree of the <filename>Release</filename> file.  For example, the line "
@@ -7859,18 +6578,18 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:489
+#: apt_preferences.5.xml:490
 #, 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:495
+#: apt_preferences.5.xml:496
 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:496
+#: apt_preferences.5.xml:497
 msgid ""
 "names the originator of the packages in the directory tree of the "
 "<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"
@@ -7879,18 +6598,18 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:502
+#: apt_preferences.5.xml:503
 #, 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:508
+#: apt_preferences.5.xml:509
 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:509
+#: apt_preferences.5.xml:510
 msgid ""
 "names the label of the packages in the directory tree of the "
 "<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"
@@ -7899,13 +6618,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:515
+#: apt_preferences.5.xml:516
 #, 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:416
+#: apt_preferences.5.xml:417
 msgid ""
 "The <filename>Release</filename> file is normally found in the directory "
 "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
@@ -7919,7 +6638,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:522
+#: apt_preferences.5.xml:523
 msgid ""
 "All of the <filename>Packages</filename> and <filename>Release</filename> "
 "files retrieved from locations listed in the &sources-list; file are stored "
@@ -7934,12 +6653,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:535
+#: apt_preferences.5.xml:536
 msgid "Optional Lines in an APT Preferences Record"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:537
+#: apt_preferences.5.xml:538
 msgid ""
 "Each record in the APT preferences file can optionally begin with one or "
 "more lines beginning with the word <literal>Explanation:</literal>.  This "
@@ -7947,12 +6666,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:546
+#: apt_preferences.5.xml:547
 msgid "Tracking Stable"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:554
+#: apt_preferences.5.xml:555
 #, fuzzy, no-wrap
 msgid ""
 "Explanation: Uninstall or do not install any Debian-originated\n"
@@ -7976,7 +6695,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:548
+#: apt_preferences.5.xml:549
 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 "
@@ -7986,8 +6705,8 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:571 apt_preferences.5.xml:617
-#: apt_preferences.5.xml:675
+#: apt_preferences.5.xml:572 apt_preferences.5.xml:618
+#: apt_preferences.5.xml:676
 #, no-wrap
 msgid ""
 "apt-get install <replaceable>package-name</replaceable>\n"
@@ -7999,7 +6718,7 @@ msgstr ""
 "apt-get dist-upgrade\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:566
+#: apt_preferences.5.xml:567
 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 "
@@ -8008,13 +6727,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:583
+#: apt_preferences.5.xml:584
 #, 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:577
+#: apt_preferences.5.xml:578
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>testing</literal> distribution; the package "
@@ -8023,12 +6742,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:589
+#: apt_preferences.5.xml:590
 msgid "Tracking Testing or Unstable"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:598
+#: apt_preferences.5.xml:599
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -8056,7 +6775,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:591
+#: apt_preferences.5.xml:592
 msgid ""
 "The following APT preferences file will cause APT to assign a high priority "
 "to package versions from the <literal>testing</literal> distribution, a "
@@ -8067,7 +6786,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:612
+#: apt_preferences.5.xml:613
 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 "
@@ -8076,13 +6795,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:632
+#: apt_preferences.5.xml:633
 #, 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:623
+#: apt_preferences.5.xml:624
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>unstable</literal> distribution.  "
@@ -8094,12 +6813,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:639
+#: apt_preferences.5.xml:640
 msgid "Tracking the evolution of a codename release"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:653
+#: apt_preferences.5.xml:654
 #, fuzzy, no-wrap
 msgid ""
 "Explanation: Uninstall or do not install any Debian-originated package versions\n"
@@ -8133,7 +6852,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:641
+#: apt_preferences.5.xml:642
 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 "
@@ -8148,7 +6867,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:670
+#: apt_preferences.5.xml:671
 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 "
@@ -8157,13 +6876,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:690
+#: apt_preferences.5.xml:691
 #, 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:681
+#: apt_preferences.5.xml:682
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>sid</literal> distribution.  Thereafter, "
@@ -8175,12 +6894,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt_preferences.5.xml:699
+#: apt_preferences.5.xml:700
 msgid "&file-preferences;"
 msgstr "&file-preferences;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:705
+#: apt_preferences.5.xml:706
 msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 
@@ -8473,6 +7192,11 @@ msgstr ""
 "plików. Jest użyteczny dla katalogów montowanych przez NFS i lokalnych kopii "
 "archiwów."
 
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+#: sources.list.5.xml:153
+msgid "cdrom"
+msgstr "cdrom"
+
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml:155
 msgid ""
@@ -8483,6 +7207,11 @@ msgstr ""
 "Prosimy używać programu &apt-cdrom; do dodawania takich wpisów w sources."
 "list."
 
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+#: sources.list.5.xml:160
+msgid "http"
+msgstr "http"
+
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml:162
 msgid ""
@@ -8500,6 +7229,11 @@ msgstr ""
 "hasło@serwer:port/. Proszę zauważyć, że taki sposób autoryzacji nie jest "
 "bezpieczny."
 
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+#: sources.list.5.xml:171
+msgid "ftp"
+msgstr "ftp"
+
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml:173
 msgid ""
@@ -8985,6 +7719,11 @@ msgstr ""
 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
+msgid "upgrade"
+msgstr "upgrade"
+
 #. type: <p></p>
 #: guide.sgml:131
 msgid ""
@@ -9005,6 +7744,11 @@ msgstr ""
 "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>."
 
+#. type: <tag></tag>
+#: guide.sgml:131
+msgid "install"
+msgstr "install"
+
 #. type: <p></p>
 #: guide.sgml:140
 msgid ""
@@ -9025,6 +7769,11 @@ 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
+msgid "dist-upgrade"
+msgstr "dist-upgrade"
+
 #. type: <p></p>
 #: guide.sgml:149
 msgid ""
@@ -10278,7 +9027,6 @@ msgstr "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade"
 msgid "Which will use the already fetched archives on the disc."
 msgstr "Które użyje pobranych uprzednio archiwów z dysku."
 
-#
 #~ msgid ""
 #~ "<literal>gencaches</literal> performs the same operation as <command>apt-"
 #~ "get check</command>. It builds the source and package caches from the "
@@ -10290,282 +9038,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>."
 
-#, fuzzy
-#~| msgid ""
-#~| "<command>apt-cache</command> <arg><option>-hvsn</option></arg> "
-#~| "<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
-#~| "<arg><option>-c=<replaceable>file</replaceable></option></arg> <group "
-#~| "choice=\"req\"> <arg>add <arg choice=\"plain\" rep=\"repeat"
-#~| "\"><replaceable>file</replaceable></arg></arg> <arg>gencaches</arg> "
-#~| "<arg>showpkg <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
-#~| "replaceable></arg></arg> <arg>showsrc <arg choice=\"plain\" rep=\"repeat"
-#~| "\"><replaceable>pkg</replaceable></arg></arg> <arg>stats</arg> "
-#~| "<arg>dump</arg> <arg>dumpavail</arg> <arg>unmet</arg> <arg>search <arg "
-#~| "choice=\"plain\"><replaceable>regex</replaceable></arg></arg> <arg>show "
-#~| "<arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></"
-#~| "arg></arg> <arg>depends <arg choice=\"plain\" rep=\"repeat"
-#~| "\"><replaceable>pkg</replaceable></arg></arg> <arg>rdepends <arg choice="
-#~| "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
-#~| "<arg>pkgnames <arg choice=\"plain\"><replaceable>prefix</replaceable></"
-#~| "arg></arg> <arg>dotty <arg choice=\"plain\" rep=\"repeat"
-#~| "\"><replaceable>pkg</replaceable></arg></arg> <arg>xvcg <arg choice="
-#~| "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
-#~| "<arg>policy <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkgs</"
-#~| "replaceable></arg></arg> <arg>madison <arg choice=\"plain\" rep=\"repeat"
-#~| "\"><replaceable>pkgs</replaceable></arg></arg> </group>"
-#~ msgid ""
-#~ "<command>apt-cache</command> <arg><option>-hvsn</option></arg> "
-#~ "<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
-#~ "<arg><option>-c=<replaceable>file</replaceable></option></arg> <group "
-#~ "choice=\"req\"> <arg>gencaches</arg> <arg>showpkg <arg choice=\"plain\" "
-#~ "rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg>showsrc "
-#~ "<arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></"
-#~ "arg></arg> <arg>stats</arg> <arg>dump</arg> <arg>dumpavail</arg> "
-#~ "<arg>unmet</arg> <arg>search <arg choice=\"plain\"><replaceable>regex</"
-#~ "replaceable></arg></arg> <arg>show <arg choice=\"plain\" rep=\"repeat"
-#~ "\"><replaceable>pkg</replaceable></arg></arg> <arg>depends <arg choice="
-#~ "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
-#~ "<arg>rdepends <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
-#~ "replaceable></arg></arg> <arg>pkgnames <arg choice=\"plain"
-#~ "\"><replaceable>prefix</replaceable></arg></arg> <arg>dotty <arg choice="
-#~ "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
-#~ "<arg>xvcg <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
-#~ "replaceable></arg></arg> <arg>policy <arg choice=\"plain\" rep=\"repeat"
-#~ "\"><replaceable>pkgs</replaceable></arg></arg> <arg>madison <arg choice="
-#~ "\"plain\" rep=\"repeat\"><replaceable>pkgs</replaceable></arg></arg> </"
-#~ "group>"
-#~ msgstr ""
-#~ "<command>apt-cache</command> <arg><option>-hvsn</option></arg> "
-#~ "<arg><option>-o=<replaceable>opcja_konfiguracji</replaceable></option></"
-#~ "arg> <arg><option>-c=<replaceable>plik</replaceable></option></arg> "
-#~ "<group choice=\"req\"> <arg>add <arg choice=\"plain\" rep=\"repeat"
-#~ "\"><replaceable>plik</replaceable></arg></arg> <arg>gencaches</arg> "
-#~ "<arg>showpkg <arg choice=\"plain\" rep=\"repeat\"><replaceable>pakiet</"
-#~ "replaceable></arg></arg> <arg>showsrc <arg choice=\"plain\" rep=\"repeat"
-#~ "\"><replaceable>pakiet</replaceable></arg></arg> <arg>stats</arg> "
-#~ "<arg>dump</arg> <arg>dumpavail</arg> <arg>unmet</arg> <arg>search <arg "
-#~ "choice=\"plain\"><replaceable>wyrażenie-regularne</replaceable></arg></"
-#~ "arg> <arg>show <arg choice=\"plain\" rep=\"repeat\"><replaceable>pakiet</"
-#~ "replaceable></arg></arg> <arg>depends <arg choice=\"plain\" rep=\"repeat"
-#~ "\"><replaceable>pakiet</replaceable></arg></arg> <arg>rdepends <arg "
-#~ "choice=\"plain\" rep=\"repeat\"><replaceable>pakiet</replaceable></arg></"
-#~ "arg> <arg>pkgnames <arg choice=\"plain\"><replaceable>prefiks</"
-#~ "replaceable></arg></arg> <arg>dotty <arg choice=\"plain\" rep=\"repeat"
-#~ "\"><replaceable>pakiet</replaceable></arg></arg> <arg>xvcg <arg choice="
-#~ "\"plain\" rep=\"repeat\"><replaceable>pakiet</replaceable></arg></arg> "
-#~ "<arg>policy <arg choice=\"plain\" rep=\"repeat\"><replaceable>pakiety</"
-#~ "replaceable></arg></arg> <arg>madison <arg choice=\"plain\" rep=\"repeat"
-#~ "\"><replaceable>pakiety</replaceable></arg></arg> </group>"
-
-#~ msgid ""
-#~ "<command>apt-cdrom</command> <arg><option>-hvrmfan</option></arg> "
-#~ "<arg><option>-d=<replaceable>cdrom mount point</replaceable></option></"
-#~ "arg> <arg><option>-o=<replaceable>config string</replaceable></option></"
-#~ "arg> <arg><option>-c=<replaceable>file</replaceable></option></arg> "
-#~ "<group> <arg>add</arg> <arg>ident</arg> </group>"
-#~ msgstr ""
-#~ "<command>apt-cdrom</command> <arg><option>-hvrmfan</option></arg> "
-#~ "<arg><option>-d=<replaceable>punkt montowania CD-ROM-u</replaceable></"
-#~ "option></arg> <arg><option>-o=<replaceable>opcja konfiguracji</"
-#~ "replaceable></option></arg> <arg><option>-c=<replaceable>plik</"
-#~ "replaceable></option></arg> <group> <arg>add</arg> <arg>identyfikator</"
-#~ "arg> </group>"
-
-#~ msgid ""
-#~ "<command>apt-config</command> <arg><option>-hv</option></arg> "
-#~ "<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
-#~ "<arg><option>-c=<replaceable>file</replaceable></option></arg> <group "
-#~ "choice=\"req\"> <arg>shell</arg> <arg>dump</arg> </group>"
-#~ msgstr ""
-#~ "<command>apt-config</command> <arg><option>-hv</option></arg> "
-#~ "<arg><option>-o=<replaceable>opcja konfiguracji</replaceable></option></"
-#~ "arg> <arg><option>-c=<replaceable>plik</replaceable></option></arg> "
-#~ "<group choice=\"req\"> <arg>shell</arg> <arg>dump</arg> </group>"
-
-#~ msgid ""
-#~ "<command>apt-extracttemplates</command> <arg><option>-hv</option></arg> "
-#~ "<arg><option>-t=<replaceable>temporary directory</replaceable></option></"
-#~ "arg> <arg choice=\"plain\" rep=\"repeat\"><replaceable>file</"
-#~ "replaceable></arg>"
-#~ msgstr ""
-#~ "<command>apt-extracttemplates</command> <arg><option>-hv</option></arg> "
-#~ "<arg><option>-t=<replaceable>katalog_tymczasowy</replaceable></option></"
-#~ "arg> <arg choice=\"plain\" rep=\"repeat\"><replaceable>plik</"
-#~ "replaceable></arg>"
-
-#, fuzzy
-#~| msgid ""
-#~| "<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> "
-#~| "<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> "
-#~| "<arg><option>--readonly</option></arg> <arg><option>--contents</option></"
-#~| "arg> <arg><option>-o <replaceable>config</"
-#~| "replaceable>=<replaceable>string</replaceable></option></arg> "
-#~| "<arg><option>-c=<replaceable>file</replaceable></option></arg> <group "
-#~| "choice=\"req\"> <arg>packages<arg choice=\"plain\" rep=\"repeat"
-#~| "\"><replaceable>path</replaceable></arg><arg><replaceable>override</"
-#~| "replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> "
-#~| "<arg>sources<arg choice=\"plain\" rep=\"repeat\"><replaceable>path</"
-#~| "replaceable></arg><arg><replaceable>override</"
-#~| "replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> "
-#~| "<arg>contents <arg choice=\"plain\"><replaceable>path</replaceable></"
-#~| "arg></arg> <arg>release <arg choice=\"plain\"><replaceable>path</"
-#~| "replaceable></arg></arg> <arg>generate <arg choice=\"plain"
-#~| "\"><replaceable>config-file</replaceable></arg> <arg choice=\"plain\" "
-#~| "rep=\"repeat\"><replaceable>section</replaceable></arg></arg> <arg>clean "
-#~| "<arg choice=\"plain\"><replaceable>config-file</replaceable></arg></arg> "
-#~| "</group>"
-#~ msgid ""
-#~ "<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> "
-#~ "<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> "
-#~ "<arg><option>--readonly</option></arg> <arg><option>--contents</option></"
-#~ "arg> <arg><option>--arch <replaceable>architecture</replaceable></"
-#~ "option></arg> <arg><option>-o <replaceable>config</"
-#~ "replaceable>=<replaceable>string</replaceable></option></arg> "
-#~ "<arg><option>-c=<replaceable>file</replaceable></option></arg> <group "
-#~ "choice=\"req\"> <arg>packages<arg choice=\"plain\" rep=\"repeat"
-#~ "\"><replaceable>path</replaceable></arg><arg><replaceable>override</"
-#~ "replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> "
-#~ "<arg>sources<arg choice=\"plain\" rep=\"repeat\"><replaceable>path</"
-#~ "replaceable></arg><arg><replaceable>override</"
-#~ "replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> "
-#~ "<arg>contents <arg choice=\"plain\"><replaceable>path</replaceable></"
-#~ "arg></arg> <arg>release <arg choice=\"plain\"><replaceable>path</"
-#~ "replaceable></arg></arg> <arg>generate <arg choice=\"plain"
-#~ "\"><replaceable>config-file</replaceable></arg> <arg choice=\"plain\" rep="
-#~ "\"repeat\"><replaceable>section</replaceable></arg></arg> <arg>clean <arg "
-#~ "choice=\"plain\"><replaceable>config-file</replaceable></arg></arg> </"
-#~ "group>"
-#~ msgstr ""
-#~ "<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> "
-#~ "<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> "
-#~ "<arg><option>--readonly</option></arg> <arg><option>--contents</option></"
-#~ "arg> <arg><option>-o <replaceable>opcja_konfiguracji</"
-#~ "replaceable>=<replaceable>łańcuch_znaków</replaceable></option></arg> "
-#~ "<arg><option>-c=<replaceable>plik</replaceable></option></arg> <group "
-#~ "choice=\"req\"> <arg>packages<arg choice=\"plain\" rep=\"repeat"
-#~ "\"><replaceable>ścieżka</replaceable></"
-#~ "arg><arg><replaceable>plik_nadpisań</"
-#~ "replaceable><arg><replaceable>prefiks_ścieżki</replaceable></arg></arg></"
-#~ "arg> <arg>sources<arg choice=\"plain\" rep=\"repeat"
-#~ "\"><replaceable>ścieżka</replaceable></"
-#~ "arg><arg><replaceable>plik_nadpisań</"
-#~ "replaceable><arg><replaceable>prefiks_ścieżki</replaceable></arg></arg></"
-#~ "arg> <arg>contents <arg choice=\"plain\"><replaceable>ścieżka</"
-#~ "replaceable></arg></arg> <arg>release <arg choice=\"plain"
-#~ "\"><replaceable>ścieżka</replaceable></arg></arg> <arg>generate <arg "
-#~ "choice=\"plain\"><replaceable>plik_konfiguracji</replaceable></arg> <arg "
-#~ "choice=\"plain\" rep=\"repeat\"><replaceable>sekcja</replaceable></arg></"
-#~ "arg> <arg>clean <arg choice=\"plain\"><replaceable>plik_konfiguracji</"
-#~ "replaceable></arg></arg> </group>"
-
-#, fuzzy
-#~| msgid ""
-#~| "<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
-#~| "<option>-o= <replaceable>config_string</replaceable> </option> </arg> "
-#~| "<arg> <option>-c= <replaceable>config_file</replaceable> </option> </"
-#~| "arg> <arg> <option>-t=</option> <group choice='req'> <arg "
-#~| "choice='plain'> <replaceable>target_release_name</replaceable> </arg> "
-#~| "<arg choice='plain'> <replaceable>target_release_number_expression</"
-#~| "replaceable> </arg> <arg choice='plain'> "
-#~| "<replaceable>target_release_codename</replaceable> </arg> </group> </"
-#~| "arg> <group choice=\"req\"> <arg choice='plain'>update</arg> <arg "
-#~| "choice='plain'>upgrade</arg> <arg choice='plain'>dselect-upgrade</arg> "
-#~| "<arg choice='plain'>dist-upgrade</arg> <arg choice='plain'>install <arg "
-#~| "choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable> <arg> "
-#~| "<group choice='req'> <arg choice='plain'> "
-#~| "=<replaceable>pkg_version_number</replaceable> </arg> <arg "
-#~| "choice='plain'> /<replaceable>target_release_name</replaceable> </arg> "
-#~| "<arg choice='plain'> /<replaceable>target_release_codename</replaceable> "
-#~| "</arg> </group> </arg> </arg> </arg> <arg choice='plain'>remove <arg "
-#~| "choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></"
-#~| "arg> <arg choice='plain'>purge <arg choice=\"plain\" rep=\"repeat"
-#~| "\"><replaceable>pkg</replaceable></arg></arg> <arg choice='plain'>source "
-#~| "<arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable> "
-#~| "<arg> <group choice='req'> <arg choice='plain'> "
-#~| "=<replaceable>pkg_version_number</replaceable> </arg> <arg "
-#~| "choice='plain'> /<replaceable>target_release_name</replaceable> </arg> "
-#~| "<arg choice='plain'> /<replaceable>target_release_codename</replaceable> "
-#~| "</arg> </group> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg "
-#~| "choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></"
-#~| "arg> <arg choice='plain'>check</arg> <arg choice='plain'>clean</arg> "
-#~| "<arg choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> "
-#~| "<arg choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> "
-#~| "<arg choice='plain'>--version</arg> </group> </arg> <arg choice='plain'> "
-#~| "<group choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--"
-#~| "help</arg> </group> </arg> </group>"
-#~ msgid ""
-#~ "<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
-#~ "<option>-o= <replaceable>config_string</replaceable> </option> </arg> "
-#~ "<arg> <option>-c= <replaceable>config_file</replaceable> </option> </arg> "
-#~ "<arg> <option>-t=</option> <arg choice='plain'> "
-#~ "<replaceable>target_release</replaceable> </arg> </arg> <group choice="
-#~ "\"req\"> <arg choice='plain'>update</arg> <arg choice='plain'>upgrade</"
-#~ "arg> <arg choice='plain'>dselect-upgrade</arg> <arg choice='plain'>dist-"
-#~ "upgrade</arg> <arg choice='plain'>install <arg choice=\"plain\" rep="
-#~ "\"repeat\"><replaceable>pkg</replaceable> <arg> <group choice='req'> <arg "
-#~ "choice='plain'> =<replaceable>pkg_version_number</replaceable> </arg> "
-#~ "<arg choice='plain'> /<replaceable>target_release</replaceable> </arg> </"
-#~ "group> </arg> </arg> </arg> <arg choice='plain'>remove <arg choice=\"plain"
-#~ "\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
-#~ "choice='plain'>purge <arg choice=\"plain\" rep=\"repeat"
-#~ "\"><replaceable>pkg</replaceable></arg></arg> <arg choice='plain'>source "
-#~ "<arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable> <arg> "
-#~ "<group choice='req'> <arg choice='plain'> "
-#~ "=<replaceable>pkg_version_number</replaceable> </arg> <arg "
-#~ "choice='plain'> /<replaceable>target_release</replaceable> </arg> </"
-#~ "group> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg choice="
-#~ "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
-#~ "choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg "
-#~ "choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> <arg "
-#~ "choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> <arg "
-#~ "choice='plain'>--version</arg> </group> </arg> <arg choice='plain'> "
-#~ "<group choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--"
-#~ "help</arg> </group> </arg> </group>"
-#~ msgstr ""
-#~ "<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
-#~ "<option>-o= <replaceable>opcja_konfiguracji</replaceable> </option> </"
-#~ "arg> <arg> <option>-c= <replaceable>plik_konfiguracyjny</replaceable> </"
-#~ "option> </arg> <arg> <option>-t=</option> <group choice='req'> <arg "
-#~ "choice='plain'> <replaceable>nazwa_wydania</replaceable> </arg> <arg "
-#~ "choice='plain'> <replaceable>wyrażenie_numeru_wydania</replaceable> </"
-#~ "arg> <arg choice='plain'> <replaceable>kod_wydania</replaceable> </arg> </"
-#~ "group> </arg> <group choice=\"req\"> <arg choice='plain'>update</arg> "
-#~ "<arg choice='plain'>upgrade</arg> <arg choice='plain'>dselect-upgrade</"
-#~ "arg> <arg choice='plain'>dist-upgrade</arg> <arg choice='plain'>install "
-#~ "<arg choice=\"plain\" rep=\"repeat\"><replaceable>pakiet</replaceable> "
-#~ "<arg> <group choice='req'> <arg choice='plain'> "
-#~ "=<replaceable>numer_wersji_pakietu</replaceable> </arg> <arg "
-#~ "choice='plain'> /<replaceable>nazwa_wydania</replaceable> </arg> <arg "
-#~ "choice='plain'> /<replaceable>kod_wydania</replaceable> </arg> </group> </"
-#~ "arg> </arg> </arg> <arg choice='plain'>remove <arg choice=\"plain\" rep="
-#~ "\"repeat\"><replaceable>pakiet</replaceable></arg></arg> <arg "
-#~ "choice='plain'>purge <arg choice=\"plain\" rep=\"repeat"
-#~ "\"><replaceable>pakiet</replaceable></arg></arg> <arg "
-#~ "choice='plain'>source <arg choice=\"plain\" rep=\"repeat"
-#~ "\"><replaceable>pakiet</replaceable> <arg> <group choice='req'> <arg "
-#~ "choice='plain'> =<replaceable>numer_wersji_pakietu</replaceable> </arg> "
-#~ "<arg choice='plain'> /<replaceable>nazwa_wydania</replaceable> </arg> "
-#~ "<arg choice='plain'> /<replaceable>kod_wydania</replaceable> </arg> </"
-#~ "group> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg choice="
-#~ "\"plain\" rep=\"repeat\"><replaceable>pakiet</replaceable></arg></arg> "
-#~ "<arg choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg "
-#~ "choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> <arg "
-#~ "choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> <arg "
-#~ "choice='plain'>--version</arg> </group> </arg> <arg choice='plain'> "
-#~ "<group choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--"
-#~ "help</arg> </group> </arg> </group>"
-
-#~ msgid ""
-#~ "<command>apt-key</command> <arg><option>--keyring <replaceable>filename</"
-#~ "replaceable></option></arg> <arg><replaceable>command</replaceable></arg> "
-#~ "<arg rep=\"repeat\"><option><replaceable>arguments</replaceable></"
-#~ "option></arg>"
-#~ msgstr ""
-#~ "<command>apt-key</command> <arg><option>--keyring "
-#~ "<replaceable>nazwa_pliku</replaceable></option></arg> "
-#~ "<arg><replaceable>polecenie</replaceable></arg> <arg rep=\"powtórzenia"
-#~ "\"><option><replaceable>argumenty</replaceable></option></arg>"
-
 #~ msgid "add <replaceable>filename</replaceable>"
 #~ msgstr "add <replaceable>nazwa_pliku</replaceable>"
 
@@ -10586,60 +9058,10 @@ msgstr "Które użyje pobranych uprzednio archiwów z dysku."
 #~ msgid "--keyring <replaceable>filename</replaceable>"
 #~ msgstr "--keyring <replaceable>nazwa_pliku</replaceable>"
 
-#, fuzzy
-#~| msgid ""
-#~| "  <command>apt-mark</command> <arg><option>-hv</option></arg> "
-#~| "<arg><option>-f=<replaceable>FILENAME</replaceable></option></arg> "
-#~| "<group choice=\"plain\"> <arg choice=\"plain\"> <group choice=\"req\"> "
-#~| "<arg choice=\"plain\">markauto</arg> <arg choice=\"plain\">unmarkauto</"
-#~| "arg> </group> <arg choice=\"plain\" rep=\"repeat\"><replaceable>package</"
-#~| "replaceable></arg> </arg> <arg choice=\"plain\">showauto</arg> </group>"
-#~ msgid ""
-#~ "  <command>apt-mark</command> <arg><option>-hv</option></arg> "
-#~ "<arg><option>-f=<replaceable>FILENAME</replaceable></option></arg> <group "
-#~ "choice=\"plain\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg "
-#~ "choice=\"plain\">auto</arg> <arg choice=\"plain\">manual</arg> <arg "
-#~ "choice=\"plain\">showauto</arg> <arg choice=\"plain\">showmanual</arg> </"
-#~ "group> <arg choice=\"plain\" rep=\"repeat\"><replaceable>package</"
-#~ "replaceable></arg> </arg> </group>"
-#~ msgstr ""
-#~ "  <command>apt-mark</command> <arg><option>-hv</option></arg> "
-#~ "<arg><option>-f=<replaceable>NAZWA_PLIKU</replaceable></option></arg> "
-#~ "<group choice=\"plain\"> <arg choice=\"plain\"> <group choice=\"req\"> "
-#~ "<arg choice=\"plain\">markauto</arg> <arg choice=\"plain\">unmarkauto</"
-#~ "arg> </group> <arg choice=\"plain\" rep=\"repeat\"><replaceable>pakiet</"
-#~ "replaceable></arg> </arg> <arg choice=\"plain\">showauto</arg> </group>"
-
-#~ msgid ""
-#~ "<command>apt-sortpkgs</command> <arg><option>-hvs</option></arg> "
-#~ "<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
-#~ "<arg><option>-c=<replaceable>file</replaceable></option></arg> <arg "
-#~ "choice=\"plain\" rep=\"repeat\"><replaceable>file</replaceable></arg>"
-#~ msgstr ""
-#~ "<command>apt-sortpkgs</command> <arg><option>-hvs</option></arg> "
-#~ "<arg><option>-o=<replaceable>opcja_konfiguracji</replaceable></option></"
-#~ "arg> <arg><option>-c=<replaceable>plik</replaceable></option></arg> <arg "
-#~ "choice=\"plain\" rep=\"repeat\"><replaceable>plik</replaceable></arg>"
-
-#~ msgid "<option>--md5</option>"
-#~ msgstr "<option>--md5</option>"
-
-#~ msgid "unmarkauto"
-#~ msgstr "unmarkauto"
-
-#~ msgid "<option>-h</option>"
-#~ msgstr "<option>-h</option>"
-
 #
 #~ msgid "Show a short usage summary."
 #~ msgstr "Wyświetla krótkie informacje na temat użytkowania."
 
-#~ msgid "<option>-v</option>"
-#~ msgstr "<option>-v</option>"
-
-#~ msgid "<option>--version</option>"
-#~ msgstr "<option>--version</option>"
-
 #
 #~ msgid "Show the program version."
 #~ msgstr "Wyświetla wersję programu."
@@ -10659,9 +9081,6 @@ msgstr "Które użyje pobranych uprzednio archiwów z dysku."
 #~ "<literal>add</literal> dodaje pliki zawierające indeks nazw pakietów do "
 #~ "bufora.  Ta opcja jest przydatna głównie w celu odpluskwiania."
 
-#~ msgid "<option>--install-recommends</option>"
-#~ msgstr "<option>--install-recommends</option>"
-
 #~ msgid "Also install recommended packages."
 #~ msgstr "Instaluje również rekomendowane pakiety."
 
@@ -10704,9 +9123,5 @@ msgstr "Które użyje pobranych uprzednio archiwów z dysku."
 #~ "konfiguracyjnym:  <literal>Dir::State</literal> ustawia ścieżkę do pliku "
 #~ "o nazwie <filename>extended_states</filename>."
 
-#, fuzzy
-#~ msgid "Cache-Limit"
-#~ msgstr "Cache"
-
 #~ msgid "Pin: release n=squeeze\n"
 #~ msgstr "Pin: release n=squeeze\n"
diff --git a/doc/po/pt.po b/doc/po/pt.po
index f4905a63d..9849d625d 100644
--- a/doc/po/pt.po
+++ b/doc/po/pt.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.8.0~pre1\n"
-"POT-Creation-Date: 2012-05-20 18:22+0300\n"
+"POT-Creation-Date: 2012-05-21 04:13+0300\n"
 "PO-Revision-Date: 2010-08-25 23:07+0100\n"
 "Last-Translator: Américo Monteiro <a_monteiro@netcabo.pt>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -851,11 +851,6 @@ msgstr ""
 "A menos que a opção <option>-h</option>, ou <option>--help</option> seja "
 "fornecida, um dos comandos abaixo têm que estar presentes."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:48
-msgid "gencaches"
-msgstr "gencaches"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:49
 msgid ""
@@ -863,12 +858,12 @@ msgid ""
 "implicitly by all commands needing this cache if it is missing or outdated."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:53
-#, fuzzy
-#| msgid "showpkg <replaceable>pkg(s)</replaceable>"
-msgid "showpkg <replaceable>&synopsis-pkg;</replaceable>…"
-msgstr "showpkg <replaceable>pacote(s)</replaceable>"
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
+#: apt-cache.8.xml:53 apt-cache.8.xml:142 apt-cache.8.xml:163
+#: 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
+msgid "&synopsis-pkg;"
+msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:54
@@ -939,11 +934,6 @@ msgstr ""
 "instalados. Para o significado específico do lembrete da saída é melhor "
 "consultar o código fonte do apt."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:87
-msgid "stats"
-msgstr "stats"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:87
 msgid ""
@@ -1058,13 +1048,6 @@ msgstr ""
 "<literal>Total dependencies</literal> é o número de relacionamentos com "
 "dependências reivindicadas por todos os pacotes na cache."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:142
-#, fuzzy
-#| msgid "showsrc <replaceable>pkg(s)</replaceable>"
-msgid "showsrc <replaceable>&synopsis-pkg;</replaceable>…"
-msgstr "showsrc <replaceable>pacote(s)</replaceable>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:143
 msgid ""
@@ -1077,11 +1060,6 @@ msgstr ""
 "mostradas, assim como todos os registos que declaram o nome como sendo um "
 "Binário."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:148 apt-config.8.xml:75
-msgid "dump"
-msgstr "dump"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:149
 msgid ""
@@ -1091,11 +1069,6 @@ msgstr ""
 "<literal>dump</literal> mostra uma listagem curta de todos os pacotes na "
 "cache. É principalmente para depuração."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:153
-msgid "dumpavail"
-msgstr "dumpavail"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:154
 msgid ""
@@ -1106,11 +1079,6 @@ msgstr ""
 "stdout. Isto é apropriado para usar com o &dpkg; e é usado pelo método "
 "&dselect;."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:158
-msgid "unmet"
-msgstr "unmet"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:159
 msgid ""
@@ -1120,13 +1088,6 @@ msgstr ""
 "<literal>unmet</literal> mostra um sumário de todas as dependências "
 "insatisfeitas na cache do pacote."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:163
-#, fuzzy
-#| msgid "show <replaceable>pkg(s)</replaceable>"
-msgid "show <replaceable>&synopsis-pkg;</replaceable>…"
-msgstr "show <replaceable>pacote(s)</replaceable>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:164
 msgid ""
@@ -1136,12 +1097,10 @@ msgstr ""
 "<literal>show</literal> executa uma função semelhante ao <command>dpkg --"
 "print-avail</command>; mostra os registos do pacote para os pacotes nomeados."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
 #: apt-cache.8.xml:169
-#, fuzzy
-#| msgid "search <replaceable>regex [ regex ... ]</replaceable>"
-msgid "search <replaceable>&synopsis-regex;</replaceable>…"
-msgstr "search <replaceable>regex [ regex ... ]</replaceable>"
+msgid "&synopsis-regex;"
+msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:170
@@ -1177,13 +1136,6 @@ msgstr ""
 "Podem ser usados argumentos separados para especificar múltiplos padrões de "
 "busca os quais são lidados em conjunto."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:187
-#, fuzzy
-#| msgid "depends <replaceable>pkg(s)</replaceable>"
-msgid "depends <replaceable>&synopsis-pkg;</replaceable>…"
-msgstr "depends <replaceable>pacote(s)</replaceable>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:188
 msgid ""
@@ -1194,13 +1146,6 @@ msgstr ""
 "pacote tem e todos os outros pacotes possíveis que podem satisfazer essa "
 "dependência."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:192
-#, fuzzy
-#| msgid "rdepends <replaceable>pkg(s)</replaceable>"
-msgid "rdepends <replaceable>&synopsis-pkg;</replaceable>…"
-msgstr "rdepends <replaceable>pacote(s)</replaceable>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:193
 msgid ""
@@ -1214,7 +1159,7 @@ msgstr ""
 #: apt-cache.8.xml:197
 #, fuzzy
 #| msgid "pkgnames <replaceable>[ prefix ]</replaceable>"
-msgid "pkgnames [ <replaceable>&synopsis-prefix;</replaceable> ]"
+msgid "<optional><replaceable>&synopsis-prefix;</replaceable></optional>"
 msgstr "pkgnames <replaceable>[ prefixo ]</replaceable>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -1243,13 +1188,6 @@ msgstr ""
 "para download, instalável ou instalado, por exemplo, os pacotes virtuais "
 "também são listados na lista gerada."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:208
-#, fuzzy
-#| msgid "dotty <replaceable>pkg(s)</replaceable>"
-msgid "dotty <replaceable>&synopsis-pkg;</replaceable>…"
-msgstr "dotty <replaceable>pacote(s)</replaceable>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:209
 msgid ""
@@ -1292,13 +1230,6 @@ msgstr ""
 "Atenção, o dotty não consegue fazer gráficos com grandes conjuntos de "
 "pacotes."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:226
-#, fuzzy
-#| msgid "xvcg <replaceable>pkg(s)</replaceable>"
-msgid "xvcg <replaceable>&synopsis-pkg;</replaceable>"
-msgstr "xvcg <replaceable>pacote(s)</replaceable>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:227
 msgid ""
@@ -1312,9 +1243,9 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-cache.8.xml:231
 #, fuzzy
-#| msgid "policy <replaceable>[ pkg(s) ]</replaceable>"
-msgid "policy [ <replaceable>&synopsis-pkg;</replaceable>… ]"
-msgstr "policy <replaceable>[ pacote(s) ]</replaceable>"
+#| msgid "madison <replaceable>[ pkg(s) ]</replaceable>"
+msgid "<optional><replaceable>&synopsis-pkg;</replaceable>…</optional>"
+msgstr "madison <replaceable>[ pacote(s) ]</replaceable>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:232
@@ -1329,13 +1260,6 @@ msgstr ""
 "propriedades de cada fonte. Caso contrário escreve informação detalhada "
 "acerca da selecção de prioridade do pacote nomeado."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:238
-#, fuzzy
-#| msgid "madison <replaceable>[ pkg(s) ]</replaceable>"
-msgid "madison <replaceable>&synopsis-pkg;</replaceable>…"
-msgstr "madison <replaceable>[ pacote(s) ]</replaceable>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:239
 msgid ""
@@ -1355,23 +1279,13 @@ msgstr ""
 "arquitectura que o APT recolheu listas de pacotes (<literal>APT::"
 "Architecture</literal>)."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:250 apt-config.8.xml:84 apt-extracttemplates.1.xml:51
+#. type: Content of: <refentry><refsect1><title>
+#: apt-cache.8.xml:250 apt-config.8.xml:84 apt-extracttemplates.1.xml:52
 #: apt-ftparchive.1.xml:504 apt-get.8.xml:259 apt-mark.8.xml:108
-#: apt-sortpkgs.1.xml:48 apt.conf.5.xml:586 apt.conf.5.xml:608
+#: apt-sortpkgs.1.xml:48
 msgid "options"
 msgstr "opções"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:254
-msgid "<option>-p</option>"
-msgstr "<option>-p</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:254
-msgid "<option>--pkg-cache</option>"
-msgstr "<option>--pkg-cache</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:255
 msgid ""
@@ -1383,17 +1297,6 @@ msgstr ""
 "a cache principal usada por todas as operações. Item de Configuração: "
 "<literal>Dir::Cache::pkgcache</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:260 apt-ftparchive.1.xml:551 apt-get.8.xml:321
-#: apt-sortpkgs.1.xml:52
-msgid "<option>-s</option>"
-msgstr "<option>-s</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:260
-msgid "<option>--src-cache</option>"
-msgstr "<option>--src-cache</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:261
 msgid ""
@@ -1409,16 +1312,6 @@ msgstr ""
 "pacote é usada a cache fonte para evitar reanalisar todos os ficheiros do "
 "pacote. Item de Configuração: <literal>Dir::Cache::srcpkgcache</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:268 apt-ftparchive.1.xml:525 apt-get.8.xml:311
-msgid "<option>-q</option>"
-msgstr "<option>-q</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:268 apt-ftparchive.1.xml:525 apt-get.8.xml:311
-msgid "<option>--quiet</option>"
-msgstr "<option>--quiet</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:269
 msgid ""
@@ -1433,16 +1326,6 @@ msgstr ""
 "nível de serenidade, sobrepondo o ficheiro de configuração. Item de "
 "Configuração: <literal>quiet</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:275
-msgid "<option>-i</option>"
-msgstr "<option>-i</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:275
-msgid "<option>--important</option>"
-msgstr "<option>--important</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:276
 msgid ""
@@ -1454,46 +1337,6 @@ msgstr ""
 "Separa apenas relações de Depends e Pre-Depends para serem escritas. Item de "
 "Configuração: <literal>APT::Cache::Important</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:281
-msgid "<option>--no-pre-depends</option>"
-msgstr "<option>--no-pre-depends</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:282
-msgid "<option>--no-depends</option>"
-msgstr "<option>--no-depends</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:283
-msgid "<option>--no-recommends</option>"
-msgstr "<option>--no-recommends</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:284
-msgid "<option>--no-suggests</option>"
-msgstr "<option>--no-suggests</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:285
-msgid "<option>--no-conflicts</option>"
-msgstr "<option>--no-conflicts</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:286
-msgid "<option>--no-breaks</option>"
-msgstr "<option>--no-breaks</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:287
-msgid "<option>--no-replaces</option>"
-msgstr "<option>--no-replaces</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:288
-msgid "<option>--no-enhances</option>"
-msgstr "<option>--no-enhances</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:289
 #, fuzzy
@@ -1516,16 +1359,6 @@ msgstr ""
 "<literal>APT::Cache::Show<replaceable>DependencyType</replaceable></literal> "
 "ex. <literal>APT::Cache::ShowRecommends</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:295 apt-cdrom.8.xml:111 apt-get.8.xml:278
-msgid "<option>-f</option>"
-msgstr "<option>-f</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:295
-msgid "<option>--full</option>"
-msgstr "<option>--full</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:296
 msgid ""
@@ -1535,17 +1368,6 @@ msgstr ""
 "Escreve registos de pacote completos quando procura. Item de Configuração: "
 "<literal>APT::Cache::ShowFull</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:300 apt-cdrom.8.xml:121 apt-ftparchive.1.xml:563
-#: apt-get.8.xml:369
-msgid "<option>-a</option>"
-msgstr "<option>-a</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:300
-msgid "<option>--all-versions</option>"
-msgstr "<option>--all-versions</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:301
 msgid ""
@@ -1563,16 +1385,6 @@ msgstr ""
 "Esta opção é aplicável apenas ao comando <literal>show</literal>. Item de "
 "Configuração: <literal>APT::Cache::AllVersions</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:309
-msgid "<option>-g</option>"
-msgstr "<option>-g</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:309
-msgid "<option>--generate</option>"
-msgstr "<option>--generate</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:310
 msgid ""
@@ -1585,16 +1397,6 @@ msgstr ""
 "generate</option>. Item de Configuração: <literal>APT::Cache::Generate</"
 "literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:315
-msgid "<option>--names-only</option>"
-msgstr "<option>--names-only</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:315 apt-cdrom.8.xml:129
-msgid "<option>-n</option>"
-msgstr "<option>-n</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:316
 msgid ""
@@ -1604,11 +1406,6 @@ msgstr ""
 "Apenas procura nos nomes dos pacotes, e não nas descrições longas. Item de "
 "Configuração: <literal>APT::Cache::NamesOnly</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:320
-msgid "<option>--all-names</option>"
-msgstr "<option>--all-names</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:321
 msgid ""
@@ -1620,11 +1417,6 @@ msgstr ""
 "pacotes virtuais e dependências em falta. Item de configuração: "
 "<literal>APT::Cache::AllNames</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:326
-msgid "<option>--recurse</option>"
-msgstr "<option>--recurse</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:327
 msgid ""
@@ -1636,11 +1428,6 @@ msgstr ""
 "para que todos os pacotes mencionados sejam escritos uma vez. Item de "
 "Configuração <literal>APT::Cache::RecurseDepends</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:332
-msgid "<option>--installed</option>"
-msgstr "<option>--installed</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:334
 msgid ""
@@ -1654,14 +1441,14 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist>
 #: apt-cache.8.xml:339 apt-cdrom.8.xml:140 apt-config.8.xml:104
-#: apt-extracttemplates.1.xml:62 apt-ftparchive.1.xml:591 apt-get.8.xml:514
+#: apt-extracttemplates.1.xml:63 apt-ftparchive.1.xml:591 apt-get.8.xml:514
 #: apt-mark.8.xml:122 apt-sortpkgs.1.xml:58
 msgid "&apt-commonoptions;"
 msgstr "&apt-commonoptions;"
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-cache.8.xml:344 apt-get.8.xml:519 apt-key.8.xml:167 apt-mark.8.xml:126
-#: apt.conf.5.xml:1119 apt_preferences.5.xml:697
+#: apt.conf.5.xml:1119 apt_preferences.5.xml:698
 msgid "Files"
 msgstr "Ficheiros"
 
@@ -1672,9 +1459,9 @@ msgstr "&file-sourceslist; &file-statelists;"
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-cache.8.xml:351 apt-cdrom.8.xml:145 apt-config.8.xml:109
-#: apt-extracttemplates.1.xml:69 apt-ftparchive.1.xml:607 apt-get.8.xml:529
+#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:607 apt-get.8.xml:529
 #: apt-key.8.xml:188 apt-mark.8.xml:132 apt-secure.8.xml:185
-#: apt-sortpkgs.1.xml:63 apt.conf.5.xml:1125 apt_preferences.5.xml:704
+#: apt-sortpkgs.1.xml:63 apt.conf.5.xml:1125 apt_preferences.5.xml:705
 #: sources.list.5.xml:255
 msgid "See Also"
 msgstr "Veja também"
@@ -1686,7 +1473,7 @@ msgstr "&apt-conf;, &sources-list;, &apt-get;"
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:114
-#: apt-extracttemplates.1.xml:73 apt-ftparchive.1.xml:611 apt-get.8.xml:535
+#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:611 apt-get.8.xml:535
 #: apt-mark.8.xml:136 apt-sortpkgs.1.xml:67
 msgid "Diagnostics"
 msgstr "Diagnóstico"
@@ -1744,11 +1531,6 @@ msgstr ""
 "de vários discos tem que ser inserido e sondado separadamente para ter em "
 "conta possíveis falhas."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:55
-msgid "add"
-msgstr "add"
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt-cdrom.8.xml:56
 msgid ""
@@ -1775,11 +1557,6 @@ msgstr ""
 "drive e mantêm uma base de dados desses IDs em <filename>&statedir;/cdroms."
 "list</filename>"
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:71
-msgid "ident"
-msgstr "ident"
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt-cdrom.8.xml:72
 msgid ""
@@ -1805,16 +1582,6 @@ msgstr ""
 msgid "Options"
 msgstr "Opções"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:85 apt-ftparchive.1.xml:519 apt-get.8.xml:273
-msgid "<option>-d</option>"
-msgstr "<option>-d</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:85
-msgid "<option>--cdrom</option>"
-msgstr "<option>--cdrom</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cdrom.8.xml:86
 msgid ""
@@ -1827,16 +1594,6 @@ msgstr ""
 "configurado apropriadamente. Item de configuração: <literal>Acquire::cdrom::"
 "mount</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:94
-msgid "<option>-r</option>"
-msgstr "<option>-r</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:94
-msgid "<option>--rename</option>"
-msgstr "<option>--rename</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cdrom.8.xml:95
 msgid ""
@@ -1849,16 +1606,6 @@ msgstr ""
 "command> pergunte por uma nova etiqueta. Item de configuração: <literal>APT::"
 "CDROM::Rename</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:103 apt-get.8.xml:292
-msgid "<option>-m</option>"
-msgstr "<option>-m</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:103
-msgid "<option>--no-mount</option>"
-msgstr "<option>--no-mount</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cdrom.8.xml:104
 msgid ""
@@ -1870,11 +1617,6 @@ msgstr ""
 "desmontar o ponto de montagem. Item de configuração: <literal>APT::CDROM::"
 "NoMount</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:111
-msgid "<option>--fast</option>"
-msgstr "<option>--fast</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cdrom.8.xml:112
 msgid ""
@@ -1888,11 +1630,6 @@ msgstr ""
 "já foi corrido com este disco e não detectou nenhum erro. Item de "
 "configuração: <literal>APT::CDROM::Fast</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:121
-msgid "<option>--thorough</option>"
-msgstr "<option>--thorough</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cdrom.8.xml:122
 msgid ""
@@ -1904,21 +1641,6 @@ msgstr ""
 "discos Debian antigos 1.1/1.2 que têm ficheiros de pacotes em lugares "
 "estranhos. Demora muito mais tempo a sondar o CD mas irá apanhá-los a todos."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:130 apt-get.8.xml:323
-msgid "<option>--just-print</option>"
-msgstr "<option>--just-print</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:131 apt-get.8.xml:325
-msgid "<option>--recon</option>"
-msgstr "<option>--recon</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:132 apt-get.8.xml:326
-msgid "<option>--no-act</option>"
-msgstr "<option>--no-act</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cdrom.8.xml:133
 msgid ""
@@ -1987,11 +1709,6 @@ msgstr ""
 "A menos que a opção <option>-h</option>, ou <option>--help</option> seja "
 "fornecida, um dos comandos abaixo têm que estar presentes."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-config.8.xml:49
-msgid "shell"
-msgstr "shell"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-config.8.xml:51
 msgid ""
@@ -2045,13 +1762,6 @@ msgstr ""
 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><term>
-#: apt-config.8.xml:89
-#, fuzzy
-#| msgid "<option>--help</option>"
-msgid "<option>--empty</option>"
-msgstr "<option>--help</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-config.8.xml:90
 msgid ""
@@ -2059,11 +1769,9 @@ msgid ""
 "empty to remove them from the output."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
 #: apt-config.8.xml:95
-msgid ""
-"<option>--format '<replaceable>&percnt;f &#x0022;&percnt;v&#x0022;;&percnt;"
-"n</replaceable>'</option>"
+msgid "&percnt;f &#x0022;&percnt;v&#x0022;;&percnt;n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -2079,7 +1787,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:110 apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:608
+#: apt-config.8.xml:110 apt-extracttemplates.1.xml:71 apt-ftparchive.1.xml:608
 #: apt-sortpkgs.1.xml:64
 msgid "&apt-conf;"
 msgstr "&apt-conf;"
@@ -2132,11 +1840,19 @@ msgstr "pacote versão ficheiro-modelo script-de-configuração"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-extracttemplates.1.xml:45
+#, fuzzy
+#| msgid ""
+#| "template-file and config-script are written to the temporary directory "
+#| "specified by the -t or --tempdir (<literal>APT::ExtractTemplates::"
+#| "TempDir</literal>)  directory, with filenames of the form "
+#| "<filename>package.template.XXXX</filename> and <filename>package.config."
+#| "XXXX</filename>"
 msgid ""
 "template-file and config-script are written to the temporary directory "
-"specified by the -t or --tempdir (<literal>APT::ExtractTemplates::TempDir</"
-"literal>)  directory, with filenames of the form <filename>package.template."
-"XXXX</filename> and <filename>package.config.XXXX</filename>"
+"specified by the <option>-t</option> or <option>--tempdir</option> "
+"(<literal>APT::ExtractTemplates::TempDir</literal>) directory, with "
+"filenames of the form <filename>package.template.XXXX</filename> and "
+"<filename>package.config.XXXX</filename>"
 msgstr ""
 "ficheiro-modelo e script-de-configuração são escritos num directório "
 "temporário especificado por  -t ou --tempdir (<literal>APT::"
@@ -2144,18 +1860,8 @@ msgstr ""
 "formato <filename>pacote.modelo.XXXX</filename> e <filename>pacote."
 "configuração.XXXX</filename>"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-extracttemplates.1.xml:55 apt-get.8.xml:448
-msgid "<option>-t</option>"
-msgstr "<option>-t</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-extracttemplates.1.xml:55
-msgid "<option>--tempdir</option>"
-msgstr "<option>--tempdir</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-extracttemplates.1.xml:57
+#: apt-extracttemplates.1.xml:58
 msgid ""
 "Temporary directory in which to write extracted debconf template files and "
 "config scripts.  Configuration Item: <literal>APT::ExtractTemplates::"
@@ -2166,7 +1872,7 @@ msgstr ""
 "ExtractTemplates::TempDir</literal>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:74
+#: apt-extracttemplates.1.xml:75
 msgid ""
 "<command>apt-extracttemplates</command> returns zero on normal operation, "
 "decimal 100 on error."
@@ -2237,11 +1943,6 @@ msgstr ""
 "geração completa, executa automaticamente verificações de alterações de "
 "ficheiros e constrói os ficheiros comprimidos desejados."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:58
-msgid "packages"
-msgstr "packages"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:60
 msgid ""
@@ -2263,11 +1964,6 @@ msgstr ""
 "A opção <option>--db</option> pode ser usada para especificar uma base de "
 "dados de cache binária."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:68
-msgid "sources"
-msgstr "sources"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:70
 msgid ""
@@ -2293,11 +1989,6 @@ msgstr ""
 "source-override pode ser usada para alterar o ficheiro de sobreposição de "
 "fonte que irá ser usado."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:80
-msgid "contents"
-msgstr "contents"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:82
 msgid ""
@@ -2316,11 +2007,6 @@ msgstr ""
 "múltiplos pacotes possuírem o mesmo ficheiro então cada pacote é separado "
 "por uma vírgula na saída."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:92
-msgid "release"
-msgstr "release"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:94
 msgid ""
@@ -2357,11 +2043,6 @@ msgstr ""
 "<literal>Architectures</literal>, <literal>Components</literal>, "
 "<literal>Description</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:115
-msgid "generate"
-msgstr "generate"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:117
 msgid ""
@@ -2378,11 +2059,6 @@ msgstr ""
 "de quais directórios, assim como disponibilizar um meio simples de manter as "
 "definições requeridas."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:124 apt-get.8.xml:215
-msgid "clean"
-msgstr "clean"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:126
 msgid ""
@@ -2441,11 +2117,6 @@ msgstr ""
 "Estes directórios precedem a certos caminhos relativos definidos em secções "
 "posteriores para produzir um caminho completo e absoluto."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:151
-msgid "ArchiveDir"
-msgstr "ArchiveDir"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:153
 msgid ""
@@ -2456,31 +2127,16 @@ msgstr ""
 "Especifica a raiz do arquivo FTP, numa configuração Debian standard este é o "
 "directório que contém o <filename>ls-LR</filename> e nós da distribuição."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:158
-msgid "OverrideDir"
-msgstr "OverrideDir"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:160
 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><term>
-#: apt-ftparchive.1.xml:163
-msgid "CacheDir"
-msgstr "CacheDir"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:165
 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><term>
-#: apt-ftparchive.1.xml:168
-msgid "FileListDir"
-msgstr "FileListDir"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:170
 msgid ""
@@ -2506,11 +2162,6 @@ msgstr ""
 "definições que controlam a operação do gerador. Outras secções podem "
 "sobrepor estas predefinições em uma definição por-secção."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:182
-msgid "Packages::Compress"
-msgstr "Packages::Compress"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:184
 msgid ""
@@ -2524,11 +2175,6 @@ msgstr ""
 "pelo menos um de:  '.' (nenhuma compressão), 'gzip' and 'bzip2'. A "
 "predefinição para todos os esquemas de compressão é '. gzip'."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:190
-msgid "Packages::Extensions"
-msgstr "Packages::Extensions"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:192
 msgid ""
@@ -2538,11 +2184,6 @@ msgstr ""
 "Define a lista predefinida das extensões de ficheiros que são ficheiros "
 "pacote. A predefinição é '.deb'."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:196
-msgid "Sources::Compress"
-msgstr "Sources::Compress"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:198
 msgid ""
@@ -2552,11 +2193,6 @@ msgstr ""
 "Isto é semelhante a <literal>Packages::Compress</literal> excepto que "
 "controla a compressão para os ficheiros das Fontes."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:202
-msgid "Sources::Extensions"
-msgstr "Sources::Extensions"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:204
 msgid ""
@@ -2566,11 +2202,6 @@ msgstr ""
 "Define a lista predefinida das extensões de ficheiros que são ficheiros de "
 "fontes. A predefinição é '.dsc'."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:208
-msgid "Contents::Compress"
-msgstr "Contents::Compress"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:210
 msgid ""
@@ -2580,11 +2211,6 @@ msgstr ""
 "Isto é semelhante a <literal>Packages::Compress</literal> excepto que "
 "controla a compressão para os ficheiros de Conteúdos."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:214
-msgid "Translation::Compress"
-msgstr "Translation::Compress"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:216
 msgid ""
@@ -2594,11 +2220,6 @@ msgstr ""
 "Isto é semelhante a <literal>Packages::Compress</literal> excepto que "
 "controla a compressão para o ficheiro mestre Translation-en."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:220
-msgid "DeLinkLimit"
-msgstr "DeLinkLimit"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:222
 msgid ""
@@ -2610,11 +2231,6 @@ msgstr ""
 "por execução. Isto é usado em conjunto com a definição <literal>External-"
 "Links</literal> por secção."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:227
-msgid "FileMode"
-msgstr "FileMode"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:229
 msgid ""
@@ -2625,11 +2241,6 @@ msgstr ""
 "0644. Todos os ficheiros índice são definidos para este modo "
 "independentemente do umask."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:234 apt-ftparchive.1.xml:380
-msgid "LongDescription"
-msgstr "LongDescription"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:236 apt-ftparchive.1.xml:382
 msgid ""
@@ -2655,11 +2266,6 @@ msgstr ""
 "Todas estas variáveis são variáveis de substituição e têm as strings "
 "$(DIST), $(SECTION) e $(ARCH) substituídas pelos seus respectivos valores."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:249
-msgid "MaxContentsChange"
-msgstr "MaxContentsChange"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:251
 msgid ""
@@ -2671,11 +2277,6 @@ msgstr ""
 "cada dia. Os ficheiros de conteúdo são re-circulados para que ao fim de "
 "alguns dias todos sejam reconstruídos."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:256
-msgid "ContentsAge"
-msgstr "ContentsAge"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:258
 msgid ""
@@ -2694,11 +2295,6 @@ msgstr ""
 "que novos .debs sejam instalados, requerendo um novo ficheiro de qualquer "
 "modo. A predefinição é 10, as unidades são em dias."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:267
-msgid "Directory"
-msgstr "Directory"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:269
 msgid ""
@@ -2708,11 +2304,6 @@ msgstr ""
 "Define o topo da árvore de directórios .deb. A predefinição é <filename>"
 "$(DIST)/$(SECTION)/binary-$(ARCH)/</filename>"
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:273
-msgid "SrcDirectory"
-msgstr "SrcDirectory"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:275
 msgid ""
@@ -2722,11 +2313,6 @@ msgstr ""
 "Define o topo da árvore de directórios de pacotes fonte. A predefinição é "
 "<filename>$(DIST)/$(SECTION)/source/</filename>"
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:279 apt-ftparchive.1.xml:418
-msgid "Packages"
-msgstr "Packages"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:281
 msgid ""
@@ -2736,11 +2322,6 @@ msgstr ""
 "Define o ficheiro Packages de saída. A predefinição é <filename>$(DIST)/"
 "$(SECTION)/binary-$(ARCH)/Packages</filename>"
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:285 apt-ftparchive.1.xml:423
-msgid "Sources"
-msgstr "Sources"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:287
 msgid ""
@@ -2750,11 +2331,6 @@ msgstr ""
 "Define o ficheiro Sources de saída. A predefinição é <filename>$(DIST)/"
 "$(SECTION)/source/Sources</filename>"
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:291
-msgid "Translation"
-msgstr "Translation"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:293
 msgid ""
@@ -2766,11 +2342,6 @@ msgstr ""
 "não deve ser incluído no ficheiro Packages. A predefinição é <filename>"
 "$(DIST)/$(SECTION)/i18n/Translation-en</filename>"
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:298
-msgid "InternalPrefix"
-msgstr "InternalPrefix"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:300
 msgid ""
@@ -2782,11 +2353,6 @@ msgstr ""
 "link interno em vez de um link externo. A predefinição é <filename>$(DIST)/"
 "$(SECTION)/</filename>"
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:305 apt-ftparchive.1.xml:429
-msgid "Contents"
-msgstr "Contents"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:307
 msgid ""
@@ -2801,21 +2367,11 @@ msgstr ""
 "então o <command>apt-ftparchive</command> irá automaticamente integrar esses "
 "ficheiros pacotes todos juntos."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:314
-msgid "Contents::Header"
-msgstr "Contents::Header"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:316
 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><term>
-#: apt-ftparchive.1.xml:319 apt-ftparchive.1.xml:454
-msgid "BinCacheDB"
-msgstr "BinCacheDB"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:321
 msgid ""
@@ -2825,11 +2381,6 @@ msgstr ""
 "Define a base de dados de cache binária a usar para esta secção. Múltiplas "
 "secções podem partilhar a mesma base de dados."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:325
-msgid "FileList"
-msgstr "FileList"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:327
 msgid ""
@@ -2842,11 +2393,6 @@ msgstr ""
 "fornecido. Nomes de ficheiros relativos são prefixados com o directório de "
 "arquivo."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:332
-msgid "SourceFileList"
-msgstr "SourceFileList"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:334
 msgid ""
@@ -2929,11 +2475,6 @@ msgstr ""
 "ftparchive</command> executa uma operação semelhante a: <placeholder type="
 "\"programlisting\" id=\"0\"/>"
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:366
-msgid "Sections"
-msgstr "Sections"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:368
 msgid ""
@@ -2945,11 +2486,6 @@ msgstr ""
 "distribuição, tipicamente isto é algo como <literal>main contrib non-free</"
 "literal>"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:373 apt.conf.5.xml:157
-msgid "Architectures"
-msgstr "Architectures"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:375
 msgid ""
@@ -2961,11 +2497,6 @@ msgstr ""
 "sob a secção de buscas. A arquitectura especial 'source' é usada para "
 "indicar que esta árvore tem um arquivo fonte."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:386 apt-ftparchive.1.xml:434
-msgid "BinOverride"
-msgstr "BinOverride"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:388
 msgid ""
@@ -2975,11 +2506,6 @@ msgstr ""
 "Define o ficheiro de sobreposição binário. O ficheiro de sobreposição "
 "informação de secção, prioridade e endereço do responsável."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:392 apt-ftparchive.1.xml:439
-msgid "SrcOverride"
-msgstr "SrcOverride"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:394
 msgid ""
@@ -2989,21 +2515,11 @@ msgstr ""
 "Define o ficheiro de sobreposição fonte. O ficheiro de sobreposição "
 "informação de secção."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:398 apt-ftparchive.1.xml:444
-msgid "ExtraOverride"
-msgstr "ExtraOverride"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:400 apt-ftparchive.1.xml:446
 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><term>
-#: apt-ftparchive.1.xml:403 apt-ftparchive.1.xml:449
-msgid "SrcExtraOverride"
-msgstr "SrcExtraOverride"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:405 apt-ftparchive.1.xml:451
 msgid "Sets the source extra override file."
@@ -3063,21 +2579,11 @@ msgstr "Define o ficheiro de sobreposição fonte."
 msgid "Sets the cache DB."
 msgstr "Define a base de dados de cache."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:459
-msgid "PathPrefix"
-msgstr "PathPrefix"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:461
 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><term>
-#: apt-ftparchive.1.xml:464
-msgid "FileList, SourceFileList"
-msgstr "FileList, SourceFileList"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:466
 msgid "Specifies the file list file."
@@ -3164,12 +2670,6 @@ msgstr ""
 "seja adicionada ou substituída na saída. Tem 3 colunas, a primeira é o "
 "pacote, a segunda é a etiqueta e restante da linha é o novo valor."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:508
-msgid ""
-"<option>--md5</option>, <option>--sha1</option>, <option>--sha256</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:510
 #, fuzzy
@@ -3202,11 +2702,6 @@ msgstr ""
 "<literal>Architectures</literal>, <literal>Components</literal>, "
 "<literal>Description</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:519
-msgid "<option>--db</option>"
-msgstr "<option>--db</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:521
 msgid ""
@@ -3230,11 +2725,6 @@ msgstr ""
 "silêncio, sobrepondo o ficheiro de configuração. Item de Configuração: "
 "<literal>quiet</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:533
-msgid "<option>--delink</option>"
-msgstr "<option>--delink</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:535
 msgid ""
@@ -3248,11 +2738,6 @@ msgstr ""
 "predefinição é ligada e e pode ser desligada com <option>--no-delink</"
 "option>. Item de Configuração: <literal>APT::FTPArchive::DeLinkAct</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:541
-msgid "<option>--contents</option>"
-msgstr "<option>--contents</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:543
 msgid ""
@@ -3269,11 +2754,6 @@ msgstr ""
 "criação de quaisquer ficheiros de Conteúdos. A predefinição é ligado. Item "
 "de Configuração: <literal>APT::FTPArchive::Contents</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:551
-msgid "<option>--source-override</option>"
-msgstr "<option>--source-override</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:553
 msgid ""
@@ -3285,11 +2765,6 @@ msgstr ""
 "<literal>sources</literal>. Item de Configuração: <literal>APT::FTPArchive::"
 "SourceOverride</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:557
-msgid "<option>--readonly</option>"
-msgstr "<option>--readonly</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:559
 msgid ""
@@ -3299,11 +2774,6 @@ msgstr ""
 "Torna as bases de dados de cache apenas de leitura. Item de Configuração: "
 "<literal>APT::FTPArchive::ReadOnlyDB</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:563
-msgid "<option>--arch</option>"
-msgstr "<option>--arch</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:564
 msgid ""
@@ -3318,11 +2788,6 @@ msgstr ""
 "pacotes presentes no caminho fornecido. Item de Configuração: <literal>APT::"
 "FTPArchive::Architecture</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:570
-msgid "<option>APT::FTPArchive::AlwaysStat</option>"
-msgstr "<option>APT::FTPArchive::AlwaysStat</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:572
 msgid ""
@@ -3347,11 +2812,6 @@ msgstr ""
 "de versão, portanto em teoria ninguém irá ter estes problemas e então todas "
 "as verificações extras serão desnecessárias."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:582
-msgid "<option>APT::FTPArchive::LongDescription</option>"
-msgstr "<option>APT::FTPArchive::LongDescription</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:584
 msgid ""
@@ -3368,7 +2828,7 @@ msgstr ""
 "<filename>Translation-en</filename> só pode ser criado no comando generate."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:596 apt.conf.5.xml:1113 apt_preferences.5.xml:544
+#: apt-ftparchive.1.xml:596 apt.conf.5.xml:1113 apt_preferences.5.xml:545
 #: sources.list.5.xml:214
 msgid "Examples"
 msgstr "Examples"
@@ -3432,11 +2892,6 @@ msgstr ""
 "outras ferramentas que usam a biblioteca APT. Existem várias interfaces "
 "\"front-end\" como o &dselect;, &aptitude;, &synaptic; e &wajig;."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:48 apt-key.8.xml:119
-msgid "update"
-msgstr "update"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:49
 msgid ""
@@ -3461,11 +2916,6 @@ msgstr ""
 "note que a medição do processo total ira estar incorrecta pois o tamanho dos "
 "ficheiros de pacotes não pode ser conhecido com antecedência."
 
-#. type: <tag></tag>
-#: apt-get.8.xml:60 guide.sgml:121
-msgid "upgrade"
-msgstr "upgrade"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:61
 msgid ""
@@ -3492,11 +2942,6 @@ msgstr ""
 "para que o <command>apt-get</command> fique a saber que estão disponíveis "
 "novas versões de pacotes."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:73
-msgid "dselect-upgrade"
-msgstr "dselect-upgrade"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:74
 msgid ""
@@ -3513,11 +2958,6 @@ msgstr ""
 "dos pacotes disponíveis, e executa as acções necessárias para realizar esse "
 "estado (por exemplo, a remoção de pacotes antigos e a instalação de novos)."
 
-#. type: <tag></tag>
-#: apt-get.8.xml:83 guide.sgml:140
-msgid "dist-upgrade"
-msgstr "dist-upgrade"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:84
 msgid ""
@@ -3542,11 +2982,6 @@ msgstr ""
 "de pacotes desejados. Veja também &apt-preferences; para um mecanismo para "
 "sobrepor as definições gerais em pacotes individuais."
 
-#. type: <tag></tag>
-#: apt-get.8.xml:96 guide.sgml:131
-msgid "install"
-msgstr "install"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:98
 msgid ""
@@ -3649,11 +3084,6 @@ msgstr ""
 "lo' e 'lowest'. Se isto for indesejável, ancore a expressão regular com a "
 "caractere '^' ou '$', para criar uma expressão regular mais específica."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:150
-msgid "remove"
-msgstr "remove"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:151
 msgid ""
@@ -3669,11 +3099,6 @@ msgstr ""
 "mais (+) for acrescentado ao nome do pacote (sem nenhum espaço a separar), o "
 "pacote identificado será instalado em vez de removido."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:158
-msgid "purge"
-msgstr "purge"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:159
 msgid ""
@@ -3685,11 +3110,6 @@ msgstr ""
 "excepção que os pacotes são removidos e purgados (quaisquer ficheiros de "
 "configuração são também apagados)."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:163
-msgid "source"
-msgstr "source"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:164
 msgid ""
@@ -3771,11 +3191,6 @@ msgstr ""
 "existem apenas no directório actual e são semelhantes à descarga de tar "
 "balls fonte."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:197
-msgid "build-dep"
-msgstr "build-dep"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:198
 #, fuzzy
@@ -3792,11 +3207,6 @@ msgstr ""
 "<literal>build-dep</literal> faz o apt-get instalar/remover pacotes numa "
 "tentativa de satisfazer dependências de compilação para um pacote fonte."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:204
-msgid "check"
-msgstr "check"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:205
 msgid ""
@@ -3806,11 +3216,6 @@ msgstr ""
 "<literal>check</literal> é uma ferramenta de diagnóstico; actualiza a cache "
 "de pacotes e verifica por dependências quebradas."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:209
-msgid "download"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:210
 msgid ""
@@ -3837,11 +3242,6 @@ msgstr ""
 "querer executar <literal>apt-get clean</literal> de tempos a tempos para "
 "libertar espaço do disco."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:225
-msgid "autoclean"
-msgstr "autoclean"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:226
 msgid ""
@@ -3861,11 +3261,6 @@ msgstr ""
 "configuração <literal>APT::Clean-Installed</literal> irá prevenir que "
 "pacotes instalados sejam apagados se estiver definida para 'off'."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:235
-msgid "autoremove"
-msgstr "autoremove"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:236
 #, fuzzy
@@ -3882,29 +3277,20 @@ msgstr ""
 "instalados automaticamente para satisfazer dependências de algum pacote e "
 "que já não são necessários."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:240
-msgid "changelog"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:241
 msgid ""
 "<literal>changelog</literal> downloads a package changelog and displays it "
 "through <command>sensible-pager</command>. The server name and base "
 "directory is defined in the <literal>APT::Changelogs::Server</literal> "
-"variable (e. g. <ulink>http://packages.debian.org/changelogs</ulink> for "
-"Debian or <ulink>http://changelogs.ubuntu.com/changelogs</ulink> for "
-"Ubuntu).  By default it displays the changelog for the version that is "
+"variable (e. g. <ulink url=\"http://packages.debian.org/changelogs"
+"\">packages.debian.org/changelogs</ulink> for Debian or <ulink url=\"http://"
+"changelogs.ubuntu.com/changelogs\">changelogs.ubuntu.com/changelogs</ulink> "
+"for Ubuntu).  By default it displays the changelog for the version that is "
 "installed.  However, you can specify the same options as for the "
 "<option>install</option> command."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:263
-msgid "<option>--no-install-recommends</option>"
-msgstr "<option>--no-install-recommends</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:264
 msgid ""
@@ -3914,13 +3300,6 @@ msgstr ""
 "Não considera pacotes recomendados como dependências para instalação. Item "
 "de Configuração: <literal>APT::Install-Recommends</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:268
-#, fuzzy
-#| msgid "<option>--no-suggests</option>"
-msgid "<option>--install-suggests</option>"
-msgstr "<option>--no-suggests</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:269
 #, fuzzy
@@ -3934,11 +3313,6 @@ msgstr ""
 "Não considera pacotes recomendados como dependências para instalação. Item "
 "de Configuração: <literal>APT::Install-Recommends</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:273
-msgid "<option>--download-only</option>"
-msgstr "<option>--download-only</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:274
 msgid ""
@@ -3949,11 +3323,6 @@ msgstr ""
 "desempacotados nem instalados. Item de Configuração: <literal>APT::Get::"
 "Download-Only</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:278
-msgid "<option>--fix-broken</option>"
-msgstr "<option>--fix-broken</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:279
 msgid ""
@@ -3982,16 +3351,6 @@ msgstr ""
 "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><term>
-#: apt-get.8.xml:292
-msgid "<option>--ignore-missing</option>"
-msgstr "<option>--ignore-missing</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:293
-msgid "<option>--fix-missing</option>"
-msgstr "<option>--fix-missing</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:294
 msgid ""
@@ -4011,11 +3370,6 @@ msgstr ""
 "de comandos) e não pode ser descarregado estão será retido em silêncio. Item "
 "de Configuração: <literal>APT::Get::Fix-Missing</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:304
-msgid "<option>--no-download</option>"
-msgstr "<option>--no-download</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:305
 msgid ""
@@ -4047,16 +3401,6 @@ msgstr ""
 "pode decidir fazer algo que você não esperava. Item de Configuração: "
 "<literal>quiet</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:322
-msgid "<option>--simulate</option>"
-msgstr "<option>--simulate</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:324
-msgid "<option>--dry-run</option>"
-msgstr "<option>--dry-run</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:327
 msgid ""
@@ -4099,21 +3443,6 @@ msgstr ""
 "rectos ([]) indicam pacotes quebrados e conjuntos de parênteses rectos "
 "vazios significam quebras que não têm consequência (raro)."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:344
-msgid "<option>-y</option>"
-msgstr "<option>-y</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:344
-msgid "<option>--yes</option>"
-msgstr "<option>--yes</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:345
-msgid "<option>--assume-yes</option>"
-msgstr "<option>--assume-yes</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:346
 msgid ""
@@ -4130,13 +3459,6 @@ msgstr ""
 "literal> irá abortar. Item de Configuração: <literal>APT::Get::Assume-Yes</"
 "literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:353
-#, fuzzy
-#| msgid "<option>--assume-yes</option>"
-msgid "<option>--assume-no</option>"
-msgstr "<option>--assume-yes</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:354
 #, fuzzy
@@ -4150,16 +3472,6 @@ msgstr ""
 "Compila pacotes fonte após os descarregar. Item de Configuração: "
 "<literal>APT::Get::Compile</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:358
-msgid "<option>-u</option>"
-msgstr "<option>-u</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:358
-msgid "<option>--show-upgraded</option>"
-msgstr "<option>--show-upgraded</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:359
 msgid ""
@@ -4170,16 +3482,6 @@ msgstr ""
 "prestes a ser actualizados. Item de Configuração: <literal>APT::Get::Show-"
 "Upgraded</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:364
-msgid "<option>-V</option>"
-msgstr "<option>-V</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:364
-msgid "<option>--verbose-versions</option>"
-msgstr "<option>--verbose-versions</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:365
 msgid ""
@@ -4189,13 +3491,6 @@ msgstr ""
 "Mostra as versões completas para pacotes actualizados e instalados.  Item de "
 "Configuração: <literal>APT::Get::Show-Versions</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:370
-#, fuzzy
-#| msgid "<option>--recurse</option>"
-msgid "<option>--host-architecture</option>"
-msgstr "<option>--recurse</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:371
 msgid ""
@@ -4207,21 +3502,6 @@ msgid ""
 "Architecture</literal>"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:379
-msgid "<option>-b</option>"
-msgstr "<option>-b</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:379
-msgid "<option>--compile</option>"
-msgstr "<option>--compile</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:380
-msgid "<option>--build</option>"
-msgstr "<option>--build</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:381
 msgid ""
@@ -4231,11 +3511,6 @@ msgstr ""
 "Compila pacotes fonte após os descarregar. Item de Configuração: "
 "<literal>APT::Get::Compile</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:385
-msgid "<option>--ignore-hold</option>"
-msgstr "<option>--ignore-hold</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:386
 msgid ""
@@ -4249,11 +3524,6 @@ msgstr ""
 "upgrade</literal> para sobrepor um grande número de retenções não desejadas. "
 "Item de Configuração: <literal>APT::Ignore-Hold</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:392
-msgid "<option>--no-upgrade</option>"
-msgstr "<option>--no-upgrade</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:393
 msgid ""
@@ -4267,11 +3537,6 @@ msgstr ""
 "actualizados na linha de comandos se estes já estiverem instalados. Item de "
 "Configuração: <literal>APT::Get::Upgrade</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:399
-msgid "<option>--only-upgrade</option>"
-msgstr "<option>--only-upgrade</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:400
 #, fuzzy
@@ -4291,11 +3556,6 @@ msgstr ""
 "actualizados na linha de comandos se estes não estiverem já instalados. Item "
 "de Configuração: <literal>APT::Get::Only-Upgrade</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:407
-msgid "<option>--force-yes</option>"
-msgstr "<option>--force-yes</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:408
 msgid ""
@@ -4311,11 +3571,6 @@ msgstr ""
 "literal> pode destruir potencialmente o seu sistema! Item de Configuração: "
 "<literal>APT::Get::force-yes</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:415
-msgid "<option>--print-uris</option>"
-msgstr "<option>--print-uris</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:416
 msgid ""
@@ -4337,11 +3592,6 @@ msgstr ""
 "cabe ao utilizador descomprimir quaisquer ficheiros comprimidos. Item de "
 "Configuração: <literal>APT::Get::Print-URIs</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:426
-msgid "<option>--purge</option>"
-msgstr "<option>--purge</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:427
 msgid ""
@@ -4355,11 +3605,6 @@ msgstr ""
 "<option>remove --purge</option> é equivalente ao comando <option>purge</"
 "option>. Item de Configuração: <literal>APT::Get::Purge</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:434
-msgid "<option>--reinstall</option>"
-msgstr "<option>--reinstall</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:435
 msgid ""
@@ -4369,11 +3614,6 @@ msgstr ""
 "Re-instala pacotes que já estão instalados e na versão mais recente. Item de "
 "Configuração: <literal>APT::Get::ReInstall</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:439
-msgid "<option>--list-cleanup</option>"
-msgstr "<option>--list-cleanup</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:440
 msgid ""
@@ -4391,16 +3631,6 @@ msgstr ""
 "desligar isto é no caso de você alterar frequentemente a sua lista de "
 "fontes. Item de Configuração: <literal>APT::Get::List-Cleanup</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:449
-msgid "<option>--target-release</option>"
-msgstr "<option>--target-release</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:450
-msgid "<option>--default-release</option>"
-msgstr "<option>--default-release</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:451
 msgid ""
@@ -4424,11 +3654,6 @@ msgstr ""
 "<option>-t sid</option>. Item de Configuração: <literal>APT::Default-"
 "Release</literal>; veja também o manual &apt-preferences;."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:464
-msgid "<option>--trivial-only</option>"
-msgstr "<option>--trivial-only</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:466
 msgid ""
@@ -4443,11 +3668,6 @@ msgstr ""
 "option> irá responder 'não'. Item de Configuração: <literal>APT::Get::"
 "Trivial-Only</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:472
-msgid "<option>--no-remove</option>"
-msgstr "<option>--no-remove</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:473
 msgid ""
@@ -4458,11 +3678,6 @@ msgstr ""
 "imediatamente sem aviso. Item de Configuração: <literal>APT::Get::Remove</"
 "literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:478
-msgid "<option>--auto-remove</option>"
-msgstr "<option>--auto-remove</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:479
 msgid ""
@@ -4476,11 +3691,6 @@ msgstr ""
 "literal>, removendo os pacotes de dependências não utilizados. Item de "
 "Configuração: <literal>APT::Get::AutomaticRemove</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:485
-msgid "<option>--only-source</option>"
-msgstr "<option>--only-source</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:486
 msgid ""
@@ -4500,21 +3710,6 @@ msgstr ""
 "e procurar o pacote fonte correspondente. Item de Configuração: "
 "<literal>APT::Get::Only-Source</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:496
-msgid "<option>--diff-only</option>"
-msgstr "<option>--diff-only</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:496
-msgid "<option>--dsc-only</option>"
-msgstr "<option>--dsc-only</option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:496
-msgid "<option>--tar-only</option>"
-msgstr "<option>--tar-only</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:497
 msgid ""
@@ -4526,11 +3721,6 @@ msgstr ""
 "Configuração: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-"
 "Only</literal>, e <literal>APT::Get::Tar-Only</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:502
-msgid "<option>--arch-only</option>"
-msgstr "<option>--arch-only</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:503
 msgid ""
@@ -4540,11 +3730,6 @@ msgstr ""
 "Apenas processa dependências de compilação dependentes da arquitectura. Item "
 "de Configuração: <literal>APT::Get::Arch-Only</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:507
-msgid "<option>--allow-unauthenticated</option>"
-msgstr "<option>--allow-unauthenticated</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:508
 msgid ""
@@ -4631,11 +3816,6 @@ msgstr ""
 msgid "Commands"
 msgstr "Comandos"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:40
-msgid "add &synopsis-param-filename;"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml:43
 #, fuzzy
@@ -4652,21 +3832,11 @@ msgstr ""
 "<replaceable>nome de ficheiro</replaceable>, ou entrada standard se "
 "<replaceable>nome de ficheiro</replaceable> for <literal>-</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:52
-msgid "del &synopsis-param-keyid;"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml:56
 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><term>
-#: apt-key.8.xml:63
-msgid "export &synopsis-param-keyid;"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml:67
 #, fuzzy
@@ -4675,41 +3845,21 @@ msgid "Output the key &synopsis-param-keyid; to standard output."
 msgstr ""
 "Escreve o <replaceable>id de chave</replaceable> da chave na saída standard."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:74
-msgid "exportall"
-msgstr "exportall"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml:78
 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><term>
-#: apt-key.8.xml:85
-msgid "list"
-msgstr "list"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml:89
 msgid "List trusted keys."
 msgstr "Lista as chaves de confiança."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:96
-msgid "finger"
-msgstr "finger"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml:100
 msgid "List fingerprints of trusted keys."
 msgstr "Lista as fingerprints das chaves de confiança."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:107
-msgid "adv"
-msgstr "adv"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml:111
 msgid ""
@@ -4729,13 +3879,6 @@ msgid ""
 "Debian."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:133
-#, fuzzy
-#| msgid "update"
-msgid "net-update"
-msgstr "update"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml:137
 msgid ""
@@ -4756,11 +3899,6 @@ msgstr ""
 "Note que as opções precisam ser definidas antes dos comandos descritos na "
 "secção prévia."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:156
-msgid "--keyring &synopsis-param-filename;"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml:157
 #, fuzzy
@@ -4877,13 +4015,6 @@ msgstr ""
 "pacote instalado manualmente, eles serão removidos pelo <command>apt-get</"
 "command> ou <command>aptitude</command> (exemplos)."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:51
-#, fuzzy
-#| msgid "markauto"
-msgid "auto"
-msgstr "markauto"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml:52
 #, fuzzy
@@ -4900,11 +4031,6 @@ msgstr ""
 "instalado automaticamente, o que irá causar a remoção do pacote quando mais "
 "nenhum pacote instalado manualmente depender deste pacote."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:59
-msgid "manual"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml:60
 #, fuzzy
@@ -4921,11 +4047,6 @@ msgstr ""
 "instalado manualmente, o que irá prevenir que o pacote seja removido "
 "automaticamente se nenhum outro pacote depender dele."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:67
-msgid "hold"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml:68
 msgid ""
@@ -4936,11 +4057,6 @@ msgid ""
 "effected by the <option>--filename</option> option."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:77
-msgid "unhold"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml:78
 #, fuzzy
@@ -4954,11 +4070,6 @@ msgstr ""
 "<literal>showauto</literal> é usado para escrever uma lista dos pacotes "
 "instalados automaticamente com cada pacote numa linha nova."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:83
-msgid "showauto"
-msgstr "showauto"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml:84
 #, fuzzy
@@ -4974,13 +4085,6 @@ msgstr ""
 "<literal>showauto</literal> é usado para escrever uma lista dos pacotes "
 "instalados automaticamente com cada pacote numa linha nova."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:91
-#, fuzzy
-#| msgid "showauto"
-msgid "showmanual"
-msgstr "showauto"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml:92
 msgid ""
@@ -4989,13 +4093,6 @@ msgid ""
 "installed packages instead."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:98
-#, fuzzy
-#| msgid "showauto"
-msgid "showhold"
-msgstr "showauto"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml:99
 #, fuzzy
@@ -5009,30 +4106,27 @@ msgstr ""
 "<literal>showauto</literal> é usado para escrever uma lista dos pacotes "
 "instalados automaticamente com cada pacote numa linha nova."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:112
-msgid ""
-"<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>"
-msgstr ""
-"<option>-f=<filename><replaceable>NOME DE FICHEIRO</replaceable></filename></"
-"option>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:113
-msgid ""
-"<option>--file=<filename><replaceable>FILENAME</replaceable></filename></"
-"option>"
-msgstr ""
-"<option>--file=<filename><replaceable>NOME DE FICHEIRO</replaceable></"
-"filename></option>"
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><filename>
+#: apt-mark.8.xml:112 apt-mark.8.xml:113
+#, fuzzy
+#| msgid "xvcg <replaceable>pkg(s)</replaceable>"
+msgid "<replaceable>&synopsis-filename;</replaceable>"
+msgstr "xvcg <replaceable>pacote(s)</replaceable>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:116
-msgid ""
-"Read/Write package stats from <filename><replaceable>FILENAME</replaceable></"
-"filename> instead of the default location, which is "
-"<filename>extended_status</filename> in the directory defined by the "
-"Configuration Item: <literal>Dir::State</literal>."
+#: apt-mark.8.xml:115
+#, fuzzy
+#| msgid ""
+#| "Read/Write package stats from <filename><replaceable>FILENAME</"
+#| "replaceable></filename> instead of the default location, which is "
+#| "<filename>extended_status</filename> in the directory defined by the "
+#| "Configuration Item: <literal>Dir::State</literal>."
+msgid ""
+"Read/Write package stats from the filename given with the parameter "
+"<filename><replaceable>&synopsis-filename;</replaceable></filename> instead "
+"of from the default location, which is <filename>extended_status</filename> "
+"in the directory defined by the Configuration Item: <literal>Dir::State</"
+"literal>."
 msgstr ""
 "Lê/Escreve o estado de pacote a partir de "
 "<filename><replaceable>NOME_DE_FICHEIRO</replaceable></filename> em vez da "
@@ -5425,11 +4519,6 @@ msgstr ""
 "Todas as saídas são enviadas para o stdout, a entrada tem de ser um ficheiro "
 "pesquisável."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-sortpkgs.1.xml:52
-msgid "<option>--source</option>"
-msgstr "<option>--source</option>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-sortpkgs.1.xml:54
 msgid ""
@@ -5784,11 +4873,6 @@ msgstr ""
 "Este grupo de opções controla o comportamento geral do APT assim como mantém "
 "as opções para todas as ferramentas."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:151
-msgid "Architecture"
-msgstr "Architecture"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:152
 msgid ""
@@ -5813,11 +4897,6 @@ msgid ""
 "architectures</command>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:167
-msgid "Default-Release"
-msgstr "Default-Release"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:168
 msgid ""
@@ -5831,11 +4910,6 @@ msgstr ""
 "lançamento. Exemplos: 'stable', 'testing', 'unstable', '&stable-codename;', "
 "'&testing-codename;', '4.0', '5.0*'. Veja também &apt-preferences;."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:173
-msgid "Ignore-Hold"
-msgstr "Ignore-Hold"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:174
 msgid ""
@@ -5845,11 +4919,6 @@ msgstr ""
 "Ignore Held packages; Esta opção global faz com que ao resolver problemas, "
 "os pacotes segurados sejam ignorados na sua decisão de marcação."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:178
-msgid "Clean-Installed"
-msgstr "Clean-Installed"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:179
 msgid ""
@@ -5864,11 +4933,6 @@ msgstr ""
 "também excluídos da limpeza - mas note que o APT não disponibiliza um meio "
 "directo de os reinstalar."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:185
-msgid "Immediate-Configure"
-msgstr "Immediate-Configure"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:186
 msgid ""
@@ -5933,11 +4997,6 @@ msgstr ""
 "do APT com o link de bug abaixo para que possam trabalhar na melhoria ou "
 "correcção do processo de actualização."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:208
-msgid "Force-LoopBreak"
-msgstr "Force-LoopBreak"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:209
 msgid ""
@@ -5955,11 +5014,6 @@ msgstr ""
 "GRAVE BUG. Esta opção deverá funcionar se os pacotes essenciais não forem "
 "tar, gzip, libc, dpkg, bash ou qualquer coisa de que estes dependem."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:217
-msgid "Cache-Start, Cache-Grow and Cache-Limit"
-msgstr "Cache-Start, Cache-Grow e Cache-Limit"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:218
 #, fuzzy
@@ -6015,11 +5069,6 @@ msgstr ""
 "<literal>Cache-Grow</literal> for definido para 0, o crescimento automático "
 "da cache é desactivado."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:233
-msgid "Build-Essential"
-msgstr "Build-Essential"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:234
 msgid "Defines which package(s) are considered essential build dependencies."
@@ -6027,11 +5076,6 @@ msgstr ""
 "Define quais pacote(s) são considerados dependências essenciais de "
 "compilação."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:237
-msgid "Get"
-msgstr "Get"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:238
 msgid ""
@@ -6041,11 +5085,6 @@ msgstr ""
 "A subsecção Get controla a ferramenta &apt-get;, por favor veja a sua "
 "documentação para mais informação acerca das opções daqui."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:242
-msgid "Cache"
-msgstr "Cache"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:243
 msgid ""
@@ -6055,11 +5094,6 @@ msgstr ""
 "A subsecção Cache controla a ferramenta &apt-cache;, por favor veja a sua "
 "documentação para mais informação acerca das opções daqui."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:247
-msgid "CDROM"
-msgstr "CDROM"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:248
 msgid ""
@@ -6074,11 +5108,6 @@ msgstr ""
 msgid "The Acquire Group"
 msgstr "O Grupo Acquire"
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:259
-msgid "Check-Valid-Until"
-msgstr "Check-Valid-Until"
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:260
 msgid ""
@@ -6100,11 +5129,6 @@ msgstr ""
 "preferir-se um valor mais rigoroso pode-se usar a opção <literal>Max-"
 "ValidTime</literal> seguinte."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:270
-msgid "Max-ValidTime"
-msgstr "Max-ValidTime"
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:271
 #, fuzzy
@@ -6136,13 +5160,6 @@ msgstr ""
 "Definições específicas do Arquivo podem ser feitas ao adicionar a etiqueta "
 "do arquivo ao nome da opção. "
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:281
-#, fuzzy
-#| msgid "Max-ValidTime"
-msgid "Min-ValidTime"
-msgstr "Max-ValidTime"
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:282
 #, fuzzy
@@ -6174,11 +5191,6 @@ msgstr ""
 "Definições específicas do Arquivo podem ser feitas ao adicionar a etiqueta "
 "do arquivo ao nome da opção. "
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:292
-msgid "PDiffs"
-msgstr "PDiffs"
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:293
 msgid ""
@@ -6214,11 +5226,6 @@ msgstr ""
 "as patches comparadas com o tamanho do ficheiro de destino. Se um destes "
 "limites for excedido, é descarregado o ficheiro completo em vez das patches."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:305
-msgid "Queue-Mode"
-msgstr "Queue-Mode"
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:306
 msgid ""
@@ -6234,11 +5241,6 @@ msgstr ""
 "ligação por máquina destino, <literal>access</literal> significa que será "
 "aberta uma ligação por tipo de URI."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:313
-msgid "Retries"
-msgstr "Retries"
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:314
 msgid ""
@@ -6248,11 +5250,6 @@ msgstr ""
 "Número de tentativas a executar. Se isto for diferente de zero o APT irá "
 "tentar, no número fornecido de vezes, obter ficheiros falhados."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:318
-msgid "Source-Symlinks"
-msgstr "Source-Symlinks"
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:319
 msgid ""
@@ -6263,11 +5260,6 @@ msgstr ""
 "os arquivos fonte serão links simbólicos, quando possível, em vez de cópias. "
 "A predefinição é verdadeiro."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:323 sources.list.5.xml:160
-msgid "http"
-msgstr "http"
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:324
 msgid ""
@@ -6367,11 +5359,6 @@ msgstr ""
 "alguns proxies apenas permitem acesso a clientes se o cliente usar um "
 "identificador conhecido."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:366
-msgid "https"
-msgstr "https"
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:367
 msgid ""
@@ -6424,11 +5411,6 @@ msgstr ""
 "predefinida a usar. Pode conter strings 'TLSv1' ou 'SSLv3'. <literal>&lt;"
 "host&gt;::SslForceVersion</literal> é a opção po máquina correspondente."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:391 sources.list.5.xml:171
-msgid "ftp"
-msgstr "ftp"
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:392
 msgid ""
@@ -6507,11 +5489,6 @@ msgstr ""
 "controle for IPv6. Definir isto para verdadeiro força o seu uso mesmo em "
 "ligações IPv4. Note que a maioria dos servidores FTP não suporta RFC2428."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:430 sources.list.5.xml:153
-msgid "cdrom"
-msgstr "cdrom"
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
 #: apt.conf.5.xml:436
 #, no-wrap
@@ -6539,11 +5516,6 @@ msgstr ""
 "\" id=\"0\"/> dentro do bloco cdrom. É importante ter a barra final. "
 "Comandos para desmontar podem ser especificados usando UMount."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:441
-msgid "gpgv"
-msgstr "gpgv"
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:442
 msgid ""
@@ -6555,11 +5527,6 @@ msgstr ""
 "adicionais ao gpgv. <literal>gpgv::Options</literal> Opções adicionais "
 "passadas ao gpgv."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:447
-msgid "CompressionTypes"
-msgstr "CompressionTypes"
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
 #: apt.conf.5.xml:453
 #, no-wrap
@@ -6679,11 +5646,6 @@ msgid ""
 "uncompressed files so this is mostly only useable for local mirrors."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:475
-msgid "GzipIndexes"
-msgstr "GzipIndexes"
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:477
 msgid ""
@@ -6697,11 +5659,6 @@ msgstr ""
 "desempacotar. Isto poupa imenso espaço no disco à custa de mais pedidos à "
 "CPU quando constrói as caches de pacotes locais. Falso por predefinição."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:484
-msgid "Languages"
-msgstr "Languages"
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:485
 msgid ""
@@ -6941,11 +5898,6 @@ msgstr ""
 "configuração controlam o comportamento predefinido. Estas estão na secção "
 "<literal>DSelect</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:577
-msgid "Clean"
-msgstr "Clean"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:578
 msgid ""
@@ -6972,11 +5924,6 @@ msgstr ""
 "O conteúdo desta variável é passado ao &apt-get; como opções de linha de "
 "comandos quando é corrido para a fase de instalação."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:591
-msgid "Updateoptions"
-msgstr "Updateoptions"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:592
 msgid ""
@@ -6986,11 +5933,6 @@ msgstr ""
 "O conteúdo desta variável é passado ao &apt-get; como opções de linha de "
 "comandos quando é executado para a fase de actualização."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:596
-msgid "PromptAfterUpdate"
-msgstr "PromptAfterUpdate"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:597
 msgid ""
@@ -7025,16 +5967,6 @@ msgstr ""
 "especificadas usando a notação de lista e cada item da lista é passado como "
 "um argumento único ao &dpkg;."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:614
-msgid "Pre-Invoke"
-msgstr "Pre-Invoke"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:614
-msgid "Post-Invoke"
-msgstr "Post-Invoke"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:615
 msgid ""
@@ -7048,11 +5980,6 @@ msgstr ""
 "em notação listada. Os  comandos são invocados em ordem usando <filename>/"
 "bin/sh</filename>, caso algum deles falhe, o APT irá abortar."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:621
-msgid "Pre-Install-Pkgs"
-msgstr "Pre-Install-Pkgs"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:622
 msgid ""
@@ -7084,11 +6011,6 @@ msgstr ""
 "options::cmd::Version</literal> a 2. <literal>cmd</literal> é um comando "
 "dado ao <literal>Pre-Install-Pkgs</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:635
-msgid "Run-Directory"
-msgstr "Run-Directory"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:636
 msgid ""
@@ -7098,11 +6020,6 @@ msgstr ""
 "O APT muda para este directório (chdir) antes de invocar o dpkg, a "
 "predefinição é <filename>/</filename>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:640
-msgid "Build-options"
-msgstr "Build-options"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:641
 msgid ""
@@ -7194,11 +6111,6 @@ msgstr ""
 "combinação de opções defensiva seria <placeholder type=\"literallayout\" id="
 "\"0\"/>"
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:668
-msgid "DPkg::NoTriggers"
-msgstr "DPkg::NoTriggers"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:669
 msgid ""
@@ -7220,11 +6132,6 @@ msgstr ""
 "configure para o dpkg - agora o apt irá adicionar esta bandeira também às "
 "chamadas unpack e remove."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:676
-msgid "PackageManager::Configure"
-msgstr "PackageManager::Configure"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:677
 msgid ""
@@ -7253,11 +6160,6 @@ msgstr ""
 "caso contrário o sistema poderia acabar num estado não configurado o qual "
 "poderia não arrancar!"
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:687
-msgid "DPkg::ConfigurePending"
-msgstr "DPkg::ConfigurePending"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:688
 msgid ""
@@ -7276,11 +6178,6 @@ msgstr ""
 "vezes numa fila - ex. numa instalação. Nestes cenários você pode desactivar "
 "esta opção em todas excepto na última execução."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:694
-msgid "DPkg::TriggersPending"
-msgstr "DPkg::TriggersPending"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:695
 msgid ""
@@ -7297,11 +6194,6 @@ msgstr ""
 "processar todos os triggers, e não apenas os triggers necessários para "
 "configurar este pacote."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:700
-msgid "PackageManager::UnpackAll"
-msgstr "PackageManager::UnpackAll"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:701
 msgid ""
@@ -7321,11 +6213,6 @@ msgstr ""
 "<literal>OrderCritical</literal> não foi usado, portanto este método é muito "
 "experimental e necessita de mais melhorias antes de se tornar realmente útil."
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:708
-msgid "OrderList::Score::Immediate"
-msgstr "OrderList::Score::Immediate"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
 #: apt.conf.5.xml:716
 #, no-wrap
@@ -7456,11 +6343,6 @@ msgstr ""
 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><term>
-#: apt.conf.5.xml:791
-msgid "<literal>Debug::Acquire::cdrom</literal>"
-msgstr "<literal>Debug::Acquire::cdrom</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:795
 msgid ""
@@ -7469,44 +6351,24 @@ msgstr ""
 "Escreve informação relacionada com o acesso a fontes de <literal>cdrom://</"
 "literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:802
-msgid "<literal>Debug::Acquire::ftp</literal>"
-msgstr "<literal>Debug::Acquire::ftp</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:806
 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><term>
-#: apt.conf.5.xml:813
-msgid "<literal>Debug::Acquire::http</literal>"
-msgstr "<literal>Debug::Acquire::http</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:817
 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><term>
-#: apt.conf.5.xml:824
-msgid "<literal>Debug::Acquire::https</literal>"
-msgstr "<literal>Debug::Acquire::https</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:828
 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><term>
-#: apt.conf.5.xml:835
-msgid "<literal>Debug::Acquire::gpgv</literal>"
-msgstr "<literal>Debug::Acquire::gpgv</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:839
 msgid ""
@@ -7516,11 +6378,6 @@ msgstr ""
 "Escreve informação relacionada com a verificação de assinaturas "
 "criptográficas usando <literal>gpg</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:846
-msgid "<literal>Debug::aptcdrom</literal>"
-msgstr "<literal>Debug::aptcdrom</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:850
 msgid ""
@@ -7530,22 +6387,12 @@ msgstr ""
 "Escreve informação acerca do processo de aceder a colecções de pacotes "
 "armazenados em CD-ROMs."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:857
-msgid "<literal>Debug::BuildDeps</literal>"
-msgstr "<literal>Debug::BuildDeps</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:860
 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><term>
-#: apt.conf.5.xml:867
-msgid "<literal>Debug::Hashes</literal>"
-msgstr "<literal>Debug::Hashes</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:870
 msgid ""
@@ -7555,11 +6402,6 @@ msgstr ""
 "Escreve cada hash criptográfico que é gerado pelas bibliotecas do "
 "<literal>apt</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:877
-msgid "<literal>Debug::IdentCDROM</literal>"
-msgstr "<literal>Debug::IdentCDROM</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:880
 msgid ""
@@ -7571,11 +6413,6 @@ msgstr ""
 "blocos usados e livres no sistema de ficheiros do CD-ROM, quando gera um ID "
 "para um CD-ROM."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:888
-msgid "<literal>Debug::NoLocking</literal>"
-msgstr "<literal>Debug::NoLocking</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:891
 msgid ""
@@ -7586,11 +6423,6 @@ msgstr ""
 "funcionamento de duas instâncias do <quote><literal>apt-get update</"
 "literal></quote> ao mesmo tempo."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:899
-msgid "<literal>Debug::pkgAcquire</literal>"
-msgstr "<literal>Debug::pkgAcquire</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:903
 msgid "Log when items are added to or removed from the global download queue."
@@ -7598,11 +6430,6 @@ msgstr ""
 "Regista no log quando os items são adicionados ou removidos da fila de "
 "download global."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:910
-msgid "<literal>Debug::pkgAcquire::Auth</literal>"
-msgstr "<literal>Debug::pkgAcquire::Auth</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:913
 msgid ""
@@ -7612,11 +6439,6 @@ msgstr ""
 "Escreve mensagens de estado e erros relacionados com a verificação de "
 "checksums e assinaturas criptográficas dos ficheiros descarregados."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:920
-msgid "<literal>Debug::pkgAcquire::Diffs</literal>"
-msgstr "<literal>Debug::pkgAcquire::Diffs</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:923
 msgid ""
@@ -7627,11 +6449,6 @@ msgstr ""
 "índice do pacote, e erros relacionados com as diffs de lista de índice do "
 "pacote."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:931
-msgid "<literal>Debug::pkgAcquire::RRed</literal>"
-msgstr "<literal>Debug::pkgAcquire::RRed</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:935
 msgid ""
@@ -7641,11 +6458,6 @@ msgstr ""
 "Escreve informação relacionada com a aplicação de patch na lista de pacotes "
 "do apt quando se descarrega diffs de índice em vez de índices completos."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:942
-msgid "<literal>Debug::pkgAcquire::Worker</literal>"
-msgstr "<literal>Debug::pkgAcquire::Worker</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:946
 msgid ""
@@ -7654,11 +6466,6 @@ msgstr ""
 "Regista todas as interacções com os sub-processos que realmente executam os "
 "downloads."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:953
-msgid "<literal>Debug::pkgAutoRemove</literal>"
-msgstr "<literal>Debug::pkgAutoRemove</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:957
 msgid ""
@@ -7668,11 +6475,6 @@ msgstr ""
 "Regista no log eventos relacionados com o estado instalado-automaticamente "
 "de pacotes e com a remoção de pacotes não utilizados."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:964
-msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>"
-msgstr "<literal>Debug::pkgDepCache::AutoInstall</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:967
 msgid ""
@@ -7688,11 +6490,6 @@ msgstr ""
 "literal>, e não ao resolvedor de dependências total do <literal>apt</"
 "literal>; veja <literal>Debug::pkgProblemResolver</literal> para isso."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:978
-msgid "<literal>Debug::pkgDepCache::Marker</literal>"
-msgstr "<literal>Debug::pkgDepCache::Marker</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:981
 msgid ""
@@ -7723,21 +6520,11 @@ msgstr ""
 "que aquela instalada. <literal>section</literal> é o nome da secção onde o "
 "pacote aparece."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1000
-msgid "<literal>Debug::pkgInitConfig</literal>"
-msgstr "<literal>Debug::pkgInitConfig</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:1003
 msgid "Dump the default configuration to standard error on startup."
 msgstr "Despeja a configuração predefinida para o erro standard no arranque."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1010
-msgid "<literal>Debug::pkgDPkgPM</literal>"
-msgstr "<literal>Debug::pkgDPkgPM</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:1013
 msgid ""
@@ -7748,11 +6535,6 @@ msgstr ""
 "está a ser invocado, com argumentos separados por um caractere de espaço "
 "único."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1021
-msgid "<literal>Debug::pkgDPkgProgressReporting</literal>"
-msgstr "<literal>Debug::pkgDPkgProgressReporting</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:1024
 msgid ""
@@ -7762,11 +6544,6 @@ msgstr ""
 "Escreve todos os dados recebidos do &dpkg; no descritor de ficheiro de "
 "estado e quaisquer erros encontrados enquanto os analisa."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1031
-msgid "<literal>Debug::pkgOrderList</literal>"
-msgstr "<literal>Debug::pkgOrderList</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:1035
 msgid ""
@@ -7776,11 +6553,6 @@ msgstr ""
 "Gera um rastro do algoritmo que decide a ordem na qual o <literal>apt</"
 "literal> deve passar os pacotes ao &dpkg;."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1043
-msgid "<literal>Debug::pkgPackageManager</literal>"
-msgstr "<literal>Debug::pkgPackageManager</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:1047
 msgid ""
@@ -7789,21 +6561,11 @@ msgstr ""
 "Escreve mensagens de estado seguindo os passos executados quando invoca o "
 "&dpkg;."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1054
-msgid "<literal>Debug::pkgPolicy</literal>"
-msgstr "<literal>Debug::pkgPolicy</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:1058
 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><term>
-#: apt.conf.5.xml:1064
-msgid "<literal>Debug::pkgProblemResolver</literal>"
-msgstr "<literal>Debug::pkgProblemResolver</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:1068
 msgid ""
@@ -7813,11 +6575,6 @@ msgstr ""
 "Rastreia a execução do resolvedor de dependências (isto só se aplica ao que "
 "acontece quando é encontrado um problema de dependências complexo)."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1076
-msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>"
-msgstr "<literal>Debug::pkgProblemResolver::ShowScores</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:1079
 msgid ""
@@ -7829,11 +6586,6 @@ msgstr ""
 "calculadas usadas pelo pkgProblemResolver. A descrição do do pacote é a "
 "mesma que é descrita em <literal>Debug::pkgDepCache::Marker</literal>"
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1087
-msgid "<literal>Debug::sourceList</literal>"
-msgstr "<literal>Debug::sourceList</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:1091
 msgid ""
@@ -8479,30 +7231,29 @@ msgstr ""
 "Pin: release a=unstable\n"
 "Pin-Priority: 50\n"
 
-#. type: Content of: <refentry><refsect1><refsect2><literal>
-#: apt_preferences.5.xml:290
-#, fuzzy
-#| msgid "Packages"
-msgid "Package"
-msgstr "Packages"
-
-#. type: Content of: <refentry><refsect1><refsect2><literal>
-#: apt_preferences.5.xml:296
-msgid "*"
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt_preferences.5.xml:291
+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 "
+"of all package names it matches. It is undecided whether this will change in "
+"the future, thus you should always list wild-card pins first, so later "
+"specific pins override it.  The pattern \"<literal>*</literal>\" in a "
+"Package field is not considered a glob() expression in itself."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:306
+#: apt_preferences.5.xml:307
 msgid "How APT Interprets Priorities"
 msgstr "Como o APT Interpreta as Prioridades"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:314
+#: apt_preferences.5.xml:315
 msgid "P &gt; 1000"
 msgstr "P &gt; 1000"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:315
+#: apt_preferences.5.xml:316
 msgid ""
 "causes a version to be installed even if this constitutes a downgrade of the "
 "package"
@@ -8511,12 +7262,12 @@ msgstr ""
 "na versão do pacote (downgrade)"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:319
+#: apt_preferences.5.xml:320
 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:320
+#: apt_preferences.5.xml:321
 msgid ""
 "causes a version to be installed even if it does not come from the target "
 "release, unless the installed version is more recent"
@@ -8525,12 +7276,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:325
+#: apt_preferences.5.xml:326
 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:326
+#: apt_preferences.5.xml:327
 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"
@@ -8540,12 +7291,12 @@ msgstr ""
 "mais recente"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:331
+#: apt_preferences.5.xml:332
 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:332
+#: apt_preferences.5.xml:333
 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"
@@ -8555,12 +7306,12 @@ msgstr ""
 "recente"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:337
+#: apt_preferences.5.xml:338
 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:338
+#: apt_preferences.5.xml:339
 msgid ""
 "causes a version to be installed only if there is no installed version of "
 "the package"
@@ -8569,17 +7320,17 @@ msgstr ""
 "instalada do pacote"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:342
+#: apt_preferences.5.xml:343
 msgid "P &lt; 0"
 msgstr "P &lt; 0"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:343
+#: apt_preferences.5.xml:344
 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:309
+#: apt_preferences.5.xml:310
 msgid ""
 "Priorities (P) assigned in the APT preferences file must be positive or "
 "negative integers.  They are interpreted as follows (roughly speaking): "
@@ -8590,7 +7341,7 @@ msgstr ""
 "(falando grosso): <placeholder type=\"variablelist\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:348
+#: apt_preferences.5.xml:349
 msgid ""
 "If any specific-form records match an available package version then the "
 "first such record determines the priority of the package version.  Failing "
@@ -8604,7 +7355,7 @@ msgstr ""
 "determina a prioridade da versão de pacote."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:354
+#: apt_preferences.5.xml:355
 msgid ""
 "For example, suppose the APT preferences file contains the three records "
 "presented earlier:"
@@ -8613,7 +7364,7 @@ msgstr ""
 "registos apresentados atrás:"
 
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:358
+#: apt_preferences.5.xml:359
 #, no-wrap
 msgid ""
 "Package: perl\n"
@@ -8641,12 +7392,12 @@ msgstr ""
 "Pin-Priority: 50\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:371
+#: apt_preferences.5.xml:372
 msgid "Then:"
 msgstr "Então:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:373
+#: apt_preferences.5.xml:374
 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 "
@@ -8661,7 +7412,7 @@ msgstr ""
 "downgrade ao <literal>perl</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:378
+#: apt_preferences.5.xml:379
 msgid ""
 "A version of any package other than <literal>perl</literal> that is "
 "available from the local system has priority over other versions, even "
@@ -8672,7 +7423,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:382
+#: apt_preferences.5.xml:383
 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</"
@@ -8685,12 +7436,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:392
+#: apt_preferences.5.xml:393
 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:394
+#: apt_preferences.5.xml:395
 msgid ""
 "The locations listed in the &sources-list; file should provide "
 "<filename>Packages</filename> and <filename>Release</filename> files to "
@@ -8701,27 +7452,27 @@ msgstr ""
 "descrever os pacotes disponíveis nessa localização."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:406
+#: apt_preferences.5.xml:407
 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:407
+#: apt_preferences.5.xml:408
 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:410 apt_preferences.5.xml:460
+#: apt_preferences.5.xml:411 apt_preferences.5.xml:461
 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:411
+#: apt_preferences.5.xml:412
 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:398
+#: apt_preferences.5.xml:399
 msgid ""
 "The <filename>Packages</filename> file is normally found in the directory "
 "<filename>.../dists/<replaceable>dist-name</replaceable>/"
@@ -8742,12 +7493,12 @@ msgstr ""
 "definir prioridades do APT: <placeholder type=\"variablelist\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:427
+#: apt_preferences.5.xml:428
 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:428
+#: apt_preferences.5.xml:429
 msgid ""
 "names the archive to which all the packages in the directory tree belong.  "
 "For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@ -8764,18 +7515,18 @@ msgstr ""
 "requerer a linha:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:438
+#: apt_preferences.5.xml:439
 #, 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:444
+#: apt_preferences.5.xml:445
 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:445
+#: apt_preferences.5.xml:446
 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 "
@@ -8792,13 +7543,13 @@ msgstr ""
 "preferências do APT requer a linha:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:454
+#: apt_preferences.5.xml:455
 #, 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:461
+#: apt_preferences.5.xml:462
 msgid ""
 "names the release version.  For example, the packages in the tree might "
 "belong to Debian GNU/Linux release version 3.0.  Note that there is normally "
@@ -8814,7 +7565,7 @@ msgstr ""
 "seguintes linhas:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:470
+#: apt_preferences.5.xml:471
 #, no-wrap
 msgid ""
 "Pin: release v=3.0\n"
@@ -8826,12 +7577,12 @@ msgstr ""
 "Pin: release 3.0\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:479
+#: apt_preferences.5.xml:480
 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:480
+#: apt_preferences.5.xml:481
 msgid ""
 "names the licensing component associated with the packages in the directory "
 "tree of the <filename>Release</filename> file.  For example, the line "
@@ -8849,18 +7600,18 @@ msgstr ""
 "a linha:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:489
+#: apt_preferences.5.xml:490
 #, 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:495
+#: apt_preferences.5.xml:496
 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:496
+#: apt_preferences.5.xml:497
 msgid ""
 "names the originator of the packages in the directory tree of the "
 "<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"
@@ -8873,18 +7624,18 @@ msgstr ""
 "linha:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:502
+#: apt_preferences.5.xml:503
 #, 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:508
+#: apt_preferences.5.xml:509
 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:509
+#: apt_preferences.5.xml:510
 msgid ""
 "names the label of the packages in the directory tree of the "
 "<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"
@@ -8897,13 +7648,13 @@ msgstr ""
 "linha:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:515
+#: apt_preferences.5.xml:516
 #, 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:416
+#: apt_preferences.5.xml:417
 msgid ""
 "The <filename>Release</filename> file is normally found in the directory "
 "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
@@ -8926,7 +7677,7 @@ msgstr ""
 "APT: <placeholder type=\"variablelist\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:522
+#: apt_preferences.5.xml:523
 msgid ""
 "All of the <filename>Packages</filename> and <filename>Release</filename> "
 "files retrieved from locations listed in the &sources-list; file are stored "
@@ -8951,12 +7702,12 @@ msgstr ""
 "literal> da distribuição <literal>unstable</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:535
+#: apt_preferences.5.xml:536
 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:537
+#: apt_preferences.5.xml:538
 msgid ""
 "Each record in the APT preferences file can optionally begin with one or "
 "more lines beginning with the word <literal>Explanation:</literal>.  This "
@@ -8967,12 +7718,12 @@ msgstr ""
 "literal>. Isto disponibiliza um espaço para comentários."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:546
+#: apt_preferences.5.xml:547
 msgid "Tracking Stable"
 msgstr "Acompanhando Stable"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:554
+#: apt_preferences.5.xml:555
 #, no-wrap
 msgid ""
 "Explanation: Uninstall or do not install any Debian-originated\n"
@@ -8996,7 +7747,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:548
+#: apt_preferences.5.xml:549
 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 "
@@ -9012,8 +7763,8 @@ msgstr ""
 "\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:571 apt_preferences.5.xml:617
-#: apt_preferences.5.xml:675
+#: apt_preferences.5.xml:572 apt_preferences.5.xml:618
+#: apt_preferences.5.xml:676
 #, no-wrap
 msgid ""
 "apt-get install <replaceable>package-name</replaceable>\n"
@@ -9025,7 +7776,7 @@ msgstr ""
 "apt-get dist-upgrade\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:566
+#: apt_preferences.5.xml:567
 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 "
@@ -9038,13 +7789,13 @@ msgstr ""
 "\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:583
+#: apt_preferences.5.xml:584
 #, 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:577
+#: apt_preferences.5.xml:578
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>testing</literal> distribution; the package "
@@ -9057,12 +7808,12 @@ msgstr ""
 "outra vez. <placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:589
+#: apt_preferences.5.xml:590
 msgid "Tracking Testing or Unstable"
 msgstr "Acompanhando Testing ou Unstable"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:598
+#: apt_preferences.5.xml:599
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -9090,7 +7841,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:591
+#: apt_preferences.5.xml:592
 msgid ""
 "The following APT preferences file will cause APT to assign a high priority "
 "to package versions from the <literal>testing</literal> distribution, a "
@@ -9107,7 +7858,7 @@ msgstr ""
 "<placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:612
+#: apt_preferences.5.xml:613
 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 "
@@ -9120,13 +7871,13 @@ msgstr ""
 "\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:632
+#: apt_preferences.5.xml:633
 #, 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:623
+#: apt_preferences.5.xml:624
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>unstable</literal> distribution.  "
@@ -9145,12 +7896,12 @@ msgstr ""
 "versão instalada. <placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:639
+#: apt_preferences.5.xml:640
 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:653
+#: apt_preferences.5.xml:654
 #, no-wrap
 msgid ""
 "Explanation: Uninstall or do not install any Debian-originated package versions\n"
@@ -9184,7 +7935,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:641
+#: apt_preferences.5.xml:642
 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 "
@@ -9210,7 +7961,7 @@ msgstr ""
 "<placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:670
+#: apt_preferences.5.xml:671
 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 "
@@ -9223,13 +7974,13 @@ msgstr ""
 "codename;</literal>.  <placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:690
+#: apt_preferences.5.xml:691
 #, 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:681
+#: apt_preferences.5.xml:682
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>sid</literal> distribution.  Thereafter, "
@@ -9248,12 +7999,12 @@ msgstr ""
 "instalada. <placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt_preferences.5.xml:699
+#: apt_preferences.5.xml:700
 msgid "&file-preferences;"
 msgstr "&file-preferences;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:705
+#: apt_preferences.5.xml:706
 msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 
@@ -9539,6 +8290,11 @@ msgstr ""
 "seja considerado um arquivo. Isto é útil para montagens NFS e mirrors ou "
 "arquivos locais."
 
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+#: sources.list.5.xml:153
+msgid "cdrom"
+msgstr "cdrom"
+
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml:155
 msgid ""
@@ -9549,6 +8305,11 @@ msgstr ""
 "media. Use o programa &apt-cdrom; para criar entradas cdrom na lista de "
 "fontes."
 
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+#: sources.list.5.xml:160
+msgid "http"
+msgstr "http"
+
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml:162
 msgid ""
@@ -9566,6 +8327,11 @@ msgstr ""
 "string do formato http://user:pass@server:port/. Note que este não é um "
 "método de autenticação seguro."
 
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+#: sources.list.5.xml:171
+msgid "ftp"
+msgstr "ftp"
+
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml:173
 msgid ""
@@ -10047,6 +8813,11 @@ msgstr ""
 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
+msgid "upgrade"
+msgstr "upgrade"
+
 #. type: <p></p>
 #: guide.sgml:131
 msgid ""
@@ -10067,6 +8838,11 @@ msgstr ""
 "outro pacote. <prgn>dselect</prgn> ou <tt>apt-get install</tt> podem ser "
 "usados para forçar estes pacotes a instalar."
 
+#. type: <tag></tag>
+#: guide.sgml:131
+msgid "install"
+msgstr "install"
+
 #. type: <p></p>
 #: guide.sgml:140
 msgid ""
@@ -10086,6 +8862,11 @@ 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
+msgid "dist-upgrade"
+msgstr "dist-upgrade"
+
 #. type: <p></p>
 #: guide.sgml:149
 msgid ""
@@ -11355,253 +10136,6 @@ msgstr "O qual irá usar os arquivos já obtidos e que estão no disco."
 #~ "corrupção de dados. As máquinas que requerem isto estão em violação de "
 #~ "RFC 2068."
 
-#, fuzzy
-#~| msgid ""
-#~| "<command>apt-cache</command> <arg><option>-hvsn</option></arg> "
-#~| "<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
-#~| "<arg><option>-c=<replaceable>file</replaceable></option></arg> <group "
-#~| "choice=\"req\"> <arg>add <arg choice=\"plain\" rep=\"repeat"
-#~| "\"><replaceable>file</replaceable></arg></arg> <arg>gencaches</arg> "
-#~| "<arg>showpkg <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
-#~| "replaceable></arg></arg> <arg>showsrc <arg choice=\"plain\" rep=\"repeat"
-#~| "\"><replaceable>pkg</replaceable></arg></arg> <arg>stats</arg> "
-#~| "<arg>dump</arg> <arg>dumpavail</arg> <arg>unmet</arg> <arg>search <arg "
-#~| "choice=\"plain\"><replaceable>regex</replaceable></arg></arg> <arg>show "
-#~| "<arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></"
-#~| "arg></arg> <arg>depends <arg choice=\"plain\" rep=\"repeat"
-#~| "\"><replaceable>pkg</replaceable></arg></arg> <arg>rdepends <arg choice="
-#~| "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
-#~| "<arg>pkgnames <arg choice=\"plain\"><replaceable>prefix</replaceable></"
-#~| "arg></arg> <arg>dotty <arg choice=\"plain\" rep=\"repeat"
-#~| "\"><replaceable>pkg</replaceable></arg></arg> <arg>xvcg <arg choice="
-#~| "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
-#~| "<arg>policy <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkgs</"
-#~| "replaceable></arg></arg> <arg>madison <arg choice=\"plain\" rep=\"repeat"
-#~| "\"><replaceable>pkgs</replaceable></arg></arg> </group>"
-#~ msgid ""
-#~ "<command>apt-cache</command> <arg><option>-hvsn</option></arg> "
-#~ "<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
-#~ "<arg><option>-c=<replaceable>file</replaceable></option></arg> <group "
-#~ "choice=\"req\"> <arg>gencaches</arg> <arg>showpkg <arg choice=\"plain\" "
-#~ "rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg>showsrc "
-#~ "<arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></"
-#~ "arg></arg> <arg>stats</arg> <arg>dump</arg> <arg>dumpavail</arg> "
-#~ "<arg>unmet</arg> <arg>search <arg choice=\"plain\"><replaceable>regex</"
-#~ "replaceable></arg></arg> <arg>show <arg choice=\"plain\" rep=\"repeat"
-#~ "\"><replaceable>pkg</replaceable></arg></arg> <arg>depends <arg choice="
-#~ "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
-#~ "<arg>rdepends <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
-#~ "replaceable></arg></arg> <arg>pkgnames <arg choice=\"plain"
-#~ "\"><replaceable>prefix</replaceable></arg></arg> <arg>dotty <arg choice="
-#~ "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
-#~ "<arg>xvcg <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
-#~ "replaceable></arg></arg> <arg>policy <arg choice=\"plain\" rep=\"repeat"
-#~ "\"><replaceable>pkgs</replaceable></arg></arg> <arg>madison <arg choice="
-#~ "\"plain\" rep=\"repeat\"><replaceable>pkgs</replaceable></arg></arg> </"
-#~ "group>"
-#~ msgstr ""
-#~ "<command>apt-cache</command> <arg><option>-hvsn</option></arg> "
-#~ "<arg><option>-o=<replaceable>string de configuração</replaceable></"
-#~ "option></arg> <arg><option>-c=<replaceable>ficheiro</replaceable></"
-#~ "option></arg> <group choice=\"req\"> <arg>add <arg choice=\"plain\" rep="
-#~ "\"repeat\"><replaceable>ficheiro</replaceable></arg></arg> "
-#~ "<arg>gencaches</arg> <arg>showpkg <arg choice=\"plain\" rep=\"repeat"
-#~ "\"><replaceable>pacote</replaceable></arg></arg> <arg>showsrc <arg choice="
-#~ "\"plain\" rep=\"repeat\"><replaceable>pacote</replaceable></arg></arg> "
-#~ "<arg>stats</arg> <arg>dump</arg> <arg>dumpavail</arg> <arg>unmet</arg> "
-#~ "<arg>search <arg choice=\"plain\"><replaceable>regex</replaceable></arg></"
-#~ "arg> <arg>show <arg choice=\"plain\" rep=\"repeat\"><replaceable>pacote</"
-#~ "replaceable></arg></arg> <arg>depends <arg choice=\"plain\" rep=\"repeat"
-#~ "\"><replaceable>pacote</replaceable></arg></arg> <arg>rdepends <arg "
-#~ "choice=\"plain\" rep=\"repeat\"><replaceable>pacote</replaceable></arg></"
-#~ "arg> <arg>pkgnames <arg choice=\"plain\"><replaceable>prefixo</"
-#~ "replaceable></arg></arg> <arg>dotty <arg choice=\"plain\" rep=\"repeat"
-#~ "\"><replaceable>pacote</replaceable></arg></arg> <arg>xvcg <arg choice="
-#~ "\"plain\" rep=\"repeat\"><replaceable>pacote</replaceable></arg></arg> "
-#~ "<arg>policy <arg choice=\"plain\" rep=\"repeat\"><replaceable>pacotes</"
-#~ "replaceable></arg></arg> <arg>madison <arg choice=\"plain\" rep=\"repeat"
-#~ "\"><replaceable>pacotes</replaceable></arg></arg> </group>"
-
-#~ msgid ""
-#~ "<command>apt-cdrom</command> <arg><option>-hvrmfan</option></arg> "
-#~ "<arg><option>-d=<replaceable>cdrom mount point</replaceable></option></"
-#~ "arg> <arg><option>-o=<replaceable>config string</replaceable></option></"
-#~ "arg> <arg><option>-c=<replaceable>file</replaceable></option></arg> "
-#~ "<group> <arg>add</arg> <arg>ident</arg> </group>"
-#~ msgstr ""
-#~ "<command>apt-cdrom</command> <arg><option>-hvrmfan</option></arg> "
-#~ "<arg><option>-d=<replaceable>ponto de montagem do cdrom</replaceable></"
-#~ "option></arg> <arg><option>-o=<replaceable>string de configuração</"
-#~ "replaceable></option></arg> <arg><option>-c=<replaceable>ficheiro</"
-#~ "replaceable></option></arg> <group> <arg>add</arg> <arg>ident</arg> </"
-#~ "group>"
-
-#~ msgid ""
-#~ "<command>apt-config</command> <arg><option>-hv</option></arg> "
-#~ "<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
-#~ "<arg><option>-c=<replaceable>file</replaceable></option></arg> <group "
-#~ "choice=\"req\"> <arg>shell</arg> <arg>dump</arg> </group>"
-#~ msgstr ""
-#~ "<command>apt-config</command> <arg><option>-hv</option></arg> "
-#~ "<arg><option>-o=<replaceable>string de configuração</replaceable></"
-#~ "option></arg> <arg><option>-c=<replaceable>ficheiro</replaceable></"
-#~ "option></arg> <group choice=\"req\"> <arg>shell</arg> <arg>dump</arg> </"
-#~ "group>"
-
-#~ msgid ""
-#~ "<command>apt-extracttemplates</command> <arg><option>-hv</option></arg> "
-#~ "<arg><option>-t=<replaceable>temporary directory</replaceable></option></"
-#~ "arg> <arg choice=\"plain\" rep=\"repeat\"><replaceable>file</"
-#~ "replaceable></arg>"
-#~ msgstr ""
-#~ "<command>apt-extracttemplates</command> <arg><option>-hv</option></arg> "
-#~ "<arg><option>-t=<replaceable>directório temporário</replaceable></"
-#~ "option></arg> <arg choice=\"plain\" rep=\"repeat\"><replaceable>ficheiro</"
-#~ "replaceable></arg>"
-
-#~ msgid ""
-#~ "<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> "
-#~ "<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> "
-#~ "<arg><option>--readonly</option></arg> <arg><option>--contents</option></"
-#~ "arg> <arg><option>--arch <replaceable>architecture</replaceable></"
-#~ "option></arg> <arg><option>-o <replaceable>config</"
-#~ "replaceable>=<replaceable>string</replaceable></option></arg> "
-#~ "<arg><option>-c=<replaceable>file</replaceable></option></arg> <group "
-#~ "choice=\"req\"> <arg>packages<arg choice=\"plain\" rep=\"repeat"
-#~ "\"><replaceable>path</replaceable></arg><arg><replaceable>override</"
-#~ "replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> "
-#~ "<arg>sources<arg choice=\"plain\" rep=\"repeat\"><replaceable>path</"
-#~ "replaceable></arg><arg><replaceable>override</"
-#~ "replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> "
-#~ "<arg>contents <arg choice=\"plain\"><replaceable>path</replaceable></"
-#~ "arg></arg> <arg>release <arg choice=\"plain\"><replaceable>path</"
-#~ "replaceable></arg></arg> <arg>generate <arg choice=\"plain"
-#~ "\"><replaceable>config-file</replaceable></arg> <arg choice=\"plain\" rep="
-#~ "\"repeat\"><replaceable>section</replaceable></arg></arg> <arg>clean <arg "
-#~ "choice=\"plain\"><replaceable>config-file</replaceable></arg></arg> </"
-#~ "group>"
-#~ msgstr ""
-#~ "<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> "
-#~ "<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> "
-#~ "<arg><option>--readonly</option></arg> <arg><option>--contents</option></"
-#~ "arg> <arg><option>--arch <replaceable>arquitectura</replaceable></"
-#~ "option></arg> <arg><option>-o <replaceable>configuração</"
-#~ "replaceable>=<replaceable>string</replaceable></option></arg> "
-#~ "<arg><option>-c=<replaceable>ficheiro</replaceable></option></arg> <group "
-#~ "choice=\"req\"> <arg>packages<arg choice=\"plain\" rep=\"repeat"
-#~ "\"><replaceable>caminho</replaceable></arg><arg><replaceable>override</"
-#~ "replaceable><arg><replaceable>prefixo-de-caminho</replaceable></arg></"
-#~ "arg></arg> <arg>sources<arg choice=\"plain\" rep=\"repeat"
-#~ "\"><replaceable>caminho</replaceable></arg><arg><replaceable>sobrepor</"
-#~ "replaceable><arg><replaceable>prefixo-de-caminho</replaceable></arg></"
-#~ "arg></arg> <arg>contents <arg choice=\"plain\"><replaceable>caminho</"
-#~ "replaceable></arg></arg> <arg>release <arg choice=\"plain"
-#~ "\"><replaceable>caminho</replaceable></arg></arg> <arg>generate <arg "
-#~ "choice=\"plain\"><replaceable>ficheiro-de-configuração</replaceable></"
-#~ "arg> <arg choice=\"plain\" rep=\"repeat\"><replaceable>secção</"
-#~ "replaceable></arg></arg> <arg>clean <arg choice=\"plain"
-#~ "\"><replaceable>ficheiro-de-configuração</replaceable></arg></arg> </"
-#~ "group>"
-
-#, fuzzy
-#~| msgid ""
-#~| "<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
-#~| "<option>-o= <replaceable>config_string</replaceable> </option> </arg> "
-#~| "<arg> <option>-c= <replaceable>config_file</replaceable> </option> </"
-#~| "arg> <arg> <option>-t=</option> <arg choice='plain'> "
-#~| "<replaceable>target_release</replaceable> </arg> </arg> <group choice="
-#~| "\"req\"> <arg choice='plain'>update</arg> <arg choice='plain'>upgrade</"
-#~| "arg> <arg choice='plain'>dselect-upgrade</arg> <arg choice='plain'>dist-"
-#~| "upgrade</arg> <arg choice='plain'>install <arg choice=\"plain\" rep="
-#~| "\"repeat\"><replaceable>pkg</replaceable> <arg> <group choice='req'> "
-#~| "<arg choice='plain'> =<replaceable>pkg_version_number</replaceable> </"
-#~| "arg> <arg choice='plain'> /<replaceable>target_release</replaceable> </"
-#~| "arg> </group> </arg> </arg> </arg> <arg choice='plain'>remove <arg "
-#~| "choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></"
-#~| "arg> <arg choice='plain'>purge <arg choice=\"plain\" rep=\"repeat"
-#~| "\"><replaceable>pkg</replaceable></arg></arg> <arg choice='plain'>source "
-#~| "<arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable> "
-#~| "<arg> <group choice='req'> <arg choice='plain'> "
-#~| "=<replaceable>pkg_version_number</replaceable> </arg> <arg "
-#~| "choice='plain'> /<replaceable>target_release</replaceable> </arg> </"
-#~| "group> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg choice="
-#~| "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
-#~| "choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg "
-#~| "choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> <arg "
-#~| "choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> <arg "
-#~| "choice='plain'>--version</arg> </group> </arg> <arg choice='plain'> "
-#~| "<group choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--"
-#~| "help</arg> </group> </arg> </group>"
-#~ msgid ""
-#~ "<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
-#~ "<option>-o= <replaceable>config_string</replaceable> </option> </arg> "
-#~ "<arg> <option>-c= <replaceable>config_file</replaceable> </option> </arg> "
-#~ "<arg> <option>-t=</option> <arg choice='plain'> "
-#~ "<replaceable>target_release</replaceable> </arg> </arg> <group choice="
-#~ "\"req\"> <arg choice='plain'>update</arg> <arg choice='plain'>upgrade</"
-#~ "arg> <arg choice='plain'>dselect-upgrade</arg> <arg choice='plain'>dist-"
-#~ "upgrade</arg> <arg choice='plain'>install <arg choice=\"plain\" rep="
-#~ "\"repeat\"><replaceable>pkg</replaceable> <arg> <group choice='req'> <arg "
-#~ "choice='plain'> =<replaceable>pkg_version_number</replaceable> </arg> "
-#~ "<arg choice='plain'> /<replaceable>target_release</replaceable> </arg> </"
-#~ "group> </arg> </arg> </arg> <arg choice='plain'>remove <arg choice=\"plain"
-#~ "\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
-#~ "choice='plain'>purge <arg choice=\"plain\" rep=\"repeat"
-#~ "\"><replaceable>pkg</replaceable></arg></arg> <arg choice='plain'>source "
-#~ "<arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable> <arg> "
-#~ "<group choice='req'> <arg choice='plain'> "
-#~ "=<replaceable>pkg_version_number</replaceable> </arg> <arg "
-#~ "choice='plain'> /<replaceable>target_release</replaceable> </arg> </"
-#~ "group> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg choice="
-#~ "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
-#~ "choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg "
-#~ "choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> <arg "
-#~ "choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> <arg "
-#~ "choice='plain'>--version</arg> </group> </arg> <arg choice='plain'> "
-#~ "<group choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--"
-#~ "help</arg> </group> </arg> </group>"
-#~ msgstr ""
-#~ "<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
-#~ "<option>-o= <replaceable>string_de_configuração</replaceable> </option> </"
-#~ "arg> <arg> <option>-c= <replaceable>ficheiro_de_configuração</"
-#~ "replaceable> </option> </arg> <arg> <option>-t=</option> <arg "
-#~ "choice='plain'> <replaceable>lançamento_de_destino</replaceable> </arg> </"
-#~ "arg> <group choice=\"req\"> <arg choice='plain'>update</arg> <arg "
-#~ "choice='plain'>upgrade</arg> <arg choice='plain'>dselect-upgrade</arg> "
-#~ "<arg choice='plain'>dist-upgrade</arg> <arg choice='plain'>install <arg "
-#~ "choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable> <arg> "
-#~ "<group choice='req'> <arg choice='plain'> "
-#~ "=<replaceable>número_de_versão_do_pacote</replaceable> </arg> <arg "
-#~ "choice='plain'> /<replaceable>lançamento_de_destino</replaceable> </arg> "
-#~ "</group> </arg> </arg> </arg> <arg choice='plain'>remove <arg choice="
-#~ "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
-#~ "choice='plain'>purge <arg choice=\"plain\" rep=\"repeat"
-#~ "\"><replaceable>pacote</replaceable></arg></arg> <arg "
-#~ "choice='plain'>source <arg choice=\"plain\" rep=\"repeat"
-#~ "\"><replaceable>pacote</replaceable> <arg> <group choice='req'> <arg "
-#~ "choice='plain'> =<replaceable>número_de_versão_do_pacote</replaceable> </"
-#~ "arg> <arg choice='plain'> /<replaceable>lançamento_de_destino</"
-#~ "replaceable> </arg> </group> </arg> </arg> </arg> <arg "
-#~ "choice='plain'>build-dep <arg choice=\"plain\" rep=\"repeat"
-#~ "\"><replaceable>pacote</replaceable></arg></arg> <arg "
-#~ "choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg "
-#~ "choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> <arg "
-#~ "choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> <arg "
-#~ "choice='plain'>--version</arg> </group> </arg> <arg choice='plain'> "
-#~ "<group choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--"
-#~ "help</arg> </group> </arg> </group>"
-
-#~ msgid ""
-#~ "<command>apt-key</command> <arg><option>--keyring <replaceable>filename</"
-#~ "replaceable></option></arg> <arg><replaceable>command</replaceable></arg> "
-#~ "<arg rep=\"repeat\"><option><replaceable>arguments</replaceable></"
-#~ "option></arg>"
-#~ msgstr ""
-#~ "<command>apt-key</command> <arg><option>--keyring <replaceable>nome de "
-#~ "ficheiro</replaceable></option></arg> <arg><replaceable>comando</"
-#~ "replaceable></arg> <arg rep=\"repeat\"><option><replaceable>argumentos</"
-#~ "replaceable></option></arg>"
-
 #~ msgid "add <replaceable>filename</replaceable>"
 #~ msgstr "add <replaceable>nome-de-ficheiro</replaceable>"
 
@@ -11621,43 +10155,6 @@ msgstr "O qual irá usar os arquivos já obtidos e que estão no disco."
 #~ msgid "--keyring <replaceable>filename</replaceable>"
 #~ msgstr "--keyring <replaceable>nome-de-ficheiro</replaceable>"
 
-#, fuzzy
-#~| msgid ""
-#~| "  <command>apt-mark</command> <arg><option>-hv</option></arg> "
-#~| "<arg><option>-f=<replaceable>FILENAME</replaceable></option></arg> "
-#~| "<group choice=\"plain\"> <arg choice=\"plain\"> <group choice=\"req\"> "
-#~| "<arg choice=\"plain\">markauto</arg> <arg choice=\"plain\">unmarkauto</"
-#~| "arg> </group> <arg choice=\"plain\" rep=\"repeat\"><replaceable>package</"
-#~| "replaceable></arg> </arg> <arg choice=\"plain\">showauto</arg> </group>"
-#~ msgid ""
-#~ "  <command>apt-mark</command> <arg><option>-hv</option></arg> "
-#~ "<arg><option>-f=<replaceable>FILENAME</replaceable></option></arg> <group "
-#~ "choice=\"plain\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg "
-#~ "choice=\"plain\">auto</arg> <arg choice=\"plain\">manual</arg> <arg "
-#~ "choice=\"plain\">showauto</arg> <arg choice=\"plain\">showmanual</arg> </"
-#~ "group> <arg choice=\"plain\" rep=\"repeat\"><replaceable>package</"
-#~ "replaceable></arg> </arg> </group>"
-#~ msgstr ""
-#~ "  <command>apt-mark</command> <arg><option>-hv</option></arg> "
-#~ "<arg><option>-f=<replaceable>NOME DE FICHEIRO</replaceable></option></"
-#~ "arg> <group choice=\"plain\"> <arg choice=\"plain\"> <group choice=\"req"
-#~ "\"> <arg choice=\"plain\">markauto</arg> <arg choice=\"plain"
-#~ "\">unmarkauto</arg> </group> <arg choice=\"plain\" rep=\"repeat"
-#~ "\"><replaceable>pacote</replaceable></arg> </arg> <arg choice=\"plain"
-#~ "\">showauto</arg> </group>"
-
-#~ msgid ""
-#~ "<command>apt-sortpkgs</command> <arg><option>-hvs</option></arg> "
-#~ "<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
-#~ "<arg><option>-c=<replaceable>file</replaceable></option></arg> <arg "
-#~ "choice=\"plain\" rep=\"repeat\"><replaceable>file</replaceable></arg>"
-#~ msgstr ""
-#~ "<command>apt-sortpkgs</command> <arg><option>-hvs</option></arg> "
-#~ "<arg><option>-o=<replaceable>string de configuração</replaceable></"
-#~ "option></arg> <arg><option>-c=<replaceable>ficheiro</replaceable></"
-#~ "option></arg> <arg choice=\"plain\" rep=\"repeat\"><replaceable>ficheiro</"
-#~ "replaceable></arg>"
-
 #, fuzzy
 #~| msgid ""
 #~| "Seconds the Release file should be considered valid after it was "
@@ -11690,9 +10187,6 @@ msgstr "O qual irá usar os arquivos já obtidos e que estão no disco."
 #~ "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 "<option>--md5</option>"
-#~ msgstr "<option>--md5</option>"
-
 #~ msgid ""
 #~ "Generate MD5 sums. This defaults to on, when turned off the generated "
 #~ "index files will not have MD5Sum fields where possible.  Configuration "
@@ -11702,21 +10196,9 @@ msgstr "O qual irá usar os arquivos já obtidos e que estão no disco."
 #~ "índice gerados não terão campos MD5Sum onde possíveis. Item de "
 #~ "Configuração: <literal>APT::FTPArchive::MD5</literal>"
 
-#~ msgid "unmarkauto"
-#~ msgstr "unmarkauto"
-
-#~ msgid "<option>-h</option>"
-#~ msgstr "<option>-h</option>"
-
 #~ msgid "Show a short usage summary."
 #~ msgstr "Mostra um curto sumário de utilização."
 
-#~ msgid "<option>-v</option>"
-#~ msgstr "<option>-v</option>"
-
-#~ msgid "<option>--version</option>"
-#~ msgstr "<option>--version</option>"
-
 #~ msgid "Show the program version."
 #~ msgstr "Mostra a versão do programa."
 
@@ -11751,9 +10233,6 @@ msgstr "O qual irá usar os arquivos já obtidos e que estão no disco."
 #~ "ficheiro Release contendo um sumário MD5 e um sumário SHA1 por cada "
 #~ "ficheiro."
 
-#~ msgid "<option>--install-recommends</option>"
-#~ msgstr "<option>--install-recommends</option>"
-
 #~ msgid "Also install recommended packages."
 #~ msgstr "Também instala pacotes recomendados."
 
@@ -11810,9 +10289,6 @@ msgstr "O qual irá usar os arquivos já obtidos e que estão no disco."
 #~ "<literal>Dir::State</literal> que define o caminho para o ficheiro "
 #~ "<filename>extended_states</filename>."
 
-#~ msgid "Cache-Limit"
-#~ msgstr "Cache-Limit"
-
 #~ msgid ""
 #~ "APT uses a fixed size memory mapped cache file to store the 'available' "
 #~ "information. This sets the size of that cache (in bytes)."
diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po
index d2041eb51..27f44311c 100644
--- a/doc/po/pt_BR.po
+++ b/doc/po/pt_BR.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
-"POT-Creation-Date: 2012-05-20 18:22+0300\n"
+"POT-Creation-Date: 2012-05-21 04:13+0300\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"
@@ -693,11 +693,6 @@ msgid ""
 "one of the commands below must be present."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:48
-msgid "gencaches"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:49
 msgid ""
@@ -705,13 +700,12 @@ msgid ""
 "implicitly by all commands needing this cache if it is missing or outdated."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:53
-#, fuzzy
-msgid "showpkg <replaceable>&synopsis-pkg;</replaceable>…"
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
+#: apt-cache.8.xml:53 apt-cache.8.xml:142 apt-cache.8.xml:163
+#: 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
+msgid "&synopsis-pkg;"
 msgstr ""
-"<programlisting>\n"
-"apt-get install <replaceable>pacote</replaceable>/testing\n"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:54
@@ -755,11 +749,6 @@ msgid ""
 "best to consult the apt source code."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:87
-msgid "stats"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:87
 msgid ""
@@ -839,14 +828,6 @@ msgid ""
 "relationships claimed by all of the packages in the cache."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:142
-#, fuzzy
-msgid "showsrc <replaceable>&synopsis-pkg;</replaceable>…"
-msgstr ""
-"<programlisting>\n"
-"apt-get install <replaceable>pacote</replaceable>/testing\n"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:143
 msgid ""
@@ -855,11 +836,6 @@ msgid ""
 "records that declare the name to be a Binary."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:148 apt-config.8.xml:75
-msgid "dump"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:149
 msgid ""
@@ -867,11 +843,6 @@ msgid ""
 "It is primarily for debugging."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:153
-msgid "dumpavail"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:154
 msgid ""
@@ -879,11 +850,6 @@ msgid ""
 "suitable for use with &dpkg; and is used by the &dselect; method."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:158
-msgid "unmet"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:159
 msgid ""
@@ -891,14 +857,6 @@ msgid ""
 "package cache."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:163
-#, fuzzy
-msgid "show <replaceable>&synopsis-pkg;</replaceable>…"
-msgstr ""
-"<programlisting>\n"
-"apt-get install <replaceable>pacote</replaceable>/testing\n"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:164
 msgid ""
@@ -906,13 +864,10 @@ msgid ""
 "avail</command>; it displays the package records for the named packages."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
 #: apt-cache.8.xml:169
-#, fuzzy
-msgid "search <replaceable>&synopsis-regex;</replaceable>…"
+msgid "&synopsis-regex;"
 msgstr ""
-"<programlisting>\n"
-"apt-get install <replaceable>pacote</replaceable>/testing\n"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:170
@@ -936,14 +891,6 @@ msgid ""
 "and'ed together."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:187
-#, fuzzy
-msgid "depends <replaceable>&synopsis-pkg;</replaceable>…"
-msgstr ""
-"<programlisting>\n"
-"apt-get install <replaceable>pacote</replaceable>/testing\n"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:188
 msgid ""
@@ -951,14 +898,6 @@ msgid ""
 "and all the possible other packages that can fulfill that dependency."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:192
-#, fuzzy
-msgid "rdepends <replaceable>&synopsis-pkg;</replaceable>…"
-msgstr ""
-"<programlisting>\n"
-"apt-get install <replaceable>pacote</replaceable>/testing\n"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:193
 msgid ""
@@ -969,7 +908,7 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-cache.8.xml:197
 #, fuzzy
-msgid "pkgnames [ <replaceable>&synopsis-prefix;</replaceable> ]"
+msgid "<optional><replaceable>&synopsis-prefix;</replaceable></optional>"
 msgstr ""
 "<programlisting>\n"
 "apt-get install <replaceable>pacote</replaceable>/testing\n"
@@ -992,14 +931,6 @@ msgid ""
 "the generated list."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:208
-#, fuzzy
-msgid "dotty <replaceable>&synopsis-pkg;</replaceable>…"
-msgstr ""
-"<programlisting>\n"
-"apt-get install <replaceable>pacote</replaceable>/testing\n"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:209
 msgid ""
@@ -1027,14 +958,6 @@ msgstr ""
 msgid "Caution, dotty cannot graph larger sets of packages."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:226
-#, fuzzy
-msgid "xvcg <replaceable>&synopsis-pkg;</replaceable>"
-msgstr ""
-"<programlisting>\n"
-"apt-get install <replaceable>pacote</replaceable>/testing\n"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:227
 msgid ""
@@ -1045,7 +968,7 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-cache.8.xml:231
 #, fuzzy
-msgid "policy [ <replaceable>&synopsis-pkg;</replaceable>… ]"
+msgid "<optional><replaceable>&synopsis-pkg;</replaceable>…</optional>"
 msgstr ""
 "<programlisting>\n"
 "apt-get install <replaceable>pacote</replaceable>/testing\n"
@@ -1059,14 +982,6 @@ msgid ""
 "selection of the named package."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:238
-#, fuzzy
-msgid "madison <replaceable>&synopsis-pkg;</replaceable>…"
-msgstr ""
-"<programlisting>\n"
-"apt-get install <replaceable>pacote</replaceable>/testing\n"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:239
 msgid ""
@@ -1079,23 +994,13 @@ msgid ""
 "Architecture</literal>)."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:250 apt-config.8.xml:84 apt-extracttemplates.1.xml:51
+#. type: Content of: <refentry><refsect1><title>
+#: apt-cache.8.xml:250 apt-config.8.xml:84 apt-extracttemplates.1.xml:52
 #: apt-ftparchive.1.xml:504 apt-get.8.xml:259 apt-mark.8.xml:108
-#: apt-sortpkgs.1.xml:48 apt.conf.5.xml:586 apt.conf.5.xml:608
+#: apt-sortpkgs.1.xml:48
 msgid "options"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:254
-msgid "<option>-p</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:254
-msgid "<option>--pkg-cache</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:255
 msgid ""
@@ -1104,17 +1009,6 @@ msgid ""
 "pkgcache</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:260 apt-ftparchive.1.xml:551 apt-get.8.xml:321
-#: apt-sortpkgs.1.xml:52
-msgid "<option>-s</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:260
-msgid "<option>--src-cache</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:261
 msgid ""
@@ -1125,16 +1019,6 @@ msgid ""
 "Item: <literal>Dir::Cache::srcpkgcache</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:268 apt-ftparchive.1.xml:525 apt-get.8.xml:311
-msgid "<option>-q</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:268 apt-ftparchive.1.xml:525 apt-get.8.xml:311
-msgid "<option>--quiet</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:269
 msgid ""
@@ -1144,16 +1028,6 @@ msgid ""
 "configuration file.  Configuration Item: <literal>quiet</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:275
-msgid "<option>-i</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:275
-msgid "<option>--important</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:276
 msgid ""
@@ -1162,46 +1036,6 @@ msgid ""
 "<literal>APT::Cache::Important</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:281
-msgid "<option>--no-pre-depends</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:282
-msgid "<option>--no-depends</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:283
-msgid "<option>--no-recommends</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:284
-msgid "<option>--no-suggests</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:285
-msgid "<option>--no-conflicts</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:286
-msgid "<option>--no-breaks</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:287
-msgid "<option>--no-replaces</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:288
-msgid "<option>--no-enhances</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:289
 msgid ""
@@ -1212,16 +1046,6 @@ msgid ""
 "Cache::ShowRecommends</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:295 apt-cdrom.8.xml:111 apt-get.8.xml:278
-msgid "<option>-f</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:295
-msgid "<option>--full</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:296
 msgid ""
@@ -1229,17 +1053,6 @@ msgid ""
 "<literal>APT::Cache::ShowFull</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:300 apt-cdrom.8.xml:121 apt-ftparchive.1.xml:563
-#: apt-get.8.xml:369
-msgid "<option>-a</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:300
-msgid "<option>--all-versions</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:301
 msgid ""
@@ -1251,16 +1064,6 @@ msgid ""
 "<literal>APT::Cache::AllVersions</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:309
-msgid "<option>-g</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:309
-msgid "<option>--generate</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:310
 msgid ""
@@ -1269,16 +1072,6 @@ msgid ""
 "option>.  Configuration Item: <literal>APT::Cache::Generate</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:315
-msgid "<option>--names-only</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:315 apt-cdrom.8.xml:129
-msgid "<option>-n</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:316
 msgid ""
@@ -1286,11 +1079,6 @@ msgid ""
 "Item: <literal>APT::Cache::NamesOnly</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:320
-msgid "<option>--all-names</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:321
 msgid ""
@@ -1299,11 +1087,6 @@ msgid ""
 "AllNames</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:326
-msgid "<option>--recurse</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:327
 msgid ""
@@ -1312,11 +1095,6 @@ msgid ""
 "<literal>APT::Cache::RecurseDepends</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:332
-msgid "<option>--installed</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:334
 msgid ""
@@ -1327,14 +1105,14 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist>
 #: apt-cache.8.xml:339 apt-cdrom.8.xml:140 apt-config.8.xml:104
-#: apt-extracttemplates.1.xml:62 apt-ftparchive.1.xml:591 apt-get.8.xml:514
+#: apt-extracttemplates.1.xml:63 apt-ftparchive.1.xml:591 apt-get.8.xml:514
 #: apt-mark.8.xml:122 apt-sortpkgs.1.xml:58
 msgid "&apt-commonoptions;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-cache.8.xml:344 apt-get.8.xml:519 apt-key.8.xml:167 apt-mark.8.xml:126
-#: apt.conf.5.xml:1119 apt_preferences.5.xml:697
+#: apt.conf.5.xml:1119 apt_preferences.5.xml:698
 msgid "Files"
 msgstr ""
 
@@ -1345,9 +1123,9 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-cache.8.xml:351 apt-cdrom.8.xml:145 apt-config.8.xml:109
-#: apt-extracttemplates.1.xml:69 apt-ftparchive.1.xml:607 apt-get.8.xml:529
+#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:607 apt-get.8.xml:529
 #: apt-key.8.xml:188 apt-mark.8.xml:132 apt-secure.8.xml:185
-#: apt-sortpkgs.1.xml:63 apt.conf.5.xml:1125 apt_preferences.5.xml:704
+#: apt-sortpkgs.1.xml:63 apt.conf.5.xml:1125 apt_preferences.5.xml:705
 #: sources.list.5.xml:255
 #, fuzzy
 msgid "See Also"
@@ -1360,7 +1138,7 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:114
-#: apt-extracttemplates.1.xml:73 apt-ftparchive.1.xml:611 apt-get.8.xml:535
+#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:611 apt-get.8.xml:535
 #: apt-mark.8.xml:136 apt-sortpkgs.1.xml:67
 msgid "Diagnostics"
 msgstr ""
@@ -1406,11 +1184,6 @@ msgid ""
 "must be inserted and scanned separately to account for possible mis-burns."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:55
-msgid "add"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt-cdrom.8.xml:56
 msgid ""
@@ -1429,11 +1202,6 @@ msgid ""
 "filename>"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:71
-msgid "ident"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt-cdrom.8.xml:72
 msgid ""
@@ -1454,16 +1222,6 @@ msgstr ""
 msgid "Options"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:85 apt-ftparchive.1.xml:519 apt-get.8.xml:273
-msgid "<option>-d</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:85
-msgid "<option>--cdrom</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cdrom.8.xml:86
 msgid ""
@@ -1472,16 +1230,6 @@ msgid ""
 "Configuration Item: <literal>Acquire::cdrom::mount</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:94
-msgid "<option>-r</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:94
-msgid "<option>--rename</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cdrom.8.xml:95
 msgid ""
@@ -1490,16 +1238,6 @@ msgid ""
 "label.  Configuration Item: <literal>APT::CDROM::Rename</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:103 apt-get.8.xml:292
-msgid "<option>-m</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:103
-msgid "<option>--no-mount</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cdrom.8.xml:104
 msgid ""
@@ -1508,11 +1246,6 @@ msgid ""
 "NoMount</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:111
-msgid "<option>--fast</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cdrom.8.xml:112
 msgid ""
@@ -1522,11 +1255,6 @@ msgid ""
 "Item: <literal>APT::CDROM::Fast</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:121
-msgid "<option>--thorough</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cdrom.8.xml:122
 msgid ""
@@ -1535,21 +1263,6 @@ msgid ""
 "longer to scan the CD but will pick them all up."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:130 apt-get.8.xml:323
-msgid "<option>--just-print</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:131 apt-get.8.xml:325
-msgid "<option>--recon</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:132 apt-get.8.xml:326
-msgid "<option>--no-act</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cdrom.8.xml:133
 msgid ""
@@ -1606,11 +1319,6 @@ msgid ""
 "one of the commands below must be present."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-config.8.xml:49
-msgid "shell"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-config.8.xml:51
 msgid ""
@@ -1650,11 +1358,6 @@ msgstr ""
 msgid "Just show the contents of the configuration space."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-config.8.xml:89
-msgid "<option>--empty</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-config.8.xml:90
 msgid ""
@@ -1662,11 +1365,9 @@ msgid ""
 "empty to remove them from the output."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
 #: apt-config.8.xml:95
-msgid ""
-"<option>--format '<replaceable>&percnt;f &#x0022;&percnt;v&#x0022;;&percnt;"
-"n</replaceable>'</option>"
+msgid "&percnt;f &#x0022;&percnt;v&#x0022;;&percnt;n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -1682,7 +1383,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:110 apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:608
+#: apt-config.8.xml:110 apt-extracttemplates.1.xml:71 apt-ftparchive.1.xml:608
 #: apt-sortpkgs.1.xml:64
 #, fuzzy
 msgid "&apt-conf;"
@@ -1732,23 +1433,14 @@ msgstr ""
 #: apt-extracttemplates.1.xml:45
 msgid ""
 "template-file and config-script are written to the temporary directory "
-"specified by the -t or --tempdir (<literal>APT::ExtractTemplates::TempDir</"
-"literal>)  directory, with filenames of the form <filename>package.template."
-"XXXX</filename> and <filename>package.config.XXXX</filename>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-extracttemplates.1.xml:55 apt-get.8.xml:448
-msgid "<option>-t</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-extracttemplates.1.xml:55
-msgid "<option>--tempdir</option>"
+"specified by the <option>-t</option> or <option>--tempdir</option> "
+"(<literal>APT::ExtractTemplates::TempDir</literal>) directory, with "
+"filenames of the form <filename>package.template.XXXX</filename> and "
+"<filename>package.config.XXXX</filename>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-extracttemplates.1.xml:57
+#: apt-extracttemplates.1.xml:58
 msgid ""
 "Temporary directory in which to write extracted debconf template files and "
 "config scripts.  Configuration Item: <literal>APT::ExtractTemplates::"
@@ -1756,7 +1448,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:74
+#: apt-extracttemplates.1.xml:75
 msgid ""
 "<command>apt-extracttemplates</command> returns zero on normal operation, "
 "decimal 100 on error."
@@ -1809,11 +1501,6 @@ msgid ""
 "output files."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:58
-msgid "packages"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:60
 msgid ""
@@ -1829,11 +1516,6 @@ msgid ""
 "The option <option>--db</option> can be used to specify a binary caching DB."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:68
-msgid "sources"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:70
 msgid ""
@@ -1851,11 +1533,6 @@ msgid ""
 "change the source override file that will be used."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:80
-msgid "contents"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:82
 msgid ""
@@ -1867,11 +1544,6 @@ msgid ""
 "package is separated by a comma in the output."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:92
-msgid "release"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:94
 msgid ""
@@ -1900,11 +1572,6 @@ msgid ""
 "<literal>Description</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:115
-msgid "generate"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:117
 msgid ""
@@ -1915,11 +1582,6 @@ msgid ""
 "maintaining the required settings."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:124 apt-get.8.xml:215
-msgid "clean"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:126
 msgid ""
@@ -1964,11 +1626,6 @@ msgid ""
 "to produce a complete an absolute path."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:151
-msgid "ArchiveDir"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:153
 msgid ""
@@ -1977,31 +1634,16 @@ msgid ""
 "nodes."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:158
-msgid "OverrideDir"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:160
 msgid "Specifies the location of the override files."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:163
-msgid "CacheDir"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:165
 msgid "Specifies the location of the cache files"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:168
-msgid "FileListDir"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:170
 msgid ""
@@ -2022,11 +1664,6 @@ msgid ""
 "override these defaults with a per-section setting."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:182
-msgid "Packages::Compress"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:184
 msgid ""
@@ -2036,11 +1673,6 @@ msgid ""
 "'. gzip'."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:190
-msgid "Packages::Extensions"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:192
 msgid ""
@@ -2048,11 +1680,6 @@ msgid ""
 "defaults to '.deb'."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:196
-msgid "Sources::Compress"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:198
 msgid ""
@@ -2060,11 +1687,6 @@ msgid ""
 "controls the compression for the Sources files."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:202
-msgid "Sources::Extensions"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:204
 msgid ""
@@ -2072,11 +1694,6 @@ msgid ""
 "defaults to '.dsc'."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:208
-msgid "Contents::Compress"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:210
 msgid ""
@@ -2084,11 +1701,6 @@ msgid ""
 "controls the compression for the Contents files."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:214
-msgid "Translation::Compress"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:216
 msgid ""
@@ -2096,11 +1708,6 @@ msgid ""
 "controls the compression for the Translation-en master file."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:220
-msgid "DeLinkLimit"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:222
 msgid ""
@@ -2109,11 +1716,6 @@ msgid ""
 "Links</literal> setting."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:227
-msgid "FileMode"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:229
 msgid ""
@@ -2121,12 +1723,6 @@ msgid ""
 "index files are set to this mode with no regard to the umask."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:234 apt-ftparchive.1.xml:380
-#, fuzzy
-msgid "LongDescription"
-msgstr "Descrição"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:236 apt-ftparchive.1.xml:382
 msgid ""
@@ -2147,11 +1743,6 @@ msgid ""
 "$(SECTION) and $(ARCH) replaced with their respective values."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:249
-msgid "MaxContentsChange"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:251
 msgid ""
@@ -2160,11 +1751,6 @@ msgid ""
 "be rebuilt."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:256
-msgid "ContentsAge"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:258
 msgid ""
@@ -2176,11 +1762,6 @@ msgid ""
 "anyhow. The default is 10, the units are in days."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:267
-msgid "Directory"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:269
 msgid ""
@@ -2188,11 +1769,6 @@ msgid ""
 "$(SECTION)/binary-$(ARCH)/</filename>"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:273
-msgid "SrcDirectory"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:275
 msgid ""
@@ -2200,11 +1776,6 @@ msgid ""
 "$(DIST)/$(SECTION)/source/</filename>"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:279 apt-ftparchive.1.xml:418
-msgid "Packages"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:281
 msgid ""
@@ -2212,11 +1783,6 @@ msgid ""
 "binary-$(ARCH)/Packages</filename>"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:285 apt-ftparchive.1.xml:423
-msgid "Sources"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:287
 msgid ""
@@ -2224,12 +1790,6 @@ msgid ""
 "source/Sources</filename>"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:291
-#, fuzzy
-msgid "Translation"
-msgstr "Descrição"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:293
 msgid ""
@@ -2238,11 +1798,6 @@ msgid ""
 "$(SECTION)/i18n/Translation-en</filename>"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:298
-msgid "InternalPrefix"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:300
 msgid ""
@@ -2251,11 +1806,6 @@ msgid ""
 "filename>"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:305 apt-ftparchive.1.xml:429
-msgid "Contents"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:307
 msgid ""
@@ -2265,21 +1815,11 @@ msgid ""
 "command> will integrate those package files together automatically."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:314
-msgid "Contents::Header"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:316
 msgid "Sets header file to prepend to the contents output."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:319 apt-ftparchive.1.xml:454
-msgid "BinCacheDB"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:321
 msgid ""
@@ -2287,11 +1827,6 @@ msgid ""
 "can share the same database."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:325
-msgid "FileList"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:327
 msgid ""
@@ -2300,11 +1835,6 @@ msgid ""
 "Relative files names are prefixed with the archive directory."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:332
-msgid "SourceFileList"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:334
 msgid ""
@@ -2364,12 +1894,6 @@ msgid ""
 "\" id=\"0\"/>"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:366
-#, fuzzy
-msgid "Sections"
-msgstr "Descrição"
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:368
 msgid ""
@@ -2378,11 +1902,6 @@ msgid ""
 "free</literal>"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:373 apt.conf.5.xml:157
-msgid "Architectures"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:375
 msgid ""
@@ -2391,11 +1910,6 @@ msgid ""
 "this tree has a source archive."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:386 apt-ftparchive.1.xml:434
-msgid "BinOverride"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:388
 msgid ""
@@ -2403,11 +1917,6 @@ msgid ""
 "and maintainer address information."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:392 apt-ftparchive.1.xml:439
-msgid "SrcOverride"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:394
 msgid ""
@@ -2415,21 +1924,11 @@ msgid ""
 "information."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:398 apt-ftparchive.1.xml:444
-msgid "ExtraOverride"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:400 apt-ftparchive.1.xml:446
 msgid "Sets the binary extra override file."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:403 apt-ftparchive.1.xml:449
-msgid "SrcExtraOverride"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:405 apt-ftparchive.1.xml:451
 msgid "Sets the source extra override file."
@@ -2482,21 +1981,11 @@ msgstr ""
 msgid "Sets the cache DB."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:459
-msgid "PathPrefix"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:461
 msgid "Appends a path to all the output paths."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:464
-msgid "FileList, SourceFileList"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:466
 msgid "Specifies the file list file."
@@ -2566,12 +2055,6 @@ msgid ""
 "tag and the remainder of the line is the new value."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:508
-msgid ""
-"<option>--md5</option>, <option>--sha1</option>, <option>--sha256</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:510
 msgid ""
@@ -2586,11 +2069,6 @@ msgid ""
 "<literal>MD5</literal>, <literal>SHA1</literal> or <literal>SHA256</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:519
-msgid "<option>--db</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:521
 msgid ""
@@ -2607,11 +2085,6 @@ msgid ""
 "file.  Configuration Item: <literal>quiet</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:533
-msgid "<option>--delink</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:535
 msgid ""
@@ -2621,11 +2094,6 @@ msgid ""
 "Item: <literal>APT::FTPArchive::DeLinkAct</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:541
-msgid "<option>--contents</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:543
 msgid ""
@@ -2636,11 +2104,6 @@ msgid ""
 "Configuration Item: <literal>APT::FTPArchive::Contents</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:551
-msgid "<option>--source-override</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:553
 msgid ""
@@ -2649,11 +2112,6 @@ msgid ""
 "literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:557
-msgid "<option>--readonly</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:559
 msgid ""
@@ -2661,11 +2119,6 @@ msgid ""
 "FTPArchive::ReadOnlyDB</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:563
-msgid "<option>--arch</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:564
 msgid ""
@@ -2675,11 +2128,6 @@ msgid ""
 "path.  Configuration Item: <literal>APT::FTPArchive::Architecture</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:570
-msgid "<option>APT::FTPArchive::AlwaysStat</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:572
 msgid ""
@@ -2694,11 +2142,6 @@ msgid ""
 "are useless."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:582
-msgid "<option>APT::FTPArchive::LongDescription</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:584
 msgid ""
@@ -2710,7 +2153,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:596 apt.conf.5.xml:1113 apt_preferences.5.xml:544
+#: apt-ftparchive.1.xml:596 apt.conf.5.xml:1113 apt_preferences.5.xml:545
 #: sources.list.5.xml:214
 #, fuzzy
 msgid "Examples"
@@ -2763,11 +2206,6 @@ msgid ""
 "&aptitude;, &synaptic; and &wajig;."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:48 apt-key.8.xml:119
-msgid "update"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:49
 msgid ""
@@ -2778,13 +2216,8 @@ msgid ""
 "<filename>Packages.gz</filename> files, so that information about new and "
 "updated packages is available. An <literal>update</literal> should always be "
 "performed before an <literal>upgrade</literal> or <literal>dist-upgrade</"
-"literal>. Please be aware that the overall progress meter will be incorrect "
-"as the size of the package files cannot be known in advance."
-msgstr ""
-
-#. type: <tag></tag>
-#: apt-get.8.xml:60 guide.sgml:121
-msgid "upgrade"
+"literal>. Please be aware that the overall progress meter will be incorrect "
+"as the size of the package files cannot be known in advance."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -2802,11 +2235,6 @@ msgid ""
 "command> knows that new versions of packages are available."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:73
-msgid "dselect-upgrade"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:74
 msgid ""
@@ -2818,11 +2246,6 @@ msgid ""
 "new packages)."
 msgstr ""
 
-#. type: <tag></tag>
-#: apt-get.8.xml:83 guide.sgml:140
-msgid "dist-upgrade"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:84
 msgid ""
@@ -2837,11 +2260,6 @@ msgid ""
 "for a mechanism for overriding the general settings for individual packages."
 msgstr ""
 
-#. type: <tag></tag>
-#: apt-get.8.xml:96 guide.sgml:131
-msgid "install"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:98
 msgid ""
@@ -2907,11 +2325,6 @@ msgid ""
 "expression."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:150
-msgid "remove"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:151
 msgid ""
@@ -2922,11 +2335,6 @@ msgid ""
 "installed instead of removed."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:158
-msgid "purge"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:159
 msgid ""
@@ -2935,11 +2343,6 @@ msgid ""
 "too)."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:163
-msgid "source"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:164
 msgid ""
@@ -2990,11 +2393,6 @@ msgid ""
 "balls."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:197
-msgid "build-dep"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:198
 msgid ""
@@ -3005,11 +2403,6 @@ msgid ""
 "option> option instead."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:204
-msgid "check"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:205
 msgid ""
@@ -3017,11 +2410,6 @@ msgid ""
 "and checks for broken dependencies."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:209
-msgid "download"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:210
 msgid ""
@@ -3041,11 +2429,6 @@ msgid ""
 "disk space."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:225
-msgid "autoclean"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:226
 msgid ""
@@ -3058,11 +2441,6 @@ msgid ""
 "is set to off."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:235
-msgid "autoremove"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:236
 msgid ""
@@ -3071,29 +2449,20 @@ msgid ""
 "now no longer needed."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:240
-msgid "changelog"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:241
 msgid ""
 "<literal>changelog</literal> downloads a package changelog and displays it "
 "through <command>sensible-pager</command>. The server name and base "
 "directory is defined in the <literal>APT::Changelogs::Server</literal> "
-"variable (e. g. <ulink>http://packages.debian.org/changelogs</ulink> for "
-"Debian or <ulink>http://changelogs.ubuntu.com/changelogs</ulink> for "
-"Ubuntu).  By default it displays the changelog for the version that is "
+"variable (e. g. <ulink url=\"http://packages.debian.org/changelogs"
+"\">packages.debian.org/changelogs</ulink> for Debian or <ulink url=\"http://"
+"changelogs.ubuntu.com/changelogs\">changelogs.ubuntu.com/changelogs</ulink> "
+"for Ubuntu).  By default it displays the changelog for the version that is "
 "installed.  However, you can specify the same options as for the "
 "<option>install</option> command."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:263
-msgid "<option>--no-install-recommends</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:264
 msgid ""
@@ -3101,11 +2470,6 @@ msgid ""
 "Configuration Item: <literal>APT::Install-Recommends</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:268
-msgid "<option>--install-suggests</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:269
 msgid ""
@@ -3113,11 +2477,6 @@ msgid ""
 "Item: <literal>APT::Install-Suggests</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:273
-msgid "<option>--download-only</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:274
 msgid ""
@@ -3125,11 +2484,6 @@ msgid ""
 "Configuration Item: <literal>APT::Get::Download-Only</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:278
-msgid "<option>--fix-broken</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:279
 msgid ""
@@ -3146,16 +2500,6 @@ msgid ""
 "<literal>APT::Get::Fix-Broken</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:292
-msgid "<option>--ignore-missing</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:293
-msgid "<option>--fix-missing</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:294
 msgid ""
@@ -3168,11 +2512,6 @@ msgid ""
 "Configuration Item: <literal>APT::Get::Fix-Missing</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:304
-msgid "<option>--no-download</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:305
 msgid ""
@@ -3193,16 +2532,6 @@ msgid ""
 "<literal>quiet</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:322
-msgid "<option>--simulate</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:324
-msgid "<option>--dry-run</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:327
 msgid ""
@@ -3231,21 +2560,6 @@ msgid ""
 "that are of no consequence (rare)."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:344
-msgid "<option>-y</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:344
-msgid "<option>--yes</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:345
-msgid "<option>--assume-yes</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:346
 msgid ""
@@ -3256,11 +2570,6 @@ msgid ""
 "Configuration Item: <literal>APT::Get::Assume-Yes</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:353
-msgid "<option>--assume-no</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:354
 msgid ""
@@ -3268,16 +2577,6 @@ msgid ""
 "Assume-No</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:358
-msgid "<option>-u</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:358
-msgid "<option>--show-upgraded</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:359
 msgid ""
@@ -3285,16 +2584,6 @@ msgid ""
 "upgraded.  Configuration Item: <literal>APT::Get::Show-Upgraded</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:364
-msgid "<option>-V</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:364
-msgid "<option>--verbose-versions</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:365
 msgid ""
@@ -3302,11 +2591,6 @@ msgid ""
 "<literal>APT::Get::Show-Versions</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:370
-msgid "<option>--host-architecture</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:371
 msgid ""
@@ -3318,21 +2602,6 @@ msgid ""
 "Architecture</literal>"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:379
-msgid "<option>-b</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:379
-msgid "<option>--compile</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:380
-msgid "<option>--build</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:381
 msgid ""
@@ -3340,11 +2609,6 @@ msgid ""
 "<literal>APT::Get::Compile</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:385
-msgid "<option>--ignore-hold</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:386
 msgid ""
@@ -3354,11 +2618,6 @@ msgid ""
 "holds.  Configuration Item: <literal>APT::Ignore-Hold</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:392
-msgid "<option>--no-upgrade</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:393
 msgid ""
@@ -3368,11 +2627,6 @@ msgid ""
 "<literal>APT::Get::Upgrade</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:399
-msgid "<option>--only-upgrade</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:400
 msgid ""
@@ -3382,11 +2636,6 @@ msgid ""
 "Configuration Item: <literal>APT::Get::Only-Upgrade</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:407
-msgid "<option>--force-yes</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:408
 msgid ""
@@ -3397,11 +2646,6 @@ msgid ""
 "<literal>APT::Get::force-yes</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:415
-msgid "<option>--print-uris</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:416
 msgid ""
@@ -3415,11 +2659,6 @@ msgid ""
 "Print-URIs</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:426
-msgid "<option>--purge</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:427
 msgid ""
@@ -3429,11 +2668,6 @@ msgid ""
 "command.  Configuration Item: <literal>APT::Get::Purge</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:434
-msgid "<option>--reinstall</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:435
 msgid ""
@@ -3441,11 +2675,6 @@ msgid ""
 "Configuration Item: <literal>APT::Get::ReInstall</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:439
-msgid "<option>--list-cleanup</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:440
 msgid ""
@@ -3457,16 +2686,6 @@ msgid ""
 "Cleanup</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:449
-msgid "<option>--target-release</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:450
-msgid "<option>--default-release</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:451
 msgid ""
@@ -3481,11 +2700,6 @@ msgid ""
 "also the &apt-preferences; manual page."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:464
-msgid "<option>--trivial-only</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:466
 msgid ""
@@ -3495,11 +2709,6 @@ msgid ""
 "answer no.  Configuration Item: <literal>APT::Get::Trivial-Only</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:472
-msgid "<option>--no-remove</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:473
 msgid ""
@@ -3507,11 +2716,6 @@ msgid ""
 "prompting.  Configuration Item: <literal>APT::Get::Remove</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:478
-msgid "<option>--auto-remove</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:479
 msgid ""
@@ -3521,11 +2725,6 @@ msgid ""
 "<literal>APT::Get::AutomaticRemove</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:485
-msgid "<option>--only-source</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:486
 msgid ""
@@ -3538,21 +2737,6 @@ msgid ""
 "Source</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:496
-msgid "<option>--diff-only</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:496
-msgid "<option>--dsc-only</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:496
-msgid "<option>--tar-only</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:497
 msgid ""
@@ -3561,11 +2745,6 @@ msgid ""
 "literal>, and <literal>APT::Get::Tar-Only</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:502
-msgid "<option>--arch-only</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:503
 msgid ""
@@ -3573,11 +2752,6 @@ msgid ""
 "<literal>APT::Get::Arch-Only</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:507
-msgid "<option>--allow-unauthenticated</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:508
 msgid ""
@@ -3651,11 +2825,6 @@ msgstr ""
 msgid "Commands"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:40
-msgid "add &synopsis-param-filename;"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml:43
 msgid ""
@@ -3664,61 +2833,31 @@ msgid ""
 "filename is <literal>-</literal> from standard input."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:52
-msgid "del &synopsis-param-keyid;"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml:56
 msgid "Remove a key from the list of trusted keys."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:63
-msgid "export &synopsis-param-keyid;"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml:67
 msgid "Output the key &synopsis-param-keyid; to standard output."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:74
-msgid "exportall"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml:78
 msgid "Output all trusted keys to standard output."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:85
-msgid "list"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml:89
 msgid "List trusted keys."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:96
-msgid "finger"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml:100
 msgid "List fingerprints of trusted keys."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:107
-msgid "adv"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml:111
 msgid ""
@@ -3736,11 +2875,6 @@ msgid ""
 "Debian."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:133
-msgid "net-update"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml:137
 msgid ""
@@ -3759,11 +2893,6 @@ msgid ""
 "previous section."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:156
-msgid "--keyring &synopsis-param-filename;"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml:157
 msgid ""
@@ -3853,11 +2982,6 @@ msgid ""
 "removed by e.g.  <command>apt-get</command> or <command>aptitude</command>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:51
-msgid "auto"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml:52
 msgid ""
@@ -3866,11 +2990,6 @@ msgid ""
 "installed packages depend on this package."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:59
-msgid "manual"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml:60
 msgid ""
@@ -3879,11 +2998,6 @@ msgid ""
 "if no other packages depend on it."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:67
-msgid "hold"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml:68
 msgid ""
@@ -3894,11 +3008,6 @@ msgid ""
 "effected by the <option>--filename</option> option."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:77
-msgid "unhold"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml:78
 msgid ""
@@ -3906,11 +3015,6 @@ msgid ""
 "package to allow all actions again."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:83
-msgid "showauto"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml:84
 msgid ""
@@ -3920,11 +3024,6 @@ msgid ""
 "given only those which are automatically installed will be shown."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:91
-msgid "showmanual"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml:92
 msgid ""
@@ -3933,11 +3032,6 @@ msgid ""
 "installed packages instead."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:98
-msgid "showhold"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml:99
 msgid ""
@@ -3945,26 +3039,22 @@ msgid ""
 "the same way as for the other show commands."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:112
-msgid ""
-"<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:113
-msgid ""
-"<option>--file=<filename><replaceable>FILENAME</replaceable></filename></"
-"option>"
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><filename>
+#: apt-mark.8.xml:112 apt-mark.8.xml:113
+#, fuzzy
+msgid "<replaceable>&synopsis-filename;</replaceable>"
 msgstr ""
+"<programlisting>\n"
+"apt-get install <replaceable>pacote</replaceable>/testing\n"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:116
+#: apt-mark.8.xml:115
 msgid ""
-"Read/Write package stats from <filename><replaceable>FILENAME</replaceable></"
-"filename> instead of the default location, which is "
-"<filename>extended_status</filename> in the directory defined by the "
-"Configuration Item: <literal>Dir::State</literal>."
+"Read/Write package stats from the filename given with the parameter "
+"<filename><replaceable>&synopsis-filename;</replaceable></filename> instead "
+"of from the default location, which is <filename>extended_status</filename> "
+"in the directory defined by the Configuration Item: <literal>Dir::State</"
+"literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist>
@@ -4236,11 +3326,6 @@ msgstr ""
 msgid "All output is sent to stdout, the input must be a seekable file."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-sortpkgs.1.xml:52
-msgid "<option>--source</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-sortpkgs.1.xml:54
 msgid ""
@@ -4471,11 +3556,6 @@ msgid ""
 "options for all of the tools."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:151
-msgid "Architecture"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:152
 msgid ""
@@ -4497,11 +3577,6 @@ msgid ""
 "architectures</command>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:167
-msgid "Default-Release"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:168
 msgid ""
@@ -4511,11 +3586,6 @@ msgid ""
 "'5.0*'. See also &apt-preferences;."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:173
-msgid "Ignore-Hold"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:174
 msgid ""
@@ -4523,11 +3593,6 @@ msgid ""
 "ignore held packages in its decision making."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:178
-msgid "Clean-Installed"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:179
 msgid ""
@@ -4537,11 +3602,6 @@ msgid ""
 "but note that APT provides no direct means to reinstall them."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:185
-msgid "Immediate-Configure"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:186
 msgid ""
@@ -4575,11 +3635,6 @@ msgid ""
 "improving or correcting the upgrade process."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:208
-msgid "Force-LoopBreak"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:209
 msgid ""
@@ -4591,11 +3646,6 @@ msgid ""
 "those packages depend on."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:217
-msgid "Cache-Start, Cache-Grow and Cache-Limit"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:218
 msgid ""
@@ -4616,21 +3666,11 @@ msgid ""
 "automatic grow of the cache is disabled."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:233
-msgid "Build-Essential"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:234
 msgid "Defines which package(s) are considered essential build dependencies."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:237
-msgid "Get"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:238
 msgid ""
@@ -4638,21 +3678,11 @@ msgid ""
 "for more information about the options here."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:242
-msgid "Cache"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:243
 msgid ""
-"The Cache subsection controls the &apt-cache; tool, please see its "
-"documentation for more information about the options here."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:247
-msgid "CDROM"
+"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>
@@ -4667,11 +3697,6 @@ msgstr ""
 msgid "The Acquire Group"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:259
-msgid "Check-Valid-Until"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:260
 msgid ""
@@ -4684,11 +3709,6 @@ msgid ""
 "<literal>Max-ValidTime</literal> option can be used."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:270
-msgid "Max-ValidTime"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:271
 msgid ""
@@ -4700,11 +3720,6 @@ msgid ""
 "be made by appending the label of the archive to the option name."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:281
-msgid "Min-ValidTime"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:282
 msgid ""
@@ -4716,11 +3731,6 @@ msgid ""
 "should be used by appending the label of the archive to the option name."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:292
-msgid "PDiffs"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:293
 msgid ""
@@ -4739,11 +3749,6 @@ msgid ""
 "complete file is downloaded instead of the patches."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:305
-msgid "Queue-Mode"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:306
 msgid ""
@@ -4754,11 +3759,6 @@ msgid ""
 "connection per URI type will be opened."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:313
-msgid "Retries"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:314
 msgid ""
@@ -4766,11 +3766,6 @@ msgid ""
 "files the given number of times."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:318
-msgid "Source-Symlinks"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:319
 msgid ""
@@ -4778,11 +3773,6 @@ msgid ""
 "be symlinked when possible instead of copying. True is the default."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:323 sources.list.5.xml:160
-msgid "http"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:324
 msgid ""
@@ -4853,11 +3843,6 @@ msgid ""
 "clients only if the client uses a known identifier."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:366
-msgid "https"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:367
 msgid ""
@@ -4889,11 +3874,6 @@ msgid ""
 "option."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:391 sources.list.5.xml:171
-msgid "ftp"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:392
 msgid ""
@@ -4942,11 +3922,6 @@ msgid ""
 "that most FTP servers do not support RFC2428."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:430 sources.list.5.xml:153
-msgid "cdrom"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
 #: apt.conf.5.xml:436
 #, no-wrap
@@ -4966,11 +3941,6 @@ msgid ""
 "can be specified using UMount."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:441
-msgid "gpgv"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:442
 msgid ""
@@ -4979,11 +3949,6 @@ msgid ""
 "passed to gpgv."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:447
-msgid "CompressionTypes"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
 #: apt.conf.5.xml:453
 #, no-wrap
@@ -5060,11 +4025,6 @@ msgid ""
 "uncompressed files so this is mostly only useable for local mirrors."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:475
-msgid "GzipIndexes"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:477
 msgid ""
@@ -5074,11 +4034,6 @@ msgid ""
 "CPU requirements when building the local package caches. False by default."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:484
-msgid "Languages"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:485
 msgid ""
@@ -5233,11 +4188,6 @@ msgid ""
 "section."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:577
-msgid "Clean"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:578
 msgid ""
@@ -5256,11 +4206,6 @@ msgid ""
 "when it is run for the install phase."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:591
-msgid "Updateoptions"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:592
 msgid ""
@@ -5268,11 +4213,6 @@ msgid ""
 "when it is run for the update phase."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:596
-msgid "PromptAfterUpdate"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:597
 msgid ""
@@ -5300,16 +4240,6 @@ msgid ""
 "&dpkg;."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:614
-msgid "Pre-Invoke"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:614
-msgid "Post-Invoke"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:615
 msgid ""
@@ -5319,11 +4249,6 @@ msgid ""
 "fail APT will abort."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:621
-msgid "Pre-Install-Pkgs"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:622
 msgid ""
@@ -5344,11 +4269,6 @@ msgid ""
 "given to <literal>Pre-Install-Pkgs</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:635
-msgid "Run-Directory"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:636
 msgid ""
@@ -5356,11 +4276,6 @@ msgid ""
 "</filename>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:640
-msgid "Build-options"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:641
 msgid ""
@@ -5412,11 +4327,6 @@ msgid ""
 "would be <placeholder type=\"literallayout\" id=\"0\"/>"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:668
-msgid "DPkg::NoTriggers"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:669
 msgid ""
@@ -5429,11 +4339,6 @@ msgid ""
 "dpkg - now apt will add these flag also to the unpack and remove calls."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:676
-msgid "PackageManager::Configure"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:677
 msgid ""
@@ -5450,11 +4355,6 @@ msgid ""
 "the system could end in an unconfigured status which could be unbootable!"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:687
-msgid "DPkg::ConfigurePending"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:688
 msgid ""
@@ -5466,11 +4366,6 @@ msgid ""
 "you could deactivate this option in all but the last run."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:694
-msgid "DPkg::TriggersPending"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:695
 msgid ""
@@ -5481,11 +4376,6 @@ msgid ""
 "triggers, not only the triggers needed to configure this package."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:700
-msgid "PackageManager::UnpackAll"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:701
 msgid ""
@@ -5498,11 +4388,6 @@ msgid ""
 "really useful."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:708
-msgid "OrderList::Score::Immediate"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
 #: apt.conf.5.xml:716
 #, no-wrap
@@ -5597,57 +4482,27 @@ msgstr ""
 msgid "A full list of debugging options to apt follows."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:791
-#, fuzzy
-msgid "<literal>Debug::Acquire::cdrom</literal>"
-msgstr "a linha <literal>Archive:</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:795
 msgid ""
 "Print information related to accessing <literal>cdrom://</literal> sources."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:802
-#, fuzzy
-msgid "<literal>Debug::Acquire::ftp</literal>"
-msgstr "a linha <literal>Archive:</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:806
 msgid "Print information related to downloading packages using FTP."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:813
-#, fuzzy
-msgid "<literal>Debug::Acquire::http</literal>"
-msgstr "a linha <literal>Archive:</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:817
 msgid "Print information related to downloading packages using HTTP."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:824
-#, fuzzy
-msgid "<literal>Debug::Acquire::https</literal>"
-msgstr "a linha <literal>Archive:</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:828
 msgid "Print information related to downloading packages using HTTPS."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:835
-#, fuzzy
-msgid "<literal>Debug::Acquire::gpgv</literal>"
-msgstr "a linha <literal>Archive:</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:839
 msgid ""
@@ -5655,12 +4510,6 @@ msgid ""
 "<literal>gpg</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:846
-#, fuzzy
-msgid "<literal>Debug::aptcdrom</literal>"
-msgstr "a linha <literal>Version:</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:850
 msgid ""
@@ -5668,23 +4517,11 @@ msgid ""
 "stored on CD-ROMs."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:857
-#, fuzzy
-msgid "<literal>Debug::BuildDeps</literal>"
-msgstr "a linha <literal>Label:</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:860
 msgid "Describes the process of resolving build-dependencies in &apt-get;."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:867
-#, fuzzy
-msgid "<literal>Debug::Hashes</literal>"
-msgstr "a linha <literal>Label:</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:870
 msgid ""
@@ -5692,12 +4529,6 @@ msgid ""
 "literal> libraries."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:877
-#, fuzzy
-msgid "<literal>Debug::IdentCDROM</literal>"
-msgstr "a linha <literal>Label:</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:880
 msgid ""
@@ -5706,12 +4537,6 @@ msgid ""
 "a CD-ROM."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:888
-#, fuzzy
-msgid "<literal>Debug::NoLocking</literal>"
-msgstr "a linha <literal>Origin:</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:891
 msgid ""
@@ -5719,23 +4544,11 @@ msgid ""
 "<quote><literal>apt-get update</literal></quote> to run at the same time."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:899
-#, fuzzy
-msgid "<literal>Debug::pkgAcquire</literal>"
-msgstr "a linha <literal>Archive:</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:903
 msgid "Log when items are added to or removed from the global download queue."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:910
-#, fuzzy
-msgid "<literal>Debug::pkgAcquire::Auth</literal>"
-msgstr "a linha <literal>Archive:</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:913
 msgid ""
@@ -5743,12 +4556,6 @@ msgid ""
 "cryptographic signatures of downloaded files."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:920
-#, fuzzy
-msgid "<literal>Debug::pkgAcquire::Diffs</literal>"
-msgstr "a linha <literal>Archive:</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:923
 msgid ""
@@ -5756,12 +4563,6 @@ msgid ""
 "and errors relating to package index list diffs."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:931
-#, fuzzy
-msgid "<literal>Debug::pkgAcquire::RRed</literal>"
-msgstr "a linha <literal>Archive:</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:935
 msgid ""
@@ -5769,23 +4570,12 @@ msgid ""
 "index diffs instead of full indices."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:942
-#, fuzzy
-msgid "<literal>Debug::pkgAcquire::Worker</literal>"
-msgstr "a linha <literal>Archive:</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:946
 msgid ""
 "Log all interactions with the sub-processes that actually perform downloads."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:953
-msgid "<literal>Debug::pkgAutoRemove</literal>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:957
 msgid ""
@@ -5793,11 +4583,6 @@ msgid ""
 "the removal of unused packages."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:964
-msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:967
 msgid ""
@@ -5808,11 +4593,6 @@ msgid ""
 "pkgProblemResolver</literal> for that."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:978
-msgid "<literal>Debug::pkgDepCache::Marker</literal>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:981
 msgid ""
@@ -5830,23 +4610,11 @@ msgid ""
 "<literal>section</literal> is the name of the section the package appears in."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1000
-#, fuzzy
-msgid "<literal>Debug::pkgInitConfig</literal>"
-msgstr "a linha <literal>Version:</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:1003
 msgid "Dump the default configuration to standard error on startup."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1010
-#, fuzzy
-msgid "<literal>Debug::pkgDPkgPM</literal>"
-msgstr "a linha <literal>Package:</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:1013
 msgid ""
@@ -5854,11 +4622,6 @@ msgid ""
 "invoked, with arguments separated by a single space character."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1021
-msgid "<literal>Debug::pkgDPkgProgressReporting</literal>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:1024
 msgid ""
@@ -5866,12 +4629,6 @@ msgid ""
 "any errors encountered while parsing it."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1031
-#, fuzzy
-msgid "<literal>Debug::pkgOrderList</literal>"
-msgstr "a linha <literal>Origin:</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:1035
 msgid ""
@@ -5879,34 +4636,17 @@ msgid ""
 "<literal>apt</literal> should pass packages to &dpkg;."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1043
-#, fuzzy
-msgid "<literal>Debug::pkgPackageManager</literal>"
-msgstr "a linha <literal>Package:</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:1047
 msgid ""
 "Output status messages tracing the steps performed when invoking &dpkg;."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1054
-#, fuzzy
-msgid "<literal>Debug::pkgPolicy</literal>"
-msgstr "a linha <literal>Label:</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:1058
 msgid "Output the priority of each package list on startup."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1064
-msgid "<literal>Debug::pkgProblemResolver</literal>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:1068
 msgid ""
@@ -5914,11 +4654,6 @@ msgid ""
 "happens when a complex dependency problem is encountered)."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1076
-msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:1079
 msgid ""
@@ -5927,12 +4662,6 @@ msgid ""
 "described in <literal>Debug::pkgDepCache::Marker</literal>"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1087
-#, fuzzy
-msgid "<literal>Debug::sourceList</literal>"
-msgstr "a linha <literal>Version:</literal>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:1091
 msgid ""
@@ -6552,30 +5281,31 @@ msgstr ""
 "Pin: release a=unstable\n"
 "Pin-Priority: 50\n"
 
-#. type: Content of: <refentry><refsect1><refsect2><literal>
-#: apt_preferences.5.xml:290
-msgid "Package"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><literal>
-#: apt_preferences.5.xml:296
-msgid "*"
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt_preferences.5.xml:291
+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 "
+"of all package names it matches. It is undecided whether this will change in "
+"the future, thus you should always list wild-card pins first, so later "
+"specific pins override it.  The pattern \"<literal>*</literal>\" in a "
+"Package field is not considered a glob() expression in itself."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:306
+#: apt_preferences.5.xml:307
 #, fuzzy
 msgid "How APT Interprets Priorities"
 msgstr "Como o APT Interpreta Prioridades"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:314
+#: apt_preferences.5.xml:315
 #, fuzzy
 msgid "P &gt; 1000"
 msgstr "P &gt; 1000"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:315
+#: apt_preferences.5.xml:316
 #, fuzzy
 msgid ""
 "causes a version to be installed even if this constitutes a downgrade of the "
@@ -6585,13 +5315,13 @@ msgstr ""
 "dowgrade do pacote"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:319
+#: apt_preferences.5.xml:320
 #, fuzzy
 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:320
+#: apt_preferences.5.xml:321
 #, fuzzy
 msgid ""
 "causes a version to be installed even if it does not come from the target "
@@ -6601,13 +5331,13 @@ 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:325
+#: apt_preferences.5.xml:326
 #, fuzzy
 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:326
+#: apt_preferences.5.xml:327
 #, fuzzy
 msgid ""
 "causes a version to be installed unless there is a version available "
@@ -6617,13 +5347,13 @@ 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:331
+#: apt_preferences.5.xml:332
 #, fuzzy
 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:332
+#: apt_preferences.5.xml:333
 #, fuzzy
 msgid ""
 "causes a version to be installed unless there is a version available "
@@ -6634,13 +5364,13 @@ msgstr ""
 "seja mais recente"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:337
+#: apt_preferences.5.xml:338
 #, fuzzy
 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:338
+#: apt_preferences.5.xml:339
 #, fuzzy
 msgid ""
 "causes a version to be installed only if there is no installed version of "
@@ -6650,19 +5380,19 @@ msgstr ""
 "instalada do pacote"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:342
+#: apt_preferences.5.xml:343
 #, fuzzy
 msgid "P &lt; 0"
 msgstr "P &lt; 0"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:343
+#: apt_preferences.5.xml:344
 #, 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:309
+#: apt_preferences.5.xml:310
 #, fuzzy
 msgid ""
 "Priorities (P) assigned in the APT preferences file must be positive or "
@@ -6674,7 +5404,7 @@ msgstr ""
 "seguir (a grosso modo):"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:348
+#: apt_preferences.5.xml:349
 #, fuzzy
 msgid ""
 "If any specific-form records match an available package version then the "
@@ -6690,7 +5420,7 @@ msgstr ""
 "determinará a prioridade da versão do pacote."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:354
+#: apt_preferences.5.xml:355
 #, fuzzy
 msgid ""
 "For example, suppose the APT preferences file contains the three records "
@@ -6700,7 +5430,7 @@ msgstr ""
 "registros apresentados anteriormente :"
 
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:358
+#: apt_preferences.5.xml:359
 #, fuzzy, no-wrap
 msgid ""
 "Package: perl\n"
@@ -6729,12 +5459,12 @@ msgstr ""
 "Pin-Priority: 50\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:371
+#: apt_preferences.5.xml:372
 msgid "Then:"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:373
+#: apt_preferences.5.xml:374
 #, fuzzy
 msgid ""
 "The most recent available version of the <literal>perl</literal> package "
@@ -6750,7 +5480,7 @@ msgstr ""
 "será feito um downgrade do <literal>perl</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:378
+#: apt_preferences.5.xml:379
 #, fuzzy
 msgid ""
 "A version of any package other than <literal>perl</literal> that is "
@@ -6762,7 +5492,7 @@ msgstr ""
 "mesmo versões pertencentes a versão alvo."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:382
+#: apt_preferences.5.xml:383
 #, fuzzy
 msgid ""
 "A version of a package whose origin is not the local system but some other "
@@ -6777,13 +5507,13 @@ msgstr ""
 "instalada."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:392
+#: apt_preferences.5.xml:393
 #, 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:394
+#: apt_preferences.5.xml:395
 #, fuzzy
 msgid ""
 "The locations listed in the &sources-list; file should provide "
@@ -6795,31 +5525,31 @@ msgstr ""
 "os pacotes disponíveis nessas localidades."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:406
+#: apt_preferences.5.xml:407
 #, 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:407
+#: apt_preferences.5.xml:408
 #, 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:410 apt_preferences.5.xml:460
+#: apt_preferences.5.xml:411 apt_preferences.5.xml:461
 #, 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:411
+#: apt_preferences.5.xml:412
 #, 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:398
+#: apt_preferences.5.xml:399
 #, fuzzy
 msgid ""
 "The <filename>Packages</filename> file is normally found in the directory "
@@ -6841,13 +5571,13 @@ msgstr ""
 "do APT :"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:427
+#: apt_preferences.5.xml:428
 #, 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:428
+#: apt_preferences.5.xml:429
 #, fuzzy
 msgid ""
 "names the archive to which all the packages in the directory tree belong.  "
@@ -6865,7 +5595,7 @@ msgstr ""
 "requerer a linha :"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:438
+#: apt_preferences.5.xml:439
 #, fuzzy, no-wrap
 msgid "Pin: release a=stable\n"
 msgstr ""
@@ -6873,13 +5603,13 @@ msgstr ""
 "Pin: release a=stable\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:444
+#: apt_preferences.5.xml:445
 #, 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:445
+#: apt_preferences.5.xml:446
 #, fuzzy
 msgid ""
 "names the codename to which all the packages in the directory tree belong.  "
@@ -6897,7 +5627,7 @@ msgstr ""
 "requerer a linha :"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:454
+#: apt_preferences.5.xml:455
 #, fuzzy, no-wrap
 msgid "Pin: release n=&testing-codename;\n"
 msgstr ""
@@ -6905,7 +5635,7 @@ msgstr ""
 "Pin: release a=stable\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:461
+#: apt_preferences.5.xml:462
 #, fuzzy
 msgid ""
 "names the release version.  For example, the packages in the tree might "
@@ -6922,7 +5652,7 @@ msgstr ""
 "das linhas a seguir."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:470
+#: apt_preferences.5.xml:471
 #, fuzzy, no-wrap
 msgid ""
 "Pin: release v=3.0\n"
@@ -6935,13 +5665,13 @@ msgstr ""
 "Pin: release 3.0\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:479
+#: apt_preferences.5.xml:480
 #, 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:480
+#: apt_preferences.5.xml:481
 #, fuzzy
 msgid ""
 "names the licensing component associated with the packages in the directory "
@@ -6960,7 +5690,7 @@ msgstr ""
 "requerer a linha :"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:489
+#: apt_preferences.5.xml:490
 #, fuzzy, no-wrap
 msgid "Pin: release c=main\n"
 msgstr ""
@@ -6968,13 +5698,13 @@ msgstr ""
 "Pin: release c=main\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:495
+#: apt_preferences.5.xml:496
 #, 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:496
+#: apt_preferences.5.xml:497
 #, fuzzy
 msgid ""
 "names the originator of the packages in the directory tree of the "
@@ -6988,7 +5718,7 @@ msgstr ""
 "requerer a linha :"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:502
+#: apt_preferences.5.xml:503
 #, fuzzy, no-wrap
 msgid "Pin: release o=Debian\n"
 msgstr ""
@@ -6996,13 +5726,13 @@ msgstr ""
 "Pin: release o=Debian\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:508
+#: apt_preferences.5.xml:509
 #, 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:509
+#: apt_preferences.5.xml:510
 #, fuzzy
 msgid ""
 "names the label of the packages in the directory tree of the "
@@ -7015,7 +5745,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:515
+#: apt_preferences.5.xml:516
 #, fuzzy, no-wrap
 msgid "Pin: release l=Debian\n"
 msgstr ""
@@ -7023,7 +5753,7 @@ msgstr ""
 "Pin: release l=Debian\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:416
+#: apt_preferences.5.xml:417
 #, fuzzy
 msgid ""
 "The <filename>Release</filename> file is normally found in the directory "
@@ -7047,7 +5777,7 @@ msgstr ""
 "do APT :"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:522
+#: apt_preferences.5.xml:523
 #, fuzzy
 msgid ""
 "All of the <filename>Packages</filename> and <filename>Release</filename> "
@@ -7073,13 +5803,13 @@ msgstr ""
 "<literal>unstable</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:535
+#: apt_preferences.5.xml:536
 #, 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:537
+#: apt_preferences.5.xml:538
 #, fuzzy
 msgid ""
 "Each record in the APT preferences file can optionally begin with one or "
@@ -7091,13 +5821,13 @@ msgstr ""
 "</literal>. Isto oferece um local para inserir comentários."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:546
+#: apt_preferences.5.xml:547
 #, fuzzy
 msgid "Tracking Stable"
 msgstr "Acompanhando a Stable"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:554
+#: apt_preferences.5.xml:555
 #, fuzzy, no-wrap
 msgid ""
 "Explanation: Uninstall or do not install any Debian-originated\n"
@@ -7122,7 +5852,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:548
+#: apt_preferences.5.xml:549
 #, fuzzy
 msgid ""
 "The following APT preferences file will cause APT to assign a priority "
@@ -7138,8 +5868,8 @@ msgstr ""
 "outras distribuições <literal>Debian</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:571 apt_preferences.5.xml:617
-#: apt_preferences.5.xml:675
+#: apt_preferences.5.xml:572 apt_preferences.5.xml:618
+#: apt_preferences.5.xml:676
 #, fuzzy, no-wrap
 msgid ""
 "apt-get install <replaceable>package-name</replaceable>\n"
@@ -7152,7 +5882,7 @@ msgstr ""
 "apt-get dist-upgrade\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:566
+#: apt_preferences.5.xml:567
 #, fuzzy
 msgid ""
 "With a suitable &sources-list; file and the above preferences file, any of "
@@ -7165,7 +5895,7 @@ msgstr ""
 "ulítma(s) versão(ôes) <literal>stable</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:583
+#: apt_preferences.5.xml:584
 #, fuzzy, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/testing\n"
 msgstr ""
@@ -7173,7 +5903,7 @@ msgstr ""
 "apt-get install <replaceable>pacote</replaceable>/testing\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:577
+#: apt_preferences.5.xml:578
 #, fuzzy
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
@@ -7186,13 +5916,13 @@ msgstr ""
 "atualizado novamente a menos que esse comando seja executado novamente."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:589
+#: apt_preferences.5.xml:590
 #, fuzzy
 msgid "Tracking Testing or Unstable"
 msgstr "Acompanhando a Testing"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:598
+#: apt_preferences.5.xml:599
 #, fuzzy, no-wrap
 msgid ""
 "Package: *\n"
@@ -7221,7 +5951,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:591
+#: apt_preferences.5.xml:592
 #, fuzzy
 msgid ""
 "The following APT preferences file will cause APT to assign a high priority "
@@ -7238,7 +5968,7 @@ msgstr ""
 "versões de pacotes de outras distribuições <literal>Debian</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:612
+#: apt_preferences.5.xml:613
 #, fuzzy
 msgid ""
 "With a suitable &sources-list; file and the above preferences file, any of "
@@ -7251,7 +5981,7 @@ msgstr ""
 "(s) última(s) versão(ões) <literal>testing</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:632
+#: apt_preferences.5.xml:633
 #, fuzzy, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
 msgstr ""
@@ -7259,7 +5989,7 @@ msgstr ""
 "apt-get install <replaceable>pacote</replaceable>/unstable\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:623
+#: apt_preferences.5.xml:624
 #, fuzzy
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
@@ -7279,12 +6009,12 @@ msgstr ""
 "recente que a versão instalada."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:639
+#: apt_preferences.5.xml:640
 msgid "Tracking the evolution of a codename release"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:653
+#: apt_preferences.5.xml:654
 #, fuzzy, no-wrap
 msgid ""
 "Explanation: Uninstall or do not install any Debian-originated package versions\n"
@@ -7314,7 +6044,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:641
+#: apt_preferences.5.xml:642
 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 "
@@ -7329,7 +6059,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:670
+#: apt_preferences.5.xml:671
 #, fuzzy
 msgid ""
 "With a suitable &sources-list; file and the above preferences file, any of "
@@ -7342,7 +6072,7 @@ msgstr ""
 "ulítma(s) versão(ôes) <literal>stable</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:690
+#: apt_preferences.5.xml:691
 #, fuzzy, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/sid\n"
 msgstr ""
@@ -7350,7 +6080,7 @@ msgstr ""
 "apt-get install <replaceable>pacote</replaceable>/testing\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:681
+#: apt_preferences.5.xml:682
 #, fuzzy
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
@@ -7370,13 +6100,13 @@ msgstr ""
 "recente que a versão instalada."
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt_preferences.5.xml:699
+#: apt_preferences.5.xml:700
 #, fuzzy
 msgid "&file-preferences;"
 msgstr "apt_preferences"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:705
+#: apt_preferences.5.xml:706
 #, fuzzy
 msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
@@ -7577,6 +6307,11 @@ msgid ""
 "archives."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+#: sources.list.5.xml:153
+msgid "cdrom"
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml:155
 msgid ""
@@ -7584,6 +6319,11 @@ msgid ""
 "Use the &apt-cdrom; program to create cdrom entries in the source list."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+#: sources.list.5.xml:160
+msgid "http"
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml:162
 msgid ""
@@ -7595,6 +6335,11 @@ msgid ""
 "authentication."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+#: sources.list.5.xml:171
+msgid "ftp"
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml:173
 msgid ""
@@ -7949,6 +6694,11 @@ msgstr ""
 msgid "Once updated there are several commands that can be used:"
 msgstr ""
 
+#. type: <tag></tag>
+#: guide.sgml:121
+msgid "upgrade"
+msgstr ""
+
 #. type: <p></p>
 #: guide.sgml:131
 msgid ""
@@ -7961,6 +6711,11 @@ msgid ""
 "<tt>apt-get install</tt> can be used to force these packages to install."
 msgstr ""
 
+#. type: <tag></tag>
+#: guide.sgml:131
+msgid "install"
+msgstr ""
+
 #. type: <p></p>
 #: guide.sgml:140
 msgid ""
@@ -7973,6 +6728,11 @@ msgid ""
 "anything other than its arguments are changed."
 msgstr ""
 
+#. type: <tag></tag>
+#: guide.sgml:140
+msgid "dist-upgrade"
+msgstr ""
+
 #. type: <p></p>
 #: guide.sgml:149
 msgid ""
@@ -8854,26 +7614,6 @@ msgstr ""
 #~ "menos o último valor especificado em uma linha iniciando com <literal>Pin-"
 #~ "Priority: release ...</literal>."
 
-#, fuzzy
-#~ msgid "<filename>/etc/apt/trusted.gpg</filename>"
-#~ msgstr "<filename>/etc/apt.conf</>"
-
-#, fuzzy
-#~ msgid "/usr/share/doc/apt/"
-#~ msgstr "/usr/share/doc/apt/"
-
-#, fuzzy
-#~ msgid "<filename>&docdir;examples/configure-index.gz</>"
-#~ msgstr "<filename>&docdir;examples/configure-index.gz</>"
-
-#, fuzzy
-#~ msgid "/var/lib/apt"
-#~ msgstr "/var/lib/apt"
-
-#, fuzzy
-#~ msgid "/var/cache/apt"
-#~ msgstr "/var/cache/apt"
-
 #, fuzzy
 #~ msgid ""
 #~ "\n"
@@ -8926,14 +7666,6 @@ msgstr ""
 #~ "     de configuração arbitrária. A sintaxe é <option>-o Foo::Bar=bar</>.\n"
 #~ "     </VarListEntry>\n"
 
-#, fuzzy
-#~ msgid "<manvolnum>5</manvolnum>"
-#~ msgstr "<manvolnum>5</manvolnum>"
-
 #, fuzzy
 #~ msgid "</programlisting> Then:"
 #~ msgstr "</programlisting> Então :"
-
-#, fuzzy
-#~ msgid "&manbugs; &manauthor;"
-#~ msgstr "&manbugs; &manauthor;"
diff --git a/doc/po4a.conf b/doc/po4a.conf
index 25c314640..aab9258fc 100644
--- a/doc/po4a.conf
+++ b/doc/po4a.conf
@@ -3,23 +3,28 @@
 
 # Entities need to be present, even if not translated
 [po4a_alias:entity] text opt:"-k 0"
+[po4a_alias:manpage] docbook opt:"\
+	-o untranslated='<term><option>' \
+	-o break='<term><option>' \
+	-o nodefault='<option>' \
+	-o inline='<para><option>'"
 
 # define source file and translated file (one file per line)
 [type: man]     apt.8 $lang:$lang/apt.$lang.8
 [type: entity]  apt.ent $lang:$lang/apt.ent
-[type: docbook] apt-cache.8.xml $lang:$lang/apt-cache.$lang.8.xml add_$lang:xml.add
-[type: docbook] apt-cdrom.8.xml $lang:$lang/apt-cdrom.$lang.8.xml add_$lang:xml.add
-[type: docbook] apt-config.8.xml $lang:$lang/apt-config.$lang.8.xml add_$lang:xml.add
-[type: docbook] apt-extracttemplates.1.xml $lang:$lang/apt-extracttemplates.$lang.1.xml add_$lang:xml.add
-[type: docbook] apt-ftparchive.1.xml $lang:$lang/apt-ftparchive.$lang.1.xml add_$lang:xml.add
-[type: docbook] apt-get.8.xml $lang:$lang/apt-get.$lang.8.xml add_$lang:xml.add
-[type: docbook] apt-key.8.xml $lang:$lang/apt-key.$lang.8.xml add_$lang:xml.add
-[type: docbook] apt-mark.8.xml $lang:$lang/apt-mark.$lang.8.xml add_$lang:xml.add
-[type: docbook] apt-secure.8.xml $lang:$lang/apt-secure.$lang.8.xml add_$lang:xml.add
-[type: docbook] apt-sortpkgs.1.xml $lang:$lang/apt-sortpkgs.$lang.1.xml add_$lang:xml.add
-[type: docbook] apt.conf.5.xml $lang:$lang/apt.conf.$lang.5.xml add_$lang:xml.add
-[type: docbook] apt_preferences.5.xml $lang:$lang/apt_preferences.$lang.5.xml add_$lang:xml.add
-[type: docbook] sources.list.5.xml $lang:$lang/sources.list.$lang.5.xml add_$lang:xml.add
+[type: manpage] apt-cache.8.xml $lang:$lang/apt-cache.$lang.8.xml add_$lang:xml.add
+[type: manpage] apt-cdrom.8.xml $lang:$lang/apt-cdrom.$lang.8.xml add_$lang:xml.add
+[type: manpage] apt-config.8.xml $lang:$lang/apt-config.$lang.8.xml add_$lang:xml.add
+[type: manpage] apt-extracttemplates.1.xml $lang:$lang/apt-extracttemplates.$lang.1.xml add_$lang:xml.add
+[type: manpage] apt-ftparchive.1.xml $lang:$lang/apt-ftparchive.$lang.1.xml add_$lang:xml.add
+[type: manpage] apt-get.8.xml $lang:$lang/apt-get.$lang.8.xml add_$lang:xml.add
+[type: manpage] apt-key.8.xml $lang:$lang/apt-key.$lang.8.xml add_$lang:xml.add
+[type: manpage] apt-mark.8.xml $lang:$lang/apt-mark.$lang.8.xml add_$lang:xml.add
+[type: manpage] apt-secure.8.xml $lang:$lang/apt-secure.$lang.8.xml add_$lang:xml.add
+[type: manpage] apt-sortpkgs.1.xml $lang:$lang/apt-sortpkgs.$lang.1.xml add_$lang:xml.add
+[type: manpage] apt.conf.5.xml $lang:$lang/apt.conf.$lang.5.xml add_$lang:xml.add
+[type: manpage] apt_preferences.5.xml $lang:$lang/apt_preferences.$lang.5.xml add_$lang:xml.add
+[type: manpage] sources.list.5.xml $lang:$lang/sources.list.$lang.5.xml add_$lang:xml.add
 
 [type: sgml]    guide.sgml $lang:$lang/guide.$lang.sgml
 #                 add_$lang::$lang/addendum/debiandoc_$lang.add