* Updates to XML man pages from richard.bos@xs4all.nl

Author: mdz
Date: 2004-03-11 18:17:08 GMT
* Updates to XML man pages from richard.bos@xs4all.nl

diff --git a/debian/changelog b/debian/changelog
index f1c106a1524203352e3c2c3c43e7509365395126..551005e8c35924990a1708ed17623512450a192d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ apt (0.5.24) unstable; urgency=low
     (Closes: #235822)
   * Updated French translation from Christian Perrier <bubulle@debian.org>
     (Closes: #237403)
+  * Updates to XML man pages from richard.bos@xs4all.nl
 
  --
 

diff --git a/doc/apt-cache.8.xml b/doc/apt-cache.8.xml
index f2a49f3fa33065cb340f12f55398de337d37394f..071b1aea4f780e0a812253369d8c4a9e9e89129e 100644 (file)
--- a/doc/apt-cache.8.xml
+++ b/doc/apt-cache.8.xml
@@ -8,7 +8,15 @@
 ]>
 
 <refentry>
- &apt-docinfo;
+
+ <refentryinfo>
+   &apt-author.jgunthorpe;
+   &apt-author.team;
+   &apt-email;
+   &apt-product;
+   <!-- The last update date -->
+   <date>29 February 2004</date>
+ </refentryinfo>
  
  <refmeta>
    <refentrytitle>apt-cache</refentrytitle>
@@ -366,6 +374,5 @@ Reverse Provides:
  </refsect1>
 
  &manbugs;
- &manauthor;
  
 </refentry>

diff --git a/doc/apt-config.8.xml b/doc/apt-config.8.xml
index ae29ddb6672d0a5ca927d83fd175d17876e3dc75..39fed59379380d8b2088f773cb73b2f5ae6de9c0 100644 (file)
--- a/doc/apt-config.8.xml
+++ b/doc/apt-config.8.xml
@@ -8,7 +8,15 @@
 ]>
 
 <refentry>
- &apt-docinfo;
+
+ <refentryinfo>
+   &apt-author.jgunthorpe;
+   &apt-author.team;
+   &apt-email;
+   &apt-product;
+   <!-- The last update date -->
+   <date>29 February 2004</date>
+ </refentryinfo>
  
  <refmeta>
    <refentrytitle>apt-config</refentrytitle>
@@ -92,8 +100,7 @@ eval $RES
  </refsect1>
 
  <refsect1><title>See Also</title>
-   <para>
-   &apt-conf;
+   <para>&apt-conf;
    </para>
  </refsect1>
 
@@ -103,7 +110,6 @@ eval $RES
  </refsect1>
 
  &manbugs;
- &manauthor;
  
 </refentry>
 

diff --git a/doc/apt-extracttemplates.1.xml b/doc/apt-extracttemplates.1.xml
index e0af9cf46165e841efcb16b77e0c27246840b15f..0f4ac04d9c7b254e9ebfa9b451b4efa2816b105f 100644 (file)
--- a/doc/apt-extracttemplates.1.xml
+++ b/doc/apt-extracttemplates.1.xml
@@ -8,7 +8,15 @@
 ]>
 
 <refentry>
- &apt-docinfo;
+
+ <refentryinfo>
+   &apt-author.jgunthorpe;
+   &apt-author.team;
+   &apt-email;
+   &apt-product;
+   <!-- The last update date -->
+   <date>29 February 2004</date>
+ </refentryinfo>
  
  <refmeta>
    <refentrytitle>apt-extracttemplates</refentrytitle>
@@ -67,11 +75,9 @@
  </refsect1>
 
  <refsect1><title>Diagnostics</title>
-   <para>
-   <command>apt-extracttemplates</command> returns zero on normal operation, decimal 100 on error.</para>
+   <para><command>apt-extracttemplates</command> returns zero on normal operation, decimal 100 on error.</para>
  </refsect1>
 
  &manbugs;
- &manauthor;
  
 </refentry>

