fix extra , at the end of the changelog line

[apt.git] / doc / apt.ent

diff --git a/doc/apt.ent b/doc/apt.ent
index 8054a25f6fe8d9faa6facd6e74d10bc5d97b0c61..4cfc0006963ee45e1d24df12da7beef0e0d3dc7e 100644 (file)
--- a/doc/apt.ent
+++ b/doc/apt.ent
@@ -2,6 +2,7 @@
 
 <!-- Some common paths.. -->
 <!ENTITY docdir "/usr/share/doc/apt/">
 
 <!-- Some common paths.. -->
 <!ENTITY docdir "/usr/share/doc/apt/">

+<!ENTITY guidesdir "/usr/share/doc/apt-doc/">

 <!ENTITY configureindex "<filename>&docdir;examples/configure-index.gz</filename>">
 <!ENTITY aptconfdir "<filename>/etc/apt.conf</filename>">
 <!ENTITY statedir "/var/lib/apt">
 <!ENTITY configureindex "<filename>&docdir;examples/configure-index.gz</filename>">
 <!ENTITY aptconfdir "<filename>/etc/apt.conf</filename>">
 <!ENTITY statedir "/var/lib/apt">


@@ -44,6 +45,25 @@
   </citerefentry>"
 >
 
   </citerefentry>"
 >
 

+<!ENTITY apt-key "<citerefentry>
+    <refentrytitle><command>apt-key</command></refentrytitle>
+    <manvolnum>8</manvolnum>
+  </citerefentry>"
+>
+
+<!ENTITY apt-secure "<citerefentry>
+    <refentrytitle>apt-secure</refentrytitle>
+    <manvolnum>8</manvolnum>
+  </citerefentry>"
+>
+
+<!ENTITY apt-ftparchive "<citerefentry>
+    <refentrytitle><filename>apt-ftparchive</filename></refentrytitle>
+    <manvolnum>1</manvolnum>
+  </citerefentry>"
+>
+
+

 <!ENTITY sources-list "<citerefentry>
     <refentrytitle><filename>sources.list</filename></refentrytitle>
     <manvolnum>5</manvolnum>
 <!ENTITY sources-list "<citerefentry>
     <refentrytitle><filename>sources.list</filename></refentrytitle>
     <manvolnum>5</manvolnum>


@@ -91,14 +111,56 @@
     <manvolnum>8</manvolnum>
   </citerefentry>"
 >
     <manvolnum>8</manvolnum>
   </citerefentry>"
 >

-    
+
+<!ENTITY aptitude "<citerefentry>
+    <refentrytitle><command>aptitude</command></refentrytitle>
+    <manvolnum>8</manvolnum>
+  </citerefentry>"
+>
+
+<!ENTITY synaptic "<citerefentry>
+    <refentrytitle><command>synaptic</command></refentrytitle>
+    <manvolnum>8</manvolnum>
+  </citerefentry>"
+>
+
+<!ENTITY debsign "<citerefentry>
+    <refentrytitle><command>debsign</command></refentrytitle>
+    <manvolnum>1</manvolnum>
+  </citerefentry>"
+>
+
+<!ENTITY debsig-verify "<citerefentry>
+    <refentrytitle><command>debsig-verify</command></refentrytitle>
+    <manvolnum>1</manvolnum>
+  </citerefentry>"
+>
+
+<!ENTITY gpg "<citerefentry>
+    <refentrytitle><command>gpg</command></refentrytitle>
+    <manvolnum>1</manvolnum>
+  </citerefentry>"
+>
+
+<!ENTITY gnome-apt "<citerefentry>
+    <refentrytitle><command>gnome-apt</command></refentrytitle>
+    <manvolnum>1</manvolnum>
+  </citerefentry>"
+>
+
+<!ENTITY wajig "<citerefentry>
+    <refentrytitle><command>wajig</command></refentrytitle>
+    <manvolnum>1</manvolnum>
+  </citerefentry>"
+>
+ 

 <!-- Boiler plate docinfo section -->
 <!ENTITY apt-docinfo "
  <refentryinfo>
    <address><email>apt@packages.debian.org</email></address>
    <author><firstname>Jason</firstname> <surname>Gunthorpe</surname></author>
    <copyright><year>1998-2001</year> <holder>Jason Gunthorpe</holder></copyright>
 <!-- Boiler plate docinfo section -->
 <!ENTITY apt-docinfo "
  <refentryinfo>
    <address><email>apt@packages.debian.org</email></address>
    <author><firstname>Jason</firstname> <surname>Gunthorpe</surname></author>
    <copyright><year>1998-2001</year> <holder>Jason Gunthorpe</holder></copyright>

-   <date>14 December 2003</date>
+   <date>28 October 2008</date>

    <productname>Linux</productname>
 
  </refentryinfo>
    <productname>Linux</productname>
 
  </refentryinfo>


@@ -117,6 +179,13 @@
    </author>
 ">
 
    </author>
 ">
 

+<!ENTITY apt-author.moconnor "
+   <author>
+    <firstname>Mike</firstname>
+    <surname>O'Connor</surname>
+   </author>
+">
+

 <!ENTITY apt-author.team "
    <author>
     <othername>APT team</othername>
 <!ENTITY apt-author.team "
    <author>
     <othername>APT team</othername>


@@ -157,6 +226,12 @@
    <productname>Linux</productname>
 ">
 
    <productname>Linux</productname>
 ">
 

+<!ENTITY apt-qapage "
+       <para>
+               <ulink url='http://packages.qa.debian.org/a/apt.html'>QA Page</ulink>
+       </para>
+">
+

 <!-- Boiler plate Bug reporting section -->
 <!ENTITY manbugs "
  <refsect1><title>Bugs</title>
 <!-- Boiler plate Bug reporting section -->
 <!ENTITY manbugs "
  <refsect1><title>Bugs</title>


@@ -207,8 +282,10 @@
      <varlistentry>
       <term><option>-o</option></term>
       <term><option>--option</option></term>
      <varlistentry>
       <term><option>-o</option></term>
       <term><option>--option</option></term>

-     <listitem><para>Set a Configuration Option; This will set an arbitary
+     <listitem><para>Set a Configuration Option; This will set an arbitrary

       configuration option. The syntax is <option>-o Foo::Bar=bar</option>.
       configuration option. The syntax is <option>-o Foo::Bar=bar</option>.

+      <option>-o</option> and <option>--option</option> can be used multiple
+      times to set different options.

      </para>
      </listitem>
      </varlistentry>
      </para>
      </listitem>
      </varlistentry>