14 files changed, 20 insertions, 20 deletions
diff --git a/doc/apt-cache.8.xml b/doc/apt-cache.8.xml
index 6c8938d8c..8b76f55b9 100644
--- a/doc/apt-cache.8.xml
+++ b/doc/apt-cache.8.xml
@@ -21,6 +21,7 @@
  <refmeta>
    <refentrytitle>apt-cache</refentrytitle>
    <manvolnum>8</manvolnum>
+   <refmiscinfo class="manual">APT</refmiscinfo>
  </refmeta>
  
  <!-- Man page title -->
diff --git a/doc/apt-cdrom.8.xml b/doc/apt-cdrom.8.xml
index 6ab8fad9c..e57942610 100644
--- a/doc/apt-cdrom.8.xml
+++ b/doc/apt-cdrom.8.xml
@@ -20,6 +20,7 @@
  <refmeta>
    <refentrytitle>apt-cdrom</refentrytitle>
    <manvolnum>8</manvolnum>
+   <refmiscinfo class="manual">APT</refmiscinfo>
  </refmeta>
  
  <!-- Man page title -->
diff --git a/doc/apt-config.8.xml b/doc/apt-config.8.xml
index 39fed5937..d4d36891f 100644
--- a/doc/apt-config.8.xml
+++ b/doc/apt-config.8.xml
@@ -21,6 +21,7 @@
  <refmeta>
    <refentrytitle>apt-config</refentrytitle>
    <manvolnum>8</manvolnum>
+   <refmiscinfo class="manual">APT</refmiscinfo>
  </refmeta>
  
  <!-- Man page title -->
diff --git a/doc/apt-extracttemplates.1.xml b/doc/apt-extracttemplates.1.xml
index 0f4ac04d9..77b837022 100644
--- a/doc/apt-extracttemplates.1.xml
+++ b/doc/apt-extracttemplates.1.xml
@@ -21,6 +21,7 @@
  <refmeta>
    <refentrytitle>apt-extracttemplates</refentrytitle>
    <manvolnum>1</manvolnum>
+   <refmiscinfo class="manual">APT</refmiscinfo>
  </refmeta>
  
  <!-- Man page title -->
diff --git a/doc/apt-ftparchive.1.xml b/doc/apt-ftparchive.1.xml
index de7e5f7a3..7131303ae 100644
--- a/doc/apt-ftparchive.1.xml
+++ b/doc/apt-ftparchive.1.xml
@@ -21,6 +21,7 @@
  <refmeta>
    <refentrytitle>apt-ftparchive</refentrytitle>
    <manvolnum>1</manvolnum>
+   <refmiscinfo class="manual">APT</refmiscinfo>
  </refmeta>
  
  <!-- Man page title -->
diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml
index 8db2883c4..b87e17247 100644
--- a/doc/apt-get.8.xml
+++ b/doc/apt-get.8.xml
@@ -21,6 +21,7 @@
  <refmeta>
    <refentrytitle>apt-get</refentrytitle>
    <manvolnum>8</manvolnum>
+   <refmiscinfo class="manual">APT</refmiscinfo>
  </refmeta>
  
  <!-- Man page title -->
diff --git a/doc/apt-key.8.xml b/doc/apt-key.8.xml
index 4b3e7c220..7b0691b5e 100644
--- a/doc/apt-key.8.xml
+++ b/doc/apt-key.8.xml
@@ -13,6 +13,7 @@
  <refmeta>
    <refentrytitle>apt-key</refentrytitle>
    <manvolnum>8</manvolnum>
+   <refmiscinfo class="manual">APT</refmiscinfo>
  </refmeta>
  
  <!-- Man page title -->
diff --git a/doc/apt-mark.8.xml b/doc/apt-mark.8.xml
index f078f2de5..35412d7c9 100644
--- a/doc/apt-mark.8.xml
+++ b/doc/apt-mark.8.xml
@@ -21,6 +21,7 @@
  <refmeta>
    <refentrytitle>apt-mark</refentrytitle>
    <manvolnum>8</manvolnum>
