From 7648ceb3a7b68c58107691412a15afc27d76e5e9 Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Fri, 31 May 2013 11:56:04 +0000
Subject: [PATCH] - Convert bibliographies to DB 5.0

---
 de_DE.ISO8859-1/share/xml/bibliography.xml  | 184 ++---
 en_US.ISO8859-1/books/bibliography/book.xml |  13 +-
 hu_HU.ISO8859-2/share/xml/bibliography.xml  | 796 +++++++-------------
 nl_NL.ISO8859-1/share/xml/bibliography.xml  | 790 +++++++------------
 share/xml/bibliography.xml                  | 778 +++++++------------
 5 files changed, 904 insertions(+), 1657 deletions(-)

diff --git a/de_DE.ISO8859-1/share/xml/bibliography.xml b/de_DE.ISO8859-1/share/xml/bibliography.xml
index a3f159bd04..2fa84151e1 100644
--- a/de_DE.ISO8859-1/share/xml/bibliography.xml
+++ b/de_DE.ISO8859-1/share/xml/bibliography.xml
@@ -1,19 +1,19 @@
+<?xml version="1.0"?>
 <!--
   $FreeBSD$
   $FreeBSDde: de-docproj/share/xml/bibliography.xml,v 1.1 2002/02/25 11:49:29 ue Exp $
 
   Basiert auf der Bibliographie aus Version 1.348 des FAQ
 -->
-
-<bibliography id="bibliography">
+<bibliography xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="bibliography">
   <title>Bibliographie</title>
 
-  <biblioentry id="biblio-44sysman">
+  <biblioentry xml:id="biblio-44sysman">
     <biblioset relation="book">
-      <title>4.4BSD System Manager's Manual</title>
+      <citetitle>4.4BSD System Manager's Manual</citetitle>
 
-      <corpauthor>Computer Systems Research Group, University of
-        California, Berkeley</corpauthor>
+      <author><orgname>Computer Systems Research Group, University of
+        California, Berkeley</orgname></author>
 
       <publisher>
         <publishername>O'Reilly and Associates</publishername>
@@ -25,16 +25,16 @@
 
       <pagenums>804 Seiten</pagenums>
 
-      <isbn>ISBN 1-56592-080-5</isbn>
+      <biblioid class="isbn">ISBN 1-56592-080-5</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-44userman">
+  <biblioentry xml:id="biblio-44userman">
     <biblioset relation="book">
-      <title>4.4BSD User's Reference Manual</title>
+      <citetitle>4.4BSD User's Reference Manual</citetitle>
 
-      <corpauthor>Computer Systems Research Group, University of
-        California, Berkeley</corpauthor>
+      <author><orgname>Computer Systems Research Group, University of
+        California, Berkeley</orgname></author>
 
       <publisher>
         <publishername>O'Reilly and Associates</publishername>
@@ -46,16 +46,16 @@
 
       <pagenums>905 Seiten</pagenums>
 
-      <isbn>ISBN 1-56592-075-9</isbn>
+      <biblioid class="isbn">ISBN 1-56592-075-9</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-44suppman">
+  <biblioentry xml:id="biblio-44suppman">
     <biblioset relation="book">
-      <title>4.4BSD User's Supplementary Documents</title>
+      <citetitle>4.4BSD User's Supplementary Documents</citetitle>
 
-      <corpauthor>Computer Systems Research Group, University of
-        California, Berkeley</corpauthor>
+      <author><orgname>Computer Systems Research Group, University of
+        California, Berkeley</orgname></author>
 
       <publisher>
         <publishername>O'Reilly and Associates</publishername>
@@ -67,16 +67,16 @@
 
       <pagenums>712 Seiten</pagenums>
 
-      <isbn>ISBN 1-56592-076-7</isbn>
+      <biblioid class="isbn">ISBN 1-56592-076-7</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-44progman">
+  <biblioentry xml:id="biblio-44progman">
     <biblioset relation="book">
-      <title>4.4BSD Programmer's Reference Manual</title>
+      <citetitle>4.4BSD Programmer's Reference Manual</citetitle>
 
-      <corpauthor>Computer Systems Research Group, University of
-        California, Berkeley</corpauthor>
+      <author><orgname>Computer Systems Research Group, University of
+        California, Berkeley</orgname></author>
 
       <publisher>
         <publishername>O'Reilly and Associates</publishername>
@@ -88,16 +88,16 @@
 
       <pagenums>866 Seiten</pagenums>
 
-      <isbn>ISBN 1-56592-078-3</isbn>
+      <biblioid class="isbn">ISBN 1-56592-078-3</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-44progsupp">
+  <biblioentry xml:id="biblio-44progsupp">
     <biblioset relation="book">
-      <title>4.4BSD Programmer's Supplementary Documents</title>
+      <citetitle>4.4BSD Programmer's Supplementary Documents</citetitle>
 
-      <corpauthor>Computer Systems Research Group, University of
-        California, Berkeley</corpauthor>
+      <author><orgname>Computer Systems Research Group, University of
+        California, Berkeley</orgname></author>
 
       <publisher>
         <publishername>O'Reilly and Associates</publishername>
@@ -109,45 +109,25 @@
 
       <pagenums>596 Seiten</pagenums>
 
-      <isbn>ISBN 1-56592-079-1</isbn>
+      <biblioid class="isbn">ISBN 1-56592-079-1</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-44kernel">
+  <biblioentry xml:id="biblio-44kernel">
     <biblioset relation="book">
-      <title>The Design and Implementation of the 4.4BSD Operating
-        System</title>
+      <citetitle>The Design and Implementation of the 4.4BSD Operating
+        System</citetitle>
 
       <authorgroup>
-        <author>
-          <firstname>M. K.</firstname>
+        <author><personname><firstname>M. K.</firstname><surname>McKusick</surname></personname></author>
 
-          <surname>McKusick</surname>
-        </author>
+        <author><personname><firstname>Kirk</firstname><surname>Marshall</surname></personname></author>
 
-        <author>
-          <firstname>Kirk</firstname>
+        <author><personname><firstname>Keith</firstname><surname>Bostic</surname></personname></author>
 
-          <surname>Marshall</surname>
-        </author>
+        <author><personname><firstname>Michael J</firstname><surname>Karels</surname></personname></author>
 
-        <author>
-          <firstname>Keith</firstname>
-
-          <surname>Bostic</surname>
-        </author>
-
-        <author>
-          <firstname>Michael J</firstname>
-
-          <surname>Karels</surname>
-        </author>
-
-        <author>
-          <firstname>John</firstname>
-
-          <surname>Quarterman</surname>
-        </author>
+        <author><personname><firstname>John</firstname><surname>Quarterman</surname></personname></author>
       </authorgroup>
 
       <publisher>
@@ -161,44 +141,24 @@
 
       <pubdate>1996</pubdate>
 
-      <isbn>ISBN 0-201-54979-4</isbn>
+      <biblioid class="isbn">ISBN 0-201-54979-4</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-nemeth3rd">
+  <biblioentry xml:id="biblio-nemeth3rd">
     <biblioset relation="book">
-      <title>Unix System Administration Handbook</title>
+      <citetitle>Unix System Administration Handbook</citetitle>
 
       <authorgroup>
-        <author>
-          <firstname>Evi</firstname>
+        <author><personname><firstname>Evi</firstname><surname>Nemeth</surname></personname></author>
 
-          <surname>Nemeth</surname>
-        </author>
+        <author><personname><firstname>Garth</firstname><surname>Snyder</surname></personname></author>
 
-        <author>
-          <firstname>Garth</firstname>
+        <author><personname><firstname>Scott</firstname><surname>Seebass</surname></personname></author>
 
-          <surname>Snyder</surname>
-        </author>
+        <author><personname><firstname>Trent R.</firstname><surname>Hein</surname></personname></author>
 
-        <author>
-          <firstname>Scott</firstname>
-
-          <surname>Seebass</surname>
-        </author>
-
-        <author>
-          <firstname>Trent R.</firstname>
-
-          <surname>Hein</surname>
-        </author>
-
-        <author>
-          <firstname>John</firstname>
-
-          <surname>Quarterman</surname>
-        </author>
+        <author><personname><firstname>John</firstname><surname>Quarterman</surname></personname></author>
       </authorgroup>
 
       <publisher>
@@ -209,19 +169,15 @@
 
       <pubdate>2000</pubdate>
 
-      <isbn>ISBN 0-13-020601-6</isbn>
+      <biblioid class="isbn">ISBN 0-13-020601-6</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="lehey3rd">
+  <biblioentry xml:id="lehey3rd">
     <biblioset relation="book">
-      <title>The Complete FreeBSD</title>
+      <citetitle>The Complete FreeBSD</citetitle>
 
-      <author>
-        <firstname>Greg</firstname>
-
-        <surname>Lehey</surname>
-      </author>
+      <author><personname><firstname>Greg</firstname><surname>Lehey</surname></personname></author>
 
       <publisher>
         <publishername>Walnut Creek</publishername>
@@ -233,15 +189,15 @@
 
       <pagenums>773 Seiten</pagenums>
 
-      <isbn>ISBN 1-57176-246-9</isbn>
+      <biblioid class="isbn">ISBN 1-57176-246-9</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-handbook">
+  <biblioentry xml:id="biblio-handbook">
     <biblioset relation="book">
-      <title>The FreeBSD Handbook</title>
+      <citetitle>The FreeBSD Handbook</citetitle>
 
-      <corpauthor>FreeBSD Documentation Project</corpauthor>
+      <author><orgname>FreeBSD Documentation Project</orgname></author>
 
       <publisher>
         <publishername>BSDi</publishername>
@@ -253,47 +209,27 @@
 
       <pagenums>489 pages</pagenums>
 
-      <isbn>ISBN 1-57176-241-8</isbn>
+      <biblioid class="isbn">ISBN 1-57176-241-8</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-mckusick-1">
+  <biblioentry xml:id="biblio-mckusick-1">
     <abbrev>McKusick et al, 1994</abbrev>
 
     <biblioset relation="manual">
-      <title>Berkeley Software Architecture Manual, 4.4BSD
-        Edition</title>
+      <citetitle>Berkeley Software Architecture Manual, 4.4BSD
+        Edition</citetitle>
 
       <authorgroup>
-        <author>
-          <firstname>M. K.</firstname>
+        <author><personname><firstname>M. K.</firstname><surname>McKusick</surname></personname></author>
 
-          <surname>McKusick</surname>
-        </author>
+        <author><personname><firstname>M. J.</firstname><surname>Karels</surname></personname></author>
 
-        <author>
-          <firstname>M. J.</firstname>
+        <author><personname><firstname>S. J.</firstname><surname>Leffler</surname></personname></author>
 
-          <surname>Karels</surname>
-        </author>
+        <author><personname><firstname>W. N.</firstname><surname>Joy</surname></personname></author>
 
-        <author>
-          <firstname>S. J.</firstname>
-
-          <surname>Leffler</surname>
-        </author>
-
-        <author>
-          <firstname>W. N.</firstname>
-
-          <surname>Joy</surname>
-        </author>
-
-        <author>
-          <firstname>R. S.</firstname>
-
-          <surname>Faber</surname>
-        </author>
+        <author><personname><firstname>R. S.</firstname><surname>Faber</surname></personname></author>
       </authorgroup>
 
       <pagenums>5:1-42</pagenums>
diff --git a/en_US.ISO8859-1/books/bibliography/book.xml b/en_US.ISO8859-1/books/bibliography/book.xml
index 778160a2be..c9b97ef1bf 100644
--- a/en_US.ISO8859-1/books/bibliography/book.xml
+++ b/en_US.ISO8859-1/books/bibliography/book.xml
@@ -1,20 +1,17 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
-	"../../../share/xml/freebsd45.dtd" [
+<!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN" "../../../share/xml/freebsd50.dtd" [
 <!ENTITY bibliography SYSTEM "../../../share/xml/bibliography.xml">
 ]>
-
 <!--
      The FreeBSD Documentation Project
 
      $FreeBSD$
 -->
-
-<book lang='en'>
-  <bookinfo>
+<book xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:lang="en">
+  <info>
     <title>FreeBSD Bibliography</title>
 
-    <corpauthor>The FreeBSD Documentation Project</corpauthor>
+    <author><orgname>The FreeBSD Documentation Project</orgname></author>
 
     <pubdate>February 1999</pubdate>
 
@@ -24,7 +21,7 @@
     </copyright>
 
     <releaseinfo>$FreeBSD$</releaseinfo>
-  </bookinfo>
+  </info>
 
   &bibliography;
 </book>
diff --git a/hu_HU.ISO8859-2/share/xml/bibliography.xml b/hu_HU.ISO8859-2/share/xml/bibliography.xml
index 47ed73976a..0591f7fb43 100644
--- a/hu_HU.ISO8859-2/share/xml/bibliography.xml
+++ b/hu_HU.ISO8859-2/share/xml/bibliography.xml
@@ -7,23 +7,16 @@
      %SOURCE%	share/xml/bibliography.xml
      %SRCID%	1.10
 -->
-
-<bibliography id="bibliography">
+<bibliography xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="bibliography">
   <title>Irodalomjegyz�k</title>
 
-  <biblioentry id="biblio-unleashed">
+  <biblioentry xml:id="biblio-unleashed">
     <biblioset relation="book">
-      <title>FreeBSD Unleashed</title>
+      <citetitle>FreeBSD Unleashed</citetitle>
 
       <authorgroup>
-	<author>
-	  <firstname>Michael</firstname>
-	  <surname>Urban</surname>
-	</author>
-	<author>
-	  <firstname>Brian</firstname>
-	  <surname>Tiemann</surname>
-	</author>
+	<author><personname><firstname>Michael</firstname><surname>Urban</surname></personname></author>
+	<author><personname><firstname>Brian</firstname><surname>Tiemann</surname></personname></author>
       </authorgroup>
 
       <publisher>
@@ -36,16 +29,16 @@
 
       <pubdate>2001&nbsp;okt�ber</pubdate>
 
-      <isbn>ISBN 0-67232-206-4</isbn>
+      <biblioid class="isbn">ISBN 0-67232-206-4</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-44sysman">
+  <biblioentry xml:id="biblio-44sysman">
     <biblioset relation="book">
-      <title>4.4BSD System Manager's Manual</title>
+      <citetitle>4.4BSD System Manager's Manual</citetitle>
 
-      <corpauthor>Computer Systems Research Group, University of
-	California, Berkeley</corpauthor>
+      <author><orgname>Computer Systems Research Group, University of
+	California, Berkeley</orgname></author>
 
       <publisher>
 	<publishername>O'Reilly and Associates</publishername>
@@ -57,16 +50,16 @@
 
       <pagenums>804&nbsp;oldal</pagenums>
 
-      <isbn>ISBN 1-56592-080-5</isbn>
+      <biblioid class="isbn">ISBN 1-56592-080-5</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-44userman">
+  <biblioentry xml:id="biblio-44userman">
     <biblioset relation="book">
-      <title>4.4BSD User's Reference Manual</title>
+      <citetitle>4.4BSD User's Reference Manual</citetitle>
 
-      <corpauthor>Computer Systems Research Group, University of
-	California, Berkeley</corpauthor>
+      <author><orgname>Computer Systems Research Group, University of
+	California, Berkeley</orgname></author>
 
       <publisher>
 	<publishername>O'Reilly and Associates</publishername>
@@ -78,16 +71,16 @@
 
       <pagenums>905&nbsp;oldal</pagenums>
 
-      <isbn>ISBN 1-56592-075-9</isbn>
+      <biblioid class="isbn">ISBN 1-56592-075-9</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-44suppman">
+  <biblioentry xml:id="biblio-44suppman">
     <biblioset relation="book">
-      <title>4.4BSD User's Supplementary Documents</title>
+      <citetitle>4.4BSD User's Supplementary Documents</citetitle>
 
-      <corpauthor>Computer Systems Research Group, University of
-	California, Berkeley</corpauthor>
+      <author><orgname>Computer Systems Research Group, University of
+	California, Berkeley</orgname></author>
 
       <publisher>
 	<publishername>O'Reilly and Associates</publishername>
@@ -99,16 +92,16 @@
 
       <pagenums>712&nbsp;oldal</pagenums>
 
-      <isbn>ISBN 1-56592-076-7</isbn>
+      <biblioid class="isbn">ISBN 1-56592-076-7</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-44progman">
+  <biblioentry xml:id="biblio-44progman">
     <biblioset relation="book">
-      <title>4.4BSD Programmer's Reference Manual</title>
+      <citetitle>4.4BSD Programmer's Reference Manual</citetitle>
 
-      <corpauthor>Computer Systems Research Group, University of
-	California, Berkeley</corpauthor>
+      <author><orgname>Computer Systems Research Group, University of
+	California, Berkeley</orgname></author>
 
       <publisher>
 	<publishername>O'Reilly and Associates</publishername>
@@ -120,16 +113,16 @@
 
       <pagenums>866&nbsp;oldal</pagenums>
 
-      <isbn>ISBN 1-56592-078-3</isbn>
+      <biblioid class="isbn">ISBN 1-56592-078-3</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-44progsupp">
+  <biblioentry xml:id="biblio-44progsupp">
     <biblioset relation="book">
-      <title>4.4BSD Programmer's Supplementary Documents</title>
+      <citetitle>4.4BSD Programmer's Supplementary Documents</citetitle>
 
-      <corpauthor>Computer Systems Research Group, University of
-	California, Berkeley</corpauthor>
+      <author><orgname>Computer Systems Research Group, University of
+	California, Berkeley</orgname></author>
 
       <publisher>
 	<publishername>O'Reilly and Associates</publishername>
@@ -141,44 +134,24 @@
 
       <pagenums>596&nbsp;oldal</pagenums>
 
-      <isbn>ISBN 1-56592-079-1</isbn>
+      <biblioid class="isbn">ISBN 1-56592-079-1</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-44kernel">
+  <biblioentry xml:id="biblio-44kernel">
     <biblioset relation="book">
-      <title>The Design and Implementation of the 4.4BSD Operating System</title>
+      <citetitle>The Design and Implementation of the 4.4BSD Operating System</citetitle>
 
       <authorgroup>
-	<author>
-	  <firstname>M. K.</firstname>
+	<author><personname><firstname>M. K.</firstname><surname>McKusick</surname></personname></author>
 
-	  <surname>McKusick</surname>
-	</author>
+	<author><personname><firstname>Kirk</firstname><surname>Marshall</surname></personname></author>
 
-	<author>
-	  <firstname>Kirk</firstname>
+	<author><personname><firstname>Keith</firstname><surname>Bostic</surname></personname></author>
 
-	  <surname>Marshall</surname>
-	</author>
+	<author><personname><firstname>Michael J</firstname><surname>Karels</surname></personname></author>
 
-	<author>
-	  <firstname>Keith</firstname>
-
-	  <surname>Bostic</surname>
-	</author>
-
-	<author>
-	  <firstname>Michael J</firstname>
-
-	  <surname>Karels</surname>
-	</author>
-
-	<author>
-	  <firstname>John</firstname>
-
-	  <surname>Quarterman</surname>
-	</author>
+	<author><personname><firstname>John</firstname><surname>Quarterman</surname></personname></author>
       </authorgroup>
 
       <publisher>
@@ -192,24 +165,18 @@
 
       <pubdate>1996</pubdate>
 
-      <isbn>ISBN 0-201-54979-4</isbn>
+      <biblioid class="isbn">ISBN 0-201-54979-4</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-freebsdkernel">
+  <biblioentry xml:id="biblio-freebsdkernel">
     <biblioset relation="book">
-      <title>The Design and Implementation of the FreeBSD Operating System</title>
+      <citetitle>The Design and Implementation of the FreeBSD Operating System</citetitle>
 
       <authorgroup>
-	<author>
-	  <firstname>M. K.</firstname>
-	  <surname>McKusick</surname>
-	</author>
+	<author><personname><firstname>M. K.</firstname><surname>McKusick</surname></personname></author>
 
-	<author>
-	  <firstname>George V.</firstname>
-	  <surname>Neville-Neil</surname>
-	</author>
+	<author><personname><firstname>George V.</firstname><surname>Neville-Neil</surname></personname></author>
       </authorgroup>
 
       <publisher>
@@ -221,44 +188,24 @@
       </publisher>
       <pubdate>2004</pubdate>
 
-      <isbn>ISBN 0-201-70245-2</isbn>
+      <biblioid class="isbn">ISBN 0-201-70245-2</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-nemeth3rd">
+  <biblioentry xml:id="biblio-nemeth3rd">
     <biblioset relation="book">
-      <title>Unix System Administration Handbook</title>
+      <citetitle>Unix System Administration Handbook</citetitle>
 
       <authorgroup>
