18 files changed, 64 insertions, 85 deletions
diff --git a/docs/docbook/devdoc/CodingSuggestions.sgml b/docs/docbook/devdoc/CodingSuggestions.xml
index bdf6d3d17d..bdf6d3d17d 100644
--- a/docs/docbook/devdoc/CodingSuggestions.sgml
+++ b/docs/docbook/devdoc/CodingSuggestions.xml
diff --git a/docs/docbook/devdoc/NetBIOS.sgml b/docs/docbook/devdoc/NetBIOS.xml
index 6b4eb34b76..6b4eb34b76 100644
--- a/docs/docbook/devdoc/NetBIOS.sgml
+++ b/docs/docbook/devdoc/NetBIOS.xml
diff --git a/docs/docbook/devdoc/Tracing.sgml b/docs/docbook/devdoc/Tracing.xml
index f55c47bc4e..ccf1e1c3c8 100644
--- a/docs/docbook/devdoc/Tracing.sgml
+++ b/docs/docbook/devdoc/Tracing.xml
@@ -1,6 +1,11 @@
 <chapter id="tracing">
 <chapterinfo>
-	&author.tridge;
+	<author>
+		<firstname>Andrew</firstname><surname>Tridgell</surname>
+		<affiliation>
+			<orgname>Samba Team</orgname>
+		</affiliation>
+	</author>
 </chapterinfo>
 
 <title>Tracing samba system calls</title>
diff --git a/docs/docbook/devdoc/architecture.sgml b/docs/docbook/devdoc/architecture.xml
index e05039054b..312a63af97 100644
--- a/docs/docbook/devdoc/architecture.sgml
+++ b/docs/docbook/devdoc/architecture.xml
@@ -4,7 +4,6 @@
 		<firstname>Dan</firstname><surname>Shearer</surname>
 	</author>
 	<pubdate> November 1997</pubdate>
-	&author.jelmer;
 </chapterinfo>
 
 <title>Samba Architecture</title>
@@ -182,56 +181,4 @@ for browsing and WINS support.
 </para>
 
 </sect1>
-
-<sect1>
-<title>Samba's subsystems</title>
-
-<para>Samba's <filename>source/</filename> directory contains quite some directories. Here's a small explanation of what each of them contains.</para>
-
-<simplelist>
-<member>aparser - Obsolete</member>
-<member>auth - The authentication subsystem, maintained by Andrew Bartlett</member>
-<member>bin - Output directory for all the binary files</member>
-<member>client - Contains 'plain' SMB client sources: smbclient and 
-some mount help utilities</member>
-<member>groupdb - Group database and mapping code</member>
-<member>include - All of samba's include files</member>
-<member>intl - Internationalization files. Not used at the moment.</member>
-<member>lib - General C helper functions. Not SMB-specific.</member>
-<member>libads - Library with ActiveDirectory related functions.</member>
-<member>libsmb - Library with SMB specific functions.</member>
-<member>locking - Locking functions!</member>
-<member>modules - Source files for various modules (VFS and charset).</member>
-<member>msdfs - DCE-DFS code</member>
-<member>nmbd - Code for the nmbd daemon</member>
-<member>nsswitch - Winbind source code</member>
-<member>pam_smbpass - Source code for pam module for authenticating against samba's passdb</member>
-<member>param - smb.conf parsing code</member>
-<member>passdb - User database(SAM) code with the various backends</member>
-<member>po - Internationalisation code - not used atm</member>
-<member>popt - Samba's internal copy of the popt library</member>
-<member>printing - Printing stuff</member>
-<member>profile - Profiling support</member>
-<member>python - Python bindings for various libsmb functions</member>
-<member>registry - Registry backend</member>
-<member>rpc_client - RPC Client library for making remote procedure calls</member>
-<member>rpc_parse - Functions for parsing RPC structures (???)</member>
-<member>rpc_server - Functions for being an RPC server</member>
-<member>rpcclient - Command-line client that is a basically a front-end to rpc_client/</member>
-<member>sam - Code for the new (but unused) SAM</member>
-<member>script - Various scripts</member>
-<member>smbd - Source code for the smbd daemon</member>
-<member>smbwrapper - Source code for library that overloads VFS function calls, for usage with LD_PRELOAD=...</member>
-<member>stf - Testsuite system?</member>
-<member>tdb - Source code of samba's Trivial Database (much like gdbm)</member>
-<member>tests - Source code for the larger tests used by configure</member>
-<member>torture - 'Torture' utilities, used for testing samba and other cifs servers</member>
-<member>ubiqx - The ubiqx library from Chris Hertel</member>
-<member>utils - Various small utilities(pdbedit, net, etc)</member>
-<member>web - SWAT sourcecode</member>
-<member>wrepld - Sourcecode of the WINS replication daemon</member>
-</simplelist>
-
-</sect1>
-
 </chapter>