+   <refmiscinfo class="manual">APT</refmiscinfo>
  </refmeta>
  
  <!-- Man page title -->
diff --git a/doc/apt-secure.8.xml b/doc/apt-secure.8.xml
index 9696e018d..20f473f77 100644
--- a/doc/apt-secure.8.xml
+++ b/doc/apt-secure.8.xml
@@ -13,6 +13,7 @@
  <refmeta>
    <refentrytitle>apt-secure</refentrytitle>
    <manvolnum>8</manvolnum>
+   <refmiscinfo class="manual">APT</refmiscinfo>
  </refmeta>
 
 <!-- NOTE: This manpage has been written based on the
diff --git a/doc/apt-sortpkgs.1.xml b/doc/apt-sortpkgs.1.xml
index ba64e11ae..a71766984 100644
--- a/doc/apt-sortpkgs.1.xml
+++ b/doc/apt-sortpkgs.1.xml
@@ -21,6 +21,7 @@
  <refmeta>
    <refentrytitle>apt-sortpkgs</refentrytitle>
    <manvolnum>1</manvolnum>
+   <refmiscinfo class="manual">APT</refmiscinfo>
  </refmeta>
  
  <!-- Man page title -->
diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml
index 59235f115..2412260e7 100644
--- a/doc/apt.conf.5.xml
+++ b/doc/apt.conf.5.xml
@@ -27,6 +27,7 @@
  <refmeta>
    <refentrytitle>apt.conf</refentrytitle>
    <manvolnum>5</manvolnum>
+   <refmiscinfo class="manual">APT</refmiscinfo>
  </refmeta>
  
  <!-- Man page title -->
diff --git a/doc/apt.ent b/doc/apt.ent
index 4cfc00069..43ac2f8e5 100644
--- a/doc/apt.ent
+++ b/doc/apt.ent
@@ -158,7 +158,10 @@
 <!ENTITY apt-docinfo "
  <refentryinfo>
    <address><email>apt@packages.debian.org</email></address>
-   <author><firstname>Jason</firstname> <surname>Gunthorpe</surname></author>
+   <author>
+     <firstname>Jason</firstname> <surname>Gunthorpe</surname>
+     <contrib></contrib>
+   </author>
    <copyright><year>1998-2001</year> <holder>Jason Gunthorpe</holder></copyright>
    <date>28 October 2008</date>
    <productname>Linux</productname>
@@ -176,6 +179,7 @@
    <author>
     <firstname>Jason</firstname>
     <surname>Gunthorpe</surname>
+    <contrib></contrib>
    </author>
 ">
 
@@ -183,12 +187,14 @@
    <author>
     <firstname>Mike</firstname>
     <surname>O'Connor</surname>
+    <contrib></contrib>
    </author>
 ">
 
 <!ENTITY apt-author.team "
    <author>
     <othername>APT team</othername>
+    <contrib></contrib>
    </author>
 ">
 
@@ -196,25 +202,6 @@
    <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 ff63f1dd3..12ea606b7 100644
--- a/doc/apt_preferences.5.xml
+++ b/doc/apt_preferences.5.xml
@@ -20,6 +20,7 @@
  <refmeta>
    <refentrytitle>apt_preferences</refentrytitle>
    <manvolnum>5</manvolnum>
+   <refmiscinfo class="manual">APT</refmiscinfo>
  </refmeta>
 
  <!-- Man page title -->
diff --git a/doc/sources.list.5.xml b/doc/sources.list.5.xml
index b875086ef..c758be61f 100644
--- a/doc/sources.list.5.xml
+++ b/doc/sources.list.5.xml
@@ -21,6 +21,7 @@
  <refmeta>
    <refentrytitle>sources.list</refentrytitle>
    <manvolnum>5</manvolnum>
+   <refmiscinfo class="manual">APT</refmiscinfo>
  </refmeta>
  
  <!-- Man page title -->