Index: server/other/openldap.xml
===================================================================
--- server/other/openldap.xml	(revision 9905a3c983a59420585a6cf136a992a692fca1cc)
+++ server/other/openldap.xml	(revision 9905a3c983a59420585a6cf136a992a692fca1cc)
@@ -0,0 +1,12 @@
+<sect1 id="openldap" xreflabel="openldap-&openldap-version;">
+<?dbhtml filename="openldap.html" dir="server"?>
+<title>openldap-&openldap-version;</title>
+
+&openldap-intro;
+&openldap-inst;
+&openldap-exp;
+&openldap-config;
+&openldap-desc;
+
+</sect1>
+
Index: server/other/other.xml
===================================================================
--- server/other/other.xml	(revision a338b482a62c273c427947d55475dbba063df13d)
+++ server/other/other.xml	(revision 9905a3c983a59420585a6cf136a992a692fca1cc)
@@ -3,11 +3,12 @@
 <title>Other Server Software</title>
 
+&bind;
+&cvsserver;
+&dhcp;
+&leafnode;
 &openssh;
-&cvsserver;
-&bind;
-&dhcp;
+&openldap;
+&samba;
 &xinetd;
-&leafnode;
-&samba;
 
 </chapter>
Index: server/other/samba/samba-config-exp.xml
===================================================================
--- server/other/samba/samba-config-exp.xml	(revision a338b482a62c273c427947d55475dbba063df13d)
+++ server/other/samba/samba-config-exp.xml	(revision 9905a3c983a59420585a6cf136a992a692fca1cc)
@@ -1,6 +1,5 @@
 <sect2>
 <title>Configuration command explanations</title>
-<para><userinput>
-cat &gt; /etc/samba/smb.conf &lt;&lt; "EOF" :</userinput>
+<para><userinput>cat &gt; /etc/samba/smb.conf &lt;&lt; "EOF" :</userinput>
 Create a default Samba configuration file.  This configuration will
 allow Samba to act as a Primary Domain Controller for a Microsoft
@@ -13,13 +12,10 @@
 
 
-<para><userinput>
-cat &gt; /etc/rc.d/init.d/samba &lt;&lt; "EOF" :</userinput>
+<para><userinput>cat &gt; /etc/rc.d/init.d/samba &lt;&lt; "EOF" :</userinput>
 Create the Samba boot script, used to start and stop Samba
 automatically on machine startup and shutdown.</para>
 
-<para><screen><userinput>
-/usr/sbin/useradd -g 100 -d /dev/null -c \
-    "Win2k Server" -s /bin/false win2kbox$ :
-</userinput></screen>
+<para><screen><userinput>/usr/sbin/useradd -g 100 -d /dev/null -c \
+    "Win2k Server" -s /bin/false win2kbox$ :</userinput></screen>
 This command creates a machine trust account, necessary only for
 Windows 2000/NT servers to authenticate to our new PDC.  Machine trust
@@ -30,12 +26,10 @@
 Register the swat service to run on port 901.</para> 
 
-<para><userinput>
-echo "swat stream tcp nowait.400 root /usr/sbin/swat swat" &gt;&gt;
+<para><userinput>echo "swat stream tcp nowait.400 root /usr/sbin/swat swat" &gt;&gt;
 /etc/inetd.conf :</userinput> Instruct inetd where to find and how to
 run swat.</para> 
 
 <para>
-<userinput>
-ln -s  /etc/rc.d/init.d/samba /etc/rc.d/rc3.d/S600samba, etc. :</userinput>
+<userinput>ln -s  /etc/rc.d/init.d/samba /etc/rc.d/rc3.d/S600samba, etc. :</userinput>
 Create the Samba boot scripts, used to start and stop Samba
 automatically on machine startup and shutdown.</para>
Index: server/other/samba/samba-config.xml
===================================================================
--- server/other/samba/samba-config.xml	(revision a338b482a62c273c427947d55475dbba063df13d)
+++ server/other/samba/samba-config.xml	(revision 9905a3c983a59420585a6cf136a992a692fca1cc)
@@ -9,24 +9,18 @@
 documentation by pointing a web browser to:</para>
 
-<para><screen><userinput>
-file:///usr/share/samba/swat/using_samba/ch03_01.html#ch03-55770
-.</userinput></screen></para>
+<para><screen><userinput>file:///usr/share/samba/swat/using_samba/ch03_01.html#ch03-55770.</userinput></screen></para>
 
 <sect3><title>Config files</title>