-        <author>
-          <firstname>Evi</firstname>
+        <author><personname><firstname>Evi</firstname><surname>Nemeth</surname></personname></author>
 
-          <surname>Nemeth</surname>
-        </author>
+        <author><personname><firstname>Garth</firstname><surname>Snyder</surname></personname></author>
 
-        <author>
-          <firstname>Garth</firstname>
+        <author><personname><firstname>Scott</firstname><surname>Seebass</surname></personname></author>
 
-          <surname>Snyder</surname>
-        </author>
+        <author><personname><firstname>Trent R.</firstname><surname>Hein</surname></personname></author>
 
-        <author>
-          <firstname>Scott</firstname>
-
-          <surname>Seebass</surname>
-        </author>
-
-        <author>
-          <firstname>Trent R.</firstname>
-
-          <surname>Hein</surname>
-        </author>
-
-        <author>
-          <firstname>John</firstname>
-
-          <surname>Quarterman</surname>
-        </author>
+        <author><personname><firstname>John</firstname><surname>Quarterman</surname></personname></author>
       </authorgroup>
 
       <publisher>
@@ -269,19 +216,15 @@
 
       <pubdate>2000</pubdate>
 
-      <isbn>ISBN 0-13-020601-6</isbn>
+      <biblioid class="isbn">ISBN 0-13-020601-6</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="lehey3rd">
+  <biblioentry xml:id="lehey3rd">
     <biblioset relation="book">
-      <title>The Complete FreeBSD</title>
+      <citetitle>The Complete FreeBSD</citetitle>
 
-      <author>
-        <firstname>Greg</firstname>
-
-        <surname>Lehey</surname>
-      </author>
+      <author><personname><firstname>Greg</firstname><surname>Lehey</surname></personname></author>
 
       <publisher>
         <publishername>Walnut Creek</publishername>
@@ -293,16 +236,16 @@
 
       <pagenums>773&nbsp;oldal</pagenums>
 
-      <isbn>ISBN 1-57176-246-9</isbn>
+      <biblioid class="isbn">ISBN 1-57176-246-9</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-handbook">
+  <biblioentry xml:id="biblio-handbook">
     <biblioset relation="book">
-      <title>The FreeBSD Handbook</title>
+      <citetitle>The FreeBSD Handbook</citetitle>
 
-      <corpauthor>FreeBSD Dokument�ci�s
-	Projekt</corpauthor>
+      <author><orgname>FreeBSD Dokument�ci�s
+	Projekt</orgname></author>
 
       <publisher>
         <publishername>BSDi</publishername>
@@ -314,47 +257,27 @@
 
       <pagenums>489&nbsp;oldal</pagenums>
 
-      <isbn>ISBN 1-57176-241-8</isbn>
+      <biblioid class="isbn">ISBN 1-57176-241-8</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-mckusick-1">
+  <biblioentry xml:id="biblio-mckusick-1">
     <abbrev>McKusick et al, 1994</abbrev>
 
     <biblioset relation="manual">
-      <title>Berkeley Software Architecture Manual, 4.4BSD
-        Edition</title>
+      <citetitle>Berkeley Software Architecture Manual, 4.4BSD
+        Edition</citetitle>
 
       <authorgroup>
-        <author>
-          <firstname>M. K.</firstname>
+        <author><personname><firstname>M. K.</firstname><surname>McKusick</surname></personname></author>
 
-          <surname>McKusick</surname>
-        </author>
+        <author><personname><firstname>M. J.</firstname><surname>Karels</surname></personname></author>
 
-        <author>
-          <firstname>M. J.</firstname>
+        <author><personname><firstname>S. J.</firstname><surname>Leffler</surname></personname></author>
 
-          <surname>Karels</surname>
-        </author>
+        <author><personname><firstname>W. N.</firstname><surname>Joy</surname></personname></author>
 
-        <author>
-          <firstname>S. J.</firstname>
-
-          <surname>Leffler</surname>
-        </author>
-
-        <author>
-          <firstname>W. N.</firstname>
-
-          <surname>Joy</surname>
-        </author>
-
-        <author>
-          <firstname>R. S.</firstname>
-
-          <surname>Faber</surname>
-        </author>
+        <author><personname><firstname>R. S.</firstname><surname>Faber</surname></personname></author>
       </authorgroup>
 
       <pagenums>5:1-42</pagenums>
@@ -364,186 +287,165 @@
 
 
 
-  <biblioentry id="biblio-ja-fbsdpc98">
+  <biblioentry xml:id="biblio-ja-fbsdpc98">
     <biblioset relation="book">
-      <title>FreeBSD for PC 98'ers (Jap�nul)</title>
+      <citetitle>FreeBSD for PC 98'ers (Jap�nul)</citetitle>
       <publisher>
         <publishername>SHUWA System Co, LTD.</publishername>
       </publisher>
-      <isbn>ISBN 4-87966-468-5 C3055 P2900E</isbn>
+      <biblioid class="isbn">ISBN 4-87966-468-5 C3055 P2900E</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-ja-fbsd">
+  <biblioentry xml:id="biblio-ja-fbsd">
     <biblioset relation="book">
-      <title>FreeBSD (Jap�nul)</title>
+      <citetitle>FreeBSD (Jap�nul)</citetitle>
       <publisher>
         <publishername>CUTT</publishername>
       </publisher>
-      <isbn>ISBN 4-906391-22-2</isbn>
+      <biblioid class="isbn">ISBN 4-906391-22-2</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-ja-compintro">
+  <biblioentry xml:id="biblio-ja-compintro">
     <biblioset relation="book">
-      <title>Complete Introduction to FreeBSD (Jap�nul)</title>
+      <citetitle>Complete Introduction to FreeBSD (Jap�nul)</citetitle>
       <publisher>
         <publishername>Shoeisha Co., Ltd</publishername>
       </publisher>
-      <isbn>ISBN 4-88135-473-6 P3600E</isbn>
+      <biblioid class="isbn">ISBN 4-88135-473-6 P3600E</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-ja-unixstarterkit">
+  <biblioentry xml:id="biblio-ja-unixstarterkit">
     <biblioset relation="book">
-      <title>Personal UNIX Starter Kit FreeBSD (Jap�nul)</title>
+      <citetitle>Personal UNIX Starter Kit FreeBSD (Jap�nul)</citetitle>
       <publisher>
         <publishername>ASCII</publishername>
       </publisher>
-      <isbn>ISBN 4-7561-1733-3 P3000E</isbn>
+      <biblioid class="isbn">ISBN 4-7561-1733-3 P3000E</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-ja-fbsdhb">
+  <biblioentry xml:id="biblio-ja-fbsdhb">
     <biblioset relation="book">
-      <title>FreeBSD Handbook (Jap�n
-      ford�t�s)</title>
+      <citetitle>FreeBSD Handbook (Jap�n
+      ford�t�s)</citetitle>
       <publisher>
         <publishername>ASCII</publishername>
       </publisher>
-      <isbn>ISBN 4-7561-1580-2 P3800E</isbn>
+      <biblioid class="isbn">ISBN 4-7561-1580-2 P3800E</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-ge-fbsdmitmeth">
+  <biblioentry xml:id="biblio-ge-fbsdmitmeth">
     <biblioset relation="book">
-      <title>FreeBSD mit Methode (N�met�l)</title>
+      <citetitle>FreeBSD mit Methode (N�met�l)</citetitle>
       <publisher>
         <publishername>Computer und Literature Verlag/Vertrieb Hanser</publishername>
       </publisher>
       <pubdate>1998</pubdate>
-      <isbn>ISBN 3-932311-31-0</isbn>
+      <biblioid class="isbn">ISBN 3-932311-31-0</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-ja-fbsdinstandutil">
+  <biblioentry xml:id="biblio-ja-fbsdinstandutil">
     <biblioset relation="book">
-      <title>FreeBSD install and Utilization Manual
-	(Jap�nul)</title>
+      <citetitle>FreeBSD install and Utilization Manual
+	(Jap�nul)</citetitle>
       <publisher>
         <publishername>Mainichi Communications Inc.</publishername>
       </publisher>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-indo-intserv">
+  <biblioentry xml:id="biblio-indo-intserv">
     <biblioset relation="book">
-      <title>Building Internet Server with FreeBSD (Indon�z
-	nyelven)</title>
+      <citetitle>Building Internet Server with FreeBSD (Indon�z
+	nyelven)</citetitle>
       <publisher>
         <publishername>Elex Media Komputindo</publishername>
       </publisher>
 
       <authorgroup>
-	<author>
-	  <firstname>Onno W</firstname>
-	  <surname>Purbo</surname>
-	</author>
+	<author><personname><firstname>Onno W</firstname><surname>Purbo</surname></personname></author>
 
-	<author>
-	  <firstname>Dodi</firstname>
-	  <surname>Maryanto</surname>
-	</author>
+	<author><personname><firstname>Dodi</firstname><surname>Maryanto</surname></personname></author>
 
-	<author>
-	  <firstname>Syahrial</firstname>
-	  <surname>Hubbany</surname>
-	</author>
+	<author><personname><firstname>Syahrial</firstname><surname>Hubbany</surname></personname></author>
 
-	<author>
-	  <firstname>Widjil</firstname>
-	  <surname>Widodo</surname>
-	</author>
+	<author><personname><firstname>Widjil</firstname><surname>Widodo</surname></personname></author>
       </authorgroup>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-fbsdcorpnetguide">
+  <biblioentry xml:id="biblio-fbsdcorpnetguide">
     <biblioset relation="book">
-      <title>The FreeBSD Corporate Networker's Guide</title>
+      <citetitle>The FreeBSD Corporate Networker's Guide</citetitle>
       <publisher>
         <publishername>Addison-Wesley</publishername>
       </publisher>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-unixnutshell">
+  <biblioentry xml:id="biblio-unixnutshell">
     <biblioset relation="book">
-      <title>UNIX in a Nutshell</title>
+      <citetitle>UNIX in a Nutshell</citetitle>
       <publisher>
         <publishername>O'Reilly &amp; Associates, Inc.</publishername>
       </publisher>
       <pubdate>1990</pubdate>
-      <isbn>ISBN 093717520X</isbn>
+      <biblioid class="isbn">ISBN 093717520X</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-cantfindadmin">
+  <biblioentry xml:id="biblio-cantfindadmin">
     <biblioset relation="book">
-      <title>What You Need To Know When You Can't Find Your Unix System Administrator</title>
+      <citetitle>What You Need To Know When You Can't Find Your Unix System Administrator</citetitle>
       <publisher>
         <publishername>O'Reilly &amp; Associates, Inc.</publishername>
       </publisher>
       <pubdate>1995</pubdate>
-      <author>
-        <firstname>Linda</firstname>
-        <surname>Mui</surname>
-      </author>
-      <isbn>ISBN 1-56592-104-6</isbn>
+      <author><personname><firstname>Linda</firstname><surname>Mui</surname></personname></author>
+      <biblioid class="isbn">ISBN 1-56592-104-6</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-ja-fbsdusrrefman">
+  <biblioentry xml:id="biblio-ja-fbsdusrrefman">
     <biblioset relation="book">
-      <title>FreeBSD User's Reference Manual (Jap�n
-	ford�t�s)</title>
+      <citetitle>FreeBSD User's Reference Manual (Jap�n
+	ford�t�s)</citetitle>
       <publisher>
         <publishername>Mainichi Communications Inc.</publishername>
       </publisher>
-      <corpauthor>Jpman Project, Japan FreeBSD Users Group</corpauthor>
+      <author><orgname>Jpman Project, Japan FreeBSD Users Group</orgname></author>
       <pubdate>1998</pubdate>
-      <isbn>ISBN 4-8399-0088-4 P3800E</isbn>
+      <biblioid class="isbn">ISBN 4-8399-0088-4 P3800E</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-newcomeunix">
+  <biblioentry xml:id="biblio-newcomeunix">
     <biblioset relation="article">
-      <citetitle pubwork="book"><ulink url="http://unixhelp.ed.ac.uk/">Online Guide
-        for newcomers to the UNIX environment</ulink></citetitle>
+      <citetitle pubwork="book"><link xlink:href="http://unixhelp.ed.ac.uk/">Online Guide
+        for newcomers to the UNIX environment</link></citetitle>
       <publisher>
-        <publishername><ulink url="http://www.ed.ac.uk/">Edinburgh University</ulink></publishername>
+        <publishername><link xlink:href="http://www.ed.ac.uk/">Edinburgh University</link></publishername>
       </publisher>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-dnsandbind">
+  <biblioentry xml:id="biblio-dnsandbind">
     <biblioset relation="book">
-      <title>DNS and BIND</title>
+      <citetitle>DNS and BIND</citetitle>
       <publisher>
         <publishername>O'Reilly &amp; Associates, Inc</publishername>
       </publisher>
-      <isbn>ISBN 1-56592-512-2</isbn>
+      <biblioid class="isbn">ISBN 1-56592-512-2</biblioid>
 
       <authorgroup>
-	<author>
-	  <firstname>Paul Albitz</firstname>
-	  <surname>Albitz</surname>
-	</author>
+	<author><personname><firstname>Paul Albitz</firstname><surname>Albitz</surname></personname></author>
 
-	<author>
-	  <firstname>Cricket</firstname>
-	  <surname>Liu</surname>
-	</author>
+	<author><personname><firstname>Cricket</firstname><surname>Liu</surname></personname></author>
       </authorgroup>
 
       <pubdate>1998</pubdate>
@@ -551,211 +453,169 @@
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-sendmail">
+  <biblioentry xml:id="biblio-sendmail">
     <biblioset relation="book">
-      <title>Sendmail</title>
+      <citetitle>Sendmail</citetitle>
       <publisher>
         <publishername>O'Reilly &amp; Associates, Inc</publishername>
       </publisher>
       <pubdate>1997</pubdate>
       <edition>m�sodik&nbsp;kiad�s</edition>
-      <author>
-        <firstname>Brian</firstname>
-        <surname>Costales</surname>
-      </author>
-      <isbn>ISBN 1-56592-222-0</isbn>
+      <author><personname><firstname>Brian</firstname><surname>Costales</surname></personname></author>
+      <biblioid class="isbn">ISBN 1-56592-222-0</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-esssysadmin">
+  <biblioentry xml:id="biblio-esssysadmin">
     <biblioset relation="book">
-      <title>Essential System Administration</title>
-      <author>
-        <firstname>&AElig;leen</firstname>
-        <surname>Frisch</surname>
-      </author>
+      <citetitle>Essential System Administration</citetitle>
+      <author><personname><firstname>&AElig;leen</firstname><surname>Frisch</surname></personname></author>
       <edition>m�sodik kiad�s</edition>
       <publisher>
         <publishername>O'Reilly &amp; Associates</publishername>
       </publisher>
       <pubdate>1995</pubdate>
-      <isbn>ISBN 1-56592-127-5</isbn>
+      <biblioid class="isbn">ISBN 1-56592-127-5</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-tcpipnetworkadministration">
+  <biblioentry xml:id="biblio-tcpipnetworkadministration">
     <biblioset relation="book">
-      <title>TCP/IP Network Administration</title>
-      <author>
-        <firstname>Craig</firstname>
-        <surname>Hunt</surname>
-      </author>
+      <citetitle>TCP/IP Network Administration</citetitle>
+      <author><personname><firstname>Craig</firstname><surname>Hunt</surname></personname></author>
       <edition>m�sodik&nbsp;kiad�s</edition>
       <publisher>
         <publishername>O'Reilly &amp; Associates, Inc</publishername>
       </publisher>
       <pubdate>1997</pubdate>
-      <isbn>ISBN 1-56592-322-7</isbn>
+      <biblioid class="isbn">ISBN 1-56592-322-7</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-managingnfsandnis">
+  <biblioentry xml:id="biblio-managingnfsandnis">
     <biblioset relation="book">
-      <title>Managing NFS and NIS</title>
-      <author>
-        <firstname>Hal</firstname>
-        <surname>Stern</surname>
-      </author>
+      <citetitle>Managing NFS and NIS</citetitle>
+      <author><personname><firstname>Hal</firstname><surname>Stern</surname></personname></author>
       <publisher>
         <publishername>O'Reilly &amp; Associates, Inc</publishername>
       </publisher>
       <pubdate>1991</pubdate>
-      <isbn>ISBN 0-937175-75-7</isbn>
+      <biblioid class="isbn">ISBN 0-937175-75-7</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-jpmanprojectjfug">
+  <biblioentry xml:id="biblio-jpmanprojectjfug">
     <biblioset relation="book">
-      <citetitle pubwork="book"><ulink url="http://www.pc.mycom.co.jp/FreeBSD/sam.html">
-        FreeBSD System Administration's Manual</ulink></citetitle>
-      <corpauthor><ulink url="http://www.jp.FreeBSD.org">Jpman Projekt,
+      <citetitle pubwork="book"><link xlink:href="http://www.pc.mycom.co.jp/FreeBSD/sam.html">
+        FreeBSD System Administration's Manual</link></citetitle>
+      <author><orgname><link xlink:href="http://www.jp.FreeBSD.org">Jpman Projekt,
 	Jap�n FreeBSD Felhaszn�l�k
-	Csoportja</ulink></corpauthor>
+	Csoportja</link></orgname></author>
       <publisher>
-        <publishername><ulink url="http://www.pc.mycom.co.jp/">Mainichi Communications
-          Inc.</ulink></publishername>
+        <publishername><link xlink:href="http://www.pc.mycom.co.jp/">Mainichi Communications
+          Inc.</link></publishername>
       </publisher>
       <pubdate>1998</pubdate>
-      <isbn>ISBN 4-8399-0109-0 P3300E</isbn>
+      <biblioid class="isbn">ISBN 4-8399-0109-0 P3300E</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-xwinsystoolkit">
+  <biblioentry xml:id="biblio-xwinsystoolkit">
     <biblioset relation="book">
-      <title>X Window System Toolkit</title>
+      <citetitle>X Window System Toolkit</citetitle>
       <publisher>
         <publishername>Digital Press</publishername>
       </publisher>
-      <author>
-        <firstname>Paul</firstname>
-        <surname>Asente</surname>
-      </author>
-      <isbn>ISBN 1-55558-051-3</isbn>
+      <author><personname><firstname>Paul</firstname><surname>Asente</surname></personname></author>
+      <biblioid class="isbn">ISBN 1-55558-051-3</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-carefman">
+  <biblioentry xml:id="biblio-carefman">
     <biblioset relation="book">
-      <title>C: A Reference Manual</title>
+      <citetitle>C: A Reference Manual</citetitle>
       <publisher>
         <publishername>Prentice Hall</publishername>
       </publisher>
       <pubdate>1995</pubdate>
       <edition>negyedik&nbsp;kiad�s</edition>
-      <author>
-        <firstname>Samuel P.</firstname>
-        <surname>Harbison</surname>
-      </author>
-      <author>
-        <firstname>Guy L. Jr.</firstname>
-        <surname>Steele</surname>
-      </author>
-      <isbn>ISBN 0-13-326224-3</isbn>
+      <author><personname><firstname>Samuel P.</firstname><surname>Harbison</surname></personname></author>
+      <author><personname><firstname>Guy L. Jr.</firstname><surname>Steele</surname></personname></author>
+      <biblioid class="isbn">ISBN 0-13-326224-3</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-thecproglang">
+  <biblioentry xml:id="biblio-thecproglang">
     <biblioset relation="book">
-      <title>The C Programming Language</title>
+      <citetitle>The C Programming Language</citetitle>
       <publisher>
         <publishername>Prentice Hall</publishername>
       </publisher>
       <pubdate>1998</pubdate>
 
       <authorgroup>
-	<author>
-	  <firstname>Brian</firstname>
-	  <surname>Kernighan</surname>
-	</author>
+	<author><personname><firstname>Brian</firstname><surname>Kernighan</surname></personname></author>
 
-	<author>
-	  <firstname>Dennis</firstname>
-	  <surname>Ritchie</surname>
-	</author>
+	<author><personname><firstname>Dennis</firstname><surname>Ritchie</surname></personname></author>
       </authorgroup>
 
-      <isbn>ISBN 0-13-110362-9</isbn>
+      <biblioid class="isbn">ISBN 0-13-110362-9</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-portingunixsoft">
+  <biblioentry xml:id="biblio-portingunixsoft">
     <biblioset relation="book">
-      <title>Porting UNIX Software</title>
-      <author>
-        <firstname>Greg</firstname>
-        <surname>Lehey</surname>
-      </author>
+      <citetitle>Porting UNIX Software</citetitle>
+      <author><personname><firstname>Greg</firstname><surname>Lehey</surname></personname></author>
       <publisher>
         <publishername>O'Reilly &amp; Associates, Inc.</publishername>
       </publisher>
       <pubdate>1995</pubdate>