diff --git a/doc/apt-ftparchive.1.xml b/doc/apt-ftparchive.1.xml
index e08444fc68a9faafb7adf1baf39f66e88ced45cd..7c1ae9432e6d1dac422cbc9abc2b7ccf5df80b5b 100644 (file)
--- a/doc/apt-ftparchive.1.xml
+++ b/doc/apt-ftparchive.1.xml
@@ -8,7 +8,15 @@
 ]>
 
 <refentry>
- &apt-docinfo;
+
+ <refentryinfo>
+   &apt-author.jgunthorpe;
+   &apt-author.team;
+   &apt-email;
+   &apt-product;
+   <!-- The last update date -->
+   <date>29 February 2004</date>
+ </refentryinfo>
  
  <refmeta>
    <refentrytitle>apt-ftparchive</refentrytitle>
@@ -560,6 +568,5 @@ binary packages (.deb):
  </refsect1>
 
  &manbugs;
- &manauthor;
  
 </refentry>

diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml
index 9c819c4c4a75210fe70008bdfcafe25ec0d40d3a..37151738abf3c671df24564ae21a5cc35ed5d1f1 100644 (file)
--- a/doc/apt-get.8.xml
+++ b/doc/apt-get.8.xml
@@ -8,8 +8,15 @@
 ]>
 
 <refentry>
- &apt-docinfo;
- <!--<date>14 December 2003</date> -->
+
+ <refentryinfo>
+   &apt-author.jgunthorpe;
+   &apt-author.team;
+   &apt-email;
+   &apt-product;
+   <!-- The last update date -->
+   <date>29 February 2004</date>
+ </refentryinfo>
  
  <refmeta>
    <refentrytitle>apt-get</refentrytitle>
@@ -461,6 +468,5 @@
  </refsect1>
 
  &manbugs;
- &manauthor;
  
 </refentry>

diff --git a/doc/apt-sortpkgs.1.xml b/doc/apt-sortpkgs.1.xml
index 86058e60515ff10558712e6735ad05a0d8dfc167..ba64e11aeb50dff0e8ffa1be7257f86094277e66 100644 (file)
--- a/doc/apt-sortpkgs.1.xml
+++ b/doc/apt-sortpkgs.1.xml
@@ -8,7 +8,15 @@
 ]>
 
 <refentry>
- &apt-docinfo;
+
+ <refentryinfo>
+   &apt-author.jgunthorpe;
+   &apt-author.team;
+   &apt-email;
+   &apt-product;
+   <!-- The last update date -->
+   <date>29 February 2004</date>
+ </refentryinfo>
  
  <refmeta>
    <refentrytitle>apt-sortpkgs</refentrytitle>
@@ -66,6 +74,5 @@
  </refsect1>
 
  &manbugs;
- &manauthor;
  
 </refentry>

diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml
index 405427ac1406bca1ff9a7c9ef43e13afa67b9135..eed5b8d5221803cad432164253a0217679f1276e 100644 (file)
--- a/doc/apt.conf.5.xml
+++ b/doc/apt.conf.5.xml
@@ -8,7 +8,15 @@
 ]>
 
 <refentry>
- &apt-docinfo;
+
+ <refentryinfo>
+   &apt-author.jgunthorpe;
+   &apt-author.team;
+   &apt-email;
+   &apt-product;
+   <!-- The last update date -->
+   <date>29 February 2004</date>
+ </refentryinfo>
  
  <refmeta>
    <refentrytitle>apt.conf</refentrytitle>
@@ -383,7 +391,6 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
  </refsect1>
 
  &manbugs;
- &manauthor;
  
 </refentry>
 

diff --git a/doc/apt.ent b/doc/apt.ent
index 6e0bc79bedc439c8ee7d29c0beee27e4115a86aa..8054a25f6fe8d9faa6facd6e74d10bc5d97b0c61 100644 (file)
--- a/doc/apt.ent
+++ b/doc/apt.ent
@@ -123,6 +123,29 @@
    </author>
 ">
 