-<para><userinput>
-/etc/samba/smb.conf, /etc/rc.d/init.d/samba </userinput></para>
+<para><userinput>/etc/samba/smb.conf, /etc/rc.d/init.d/samba </userinput></para>
 
 <para>First we set up some directories needed by Samba:</para>
-<para><screen><userinput>
-mkdir /var/lib/samba &amp;&amp;
+<para><screen><userinput>mkdir /var/lib/samba &amp;&amp;
 mkdir /var/lib/samba/netlogon &amp;&amp;
 mkdir /var/lib/samba/ntprofile &amp;&amp;
 mkdir /var/lib/samba/profiles &amp;&amp;
-chmod -R 1777 /var/lib/samba
-</userinput></screen></para>
+chmod -R 1777 /var/lib/samba</userinput></screen></para>
 
 <para>And the Samba configuration file: </para>
-<para><screen><userinput>
-cat &gt; /etc/samba/smb.conf &lt;&lt; "EOF"
+<para><screen><userinput>cat &gt; /etc/samba/smb.conf &lt;&lt; "EOF"
 [global]
     netbios name = SAMBABOX
@@ -65,6 +59,5 @@
         read only = no
         public = no
-EOF
-</userinput></screen></para>
+EOF </userinput></screen></para>
 
 <para>Now add the machine trust account for WIN2KBOX:</para>
@@ -77,6 +70,5 @@
 
 <para>Create the Samba boot script:</para>
-<para><screen><userinput>
-cat &gt; /etc/rc.d/init.d/samba &lt;&lt; "EOF"
+<para><screen><userinput>cat &gt; /etc/rc.d/init.d/samba &lt;&lt; "EOF"
 #!/bin/bash
 # Begin $rc_base/init.d/samba
@@ -141,7 +133,5 @@
 first in order to join WIN2KBOX to the DOMAIN01 domain: </para>
 
-<para><screen><userinput>
-smbpasswd -a root
-</userinput></screen></para>
+<para><screen><userinput>smbpasswd -a root</userinput></screen></para>
 
 <para>After starting Samba and adding root to the Samba user list, the
@@ -163,43 +153,33 @@
 9.  Click OK in the reboot reminder dialog box.
 10. Click OK to close the System Properties window.
-11. Click Yes to reboot WIN2KBOX.
-</userinput></screen></para></sect3>
+11. Click Yes to reboot WIN2KBOX.  </userinput></screen></para></sect3>
 
 <sect3><title>Add a new user to the DOMAIN01 domain.</title>
 <para>Before logging on to WIN2KBOX, we will create a new user with
     the following commands:</para>
-<para><screen><userinput>
-useradd -m win2kuser01 &amp;&amp;
+<para><screen><userinput>useradd -m win2kuser01 &amp;&amp;
 passwd win2kuser01 &amp;&amp;
-smbpasswd -a win2kuser01 
-</userinput></screen></para></sect3>
+smbpasswd -a win2kuser01</userinput></screen></para></sect3>
 
 <sect3><title>Logging on to DOMAIN01.</title>
 <para>Now we will log on the the domain as our newly created user as
     follows:</para> 
-<para><screen><userinput>
-1. Press Ctrl-Alt-Del to bring up the Log On to Windows dialog box.
+<para><screen><userinput>1. Press Ctrl-Alt-Del to bring up the Log On to Windows dialog box.
 2. Enter the win2kuser01 name and password.
-3. Select DOMAIN01 from the Log on to: combination box and click OK.
-</userinput></screen></para>
+3. Select DOMAIN01 from the Log on to: combination box and click OK.</userinput></screen></para>
 
 <para>Add the swat entry to <filename>/etc/services</filename>with the
 following command: </para>
 
-<para><screen><userinput>
-echo "swat            901/tcp" &gt;&gt; /etc/services
-</userinput></screen></para>
+<para><screen><userinput>echo "swat            901/tcp" &gt;&gt; /etc/services</userinput></screen></para>
 
 <para>If inetd is used, the following command will add the swat entry
 to <filename>/etc/inetd.conf</filename>: </para>