-      <isbn>ISBN 1-56592-126-7</isbn>
+      <biblioid class="isbn">ISBN 1-56592-126-7</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-thestandardclibrary">
+  <biblioentry xml:id="biblio-thestandardclibrary">
     <biblioset relation="book">
-      <title>The Standard C Library</title>
+      <citetitle>The Standard C Library</citetitle>
       <publisher>
         <publishername>Prentice Hall</publishername>
       </publisher>
       <pubdate>1992</pubdate>
-      <author>
-        <firstname>P. J.</firstname>
-        <surname>Plauger</surname>
-      </author>
-      <isbn>ISBN 0-13-131509-9</isbn>
+      <author><personname><firstname>P. J.</firstname><surname>Plauger</surname></personname></author>
+      <biblioid class="isbn">ISBN 0-13-131509-9</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-advprogintheunixenv">
+  <biblioentry xml:id="biblio-advprogintheunixenv">
     <biblioset relation="book">
-      <title>Advanced Programming in the UNIX Environment</title>
+      <citetitle>Advanced Programming in the UNIX Environment</citetitle>
       <publisher>
         <publishername>Addison-Wesley</publishername>
       </publisher>
       <pubdate>1992</pubdate>
-      <author>
-        <firstname>W. Richard</firstname>
-        <surname>Stevens</surname>
-      </author>
-      <isbn>ISBN 0-201-56317-7</isbn>
+      <author><personname><firstname>W. Richard</firstname><surname>Stevens</surname></personname></author>
+      <biblioid class="isbn">ISBN 0-201-56317-7</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-unixnetprog">
+  <biblioentry xml:id="biblio-unixnetprog">
     <biblioset relation="book">
-      <title>UNIX Network Programming</title>
-      <author>
-        <firstname>W. Richard</firstname>
-        <surname>Stevens</surname>
-      </author>
+      <citetitle>UNIX Network Programming</citetitle>
+      <author><personname><firstname>W. Richard</firstname><surname>Stevens</surname></personname></author>
       <publisher>
         <publishername>Prentice Hall</publishername>
       </publisher>
       <pubdate>1998</pubdate>
       <edition>m�sodik&nbsp;kiad�s</edition>
-      <isbn>ISBN 0-13-490012-X</isbn>
+      <biblioid class="isbn">ISBN 0-13-490012-X</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-writeserialdriverforunix">
+  <biblioentry xml:id="biblio-writeserialdriverforunix">
     <biblioset relation="book">
-      <title>Writing Serial Drivers for UNIX</title>
-      <author>
-        <firstname>Bill</firstname>
-        <surname>Wells</surname>
-      </author>
+      <citetitle>Writing Serial Drivers for UNIX</citetitle>
+      <author><personname><firstname>Bill</firstname><surname>Wells</surname></personname></author>
       <pubdate>1994&nbsp;december</pubdate>
       <publisher>
         <publishername>Dr. Dobb's Journal</publishername>
@@ -764,28 +624,22 @@
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-unixsysarch">
+  <biblioentry xml:id="biblio-unixsysarch">
     <biblioset relation="book">
-      <title>UNIX System Architecture</title>
+      <citetitle>UNIX System Architecture</citetitle>
       <publisher>
         <publishername>Prentice-Hall, Inc</publishername>
       </publisher>
       <pubdate>1990</pubdate>
-      <author>
-        <firstname>Prabhat K.</firstname>
-        <surname>Andleigh</surname>
-      </author>
-      <isbn>ISBN 0-13-949843-5</isbn>
+      <author><personname><firstname>Prabhat K.</firstname><surname>Andleigh</surname></personname></author>
+      <biblioid class="isbn">ISBN 0-13-949843-5</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-portingunixtothe386">
+  <biblioentry xml:id="biblio-portingunixtothe386">
     <biblioset relation="book">
-      <title>Porting UNIX to the 386</title>
-      <author>
-        <firstname>William</firstname>
-        <surname>Jolitz</surname>
-      </author>
+      <citetitle>Porting UNIX to the 386</citetitle>
+      <author><personname><firstname>William</firstname><surname>Jolitz</surname></personname></author>
       <publisher>
         <publishername>Dr. Dobb's Journal</publishername>
       </publisher>
@@ -793,128 +647,98 @@
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-tcpipillv1theprotocols">
+  <biblioentry xml:id="biblio-tcpipillv1theprotocols">
     <biblioset relation="book">
-      <title>TCP/IP Illustrated, Volume 1: The Protocols</title>
-      <author>
-        <firstname>W. Richard</firstname>
-        <surname>Stevens</surname>
-      </author>
+      <citetitle>TCP/IP Illustrated, Volume 1: The Protocols</citetitle>
+      <author><personname><firstname>W. Richard</firstname><surname>Stevens</surname></personname></author>
       <publisher>
         <publishername>Addison-Wesley</publishername>
       </publisher>
       <pubdate>1996</pubdate>
-      <isbn>ISBN 0-201-63346-9</isbn>
+      <biblioid class="isbn">ISBN 0-201-63346-9</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-unixsysformodrnarch">
+  <biblioentry xml:id="biblio-unixsysformodrnarch">
     <biblioset relation="book">
-      <title>Unix Systems for Modern Architectures</title>
+      <citetitle>Unix Systems for Modern Architectures</citetitle>
       <publisher>
         <publishername>Addison-Wesley</publishername>
       </publisher>
-      <author>
-        <firstname>Curt</firstname>
-        <surname>Schimmel</surname>
-      </author>
+      <author><personname><firstname>Curt</firstname><surname>Schimmel</surname></personname></author>
       <pubdate>1994</pubdate>
-      <isbn>ISBN 0-201-63338-8</isbn>
+      <biblioid class="isbn">ISBN 0-201-63338-8</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-tcpipillvol3">
+  <biblioentry xml:id="biblio-tcpipillvol3">
     <biblioset relation="book">
-      <title>TCP/IP Illustrated, Volume 3: TCP for Transactions, HTTP, NNTP and the UNIX Domain Protocols</title>
+      <citetitle>TCP/IP Illustrated, Volume 3: TCP for Transactions, HTTP, NNTP and the UNIX Domain Protocols</citetitle>
       <publisher>
         <publishername>Addison-Wesley</publishername>
       </publisher>
       <pubdate>1996</pubdate>
-      <author>
-        <firstname>W. Richard</firstname>
-        <surname>Stevens</surname>
-      </author>
-      <isbn>ISBN 0-201-63495-3</isbn>
+      <author><personname><firstname>W. Richard</firstname><surname>Stevens</surname></personname></author>
+      <biblioid class="isbn">ISBN 0-201-63495-3</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-unixinternthenewfrontiers">
+  <biblioentry xml:id="biblio-unixinternthenewfrontiers">
     <biblioset relation="book">
-      <title>UNIX Internals -- The New Frontiers</title>
-      <author>
-        <firstname>Uresh</firstname>
-        <surname>Vahalia</surname>
-      </author>
+      <citetitle>UNIX Internals -- The New Frontiers</citetitle>
+      <author><personname><firstname>Uresh</firstname><surname>Vahalia</surname></personname></author>
       <publisher>
         <publishername>Prentice Hall</publishername>
       </publisher>
       <pubdate>1996</pubdate>
-      <isbn>ISBN 0-13-101908-2</isbn>
+      <biblioid class="isbn">ISBN 0-13-101908-2</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-tcpipillvol2theimplementation">
+  <biblioentry xml:id="biblio-tcpipillvol2theimplementation">
     <biblioset relation="book">
-      <title>TCP/IP Illustrated, Volume 2: The Implementation</title>
+      <citetitle>TCP/IP Illustrated, Volume 2: The Implementation</citetitle>
 
       <authorgroup>
-	<author>
-	  <firstname>Gary R.</firstname>
-	  <surname>Wright</surname>
-	</author>
+	<author><personname><firstname>Gary R.</firstname><surname>Wright</surname></personname></author>
 
-	<author>
-	  <firstname>W. Richard</firstname>
-	  <surname>Stevens</surname>
-	</author>
+	<author><personname><firstname>W. Richard</firstname><surname>Stevens</surname></personname></author>
       </authorgroup>
 
       <pubdate>1995</pubdate>
       <publisher>
         <publishername>Addison-Wesley</publishername>
       </publisher>
-      <isbn>ISBN 0-201-63354-X</isbn>
+      <biblioid class="isbn">ISBN 0-201-63354-X</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-firewallsandinternetsecurity">
+  <biblioentry xml:id="biblio-firewallsandinternetsecurity">
     <biblioset relation="book">
-      <title>Firewalls and Internet Security: Repelling the Wily Hacker</title>
+      <citetitle>Firewalls and Internet Security: Repelling the Wily Hacker</citetitle>
 
       <authorgroup>
-	<author>
-	  <firstname>William R.</firstname>
-	  <surname>Cheswick</surname>
-	</author>
+	<author><personname><firstname>William R.</firstname><surname>Cheswick</surname></personname></author>
 
-	<author>
-	  <firstname>Steven M.</firstname>
-	  <surname>Bellovin</surname>
-	</author>
+	<author><personname><firstname>Steven M.</firstname><surname>Bellovin</surname></personname></author>
       </authorgroup>
 
       <publisher>
         <publishername>Addison-Wesley</publishername>
       </publisher>
       <pubdate>1995</pubdate>
-      <isbn>ISBN 0-201-63357-4</isbn>
+      <biblioid class="isbn">ISBN 0-201-63357-4</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-practicalunixsecurity">
+  <biblioentry xml:id="biblio-practicalunixsecurity">
     <biblioset relation="book">
-      <title>Practical UNIX Security</title>
+      <citetitle>Practical UNIX Security</citetitle>
 
       <authorgroup>
-	<author>
-	  <firstname>Simson</firstname>
-	  <surname>Garfinkel</surname>
-	</author>
+	<author><personname><firstname>Simson</firstname><surname>Garfinkel</surname></personname></author>
 
-	<author>
-	  <firstname>Gene</firstname>
-	  <surname>Spafford</surname>
-	</author>
+	<author><personname><firstname>Gene</firstname><surname>Spafford</surname></personname></author>
       </authorgroup>
 
       <pubdate>1996</pubdate>
@@ -922,39 +746,30 @@
       <publisher>
         <publishername>O'Reilly &amp; Associates, Inc</publishername>
       </publisher>
-      <isbn>ISBN 1-56592-148-8</isbn>
+      <biblioid class="isbn">ISBN 1-56592-148-8</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-pgpprettygoodprivacy">
+  <biblioentry xml:id="biblio-pgpprettygoodprivacy">
     <biblioset relation="book">
-      <title>PGP Pretty Good Privacy</title>
-      <author>
-        <firstname>Simson</firstname>
-        <surname>Garfinkel</surname>
-      </author>
+      <citetitle>PGP Pretty Good Privacy</citetitle>
+      <author><personname><firstname>Simson</firstname><surname>Garfinkel</surname></personname></author>
       <publisher>
         <publishername>O'Reilly &amp; Associates, Inc</publishername>
       </publisher>
       <pubdate>1995</pubdate>
-      <isbn>ISBN 1-56592-098-8</isbn>
+      <biblioid class="isbn">ISBN 1-56592-098-8</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-pentiumprocarch">
+  <biblioentry xml:id="biblio-pentiumprocarch">
     <biblioset relation="book">
-      <title>Pentium Processor System Architecture</title>
+      <citetitle>Pentium Processor System Architecture</citetitle>
 
       <authorgroup>
-	<author>
-	  <firstname>Don</firstname>
-	  <surname>Anderson</surname>
-	</author>
+	<author><personname><firstname>Don</firstname><surname>Anderson</surname></personname></author>
 
-	<author>
-	  <firstname>Tom</firstname>
-	  <surname>Shanley</surname>
-	</author>
+	<author><personname><firstname>Tom</firstname><surname>Shanley</surname></personname></author>
       </authorgroup>
 
       <publisher>
@@ -962,214 +777,171 @@
       </publisher>
       <pubdate>1995</pubdate>
       <edition>m�sodik&nbsp;kiad�s</edition>
-      <isbn>ISBN 0-201-40992-5</isbn>
+      <biblioid class="isbn">ISBN 0-201-40992-5</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-progguidetothesvgacards">
+  <biblioentry xml:id="biblio-progguidetothesvgacards">
     <biblioset relation="book">
-      <title>Programmer's Guide to the EGA, VGA, and Super VGA Cards</title>
-      <author>
-        <firstname>Richard F.</firstname>
-        <surname>Ferraro</surname>
-      </author>
+      <citetitle>Programmer's Guide to the EGA, VGA, and Super VGA Cards</citetitle>
+      <author><personname><firstname>Richard F.</firstname><surname>Ferraro</surname></personname></author>
       <edition>harmadik&nbsp;kiad�s</edition>
       <publisher>
         <publishername>Addison-Wesley</publishername>
       </publisher>
       <pubdate>1995</pubdate>
-      <isbn>ISBN 0-201-62490-7</isbn>
+      <biblioid class="isbn">ISBN 0-201-62490-7</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-80486">
+  <biblioentry xml:id="biblio-80486">
     <biblioset relation="book">
-      <title>80486 System Architecture</title>
-      <author>
-        <firstname>Tom</firstname>
-        <surname>Shanley</surname>
-      </author>
+      <citetitle>80486 System Architecture</citetitle>
+      <author><personname><firstname>Tom</firstname><surname>Shanley</surname></personname></author>
       <publisher>
         <publishername>Addison-Wesley</publishername>
       </publisher>
       <pubdate>1995</pubdate>
       <edition>harmadik&nbsp;kiad�s</edition>
-      <isbn>ISBN 0-201-40994-1</isbn>
+      <biblioid class="isbn">ISBN 0-201-40994-1</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-isasysarch">
+  <biblioentry xml:id="biblio-isasysarch">
     <biblioset relation="book">
-      <title>ISA System Architecture</title>
-      <author>
-        <firstname>Tom</firstname>
-        <surname>Shanley</surname>
-      </author>
+      <citetitle>ISA System Architecture</citetitle>
+      <author><personname><firstname>Tom</firstname><surname>Shanley</surname></personname></author>
       <publisher>
         <publishername>Addison-Wesley</publishername>
       </publisher>
       <edition>harmadik&nbsp;kiad�s</edition>
       <pubdate>1995</pubdate>
-      <isbn>ISBN 0-201-40996-8</isbn>
+      <biblioid class="isbn">ISBN 0-201-40996-8</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-pcisysarch">
+  <biblioentry xml:id="biblio-pcisysarch">
     <biblioset relation="book">
-      <title>PCI System Architecture</title>
-      <author>
-        <firstname>Tom</firstname>
-        <surname>Shanley</surname>
-      </author>
+      <citetitle>PCI System Architecture</citetitle>
+      <author><personname><firstname>Tom</firstname><surname>Shanley</surname></personname></author>
       <publisher>
         <publishername>Addison-Wesley</publishername>
       </publisher>
       <pubdate>1995</pubdate>
       <edition>harmadik&nbsp;kiad�s</edition>
-      <isbn>ISBN 0-201-40993-3</isbn>
+      <biblioid class="isbn">ISBN 0-201-40993-3</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-theundocumentedpc">
+  <biblioentry xml:id="biblio-theundocumentedpc">
     <biblioset relation="book">
-      <title>The Undocumented PC</title>
-      <author>
-        <firstname>Frank</firstname>
-        <surname>Van Gilluwe</surname>
-      </author>
+      <citetitle>The Undocumented PC</citetitle>
+      <author><personname><firstname>Frank</firstname><surname>Van Gilluwe</surname></personname></author>
       <publisher>
         <publishername>Addison-Wesley</publishername>
       </publisher>
       <pubdate>1994</pubdate>
-      <isbn>ISBN 0-201-62277-7</isbn>
+      <biblioid class="isbn">ISBN 0-201-62277-7</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-bellsystemtechnicaljournal">
+  <biblioentry xml:id="biblio-bellsystemtechnicaljournal">
     <biblioset relation="book">
-      <title>Bell System Technical Journal, Unix Time-Sharing System</title>
+      <citetitle>Bell System Technical Journal, Unix Time-Sharing System</citetitle>
       <publisher>
 	<publishername>American Telephone &amp; Telegraph Company</publishername>
       </publisher>
       <pubdate>1978&nbsp;j�lius &mdash; augusztus</pubdate>
       <edition>Vol&nbsp;57, No&nbsp;6, Part&nbsp;2</edition>
-      <isbn>ISSN0005-8580</isbn>
+      <biblioid class="isbn">ISSN0005-8580</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-commentaryonunix">
+  <biblioentry xml:id="biblio-commentaryonunix">
     <biblioset relation="book">
-      <title>Lion's Commentary on UNIX</title>
-      <author>
-        <firstname>John</firstname>
-        <surname>Lion</surname>
-      </author>
+      <citetitle>Lion's Commentary on UNIX</citetitle>
+      <author><personname><firstname>John</firstname><surname>Lion</surname></personname></author>
       <publisher>
         <publishername>ITP Media Group</publishername>
       </publisher>
       <pubdate>1996</pubdate>
       <edition>hatodik&nbsp;kiad�s</edition>
-      <isbn>ISBN 1573980137</isbn>
+      <biblioid class="isbn">ISBN 1573980137</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-newhackerdict">
+  <biblioentry xml:id="biblio-newhackerdict">
     <biblioset relation="book">
-      <title>The New Hacker's Dictionary</title>
-      <author>
-        <firstname>Eric S.</firstname>
-        <surname>Raymond</surname>
-      </author>
+      <citetitle>The New Hacker's Dictionary</citetitle>
+      <author><personname><firstname>Eric S.</firstname><surname>Raymond</surname></personname></author>
       <publisher>
         <publishername>MIT Press</publishername>
       </publisher>
       <pubdate>1996</pubdate>
       <edition>harmadik&nbsp;kiad�s</edition>
-      <isbn>ISBN 0-262-68092-0</isbn>
+      <biblioid class="isbn">ISBN 0-262-68092-0</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-aqtrcentofunix">
+  <biblioentry xml:id="biblio-aqtrcentofunix">
     <biblioset relation="book">
-      <title>A quarter century of UNIX</title>
-      <author>
-        <firstname>Peter H.</firstname>
-        <surname>Salus</surname>
-      </author>
+      <citetitle>A quarter century of UNIX</citetitle>
+      <author><personname><firstname>Peter H.</firstname><surname>Salus</surname></personname></author>
       <publisher>
         <publishername>Addison-Wesley</publishername>
       </publisher>
       <pubdate>1994</pubdate>
-      <isbn>ISBN 0-201-54777-5</isbn>
+      <biblioid class="isbn">ISBN 0-201-54777-5</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-unixhatershandbook">
+  <biblioentry xml:id="biblio-unixhatershandbook">
     <biblioset relation="book">
-      <title>The UNIX-HATERS Handbook</title>
+      <citetitle>The UNIX-HATERS Handbook</citetitle>
 
       <authorgroup>
-	<author>
-	  <firstname>Steven</firstname>
-	  <surname>Strassman</surname>
-	</author>
+	<author><personname><firstname>Steven</firstname><surname>Strassman</surname></personname></author>
 
-	<author>
-	  <firstname>Daniel</firstname>
-	  <surname>Weise</surname>
-	</author>
+	<author><personname><firstname>Daniel</firstname><surname>Weise</surname></personname></author>
 
-	<author>
-	  <firstname>Simon</firstname>
-	  <surname>Garfinkel</surname>
-	</author>
+	<author><personname><firstname>Simon</firstname><surname>Garfinkel</surname></personname></author>
       </authorgroup>
 
       <publisher>
         <publishername>IDG Books Worldwide, Inc</publishername>
       </publisher>
       <pubdate>1994</pubdate>
-      <isbn>ISBN 1-56884-203-1</isbn>
+      <biblioid class="isbn">ISBN 1-56884-203-1</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-lifewithunix">
+  <biblioentry xml:id="biblio-lifewithunix">
     <biblioset relation="book">
-      <title>Life with UNIX &mdash; Special Edition</title>
-      <author>
-        <firstname>Don</firstname>
-        <surname>Libes</surname>
-      </author>
-      <author>
-        <firstname>Sandy</firstname>
-        <surname>Ressler</surname>
-      </author>
+      <citetitle>Life with UNIX &mdash; Special Edition</citetitle>
+      <author><personname><firstname>Don</firstname><surname>Libes</surname></personname></author>
+      <author><personname><firstname>Sandy</firstname><surname>Ressler</surname></personname></author>
       <publisher>
         <publishername>Prentice-Hall</publishername>
       </publisher>
       <pubdate>1989</pubdate>
