From 646c70901a2039a6b38d98db5dc97fc3b86619a1 Mon Sep 17 00:00:00 2001
From: Arch Librarian <arch@canonical.com>
Date: Mon, 20 Sep 2004 17:05:26 +0000
Subject: [PATCH] * Cosmetic updates to XML man pages from Richard Bos <r...
 Author: mdz Date: 2004-02-14 21:03:46 GMT * Cosmetic updates to XML man pages
 from Richard Bos <radoeka@xs4all.nl>

---
 debian/changelog    |  6 ++++++
 doc/apt-cdrom.8.xml |  9 +++++++--
 doc/apt.ent         | 39 ++++++++++++++++++++++++++++++---------
 3 files changed, 43 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c29a89c30..0b77064bb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+apt (0.5.23) unstable; urgency=low
+
+  * Cosmetic updates to XML man pages from Richard Bos <radoeka@xs4all.nl>
+
+ --
+
 apt (0.5.22) unstable; urgency=low
 
   * Updated French translation of man pages from Philippe Batailler
diff --git a/doc/apt-cdrom.8.xml b/doc/apt-cdrom.8.xml
index c8392712f..6ab8fad9c 100644
--- a/doc/apt-cdrom.8.xml
+++ b/doc/apt-cdrom.8.xml
@@ -9,7 +9,13 @@
 
 <refentry>
 
- &apt-docinfo;
+ <refentryinfo>
+   &apt-author.jgunthorpe;
+   &apt-author.team;
+   &apt-email;
+   &apt-product;
+   <date>14 February 2004</date>
+ </refentryinfo>
 
  <refmeta>
    <refentrytitle>apt-cdrom</refentrytitle>
@@ -156,7 +162,6 @@
  </refsect1>
 
  &manbugs;
- &manauthor;
 
 </refentry>
 
diff --git a/doc/apt.ent b/doc/apt.ent
index be90a3d77..6e0bc79be 100644
--- a/doc/apt.ent
+++ b/doc/apt.ent
@@ -104,6 +104,36 @@
  </refentryinfo>
 "> 
 
+<!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>
+     <year>1998-2001</year>
+    </copyright>
+">
+
+<!ENTITY apt-product "
+   <productname>Linux</productname>
+">
+
 <!-- Boiler plate Bug reporting section -->
 <!ENTITY manbugs "
  <refsect1><title>Bugs</title>
@@ -123,15 +153,6 @@
  </refsect1>
 ">
 
-<!-- Should be used in every man page to get the date bottom center of
-     the man page -->
-<!ENTITY apt-preamble "
-  <refentryinfo>
-    <date>14 December 2003</date>
-    <productname>Linux</productname>
-  </refentryinfo>
-">
-
 <!-- Should be used within the option section of the text to
      put in the blurb about -h, -v, -c and -o -->
 <!ENTITY apt-commonoptions "
-- 
2.45.2