+<!ENTITY apt-product "
+   <productname>Linux</productname>
+">
+
+<!ENTITY apt-email "
+   <address>
+    <email>apt@packages.debian.org</email>
+   </address>
+">
+
+<!ENTITY apt-author.jgunthorpe "
+   <author>
+    <firstname>Jason</firstname>
+    <surname>Gunthorpe</surname>
+   </author>
+">
+
+<!ENTITY apt-author.team "
+   <author>
+    <othername>APT team</othername>
+   </author>
+">
+
 <!ENTITY apt-copyright "
     <copyright>
      <holder>Jason Gunthorpe</holder>

diff --git a/doc/apt_preferences.5.xml b/doc/apt_preferences.5.xml
index db32b800ed8b0ab453e40ef2c812583b6ae60568..2aacc174af288787345d77769640c83a45161e09 100644 (file)
--- a/doc/apt_preferences.5.xml
+++ b/doc/apt_preferences.5.xml
@@ -9,6 +9,14 @@
 
 <refentry>
 
+ <refentryinfo>
+   &apt-author.team;
+   &apt-email;
+   &apt-product;
+   <!-- The last update date -->
+   <date>29 February 2004</date>
+ </refentryinfo>
+
  <refmeta>
    <refentrytitle>apt_preferences</refentrytitle>
    <manvolnum>5</manvolnum>
@@ -516,13 +524,11 @@ apt-get install <replaceable>package</replaceable>/unstable
 
 <refsect1>
 <title>See Also</title>
-<para>
-&apt-get; &apt-cache; &apt-conf; &sources-list;
+<para>&apt-get; &apt-cache; &apt-conf; &sources-list;
 </para>
 </refsect1>
 
  &manbugs;
- &manauthor;
 
 </refentry>
 

diff --git a/doc/sources.list.5.xml b/doc/sources.list.5.xml
index 5248a7ebbbaf75aa2f852ebea3815c17020e53ec..bde9893bffae123ff6eef6a67e17e9f5fdcd22eb 100644 (file)
--- a/doc/sources.list.5.xml
+++ b/doc/sources.list.5.xml
@@ -8,7 +8,15 @@
 ]>
 
 <refentry>
- &apt-docinfo;
+
+ <refentryinfo>
+   &apt-author.jgunthorpe;
+   &apt-author.team;
+   &apt-email;
+   &apt-product;
+   <!-- The last update date -->
+   <date>29 February 2004</date>
+ </refentryinfo>
  
  <refmeta>
    <refentrytitle>sources.list</refentrytitle>
@@ -199,13 +207,11 @@ deb http://http.us.debian.org/debian dists/stable-updates/
  </refsect1>
  
  <refsect1><title>See Also</title>
-   <para>
-   &apt-cache; &apt-conf;
+   <para>&apt-cache; &apt-conf;
    </para>
  </refsect1>
 
  &manbugs;
- &manauthor;
  
 </refentry>
 

diff --git a/doc/vendors.list.5.xml b/doc/vendors.list.5.xml
index a14b36a461003dce64a5be0cf1b4e8ab0ec054c5..7e03eefc780ae4e2bc75ba5f3808010eac0a8e0c 100644 (file)
--- a/doc/vendors.list.5.xml
+++ b/doc/vendors.list.5.xml
@@ -8,7 +8,15 @@
 ]>
 
 <refentry>
- &apt-docinfo;
+
+ <refentryinfo>
+   &apt-author.jgunthorpe;
+   &apt-author.team;
+   &apt-email;
+   &apt-product;
+   <!-- The last update date -->
+   <date>29 February 2004</date>
+ </refentryinfo>
  
  <refmeta>
    <refentrytitle>vendors.list</refentrytitle>
@@ -97,13 +105,11 @@ simple-key "joe"
  </refsect1>
  
  <refsect1><title>See Also</title>
-   <para>
-   &sources-list;
+   <para>&sources-list;
    </para>
  </refsect1>
 
  &manbugs;
- &manauthor;
  
 </refentry>