-      <isbn>ISBN 0-13-536657-7</isbn>
+      <biblioid class="isbn">ISBN 0-13-536657-7</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-bsdfamilytree">
+  <biblioentry xml:id="biblio-bsdfamilytree">
     <biblioset relation="book">
       <citetitle pubwork="book">
-        <ulink url="ftp://ftp.uk.FreeBSD.org/pub/FreeBSD/FreeBSD-current/src/share/misc/bsd-family-tree">
-          The BSD Family Tree</ulink></citetitle>
+        <link xlink:href="ftp://ftp.uk.FreeBSD.org/pub/FreeBSD/FreeBSD-current/src/share/misc/bsd-family-tree">
+          The BSD Family Tree</link></citetitle>
       <pubdate>1997</pubdate>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="absolutebsd">
+  <biblioentry xml:id="absolutebsd">
     <biblioset relation="book">
-      <title>Absolute BSD</title>
+      <citetitle>Absolute BSD</citetitle>
 
-      <author>
-        <firstname>Michael</firstname>
-
-        <surname>Lucas</surname>
-      </author>
+      <author><personname><firstname>Michael</firstname><surname>Lucas</surname></personname></author>
 
       <publisher>
         <publishername>No Starch Press</publishername>
@@ -1177,27 +949,27 @@
 
       <pubdate>June 2002</pubdate>
 
-      <isbn>ISBN 1-886411-74-3</isbn>
+      <biblioid class="isbn">ISBN 1-886411-74-3</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-ccppusersjournal">
+  <biblioentry xml:id="biblio-ccppusersjournal">
     <biblioset relation="magazine">
-      <title>The C/C++ Users Journal</title>
+      <citetitle>The C/C++ Users Journal</citetitle>
       <publisher>
         <publishername>R&amp;D Publications Inc.</publishername>
       </publisher>
-      <issn>ISSN 1075-2838</issn>
+      <biblioid class="issn">ISSN 1075-2838</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-sysadminthejournalforunixsysadmins">
+  <biblioentry xml:id="biblio-sysadminthejournalforunixsysadmins">
     <biblioset relation="magazine">
-      <title>Sys Admin &mdash; The Journal for UNIX System Administrators</title>
+      <citetitle>Sys Admin &mdash; The Journal for UNIX System Administrators</citetitle>
       <publisher>
         <publishername>Miller Freeman, Inc</publishername>
       </publisher>
-      <issn>ISSN 1061-2688</issn>
+      <biblioid class="issn">ISSN 1061-2688</biblioid>
     </biblioset>
   </biblioentry>
 </bibliography>
diff --git a/nl_NL.ISO8859-1/share/xml/bibliography.xml b/nl_NL.ISO8859-1/share/xml/bibliography.xml
index 5d6e0a54aa..fdaa480d84 100644
--- a/nl_NL.ISO8859-1/share/xml/bibliography.xml
+++ b/nl_NL.ISO8859-1/share/xml/bibliography.xml
@@ -7,24 +7,17 @@
   %SOURCE%	share/xml/bibliography.xml
   %SRCID%	41645
 -->
-
-<bibliography id="bibliography">
+<bibliography xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="bibliography">
   <title>Bibliografie</title>
 
-  <biblioentry id="biblio-unleashed">
+  <biblioentry xml:id="biblio-unleashed">
     <biblioset relation="book">
-      <title>&os; Unleashed</title>
+      <citetitle>&os; Unleashed</citetitle>
 
       <authorgroup>
-	<author>
-	  <firstname>Michael</firstname>
-	  <surname>Urban</surname>
-	</author>
+	<author><personname><firstname>Michael</firstname><surname>Urban</surname></personname></author>
 
-	<author>
-	  <firstname>Brian</firstname>
-	  <surname>Tiemann</surname>
-	</author>
+	<author><personname><firstname>Brian</firstname><surname>Tiemann</surname></personname></author>
       </authorgroup>
 
       <publisher>
@@ -37,16 +30,16 @@
 
       <pubdate>oktober 2001</pubdate>
 
-      <isbn>ISBN 0-67232-206-4</isbn>
+      <biblioid class="isbn">ISBN 0-67232-206-4</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-44sysman">
+  <biblioentry xml:id="biblio-44sysman">
     <biblioset relation="book">
-      <title>4.4BSD System Manager's Manual</title>
+      <citetitle>4.4BSD System Manager's Manual</citetitle>
 
-      <corpauthor>Computer Systems Research Group, University of
-	California, Berkeley</corpauthor>
+      <author><orgname>Computer Systems Research Group, University of
+	California, Berkeley</orgname></author>
 
       <publisher>
 	<publishername>O'Reilly and Associates</publishername>
@@ -58,16 +51,16 @@
 
       <pagenums>804 pagina's</pagenums>
 
-      <isbn>ISBN 1-56592-080-5</isbn>
+      <biblioid class="isbn">ISBN 1-56592-080-5</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-44userman">
+  <biblioentry xml:id="biblio-44userman">
     <biblioset relation="book">
-      <title>4.4BSD User's Reference Manual</title>
+      <citetitle>4.4BSD User's Reference Manual</citetitle>
 
-      <corpauthor>Computer Systems Research Group, University of
-	California, Berkeley</corpauthor>
+      <author><orgname>Computer Systems Research Group, University of
+	California, Berkeley</orgname></author>
 
       <publisher>
 	<publishername>O'Reilly and Associates</publishername>
@@ -79,16 +72,16 @@
 
       <pagenums>905 pagina's</pagenums>
 
-      <isbn>ISBN 1-56592-075-9</isbn>
+      <biblioid class="isbn">ISBN 1-56592-075-9</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-44suppman">
+  <biblioentry xml:id="biblio-44suppman">
     <biblioset relation="book">
-      <title>4.4BSD User's Supplementary Documents</title>
+      <citetitle>4.4BSD User's Supplementary Documents</citetitle>
 
-      <corpauthor>Computer Systems Research Group, University of
-	California, Berkeley</corpauthor>
+      <author><orgname>Computer Systems Research Group, University of
+	California, Berkeley</orgname></author>
 
       <publisher>
 	<publishername>O'Reilly and Associates</publishername>
@@ -100,16 +93,16 @@
 
       <pagenums>712 pagina's</pagenums>
 
-      <isbn>ISBN 1-56592-076-7</isbn>
+      <biblioid class="isbn">ISBN 1-56592-076-7</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-44progman">
+  <biblioentry xml:id="biblio-44progman">
     <biblioset relation="book">
-      <title>4.4BSD Programmer's Reference Manual</title>
+      <citetitle>4.4BSD Programmer's Reference Manual</citetitle>
 
-      <corpauthor>Computer Systems Research Group, University of
-	California, Berkeley</corpauthor>
+      <author><orgname>Computer Systems Research Group, University of
+	California, Berkeley</orgname></author>
 
       <publisher>
 	<publishername>O'Reilly and Associates</publishername>
@@ -121,16 +114,16 @@
 
       <pagenums>866 pagina's</pagenums>
 
-      <isbn>ISBN 1-56592-078-3</isbn>
+      <biblioid class="isbn">ISBN 1-56592-078-3</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-44progsupp">
+  <biblioentry xml:id="biblio-44progsupp">
     <biblioset relation="book">
-      <title>4.4BSD Programmer's Supplementary Documents</title>
+      <citetitle>4.4BSD Programmer's Supplementary Documents</citetitle>
 
-      <corpauthor>Computer Systems Research Group, University of
-	California, Berkeley</corpauthor>
+      <author><orgname>Computer Systems Research Group, University of
+	California, Berkeley</orgname></author>
 
       <publisher>
 	<publishername>O'Reilly and Associates</publishername>
@@ -142,45 +135,25 @@
 
       <pagenums>596 pagina's</pagenums>
 
-      <isbn>ISBN 1-56592-079-1</isbn>
+      <biblioid class="isbn">ISBN 1-56592-079-1</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-44kernel">
+  <biblioentry xml:id="biblio-44kernel">
     <biblioset relation="book">
-      <title>The Design and Implementation of the 4.4BSD Operating
-	System</title>
+      <citetitle>The Design and Implementation of the 4.4BSD Operating
+	System</citetitle>
 
       <authorgroup>
-	<author>
-	  <firstname>M. K.</firstname>
+	<author><personname><firstname>M. K.</firstname><surname>McKusick</surname></personname></author>
 
-	  <surname>McKusick</surname>
-	</author>
+	<author><personname><firstname>Kirk</firstname><surname>Marshall</surname></personname></author>
 
-	<author>
-	  <firstname>Kirk</firstname>
+	<author><personname><firstname>Keith</firstname><surname>Bostic</surname></personname></author>
 
-	  <surname>Marshall</surname>
-	</author>
+	<author><personname><firstname>Michael J</firstname><surname>Karels</surname></personname></author>
 
-	<author>
-	  <firstname>Keith</firstname>
-
-	  <surname>Bostic</surname>
-	</author>
-
-	<author>
-	  <firstname>Michael J</firstname>
-
-	  <surname>Karels</surname>
-	</author>
-
-	<author>
-	  <firstname>John</firstname>
-
-	  <surname>Quarterman</surname>
-	</author>
+	<author><personname><firstname>John</firstname><surname>Quarterman</surname></personname></author>
       </authorgroup>
 
       <publisher>
@@ -194,24 +167,18 @@
 
       <pubdate>1996</pubdate>
 
-      <isbn>ISBN 0-201-54979-4</isbn>
+      <biblioid class="isbn">ISBN 0-201-54979-4</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-freebsdkernel">
+  <biblioentry xml:id="biblio-freebsdkernel">
     <biblioset relation="book">
-      <title>The Design and Implementation of the &os; Operating System</title>
+      <citetitle>The Design and Implementation of the &os; Operating System</citetitle>
 
       <authorgroup>
-	<author>
-	  <firstname>M. K.</firstname>
-	  <surname>McKusick</surname>
-	</author>
+	<author><personname><firstname>M. K.</firstname><surname>McKusick</surname></personname></author>
 
-	<author>
-	  <firstname>George V.</firstname>
-	  <surname>Neville-Neil</surname>
-	</author>
+	<author><personname><firstname>George V.</firstname><surname>Neville-Neil</surname></personname></author>
       </authorgroup>
 
       <publisher>
@@ -223,44 +190,24 @@
       </publisher>
       <pubdate>2004</pubdate>
 
-      <isbn>ISBN 0-201-70245-2</isbn>
+      <biblioid class="isbn">ISBN 0-201-70245-2</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-nemeth3rd">
+  <biblioentry xml:id="biblio-nemeth3rd">
     <biblioset relation="book">
-      <title>Unix System Administration Handbook</title>
+      <citetitle>Unix System Administration Handbook</citetitle>
 
       <authorgroup>
-	<author>
-	  <firstname>Evi</firstname>
+	<author><personname><firstname>Evi</firstname><surname>Nemeth</surname></personname></author>
 
-	  <surname>Nemeth</surname>
-	</author>
+	<author><personname><firstname>Garth</firstname><surname>Snyder</surname></personname></author>
 
-	<author>
-	  <firstname>Garth</firstname>
+	<author><personname><firstname>Scott</firstname><surname>Seebass</surname></personname></author>
 
-	  <surname>Snyder</surname>
-	</author>
+	<author><personname><firstname>Trent R.</firstname><surname>Hein</surname></personname></author>
 
-	<author>
-	  <firstname>Scott</firstname>
-
-	  <surname>Seebass</surname>
-	</author>
-
-	<author>
-	  <firstname>Trent R.</firstname>
-
-	  <surname>Hein</surname>
-	</author>
-
-	<author>
-	  <firstname>John</firstname>
-
-	  <surname>Quarterman</surname>
-	</author>
+	<author><personname><firstname>John</firstname><surname>Quarterman</surname></personname></author>
       </authorgroup>
 
       <publisher>
@@ -271,19 +218,15 @@
 
       <pubdate>2000</pubdate>
 
-      <isbn>ISBN 0-13-020601-6</isbn>
+      <biblioid class="isbn">ISBN 0-13-020601-6</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="lehey3rd">
+  <biblioentry xml:id="lehey3rd">
     <biblioset relation="book">
-      <title>The Complete &os;</title>
+      <citetitle>The Complete &os;</citetitle>
 
-      <author>
-	<firstname>Greg</firstname>
-
-	<surname>Lehey</surname>
-      </author>
+      <author><personname><firstname>Greg</firstname><surname>Lehey</surname></personname></author>
 
       <publisher>
 	<publishername>Walnut Creek</publishername>
@@ -295,436 +238,352 @@
 
       <pagenums>773 pagina's</pagenums>
 
-      <isbn>ISBN 1-57176-246-9</isbn>
+      <biblioid class="isbn">ISBN 1-57176-246-9</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-mckusick-1">
+  <biblioentry xml:id="biblio-mckusick-1">
     <abbrev>McKusick et al, 1994</abbrev>
 
     <biblioset relation="manual">
-      <title>Berkeley Software Architecture Manual, 4.4BSD
-	Edition</title>
+      <citetitle>Berkeley Software Architecture Manual, 4.4BSD
+	Edition</citetitle>
 
       <authorgroup>
-	<author>
-	  <firstname>M. K.</firstname>
+	<author><personname><firstname>M. K.</firstname><surname>McKusick</surname></personname></author>
 
-	  <surname>McKusick</surname>
-	</author>
+	<author><personname><firstname>M. J.</firstname><surname>Karels</surname></personname></author>
 
-	<author>
-	  <firstname>M. J.</firstname>
+	<author><personname><firstname>S. J.</firstname><surname>Leffler</surname></personname></author>
 
-	  <surname>Karels</surname>
-	</author>
+	<author><personname><firstname>W. N.</firstname><surname>Joy</surname></personname></author>
 
-	<author>
-	  <firstname>S. J.</firstname>
-
-	  <surname>Leffler</surname>
-	</author>
-
-	<author>
-	  <firstname>W. N.</firstname>
-
-	  <surname>Joy</surname>
-	</author>
-
-	<author>
-	  <firstname>R. S.</firstname>
-
-	  <surname>Faber</surname>
-	</author>
+	<author><personname><firstname>R. S.</firstname><surname>Faber</surname></personname></author>
       </authorgroup>
 
       <pagenums>5:1-42</pagenums>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-ja-fbsdpc98">
+  <biblioentry xml:id="biblio-ja-fbsdpc98">
     <biblioset relation="book">
-      <title>&os; for PC 98'ers (in het Japans)</title>
+      <citetitle>&os; for PC 98'ers (in het Japans)</citetitle>
       <publisher>
 	<publishername>SHUWA System Co, LTD.</publishername>
       </publisher>
-      <isbn>ISBN 4-87966-468-5 C3055 P2900E</isbn>
+      <biblioid class="isbn">ISBN 4-87966-468-5 C3055 P2900E</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-ja-fbsd">
+  <biblioentry xml:id="biblio-ja-fbsd">
     <biblioset relation="book">
-      <title>&os; (in het Japans)</title>
+      <citetitle>&os; (in het Japans)</citetitle>
       <publisher>
 	<publishername>CUTT</publishername>
       </publisher>
-      <isbn>ISBN 4-906391-22-2</isbn>
+      <biblioid class="isbn">ISBN 4-906391-22-2</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-ja-compintro">
+  <biblioentry xml:id="biblio-ja-compintro">
     <biblioset relation="book">
-      <title>Complete Introduction to &os; (in het Japans)</title>
+      <citetitle>Complete Introduction to &os; (in het Japans)</citetitle>
       <publisher>
 	<publishername>Shoeisha Co., Ltd</publishername>
       </publisher>
-      <isbn>ISBN 4-88135-473-6 P3600E</isbn>
+      <biblioid class="isbn">ISBN 4-88135-473-6 P3600E</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-ja-unixstarterkit">
+  <biblioentry xml:id="biblio-ja-unixstarterkit">
     <biblioset relation="book">
-      <title>Personal UNIX Starter Kit &os; (in het Japans)</title>
+      <citetitle>Personal UNIX Starter Kit &os; (in het Japans)</citetitle>
       <publisher>
 	<publishername>ASCII</publishername>
       </publisher>
-      <isbn>ISBN 4-7561-1733-3 P3000E</isbn>
+      <biblioid class="isbn">ISBN 4-7561-1733-3 P3000E</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-ja-fbsdhb">
+  <biblioentry xml:id="biblio-ja-fbsdhb">
     <biblioset relation="book">
-      <title>&os; Handbook (Japanse vertaling)</title>
+      <citetitle>&os; Handbook (Japanse vertaling)</citetitle>
       <publisher>
 	<publishername>ASCII</publishername>
       </publisher>
-      <isbn>ISBN 4-7561-1580-2 P3800E</isbn>
+      <biblioid class="isbn">ISBN 4-7561-1580-2 P3800E</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-ge-fbsdmitmeth">
+  <biblioentry xml:id="biblio-ge-fbsdmitmeth">
     <biblioset relation="book">
-      <title>&os; mit Methode (in het Duits)</title>
+      <citetitle>&os; mit Methode (in het Duits)</citetitle>
       <publisher>
 	<publishername>Computer und Literature Verlag/Vertrieb
 	  Hanser</publishername>
       </publisher>
       <pubdate>1998</pubdate>
-      <isbn>ISBN 3-932311-31-0</isbn>
+      <biblioid class="isbn">ISBN 3-932311-31-0</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-ja-fbsdinstandutil">
+  <biblioentry xml:id="biblio-ja-fbsdinstandutil">
     <biblioset relation="book">
-      <title>&os; install and Utilization Manual (in het Japans)</title>
+      <citetitle>&os; install and Utilization Manual (in het Japans)</citetitle>
       <publisher>
 	<publishername>Mainichi Communications Inc.</publishername>
       </publisher>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-indo-intserv">
+  <biblioentry xml:id="biblio-indo-intserv">
     <biblioset relation="book">
-      <title>Building Internet Server with &os; (in het Indonesisch)</title>
+      <citetitle>Building Internet Server with &os; (in het Indonesisch)</citetitle>
       <publisher>
 	<publishername>Elex Media Komputindo</publishername>
       </publisher>
       <authorgroup>
-	<author>
-	  <firstname>Onno W</firstname>
-	  <surname>Purbo</surname>
-	</author>
-	<author>
-	  <firstname>Dodi</firstname>
-	  <surname>Maryanto</surname>
-	</author>
-	<author>
-	  <firstname>Syahrial</firstname>
-	  <surname>Hubbany</surname>
-	</author>
-	<author>
-	  <firstname>Widjil</firstname>
-	  <surname>Widodo</surname>
-	</author>
+	<author><personname><firstname>Onno W</firstname><surname>Purbo</surname></personname></author>
+	<author><personname><firstname>Dodi</firstname><surname>Maryanto</surname></personname></author>
+	<author><personname><firstname>Syahrial</firstname><surname>Hubbany</surname></personname></author>
+	<author><personname><firstname>Widjil</firstname><surname>Widodo</surname></personname></author>
       </authorgroup>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-fbsdcorpnetguide">
+  <biblioentry xml:id="biblio-fbsdcorpnetguide">
     <biblioset relation="book">
-      <title>The &os; Corporate Networker's Guide</title>
+      <citetitle>The &os; Corporate Networker's Guide</citetitle>
       <publisher>
 	<publishername>Addison-Wesley</publishername>
       </publisher>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-unixnutshell">
+  <biblioentry xml:id="biblio-unixnutshell">
     <biblioset relation="book">
-      <title>UNIX in a Nutshell</title>
+      <citetitle>UNIX in a Nutshell</citetitle>
       <publisher>
 	<publishername>O'Reilly &amp; Associates, Inc.</publishername>
       </publisher>
       <pubdate>1990</pubdate>
-      <isbn>ISBN 093717520X</isbn>
+      <biblioid class="isbn">ISBN 093717520X</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-cantfindadmin">
+  <biblioentry xml:id="biblio-cantfindadmin">
     <biblioset relation="book">
-      <title>What You Need To Know When You Can't Find Your Unix System
-	Administrator</title>
+      <citetitle>What You Need To Know When You Can't Find Your Unix System
+	Administrator</citetitle>
       <publisher>
 	<publishername>O'Reilly &amp; Associates, Inc.</publishername>
       </publisher>
       <pubdate>1995</pubdate>
-      <author>
-	<firstname>Linda</firstname>
-	<surname>Mui</surname>
-      </author>
-      <isbn>ISBN 1-56592-104-6</isbn>
+      <author><personname><firstname>Linda</firstname><surname>Mui</surname></personname></author>
+      <biblioid class="isbn">ISBN 1-56592-104-6</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-ja-fbsdusrrefman">
+  <biblioentry xml:id="biblio-ja-fbsdusrrefman">
     <biblioset relation="book">
