- Remove duplicate 'showpkg' from synopsis on apt-cache(8)

[apt.git] / doc / apt.ent

diff --git a/doc/apt.ent b/doc/apt.ent
index 56a08a087f9338c2208d465d396ec2dd7ad73b7b..e980e0a03dbaff68abdddb576f2117a5524d7f30 100644 (file)
--- a/doc/apt.ent
+++ b/doc/apt.ent
@@ -2,103 +2,89 @@
 
 <!-- Some common paths.. -->
 <!ENTITY docdir "/usr/share/doc/apt/">
-<!ENTITY configureindex "<filename>&docdir;/examples/configure-index</>">
+<!ENTITY configureindex "<filename>&docdir;examples/configure-index.gz</>">
 <!ENTITY aptconfdir "<filename>/etc/apt.conf</>">
 <!ENTITY statedir "/var/lib/apt">
 <!ENTITY cachedir "/var/cache/apt">
 
 <!-- Cross references to other man pages -->
-<!ENTITY apt-conf "
-  <CiteRefEntry>
+<!ENTITY apt-conf "<CiteRefEntry>
     <RefEntryTitle><filename/apt.conf/</RefEntryTitle>
     <ManVolNum/5/
-  </CiteRefEntry>
-">
+  </CiteRefEntry>">
 
-<!ENTITY apt-get "
-  <CiteRefEntry>
+<!ENTITY apt-get "<CiteRefEntry>
     <RefEntryTitle><command/apt-get/</RefEntryTitle>
     <ManVolNum/8/
-  </CiteRefEntry>
-">
+  </CiteRefEntry>">
+
+<!ENTITY apt-config "<CiteRefEntry>
+    <RefEntryTitle><command/apt-config/</RefEntryTitle>
+    <ManVolNum/8/
+  </CiteRefEntry>">
 
-<!ENTITY apt-cdrom "
-  <CiteRefEntry>
+<!ENTITY apt-cdrom "<CiteRefEntry>
     <RefEntryTitle><command/apt-cdrom/</RefEntryTitle>
     <ManVolNum/8/
-  </CiteRefEntry>
-">
+  </CiteRefEntry>">
 
-<!ENTITY apt-cache "
-  <CiteRefEntry>
+<!ENTITY apt-cache "<CiteRefEntry>
     <RefEntryTitle><command/apt-cache/</RefEntryTitle>
     <ManVolNum/8/
-  </CiteRefEntry>
-">
+  </CiteRefEntry>">
+
+<!ENTITY apt-preferences "<CiteRefEntry>
+    <RefEntryTitle><command/apt_preferences/</RefEntryTitle>
+    <ManVolNum/5/
+  </CiteRefEntry>">
 
-<!ENTITY sources-list "
-  <CiteRefEntry>
+<!ENTITY sources-list "<CiteRefEntry>
     <RefEntryTitle><filename/sources.list/</RefEntryTitle>
     <ManVolNum/5/
-  </CiteRefEntry>
-">
+  </CiteRefEntry>">
 
-<!ENTITY bug "
-  <CiteRefEntry>
-    <RefEntryTitle><command/bug/</RefEntryTitle>
+<!ENTITY reportbug "<CiteRefEntry>
+    <RefEntryTitle><command/reportbug/</RefEntryTitle>
     <ManVolNum/1/
-  </CiteRefEntry>
-">
+  </CiteRefEntry>">
 
-<!ENTITY dpkg "
-  <CiteRefEntry>
+<!ENTITY dpkg "<CiteRefEntry>
     <RefEntryTitle><command/dpkg/</RefEntryTitle>
     <ManVolNum/8/
-  </CiteRefEntry>
-">
+  </CiteRefEntry>">
 
-<!ENTITY dpkg-buildpackage "
-  <CiteRefEntry>
+<!ENTITY dpkg-buildpackage "<CiteRefEntry>
     <RefEntryTitle><command/dpkg-buildpackage/</RefEntryTitle>
     <ManVolNum/1/
-  </CiteRefEntry>
-">
+  </CiteRefEntry>">
 
-<!ENTITY gzip "
-  <CiteRefEntry>
+<!ENTITY gzip "<CiteRefEntry>
     <RefEntryTitle><command/gzip/</RefEntryTitle>
     <ManVolNum/1/
-  </CiteRefEntry>
-">
+  </CiteRefEntry>">
 
-<!ENTITY dpkg-scanpackages "
-  <CiteRefEntry>
+<!ENTITY dpkg-scanpackages "<CiteRefEntry>
     <RefEntryTitle><command/dpkg-scanpackages/</RefEntryTitle>
     <ManVolNum/8/
-  </CiteRefEntry>
-">
+  </CiteRefEntry>">
 
-<!ENTITY dpkg-scansources "
-  <CiteRefEntry>
+<!ENTITY dpkg-scansources "<CiteRefEntry>
     <RefEntryTitle><command/dpkg-scansources/</RefEntryTitle>
     <ManVolNum/8/
-  </CiteRefEntry>
-">
+  </CiteRefEntry>">
 
-<!ENTITY dselect "
-  <CiteRefEntry>
+<!ENTITY dselect "<CiteRefEntry>
     <RefEntryTitle><command/dselect/</RefEntryTitle>
     <ManVolNum/8/
-  </CiteRefEntry>
-">
+  </CiteRefEntry>">
     
 <!-- Boiler plate docinfo section -->
 <!ENTITY apt-docinfo "
  <docinfo>
    <address><email>apt@packages.debian.org</></address>
    <author><firstname>Jason</> <surname>Gunthorpe</></>
-   <copyright><year>1998-2000</> <holder>Jason Gunthorpe</></>
-   <date>20 September 2000</>
+   <copyright><year>1998-2001</> <holder>Jason Gunthorpe</></>
+   <date>12 March 2001</>
  </docinfo>
 "> 
 
@@ -107,8 +93,8 @@
  <RefSect1><Title>Bugs</>
    <para>
    See the <ulink url='http://bugs.debian.org/apt'>APT bug page</>.  
-   If you wish to report a bug in APT, please see 
-   <filename>/usr/share/doc/debian/bug-reporting.txt</> or the &bug; command.
+   If you wish to report a bug in APT, please see
+   <filename>/usr/share/doc/debian/bug-reporting.txt</> or the &reportbug; command.
  </RefSect1>
 ">
 
@@ -130,7 +116,7 @@
      
      <VarListEntry><term><option/-v/</><term><option/--version/</>
      <ListItem><Para>
-     Show the program verison.
+     Show the program version.
      </VarListEntry>
 
      <VarListEntry><term><option/-c/</><term><option/--config-file/</>