summaryrefslogtreecommitdiff
path: root/docs/docbook/global.ent
diff options
context:
space:
mode:
Diffstat (limited to 'docs/docbook/global.ent')
-rw-r--r--docs/docbook/global.ent62
1 files changed, 48 insertions, 14 deletions
diff --git a/docs/docbook/global.ent b/docs/docbook/global.ent
index c34151ea05..c71166b4d7 100644
--- a/docs/docbook/global.ent
+++ b/docs/docbook/global.ent
@@ -8,20 +8,25 @@
<!ENTITY email.patches 'samba-patches@samba.org'>
<!ENTITY email.jelmer 'jelmer@samba.org'>
+
<!-- Author entities -->
-<!ENTITY author.jelmer '
-<author>
+<!ENTITY person.jelmer '
<firstname>Jelmer</firstname><surname>Vernooij</surname>
-<affiliation><orgname>The Samba Team</orgname><address><email>jelmer@samba.org</email></address></affiliation>
-</author>
-'>
+<affiliation>
+ <orgname>The Samba Team</orgname>
+ <address><email>jelmer@samba.org</email></address>
+</affiliation>'>
-<!ENTITY author.jerry '
-<author>
-<firstname>Gerald (Jerry)</firstname><surname>Carter</surname>
-<affiliation><orgname>Samba Team</orgname><address><email>jerry@samba.org</email></address></affiliation>
-</author>
-'>
+<!ENTITY author.jelmer '<author>&person.jelmer;</author>'>
+
+<!ENTITY person.jerry '
+<firstname>Gerald</firstname><surname>Carter</surname><othername>(Jerry)</othername>
+<affiliation>
+ <orgname>Samba Team</orgname>
+ <address><email>jerry@samba.org</email></address>
+</affiliation>'>
+
+<!ENTITY author.jerry '<author>&person.jerry;</author>'>
<!ENTITY author.jeremy '
<author>
@@ -32,15 +37,44 @@
</affiliation>
</author>'>
-<!ENTITY author.jht '
+<!ENTITY person.jht '
+<firstname>John H</firstname><surname>Terpstra</surname>
+<affiliation>
+ <orgname>Samba Team</orgname>
+ <address><email>jht@samba.org</email></address>
+</affiliation>
+'>
+
+<!ENTITY author.jht '<author>&person.jht;</author>'>
+
+<!ENTITY author.tridge '
+<author>
+ <firstname>Andrew</firstname><surname>Tridgell</surname>
+ <affiliation>
+ <orgname>Samba Team</orgname>
+ <address><email>tridge@samba.org</email></address>
+ </affiliation>
+</author>'>
+
+<!ENTITY author.jmcd '
<author>
- <firstname>John H</firstname><surname>Terpstra</surname>
+ <firstname>Jim</firstname><surname>McDonough</surname>
+ <affiliation>
+ <orgname>IBM</orgname>
+ <address><email>jmcd@us.ibm.com</email></address>
+ </affiliation>
+</author>'>
+
+<!ENTITY author.vl '
+<author>
+ <firstname>Volker</firstname><surname>Lendecke</surname>
<affiliation>
<orgname>Samba Team</orgname>
- <address><email>jht@samba.org</email></address>
+ <address><email>Volker.Lendecke@SerNet.DE</email></address>
</affiliation>
</author>'>
+
<!-- URL's -->
<!ENTITY url.samba.cvsinfo 'http://pserver.samba.org/samba/cvs.html'>
<!ENTITY url.pdc-howto.local 'samba-pdc-howto.html'>