-      <title>&os; User's Reference Manual (Japanse vertaling)</title>
+      <citetitle>&os; User's Reference Manual (Japanse vertaling)</citetitle>
       <publisher>
 	<publishername>Mainichi Communications Inc.</publishername>
       </publisher>
-      <corpauthor>Jpman Project, Japan FreeBSD Users Group</corpauthor>
+      <author><orgname>Jpman Project, Japan FreeBSD Users Group</orgname></author>
       <pubdate>1998</pubdate>
-      <isbn>ISBN 4-8399-0088-4 P3800E</isbn>
+      <biblioid class="isbn">ISBN 4-8399-0088-4 P3800E</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-newcomeunix">
+  <biblioentry xml:id="biblio-newcomeunix">
     <biblioset relation="article">
-      <citetitle pubwork="book"><ulink url="http://unixhelp.ed.ac.uk/">Online
-	Guide for newcomers to the UNIX environment</ulink></citetitle>
+      <citetitle pubwork="book"><link xlink:href="http://unixhelp.ed.ac.uk/">Online
+	Guide for newcomers to the UNIX environment</link></citetitle>
       <publisher>
-	<publishername><ulink url="http://www.ed.ac.uk/">Edinburgh
-	  University</ulink></publishername>
+	<publishername><link xlink:href="http://www.ed.ac.uk/">Edinburgh
+	  University</link></publishername>
       </publisher>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-dnsandbind">
+  <biblioentry xml:id="biblio-dnsandbind">
     <biblioset relation="book">
-      <title>DNS and BIND</title>
+      <citetitle>DNS and BIND</citetitle>
       <publisher>
 	<publishername>O'Reilly &amp; Associates, Inc</publishername>
       </publisher>
-      <isbn>ISBN 1-56592-512-2</isbn>
+      <biblioid class="isbn">ISBN 1-56592-512-2</biblioid>
       <authorgroup>
-	<author>
-	  <firstname>Paul Albitz</firstname>
-	  <surname>Albitz</surname>
-	</author>
-	<author>
-	  <firstname>Cricket</firstname>
-	  <surname>Liu</surname>
-	</author>
+	<author><personname><firstname>Paul Albitz</firstname><surname>Albitz</surname></personname></author>
+	<author><personname><firstname>Cricket</firstname><surname>Liu</surname></personname></author>
       </authorgroup>
       <pubdate>1998</pubdate>
       <edition>3e editie</edition>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-sendmail">
+  <biblioentry xml:id="biblio-sendmail">
     <biblioset relation="book">
-      <title>Sendmail</title>
+      <citetitle>Sendmail</citetitle>
       <publisher>
 	<publishername>O'Reilly &amp; Associates, Inc</publishername>
       </publisher>
       <pubdate>1997</pubdate>
       <edition>2e editie</edition>
-      <author>
-	<firstname>Brian</firstname>
-	<surname>Costales</surname>
-      </author>
-      <isbn>ISBN 1-56592-222-0</isbn>
+      <author><personname><firstname>Brian</firstname><surname>Costales</surname></personname></author>
+      <biblioid class="isbn">ISBN 1-56592-222-0</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-esssysadmin">
+  <biblioentry xml:id="biblio-esssysadmin">
     <biblioset relation="book">
-      <title>Essential System Administration</title>
-      <author>
-	<firstname>&AElig;leen</firstname>
-	<surname>Frisch</surname>
-      </author>
+      <citetitle>Essential System Administration</citetitle>
+      <author><personname><firstname>&AElig;leen</firstname><surname>Frisch</surname></personname></author>
       <edition>2e editie</edition>
       <publisher>
 	<publishername>O'Reilly &amp; Associates</publishername>
       </publisher>
       <pubdate>1995</pubdate>
-      <isbn>ISBN 1-56592-127-5</isbn>
+      <biblioid class="isbn">ISBN 1-56592-127-5</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-tcpipnetworkadministration">
+  <biblioentry xml:id="biblio-tcpipnetworkadministration">
     <biblioset relation="book">
-      <title>TCP/IP Network Administration</title>
-      <author>
-	<firstname>Craig</firstname>
-	<surname>Hunt</surname>
-      </author>
+      <citetitle>TCP/IP Network Administration</citetitle>
+      <author><personname><firstname>Craig</firstname><surname>Hunt</surname></personname></author>
       <edition>2e editie</edition>
       <publisher>
 	<publishername>O'Reilly &amp; Associates, Inc</publishername>
       </publisher>
       <pubdate>1997</pubdate>
-      <isbn>ISBN 1-56592-322-7</isbn>
+      <biblioid class="isbn">ISBN 1-56592-322-7</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-managingnfsandnis">
+  <biblioentry xml:id="biblio-managingnfsandnis">
     <biblioset relation="book">
-      <title>Managing NFS and NIS</title>
-      <author>
-	<firstname>Hal</firstname>
-	<surname>Stern</surname>
-      </author>
+      <citetitle>Managing NFS and NIS</citetitle>
+      <author><personname><firstname>Hal</firstname><surname>Stern</surname></personname></author>
       <publisher>
 	<publishername>O'Reilly &amp; Associates, Inc</publishername>
       </publisher>
       <pubdate>1991</pubdate>
-      <isbn>ISBN 0-937175-75-7</isbn>
+      <biblioid class="isbn">ISBN 0-937175-75-7</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-jpmanprojectjfug">
+  <biblioentry xml:id="biblio-jpmanprojectjfug">
     <biblioset relation="book">
-      <citetitle pubwork="book"><ulink
-	  url="http://www.pc.mycom.co.jp/FreeBSD/sam.html">&os; System
-	Administration's Manual</ulink></citetitle>
-      <corpauthor><ulink url="http://www.jp.FreeBSD.org">Jpman Project, Japan
-	&os; Users Group</ulink></corpauthor>
+      <citetitle pubwork="book"><link xlink:href="http://www.pc.mycom.co.jp/FreeBSD/sam.html">&os; System
+	Administration's Manual</link></citetitle>
+      <author><orgname><link xlink:href="http://www.jp.FreeBSD.org">Jpman Project, Japan
+	&os; Users Group</link></orgname></author>
       <publisher>
-	<publishername><ulink url="http://www.pc.mycom.co.jp/">Mainichi
-	  Communications Inc.</ulink></publishername>
+	<publishername><link xlink:href="http://www.pc.mycom.co.jp/">Mainichi
+	  Communications Inc.</link></publishername>
       </publisher>
       <pubdate>1998</pubdate>
-      <isbn>ISBN 4-8399-0109-0 P3300E</isbn>
+      <biblioid class="isbn">ISBN 4-8399-0109-0 P3300E</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-xwinsystoolkit">
+  <biblioentry xml:id="biblio-xwinsystoolkit">
     <biblioset relation="book">
-      <title>X Window System Toolkit</title>
+      <citetitle>X Window System Toolkit</citetitle>
       <publisher>
 	<publishername>Digital Press</publishername>
       </publisher>
-      <author>
-	<firstname>Paul</firstname>
-	<surname>Asente</surname>
-      </author>
-      <isbn>ISBN 1-55558-051-3</isbn>
+      <author><personname><firstname>Paul</firstname><surname>Asente</surname></personname></author>
+      <biblioid class="isbn">ISBN 1-55558-051-3</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-carefman">
+  <biblioentry xml:id="biblio-carefman">
     <biblioset relation="book">
-      <title>C: A Reference Manual</title>
+      <citetitle>C: A Reference Manual</citetitle>
       <publisher>
 	<publishername>Prentice Hall</publishername>
       </publisher>
       <pubdate>1995</pubdate>
       <edition>4e editie</edition>
       <authorgroup>
-	<author>
-	  <firstname>Samuel P.</firstname>
-	  <surname>Harbison</surname>
-	</author>
-	<author>
-	  <firstname>Guy L. Jr.</firstname>
-	  <surname>Steele</surname>
-	</author>
+	<author><personname><firstname>Samuel P.</firstname><surname>Harbison</surname></personname></author>
+	<author><personname><firstname>Guy L. Jr.</firstname><surname>Steele</surname></personname></author>
       </authorgroup>
-      <isbn>ISBN 0-13-326224-3</isbn>
+      <biblioid class="isbn">ISBN 0-13-326224-3</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-thecproglang">
+  <biblioentry xml:id="biblio-thecproglang">
     <biblioset relation="book">
-      <title>The C Programming Language</title>
+      <citetitle>The C Programming Language</citetitle>
       <publisher>
 	<publishername>Prentice Hall</publishername>
       </publisher>
       <pubdate>1998</pubdate>
       <authorgroup>
-	<author>
-	  <firstname>Brian</firstname>
-	  <surname>Kernighan</surname>
-	</author>
-	<author>
-	  <firstname>Dennis</firstname>
-	  <surname>Ritchie</surname>
-	</author>
+	<author><personname><firstname>Brian</firstname><surname>Kernighan</surname></personname></author>
+	<author><personname><firstname>Dennis</firstname><surname>Ritchie</surname></personname></author>
       </authorgroup>
-      <isbn>ISBN 0-13-110362-9</isbn>
+      <biblioid class="isbn">ISBN 0-13-110362-9</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-portingunixsoft">
+  <biblioentry xml:id="biblio-portingunixsoft">
     <biblioset relation="book">
-      <title>Porting UNIX Software</title>
-      <author>
-	<firstname>Greg</firstname>
-	<surname>Lehey</surname>
-      </author>
+      <citetitle>Porting UNIX Software</citetitle>
+      <author><personname><firstname>Greg</firstname><surname>Lehey</surname></personname></author>
       <publisher>
 	<publishername>O'Reilly &amp; Associates, Inc.</publishername>
       </publisher>
       <pubdate>1995</pubdate>
-      <isbn>ISBN 1-56592-126-7</isbn>
+      <biblioid class="isbn">ISBN 1-56592-126-7</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-thestandardclibrary">
+  <biblioentry xml:id="biblio-thestandardclibrary">
     <biblioset relation="book">
-      <title>The Standard C Library</title>
+      <citetitle>The Standard C Library</citetitle>
       <publisher>
 	<publishername>Prentice Hall</publishername>
       </publisher>
       <pubdate>1992</pubdate>
-      <author>
-	<firstname>P. J.</firstname>
-	<surname>Plauger</surname>
-      </author>
-      <isbn>ISBN 0-13-131509-9</isbn>
+      <author><personname><firstname>P. J.</firstname><surname>Plauger</surname></personname></author>
+      <biblioid class="isbn">ISBN 0-13-131509-9</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-advprogintheunixenv">
+  <biblioentry xml:id="biblio-advprogintheunixenv">
     <biblioset relation="book">
-      <title>Advanced Programming in the UNIX Environment</title>
+      <citetitle>Advanced Programming in the UNIX Environment</citetitle>
       <publisher>
 	<publishername>Addison-Wesley</publishername>
       </publisher>
       <pubdate>1992</pubdate>
-      <author>
-	<firstname>W. Richard</firstname>
-	<surname>Stevens</surname>
-      </author>
-      <isbn>ISBN 0-201-56317-7</isbn>
+      <author><personname><firstname>W. Richard</firstname><surname>Stevens</surname></personname></author>
+      <biblioid class="isbn">ISBN 0-201-56317-7</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-unixnetprog">
+  <biblioentry xml:id="biblio-unixnetprog">
     <biblioset relation="book">
-      <title>UNIX Network Programming</title>
-      <author>
-	<firstname>W. Richard</firstname>
-	<surname>Stevens</surname>
-      </author>
+      <citetitle>UNIX Network Programming</citetitle>
+      <author><personname><firstname>W. Richard</firstname><surname>Stevens</surname></personname></author>
       <publisher>
 	<publishername>Prentice Hall</publishername>
       </publisher>
       <pubdate>1998</pubdate>
       <edition>2e editie</edition>
-      <isbn>ISBN 0-13-490012-X</isbn>
+      <biblioid class="isbn">ISBN 0-13-490012-X</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-writeserialdriverforunix">
+  <biblioentry xml:id="biblio-writeserialdriverforunix">
     <biblioset relation="book">
-      <title>Writing Serial Drivers for UNIX</title>
-      <author>
-	<firstname>Bill</firstname>
-	<surname>Wells</surname>
-      </author>
+      <citetitle>Writing Serial Drivers for UNIX</citetitle>
+      <author><personname><firstname>Bill</firstname><surname>Wells</surname></personname></author>
       <pubdate>december 1994</pubdate>
       <publisher>
 	<publishername>Dr. Dobb's Journal</publishername>
@@ -733,28 +592,22 @@
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-unixsysarch">
+  <biblioentry xml:id="biblio-unixsysarch">
     <biblioset relation="book">
-      <title>UNIX System Architecture</title>
+      <citetitle>UNIX System Architecture</citetitle>
       <publisher>
 	<publishername>Prentice-Hall, Inc</publishername>
       </publisher>
       <pubdate>1990</pubdate>
-      <author>
-	<firstname>Prabhat K.</firstname>
-	<surname>Andleigh</surname>
-      </author>
-      <isbn>ISBN 0-13-949843-5</isbn>
+      <author><personname><firstname>Prabhat K.</firstname><surname>Andleigh</surname></personname></author>
+      <biblioid class="isbn">ISBN 0-13-949843-5</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-portingunixtothe386">
+  <biblioentry xml:id="biblio-portingunixtothe386">
     <biblioset relation="book">
-      <title>Porting UNIX to the 386</title>
-      <author>
-	<firstname>William</firstname>
-	<surname>Jolitz</surname>
-      </author>
+      <citetitle>Porting UNIX to the 386</citetitle>
+      <author><personname><firstname>William</firstname><surname>Jolitz</surname></personname></author>
       <publisher>
 	<publishername>Dr. Dobb's Journal</publishername>
       </publisher>
@@ -762,371 +615,288 @@
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-tcpipillv1theprotocols">
+  <biblioentry xml:id="biblio-tcpipillv1theprotocols">
     <biblioset relation="book">
-      <title>TCP/IP Illustrated, Volume 1: The Protocols</title>
-      <author>
-	<firstname>W. Richard</firstname>
-	<surname>Stevens</surname>
-      </author>
+      <citetitle>TCP/IP Illustrated, Volume 1: The Protocols</citetitle>
+      <author><personname><firstname>W. Richard</firstname><surname>Stevens</surname></personname></author>
       <publisher>
 	<publishername>Addison-Wesley</publishername>
       </publisher>
       <pubdate>1996</pubdate>
-      <isbn>ISBN 0-201-63346-9</isbn>
+      <biblioid class="isbn">ISBN 0-201-63346-9</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-unixsysformodrnarch">
+  <biblioentry xml:id="biblio-unixsysformodrnarch">
     <biblioset relation="book">
-      <title>Unix Systems for Modern Architectures</title>
+      <citetitle>Unix Systems for Modern Architectures</citetitle>
       <publisher>
 	<publishername>Addison-Wesley</publishername>
       </publisher>
-      <author>
-	<firstname>Curt</firstname>
-	<surname>Schimmel</surname>
-      </author>
+      <author><personname><firstname>Curt</firstname><surname>Schimmel</surname></personname></author>
       <pubdate>1994</pubdate>
-      <isbn>ISBN 0-201-63338-8</isbn>
+      <biblioid class="isbn">ISBN 0-201-63338-8</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-tcpipillvol3">
+  <biblioentry xml:id="biblio-tcpipillvol3">
     <biblioset relation="book">
-      <title>TCP/IP Illustrated, Volume 3: TCP for Transactions, HTTP, NNTP and
-	the UNIX Domain Protocols</title>
+      <citetitle>TCP/IP Illustrated, Volume 3: TCP for Transactions, HTTP, NNTP and
+	the UNIX Domain Protocols</citetitle>
       <publisher>
 	<publishername>Addison-Wesley</publishername>
       </publisher>
       <pubdate>1996</pubdate>
-      <author>
-	<firstname>W. Richard</firstname>
-	<surname>Stevens</surname>
-      </author>
-      <isbn>ISBN 0-201-63495-3</isbn>
+      <author><personname><firstname>W. Richard</firstname><surname>Stevens</surname></personname></author>
+      <biblioid class="isbn">ISBN 0-201-63495-3</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-unixinternthenewfrontiers">
+  <biblioentry xml:id="biblio-unixinternthenewfrontiers">
     <biblioset relation="book">
-      <title>UNIX Internals &mdash; The New Frontiers</title>
-      <author>
-	<firstname>Uresh</firstname>
-	<surname>Vahalia</surname>
-      </author>
+      <citetitle>UNIX Internals &mdash; The New Frontiers</citetitle>
+      <author><personname><firstname>Uresh</firstname><surname>Vahalia</surname></personname></author>
       <publisher>
 	<publishername>Prentice Hall</publishername>
       </publisher>
       <pubdate>1996</pubdate>
-      <isbn>ISBN 0-13-101908-2</isbn>
+      <biblioid class="isbn">ISBN 0-13-101908-2</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-tcpipillvol2theimplementation">
+  <biblioentry xml:id="biblio-tcpipillvol2theimplementation">
     <biblioset relation="book">
-      <title>TCP/IP Illustrated, Volume 2: The Implementation</title>
+      <citetitle>TCP/IP Illustrated, Volume 2: The Implementation</citetitle>
       <authorgroup>
-	<author>
-	  <firstname>Gary R.</firstname>
-	  <surname>Wright</surname>
-	</author>
-	<author>
-	  <firstname>W. Richard</firstname>
-	  <surname>Stevens</surname>
-	</author>
+	<author><personname><firstname>Gary R.</firstname><surname>Wright</surname></personname></author>
+	<author><personname><firstname>W. Richard</firstname><surname>Stevens</surname></personname></author>
       </authorgroup>
       <pubdate>1995</pubdate>
       <publisher>
 	<publishername>Addison-Wesley</publishername>
       </publisher>
-      <isbn>ISBN 0-201-63354-X</isbn>
+      <biblioid class="isbn">ISBN 0-201-63354-X</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-firewallsandinternetsecurity">
+  <biblioentry xml:id="biblio-firewallsandinternetsecurity">
     <biblioset relation="book">
-      <title>Firewalls and Internet Security: Repelling the Wily Hacker</title>
+      <citetitle>Firewalls and Internet Security: Repelling the Wily Hacker</citetitle>
       <authorgroup>
-	<author>
-	  <firstname>William R.</firstname>
-	  <surname>CHeswick</surname>
-	</author>
-	<author>
-	  <firstname>Steven M.</firstname>
-	  <surname>Bellovin</surname>
-	</author>
+	<author><personname><firstname>William R.</firstname><surname>CHeswick</surname></personname></author>
+	<author><personname><firstname>Steven M.</firstname><surname>Bellovin</surname></personname></author>
       </authorgroup>
       <publisher>
 	<publishername>Addison-Wesley</publishername>
       </publisher>
       <pubdate>1995</pubdate>
-      <isbn>ISBN 0-201-63357-4</isbn>
+      <biblioid class="isbn">ISBN 0-201-63357-4</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-practicalunixsecurity">
+  <biblioentry xml:id="biblio-practicalunixsecurity">
     <biblioset relation="book">
-      <title>Practical UNIX Security</title>
+      <citetitle>Practical UNIX Security</citetitle>
       <authorgroup>
-	<author>
-	  <firstname>Simson</firstname>
-	  <surname>Garfinkel</surname>
-	</author>
-	<author>
-	  <firstname>Gene</firstname>
-	  <surname>Spafford</surname>
-	</author>
+	<author><personname><firstname>Simson</firstname><surname>Garfinkel</surname></personname></author>
+	<author><personname><firstname>Gene</firstname><surname>Spafford</surname></personname></author>
       </authorgroup>
       <pubdate>1996</pubdate>
       <edition>2e editie</edition>
       <publisher>
 	<publishername>O'Reilly &amp; Associates, Inc</publishername>
       </publisher>
-      <isbn>ISBN 1-56592-148-8</isbn>
+      <biblioid class="isbn">ISBN 1-56592-148-8</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-pgpprettygoodprivacy">
+  <biblioentry xml:id="biblio-pgpprettygoodprivacy">
     <biblioset relation="book">
-      <title>PGP Pretty Good Privacy</title>
-      <author>
-	<firstname>Simson</firstname>
-	<surname>Garfinkel</surname>
-      </author>
+      <citetitle>PGP Pretty Good Privacy</citetitle>
+      <author><personname><firstname>Simson</firstname><surname>Garfinkel</surname></personname></author>
       <publisher>
 	<publishername>O'Reilly &amp; Associates, Inc</publishername>
       </publisher>
       <pubdate>1995</pubdate>
-      <isbn>ISBN 1-56592-098-8</isbn>
+      <biblioid class="isbn">ISBN 1-56592-098-8</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-pentiumprocarch">
+  <biblioentry xml:id="biblio-pentiumprocarch">
     <biblioset relation="book">