diff --git a/docs/docbook/devdoc/cifsntdomain.sgml b/docs/docbook/devdoc/cifsntdomain.xml
index 7c3c22d106..7c3c22d106 100644
--- a/docs/docbook/devdoc/cifsntdomain.sgml
+++ b/docs/docbook/devdoc/cifsntdomain.xml
diff --git a/docs/docbook/devdoc/debug.sgml b/docs/docbook/devdoc/debug.xml
index 7e81cc825d..7e81cc825d 100644
--- a/docs/docbook/devdoc/debug.sgml
+++ b/docs/docbook/devdoc/debug.xml
diff --git a/docs/docbook/devdoc/dev-doc.sgml b/docs/docbook/devdoc/dev-doc.xml
index ee2a40535d..d943031193 100644
--- a/docs/docbook/devdoc/dev-doc.sgml
+++ b/docs/docbook/devdoc/dev-doc.xml
@@ -1,21 +1,21 @@
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-<!ENTITY % globalentities SYSTEM '../global.ent'> %globalentities;
-<!ENTITY NetBIOS SYSTEM "NetBIOS.sgml">
-<!ENTITY Architecture SYSTEM "architecture.sgml">
-<!ENTITY debug SYSTEM "debug.sgml">
-<!ENTITY internals SYSTEM "internals.sgml">
-<!ENTITY parsing SYSTEM "parsing.sgml">
-<!ENTITY unix-smb SYSTEM "unix-smb.sgml">
-<!ENTITY CodingSuggestions SYSTEM "CodingSuggestions.sgml">
-<!ENTITY Tracing SYSTEM "Tracing.sgml">
-<!ENTITY cifsntdomain SYSTEM "cifsntdomain.sgml">
-<!ENTITY printing SYSTEM "printing.sgml">
-<!ENTITY wins SYSTEM "wins.sgml">
-<!ENTITY sam SYSTEM "sam.sgml">
-<!ENTITY encryption SYSTEM "encryption.sgml">
-<!ENTITY rpc-plugin SYSTEM "rpc_plugin.sgml">
-<!ENTITY modules SYSTEM "modules.sgml">
-<!ENTITY packagers SYSTEM "packagers.sgml">
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE book SYSTEM "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY NetBIOS SYSTEM "NetBIOS.xml">
+<!ENTITY Architecture SYSTEM "architecture.xml">
+<!ENTITY debug SYSTEM "debug.xml">
+<!ENTITY internals SYSTEM "internals.xml">
+<!ENTITY parsing SYSTEM "parsing.xml">
+<!ENTITY unix-smb SYSTEM "unix-smb.xml">
+<!ENTITY CodingSuggestions SYSTEM "CodingSuggestions.xml">
+<!ENTITY Tracing SYSTEM "Tracing.xml">
+<!ENTITY cifsntdomain SYSTEM "cifsntdomain.xml">
+<!ENTITY printing SYSTEM "printing.xml">
+<!ENTITY wins SYSTEM "wins.xml">
+<!ENTITY sam SYSTEM "sam.xml">
+<!ENTITY encryption SYSTEM "encryption.xml">
+<!ENTITY rpc-plugin SYSTEM "rpc_plugin.xml">
+<!ENTITY modules SYSTEM "modules.xml">
+<!ENTITY packagers SYSTEM "packagers.xml">
 ]>
 
 <book id="Samba-Developers-Guide">
@@ -27,7 +27,6 @@
 		<surname>SAMBA Team</surname>
 	</author>
 	<address><email>samba@samba.org</email></address>
-    <editor>&person.jelmer;</editor>
 </bookinfo>
 
 <dedication>
@@ -45,7 +44,7 @@ the internals of various parts of samba and the SMB protocol. It's still incompl
 The most recent version of this document
 can be found at <ulink url="http://devel.samba.org/">http://devel.samba.org/</ulink>.
 Please send updates to <ulink 
-url="mailto:jelmer@samba.org">jelmer@samba.org</ulink>.
+url="mailto:jelmer@samba.org">Jelmer Veenrooij</ulink>.
 </para>
 
 <para>
diff --git a/docs/docbook/devdoc/encryption.sgml b/docs/docbook/devdoc/encryption.xml
index 64ff4262cb..3ca8aa109c 100644
--- a/docs/docbook/devdoc/encryption.sgml
+++ b/docs/docbook/devdoc/encryption.xml
@@ -2,7 +2,16 @@
 
 
 <chapterinfo>
-	&author.jeremy;
+	<author>
+		<firstname>Jeremy</firstname><surname>Allison</surname>
+		<affiliation>
+			<orgname>Samba Team</orgname>
+			<address>
+				<email>samba@samba.org</email>
+			</address>
+		</affiliation>
+	</author>
+
 	<pubdate>19 Apr 1999</pubdate>
 </chapterinfo>
 	
diff --git a/docs/docbook/devdoc/gencache.sgml b/docs/docbook/devdoc/gencache.xml
index 096bdce789..1ba2f77c9d 100644
--- a/docs/docbook/devdoc/gencache.sgml
+++ b/docs/docbook/devdoc/gencache.xml
@@ -1,6 +1,8 @@
 <chapter id="gencache">
 <chapterinfo>
-	&author.mimir;
+	<author>
+		<firstname>Rafal</firstname><surname>Szczesniak</surname>
+	</author>
 	<pubdate>April 2003</pubdate>
 </chapterinfo>
 
