* doc/*.xml:

- mark even more stuff as untranslateable and improve the markup here and there (no real text change)
author: David Kalnischkies <kalnischkies@gmail.com> 2012-05-23 18:00:32 +0200
committer: David Kalnischkies <kalnischkies@gmail.com> 2012-05-23 18:00:32 +0200
commit: aec2216091b3d70b3baa5a5b8c87ce208e35c19c (patch)
tree: 4036014e4653205e59b28f9cce46895635a4cd81 /doc
parent: d3aac32ece65fd5424a94402f46db065298c07a8 (diff)
12 files changed, 382 insertions, 598 deletions
diff --git a/doc/apt-cache.8.xml b/doc/apt-cache.8.xml
index f36347107..1429af185 100644
--- a/doc/apt-cache.8.xml
+++ b/doc/apt-cache.8.xml
@@ -168,9 +168,7 @@ Reverse Provides:
 
      <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>
-     <manvolnum>7</manvolnum></citerefentry>.
+     lists for the POSIX regex pattern given, see &regex;.
      It searches the package names and the
      descriptions for an occurrence of the regular expression and prints out
      the package name and the short description, including virtual package
diff --git a/doc/apt-cdrom.8.xml b/doc/apt-cdrom.8.xml
index 501c4ee7e..dee42c1b1 100644
--- a/doc/apt-cdrom.8.xml
+++ b/doc/apt-cdrom.8.xml
@@ -49,8 +49,8 @@
    </para>
 
    <para>Unless the <option>-h</option>, or <option>--help</option> option is
-    given one of the commands below must be present.
-   
+   given, one of the commands below must be present.</para>
+
     <variablelist>
      <varlistentry><term><option>add</option></term>
      <listitem><para><literal>add</literal> is used to add a new disc to the
@@ -75,7 +75,6 @@
      </listitem>
      </varlistentry>
     </variablelist>
-   </para>
  </refsect1>
 
  <refsect1><title>Options</title>
diff --git a/doc/apt-config.8.xml b/doc/apt-config.8.xml
index a8fb897ef..134c8b086 100644
--- a/doc/apt-config.8.xml
+++ b/doc/apt-config.8.xml
@@ -42,7 +42,7 @@
    manner that is easy to use by scripted applications.</para>
 
    <para>Unless the <option>-h</option>, or <option>--help</option> option is
-   given one of the commands below must be present.
+   given, one of the commands below must be present.
    </para>
    
    <variablelist>
diff --git a/doc/apt-ftparchive.1.xml b/doc/apt-ftparchive.1.xml
index 028d9f70e..06d794a19 100644
--- a/doc/apt-ftparchive.1.xml
+++ b/doc/apt-ftparchive.1.xml
@@ -51,8 +51,8 @@
    programs aside from &gzip;. When doing a full generate it automatically 
    performs file-change checks and builds the desired compressed output files.</para>
    
-   <para>Unless the <option>-h</option>, or <option>--help</option> option is given one of the
-   commands below must be present.</para>
+   <para>Unless the <option>-h</option>, or <option>--help</option> option is given,
+   one of the commands below must be present.</para>
    
    <variablelist>
      <varlistentry><term><option>packages</option></term>
@@ -141,7 +141,7 @@
    <para>
    The generate configuration has 4 separate sections, each described below.</para>
 
-   <refsect2><title>Dir Section</title>
+     <refsect2><title><literal>Dir</literal> Section</title>
      <para>
      The <literal>Dir</literal> section defines the standard directories needed to 
      locate the files required during the generation process. These 
@@ -173,7 +173,7 @@
      </variablelist>
    </refsect2>
    
-   <refsect2><title>Default Section</title>
+   <refsect2><title><literal>Default</literal> Section</title>
      <para>
      The <literal>Default</literal> section specifies default values, and settings 
      that control the operation of the generator. Other sections may override 
@@ -239,7 +239,7 @@
      </variablelist>
    </refsect2>
    
-   <refsect2><title>TreeDefault Section</title>
+   <refsect2><title><literal>TreeDefault</literal> Section</title>
      <para>
      Sets defaults specific to <literal>Tree</literal> sections. All of these
      variables are substitution variables and have the strings $(DIST), 
@@ -339,7 +339,7 @@
      </variablelist>     
    </refsect2>
    
-   <refsect2><title>Tree Section</title>
+   <refsect2><title><literal>Tree</literal> Section</title>
      <para>
      The <literal>Tree</literal> section defines a standard Debian file tree which 
      consists of a base directory, then multiple sections in that base 
@@ -407,7 +407,7 @@ for i in Sections do
      </variablelist>
    </refsect2>
    
-   <refsect2><title>BinDirectory Section</title>
+   <refsect2><title><literal>BinDirectory</literal> Section</title>
      <para>
      The <literal>bindirectory</literal> section defines a binary directory tree 
      with no special structure. The scope tag specifies the location of 
diff --git a/doc/apt-mark.8.xml b/doc/apt-mark.8.xml
index 3b2b43c24..fcded2bf4 100644
--- a/doc/apt-mark.8.xml
+++ b/doc/apt-mark.8.xml
@@ -109,12 +109,11 @@
    
    <variablelist>
 	<varlistentry>
-		<term><option>-f=<filename><replaceable>&synopsis-filename;</replaceable></filename></option></term>
-		<term><option>--file=<filename><replaceable>&synopsis-filename;</replaceable></filename></option></term>
+	   <term><option>-f=&synopsis-param-filename;</option></term>
+	   <term><option>--file=&synopsis-param-filename;</option></term>
      <listitem><para>
      Read/Write package stats from the filename given with the parameter
-     <filename><replaceable>&synopsis-filename;</replaceable></filename>
-     instead of from the default location, which
+     &synopsis-param-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>
@@ -130,7 +129,7 @@
  </refsect1>
 
  <refsect1><title>See Also</title>
-   <para>&apt-get;,&aptitude;,&apt-conf;</para>
+    <para><phrase>&apt-get;,&aptitude;,&apt-conf;</phrase></para>
  </refsect1>
 
  <refsect1><title>Diagnostics</title>
diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index a44f37ab8..ff37f4ae7 100644
--- a/doc/apt-verbatim.ent
+++ b/doc/apt-verbatim.ent
@@ -154,6 +154,18 @@
   </citerefentry>"
 >
 
+<!ENTITY apt-transport-debtorrent "<citerefentry>
+    <refentrytitle><package>apt-transport-debtorrent</package></refentrytitle>
+    <manvolnum>1</manvolnum>
+  </citerefentry>"
+>
+
+<!ENTITY regex "<citerefentry>
+     <refentrytitle><abbrev>regex</abbrev></refentrytitle>
+     <manvolnum>7</manvolnum>
+  </citerefentry>"
+>
+
 <!-- Boiler plate docinfo section -->
 <!ENTITY apt-email "
    <address>
diff --git a/doc/apt.ent b/doc/apt.ent
index ea1dc0265..6a3837b95 100644
--- a/doc/apt.ent
+++ b/doc/apt.ent
@@ -103,7 +103,7 @@
 
      <varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>
      <listitem><para>Storage area for package files in transit.
-     Configuration Item: <literal>Dir::Cache::Archives</literal> (<filename>partial</filename> will be implicitly appended). </para></listitem>
+     Configuration Item: <literal>Dir::Cache::Archives</literal> (<filename>partial</filename> will be implicitly appended)</para></listitem>
      </varlistentry>
 ">
 
@@ -144,7 +144,7 @@
 
      <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>
      <listitem><para>Storage area for state information in transit.
-     Configuration Item: <literal>Dir::State::Lists</literal> (<filename>partial</filename> will be implicitly appended).</para></listitem>
+     Configuration Item: <literal>Dir::State::Lists</literal> (<filename>partial</filename> will be implicitly appended)</para></listitem>
      </varlistentry>
 ">
 
diff --git a/doc/makefile b/doc/makefile
index d9542b438..7b49ac269 100644
--- a/doc/makefile
+++ b/doc/makefile
@@ -84,12 +84,12 @@ doc: po4a
 
 update-po:
 	po4a --previous --no-backups --force --no-translations \
-		--package-name='$(PACKAGE)' --package-version='$(PACKAGE_VERSION)' \
+		--package-name='$(PACKAGE)-doc' --package-version='$(PACKAGE_VERSION)' \
 		--msgid-bugs-address='$(PACKAGE_MAIL)' po4a.conf
 
 po4a:
 	po4a --previous --no-backups \
-		--package-name='$(PACKAGE)' --package-version='$(PACKAGE_VERSION)' \
+		--package-name='$(PACKAGE)-doc' --package-version='$(PACKAGE_VERSION)' \
 		--msgid-bugs-address='$(PACKAGE_MAIL)' po4a.conf
 endif
 
diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index 377e83429..38689d28d 100644
--- a/doc/po/apt-doc.pot
+++ b/doc/po/apt-doc.pot
@@ -1,14 +1,14 @@
 # SOME DESCRIPTIVE TITLE
 # Copyright (C) YEAR Free Software Foundation, Inc.
-# This file is distributed under the same license as the apt package.
+# This file is distributed under the same license as the apt-doc package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: apt 0.9.5\n"
+"Project-Id-Version: apt-doc 0.9.4\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-05-22 16:30+0300\n"
+"POT-Creation-Date: 2012-05-23 17:06+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"
@@ -309,7 +309,7 @@ msgid ""
 "     <listitem><para>Storage area for package files in transit.\n"
 "     Configuration Item: <literal>Dir::Cache::Archives</literal> "
 "(<filename>partial</filename> will be implicitly "
-"appended). </para></listitem>\n"
+"appended)</para></listitem>\n"
 "     </varlistentry>\n"
 "\">\n"
 msgstr ""
@@ -391,7 +391,7 @@ msgid ""
 "     <listitem><para>Storage area for state information in transit.\n"
 "     Configuration Item: <literal>Dir::State::Lists</literal> "
 "(<filename>partial</filename> will be implicitly "
-"appended).</para></listitem>\n"
+"appended)</para></listitem>\n"
 "     </varlistentry>\n"
 "\">\n"
 msgstr ""
@@ -635,7 +635,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:44 apt-get.8.xml:44
+#: apt-cache.8.xml:44 apt-cdrom.8.xml:51 apt-config.8.xml:44 apt-ftparchive.1.xml:54 apt-get.8.xml:44
 msgid ""
 "Unless the <option>-h</option>, or <option>--help</option> option is given, "
 "one of the commands below must be present."
@@ -649,7 +649,7 @@ msgid ""
 msgstr ""
 
 #. 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
+#: apt-cache.8.xml:53 apt-cache.8.xml:142 apt-cache.8.xml:163 apt-cache.8.xml:185 apt-cache.8.xml:190 apt-cache.8.xml:206 apt-cache.8.xml:224 apt-cache.8.xml:236
 msgid "&synopsis-pkg;"
 msgstr ""
 
@@ -821,45 +821,43 @@ msgstr ""
 #: apt-cache.8.xml:170
 msgid ""
 "<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> "
-"<manvolnum>7</manvolnum></citerefentry>.  It searches the package names and "
-"the descriptions for an occurrence of the regular expression and prints out "
-"the package name and the short description, including virtual package "
-"names.  If <option>--full</option> is given then output identical to "
-"<literal>show</literal> is produced for each matched package, and if "
-"<option>--names-only</option> is given then the long description is not "
-"searched, only the package name is."
+"package lists for the POSIX regex pattern given, see &regex;.  It searches "
+"the package names and the descriptions for an occurrence of the regular "
+"expression and prints out the package name and the short description, "
+"including virtual package names.  If <option>--full</option> is given then "
+"output identical to <literal>show</literal> is produced for each matched "
+"package, and if <option>--names-only</option> is given then the long "
+"description is not searched, only the package name is."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:183
+#: apt-cache.8.xml:181
 msgid ""
 "Separate arguments can be used to specify multiple search patterns that are "
 "and'ed together."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:188
+#: apt-cache.8.xml:186
 msgid ""
 "<literal>depends</literal> shows a listing of each dependency a package has "
 "and all the possible other packages that can fulfill that dependency."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:193
+#: apt-cache.8.xml:191
 msgid ""
 "<literal>rdepends</literal> shows a listing of each reverse dependency a "
 "package has."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:197
+#: apt-cache.8.xml:195
 msgid "<optional><replaceable>&synopsis-prefix;</replaceable></optional>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:198
+#: apt-cache.8.xml:196
 msgid ""
 "This command prints the name of each package APT knows. The optional "
 "argument is a prefix match to filter the name list. The output is suitable "
@@ -869,7 +867,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:203
+#: apt-cache.8.xml:201
 msgid ""
 "Note that a package which APT knows of is not necessarily available to "
 "download, installable or installed, e.g. virtual packages are also listed in "
@@ -877,7 +875,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:209
+#: apt-cache.8.xml:207
 msgid ""
 "<literal>dotty</literal> takes a list of packages on the command line and "
 "generates output suitable for use by dotty from the <ulink "
@@ -890,7 +888,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:218
+#: apt-cache.8.xml:216
 msgid ""
 "The resulting nodes will have several shapes; normal packages are boxes, "
 "pure provides are triangles, mixed provides are diamonds, missing packages "
@@ -899,12 +897,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:223
+#: apt-cache.8.xml:221
 msgid "Caution, dotty cannot graph larger sets of packages."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:227
+#: apt-cache.8.xml:225
 msgid ""
 "The same as <literal>dotty</literal>, only for xvcg from the <ulink "
 "url=\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG "
@@ -912,12 +910,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:231
+#: apt-cache.8.xml:229
 msgid "<optional><replaceable>&synopsis-pkg;</replaceable>…</optional>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:232
+#: apt-cache.8.xml:230
 msgid ""
 "<literal>policy</literal> is meant to help debug issues relating to the "
 "preferences file. With no arguments it will print out the priorities of each "
@@ -926,7 +924,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:239
+#: apt-cache.8.xml:237
 msgid ""
 "<literal>apt-cache</literal>'s <literal>madison</literal> command attempts "
 "to mimic the output format and a subset of the functionality of the Debian "
@@ -938,12 +936,12 @@ msgid ""
 msgstr ""
 
 #. 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-cache.8.xml:248 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><listitem><para>
-#: apt-cache.8.xml:255
+#: apt-cache.8.xml:253
 msgid ""
 "Select the file to store the package cache. The package cache is the primary "
 "cache used by all operations.  Configuration Item: "
@@ -951,7 +949,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:261
+#: apt-cache.8.xml:259
 msgid ""
 "Select the file to store the source cache. The source is used only by "
 "<literal>gencaches</literal> and it stores a parsed version of the package "
@@ -961,7 +959,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:269
+#: apt-cache.8.xml:267
 msgid ""
 "Quiet; produces output suitable for logging, omitting progress indicators.  "
 "More q's will produce more quietness up to a maximum of 2. You can also use "
@@ -970,7 +968,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:276
+#: apt-cache.8.xml:274
 msgid ""
 "Print only important dependencies; for use with unmet and depends. Causes "
 "only Depends and Pre-Depends relations to be printed.  Configuration Item: "
@@ -978,7 +976,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:289
+#: apt-cache.8.xml:287
 msgid ""
 "Per default the <literal>depends</literal> and <literal>rdepends</literal> "
 "print all dependencies. This can be tweaked with these flags which will omit "
@@ -988,14 +986,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:296
+#: apt-cache.8.xml:294
 msgid ""
 "Print full package records when searching.  Configuration Item: "
 "<literal>APT::Cache::ShowFull</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:301
+#: apt-cache.8.xml:299
 msgid ""
 "Print full records for all available versions. This is the default; to turn "
 "it off, use <option>--no-all-versions</option>.  If "
@@ -1006,7 +1004,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:310
+#: apt-cache.8.xml:308
 msgid ""
 "Perform automatic package cache regeneration, rather than use the cache as "
 "it is. This is the default; to turn it off, use "
@@ -1015,14 +1013,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:316
+#: apt-cache.8.xml:314
 msgid ""
 "Only search on the package names, not the long descriptions.  Configuration "
 "Item: <literal>APT::Cache::NamesOnly</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:321
+#: apt-cache.8.xml:319
 msgid ""
 "Make <literal>pkgnames</literal> print all names, including virtual packages "
 "and missing dependencies.  Configuration Item: "
@@ -1030,7 +1028,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:327
+#: apt-cache.8.xml:325
 msgid ""
 "Make <literal>depends</literal> and <literal>rdepends</literal> recursive so "
 "that all packages mentioned are printed once.  Configuration Item: "
@@ -1038,45 +1036,35 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:334
+#: apt-cache.8.xml:332
 msgid ""
 "Limit the output of <literal>depends</literal> and "
 "<literal>rdepends</literal> to packages which are currently installed.  "
 "Configuration Item: <literal>APT::Cache::Installed</literal>."
 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: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:174 apt-mark.8.xml:126 apt.conf.5.xml:1118 apt_preferences.5.xml:698
+#: apt-cache.8.xml:342 apt-get.8.xml:519 apt-key.8.xml:174 apt-mark.8.xml:125 apt.conf.5.xml:1118 apt_preferences.5.xml:698
 msgid "Files"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-cache.8.xml:346
-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:70 apt-ftparchive.1.xml:607 apt-get.8.xml:529 apt-key.8.xml:195 apt-mark.8.xml:132 apt-secure.8.xml:192 apt-sortpkgs.1.xml:63 apt.conf.5.xml:1124 apt_preferences.5.xml:705 sources.list.5.xml:255
+#: apt-cache.8.xml:349 apt-cdrom.8.xml:144 apt-config.8.xml:109 apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:607 apt-get.8.xml:529 apt-key.8.xml:195 apt-mark.8.xml:131 apt-secure.8.xml:192 apt-sortpkgs.1.xml:63 apt.conf.5.xml:1124 apt_preferences.5.xml:705 sources.list.5.xml:252
 msgid "See Also"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:352
+#: apt-cache.8.xml:350
 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:74 apt-ftparchive.1.xml:611 apt-get.8.xml:535 apt-mark.8.xml:136 apt-sortpkgs.1.xml:67
+#: apt-cache.8.xml:354 apt-cdrom.8.xml:149 apt-config.8.xml:114 apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:611 apt-get.8.xml:535 apt-mark.8.xml:135 apt-sortpkgs.1.xml:67
 msgid "Diagnostics"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:357
+#: apt-cache.8.xml:355
 msgid ""
 "<command>apt-cache</command> returns zero on normal operation, decimal 100 "
 "on error."
@@ -1104,7 +1092,7 @@ msgid ""
 "must be inserted and scanned separately to account for possible mis-burns."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cdrom.8.xml:56
 msgid ""
 "<literal>add</literal> is used to add a new disc to the source list. It will "
@@ -1114,7 +1102,7 @@ msgid ""
 "title."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cdrom.8.xml:64
 msgid ""
 "APT uses a CDROM ID to track which disc is currently in the drive and "
@@ -1122,28 +1110,20 @@ msgid ""
 "<filename>&statedir;/cdroms.list</filename>"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cdrom.8.xml:72
 msgid ""
 "A debugging tool to report the identity of the current disc as well as the "
 "stored file name"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:51
-msgid ""
-"Unless the <option>-h</option>, or <option>--help</option> option is given "
-"one of the commands below must be present.  <placeholder "
-"type=\"variablelist\" id=\"0\"/>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cdrom.8.xml:81 apt-key.8.xml:160
+#: apt-cdrom.8.xml:80 apt-key.8.xml:160
 msgid "Options"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:86
+#: apt-cdrom.8.xml:85
 msgid ""
 "Mount point; specify the location to mount the cdrom. This mount point must "
 "be listed in <filename>/etc/fstab</filename> and properly configured.  "
@@ -1151,7 +1131,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:95
+#: apt-cdrom.8.xml:94
 msgid ""
 "Rename a disc; change the label of a disk or override the disks given "
 "label. This option will cause <command>apt-cdrom</command> to prompt for a "
@@ -1159,7 +1139,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:104
+#: apt-cdrom.8.xml:103
 msgid ""
 "No mounting; prevent <command>apt-cdrom</command> from mounting and "
 "unmounting the mount point.  Configuration Item: "
@@ -1167,7 +1147,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:112
+#: apt-cdrom.8.xml:111
 msgid ""
 "Fast Copy; Assume the package files are valid and do not check every "
 "package. This option should be used only if <command>apt-cdrom</command> has "
@@ -1176,7 +1156,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:122
+#: apt-cdrom.8.xml:121
 msgid ""
 "Thorough Package Scan; This option may be needed with some old Debian "
 "1.1/1.2 discs that have Package files in strange places. It takes much "
@@ -1184,7 +1164,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:133
+#: apt-cdrom.8.xml:132
 msgid ""
 "No Changes; Do not change the &sources-list; file and do not write index "
 "files. Everything is still checked however.  Configuration Item: "
@@ -1192,12 +1172,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:146
+#: apt-cdrom.8.xml:145
 msgid "&apt-conf;, &apt-get;, &sources-list;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:151
+#: apt-cdrom.8.xml:150
 msgid ""
 "<command>apt-cdrom</command> returns zero on normal operation, decimal 100 "
 "on error."
@@ -1217,13 +1197,6 @@ msgid ""
 "manner that is easy to use by scripted applications."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:44 apt-ftparchive.1.xml:54
-msgid ""
-"Unless the <option>-h</option>, or <option>--help</option> option is given "
-"one of the commands below must be present."
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-config.8.xml:51
 msgid ""
@@ -1495,7 +1468,7 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
 #: apt-ftparchive.1.xml:144
-msgid "Dir Section"
+msgid "<literal>Dir</literal> Section"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
@@ -1534,7 +1507,7 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
 #: apt-ftparchive.1.xml:176
-msgid "Default Section"
+msgid "<literal>Default</literal> Section"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
@@ -1613,7 +1586,7 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
 #: apt-ftparchive.1.xml:242
-msgid "TreeDefault Section"
+msgid "<literal>TreeDefault</literal> Section"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
@@ -1728,7 +1701,7 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
 #: apt-ftparchive.1.xml:342
-msgid "Tree Section"
+msgid "<literal>Tree</literal> Section"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
@@ -1818,7 +1791,7 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
 #: apt-ftparchive.1.xml:410
-msgid "BinDirectory Section"
+msgid "<literal>BinDirectory</literal> Section"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
@@ -2037,7 +2010,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:596 apt.conf.5.xml:1112 apt_preferences.5.xml:545 sources.list.5.xml:214
+#: apt-ftparchive.1.xml:596 apt.conf.5.xml:1112 apt_preferences.5.xml:545 sources.list.5.xml:211
 msgid "Examples"
 msgstr ""
 
@@ -2643,13 +2616,6 @@ msgid ""
 "<literal>APT::Get::AllowUnauthenticated</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-get.8.xml:521
-msgid ""
-"&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; "
-"&file-statelists;"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><para>
 #: apt-get.8.xml:530
 msgid ""
@@ -2762,11 +2728,6 @@ msgid ""
 "e.g. new keys are added to this one."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-key.8.xml:177
-msgid "&file-trustedgpg;"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-key.8.xml:179
 msgid "<filename>/etc/apt/trustdb.gpg</filename>"
@@ -2881,33 +2842,17 @@ msgid ""
 "the same way as for the other show commands."
 msgstr ""
 
-#. 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:115
 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 ""
-
-#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-mark.8.xml:128
-msgid "  &file-extended_states;"
+"&synopsis-param-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><para>
-#: apt-mark.8.xml:133
-msgid "&apt-get;,&aptitude;,&apt-conf;"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:137
+#: apt-mark.8.xml:136
 msgid ""
 "<command>apt-mark</command> returns zero on normal operation, non-zero on "
 "error."
@@ -3522,6 +3467,13 @@ msgstr ""
 msgid "The Acquire Group"
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><para>
+#: apt.conf.5.xml:254
+msgid ""
+"The <literal>Acquire</literal> group of options controls the download of "
+"packages and the URI handlers."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:259
 msgid ""
@@ -3918,14 +3870,6 @@ msgid ""
 "\"<literal>none</literal>\")."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:254
-msgid ""
-"The <literal>Acquire</literal> group of options controls the download of "
-"packages and the URI handlers.  <placeholder type=\"variablelist\" "
-"id=\"0\"/>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><title>
 #: apt.conf.5.xml:512
 msgid "Directories"
@@ -4512,11 +4456,6 @@ msgid ""
 "possible options."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist>
-#: apt.conf.5.xml:1120
-msgid "&file-aptconf;"
-msgstr ""
-
 #.  ? reading apt.conf 
 #. type: Content of: <refentry><refsect1><para>
 #: apt.conf.5.xml:1125
@@ -4623,6 +4562,13 @@ msgid ""
 "id=\"1\"/>"
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt_preferences.5.xml:101
+msgid ""
+"If the target release has been specified then APT uses the following "
+"algorithm to set the priorities of the versions of a package.  Assign:"
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
 #: apt_preferences.5.xml:106
 msgid "priority 1"
@@ -4674,14 +4620,6 @@ msgid "to the versions that are not installed and belong to the target release."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:101
-msgid ""
-"If the target release has been specified then APT uses the following "
-"algorithm to set the priorities of the versions of a package.  Assign: "
-"<placeholder type=\"variablelist\" id=\"0\"/>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><para>
 #: apt_preferences.5.xml:132
 msgid ""
 "If the target release has not been specified then APT simply assigns "
@@ -4958,6 +4896,13 @@ msgstr ""
 msgid "How APT Interprets Priorities"
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: 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):"
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
 #: apt_preferences.5.xml:315
 msgid "P &gt; 1000"
@@ -5029,14 +4974,6 @@ msgid "prevents the version from being installed"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: 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): "
-"<placeholder type=\"variablelist\" id=\"0\"/>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><para>
 #: apt_preferences.5.xml:349
 msgid ""
 "If any specific-form records match an available package version then the "
@@ -5114,6 +5051,18 @@ msgid ""
 "describe the packages available at that location."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: 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>: "
+"for example, "
+"<filename>.../dists/stable/main/binary-i386/Packages</filename>.  It "
+"consists of a series of multi-line records, one for each package available "
+"in that directory.  Only two lines in each record are relevant for setting "
+"APT priorities:"
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
 #: apt_preferences.5.xml:407
 msgid "the <literal>Package:</literal> line"
@@ -5135,15 +5084,16 @@ msgid "gives the version number for the named package"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:399
+#: apt_preferences.5.xml:417
 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>: "
-"for example, "
-"<filename>.../dists/stable/main/binary-i386/Packages</filename>.  It "
-"consists of a series of multi-line records, one for each package available "
-"in that directory.  Only two lines in each record are relevant for setting "
-"APT priorities: <placeholder type=\"variablelist\" id=\"0\"/>"
+"The <filename>Release</filename> file is normally found in the directory "
+"<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
+"example, <filename>.../dists/stable/Release</filename>, or "
+"<filename>.../dists/&stable-codename;/Release</filename>.  It consists of a "
+"single multi-line record which applies to <emphasis>all</emphasis> of the "
+"packages in the directory tree below its parent.  Unlike the "
+"<filename>Packages</filename> file, nearly all of the lines in a "
+"<filename>Release</filename> file are relevant for setting APT priorities:"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
@@ -5274,20 +5224,6 @@ msgid "Pin: release l=Debian\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: 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 "
-"example, <filename>.../dists/stable/Release</filename>, or "
-"<filename>.../dists/&stable-codename;/Release</filename>.  It consists of a "
-"single multi-line record which applies to <emphasis>all</emphasis> of the "
-"packages in the directory tree below its parent.  Unlike the "
-"<filename>Packages</filename> file, nearly all of the lines in a "
-"<filename>Release</filename> file are relevant for setting APT priorities: "
-"<placeholder type=\"variablelist\" id=\"0\"/>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><para>
 #: apt_preferences.5.xml:523
 msgid ""
 "All of the <filename>Packages</filename> and <filename>Release</filename> "
@@ -5507,11 +5443,6 @@ msgid ""
 "version.  <placeholder type=\"programlisting\" id=\"0\"/>"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist>
-#: apt_preferences.5.xml:700
-msgid "&file-preferences;"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><para>
 #: apt_preferences.5.xml:706
 msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
@@ -5697,39 +5628,29 @@ msgstr ""
 msgid "URI specification"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:146
-msgid "file"
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:143
+msgid "The currently recognized URI types are:"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:148
+#: sources.list.5.xml:147
 msgid ""
 "The file scheme allows an arbitrary directory in the file system to be "
 "considered an archive. This is useful for NFS mounts and local mirrors or "
 "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
+#: sources.list.5.xml:154
 msgid ""
 "The cdrom scheme allows APT to use a local CDROM drive with media "
 "swapping. Use the &apt-cdrom; program to create cdrom entries in the source "
 "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
+#: sources.list.5.xml:161
 msgid ""
 "The http scheme specifies an HTTP server for the archive. If an environment "
 "variable <envar>http_proxy</envar> is set with the format "
@@ -5739,13 +5660,8 @@ 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
+#: sources.list.5.xml:172
 msgid ""
 "The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
 "is highly configurable; for more information see the &apt-conf; manual "
@@ -5756,31 +5672,16 @@ msgid ""
 "file will be ignored."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:182
-msgid "copy"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:184
+#: sources.list.5.xml:183
 msgid ""
 "The copy scheme is identical to the file scheme except that packages are "
 "copied into the cache directory instead of used directly at their location.  "
 "This is useful for people using a zip disk to copy files around with APT."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:189
-msgid "rsh"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:189
-msgid "ssh"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:191
+#: sources.list.5.xml:190
 msgid ""
 "The rsh/ssh method invokes rsh/ssh to connect to a remote host as a given "
 "user and access the files. It is a good idea to do prior arrangements with "
@@ -5790,68 +5691,59 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:199
-msgid "more recognizable URI types"
+#: sources.list.5.xml:198
+msgid "adding more recognizable URI types"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:201
+#: sources.list.5.xml:200
 msgid ""
 "APT can be extended with more methods shipped in other optional packages "
 "which should follow the nameing scheme "
-"<literal>apt-transport-<replaceable>method</replaceable></literal>.  The APT "
-"team e.g. maintains also the <literal>apt-transport-https</literal> package "
+"<package>apt-transport-<replaceable>method</replaceable></package>.  The APT "
+"team e.g. maintains also the <package>apt-transport-https</package> package "
 "which provides access methods for https-URIs with features similar to the "
 "http method, but other methods for using e.g. debtorrent are also available, "
-"see <citerefentry> "
-"<refentrytitle><filename>apt-transport-debtorrent</filename></refentrytitle> "
-"<manvolnum>1</manvolnum></citerefentry>."
+"see &apt-transport-debtorrent;."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:143
-msgid ""
-"The currently recognized URI types are cdrom, file, http, ftp, copy, ssh, "
-"rsh.  <placeholder type=\"variablelist\" id=\"0\"/>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:215
+#: sources.list.5.xml:212
 msgid ""
 "Uses the archive stored locally (or NFS mounted) at /home/jason/debian for "
 "stable/main, stable/contrib, and stable/non-free."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:217
+#: sources.list.5.xml:214
 #, no-wrap
 msgid "deb file:/home/jason/debian stable main contrib non-free"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:219
+#: sources.list.5.xml:216
 msgid "As above, except this uses the unstable (development) distribution."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:220
+#: sources.list.5.xml:217
 #, no-wrap
 msgid "deb file:/home/jason/debian unstable main contrib non-free"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:222
+#: sources.list.5.xml:219
 msgid "Source line for the above"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:223
+#: sources.list.5.xml:220
 #, no-wrap
 msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:225
+#: sources.list.5.xml:222
 msgid ""
 "The first line gets package information for the architectures in "
 "<literal>APT::Architectures</literal> while the second always retrieves "
@@ -5859,7 +5751,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:227
+#: sources.list.5.xml:224
 #, no-wrap
 msgid ""
 "deb http://ftp.debian.org/debian &stable-codename; main\n"
@@ -5867,33 +5759,33 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:230
+#: sources.list.5.xml:227
 msgid ""
 "Uses HTTP to access the archive at archive.debian.org, and uses only the "
 "hamm/main area."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:232
+#: sources.list.5.xml:229
 #, no-wrap
 msgid "deb http://archive.debian.org/debian-archive hamm main"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:234
+#: sources.list.5.xml:231
 msgid ""
 "Uses FTP to access the archive at ftp.debian.org, under the debian "
 "directory, and uses only the &stable-codename;/contrib area."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:236
+#: sources.list.5.xml:233
 #, no-wrap
 msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:238
+#: sources.list.5.xml:235
 msgid ""
 "Uses FTP to access the archive at ftp.debian.org, under the debian "
 "directory, and uses only the unstable/contrib area. If this line appears as "
@@ -5902,19 +5794,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:242
+#: sources.list.5.xml:239
 #, no-wrap
 msgid "deb ftp://ftp.debian.org/debian unstable contrib"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:251
+#: sources.list.5.xml:248
 #, no-wrap
 msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:244
+#: sources.list.5.xml:241
 msgid ""
 "Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe "
 "directory, and uses only files found under "
@@ -5926,7 +5818,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:256
+#: sources.list.5.xml:253
 msgid "&apt-cache; &apt-conf;"
 msgstr ""
 
diff --git a/doc/po/de.po b/doc/po/de.po
index c7da79418..0442c4475 100644
--- a/doc/po/de.po
+++ b/doc/po/de.po
@@ -5,9 +5,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: apt-doc 0.8.15-9\n"
+"Project-Id-Version: apt-doc 0.9.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-05-21 13:37+0300\n"
+"POT-Creation-Date: 2012-05-23 01:20+0300\n"
 "PO-Revision-Date: 2012-05-21 23:18+0100\n"
 "Last-Translator: Chris Leick <c.leick@vollbio.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -389,20 +389,19 @@ msgstr ""
 "     Konfigurationselement: <literal>Dir::Cache::Archives</literal>.</para></listitem>\n"
 "     </varlistentry>\n"
 
-# FIXME s/appended)./appended.)/
 #. type: Plain text
 #: apt.ent:109
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>\n"
 "     <listitem><para>Storage area for package files in transit.\n"
-"     Configuration Item: <literal>Dir::Cache::Archives</literal> (<filename>partial</filename> will be implicitly appended). </para></listitem>\n"
+"     Configuration Item: <literal>Dir::Cache::Archives</literal> (<filename>partial</filename> will be implicitly appended)</para></listitem>\n"
 "     </varlistentry>\n"
 "\">\n"
 msgstr ""
 "     <varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>\n"
 "     <listitem><para>Speicherbereich für Paketdateien auf dem Transportweg.\n"
-"     Konfigurationselement: <literal>Dir::Cache::Archives</literal> (<filename>partial</filename> wird implizit angehängt.)</para></listitem>\n"
+"     Konfigurationselement: <literal>Dir::Cache::Archives</literal> (<filename>partial</filename> wird implizit angehängt)</para></listitem>\n"
 "     </varlistentry>\n"
 "\">\n"
 
@@ -495,20 +494,19 @@ msgstr ""
 "     Konfigurationselement: <literal>Dir::State::Lists</literal>.</para></listitem>\n"
 "     </varlistentry>\n"
 
-# FIXME s/appended)./appended.)/
 #. type: Plain text
 #: apt.ent:150
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n"
 "     <listitem><para>Storage area for state information in transit.\n"
-"     Configuration Item: <literal>Dir::State::Lists</literal> (<filename>partial</filename> will be implicitly appended).</para></listitem>\n"
+"     Configuration Item: <literal>Dir::State::Lists</literal> (<filename>partial</filename> will be implicitly appended)</para></listitem>\n"
 "     </varlistentry>\n"
 "\">\n"
 msgstr ""
 "     <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n"
 "     <listitem><para>Speicherbereich für Statusinformationen auf dem Transportweg.\n"
-"     Konfigurationselement: <literal>Dir::State::Lists</literal> (<filename>partial</filename> wird implizit angehängt.)</para></listitem>\n"
+"     Konfigurationselement: <literal>Dir::State::Lists</literal> (<filename>partial</filename> wird implizit angehängt)</para></listitem>\n"
 "     </varlistentry>\n"
 "\">\n"
 
@@ -777,7 +775,8 @@ msgstr ""
 "und Generieren von interessanten Ausgaben der Paket-Metadaten bereit."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:44 apt-get.8.xml:44
+#: apt-cache.8.xml:44 apt-cdrom.8.xml:51 apt-config.8.xml:44
+#: apt-ftparchive.1.xml:54 apt-get.8.xml:44
 msgid ""
 "Unless the <option>-h</option>, or <option>--help</option> option is given, "
 "one of the commands below must be present."
@@ -797,8 +796,8 @@ msgstr ""
 
 #. 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
+#: apt-cache.8.xml:185 apt-cache.8.xml:190 apt-cache.8.xml:206
+#: apt-cache.8.xml:224 apt-cache.8.xml:236
 msgid "&synopsis-pkg;"
 msgstr "&synopsis-pkg;"
 
@@ -1044,20 +1043,17 @@ msgstr "&synopsis-regex;"
 #: apt-cache.8.xml:170
 msgid ""
 "<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> "
-"<manvolnum>7</manvolnum></citerefentry>.  It searches the package names and "
-"the descriptions for an occurrence of the regular expression and prints out "
-"the package name and the short description, including virtual package "
-"names.  If <option>--full</option> is given then output identical to "
-"<literal>show</literal> is produced for each matched package, and if "
-"<option>--names-only</option> is given then the long description is not "
-"searched, only the package name is."
+"package lists for the POSIX regex pattern given, see &regex;.  It searches "
+"the package names and the descriptions for an occurrence of the regular "
+"expression and prints out the package name and the short description, "
+"including virtual package names.  If <option>--full</option> is given then "
+"output identical to <literal>show</literal> is produced for each matched "
+"package, and if <option>--names-only</option> is given then the long "
+"description is not searched, only the package name is."
 msgstr ""
 "<literal>search</literal> führt eine Volltextsuche in der Liste aller "
 "verfügbaren Pakete für das gegebene POSIX-regex-Muster durch, siehe "
-"<citerefentry><refentrytitle><command>regex</command></refentrytitle> "
-"<manvolnum>7</manvolnum></citerefentry>. Es durchsucht die Paketnamen und "
+"&regex;. Es durchsucht die Paketnamen und "
 "die Beschreibungen nach einem Vorkommen des regulären Ausdrucks und gibt den "
 "Paketnamen mit einer kurzen Beschreibung, einschließlich virtueller "
 "Paketnamen, aus. Wenn <option>--full</option> angegeben wurde, ist die "
@@ -1066,7 +1062,7 @@ msgstr ""
 "Beschreibung nicht durchsucht, sondern nur der Paketname."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:183
+#: apt-cache.8.xml:181
 msgid ""
 "Separate arguments can be used to specify multiple search patterns that are "
 "and'ed together."
@@ -1075,7 +1071,7 @@ msgstr ""
 "die »und«-verknüpft werden."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:188
+#: apt-cache.8.xml:186
 msgid ""
 "<literal>depends</literal> shows a listing of each dependency a package has "
 "and all the possible other packages that can fulfill that dependency."
@@ -1085,7 +1081,7 @@ msgstr ""
 "können."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:193
+#: apt-cache.8.xml:191
 msgid ""
 "<literal>rdepends</literal> shows a listing of each reverse dependency a "
 "package has."
@@ -1094,12 +1090,12 @@ msgstr ""
 "Rückwärtsabhängigkeit, die ein Paket hat."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:197
+#: apt-cache.8.xml:195
 msgid "<optional><replaceable>&synopsis-prefix;</replaceable></optional>"
 msgstr "<optional><replaceable>&synopsis-prefix;</replaceable></optional>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:198
+#: apt-cache.8.xml:196
 msgid ""
 "This command prints the name of each package APT knows. The optional "
 "argument is a prefix match to filter the name list. The output is suitable "
@@ -1114,7 +1110,7 @@ msgstr ""
 "besten mit der <option>--generate</option>-Option benutzt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:203
+#: apt-cache.8.xml:201
 msgid ""
 "Note that a package which APT knows of is not necessarily available to "
 "download, installable or installed, e.g. virtual packages are also listed in "
@@ -1125,7 +1121,7 @@ msgstr ""
 "Pakete sind z.B. auch in der generierten Liste aufgeführt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:209
+#: apt-cache.8.xml:207
 msgid ""
 "<literal>dotty</literal> takes a list of packages on the command line and "
 "generates output suitable for use by dotty from the <ulink url=\"http://www."
@@ -1147,7 +1143,7 @@ msgstr ""
 "GivenOnly</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:218
+#: apt-cache.8.xml:216
 msgid ""
 "The resulting nodes will have several shapes; normal packages are boxes, "
 "pure provides are triangles, mixed provides are diamonds, missing packages "
@@ -1161,14 +1157,14 @@ msgstr ""
 "depends, grüne Linien sind Konflikte."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:223
+#: apt-cache.8.xml:221
 msgid "Caution, dotty cannot graph larger sets of packages."
 msgstr ""
 "Vorsicht, dotty kann keine größeren Zusammenstellungen von Paketen grafisch "
 "darstellen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:227
+#: apt-cache.8.xml:225
 msgid ""
 "The same as <literal>dotty</literal>, only for xvcg from the <ulink url="
 "\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG tool</ulink>."
@@ -1178,12 +1174,12 @@ msgstr ""
 "ulink>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:231
+#: apt-cache.8.xml:229
 msgid "<optional><replaceable>&synopsis-pkg;</replaceable>…</optional>"
 msgstr "<optional><replaceable>&synopsis-pkg;</replaceable>…</optional>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:232
+#: apt-cache.8.xml:230
 msgid ""
 "<literal>policy</literal> is meant to help debug issues relating to the "
 "preferences file. With no arguments it will print out the priorities of each "
@@ -1196,7 +1192,7 @@ msgstr ""
 "Informationen über die Prioritätenauswahl der genannten Pakete aus."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:239
+#: apt-cache.8.xml:237
 msgid ""
 "<literal>apt-cache</literal>'s <literal>madison</literal> command attempts "
 "to mimic the output format and a subset of the functionality of the Debian "
@@ -1215,14 +1211,14 @@ msgstr ""
 "(<literal>APT::Architecture</literal>)."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:250 apt-config.8.xml:84 apt-extracttemplates.1.xml:52
+#: apt-cache.8.xml:248 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 "Optionen"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:255
+#: apt-cache.8.xml:253
 msgid ""
 "Select the file to store the package cache. The package cache is the primary "
 "cache used by all operations.  Configuration Item: <literal>Dir::Cache::"
@@ -1234,7 +1230,7 @@ msgstr ""
 "pkgcache</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:261
+#: apt-cache.8.xml:259
 msgid ""
 "Select the file to store the source cache. The source is used only by "
 "<literal>gencaches</literal> and it stores a parsed version of the package "
@@ -1251,7 +1247,7 @@ msgstr ""
 "srcpkgcache</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:269
+#: apt-cache.8.xml:267
 msgid ""
 "Quiet; produces output suitable for logging, omitting progress indicators.  "
 "More q's will produce more quietness up to a maximum of 2. You can also use "
@@ -1265,7 +1261,7 @@ msgstr ""
 "Konfigurationselement: <literal>quiet</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:276
+#: apt-cache.8.xml:274
 msgid ""
 "Print only important dependencies; for use with unmet and depends. Causes "
 "only Depends and Pre-Depends relations to be printed.  Configuration Item: "
@@ -1276,7 +1272,7 @@ msgstr ""
 "Konfigurationselement: <literal>APT::Cache::Important</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:289
+#: apt-cache.8.xml:287
 msgid ""
 "Per default the <literal>depends</literal> and <literal>rdepends</literal> "
 "print all dependencies. This can be tweaked with these flags which will omit "
@@ -1292,7 +1288,7 @@ msgstr ""
 "Cache::ShowRecommends</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:296
+#: apt-cache.8.xml:294
 msgid ""
 "Print full package records when searching.  Configuration Item: "
 "<literal>APT::Cache::ShowFull</literal>."
@@ -1301,7 +1297,7 @@ msgstr ""
 "Konfigurationselement: <literal>APT::Cache::ShowFull</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:301
+#: apt-cache.8.xml:299
 msgid ""
 "Print full records for all available versions. This is the default; to turn "
 "it off, use <option>--no-all-versions</option>.  If <option>--no-all-"
@@ -1318,7 +1314,7 @@ msgstr ""
 "anwendbar. Konfigurationselement: <literal>APT::Cache::AllVersions</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:310
+#: apt-cache.8.xml:308
 msgid ""
 "Perform automatic package cache regeneration, rather than use the cache as "
 "it is. This is the default; to turn it off, use <option>--no-generate</"
@@ -1330,7 +1326,7 @@ msgstr ""
 "Konfigurationselement: <literal>APT::Cache::Generate</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:316
+#: apt-cache.8.xml:314
 msgid ""
 "Only search on the package names, not the long descriptions.  Configuration "
 "Item: <literal>APT::Cache::NamesOnly</literal>."
@@ -1339,7 +1335,7 @@ msgstr ""
 "Konfigurationselement: <literal>APT::Cache::NamesOnly</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:321
+#: apt-cache.8.xml:319
 msgid ""
 "Make <literal>pkgnames</literal> print all names, including virtual packages "
 "and missing dependencies.  Configuration Item: <literal>APT::Cache::"
@@ -1350,7 +1346,7 @@ msgstr ""
 "<literal>APT::Cache::AllNames</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:327
+#: apt-cache.8.xml:325
 msgid ""
 "Make <literal>depends</literal> and <literal>rdepends</literal> recursive so "
 "that all packages mentioned are printed once.  Configuration Item: "
@@ -1361,7 +1357,7 @@ msgstr ""
 "Konfigurationselement: <literal>APT::Cache::RecurseDepends</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:334
+#: apt-cache.8.xml:332
 msgid ""
 "Limit the output of <literal>depends</literal> and <literal>rdepends</"
 "literal> to packages which are currently installed.  Configuration Item: "
@@ -1371,47 +1367,35 @@ msgstr ""
 "literal> auf Pakete, die aktuell installiert sind. Konfigurationselement: "
 "<literal>APT::Cache::Installed</literal>."
 
-#. 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: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:174 apt-mark.8.xml:126
+#: apt-cache.8.xml:342 apt-get.8.xml:519 apt-key.8.xml:174 apt-mark.8.xml:125
 #: apt.conf.5.xml:1118 apt_preferences.5.xml:698
 msgid "Files"
 msgstr "Dateien"
 
-#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-cache.8.xml:346
-msgid "&file-sourceslist; &file-statelists;"
-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-cache.8.xml:349 apt-cdrom.8.xml:144 apt-config.8.xml:109
 #: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:607 apt-get.8.xml:529
-#: apt-key.8.xml:195 apt-mark.8.xml:132 apt-secure.8.xml:192
+#: apt-key.8.xml:195 apt-mark.8.xml:131 apt-secure.8.xml:192
 #: apt-sortpkgs.1.xml:63 apt.conf.5.xml:1124 apt_preferences.5.xml:705
-#: sources.list.5.xml:255
+#: sources.list.5.xml:252
 msgid "See Also"
 msgstr "Siehe auch"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:352
+#: apt-cache.8.xml:350
 msgid "&apt-conf;, &sources-list;, &apt-get;"
 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-cache.8.xml:354 apt-cdrom.8.xml:149 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
+#: apt-mark.8.xml:135 apt-sortpkgs.1.xml:67
 msgid "Diagnostics"
 msgstr "Diagnose"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:357
+#: apt-cache.8.xml:355
 msgid ""
 "<command>apt-cache</command> returns zero on normal operation, decimal 100 "
 "on error."
@@ -1449,7 +1433,7 @@ 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><listitem><para>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cdrom.8.xml:56
 msgid ""
 "<literal>add</literal> is used to add a new disc to the source list. It will "
@@ -1464,7 +1448,7 @@ msgstr ""
 "fortfahren. Wenn das Medium kein angemessenes <filename>disk</filename>-"
 "Verzeichnis hat, werden Sie nach einem aussagekräftigen Titel gefragt."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cdrom.8.xml:64
 msgid ""
 "APT uses a CDROM ID to track which disc is currently in the drive and "
@@ -1475,7 +1459,7 @@ msgstr ""
 "Laufwerk ist und verwaltet eine Datenbank mit diesen IDs in "
 "<filename>&statedir;/cdroms.list</filename>"
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cdrom.8.xml:72
 msgid ""
 "A debugging tool to report the identity of the current disc as well as the "
@@ -1484,24 +1468,13 @@ msgstr ""
 "ein Fehlersuchwerkzeug, um die Identität des aktuellen Mediums sowie den "
 "gespeicherten Dateinamen zu berichten"
 
-#. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:51
-msgid ""
-"Unless the <option>-h</option>, or <option>--help</option> option is given "
-"one of the commands below must be present.  <placeholder type=\"variablelist"
-"\" id=\"0\"/>"
-msgstr ""
-"Außer wenn die Option <option>-h</option> oder <option>--help</option> "
-"angegeben wurde, muss einer der beiden Befehle unterhalb gegeben sein. "
-"<placeholder type=\"variablelist\" id=\"0\"/>"
-
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cdrom.8.xml:81 apt-key.8.xml:160
+#: apt-cdrom.8.xml:80 apt-key.8.xml:160
 msgid "Options"
 msgstr "Optionen"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:86
+#: apt-cdrom.8.xml:85
 msgid ""
 "Mount point; specify the location to mount the cdrom. This mount point must "
 "be listed in <filename>/etc/fstab</filename> and properly configured.  "
@@ -1513,7 +1486,7 @@ msgstr ""
 "cdrom::mount</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:95
+#: apt-cdrom.8.xml:94
 msgid ""
 "Rename a disc; change the label of a disk or override the disks given label. "
 "This option will cause <command>apt-cdrom</command> to prompt for a new "
@@ -1525,7 +1498,7 @@ msgstr ""
 "Konfigurationselement: <literal>APT::CDROM::Rename</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:104
+#: apt-cdrom.8.xml:103
 msgid ""
 "No mounting; prevent <command>apt-cdrom</command> from mounting and "
 "unmounting the mount point.  Configuration Item: <literal>APT::CDROM::"
@@ -1536,7 +1509,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:112
+#: apt-cdrom.8.xml:111
 msgid ""
 "Fast Copy; Assume the package files are valid and do not check every "
 "package. This option should be used only if <command>apt-cdrom</command> has "
@@ -1549,7 +1522,7 @@ msgstr ""
 "festgestellt hat. Konfigurationselement: <literal>APT::CDROM::Fast</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:122
+#: apt-cdrom.8.xml:121
 msgid ""
 "Thorough Package Scan; This option may be needed with some old Debian "
 "1.1/1.2 discs that have Package files in strange places. It takes much "
@@ -1560,7 +1533,7 @@ msgstr ""
 "Dies verlängert das Durchsuchen des Mediums deutlich, nimmt aber alle auf."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:133
+#: apt-cdrom.8.xml:132
 msgid ""
 "No Changes; Do not change the &sources-list; file and do not write index "
 "files. Everything is still checked however.  Configuration Item: "
@@ -1571,12 +1544,12 @@ msgstr ""
 "Konfigurationselement: <literal>APT::CDROM::NoAct</literal>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:146
+#: apt-cdrom.8.xml:145
 msgid "&apt-conf;, &apt-get;, &sources-list;"
 msgstr "&apt-conf;, &apt-get;, &sources-list;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:151
+#: apt-cdrom.8.xml:150
 msgid ""
 "<command>apt-cdrom</command> returns zero on normal operation, decimal 100 "
 "on error."
@@ -1603,15 +1576,6 @@ msgstr ""
 "apt/apt.conf</filename> auf eine Art zu, die leicht für geskriptete "
 "Anwendungen zu benutzen ist."
 
-#. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:44 apt-ftparchive.1.xml:54
-msgid ""
-"Unless the <option>-h</option>, or <option>--help</option> option is given "
-"one of the commands below must be present."
-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><listitem><para>
 #: apt-config.8.xml:51
 msgid ""
@@ -2001,8 +1965,8 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
 #: apt-ftparchive.1.xml:144
-msgid "Dir Section"
-msgstr "Dir-Abschnitt"
+msgid "<literal>Dir</literal> Section"
+msgstr "<literal>Dir</literal>-Abschnitt"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 #: apt-ftparchive.1.xml:146
@@ -2050,8 +2014,8 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
 #: apt-ftparchive.1.xml:176
-msgid "Default Section"
-msgstr "Default-Abschnitt"
+msgid "<literal>Default</literal> Section"
+msgstr "<literal>Default</literal>-Abschnitt"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 #: apt-ftparchive.1.xml:178
@@ -2154,8 +2118,8 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
 #: apt-ftparchive.1.xml:242
-msgid "TreeDefault Section"
-msgstr "TreeDefault-Abschnitt"
+msgid "<literal>TreeDefault</literal> Section"
+msgstr "<literal>TreeDefault</literal>-Abschnitt"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 #: apt-ftparchive.1.xml:244
@@ -2309,8 +2273,8 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
 #: apt-ftparchive.1.xml:342
-msgid "Tree Section"
-msgstr "Tree-Abschnitt"
+msgid "<literal>Tree</literal> Section"
+msgstr "<literal>Tree</literal>-Abschnitt"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 #: apt-ftparchive.1.xml:344
@@ -2427,11 +2391,10 @@ msgstr "setzt die zusätzliche Programm-Override-Datei"
 msgid "Sets the source extra override file."
 msgstr "setzt die zusätzliche Quell-Override-Datei"
 
-# FIXME <literal>?
 #. type: Content of: <refentry><refsect1><refsect2><title>
 #: apt-ftparchive.1.xml:410
-msgid "BinDirectory Section"
-msgstr "BinDirectory-Abschnitt"
+msgid "<literal>BinDirectory</literal> Section"
+msgstr "<literal>BinDirectory</literal>-Abschnitt"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 #: apt-ftparchive.1.xml:412
@@ -2729,7 +2692,7 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-ftparchive.1.xml:596 apt.conf.5.xml:1112 apt_preferences.5.xml:545
-#: sources.list.5.xml:214
+#: sources.list.5.xml:211
 msgid "Examples"
 msgstr "Beispiele"
 
@@ -3639,15 +3602,6 @@ msgstr ""
 "fragen. Dies ist für Werkzeuge wie pbuilder nützlich. Konfigurationselement: "
 "<literal>APT::Get::AllowUnauthenticated</literal>."
 
-#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-get.8.xml:521
-msgid ""
-"&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; "
-"&file-statelists;"
-msgstr ""
-"&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; "
-"&file-statelists;"
-
 #. type: Content of: <refentry><refsect1><para>
 #: apt-get.8.xml:530
 msgid ""
@@ -3795,11 +3749,6 @@ msgstr ""
 "<filename>trusted.gpg</filename> der primäre Schlüsselbund wird, d.h. neue "
 "Schlüssel werden zu diesem hinzugefügt."
 
-#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-key.8.xml:177
-msgid "&file-trustedgpg;"
-msgstr "&file-trustedgpg;"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-key.8.xml:179
 msgid "<filename>/etc/apt/trustdb.gpg</filename>"
@@ -3951,39 +3900,22 @@ msgstr ""
 "<literal>showhold</literal> wird benutzt, um eine Liste auf »hold« gesetzter "
 "Pakete auf die gleiche Art wie für andere Anzeigebefehle auszugeben."
 
-# FIXME not translatable
-#. 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 "<replaceable>&synopsis-filename;</replaceable>"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml:115
 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>."
+"&synopsis-param-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 ""
 "schreibt/liest Paketstatus von dem Dateinamen, der mit dem Parameter "
-"<filename><replaceable>&synopsis-filename;</replaceable></filename>, anstatt "
+"&synopsis-param-filename;, anstatt "
 "vom Standardort, der <filename>extended_status</filename> im von "
 "Konfigurationselement <literal>Dir::State</literal> definierten Verzeichnis, "
 "ist."
 
-#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-mark.8.xml:128
-msgid "  &file-extended_states;"
-msgstr "  &file-extended_states;"
-
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:133
-msgid "&apt-get;,&aptitude;,&apt-conf;"
-msgstr "&apt-get;,&aptitude;,&apt-conf;"
-
-#. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:137
+#: apt-mark.8.xml:136
 msgid ""
 "<command>apt-mark</command> returns zero on normal operation, non-zero on "
 "error."
@@ -4896,6 +4828,15 @@ msgstr ""
 msgid "The Acquire Group"
 msgstr "Die Erwerbgruppe"
 
+#. type: Content of: <refentry><refsect1><para>
+#: apt.conf.5.xml:254
+msgid ""
+"The <literal>Acquire</literal> group of options controls the download of "
+"packages and the URI handlers."
+msgstr ""
+"Die <literal>Acquire</literal>-Gruppe der Optionen steuert das Herunterladen "
+"von Paketen und die URI-Steuerprogramme."
+
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:259
 msgid ""
@@ -5515,16 +5456,6 @@ msgstr ""
 "in <filename>/var/lib/apt/lists/</filename> gefunden werden, an das Ende der "
 "Liste hinzugefügt (nach einem impliziten »<literal>none</literal>«)."
 
-#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:254
-msgid ""
-"The <literal>Acquire</literal> group of options controls the download of "
-"packages and the URI handlers.  <placeholder type=\"variablelist\" id=\"0\"/>"
-msgstr ""
-"Die <literal>Acquire</literal>-Gruppe der Optionen steuert das Herunterladen "
-"von Paketen und die URI-Steuerprogramme. <placeholder type=\"variablelist\" "
-"id=\"0\"/>"
-
 #. type: Content of: <refentry><refsect1><title>
 #: apt.conf.5.xml:512
 msgid "Directories"
@@ -6387,11 +6318,6 @@ msgstr ""
 "&configureindex; ist eine Konfigurationsdatei, die Beispielwerte für alle "
 "möglichen Optionen zeigen."
 
-#. type: Content of: <refentry><refsect1><variablelist>
-#: apt.conf.5.xml:1120
-msgid "&file-aptconf;"
-msgstr "&file-aptconf;"
-
 #.  ? reading apt.conf 
 #. type: Content of: <refentry><refsect1><para>
 #: apt.conf.5.xml:1125
@@ -6545,6 +6471,16 @@ msgstr ""
 "mit Pinning gewichteten Paketen. Beispielsweise <placeholder type="
 "\"programlisting\" id=\"0\"/> <placeholder type=\"programlisting\" id=\"1\"/>"
 
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt_preferences.5.xml:101
+msgid ""
+"If the target release has been specified then APT uses the following "
+"algorithm to set the priorities of the versions of a package.  Assign:"
+msgstr ""
+"Wenn das Ziel-Release angegeben wurde, dann benutzt APT den folgenden "
+"Algorithmus, um die Prioritäten der Versionen eines Paketes zu setzen. "
+"Zuweisung:"
+
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
 #: apt_preferences.5.xml:106
 msgid "priority 1"
@@ -6609,17 +6545,6 @@ msgstr ""
 "zu den Versionen, die nicht installiert sind und zum Ziel-Release gehören."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:101
-msgid ""
-"If the target release has been specified then APT uses the following "
-"algorithm to set the priorities of the versions of a package.  Assign: "
-"<placeholder type=\"variablelist\" id=\"0\"/>"
-msgstr ""
-"Wenn das Ziel-Release angegeben wurde, dann benutzt APT den folgenden "
-"Algorithmus, um die Prioritäten der Versionen eines Paketes zu setzen. "
-"Zuweisung: <placeholder type=\"variablelist\" id=\"0\"/>"
-
-#. type: Content of: <refentry><refsect1><refsect2><para>
 #: apt_preferences.5.xml:132
 msgid ""
 "If the target release has not been specified then APT simply assigns "
@@ -7013,6 +6938,16 @@ msgstr ""
 msgid "How APT Interprets Priorities"
 msgstr "Wie APT Prioritäten interpretiert"
 
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: 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):"
+msgstr ""
+"Die in der APT-Einstellungsdatei zugewiesenen Prioritäten (P) müssen "
+"positive oder negative Ganzzahlen sein. Sie werden wie folgt interpretiert "
+"(grob gesagt):"
+
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
 #: apt_preferences.5.xml:315
 msgid "P &gt; 1000"
@@ -7096,17 +7031,6 @@ msgid "prevents the version from being installed"
 msgstr "verhindert das Installieren der Version"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: 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): "
-"<placeholder type=\"variablelist\" id=\"0\"/>"
-msgstr ""
-"Die in der APT-Einstellungsdatei zugewiesenen Prioritäten (P) müssen "
-"positive oder negative Ganzzahlen sein. Sie werden wie folgt interpretiert "
-"(grob gesagt): <placeholder type=\"variablelist\" id=\"0\"/>"
-
-#. type: Content of: <refentry><refsect1><refsect2><para>
 #: apt_preferences.5.xml:349
 msgid ""
 "If any specific-form records match an available package version then the "
@@ -7218,6 +7142,25 @@ msgstr ""
 "<filename>Packages</filename>- und <filename>Release</filename>-Dateien "
 "bereitstellen, um die an diesem Ort verfügbaren Pakete zu beschreiben."
 
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: 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>: for example, <filename>.../dists/stable/main/binary-i386/"
+"Packages</filename>.  It consists of a series of multi-line records, one for "
+"each package available in that directory.  Only two lines in each record are "
+"relevant for setting APT priorities:"
+msgstr ""
+"Die <filename>Packages</filename>-Datei wird normalerweise im Verzeichnis "
+"<filename>…/dists/<replaceable>Distributions-Name</replaceable>/"
+"<replaceable>Komponente</replaceable>/<replaceable>Architektur</"
+"replaceable></filename> gefunden, zum Beispiel <filename>…/dists/stable/main/"
+"binary-i386/Packages</filename>. Sie besteht aus einer Serie mehrzeiliger "
+"Datensätze, einem für jedes verfügbare Paket in diesem Verzeichnis. In jedem "
+"Datensatz sind nur zwei Zeilen zum Setzen der APT-Prioritäten relevant:"
+
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
 #: apt_preferences.5.xml:407
 msgid "the <literal>Package:</literal> line"
@@ -7239,25 +7182,26 @@ 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:399
+#: apt_preferences.5.xml:417
 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>: for example, <filename>.../dists/stable/main/binary-i386/"
-"Packages</filename>.  It consists of a series of multi-line records, one for "
-"each package available in that directory.  Only two lines in each record are "
-"relevant for setting APT priorities: <placeholder type=\"variablelist\" id="
-"\"0\"/>"
+"The <filename>Release</filename> file is normally found in the directory "
+"<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
+"example, <filename>.../dists/stable/Release</filename>, or <filename>.../"
+"dists/&stable-codename;/Release</filename>.  It consists of a single multi-"
+"line record which applies to <emphasis>all</emphasis> of the packages in the "
+"directory tree below its parent.  Unlike the <filename>Packages</filename> "
+"file, nearly all of the lines in a <filename>Release</filename> file are "
+"relevant for setting APT priorities:"
 msgstr ""
-"Die <filename>Packages</filename>-Datei wird normalerweise im Verzeichnis "
-"<filename>…/dists/<replaceable>Distributions-Name</replaceable>/"
-"<replaceable>Komponente</replaceable>/<replaceable>Architektur</"
-"replaceable></filename> gefunden, zum Beispiel <filename>…/dists/stable/main/"
-"binary-i386/Packages</filename>. Sie besteht aus einer Serie mehrzeiliger "
-"Datensätze, einem für jedes verfügbare Paket in diesem Verzeichnis. In jedem "
-"Datensatz sind nur zwei Zeilen zum Setzen der APT-Prioritäten relevant: "
-"<placeholder type=\"variablelist\" id=\"0\"/>"
+"Die <filename>Release</filename>-Datei ist normalerweise im Verzeichnis "
+"<filename>…/dists/<replaceable>Distributionsname</replaceable></filename> zu "
+"finden, zum Beispiel <filename>…/dists/stable/Release</filename> oder "
+"<filename>…/dists/&stable-codename;/Release</filename>. Sie besteht aus "
+"einem einzelnen mehrzeiligen Datensatz, der auf <emphasis>alle</emphasis> "
+"Pakete im Verzeichnisbaum unterhalb des übergeordneten Verzeichnisses "
+"zutrifft. Anders als die <filename>Packages</filename>-Datei sind nahezu "
+"alle Zeilen in einer <filename>Release</filename>-Datei für das Setzen von "
+"APT-Prioritäten relevant:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
 #: apt_preferences.5.xml:428
@@ -7420,29 +7364,6 @@ msgid "Pin: release l=Debian\n"
 msgstr "Pin: release l=Debian\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: 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 "
-"example, <filename>.../dists/stable/Release</filename>, or <filename>.../"
-"dists/&stable-codename;/Release</filename>.  It consists of a single multi-"
-"line record which applies to <emphasis>all</emphasis> of the packages in the "
-"directory tree below its parent.  Unlike the <filename>Packages</filename> "
-"file, nearly all of the lines in a <filename>Release</filename> file are "
-"relevant for setting APT priorities: <placeholder type=\"variablelist\" id="
-"\"0\"/>"
-msgstr ""
-"Die <filename>Release</filename>-Datei ist normalerweise im Verzeichnis "
-"<filename>…/dists/<replaceable>Distributionsname</replaceable></filename> zu "
-"finden, zum Beispiel <filename>…/dists/stable/Release</filename> oder "
-"<filename>…/dists/&stable-codename;/Release</filename>. Sie besteht aus "
-"einem einzelnen mehrzeiligen Datensatz, der auf <emphasis>alle</emphasis> "
-"Pakete im Verzeichnisbaum unterhalb des übergeordneten Verzeichnisses "
-"zutrifft. Anders als die <filename>Packages</filename>-Datei sind nahezu "
-"alle Zeilen in einer <filename>Release</filename>-Datei für das Setzen von "
-"APT-Prioritäten relevant: <placeholder type=\"variablelist\" id=\"0\"/>"
-
-#. type: Content of: <refentry><refsect1><refsect2><para>
 #: apt_preferences.5.xml:523
 msgid ""
 "All of the <filename>Packages</filename> and <filename>Release</filename> "
@@ -7768,11 +7689,6 @@ msgstr ""
 "aktueller als die installierte Version ist. <placeholder type="
 "\"programlisting\" id=\"0\"/>"
 
-#. type: Content of: <refentry><refsect1><variablelist>
-#: apt_preferences.5.xml:700
-msgid "&file-preferences;"
-msgstr "&file-preferences;"
-
 #. type: Content of: <refentry><refsect1><para>
 #: apt_preferences.5.xml:706
 msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
@@ -8046,13 +7962,15 @@ msgstr ""
 msgid "URI specification"
 msgstr "URI-Beschreibung"
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:146
-msgid "file"
-msgstr "file"
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:143
+#, fuzzy
+#| msgid "more recognizable URI types"
+msgid "The currently recognized URI types are:"
+msgstr "weitere erkennbare URI-Typen"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:148
+#: sources.list.5.xml:147
 msgid ""
 "The file scheme allows an arbitrary directory in the file system to be "
 "considered an archive. This is useful for NFS mounts and local mirrors or "
@@ -8062,13 +7980,8 @@ 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
+#: sources.list.5.xml:154
 msgid ""
 "The cdrom scheme allows APT to use a local CDROM drive with media swapping. "
 "Use the &apt-cdrom; program to create cdrom entries in the source list."
@@ -8077,13 +7990,8 @@ 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
+#: sources.list.5.xml:161
 msgid ""
 "The http scheme specifies an HTTP server for the archive. If an environment "
 "variable <envar>http_proxy</envar> is set with the format http://server:"
@@ -8099,13 +8007,8 @@ 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
+#: sources.list.5.xml:172
 msgid ""
 "The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
 "is highly configurable; for more information see the &apt-conf; manual page. "
@@ -8124,13 +8027,8 @@ msgstr ""
 "verstehen oft auch FTP-URLs). FTP-Proxys, die gemäß Angabe in der "
 "Konfigurationsdatei HTTP benutzen, werden ignoriert."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:182
-msgid "copy"
-msgstr "copy"
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:184
+#: sources.list.5.xml:183
 msgid ""
 "The copy scheme is identical to the file scheme except that packages are "
 "copied into the cache directory instead of used directly at their location.  "
@@ -8141,18 +8039,8 @@ msgstr ""
 "Herkunftsort benutzt zu werden. Dies ist für Leute nützlich, die eine ZIP-"
 "Platte benutzen, um Dateien mit APT umherzukopieren."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:189
-msgid "rsh"
-msgstr "rsh"
-
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:189
-msgid "ssh"
-msgstr "ssh"
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:191
+#: sources.list.5.xml:190
 msgid ""
 "The rsh/ssh method invokes rsh/ssh to connect to a remote host as a given "
 "user and access the files. It is a good idea to do prior arrangements with "
@@ -8168,21 +8056,22 @@ msgstr ""
 "aus der Ferne durchzuführen."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:199
-msgid "more recognizable URI types"
+#: sources.list.5.xml:198
+#, fuzzy
+#| msgid "more recognizable URI types"
+msgid "adding more recognizable URI types"
 msgstr "weitere erkennbare URI-Typen"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:201
+#: sources.list.5.xml:200
 msgid ""
 "APT can be extended with more methods shipped in other optional packages "
-"which should follow the nameing scheme <literal>apt-transport-"
-"<replaceable>method</replaceable></literal>.  The APT team e.g. maintains "
-"also the <literal>apt-transport-https</literal> package which provides "
+"which should follow the nameing scheme <package>apt-transport-"
+"<replaceable>method</replaceable></package>.  The APT team e.g. maintains "
+"also the <package>apt-transport-https</package> package which provides "
 "access methods for https-URIs with features similar to the http method, but "
-"other methods for using e.g. debtorrent are also available, see "
-"<citerefentry> <refentrytitle><filename>apt-transport-debtorrent</filename></"
-"refentrytitle> <manvolnum>1</manvolnum></citerefentry>."
+"other methods for using e.g. debtorrent are also available, see &apt-"
+"transport-debtorrent;."
 msgstr ""
 "APT kann mit weiteren Methoden, die in anderen optionalen Paketen geliefert "
 "werden, die dem Namensschema <literal>apt-transport-<replaceable>Methode</"
@@ -8190,21 +8079,10 @@ msgstr ""
 "betreut z.B. außerdem das Paket <literal>apt-transport-https</literal>, das "
 "Zugriffsmethoden für HTTPS-URIs mit Funktionen bereitstellt, die denen der "
 "HTTP-Methode ähneln, bei der aber andere Methoden für z.B. debtorrent "
-"verfügbar sind, siehe <citerefentry> <refentrytitle><filename>apt-transport-"
-"debtorrent</filename></refentrytitle> <manvolnum>1</manvolnum></"
-"citerefentry>."
+"verfügbar sind, siehe &apt-transport-debtorrent;."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:143
-msgid ""
-"The currently recognized URI types are cdrom, file, http, ftp, copy, ssh, "
-"rsh.  <placeholder type=\"variablelist\" id=\"0\"/>"
-msgstr ""
-"Die aktuell erkannten URI-Typen sind »cdrom«, »file«, »http«, »ftp«, »copy«, "
-"»ssh«, »rsh«. <placeholder type=\"variablelist\" id=\"0\"/>"
-
-#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:215
+#: sources.list.5.xml:212
 msgid ""
 "Uses the archive stored locally (or NFS mounted) at /home/jason/debian for "
 "stable/main, stable/contrib, and stable/non-free."
@@ -8213,37 +8091,37 @@ msgstr ""
 "jason/debian für stable/main, stable/contrib und stable/non-free."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:217
+#: sources.list.5.xml:214
 #, no-wrap
 msgid "deb file:/home/jason/debian stable main contrib non-free"
 msgstr "deb file:/home/jason/debian stable main contrib non-free"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:219
+#: sources.list.5.xml:216
 msgid "As above, except this uses the unstable (development) distribution."
 msgstr ""
 "wie oben, außer das dies die »unstable«- (Entwicklungs-) Distribution "
 "benutzt."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:220
+#: sources.list.5.xml:217
 #, no-wrap
 msgid "deb file:/home/jason/debian unstable main contrib non-free"
 msgstr "deb file:/home/jason/debian unstable main contrib non-free"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:222
+#: sources.list.5.xml:219
 msgid "Source line for the above"
 msgstr "Quellzeile für obiges"
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:223
+#: sources.list.5.xml:220
 #, no-wrap
 msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
 msgstr "deb-src file:/home/jason/debian unstable main contrib non-free"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:225
+#: sources.list.5.xml:222
 msgid ""
 "The first line gets package information for the architectures in "
 "<literal>APT::Architectures</literal> while the second always retrieves "
@@ -8254,7 +8132,7 @@ msgstr ""
 "<literal>amd64</literal> und <literal>armel</literal> holt."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:227
+#: sources.list.5.xml:224
 #, no-wrap
 msgid ""
 "deb http://ftp.debian.org/debian &stable-codename; main\n"
@@ -8264,7 +8142,7 @@ msgstr ""
 "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:230
+#: sources.list.5.xml:227
 msgid ""
 "Uses HTTP to access the archive at archive.debian.org, and uses only the "
 "hamm/main area."
@@ -8273,13 +8151,13 @@ msgstr ""
 "den hamm/main-Bereich zu benutzen."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:232
+#: sources.list.5.xml:229
 #, no-wrap
 msgid "deb http://archive.debian.org/debian-archive hamm main"
 msgstr "deb http://archive.debian.org/debian-archive hamm main"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:234
+#: sources.list.5.xml:231
 msgid ""
 "Uses FTP to access the archive at ftp.debian.org, under the debian "
 "directory, and uses only the &stable-codename;/contrib area."
@@ -8289,13 +8167,13 @@ msgstr ""
 "benutzen."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:236
+#: sources.list.5.xml:233
 #, no-wrap
 msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
 msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:238
+#: sources.list.5.xml:235
 msgid ""
 "Uses FTP to access the archive at ftp.debian.org, under the debian "
 "directory, and uses only the unstable/contrib area. If this line appears as "
@@ -8309,19 +8187,19 @@ msgstr ""
 "für beide Quellzeilen benutzt."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:242
+#: sources.list.5.xml:239
 #, no-wrap
 msgid "deb ftp://ftp.debian.org/debian unstable contrib"
 msgstr "deb ftp://ftp.debian.org/debian unstable contrib"
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:251
+#: sources.list.5.xml:248
 #, no-wrap
 msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
 msgstr "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:244
+#: sources.list.5.xml:241
 msgid ""
 "Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe "
 "directory, and uses only files found under <filename>unstable/binary-i386</"
@@ -8341,7 +8219,7 @@ msgstr ""
 "type=\"literallayout\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:256
+#: sources.list.5.xml:253
 msgid "&apt-cache; &apt-conf;"
 msgstr "&apt-cache; &apt-conf;"
 
@@ -9918,3 +9796,11 @@ msgstr "  # apt-get -o dir::cache::archives=\"/Platte/\" dist-upgrade"
 #: offline.sgml:234
 msgid "Which will use the already fetched archives on the disc."
 msgstr "Es wird die bereits auf die Platte heruntergeladenen Archive benutzen."
+
+#, fuzzy
+#~ msgid ""
+#~ "The currently recognized URI types are cdrom, file, http, ftp, copy, ssh, "
+#~ "rsh."
+#~ msgstr ""
+#~ "Die aktuell erkannten URI-Typen sind »cdrom«, »file«, »http«, »ftp«, "
+#~ "»copy«, »ssh«, »rsh«."
diff --git a/doc/po4a.conf b/doc/po4a.conf
index 2003e9f84..c9df1f9ac 100644
--- a/doc/po4a.conf
+++ b/doc/po4a.conf
@@ -4,10 +4,11 @@
 # 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> <refname> <refentrytitle> <date> <refentryinfo>' \
-	-o break='<term><option>' \
-	-o nodefault='<option> <refname> <refentrytitle> <date> <refentryinfo>' \
-	-o inline='<para><option> <refentrytitle>'"
+	-o untranslated='<term><option> <refname> <refentrytitle> <date> <refentryinfo> <phrase> <variablelist> <term><command>' \
+	-o break='<term><option> <term><command>' \
+	-o nodefault='<option> <refname> <refentrytitle> <date> <refentryinfo> <phrase> <variablelist> <command>' \
+	-o inline='<para><option> <refentrytitle> <para><command> <programlisting><command> <refentrytitle><command>' \
+	-o translated='<para><command> <programlisting><command> <refentrytitle><command>'"
 
 # define source file and translated file (one file per line)
 [type: man]     apt.8 $lang:$lang/apt.$lang.8
diff --git a/doc/sources.list.5.xml b/doc/sources.list.5.xml
index eeff509ff..6499df7e3 100644
--- a/doc/sources.list.5.xml
+++ b/doc/sources.list.5.xml
@@ -140,24 +140,23 @@ deb http://security.debian.org/ &stable-codename;/updates main contrib non-free
 
  <refsect1><title>URI specification</title>
 
-   <para>The currently recognized URI types are cdrom, file, http, ftp, copy,
-   ssh, rsh.
+    <para>The currently recognized URI types are:
    <variablelist>
-    <varlistentry><term>file</term>
+    <varlistentry><term><command>file</command></term>
     <listitem><para>
     The file scheme allows an arbitrary directory in the file system to be
     considered an archive. This is useful for NFS mounts and local mirrors or
     archives.</para></listitem>
     </varlistentry>
     
-    <varlistentry><term>cdrom</term>
+    <varlistentry><term><command>cdrom</command></term>
     <listitem><para>
     The cdrom scheme allows APT to use a local CDROM drive with media
     swapping. Use the &apt-cdrom; program to create cdrom entries in the
     source list.</para></listitem>
     </varlistentry>
 
-    <varlistentry><term>http</term>
+    <varlistentry><term><command>http</command></term>
     <listitem><para>
     The http scheme specifies an HTTP server for the archive. If an environment
     variable <envar>http_proxy</envar> is set with the format 
@@ -168,7 +167,7 @@ deb http://security.debian.org/ &stable-codename;/updates main contrib non-free
     Note that this is an insecure method of authentication.</para></listitem>
     </varlistentry>
 
-    <varlistentry><term>ftp</term>
+    <varlistentry><term><command>ftp</command></term>
     <listitem><para>
     The ftp scheme specifies an FTP server for the archive. APT's FTP behavior
     is highly configurable; for more information see the
@@ -179,14 +178,14 @@ deb http://security.debian.org/ &stable-codename;/updates main contrib non-free
     the configuration file will be ignored.</para></listitem>
     </varlistentry>
 
-    <varlistentry><term>copy</term>
+    <varlistentry><term><command>copy</command></term>
     <listitem><para>
     The copy scheme is identical to the file scheme except that packages are
     copied into the cache directory instead of used directly at their location.
     This is useful for people using a zip disk to copy files around with APT.</para></listitem>
     </varlistentry>
     
-    <varlistentry><term>rsh</term><term>ssh</term>
+    <varlistentry><term><command>rsh</command></term><term><command>ssh</command></term>
     <listitem><para>
     The rsh/ssh method invokes rsh/ssh to connect to a remote host
 	as a given user and access the files. It is a good idea to do prior
@@ -196,15 +195,13 @@ deb http://security.debian.org/ &stable-codename;/updates main contrib non-free
     commands to perform the file transfers from the remote.</para></listitem>
     </varlistentry>
 
-    <varlistentry><term>more recognizable URI types</term>
+    <varlistentry><term>adding more recognizable URI types</term>
     <listitem><para>
     APT can be extended with more methods shipped in other optional packages which should
-    follow the nameing scheme <literal>apt-transport-<replaceable>method</replaceable></literal>.
-    The APT team e.g. maintains also the <literal>apt-transport-https</literal> package which
+    follow the nameing scheme <package>apt-transport-<replaceable>method</replaceable></package>.
+    The APT team e.g. maintains also the <package>apt-transport-https</package> package which
     provides access methods for https-URIs with features similar to the http method, but other
-    methods for using e.g. debtorrent are also available, see <citerefentry>
-    <refentrytitle><filename>apt-transport-debtorrent</filename></refentrytitle>
-    <manvolnum>1</manvolnum></citerefentry>.
+    methods for using e.g. debtorrent are also available, see &apt-transport-debtorrent;.
     </para></listitem>
     </varlistentry>
   </variablelist>
author	David Kalnischkies <kalnischkies@gmail.com>	2012-05-23 18:00:32 +0200
committer	David Kalnischkies <kalnischkies@gmail.com>	2012-05-23 18:00:32 +0200
commit	aec2216091b3d70b3baa5a5b8c87ce208e35c19c (patch)
tree	4036014e4653205e59b28f9cce46895635a4cd81 /doc
parent	d3aac32ece65fd5424a94402f46db065298c07a8 (diff)