-      <title>Pentium Processor System Architecture</title>
+      <citetitle>Pentium Processor System Architecture</citetitle>
       <authorgroup>
-	<author>
-	  <firstname>Don</firstname>
-	  <surname>Anderson</surname>
-	</author>
-	<author>
-	  <firstname>Tom</firstname>
-	  <surname>Shanley</surname>
-	</author>
+	<author><personname><firstname>Don</firstname><surname>Anderson</surname></personname></author>
+	<author><personname><firstname>Tom</firstname><surname>Shanley</surname></personname></author>
       </authorgroup>
       <publisher>
 	<publishername>Addison-Wesley</publishername>
       </publisher>
       <pubdate>1995</pubdate>
       <edition>2e editie</edition>
-      <isbn>ISBN 0-201-40992-5</isbn>
+      <biblioid class="isbn">ISBN 0-201-40992-5</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-progguidetothesvgacards">
+  <biblioentry xml:id="biblio-progguidetothesvgacards">
     <biblioset relation="book">
-      <title>Programmer's Guide to the EGA, VGA, and Super VGA Cards</title>
-      <author>
-	<firstname>Richard F.</firstname>
-	<surname>Ferraro</surname>
-      </author>
+      <citetitle>Programmer's Guide to the EGA, VGA, and Super VGA Cards</citetitle>
+      <author><personname><firstname>Richard F.</firstname><surname>Ferraro</surname></personname></author>
       <edition>3e editie</edition>
       <publisher>
 	<publishername>Addison-Wesley</publishername>
       </publisher>
       <pubdate>1995</pubdate>
-      <isbn>ISBN 0-201-62490-7</isbn>
+      <biblioid class="isbn">ISBN 0-201-62490-7</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-80486">
+  <biblioentry xml:id="biblio-80486">
     <biblioset relation="book">
-      <title>80486 System Architecture</title>
-      <author>
-	<firstname>Tom</firstname>
-	<surname>Shanley</surname>
-      </author>
+      <citetitle>80486 System Architecture</citetitle>
+      <author><personname><firstname>Tom</firstname><surname>Shanley</surname></personname></author>
       <publisher>
 	<publishername>Addison-Wesley</publishername>
       </publisher>
       <pubdate>1995</pubdate>
       <edition>3e editie</edition>
-      <isbn>ISBN 0-201-40994-1</isbn>
+      <biblioid class="isbn">ISBN 0-201-40994-1</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-isasysarch">
+  <biblioentry xml:id="biblio-isasysarch">
     <biblioset relation="book">
-      <title>ISA System Architecture</title>
-      <author>
-	<firstname>Tom</firstname>
-	<surname>Shanley</surname>
-      </author>
+      <citetitle>ISA System Architecture</citetitle>
+      <author><personname><firstname>Tom</firstname><surname>Shanley</surname></personname></author>
       <publisher>
 	<publishername>Addison-Wesley</publishername>
       </publisher>
       <edition>3e editie</edition>
       <pubdate>1995</pubdate>
-      <isbn>ISBN 0-201-40996-8</isbn>
+      <biblioid class="isbn">ISBN 0-201-40996-8</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-pcisysarch">
+  <biblioentry xml:id="biblio-pcisysarch">
     <biblioset relation="book">
-      <title>PCI System Architecture</title>
-      <author>
-	<firstname>Tom</firstname>
-	<surname>Shanley</surname>
-      </author>
+      <citetitle>PCI System Architecture</citetitle>
+      <author><personname><firstname>Tom</firstname><surname>Shanley</surname></personname></author>
       <publisher>
 	<publishername>Addison-Wesley</publishername>
       </publisher>
       <pubdate>1995</pubdate>
       <edition>3e editie</edition>
-      <isbn>ISBN 0-201-40993-3</isbn>
+      <biblioid class="isbn">ISBN 0-201-40993-3</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-theundocumentedpc">
+  <biblioentry xml:id="biblio-theundocumentedpc">
     <biblioset relation="book">
-      <title>The Undocumented PC</title>
-      <author>
-	<firstname>Frank</firstname>
-	<surname>Van Gilluwe</surname>
-      </author>
+      <citetitle>The Undocumented PC</citetitle>
+      <author><personname><firstname>Frank</firstname><surname>Van Gilluwe</surname></personname></author>
       <publisher>
 	<publishername>Addison-Wesley</publishername>
       </publisher>
       <pubdate>1994</pubdate>
-      <isbn>ISBN 0-201-62277-7</isbn>
+      <biblioid class="isbn">ISBN 0-201-62277-7</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-bellsystemtechnicaljournal">
+  <biblioentry xml:id="biblio-bellsystemtechnicaljournal">
     <biblioset relation="book">
-      <title>Bell System Technical Journal, Unix Time-Sharing System</title>
+      <citetitle>Bell System Technical Journal, Unix Time-Sharing System</citetitle>
       <publisher>
 	<publishername>American Telephone &amp; Telegraph Company</publishername>
       </publisher>
       <pubdate>July-August 1978</pubdate>
       <edition>Vol 57, No 6, Deel 2</edition>
-      <isbn>ISSN0005-8580</isbn>
+      <biblioid class="isbn">ISSN0005-8580</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-commentaryonunix">
+  <biblioentry xml:id="biblio-commentaryonunix">
     <biblioset relation="book">
-      <title>Lion's Commentary on UNIX</title>
-      <author>
-	<firstname>John</firstname>
-	<surname>Lion</surname>
-      </author>
+      <citetitle>Lion's Commentary on UNIX</citetitle>
+      <author><personname><firstname>John</firstname><surname>Lion</surname></personname></author>
       <publisher>
 	<publishername>ITP Media Group</publishername>
       </publisher>
       <pubdate>1996</pubdate>
       <edition>6e editie</edition>
-      <isbn>ISBN 1573980137</isbn>
+      <biblioid class="isbn">ISBN 1573980137</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-newhackerdict">
+  <biblioentry xml:id="biblio-newhackerdict">
     <biblioset relation="book">
-      <title>The New Hacker's Dictionary</title>
-      <author>
-	<firstname>Eric S.</firstname>
-	<surname>Raymond</surname>
-      </author>
+      <citetitle>The New Hacker's Dictionary</citetitle>
+      <author><personname><firstname>Eric S.</firstname><surname>Raymond</surname></personname></author>
       <publisher>
 	<publishername>MIT Press</publishername>
       </publisher>
       <pubdate>1996</pubdate>
       <edition>3e editie</edition>
-      <isbn>ISBN 0-262-68092-0</isbn>
+      <biblioid class="isbn">ISBN 0-262-68092-0</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-aqtrcentofunix">
+  <biblioentry xml:id="biblio-aqtrcentofunix">
     <biblioset relation="book">
-      <title>A quarter century of UNIX</title>
-      <author>
-	<firstname>Peter H.</firstname>
-	<surname>Salus</surname>
-      </author>
+      <citetitle>A quarter century of UNIX</citetitle>
+      <author><personname><firstname>Peter H.</firstname><surname>Salus</surname></personname></author>
       <publisher>
 	<publishername>Addison-Wesley</publishername>
       </publisher>
       <pubdate>1994</pubdate>
-      <isbn>ISBN 0-201-54777-5</isbn>
+      <biblioid class="isbn">ISBN 0-201-54777-5</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-unixhatershandbook">
+  <biblioentry xml:id="biblio-unixhatershandbook">
     <biblioset relation="book">
-      <title>The UNIX-HATERS Handbook</title>
+      <citetitle>The UNIX-HATERS Handbook</citetitle>
       <authorgroup>
-	<author>
-	  <firstname>Steven</firstname>
-	  <surname>Strassman</surname>
-	</author>
-	<author>
-	  <firstname>Daniel</firstname>
-	  <surname>Weise</surname>
-	</author>
-	<author>
-	  <firstname>Simon</firstname>
-	  <surname>Garfinkel</surname>
-	</author>
+	<author><personname><firstname>Steven</firstname><surname>Strassman</surname></personname></author>
+	<author><personname><firstname>Daniel</firstname><surname>Weise</surname></personname></author>
+	<author><personname><firstname>Simon</firstname><surname>Garfinkel</surname></personname></author>
       </authorgroup>
       <publisher>
 	<publishername>IDG Books Worldwide, Inc</publishername>
       </publisher>
       <pubdate>1994</pubdate>
-      <isbn>ISBN 1-56884-203-1</isbn>
+      <biblioid class="isbn">ISBN 1-56884-203-1</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-lifewithunix">
+  <biblioentry xml:id="biblio-lifewithunix">
     <biblioset relation="book">
-      <title>Life with UNIX &mdash; special edition</title>
+      <citetitle>Life with UNIX &mdash; special edition</citetitle>
       <authorgroup>
-	<author>
-	  <firstname>Don</firstname>
-	  <surname>Libes</surname>
-	</author>
-	<author>
-	  <firstname>Sandy</firstname>
-	  <surname>Ressler</surname>
-	</author>
+	<author><personname><firstname>Don</firstname><surname>Libes</surname></personname></author>
+	<author><personname><firstname>Sandy</firstname><surname>Ressler</surname></personname></author>
       </authorgroup>
       <publisher>
 	<publishername>Prentice-Hall</publishername>
       </publisher>
       <pubdate>1989</pubdate>
-      <isbn>ISBN 0-13-536657-7</isbn>
+      <biblioid class="isbn">ISBN 0-13-536657-7</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-bsdfamilytree">
+  <biblioentry xml:id="biblio-bsdfamilytree">
     <biblioset relation="book">
       <citetitle pubwork="book">
-	<ulink
-	  url="http://svnweb.FreeBSD.org/base/head/share/misc/bsd-family-tree?view=co">
-	  The BSD Family Tree</ulink></citetitle>
+	<link xlink:href="http://svnweb.FreeBSD.org/base/head/share/misc/bsd-family-tree?view=co">
+	  The BSD Family Tree</link></citetitle>
       <pubdate>1997</pubdate>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="absolutebsd">
+  <biblioentry xml:id="absolutebsd">
     <biblioset relation="book">
-      <title>Absolute BSD</title>
+      <citetitle>Absolute BSD</citetitle>
 
-      <author>
-	<firstname>Michael</firstname>
-
-	<surname>Lucas</surname>
-      </author>
+      <author><personname><firstname>Michael</firstname><surname>Lucas</surname></personname></author>
 
       <publisher>
 	<publishername>No Starch Press</publishername>
@@ -1134,28 +904,28 @@
 
       <pubdate>juni 2002</pubdate>
 
-      <isbn>ISBN 1-886411-74-3</isbn>
+      <biblioid class="isbn">ISBN 1-886411-74-3</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-ccppusersjournal">
+  <biblioentry xml:id="biblio-ccppusersjournal">
     <biblioset relation="magazine">
-      <title>The C/C++ Users Journal</title>
+      <citetitle>The C/C++ Users Journal</citetitle>
       <publisher>
 	<publishername>R&amp;D Publications Inc.</publishername>
       </publisher>
-      <issn>ISSN 1075-2838</issn>
+      <biblioid class="issn">ISSN 1075-2838</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-sysadminthejournalforunixsysadmins">
+  <biblioentry xml:id="biblio-sysadminthejournalforunixsysadmins">
     <biblioset relation="magazine">
-      <title>Sys Admin &mdash; The Journal for UNIX System
-	Administrators</title>
+      <citetitle>Sys Admin &mdash; The Journal for UNIX System
+	Administrators</citetitle>
       <publisher>
 	<publishername>Miller Freeman, Inc</publishername>
       </publisher>
-      <issn>ISSN 1061-2688</issn>
+      <biblioid class="issn">ISSN 1061-2688</biblioid>
     </biblioset>
   </biblioentry>
 </bibliography>
diff --git a/share/xml/bibliography.xml b/share/xml/bibliography.xml
index 140202702a..eb2b8af324 100644
--- a/share/xml/bibliography.xml
+++ b/share/xml/bibliography.xml
@@ -2,23 +2,16 @@
 <!--
   $FreeBSD$
 -->
-
-<bibliography id="bibliography">
+<bibliography xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="bibliography">
   <title>Bibliography</title>
 
-  <biblioentry id="biblio-unleashed">
+  <biblioentry xml:id="biblio-unleashed">
     <biblioset relation="book">
-      <title>FreeBSD Unleashed</title>
+      <citetitle>FreeBSD Unleashed</citetitle>
 
       <authorgroup>
-	<author>
-	  <firstname>Michael</firstname>
-	  <surname>Urban</surname>
-	</author>
-	<author>
-	  <firstname>Brian</firstname>
-	  <surname>Tiemann</surname>
-	</author>
+	<author><personname><firstname>Michael</firstname><surname>Urban</surname></personname></author>
+	<author><personname><firstname>Brian</firstname><surname>Tiemann</surname></personname></author>
       </authorgroup>
 
       <publisher>
@@ -31,16 +24,16 @@
 
       <pubdate>October 2001</pubdate>
 
-      <isbn>ISBN 0-67232-206-4</isbn>
+      <biblioid class="isbn">ISBN 0-67232-206-4</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-44sysman">
+  <biblioentry xml:id="biblio-44sysman">
     <biblioset relation="book">
-      <title>4.4BSD System Manager's Manual</title>
+      <citetitle>4.4BSD System Manager's Manual</citetitle>
 
-      <corpauthor>Computer Systems Research Group, University of
-	California, Berkeley</corpauthor>
+      <author><orgname>Computer Systems Research Group, University of
+	California, Berkeley</orgname></author>
 
       <publisher>
 	<publishername>O'Reilly and Associates</publishername>
@@ -52,16 +45,16 @@
 
       <pagenums>804 pages</pagenums>
 
-      <isbn>ISBN 1-56592-080-5</isbn>
+      <biblioid class="isbn">ISBN 1-56592-080-5</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-44userman">
+  <biblioentry xml:id="biblio-44userman">
     <biblioset relation="book">
-      <title>4.4BSD User's Reference Manual</title>
+      <citetitle>4.4BSD User's Reference Manual</citetitle>
 
-      <corpauthor>Computer Systems Research Group, University of
-	California, Berkeley</corpauthor>
+      <author><orgname>Computer Systems Research Group, University of
+	California, Berkeley</orgname></author>
 
       <publisher>
 	<publishername>O'Reilly and Associates</publishername>
@@ -73,16 +66,16 @@
 
       <pagenums>905 pages</pagenums>
 
-      <isbn>ISBN 1-56592-075-9</isbn>
+      <biblioid class="isbn">ISBN 1-56592-075-9</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-44suppman">
+  <biblioentry xml:id="biblio-44suppman">
     <biblioset relation="book">
-      <title>4.4BSD User's Supplementary Documents</title>
+      <citetitle>4.4BSD User's Supplementary Documents</citetitle>
 
-      <corpauthor>Computer Systems Research Group, University of
-	California, Berkeley</corpauthor>
+      <author><orgname>Computer Systems Research Group, University of
+	California, Berkeley</orgname></author>
 
       <publisher>
 	<publishername>O'Reilly and Associates</publishername>
@@ -94,16 +87,16 @@
 
       <pagenums>712 pages</pagenums>
 
-      <isbn>ISBN 1-56592-076-7</isbn>
+      <biblioid class="isbn">ISBN 1-56592-076-7</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-44progman">
+  <biblioentry xml:id="biblio-44progman">
     <biblioset relation="book">
-      <title>4.4BSD Programmer's Reference Manual</title>
+      <citetitle>4.4BSD Programmer's Reference Manual</citetitle>
 
-      <corpauthor>Computer Systems Research Group, University of
-	California, Berkeley</corpauthor>
+      <author><orgname>Computer Systems Research Group, University of
+	California, Berkeley</orgname></author>
 
       <publisher>
 	<publishername>O'Reilly and Associates</publishername>
@@ -115,16 +108,16 @@
 
       <pagenums>866 pages</pagenums>
 
-      <isbn>ISBN 1-56592-078-3</isbn>
+      <biblioid class="isbn">ISBN 1-56592-078-3</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-44progsupp">
+  <biblioentry xml:id="biblio-44progsupp">
     <biblioset relation="book">
-      <title>4.4BSD Programmer's Supplementary Documents</title>
+      <citetitle>4.4BSD Programmer's Supplementary Documents</citetitle>
 
-      <corpauthor>Computer Systems Research Group, University of
-	California, Berkeley</corpauthor>
+      <author><orgname>Computer Systems Research Group, University of
+	California, Berkeley</orgname></author>
 
       <publisher>
 	<publishername>O'Reilly and Associates</publishername>
@@ -136,44 +129,24 @@
 
       <pagenums>596 pages</pagenums>
 
-      <isbn>ISBN 1-56592-079-1</isbn>
+      <biblioid class="isbn">ISBN 1-56592-079-1</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-44kernel">
+  <biblioentry xml:id="biblio-44kernel">
     <biblioset relation="book">
-      <title>The Design and Implementation of the 4.4BSD Operating System</title>
+      <citetitle>The Design and Implementation of the 4.4BSD Operating System</citetitle>
 
       <authorgroup>
-	<author>
-	  <firstname>M. K.</firstname>
+	<author><personname><firstname>M. K.</firstname><surname>McKusick</surname></personname></author>
 
-	  <surname>McKusick</surname>
-	</author>
+	<author><personname><firstname>Kirk</firstname><surname>Marshall</surname></personname></author>
 
-	<author>
-	  <firstname>Kirk</firstname>
+	<author><personname><firstname>Keith</firstname><surname>Bostic</surname></personname></author>
 
-	  <surname>Marshall</surname>
-	</author>
+	<author><personname><firstname>Michael J</firstname><surname>Karels</surname></personname></author>
 
-	<author>
-	  <firstname>Keith</firstname>
-
-	  <surname>Bostic</surname>
-	</author>
-
-	<author>
-	  <firstname>Michael J</firstname>
-
-	  <surname>Karels</surname>
-	</author>
-
-	<author>
-	  <firstname>John</firstname>
-
-	  <surname>Quarterman</surname>
-	</author>
+	<author><personname><firstname>John</firstname><surname>Quarterman</surname></personname></author>
       </authorgroup>
 
       <publisher>
@@ -187,24 +160,18 @@
 
       <pubdate>1996</pubdate>
 
-      <isbn>ISBN 0-201-54979-4</isbn>
+      <biblioid class="isbn">ISBN 0-201-54979-4</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-freebsdkernel">
+  <biblioentry xml:id="biblio-freebsdkernel">
     <biblioset relation="book">
-      <title>The Design and Implementation of the FreeBSD Operating System</title>
+      <citetitle>The Design and Implementation of the FreeBSD Operating System</citetitle>
 
       <authorgroup>
-	<author>
-	  <firstname>M. K.</firstname>
-	  <surname>McKusick</surname>
-	</author>
+	<author><personname><firstname>M. K.</firstname><surname>McKusick</surname></personname></author>
 
-	<author>
-	  <firstname>George V.</firstname>
-	  <surname>Neville-Neil</surname>
-	</author>
+	<author><personname><firstname>George V.</firstname><surname>Neville-Neil</surname></personname></author>
       </authorgroup>
 
       <publisher>
@@ -216,44 +183,24 @@
       </publisher>
       <pubdate>2004</pubdate>
 
-      <isbn>ISBN 0-201-70245-2</isbn>
+      <biblioid class="isbn">ISBN 0-201-70245-2</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-nemeth3rd">
+  <biblioentry xml:id="biblio-nemeth3rd">
     <biblioset relation="book">
-      <title>Unix System Administration Handbook</title>
+      <citetitle>Unix System Administration Handbook</citetitle>
 
       <authorgroup>
-        <author>
-          <firstname>Evi</firstname>
+        <author><personname><firstname>Evi</firstname><surname>Nemeth</surname></personname></author>
 
-          <surname>Nemeth</surname>
-        </author>
+        <author><personname><firstname>Garth</firstname><surname>Snyder</surname></personname></author>
 
-        <author>
-          <firstname>Garth</firstname>
+        <author><personname><firstname>Scott</firstname><surname>Seebass</surname></personname></author>
 
-          <surname>Snyder</surname>
-        </author>
+        <author><personname><firstname>Trent R.</firstname><surname>Hein</surname></personname></author>
 
-        <author>
-          <firstname>Scott</firstname>
-
-          <surname>Seebass</surname>
-        </author>
-
-        <author>
-          <firstname>Trent R.</firstname>
-
-          <surname>Hein</surname>
-        </author>
-
-        <author>
-          <firstname>John</firstname>
-
-          <surname>Quarterman</surname>
-        </author>
+        <author><personname><firstname>John</firstname><surname>Quarterman</surname></personname></author>
       </authorgroup>
 
       <publisher>
