From 5e80de292398d315815d05f509ef5eb70d66a80d Mon Sep 17 00:00:00 2001
From: Arch Librarian <arch@canonical.com>
Date: Mon, 20 Sep 2004 17:05:46 +0000
Subject: [PATCH] * 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

---
 debian/changelog               |  1 +
 doc/apt-cache.8.xml            | 11 +++++++++--
 doc/apt-config.8.xml           | 14 ++++++++++----
 doc/apt-extracttemplates.1.xml | 14 ++++++++++----
 doc/apt-ftparchive.1.xml       | 11 +++++++++--
 doc/apt-get.8.xml              | 12 +++++++++---
 doc/apt-sortpkgs.1.xml         | 11 +++++++++--
 doc/apt.conf.5.xml             | 11 +++++++++--
 doc/apt.ent                    | 23 +++++++++++++++++++++++
 doc/apt_preferences.5.xml      | 12 +++++++++---
 doc/sources.list.5.xml         | 14 ++++++++++----
 doc/vendors.list.5.xml         | 14 ++++++++++----
 12 files changed, 118 insertions(+), 30 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f1c106a1..551005e8 100644
--- 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 f2a49f3f..071b1aea 100644
--- 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 ae29ddb6..39fed593 100644
--- 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 e0af9cf4..0f4ac04d 100644
--- 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 e08444fc..7c1ae943 100644
--- 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 9c819c4c..37151738 100644
--- 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 86058e60..ba64e11a 100644
--- 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 405427ac..eed5b8d5 100644
--- 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 6e0bc79b..8054a25f 100644
--- 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 db32b800..2aacc174 100644
--- 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 5248a7eb..bde9893b 100644
--- 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 a14b36a4..7e03eefc 100644
--- 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>
    
-- 
2.20.1