discard candidates via IsInstallOk to allow override

[apt.git] / doc / apt.ent

diff --git a/doc/apt.ent b/doc/apt.ent
index e48087fa712dee6a8a5a2a70238a67360b80dba6..6a3837b9553fb11b63dcc11fcc530b7d36a73a33 100644 (file)
--- a/doc/apt.ent
+++ b/doc/apt.ent
@@ -1,19 +1,3 @@
-<!-- -*- mode: sgml; mode: fold -*- -->
-
-<!-- Boiler plate docinfo section -->
-<!ENTITY apt-docinfo "
- <refentryinfo>
-   <address><email>apt@packages.debian.org</email></address>
-   <author>
-     <firstname>Jason</firstname> <surname>Gunthorpe</surname>
-     <contrib></contrib>
-   </author>
-   <copyright><year>1998-2001</year> <holder>Jason Gunthorpe</holder></copyright>
-   <date>28 October 2008</date>
-   <productname>Linux</productname>
- </refentryinfo>
-">
-
 <!ENTITY apt-author.team "
    <author>
     <othername>APT team</othername>
@@ -119,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> (implicit partial). </para></listitem>
+     Configuration Item: <literal>Dir::Cache::Archives</literal> (<filename>partial</filename> will be implicitly appended)</para></listitem>
      </varlistentry>
 ">
 
@@ -160,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> (implicit partial).</para></listitem>
+     Configuration Item: <literal>Dir::State::Lists</literal> (<filename>partial</filename> will be implicitly appended)</para></listitem>
      </varlistentry>
 ">
 
@@ -242,11 +226,17 @@
 <!-- TRANSLATOR: used as in apt-extracttemplates filename -->
 <!ENTITY synopsis-filename "filename">
 
-<!-- TRANSLATOR: used as parameters for apt-ftparchive  e.g. apt-ftparchive packages path override pathprefix -->
+<!-- TRANSLATOR: used as parameter for apt-ftparchive  e.g. apt-ftparchive packages path override-file pathprefix -->
 <!ENTITY synopsis-path "path">
+
+<!-- TRANSLATOR: used as parameter for apt-ftparchive  e.g. apt-ftparchive packages path override-file pathprefix -->
+<!ENTITY synopsis-override "override-file">
+
+<!-- TRANSLATOR: used as parameter for apt-ftparchive  e.g. apt-ftparchive packages path override-file pathprefix -->
 <!ENTITY synopsis-pathprefix "pathprefix">
+
+<!-- TRANSLATOR: used as parameter for apt-ftparchive  e.g. apt-ftparchive generate section -->
 <!ENTITY synopsis-section "section">
-<!ENTITY synopsis-override "override">
 
 <!-- TRANSLATOR: used as in apt-key export keyid  e.g. apt-key export 473041FA -->
 <!ENTITY synopsis-keyid "keyid">