Another progress edit.

(This used to be commit 58d2ba33dde4c28032d83b0161ac32fcc1b7d0ae)

4 files changed, 57 insertions, 27 deletions

diff --git a/docs/Samba-Guide/SBE-500UserNetwork.xml b/docs/Samba-Guide/SBE-500UserNetwork.xml
index 0f13769ebf..d86b97d044 100644
--- a/docs/Samba-Guide/SBE-500UserNetwork.xml
+++ b/docs/Samba-Guide/SBE-500UserNetwork.xml
@@ -1540,10 +1540,14 @@ net groupmap add ntgroup="Insurance Group"     unixgroup=piops type=d
         </para>
 
         <para>
-        Last, each service must be started to permit system validation to proceed.
+        Last, each service must be started to permit system validation to proceed. The following steps
+		are for a Red Hat Linux system, please adapt them to suit the target OS platform on which you 
+		are installing Samba.
         </para>
 
         <procedure>
+		<title>Process Startup Configuration Steps</title>
+
                 <step><para>
                 Use the standard system tool to configure each service to restart
                 automatically at every system reboot. For example,
@@ -1585,6 +1589,8 @@ net groupmap add ntgroup="Insurance Group"     unixgroup=piops type=d
 	</para>
 
 	<procedure>
+	<title>Windows Client Configuration Steps</title>
+
 		<step><para>
 		Install MS Windows XP Professional. During installation, configure the client to use DHCP for 
 		TCP/IP protocol configuration.
@@ -1637,6 +1643,8 @@ net groupmap add ntgroup="Insurance Group"     unixgroup=piops type=d
 		Install printers on each machine using the following steps:
 
 			<procedure>
+			<title>Steps to Install Printer Drivers on Windows Clients</title>
+
 				<step><para>
 				Click <menuchoice>
 					<guimenu>Start</guimenu>
diff --git a/docs/Samba-Guide/SBE-MakingHappyUsers.xml b/docs/Samba-Guide/SBE-MakingHappyUsers.xml
index 98b7e9aade..4173fd267c 100644
--- a/docs/Samba-Guide/SBE-MakingHappyUsers.xml
+++ b/docs/Samba-Guide/SBE-MakingHappyUsers.xml
@@ -71,8 +71,7 @@ clients is conservative and if followed will minimize problems &smbmdash; but it
 
 			<itemizedlist>
 				<listitem><para>
-				<indexterm><primary>NetBIOS</primary><secondary>name resolution</secondary>
-					<tertiary>delays</tertiary></indexterm>
+				<indexterm><primary>NetBIOS</primary><secondary>name resolution</secondary><tertiary>delays</tertiary></indexterm>
 				<indexterm><primary>WINS</primary><secondary>server</secondary></indexterm>
 				Excessive delays in the resolution of a NetBIOS name to its IP
 				address. This may be observed when an overloaded domain controller 
@@ -90,8 +89,7 @@ clients is conservative and if followed will minimize problems &smbmdash; but it
 				</para></listitem>
 
 				<listitem><para>
-				<indexterm><primary>networking hardware</primary>
-					<secondary>defective</secondary></indexterm>
+				<indexterm><primary>networking hardware</primary><secondary>defective</secondary></indexterm>
 				Defective networking hardware. Over the past few years, we have seen
 				on the Samba mailing list a significant increase in the number of
 				problems that were traced to a defective network interface controller,
@@ -101,10 +99,8 @@ clients is conservative and if followed will minimize problems &smbmdash; but it
 				</para></listitem>
 
 				<listitem><para>
-				<indexterm><primary>profile</primary>
-					<secondary>roaming</secondary></indexterm>
-				<indexterm><primary>MS Outlook</primary>
-					<secondary>PST file</secondary></indexterm>
+				<indexterm><primary>profile</primary><secondary>roaming</secondary></indexterm>
+				<indexterm><primary>MS Outlook</primary><secondary>PST file</secondary></indexterm>
 				Excessively large roaming profiles. This type of problem is typically
 				the result of poor user education as well as poor network management.
 				It can be avoided by users not storing huge quantities of email in
@@ -1046,6 +1042,7 @@ logdir /data/logs
 		</para>
 
 		<procedure>
+		<title>NSS_LDAP Diagnostic Steps</title>
 
 			<step><para>
 			Verify the <constant>nss_base_passwd, nss_base_shadow, nss_base_group</constant> entries
@@ -1384,6 +1381,7 @@ They could just as well be located under the rdn <constant>cn=NextFreeUnixId</co
 	</para>
 
 	<procedure>
+	<title>OpenLDAP Server Configuration Steps</title>
 
 		<step><para>
 		<indexterm><primary>/etc/openldap/slapd.conf</primary></indexterm>
@@ -1548,6 +1546,7 @@ index default               sub
 	</para>
 
 	<procedure>