-<para><screen><userinput>
-echo "swat stream tcp nowait.400 root /usr/sbin/swat swat" \
-    &gt;&gt; /etc/inetd.conf
-</userinput></screen></para>
+<para><screen><userinput>echo "swat stream tcp nowait.400 root /usr/sbin/swat swat" \
+    &gt;&gt; /etc/inetd.conf</userinput></screen></para>
 
 <para>If xinetd is used, the following command will add the swat entry
 to <filename>/etc/xinetd.conf</filename>: </para>
-<para><screen><userinput>
-cat &gt;&gt; /etc/xinetd.conf &lt;&lt; "EOF"
+<para><screen><userinput>cat &gt;&gt; /etc/xinetd.conf &lt;&lt; "EOF"
 service swat
 {
@@ -212,12 +192,9 @@
     log_on_failure  += USERID
 }
-EOF
-</userinput></screen></para>
+EOF</userinput></screen></para>
 
 <para>The Samba Web Administration Tool, swat, can be launched with the
 following command on SAMBABOX: </para>
-<para><screen><userinput>
-lynx http://localhost:901
-</userinput></screen></para>
+<para><screen><userinput>lynx http://localhost:901 </userinput></screen></para>
 <note><para>Be sure inetd is running, and issue a killall -HUP inetd
 before starting swat.</para></note>
Index: server/server.ent
===================================================================
--- server/server.ent	(revision a338b482a62c273c427947d55475dbba063df13d)
+++ server/server.ent	(revision 9905a3c983a59420585a6cf136a992a692fca1cc)
@@ -3,32 +3,34 @@
 <!-- Mail server software -->
 <!ENTITY server-mail SYSTEM "mail/mail.xml">
-<!ENTITY % postfix SYSTEM "mail/postfix/postfix.ent">
-<!ENTITY % qmail SYSTEM "mail/qmail/qmail.ent">
-<!ENTITY % sendmail SYSTEM "mail/sendmail/sendmail.ent">
-<!ENTITY % exim SYSTEM "mail/exim/exim.ent">
-<!ENTITY % qpopper SYSTEM "mail/qpopper/qpopper.ent">
-<!ENTITY % courier SYSTEM "mail/courier/courier.ent">
+<!ENTITY % postfix   SYSTEM "mail/postfix/postfix.ent">
+<!ENTITY % qmail     SYSTEM "mail/qmail/qmail.ent">
+<!ENTITY % sendmail  SYSTEM "mail/sendmail/sendmail.ent">
+<!ENTITY % exim      SYSTEM "mail/exim/exim.ent">
+<!ENTITY % qpopper   SYSTEM "mail/qpopper/qpopper.ent">
+<!ENTITY % courier   SYSTEM "mail/courier/courier.ent">
+%exim;
 %postfix;
 %qmail;
+%qpopper;
 %sendmail;
-%exim;
-%qpopper;
 %courier;
 
 <!-- Other server software -->
 <!ENTITY server-other SYSTEM "other/other.xml">
-<!ENTITY % cvsserver SYSTEM "other/cvsserver/cvsserver.ent">
-<!ENTITY % openssh SYSTEM "other/openssh/openssh.ent">
-<!ENTITY % bind SYSTEM "other/bind/bind.ent">
-<!ENTITY % dhcp SYSTEM "other/dhcp/dhcp.ent">
-<!ENTITY % xinetd SYSTEM "other/xinetd/xinetd.ent">
-<!ENTITY % leafnode SYSTEM "other/leafnode/leafnode.ent">
-<!ENTITY % samba SYSTEM "other/samba/samba.ent">
+<!ENTITY % cvsserver  SYSTEM "other/cvsserver/cvsserver.ent">
+<!ENTITY % openssh    SYSTEM "other/openssh/openssh.ent">
+<!ENTITY % bind       SYSTEM "other/bind/bind.ent">
+<!ENTITY % dhcp       SYSTEM "other/dhcp/dhcp.ent">
+<!ENTITY % xinetd     SYSTEM "other/xinetd/xinetd.ent">
+<!ENTITY % leafnode   SYSTEM "other/leafnode/leafnode.ent">
+<!ENTITY % samba      SYSTEM "other/samba/samba.ent">
+<!ENTITY % openldap   SYSTEM "other/openldap/openldap.ent">
 
+%bind;
+%cvsserver;
+%dhcp;
+%leafnode;
+%openldap;
 %openssh;
-%cvsserver;
-%bind;
-%dhcp;
+%samba;
 %xinetd;
-%leafnode;
-%samba;