@@ -264,19 +211,15 @@
 
       <pubdate>2000</pubdate>
 
-      <isbn>ISBN 0-13-020601-6</isbn>
+      <biblioid class="isbn">ISBN 0-13-020601-6</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="lehey3rd">
+  <biblioentry xml:id="lehey3rd">
     <biblioset relation="book">
-      <title>The Complete FreeBSD</title>
+      <citetitle>The Complete FreeBSD</citetitle>
 
-      <author>
-        <firstname>Greg</firstname>
-
-        <surname>Lehey</surname>
-      </author>
+      <author><personname><firstname>Greg</firstname><surname>Lehey</surname></personname></author>
 
       <publisher>
         <publishername>Walnut Creek</publishername>
@@ -288,47 +231,27 @@
 
       <pagenums>773 pages</pagenums>
 
-      <isbn>ISBN 1-57176-246-9</isbn>
+      <biblioid class="isbn">ISBN 1-57176-246-9</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-mckusick-1">
+  <biblioentry xml:id="biblio-mckusick-1">
     <abbrev>McKusick et al, 1994</abbrev>
 
     <biblioset relation="manual">
-      <title>Berkeley Software Architecture Manual, 4.4BSD
-        Edition</title>
+      <citetitle>Berkeley Software Architecture Manual, 4.4BSD
+        Edition</citetitle>
 
       <authorgroup>
-        <author>
-          <firstname>M. K.</firstname>
+        <author><personname><firstname>M. K.</firstname><surname>McKusick</surname></personname></author>
 
-          <surname>McKusick</surname>
-        </author>
+        <author><personname><firstname>M. J.</firstname><surname>Karels</surname></personname></author>
 
-        <author>
-          <firstname>M. J.</firstname>
+        <author><personname><firstname>S. J.</firstname><surname>Leffler</surname></personname></author>
 
-          <surname>Karels</surname>
-        </author>
+        <author><personname><firstname>W. N.</firstname><surname>Joy</surname></personname></author>
 
-        <author>
-          <firstname>S. J.</firstname>
-
-          <surname>Leffler</surname>
-        </author>
-
-        <author>
-          <firstname>W. N.</firstname>
-
-          <surname>Joy</surname>
-        </author>
-
-        <author>
-          <firstname>R. S.</firstname>
-
-          <surname>Faber</surname>
-        </author>
+        <author><personname><firstname>R. S.</firstname><surname>Faber</surname></personname></author>
       </authorgroup>
 
       <pagenums>5:1-42</pagenums>
@@ -338,385 +261,322 @@
 
 
 
-  <biblioentry id="biblio-ja-fbsdpc98">
+  <biblioentry xml:id="biblio-ja-fbsdpc98">
     <biblioset relation="book">
-      <title>FreeBSD for PC 98'ers (in Japanese)</title>
+      <citetitle>FreeBSD for PC 98'ers (in Japanese)</citetitle>
       <publisher>
         <publishername>SHUWA System Co, LTD.</publishername>
       </publisher>
-      <isbn>ISBN 4-87966-468-5 C3055 P2900E</isbn>
+      <biblioid class="isbn">ISBN 4-87966-468-5 C3055 P2900E</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-ja-fbsd">
+  <biblioentry xml:id="biblio-ja-fbsd">
     <biblioset relation="book">
-      <title>FreeBSD (in Japanese)</title>
+      <citetitle>FreeBSD (in Japanese)</citetitle>
       <publisher>
         <publishername>CUTT</publishername>
       </publisher>
-      <isbn>ISBN 4-906391-22-2</isbn>
+      <biblioid class="isbn">ISBN 4-906391-22-2</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-ja-compintro">
+  <biblioentry xml:id="biblio-ja-compintro">
     <biblioset relation="book">
-      <title>Complete Introduction to FreeBSD (in Japanese)</title>
+      <citetitle>Complete Introduction to FreeBSD (in Japanese)</citetitle>
       <publisher>
         <publishername>Shoeisha Co., Ltd</publishername>
       </publisher>
-      <isbn>ISBN 4-88135-473-6 P3600E</isbn>
+      <biblioid class="isbn">ISBN 4-88135-473-6 P3600E</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-ja-unixstarterkit">
+  <biblioentry xml:id="biblio-ja-unixstarterkit">
     <biblioset relation="book">
-      <title>Personal UNIX Starter Kit FreeBSD (in Japanese)</title>
+      <citetitle>Personal UNIX Starter Kit FreeBSD (in Japanese)</citetitle>
       <publisher>
         <publishername>ASCII</publishername>
       </publisher>
-      <isbn>ISBN 4-7561-1733-3 P3000E</isbn>
+      <biblioid class="isbn">ISBN 4-7561-1733-3 P3000E</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-ja-fbsdhb">
+  <biblioentry xml:id="biblio-ja-fbsdhb">
     <biblioset relation="book">
-      <title>FreeBSD Handbook (Japanese translation)</title>
+      <citetitle>FreeBSD Handbook (Japanese translation)</citetitle>
       <publisher>
         <publishername>ASCII</publishername>
       </publisher>
-      <isbn>ISBN 4-7561-1580-2 P3800E</isbn>
+      <biblioid class="isbn">ISBN 4-7561-1580-2 P3800E</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-ge-fbsdmitmeth">
+  <biblioentry xml:id="biblio-ge-fbsdmitmeth">
     <biblioset relation="book">
-      <title>FreeBSD mit Methode (in German)</title>
+      <citetitle>FreeBSD mit Methode (in German)</citetitle>
       <publisher>
         <publishername>Computer und Literature Verlag/Vertrieb Hanser</publishername>
       </publisher>
       <pubdate>1998</pubdate>
-      <isbn>ISBN 3-932311-31-0</isbn>
+      <biblioid class="isbn">ISBN 3-932311-31-0</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-ja-fbsdinstandutil">
+  <biblioentry xml:id="biblio-ja-fbsdinstandutil">
     <biblioset relation="book">
-      <title>FreeBSD install and Utilization Manual (in Japanese)</title>
+      <citetitle>FreeBSD install and Utilization Manual (in Japanese)</citetitle>
       <publisher>
         <publishername>Mainichi Communications Inc.</publishername>
       </publisher>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-indo-intserv">
+  <biblioentry xml:id="biblio-indo-intserv">
     <biblioset relation="book">
-      <title>Building Internet Server with FreeBSD (in Indonesia Language)</title>
+      <citetitle>Building Internet Server with FreeBSD (in Indonesia Language)</citetitle>
       <publisher>
         <publishername>Elex Media Komputindo</publishername>
       </publisher>
       <authorgroup>
-      <author>
-        <firstname>Onno W</firstname>
-        <surname>Purbo</surname>
-      </author>
-      <author>
-        <firstname>Dodi</firstname>
-        <surname>Maryanto</surname>
-      </author>
-      <author>
-        <firstname>Syahrial</firstname>
-        <surname>Hubbany</surname>
-      </author>
-      <author>
-        <firstname>Widjil</firstname>
-        <surname>Widodo</surname>
-      </author>
+      <author><personname><firstname>Onno W</firstname><surname>Purbo</surname></personname></author>
+      <author><personname><firstname>Dodi</firstname><surname>Maryanto</surname></personname></author>
+      <author><personname><firstname>Syahrial</firstname><surname>Hubbany</surname></personname></author>
+      <author><personname><firstname>Widjil</firstname><surname>Widodo</surname></personname></author>
       </authorgroup>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-fbsdcorpnetguide">
+  <biblioentry xml:id="biblio-fbsdcorpnetguide">
     <biblioset relation="book">
-      <title>The FreeBSD Corporate Networker's Guide</title>
+      <citetitle>The FreeBSD Corporate Networker's Guide</citetitle>
       <publisher>
         <publishername>Addison-Wesley</publishername>
       </publisher>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-unixnutshell">
+  <biblioentry xml:id="biblio-unixnutshell">
     <biblioset relation="book">
-      <title>UNIX in a Nutshell</title>
+      <citetitle>UNIX in a Nutshell</citetitle>
       <publisher>
         <publishername>O'Reilly &amp; Associates, Inc.</publishername>
       </publisher>
       <pubdate>1990</pubdate>
-      <isbn>ISBN 093717520X</isbn>
+      <biblioid class="isbn">ISBN 093717520X</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-cantfindadmin">
+  <biblioentry xml:id="biblio-cantfindadmin">
     <biblioset relation="book">
-      <title>What You Need To Know When You Can't Find Your Unix System Administrator</title>
+      <citetitle>What You Need To Know When You Can't Find Your Unix System Administrator</citetitle>
       <publisher>
         <publishername>O'Reilly &amp; Associates, Inc.</publishername>
       </publisher>
       <pubdate>1995</pubdate>
-      <author>
-        <firstname>Linda</firstname>
-        <surname>Mui</surname>
-      </author>
-      <isbn>ISBN 1-56592-104-6</isbn>
+      <author><personname><firstname>Linda</firstname><surname>Mui</surname></personname></author>
+      <biblioid class="isbn">ISBN 1-56592-104-6</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-ja-fbsdusrrefman">
+  <biblioentry xml:id="biblio-ja-fbsdusrrefman">
     <biblioset relation="book">
-      <title>FreeBSD User's Reference Manual (Japanese translation)</title>
+      <citetitle>FreeBSD User's Reference Manual (Japanese translation)</citetitle>
       <publisher>
         <publishername>Mainichi Communications Inc.</publishername>
       </publisher>
-      <corpauthor>Jpman Project, Japan FreeBSD Users Group</corpauthor>
+      <author><orgname>Jpman Project, Japan FreeBSD Users Group</orgname></author>
       <pubdate>1998</pubdate>
-      <isbn>ISBN 4-8399-0088-4 P3800E</isbn>
+      <biblioid class="isbn">ISBN 4-8399-0088-4 P3800E</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-newcomeunix">
+  <biblioentry xml:id="biblio-newcomeunix">
     <biblioset relation="article">
-      <citetitle pubwork="book"><ulink url="http://unixhelp.ed.ac.uk/">Online Guide
-        for newcomers to the UNIX environment</ulink></citetitle>
+      <citetitle pubwork="book"><link xlink:href="http://unixhelp.ed.ac.uk/">Online Guide
+        for newcomers to the UNIX environment</link></citetitle>
       <publisher>
-        <publishername><ulink url="http://www.ed.ac.uk/">Edinburgh University</ulink></publishername>
+        <publishername><link xlink:href="http://www.ed.ac.uk/">Edinburgh University</link></publishername>
       </publisher>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-dnsandbind">
+  <biblioentry xml:id="biblio-dnsandbind">
     <biblioset relation="book">
-      <title>DNS and BIND</title>
+      <citetitle>DNS and BIND</citetitle>
       <publisher>
         <publishername>O'Reilly &amp; Associates, Inc</publishername>
       </publisher>
-      <isbn>ISBN 1-56592-512-2</isbn>
+      <biblioid class="isbn">ISBN 1-56592-512-2</biblioid>
       <authorgroup>
-      <author>
-        <firstname>Paul Albitz</firstname>
-        <surname>Albitz</surname>
-      </author>
-      <author>
-        <firstname>Cricket</firstname>
-        <surname>Liu</surname>
-      </author>
+      <author><personname><firstname>Paul Albitz</firstname><surname>Albitz</surname></personname></author>
+      <author><personname><firstname>Cricket</firstname><surname>Liu</surname></personname></author>
       </authorgroup>
       <pubdate>1998</pubdate>
       <edition>3rd edition</edition>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-sendmail">
+  <biblioentry xml:id="biblio-sendmail">
     <biblioset relation="book">
-      <title>Sendmail</title>
+      <citetitle>Sendmail</citetitle>
       <publisher>
         <publishername>O'Reilly &amp; Associates, Inc</publishername>
       </publisher>
       <pubdate>1997</pubdate>
       <edition>2nd edition</edition>
-      <author>
-        <firstname>Brian</firstname>
-        <surname>Costales</surname>
-      </author>
-      <isbn>ISBN 1-56592-222-0</isbn>
+      <author><personname><firstname>Brian</firstname><surname>Costales</surname></personname></author>
+      <biblioid class="isbn">ISBN 1-56592-222-0</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-esssysadmin">
+  <biblioentry xml:id="biblio-esssysadmin">
     <biblioset relation="book">
-      <title>Essential System Administration</title>
-      <author>
-        <firstname>&AElig;leen</firstname>
-        <surname>Frisch</surname>
-      </author>
+      <citetitle>Essential System Administration</citetitle>
+      <author><personname><firstname>&AElig;leen</firstname><surname>Frisch</surname></personname></author>
       <edition>2nd edition</edition>
       <publisher>
         <publishername>O'Reilly &amp; Associates</publishername>
       </publisher>
       <pubdate>1995</pubdate>
-      <isbn>ISBN 1-56592-127-5</isbn>
+      <biblioid class="isbn">ISBN 1-56592-127-5</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-tcpipnetworkadministration">
+  <biblioentry xml:id="biblio-tcpipnetworkadministration">
     <biblioset relation="book">
-      <title>TCP/IP Network Administration</title>
-      <author>
-        <firstname>Craig</firstname>
-        <surname>Hunt</surname>
-      </author>
+      <citetitle>TCP/IP Network Administration</citetitle>
+      <author><personname><firstname>Craig</firstname><surname>Hunt</surname></personname></author>
       <edition>2nd edition</edition>
       <publisher>
         <publishername>O'Reilly &amp; Associates, Inc</publishername>
       </publisher>
       <pubdate>1997</pubdate>
-      <isbn>ISBN 1-56592-322-7</isbn>
+      <biblioid class="isbn">ISBN 1-56592-322-7</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-managingnfsandnis">
+  <biblioentry xml:id="biblio-managingnfsandnis">
     <biblioset relation="book">
-      <title>Managing NFS and NIS</title>
-      <author>
-        <firstname>Hal</firstname>
-        <surname>Stern</surname>
-      </author>
+      <citetitle>Managing NFS and NIS</citetitle>
+      <author><personname><firstname>Hal</firstname><surname>Stern</surname></personname></author>
       <publisher>
         <publishername>O'Reilly &amp; Associates, Inc</publishername>
       </publisher>
       <pubdate>1991</pubdate>
-      <isbn>ISBN 0-937175-75-7</isbn>
+      <biblioid class="isbn">ISBN 0-937175-75-7</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-jpmanprojectjfug">
+  <biblioentry xml:id="biblio-jpmanprojectjfug">
     <biblioset relation="book">
-      <citetitle pubwork="book"><ulink url="http://www.pc.mycom.co.jp/FreeBSD/sam.html">
-        FreeBSD System Administration's Manual</ulink></citetitle>
-      <corpauthor><ulink url="http://www.jp.FreeBSD.org">Jpman Project, Japan FreeBSD
-        Users Group</ulink></corpauthor>
+      <citetitle pubwork="book"><link xlink:href="http://www.pc.mycom.co.jp/FreeBSD/sam.html">
+        FreeBSD System Administration's Manual</link></citetitle>
+      <author><orgname><link xlink:href="http://www.jp.FreeBSD.org">Jpman Project, Japan FreeBSD
+        Users Group</link></orgname></author>
       <publisher>
-        <publishername><ulink url="http://www.pc.mycom.co.jp/">Mainichi Communications
-          Inc.</ulink></publishername>
+        <publishername><link xlink:href="http://www.pc.mycom.co.jp/">Mainichi Communications
+          Inc.</link></publishername>
       </publisher>
       <pubdate>1998</pubdate>
-      <isbn>ISBN 4-8399-0109-0 P3300E</isbn>
+      <biblioid class="isbn">ISBN 4-8399-0109-0 P3300E</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-xwinsystoolkit">
+  <biblioentry xml:id="biblio-xwinsystoolkit">
     <biblioset relation="book">
-      <title>X Window System Toolkit</title>
+      <citetitle>X Window System Toolkit</citetitle>
       <publisher>
         <publishername>Digital Press</publishername>
       </publisher>
-      <author>
-        <firstname>Paul</firstname>
-        <surname>Asente</surname>
-      </author>
-      <isbn>ISBN 1-55558-051-3</isbn>
+      <author><personname><firstname>Paul</firstname><surname>Asente</surname></personname></author>
+      <biblioid class="isbn">ISBN 1-55558-051-3</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-carefman">
+  <biblioentry xml:id="biblio-carefman">
     <biblioset relation="book">
-      <title>C: A Reference Manual</title>
+      <citetitle>C: A Reference Manual</citetitle>
       <publisher>
         <publishername>Prentice Hall</publishername>
       </publisher>
       <pubdate>1995</pubdate>
       <edition>4th edition</edition>
       <authorgroup>
-      <author>
-        <firstname>Samuel P.</firstname>
-        <surname>Harbison</surname>
-      </author>
-      <author>
-        <firstname>Guy L. Jr.</firstname>
-        <surname>Steele</surname>
-      </author>
+      <author><personname><firstname>Samuel P.</firstname><surname>Harbison</surname></personname></author>
+      <author><personname><firstname>Guy L. Jr.</firstname><surname>Steele</surname></personname></author>
       </authorgroup>
-      <isbn>ISBN 0-13-326224-3</isbn>
+      <biblioid class="isbn">ISBN 0-13-326224-3</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-thecproglang">
+  <biblioentry xml:id="biblio-thecproglang">
     <biblioset relation="book">
-      <title>The C Programming Language</title>
+      <citetitle>The C Programming Language</citetitle>
       <publisher>
         <publishername>Prentice Hall</publishername>
       </publisher>
       <pubdate>1998</pubdate>
       <authorgroup>
-	<author>
-	  <firstname>Brian</firstname>
-	  <surname>Kernighan</surname>
-	</author>
-	<author>
-	  <firstname>Dennis</firstname>
-	  <surname>Ritchie</surname>
-	</author>
+	<author><personname><firstname>Brian</firstname><surname>Kernighan</surname></personname></author>
+	<author><personname><firstname>Dennis</firstname><surname>Ritchie</surname></personname></author>
       </authorgroup>
-      <isbn>ISBN 0-13-110362-9</isbn>
+      <biblioid class="isbn">ISBN 0-13-110362-9</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-portingunixsoft">
+  <biblioentry xml:id="biblio-portingunixsoft">
     <biblioset relation="book">
-      <title>Porting UNIX Software</title>
-      <author>
-        <firstname>Greg</firstname>
-        <surname>Lehey</surname>
-      </author>
+      <citetitle>Porting UNIX Software</citetitle>
+      <author><personname><firstname>Greg</firstname><surname>Lehey</surname></personname></author>
       <publisher>
         <publishername>O'Reilly &amp; Associates, Inc.</publishername>
       </publisher>
       <pubdate>1995</pubdate>
-      <isbn>ISBN 1-56592-126-7</isbn>
+      <biblioid class="isbn">ISBN 1-56592-126-7</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-thestandardclibrary">
+  <biblioentry xml:id="biblio-thestandardclibrary">
     <biblioset relation="book">
-      <title>The Standard C Library</title>
+      <citetitle>The Standard C Library</citetitle>
       <publisher>
         <publishername>Prentice Hall</publishername>
       </publisher>
       <pubdate>1992</pubdate>
-      <author>
-        <firstname>P. J.</firstname>
-        <surname>Plauger</surname>
-      </author>
-      <isbn>ISBN 0-13-131509-9</isbn>
+      <author><personname><firstname>P. J.</firstname><surname>Plauger</surname></personname></author>
+      <biblioid class="isbn">ISBN 0-13-131509-9</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-advprogintheunixenv">
+  <biblioentry xml:id="biblio-advprogintheunixenv">
     <biblioset relation="book">
-      <title>Advanced Programming in the UNIX Environment</title>
+      <citetitle>Advanced Programming in the UNIX Environment</citetitle>
       <publisher>
         <publishername>Addison-Wesley</publishername>
       </publisher>
       <pubdate>1992</pubdate>
-      <author>
-        <firstname>W. Richard</firstname>
-        <surname>Stevens</surname>
-      </author>
-      <isbn>ISBN 0-201-56317-7</isbn>
+      <author><personname><firstname>W. Richard</firstname><surname>Stevens</surname></personname></author>
+      <biblioid class="isbn">ISBN 0-201-56317-7</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-unixnetprog">
+  <biblioentry xml:id="biblio-unixnetprog">
     <biblioset relation="book">
-      <title>UNIX Network Programming</title>
-      <author>
-        <firstname>W. Richard</firstname>
-        <surname>Stevens</surname>
-      </author>
+      <citetitle>UNIX Network Programming</citetitle>
+      <author><personname><firstname>W. Richard</firstname><surname>Stevens</surname></personname></author>
       <publisher>
         <publishername>Prentice Hall</publishername>
       </publisher>
       <pubdate>1998</pubdate>
       <edition>2nd edition</edition>