diff --git a/docs/docbook/devdoc/internals.sgml b/docs/docbook/devdoc/internals.xml
index 982cfd2e10..982cfd2e10 100644
--- a/docs/docbook/devdoc/internals.sgml
+++ b/docs/docbook/devdoc/internals.xml
diff --git a/docs/docbook/devdoc/modules.sgml b/docs/docbook/devdoc/modules.xml
index c43e8a9118..0bcdadc66c 100644
--- a/docs/docbook/devdoc/modules.sgml
+++ b/docs/docbook/devdoc/modules.xml
@@ -1,6 +1,12 @@
 <chapter id="modules">
 <chapterinfo>
-	&author.jelmer;
+	<author>
+		<firstname>Jelmer</firstname><surname>Vernooij</surname>
+		<affiliation>
+			<orgname>Samba Team</orgname>
+			<address><email>jelmer@samba.org</email></address>
+		</affiliation>
+	</author>
 	<pubdate> 19 March 2003 </pubdate>
 </chapterinfo>
 
diff --git a/docs/docbook/devdoc/packagers.sgml b/docs/docbook/devdoc/packagers.xml
index edc581cf05..fb47c7305c 100644
--- a/docs/docbook/devdoc/packagers.sgml
+++ b/docs/docbook/devdoc/packagers.xml
@@ -1,6 +1,8 @@
 <chapter id="Packaging">
 <chapterinfo>
-	&author.jelmer;
+	<author>
+		<firstname>Jelmer</firstname><surname>Vernooij</surname>
+	</author>
 </chapterinfo>
 
 <title>Notes to packagers</title>
diff --git a/docs/docbook/devdoc/parsing.sgml b/docs/docbook/devdoc/parsing.xml
index 8d929617f5..8d929617f5 100644
--- a/docs/docbook/devdoc/parsing.sgml
+++ b/docs/docbook/devdoc/parsing.xml
diff --git a/docs/docbook/devdoc/printing.sgml b/docs/docbook/devdoc/printing.xml
index 150652ac37..363b9fb6e5 100644
--- a/docs/docbook/devdoc/printing.sgml
+++ b/docs/docbook/devdoc/printing.xml
@@ -1,6 +1,8 @@
 <chapter id="printing">
 <chapterinfo>
-	&author.jerry;
+	<author>
+		<firstname>Gerald</firstname><surname>Carter</surname>
+	</author>
 	<pubdate>October 2002</pubdate>
 </chapterinfo>
 
diff --git a/docs/docbook/devdoc/rpc_plugin.sgml b/docs/docbook/devdoc/rpc_plugin.xml
index a2d1bd4c35..c83742a247 100644
--- a/docs/docbook/devdoc/rpc_plugin.sgml
+++ b/docs/docbook/devdoc/rpc_plugin.xml
@@ -7,7 +7,13 @@
 			<address><email>aliguor@us.ibm.com</email></address>
 		</affiliation>
 	</author>
-	&author.jelmer;
+	<author>
+		<firstname>Jelmer</firstname><surname>Vernooij</surname>
+		<affiliation>
+			<orgname>Samba Team</orgname>
+			<address><email>jelmer@samba.org</email></address>
+		</affiliation>
+	</author>
 	<pubdate>January 2003</pubdate>
 </chapterinfo>
 
diff --git a/docs/docbook/devdoc/sam.sgml b/docs/docbook/devdoc/sam.xml
index d4c065ca21..84c17d65e2 100644
--- a/docs/docbook/devdoc/sam.sgml
+++ b/docs/docbook/devdoc/sam.xml
@@ -9,9 +9,6 @@
 
 <title>The Upcoming SAM System</title>
 
-<note><para>The design as described in this document is _NOT_ the design that 
-made it into samba 3.0. </para></note>
-
 <sect1>
 <title>Security in the 'new SAM'</title>
 
diff --git a/docs/docbook/devdoc/unix-smb.sgml b/docs/docbook/devdoc/unix-smb.xml
index eea02012e0..d6a658089c 100644
--- a/docs/docbook/devdoc/unix-smb.sgml
+++ b/docs/docbook/devdoc/unix-smb.xml
@@ -1,6 +1,8 @@
 <chapter id="unix-smb">
 <chapterinfo>
-	&author.tridge;
+	<author>
+		<firstname>Andrew</firstname><surname>Tridgell</surname>
+	</author>
 	<pubdate>April 1995</pubdate>
 </chapterinfo>
 
diff --git a/docs/docbook/devdoc/wins.sgml b/docs/docbook/devdoc/wins.xml
index 5cdf760406..53410316c5 100644
--- a/docs/docbook/devdoc/wins.sgml
+++ b/docs/docbook/devdoc/wins.xml
@@ -1,6 +1,8 @@
 <chapter id="wins">
 <chapterinfo>
-	&author.jerry;
+	<author>
+		<firstname>Gerald</firstname><surname>Carter</surname>
+	</author>
 	<pubdate>October 2002</pubdate>
 </chapterinfo>