+	<title>PAM and NSS Client Configuration Steps</title>
 
 		<step><para>
 		<indexterm><primary>/lib/libnss_ldap.so.2</primary></indexterm>
@@ -1947,6 +1946,7 @@ change the path to them in your &smb.conf; file on the PDC (<constant>MASSIVE</c
 	</para>
 
 	<procedure id="idealxscript">
+	<title>Unpacking and Installation Steps for the <constant>smbldap-tools</constant> Tarball</title>
 
 		<step><para>
 		Create the <filename>/opt/IDEALX/sbin</filename> directory, and set its permissions
@@ -2021,6 +2021,7 @@ my $smbldap_bind_conf="/etc/smbldap-tools/smbldap_bind.conf";
 	</para>
 
 	<procedure>
+	<title>Installation Steps for <constant>smbldap-tools</constant> RPM's</title>
 
 		<step><para>
 		Install the source RPM that has been downloaded as follows:
@@ -2091,6 +2092,7 @@ my $smbldap_bind_conf="/etc/smbldap-tools/smbldap_bind.conf";
 	</para>
 
 	<procedure>
+	<title>Configuration Steps for <constant>smbldap-tools</constant> to Enable Use</title>
 
 		<step><para>
 		Change into the directory that contains the <filename>configure.pl</filename> script.
@@ -2379,6 +2381,8 @@ writing new configuration file:
 	</table>
 
 	<procedure id="creatacc">
+	<title>LDAP Directory Initialization Steps</title>
+
 		<step><para>
 		Start the LDAP server by executing:
 <screen>
@@ -2807,7 +2811,7 @@ Joined domain MEGANET2.
 
         Sharename      Type      Comment
         ---------      ----      -------
-        IPC$           IPC       IPC Service (Samba 3.0.1)
+        IPC$           IPC       IPC Service (Samba 3.0.20)
         accounts       Disk      Accounting Files
         service        Disk      Financial Services Files
         pidata         Disk      Property Insurance Files
@@ -2815,11 +2819,11 @@ Joined domain MEGANET2.
         netlogon       Disk      Network Logon Service
         profiles       Disk      Profile Share
         profdata       Disk      Profile Data Share
-        ADMIN$         IPC       IPC Service (Samba 3.0.1)
+        ADMIN$         IPC       IPC Service (Samba 3.0.20)
 
         Server               Comment
         ---------            -------
-        MASSIVE              Samba 3.0.1
+        MASSIVE              Samba 3.0.20
 
         Workgroup            Master
         ---------            -------
@@ -2968,6 +2972,7 @@ application/octet-stream
 
 	<procedure>
 	<title>Configuration of BDC Called: <constant>BLDG1</constant></title>
+
 		<step><para>
 		Install the files in <link linkend="sbehap-bldg1-smbconf"/>,
 		<link linkend="sbehap-shareconfa"/>, and <link linkend="sbehap-shareconfb"/>
@@ -3019,9 +3024,8 @@ bldg1$:x:1006:553:bldg1$:/dev/null:/bin/false
 		This is the correct output. If the accounts that have UIDs above 512 are not shown, there is a problem.
 		</para></step>
 
-	<step><para><indexterm>
-	      <primary>getent</primary>
-	    </indexterm>
+		<step><para>
+		<indexterm><primary>getent</primary></indexterm>
 		The next step in the verification process involves testing the operation of UNIX group
 		resolution via the NSS LDAP resolver. Execute these commands:
 <screen>
@@ -3178,6 +3182,11 @@ smb: \> q
 
 	</procedure>
 
+	<para>
+	Now that the first BDC (<constant>BDLG1</constant>) has been configured it is time to build 
+	and configure the second BDC server (<constant>BLDG2</constant>) as follows:
+	</para>
+
 	<procedure id="sbehap-bldg2">
 	<title>Configuration of BDC Called <constant>BLDG2</constant></title>
 
@@ -3519,6 +3528,7 @@ structuralObjectClass: organizationalUnit
 	</para>
 
 	<procedure>
+	<title>Steps for Assignment of User Rights and Privileges</title>
 
 		<step><para>
 		Log onto the PDC as the <constant>root</constant> account.
@@ -3737,6 +3747,12 @@ HKEY_LOCAL_MACHINE\Default\Software\Microsoft\Windows\
 
 	</procedure>
 
+	<para>
+	Before puching out new desktop images for the client workstations, it is perhaps a good idea that
+	desktop behavior should be returned to the original Microsoft settings. The followin steps achieve
+	that ojective:
+	</para>
+
 	<procedure>
 	<title>Reset Folder Display to Original Behavior</title>
 
@@ -3913,6 +3929,7 @@ HKEY_LOCAL_MACHINE\Default\Software\Microsoft\Windows\
 	</para>
 
 	<procedure>
+	<title>Steps to Install Printer Drivers on the Samba Servers</title>
 
 		<step><para>
 		Join your Windows XP Professional workstation (the staging machine) to the 
diff --git a/docs/Samba-Guide/SBE-SecureOfficeServer.xml b/docs/Samba-Guide/SBE-SecureOfficeServer.xml
index 6d9db6b9c1..5b824a195f 100644
--- a/docs/Samba-Guide/SBE-SecureOfficeServer.xml
+++ b/docs/Samba-Guide/SBE-SecureOfficeServer.xml
@@ -223,9 +223,7 @@
 		<indexterm><primary>iptables</primary></indexterm>
 		<indexterm><primary>NAT</primary></indexterm>
 		<indexterm><primary>Network Address Translation</primary><see>NAT</see></indexterm>
-	  <indexterm>
-	    <primary>firewall</primary>
-	  </indexterm>
+		<indexterm><primary>firewall</primary></indexterm>
 		You know that your ISP is providing full firewall services, but you cannot rely on that.
 		Always assume that human error will occur, so be prepared by using Linux firewall facilities
 		based on <command>iptables</command> to effect NAT. Block all
@@ -239,9 +237,8 @@
 		covered except insofar as this affects Samba-3.
 		</para>
 
-	<para><indexterm>
-	    <primary>login</primary>
-	  </indexterm>
+		<para>
+		<indexterm><primary>login</primary></indexterm>
 		Notebook computers are configured to use a network login when in the office and a
 		local account to log in while away from the office. Users store all work done in
 		transit (away from the office) by using a local share for work files. Standard procedures
@@ -252,9 +249,8 @@
 		records.
 		</para>
 
-	<para><indexterm>
-	    <primary>application server</primary>
-	  </indexterm>
+		<para>
+		<indexterm><primary>application server</primary></indexterm>
 		All applications are served from the central server from a share called <constant>apps</constant>.
 		Microsoft Office XP Professional and OpenOffice 1.1.0 will be installed using a network 
 		(or administrative) installation. Accounting and financial management software can also
@@ -619,6 +615,8 @@ Given 500 Users and 2 years:
 	</para>
 
 	<procedure>
+	<title>Server Configuration Steps</title>
+
 		<step><para>
 		<indexterm><primary>hostname</primary></indexterm>
 		Using the UNIX/Linux system tools, name the server <constant>server.abmas.us</constant>.
@@ -787,6 +785,8 @@ echo -e "\nNAT firewall done.\n"
 	</para>
 
 	<procedure>
+	<title>Samba Configuration Steps</title>
+
 		<step><para>
 		Install the Samba-3 binary RPM from the Samba-Team FTP site. Assuming that the binary
 		RPM file is called <filename>samba-3.0.20-1.i386.rpm</filename>, one way to install this
@@ -1145,6 +1145,8 @@ net use p: \\diamond\apps
 	</para>
 
 	<procedure>
+	<title>DHCP and DNS Server Configuration Steps</title>
+
 		<step><para>
 		<indexterm><primary>/etc/dhcpd.conf</primary></indexterm>
 		Create a file called <filename>/etc/dhcpd.conf</filename> with the contents as
@@ -1601,8 +1603,8 @@ application/octet-stream
 	</procedure>
 
 	<para>
-	Note: The last two steps can be omitted where CUPS version 1.1.18, or later, is used &smbmdash; so
-	long as the parameter <parameter>cups options = Raw</parameter> is specified in the &smb.conf; file.
+	Note: If the parameter <parameter>cups options = Raw</parameter> is specified in the &smb.conf; file,
+	the last two steps can be omitted where CUPS version 1.1.18, or later.
 	</para>
 
 	<para>
@@ -1690,6 +1692,7 @@ application/octet-stream
 	</para>
 
 		<procedure>
+		<title>Server Validation Steps</title>
 
 			<step><para>
 			<indexterm><primary>/etc/nsswitch.conf</primary></indexterm>
diff --git a/docs/Samba-Guide/SBE-TheSmallOffice.xml b/docs/Samba-Guide/SBE-TheSmallOffice.xml
index cf0079ae4a..c9e2d3c0e4 100644
--- a/docs/Samba-Guide/SBE-TheSmallOffice.xml
+++ b/docs/Samba-Guide/SBE-TheSmallOffice.xml
@@ -294,6 +294,8 @@
 	</image>
 
 	<procedure>
+	<title>Server Installation Steps</title>
+
 		<step><para>
 		Using UNIX/Linux system tools, name the server <constant>sleeth</constant>.
 		</para></step>
@@ -700,6 +702,7 @@ hosts:	files wins
 		</para>
 
 		<procedure>
+		<title>Validation Steps</title>
 
 			<step><para>
 			<indexterm><primary>testparm</primary></indexterm>
@@ -738,7 +741,6 @@ Loaded services file OK.
         domain logons = Yes
         preferred master = Yes
         wins support = Yes
-        printing = cups
 ...
 ### Remainder cut to save space ###
 </screen>