-      <isbn>ISBN 0-13-490012-X</isbn>
+      <biblioid class="isbn">ISBN 0-13-490012-X</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-writeserialdriverforunix">
+  <biblioentry xml:id="biblio-writeserialdriverforunix">
     <biblioset relation="book">
-      <title>Writing Serial Drivers for UNIX</title>
-      <author>
-        <firstname>Bill</firstname>
-        <surname>Wells</surname>
-      </author>
+      <citetitle>Writing Serial Drivers for UNIX</citetitle>
+      <author><personname><firstname>Bill</firstname><surname>Wells</surname></personname></author>
       <pubdate>December 1994</pubdate>
       <publisher>
         <publishername>Dr. Dobb's Journal</publishername>
@@ -725,28 +585,22 @@
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-unixsysarch">
+  <biblioentry xml:id="biblio-unixsysarch">
     <biblioset relation="book">
-      <title>UNIX System Architecture</title>
+      <citetitle>UNIX System Architecture</citetitle>
       <publisher>
         <publishername>Prentice-Hall, Inc</publishername>
       </publisher>
       <pubdate>1990</pubdate>
-      <author>
-        <firstname>Prabhat K.</firstname>
-        <surname>Andleigh</surname>
-      </author>
-      <isbn>ISBN 0-13-949843-5</isbn>
+      <author><personname><firstname>Prabhat K.</firstname><surname>Andleigh</surname></personname></author>
+      <biblioid class="isbn">ISBN 0-13-949843-5</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-portingunixtothe386">
+  <biblioentry xml:id="biblio-portingunixtothe386">
     <biblioset relation="book">
-      <title>Porting UNIX to the 386</title>
-      <author>
-        <firstname>William</firstname>
-        <surname>Jolitz</surname>
-      </author>
+      <citetitle>Porting UNIX to the 386</citetitle>
+      <author><personname><firstname>William</firstname><surname>Jolitz</surname></personname></author>
       <publisher>
         <publishername>Dr. Dobb's Journal</publishername>
       </publisher>
@@ -754,369 +608,287 @@
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-tcpipillv1theprotocols">
+  <biblioentry xml:id="biblio-tcpipillv1theprotocols">
     <biblioset relation="book">
-      <title>TCP/IP Illustrated, Volume 1: The Protocols</title>
-      <author>
-        <firstname>W. Richard</firstname>
-        <surname>Stevens</surname>
-      </author>
+      <citetitle>TCP/IP Illustrated, Volume 1: The Protocols</citetitle>
+      <author><personname><firstname>W. Richard</firstname><surname>Stevens</surname></personname></author>
       <publisher>
         <publishername>Addison-Wesley</publishername>
       </publisher>
       <pubdate>1996</pubdate>
-      <isbn>ISBN 0-201-63346-9</isbn>
+      <biblioid class="isbn">ISBN 0-201-63346-9</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-unixsysformodrnarch">
+  <biblioentry xml:id="biblio-unixsysformodrnarch">
     <biblioset relation="book">
-      <title>Unix Systems for Modern Architectures</title>
+      <citetitle>Unix Systems for Modern Architectures</citetitle>
       <publisher>
         <publishername>Addison-Wesley</publishername>
       </publisher>
-      <author>
-        <firstname>Curt</firstname>
-        <surname>Schimmel</surname>
-      </author>
+      <author><personname><firstname>Curt</firstname><surname>Schimmel</surname></personname></author>
       <pubdate>1994</pubdate>
-      <isbn>ISBN 0-201-63338-8</isbn>
+      <biblioid class="isbn">ISBN 0-201-63338-8</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-tcpipillvol3">
+  <biblioentry xml:id="biblio-tcpipillvol3">
     <biblioset relation="book">
-      <title>TCP/IP Illustrated, Volume 3: TCP for Transactions, HTTP, NNTP and the UNIX Domain Protocols</title>
+      <citetitle>TCP/IP Illustrated, Volume 3: TCP for Transactions, HTTP, NNTP and the UNIX Domain Protocols</citetitle>
       <publisher>
         <publishername>Addison-Wesley</publishername>
       </publisher>
       <pubdate>1996</pubdate>
-      <author>
-        <firstname>W. Richard</firstname>
-        <surname>Stevens</surname>
-      </author>
-      <isbn>ISBN 0-201-63495-3</isbn>
+      <author><personname><firstname>W. Richard</firstname><surname>Stevens</surname></personname></author>
+      <biblioid class="isbn">ISBN 0-201-63495-3</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-unixinternthenewfrontiers">
+  <biblioentry xml:id="biblio-unixinternthenewfrontiers">
     <biblioset relation="book">
-      <title>UNIX Internals -- The New Frontiers</title>
-      <author>
-        <firstname>Uresh</firstname>
-        <surname>Vahalia</surname>
-      </author>
+      <citetitle>UNIX Internals -- The New Frontiers</citetitle>
+      <author><personname><firstname>Uresh</firstname><surname>Vahalia</surname></personname></author>
       <publisher>
         <publishername>Prentice Hall</publishername>
       </publisher>
       <pubdate>1996</pubdate>
-      <isbn>ISBN 0-13-101908-2</isbn>
+      <biblioid class="isbn">ISBN 0-13-101908-2</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-tcpipillvol2theimplementation">
+  <biblioentry xml:id="biblio-tcpipillvol2theimplementation">
     <biblioset relation="book">
-      <title>TCP/IP Illustrated, Volume 2: The Implementation</title>
+      <citetitle>TCP/IP Illustrated, Volume 2: The Implementation</citetitle>
       <authorgroup>
-      <author>
-        <firstname>Gary R.</firstname>
-        <surname>Wright</surname>
-      </author>
-      <author>
-        <firstname>W. Richard</firstname>
-        <surname>Stevens</surname>
-      </author>
+      <author><personname><firstname>Gary R.</firstname><surname>Wright</surname></personname></author>
+      <author><personname><firstname>W. Richard</firstname><surname>Stevens</surname></personname></author>
       </authorgroup>
       <pubdate>1995</pubdate>
       <publisher>
         <publishername>Addison-Wesley</publishername>
       </publisher>
-      <isbn>ISBN 0-201-63354-X</isbn>
+      <biblioid class="isbn">ISBN 0-201-63354-X</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-firewallsandinternetsecurity">
+  <biblioentry xml:id="biblio-firewallsandinternetsecurity">
     <biblioset relation="book">
-      <title>Firewalls and Internet Security: Repelling the Wily Hacker</title>
+      <citetitle>Firewalls and Internet Security: Repelling the Wily Hacker</citetitle>
       <authorgroup>
-      <author>
-        <firstname>William R.</firstname>
-        <surname>CHeswick</surname>
-      </author>
-      <author>
-        <firstname>Steven M.</firstname>
-        <surname>Bellovin</surname>
-      </author>
+      <author><personname><firstname>William R.</firstname><surname>CHeswick</surname></personname></author>
+      <author><personname><firstname>Steven M.</firstname><surname>Bellovin</surname></personname></author>
       </authorgroup>
       <publisher>
         <publishername>Addison-Wesley</publishername>
       </publisher>
       <pubdate>1995</pubdate>
-      <isbn>ISBN 0-201-63357-4</isbn>
+      <biblioid class="isbn">ISBN 0-201-63357-4</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-practicalunixsecurity">
+  <biblioentry xml:id="biblio-practicalunixsecurity">
     <biblioset relation="book">
-      <title>Practical UNIX Security</title>
+      <citetitle>Practical UNIX Security</citetitle>
       <authorgroup>
-      <author>
-        <firstname>Simson</firstname>
-        <surname>Garfinkel</surname>
-      </author>
-      <author>
-        <firstname>Gene</firstname>
-        <surname>Spafford</surname>
-      </author>
+      <author><personname><firstname>Simson</firstname><surname>Garfinkel</surname></personname></author>
+      <author><personname><firstname>Gene</firstname><surname>Spafford</surname></personname></author>
       </authorgroup>
       <pubdate>1996</pubdate>
       <edition>2nd edition</edition>
       <publisher>
         <publishername>O'Reilly &amp; Associates, Inc</publishername>
       </publisher>
-      <isbn>ISBN 1-56592-148-8</isbn>
+      <biblioid class="isbn">ISBN 1-56592-148-8</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-pgpprettygoodprivacy">
+  <biblioentry xml:id="biblio-pgpprettygoodprivacy">
     <biblioset relation="book">
-      <title>PGP Pretty Good Privacy</title>
-      <author>
-        <firstname>Simson</firstname>
-        <surname>Garfinkel</surname>
-      </author>
+      <citetitle>PGP Pretty Good Privacy</citetitle>
+      <author><personname><firstname>Simson</firstname><surname>Garfinkel</surname></personname></author>
       <publisher>
         <publishername>O'Reilly &amp; Associates, Inc</publishername>
       </publisher>
       <pubdate>1995</pubdate>
-      <isbn>ISBN 1-56592-098-8</isbn>
+      <biblioid class="isbn">ISBN 1-56592-098-8</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-pentiumprocarch">
+  <biblioentry xml:id="biblio-pentiumprocarch">
     <biblioset relation="book">
-      <title>Pentium Processor System Architecture</title>
+      <citetitle>Pentium Processor System Architecture</citetitle>
       <authorgroup>
-      <author>
-        <firstname>Don</firstname>
-        <surname>Anderson</surname>
-      </author>
-      <author>
-        <firstname>Tom</firstname>
-        <surname>Shanley</surname>
-      </author>
+      <author><personname><firstname>Don</firstname><surname>Anderson</surname></personname></author>
+      <author><personname><firstname>Tom</firstname><surname>Shanley</surname></personname></author>
       </authorgroup>
       <publisher>
         <publishername>Addison-Wesley</publishername>
       </publisher>
       <pubdate>1995</pubdate>
       <edition>2nd edition</edition>
-      <isbn>ISBN 0-201-40992-5</isbn>
+      <biblioid class="isbn">ISBN 0-201-40992-5</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-progguidetothesvgacards">
+  <biblioentry xml:id="biblio-progguidetothesvgacards">
     <biblioset relation="book">
-      <title>Programmer's Guide to the EGA, VGA, and Super VGA Cards</title>
-      <author>
-        <firstname>Richard F.</firstname>
-        <surname>Ferraro</surname>
-      </author>
+      <citetitle>Programmer's Guide to the EGA, VGA, and Super VGA Cards</citetitle>
+      <author><personname><firstname>Richard F.</firstname><surname>Ferraro</surname></personname></author>
       <edition>3rd edition</edition>
       <publisher>
         <publishername>Addison-Wesley</publishername>
       </publisher>
       <pubdate>1995</pubdate>
-      <isbn>ISBN 0-201-62490-7</isbn>
+      <biblioid class="isbn">ISBN 0-201-62490-7</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-80486">
+  <biblioentry xml:id="biblio-80486">
     <biblioset relation="book">
-      <title>80486 System Architecture</title>
-      <author>
-        <firstname>Tom</firstname>
-        <surname>Shanley</surname>
-      </author>
+      <citetitle>80486 System Architecture</citetitle>
+      <author><personname><firstname>Tom</firstname><surname>Shanley</surname></personname></author>
       <publisher>
         <publishername>Addison-Wesley</publishername>
       </publisher>
       <pubdate>1995</pubdate>
       <edition>3rd edition</edition>
-      <isbn>ISBN 0-201-40994-1</isbn>
+      <biblioid class="isbn">ISBN 0-201-40994-1</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-isasysarch">
+  <biblioentry xml:id="biblio-isasysarch">
     <biblioset relation="book">
-      <title>ISA System Architecture</title>
-      <author>
-        <firstname>Tom</firstname>
-        <surname>Shanley</surname>
-      </author>
+      <citetitle>ISA System Architecture</citetitle>
+      <author><personname><firstname>Tom</firstname><surname>Shanley</surname></personname></author>
       <publisher>
         <publishername>Addison-Wesley</publishername>
       </publisher>
       <edition>3rd edition</edition>
       <pubdate>1995</pubdate>
-      <isbn>ISBN 0-201-40996-8</isbn>
+      <biblioid class="isbn">ISBN 0-201-40996-8</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-pcisysarch">
+  <biblioentry xml:id="biblio-pcisysarch">
     <biblioset relation="book">
-      <title>PCI System Architecture</title>
-      <author>
-        <firstname>Tom</firstname>
-        <surname>Shanley</surname>
-      </author>
+      <citetitle>PCI System Architecture</citetitle>
+      <author><personname><firstname>Tom</firstname><surname>Shanley</surname></personname></author>
       <publisher>
         <publishername>Addison-Wesley</publishername>
       </publisher>
       <pubdate>1995</pubdate>
       <edition>3rd edition</edition>
-      <isbn>ISBN 0-201-40993-3</isbn>
+      <biblioid class="isbn">ISBN 0-201-40993-3</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-theundocumentedpc">
+  <biblioentry xml:id="biblio-theundocumentedpc">
     <biblioset relation="book">
-      <title>The Undocumented PC</title>
-      <author>
-        <firstname>Frank</firstname>
-        <surname>Van Gilluwe</surname>
-      </author>
+      <citetitle>The Undocumented PC</citetitle>
+      <author><personname><firstname>Frank</firstname><surname>Van Gilluwe</surname></personname></author>
       <publisher>
         <publishername>Addison-Wesley</publishername>
       </publisher>
       <pubdate>1994</pubdate>
-      <isbn>ISBN 0-201-62277-7</isbn>
+      <biblioid class="isbn">ISBN 0-201-62277-7</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-bellsystemtechnicaljournal">
+  <biblioentry xml:id="biblio-bellsystemtechnicaljournal">
     <biblioset relation="book">
-      <title>Bell System Technical Journal, Unix Time-Sharing System</title>
+      <citetitle>Bell System Technical Journal, Unix Time-Sharing System</citetitle>
       <publisher>
 	<publishername>American Telephone &amp; Telegraph Company</publishername>
       </publisher>
       <pubdate>July-August 1978</pubdate>
       <edition>Vol 57, No 6, Part 2</edition>
-      <isbn>ISSN0005-8580</isbn>
+      <biblioid class="isbn">ISSN0005-8580</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-commentaryonunix">
+  <biblioentry xml:id="biblio-commentaryonunix">
     <biblioset relation="book">
-      <title>Lion's Commentary on UNIX</title>
-      <author>
-        <firstname>John</firstname>
-        <surname>Lion</surname>
-      </author>
+      <citetitle>Lion's Commentary on UNIX</citetitle>
+      <author><personname><firstname>John</firstname><surname>Lion</surname></personname></author>
       <publisher>
         <publishername>ITP Media Group</publishername>
       </publisher>
       <pubdate>1996</pubdate>
       <edition>6th edition</edition>
-      <isbn>ISBN 1573980137</isbn>
+      <biblioid class="isbn">ISBN 1573980137</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-newhackerdict">
+  <biblioentry xml:id="biblio-newhackerdict">
     <biblioset relation="book">
-      <title>The New Hacker's Dictionary</title>
-      <author>
-        <firstname>Eric S.</firstname>
-        <surname>Raymond</surname>
-      </author>
+      <citetitle>The New Hacker's Dictionary</citetitle>
+      <author><personname><firstname>Eric S.</firstname><surname>Raymond</surname></personname></author>
       <publisher>
         <publishername>MIT Press</publishername>
       </publisher>
       <pubdate>1996</pubdate>
       <edition>3rd edition</edition>
-      <isbn>ISBN 0-262-68092-0</isbn>
+      <biblioid class="isbn">ISBN 0-262-68092-0</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-aqtrcentofunix">
+  <biblioentry xml:id="biblio-aqtrcentofunix">
     <biblioset relation="book">
-      <title>A quarter century of UNIX</title>
-      <author>
-        <firstname>Peter H.</firstname>
-        <surname>Salus</surname>
-      </author>
+      <citetitle>A quarter century of UNIX</citetitle>
+      <author><personname><firstname>Peter H.</firstname><surname>Salus</surname></personname></author>
       <publisher>
         <publishername>Addison-Wesley</publishername>
       </publisher>
       <pubdate>1994</pubdate>
-      <isbn>ISBN 0-201-54777-5</isbn>
+      <biblioid class="isbn">ISBN 0-201-54777-5</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-unixhatershandbook">
+  <biblioentry xml:id="biblio-unixhatershandbook">
     <biblioset relation="book">
-      <title>The UNIX-HATERS Handbook</title>
+      <citetitle>The UNIX-HATERS Handbook</citetitle>
       <authorgroup>
-      <author>
-        <firstname>Steven</firstname>
-        <surname>Strassman</surname>
-      </author>
-      <author>
-        <firstname>Daniel</firstname>
-        <surname>Weise</surname>
-      </author>
-      <author>
-        <firstname>Simon</firstname>
-        <surname>Garfinkel</surname>
-      </author>
+      <author><personname><firstname>Steven</firstname><surname>Strassman</surname></personname></author>
+      <author><personname><firstname>Daniel</firstname><surname>Weise</surname></personname></author>
+      <author><personname><firstname>Simon</firstname><surname>Garfinkel</surname></personname></author>
       </authorgroup>
       <publisher>
         <publishername>IDG Books Worldwide, Inc</publishername>
       </publisher>
       <pubdate>1994</pubdate>
-      <isbn>ISBN 1-56884-203-1</isbn>
+      <biblioid class="isbn">ISBN 1-56884-203-1</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-lifewithunix">
+  <biblioentry xml:id="biblio-lifewithunix">
     <biblioset relation="book">
-      <title>Life with UNIX &mdash; special edition</title>
+      <citetitle>Life with UNIX &mdash; special edition</citetitle>
       <authorgroup>
-      <author>
-        <firstname>Don</firstname>
-        <surname>Libes</surname>
-      </author>
-      <author>
-        <firstname>Sandy</firstname>
-        <surname>Ressler</surname>
-      </author>
+      <author><personname><firstname>Don</firstname><surname>Libes</surname></personname></author>
+      <author><personname><firstname>Sandy</firstname><surname>Ressler</surname></personname></author>
       </authorgroup>
       <publisher>
         <publishername>Prentice-Hall</publishername>
       </publisher>
       <pubdate>1989</pubdate>
-      <isbn>ISBN 0-13-536657-7</isbn>
+      <biblioid class="isbn">ISBN 0-13-536657-7</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-bsdfamilytree">
+  <biblioentry xml:id="biblio-bsdfamilytree">
     <biblioset relation="book">
       <citetitle pubwork="book">
-	<ulink url="http://svnweb.FreeBSD.org/base/head/share/misc/bsd-family-tree?view=co">
-          The BSD Family Tree</ulink></citetitle>
+	<link xlink:href="http://svnweb.FreeBSD.org/base/head/share/misc/bsd-family-tree?view=co">
+          The BSD Family Tree</link></citetitle>
       <pubdate>1997</pubdate>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="absolutebsd">
+  <biblioentry xml:id="absolutebsd">
     <biblioset relation="book">
-      <title>Absolute BSD</title>
+      <citetitle>Absolute BSD</citetitle>
 
-      <author>
-        <firstname>Michael</firstname>
-
-        <surname>Lucas</surname>
-      </author>
+      <author><personname><firstname>Michael</firstname><surname>Lucas</surname></personname></author>
 
       <publisher>
         <publishername>No Starch Press</publishername>
@@ -1124,27 +896,27 @@
 
       <pubdate>June 2002</pubdate>
 
-      <isbn>ISBN 1-886411-74-3</isbn>
+      <biblioid class="isbn">ISBN 1-886411-74-3</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-ccppusersjournal">
+  <biblioentry xml:id="biblio-ccppusersjournal">
     <biblioset relation="magazine">
-      <title>The C/C++ Users Journal</title>
+      <citetitle>The C/C++ Users Journal</citetitle>
       <publisher>
         <publishername>R&amp;D Publications Inc.</publishername>
       </publisher>
-      <issn>ISSN 1075-2838</issn>
+      <biblioid class="issn">ISSN 1075-2838</biblioid>
     </biblioset>
   </biblioentry>
 
-  <biblioentry id="biblio-sysadminthejournalforunixsysadmins">
+  <biblioentry xml:id="biblio-sysadminthejournalforunixsysadmins">
     <biblioset relation="magazine">
-      <title>Sys Admin &mdash; The Journal for UNIX System Administrators</title>
+      <citetitle>Sys Admin &mdash; The Journal for UNIX System Administrators</citetitle>
       <publisher>
         <publishername>Miller Freeman, Inc</publishername>
       </publisher>
-      <issn>ISSN 1061-2688</issn>
+      <biblioid class="issn">ISSN 1061-2688</biblioid>
     </biblioset>
   </biblioentry>
 </bibliography>