Lots of minor, mostly layout fixes.

(This used to be commit 99674fdbd12caca61baa00974a492a9a26d982e9)

7 files changed, 426 insertions, 350 deletions

diff --git a/docs/docbook/projdoc/AccessControls.xml b/docs/docbook/projdoc/AccessControls.xml
index 38c3475d34..6a56705a54 100644
--- a/docs/docbook/projdoc/AccessControls.xml
+++ b/docs/docbook/projdoc/AccessControls.xml
@@ -176,11 +176,11 @@ at how Samba helps to bridge the differences.
 		</para>
 		<para>
 		Consider the following, all are unique Unix names but one single MS Windows file name:
-			<programlisting>
+		<computeroutput>
 				MYFILE.TXT
 				MyFile.txt
 				myfile.txt
-			</programlisting>
+		</computeroutput>
 		So clearly, In an MS Windows file name space these three files CAN NOT co-exist! But in Unix 
 		they can. So what should Samba do if all three are present? Answer, the one that is lexically
 		first will be accessible to MS Windows users, the others are invisible and unaccessible - any
@@ -246,13 +246,17 @@ at how Samba helps to bridge the differences.
 
 	<para>
 	There are three basic operations for managing directories, <command>create, delete, rename</command>.
-	<programlisting>
-		Action    MS Windows Command         Unix Command
-		------    ------------------         ------------
-		create    md folder                 mkdir folder
-		delete    rd folder                 rmdir folder
-		rename    rename oldname newname    mv oldname newname
-	</programlisting>
+	<table>
+		<thead>
+		<row><entry>Action</entry><entry>MS Windows Command</entry><entry>Unix Command</entry></row>
+		</thead>
+	
+		<tbody>
+			<row><entry>create</entry><entry>md folder</entry><entry>mkdir folder</entry></row>
+			<row><entry>delete</entry><entry>rd folder</entry><entry>rmdir folder</entry></row>
+			<row><entry>rename</entry><entry>rename oldname newname</entry><entry>mv oldname newname</entry></row>
+		</tbody>
+	</table>
 	</para>
 
 	</sect2>
@@ -271,8 +275,8 @@ at how Samba helps to bridge the differences.
 	Unix/Linux file and directory access permissions invloves setting three (3) primary sets of data and one (1) control set.
 	A Unix file listing looks as follows:-
 
-	<programlisting>
-	jht@frodo:~/stuff> ls -la
+	<screen>
+	<prompt>jht@frodo:~/stuff> </prompt><userinput>ls -la</userinput>
 	total 632
 	drwxr-xr-x   13 jht   users      816 2003-05-12 22:56 .
 	drwxr-xr-x   37 jht   users     3800 2003-05-12 22:29 ..
@@ -293,8 +297,8 @@ at how Samba helps to bridge the differences.
 	-r-xr-xr-x    1 jht   users   206339 2003-05-12 22:32 mydata05.lst
 	-rw-rw-rw-    1 jht   users    41105 2003-05-12 22:32 mydata06.lst
 	-rwxrwxrwx    1 jht   users    19312 2003-05-12 22:32 mydata07.lst
-	jht@frodo:~/stuff>
-	</programlisting>
+	<prompt>jht@frodo:~/stuff></prompt>
+	</screen>
 	</para>
 
 	<para>
@@ -305,6 +309,7 @@ at how Samba helps to bridge the differences.
 	The permissions field is made up of:
 
 	<programlisting>
+	<!-- JRV: Put this into a diagram of some sort -->
 	[ type  ] [ users ] [ group ] [ others ]   [File, Directory Permissions]
 	[ d | l ] [ r w x ] [ r w x ] [ r w x  ]
 	  |   |     | | |     | | |     | | |
@@ -324,6 +329,7 @@ at how Samba helps to bridge the differences.
 
 	<para>
 	Any bit flag may be unset. An unset bit flag is the equivalent of 'Can NOT' and is represented as a '-' character.
+	<!-- FIXME -->
 	<programlisting>
 	<title>Example File</title>
 		-rwxr-x---   Means: The owner (user) can read, write, execute
@@ -337,7 +343,7 @@ at how Samba helps to bridge the differences.
 	</para>
 
 	<para>
-	The letters `rwxXst' set permissions for the user, group and others as: read (r), write (w), execute (or access for directories) (x),r
+		The letters `rwxXst' set permissions for the user, group and others as: read (r), write (w), execute (or access for directories) (x),r
 	execute  only  if  the  file  is a directory or already has execute permission for some user (X), set user or group ID on execution (s),
 	sticky (t).
 	</para>
@@ -809,7 +815,7 @@ Before using any of the following options please refer to the man page for &smb.
 	<sect2>
 		<title>Viewing file ownership</title>
 
-		<para>Clicking on the <command>"Ownership"</command> button 
+		<para>Clicking on the <guibutton>Ownership</guibutton> button 
 		brings up a dialog box telling you who owns the given file. The 
 		owner name will be of the form :</para>
 
@@ -819,14 +825,14 @@ Before using any of the following options please refer to the man page for &smb.
 		the Samba server, <replaceable>user</replaceable> is the user name of 
 		the UNIX user who owns the file, and <replaceable>(Long name)</replaceable>
 		is the descriptive string identifying the user (normally found in the
-		GECOS field of the UNIX password database). Click on the <command>Close
-		</command> button to remove this dialog.</para>
+		GECOS field of the UNIX password database). Click on the 
+		<guibutton>Close </guibutton> button to remove this dialog.</para>
 
 		<para>If the parameter <parameter>nt acl support</parameter>
 		is set to <constant>false</constant> then the file owner will 
-		be shown as the NT user <command>"Everyone"</command>.</para>
+		be shown as the NT user <constant>"Everyone"</constant>.</para>
 
-		<para>The <command>Take Ownership</command> button will not allow 
+		<para>The <guibutton>Take Ownership</guibutton> button will not allow 
 		you to change the ownership of this file to yourself (clicking on 
 		it will display a dialog box complaining that the user you are 
 		currently logged onto the NT client cannot be found). The reason 
@@ -849,12 +855,14 @@ Before using any of the following options please refer to the man page for &smb.
 	<sect2>
 		<title>Viewing File or Directory Permissions</title>
 
-		<para>The third button is the <command>"Permissions"</command> 
+		<para>The third button is the <guibutton>Permissions</guibutton> 
 		button. Clicking on this brings up a dialog box that shows both 
 		the permissions and the UNIX owner of the file or directory. 
 		The owner is displayed in the form :</para>
 
-		<para><command>"SERVER\user (Long name)"</command></para>
+		<para><command>"<replaceable>SERVER</replaceable>\
+				<replaceable>user</replaceable> 
+				<replaceable>(Long name)</replaceable>"</command></para>
 
 		<para>Where <replaceable>SERVER</replaceable> is the NetBIOS name of 
 		the Samba server, <replaceable>user</replaceable> is the user name of 
@@ -864,7 +872,7 @@ Before using any of the following options please refer to the man page for &smb.
 
 		<para>If the parameter <parameter>nt acl support</parameter>
 		is set to <constant>false</constant> then the file owner will 
-		be shown as the NT user <command>"Everyone"</command> and the 
+		be shown as the NT user <constant>"Everyone"</constant> and the 
 		permissions will be shown as NT "Full Control".</para>
 
 
@@ -880,18 +888,18 @@ Before using any of the following options please refer to the man page for &smb.
 			triples are mapped by Samba into a three element NT ACL 
 			with the 'r', 'w', and 'x' bits mapped into the corresponding 
 			NT permissions. The UNIX world permissions are mapped into 
-			the global NT group <command>Everyone</command>, followed 
+			the global NT group <constant>Everyone</constant>, followed 
 			by the list of permissions allowed for UNIX world. The UNIX 
 			owner and group permissions are displayed as an NT 
-			<command>user</command> icon and an NT <command>local 
-			group</command> icon respectively followed by the list 
+			<guiicon>user</guiicon> icon and an NT <guiicon>local 
+			group</guiicon> icon respectively followed by the list 
 			of permissions allowed for the UNIX user and group.</para>
 
 			<para>As many UNIX permission sets don't map into common 
-			NT names such as <command>"read"</command>, <command>
-			"change"</command> or <command>"full control"</command> then 
-			usually the permissions will be prefixed by the words <command>
-			"Special Access"</command> in the NT display list.</para>
+			NT names such as <constant>read</constant>, <constant>
+			"change"</constant> or <constant>full control</constant> then 
+			usually the permissions will be prefixed by the words <constant>
+			"Special Access"</constant> in the NT display list.</para>
 
 			<para>But what happens if the file has no permissions allowed 
 			for a particular UNIX user group or world component ? In order 
@@ -916,8 +924,8 @@ Before using any of the following options please refer to the man page for &smb.
 			above, and is displayed in the same way.</para>
 
 			<para>The second set of directory permissions has no real meaning 
-			in the UNIX permissions world and represents the <command>
-			"inherited"</command> permissions that any file created within 
+			in the UNIX permissions world and represents the <constant>
+			inherited</constant> permissions that any file created within 
 			this directory would inherit.</para>
 
 			<para>Samba synthesises these inherited permissions for NT by 
@@ -931,27 +939,27 @@ Before using any of the following options please refer to the man page for &smb.
 
 		<para>Modifying file and directory permissions is as simple 
 		as changing the displayed permissions in the dialog box, and 
-		clicking the <command>OK</command> button. However, there are 
+		clicking the <guibutton>OK</guibutton> button. However, there are 
 		limitations that a user needs to be aware of, and also interactions 
 		with the standard Samba permission masks and mapping of DOS 
 		attributes that need to also be taken into account.</para>
 
 		<para>If the parameter <parameter>nt acl support</parameter>
 		is set to <constant>false</constant> then any attempt to set 
-		security permissions will fail with an <command>"Access Denied"
-		</command> message.</para>
+		security permissions will fail with an <errorname>"Access Denied"
+		</errorname> message.</para>
 
-		<para>The first thing to note is that the <command>"Add"</command> 
+		<para>The first thing to note is that the <guibutton>"Add"</guibutton> 
 		button will not return a list of users in Samba (it will give 
-		an error message of <command>"The remote procedure call failed 
-		and did not execute"</command>). This means that you can only 
+		an error message of <errorname>The remote procedure call failed 
+		and did not execute</errorname>). This means that you can only 
 		manipulate the current user/group/world permissions listed in 
 		the dialog box. This actually works quite well as these are the 
 		only permissions that UNIX actually has.</para>
 
 		<para>If a permission triple (either user, group, or world) 
 		is removed from the list of permissions in the NT dialog box, 
-		then when the <command>"OK"</command> button is pressed it will 
+		then when the <guibutton>OK</guibutton> button is pressed it will 
 		be applied as "no permissions" on the UNIX side. If you then 
 		view the permissions again the "no permissions" entry will appear 
 		as the NT <command>"O"</command> flag, as described above. This 
@@ -966,15 +974,15 @@ Before using any of the following options please refer to the man page for &smb.
 		<para>When setting permissions on a directory the second 
 		set of permissions (in the second set of parentheses) is 
 		by default applied to all files within that directory. If this 
-		is not what you want you must uncheck the <command>"Replace 
-		permissions on existing files"</command> checkbox in the NT 
-		dialog before clicking <command>"OK"</command>.</para>
+		is not what you want you must uncheck the <guilabel>Replace 
+		permissions on existing files</guilabel> checkbox in the NT 
+		dialog before clicking <guibutton>OK</guibutton>.</para>
 
 		<para>If you wish to remove all permissions from a 
 		user/group/world  component then you may either highlight the 
-		component and click the <command>"Remove"</command> button, 
-		or set the component to only have the special <command>"Take
-		Ownership"</command> permission (displayed as <command>"O"
+		component and click the <guibutton>Remove</guibutton> button, 
+		or set the component to only have the special <constant>Take
+		Ownership</constant> permission (displayed as <command>"O"
 		</command>) highlighted.</para>
 	</sect2>
 
@@ -991,7 +999,7 @@ Before using any of the following options please refer to the man page for &smb.
 		<para><parameter>directory security mask</parameter></para>
 		<para><parameter>force directory security mode</parameter></para>
 
-		<para>Once a user clicks <command>"OK"</command> to apply the 
+		<para>Once a user clicks <guibutton>OK</guibutton> to apply the 
 		permissions Samba maps the given permissions into a user/group/world 
 		r/w/x triple set, and then will check the changed permissions for a 
 		file against the bits set in the <ulink url="smb.conf.5.html#SECURITYMASK"> 
@@ -1075,13 +1083,13 @@ Before using any of the following options please refer to the man page for &smb.
 
 		<para>What this can mean is that if the owner changes the permissions
 		to allow themselves read access using the security dialog, clicks
-		<command>"OK"</command> to get back to the standard attributes tab 
-		dialog, and then clicks <command>"OK"</command> on that dialog, then 
+		<guibutton>OK</guibutton> to get back to the standard attributes tab 
+		dialog, and then clicks <guibutton>OK</guibutton> on that dialog, then 
 		NT will set the file permissions back to read-only (as that is what 
 		the attributes still say in the dialog). This means that after setting 
-		permissions and clicking <command>"OK"</command> to get back to the 
-		attributes dialog you should always hit <command>"Cancel"</command> 
-		rather than <command>"OK"</command> to ensure that your changes 
+		permissions and clicking <guibutton>OK</guibutton> to get back to the 
+		attributes dialog you should always hit <guibutton>Cancel</guibutton> 
+		rather than <guibutton>OK</guibutton> to ensure that your changes 
 		are not overridden.</para>
 	</sect2>
 </sect1>
@@ -1099,10 +1107,12 @@ are examples taken from the mailing list in recent times.
 	<title>Users can not write to a public share</title>
 
 	<para>
+	<quote>
 	We are facing some troubles with file / directory permissions. I can log on the domain as admin user(root),
 	and theres a public share, on which everyone needs to have permission to create / modify files, but only
 	root can change the file, no one else can. We need to constantly go to server to
-	<command>chgrp -R users *</command> and <command>chown -R nobody *</command> to allow others users to change the file.
+	<userinput>chgrp -R users *</userinput> and <userinput>chown -R nobody *</userinput> to allow others users to change the file.
+	</quote>
 	</para>
 
 	<para>
@@ -1112,77 +1122,99 @@ are examples taken from the mailing list in recent times.
 	<procedure>
 	<title>Example Solution:</title>
 		<step>
-		<para>
-		Go to the top of the directory that is shared
-		</para>
+			<para>
+			Go to the top of the directory that is shared
+			</para>
 		</step>
 
 		<step>
-		<para>
-		Set the ownership to what ever public owner and group you want
-		<programlisting>
-		find 'directory_name' -type d -exec chown user.group {}\;
-		find 'directory_name' -type d -exec chmod 6775 'directory_name'
-		find 'directory_name' -type f -exec chmod 0775 {} \;
-		find 'directory_name' -type f -exec chown user.group {}\;
-		</programlisting>
-		</para>
+			<para>
+			Set the ownership to what ever public owner and group you want
+			<programlisting>
+			find 'directory_name' -type d -exec chown user.group {}\;
+			find 'directory_name' -type d -exec chmod 6775 'directory_name'
+			find 'directory_name' -type f -exec chmod 0775 {} \;
+			find 'directory_name' -type f -exec chown user.group {}\;
+			</programlisting>
+			</para>
 
-		<para>
-		Note: The above will set the 'sticky bit' on all directories. Read your
-		Unix/Linux man page on what that does. It causes the OS to assign to all
-		files created in the directories the ownership of the directory.
-		</para>
+			<note><para>
+			The above will set the 'sticky bit' on all directories. Read your
+			Unix/Linux man page on what that does. It causes the OS to assign 
+			to all files created in the directories the ownership of the 
+			directory.
+			</para></note>
+		</step>
+		<step>
+			<para>
 
-		<para>
-		<programlisting>
-		Directory is: /foodbar
-			chown jack.engr /foodbar
+			Directory is: <replaceable>/foodbar</replaceable>
+			<screen>
+				<prompt>$ </prompt><userinput>chown jack.engr /foodbar</userinput>
+			</screen>
+			</para>
 
-		Note: This is the same as doing:
-			chown jack /foodbar
-			chgrp engr /foodbar
+			<note><para>
+				<para>This is the same as doing:</para>
+				<screen>
+					<prompt>$ </prompt><userinput>chown jack /foodbar</userinput>
+					<prompt>$ </prompt><userinput>chgrp engr /foodbar</userinput>
+				</screen>
+			</para></note>
+		</step>
+		<step>
+			<para>Now do: 
 
-		Now do:
-			chmod 6775 /foodbar
-			ls -al /foodbar/..
+			<screen>
+				<prompt>$ </prompt><userinput>chmod 6775 /foodbar</userinput>
+				<prompt>$ </prompt><userinput>ls -al /foodbar/..</userinput>
+			</screen>
 
-		You should see:
-		drwsrwsr-x  2 jack  engr    48 2003-02-04 09:55 foodbar
+			</para>
+		
+			<para>You should see:
+			<screen>
+				drwsrwsr-x  2 jack  engr    48 2003-02-04 09:55 foodbar
+			</screen>
+			</para>
+		</step>
+		<step>
 
-		Now do:
-			su - jill
-			cd /foodbar
-			touch Afile
-			ls -al
-		</programlisting>
+		<para>Now do:
+			<screen>
+				<prompt>$ </prompt><userinput>su - jill</userinput>
+				<prompt>$ </prompt><userinput>cd /foodbar</userinput>
+				<prompt>$ </prompt><userinput>touch Afile</userinput>
+				<prompt>$ </prompt><userinput>ls -al</userinput>
+			</screen>
 		</para>
 
 		<para>
 		You should see that the file 'Afile' created by Jill will have ownership
 		and permissions of Jack, as follows:
-		<programlisting>
+		<screen>
 		-rw-r--r--  1 jack  engr     0 2003-02-04 09:57 Afile
-		</programlisting>
+		</screen>
 		</para>
 		</step>
 
 		<step>
 		<para>
-		Now in your smb.conf for the share add:
+		Now in your &smb.conf; for the share add:
 		<programlisting>
 		force create mode = 0775
 		force direcrtory mode = 6775
 		</programlisting>
 		</para>
 
-		<para>
-		Note: The above are only needed IF your users are NOT members of the group
+		<note><para>
+		The above are only needed IF your users are NOT members of the group
 		you have used. ie: Within the OS do not have write permission on the directory.
 		</para>
-
+		</note>
+		
 		<para>
-		An alternative is to set in the smb.conf entry for the share:
+		An alternative is to set in the &smb.conf; entry for the share:
 		<programlisting>
 		force user = jack
 		force group = engr
@@ -1192,7 +1224,6 @@ are examples taken from the mailing list in recent times.
 	</procedure>
 	</sect2>
 
-
 </sect1>
 
 </chapter>
diff --git a/docs/docbook/projdoc/AdvancedNetworkAdmin.xml b/docs/docbook/projdoc/AdvancedNetworkAdmin.xml
index e6e7347290..a52728d9c9 100644
--- a/docs/docbook/projdoc/AdvancedNetworkAdmin.xml
+++ b/docs/docbook/projdoc/AdvancedNetworkAdmin.xml
@@ -20,20 +20,20 @@ environment, and to make their lives a little easier.
 </para>
 
 <para>
-Since I don't need to buy an NT4 Server, how do I get the 'User Manager for Domains',
+	Since I don't need to buy an <application>NT4 Server</application>, how do I get the 'User Manager for Domains',
 the 'Server Manager'?
 </para>
 
 <para>
-Microsoft distributes a version of these tools called nexus for installation on Windows 9x / Me
-systems.  The tools set includes:
+Microsoft distributes a version of these tools called nexus for installation 
+on <application>Windows 9x / Me</application> systems.  The tools set includes:
 </para>
 
-<itemizedlist>
-	<listitem><para>Server Manager</para></listitem> 
-	<listitem><para>User Manager for Domains</para></listitem> 
-	<listitem><para>Event Viewer</para></listitem> 
-</itemizedlist>
+<simplelist>
+	<member>Server Manager</member>
+	<member>User Manager for Domains</member>
+	<member>Event Viewer</member>
+</simplelist>
 
 <para>
 Click here to download the archived file <ulink 
@@ -41,7 +41,7 @@ url="ftp://ftp.microsoft.com/Softlib/MSLFILES/NEXUS.EXE">ftp://ftp.microsoft.com
 </para>
 
 <para>
-The Windows NT 4.0 version of the 'User Manager for 
+The <application>Windows NT 4.0</application> version of the 'User Manager for 
 Domains' and 'Server Manager' are available from Microsoft via ftp 
 from <ulink url="ftp://ftp.microsoft.com/Softlib/MSLFILES/SRVTOOLS.EXE">ftp://ftp.microsoft.com/Softlib/MSLFILES/SRVTOOLS.EXE</ulink>
 </para>
@@ -69,7 +69,9 @@ There are several opportunities for creating a custom network startup configurat
 </simplelist>
 
 <para>
-The Samba source code tree includes two logon script generation/execution tools. See <filename>examples</filename> directory <filename>genlogon</filename> and <filename>ntlogon</filename> subdirectories.
+The Samba source code tree includes two logon script generation/execution tools.
+See <filename>examples</filename> directory <filename>genlogon</filename> and
+<filename>ntlogon</filename> subdirectories.
 </para>
 
 <para>
@@ -77,7 +79,7 @@ The following listings are from the genlogon directory.
 </para>
 
 <para>
-This is the genlogon.pl file:
+This is the <filename>genlogon.pl</filename> file:
 
 <programlisting>
 	#!/usr/bin/perl
@@ -174,10 +176,9 @@ Printers may be added automatically during logon script processing through the u
 	rundll32 printui.dll,PrintUIEntry /?
 </programlisting>
 
-See the documentation in the Microsoft knowledgebase article no: 189105 referred to above.
+See the documentation in the <ulink url="http://support.microsoft.com/default.asp?scid=kb;en-us;189105">Microsoft knowledgebase article no: 189105</ulink>.
 </para>
 </sect2>
 
 </sect1>
 </chapter>
-
diff --git a/docs/docbook/projdoc/Bugs.xml b/docs/docbook/projdoc/Bugs.xml
index d782920457..03a60b6ce5 100644
--- a/docs/docbook/projdoc/Bugs.xml
+++ b/docs/docbook/projdoc/Bugs.xml
@@ -83,7 +83,7 @@ detail, but may use too much disk space.
 </para>
 
 <para>
-To set the debug level use <command>log level =</command> in your 
+To set the debug level use the <parameter>log level</parameter> in your 
 &smb.conf;. You may also find it useful to set the log 
 level higher for just one machine and keep separate logs for each machine. 
 To do this use:
@@ -100,24 +100,25 @@ then create a file
 <filename>/usr/local/samba/lib/smb.conf.<replaceable>machine</replaceable></filename> where
 <replaceable>machine</replaceable> is the name of the client you wish to debug. In that file
 put any &smb.conf; commands you want, for example 
-<command>log level=</command> may be useful. This also allows you to 
+<parameter>log level</parameter> may be useful. This also allows you to 
 experiment with different security systems, protocol levels etc on just 
 one machine.
 </para>
 
 <para>
-The &smb.conf; entry <command>log level =</command> 
-is synonymous with the entry <command>debuglevel =</command> that has been 
-used in older versions of Samba and is being retained for backwards 
+The &smb.conf; entry <parameter>log level</parameter> 
+is synonymous with the parameter <parameter>debuglevel</parameter> that has
+been used in older versions of Samba and is being retained for backwards 
 compatibility of &smb.conf; files.
 </para>
 
 <para>
-As the <command>log level =</command> value is increased you will record 
+As the <parameter>log level</parameter> value is increased you will record 
 a significantly increasing level of debugging information. For most 
-debugging operations you may not need a setting higher than 3. Nearly 
-all bugs can be tracked at a setting of 10, but be prepared for a VERY 
-large volume of log data.
+debugging operations you may not need a setting higher than 
+<constant>3</constant>. Nearly 
+all bugs can be tracked at a setting of <constant>10</constant>, but be 
+prepared for a VERY large volume of log data.
 </para>
 
 </sect1>
@@ -126,8 +127,8 @@ large volume of log data.
 <title>Internal errors</title>
 
 <para>
-If you get a "INTERNAL ERROR" message in your log files it means that
-Samba got an unexpected signal while running. It is probably a
+If you get a <errorname>INTERNAL ERROR</errorname> message in your log files 
+it means that Samba got an unexpected signal while running. It is probably a
 segmentation fault and almost certainly means a bug in Samba (unless
 you have faulty hardware or system software).
 </para>
@@ -151,17 +152,20 @@ files. This file is the most useful tool for tracking down the bug. To
 use it you do this:
 </para>
 
-<para><command>gdb smbd core</command></para>
+<screen>
+	<prompt>$ </prompt><userinput>gdb smbd core</userinput>
+</screen>
 
 <para>
 adding appropriate paths to smbd and core so gdb can find them. If you
-don't have gdb then try <userinput>dbx</userinput>. Then within the debugger use the
-command <userinput>where</userinput> to give a stack trace of where the problem
-occurred. Include this in your mail.
+don't have gdb then try <userinput>dbx</userinput>. Then within the debugger
+use the command <command>where</command> to give a stack trace of where the
+problem occurred. Include this in your report.
 </para>
 
 <para>
-If you know any assembly language then do a <userinput>disass</userinput> of the routine
+If you know any assembly language then do a 
+<command>disass</command> of the routine
 where the problem occurred (if its in a library routine then
 disassemble the routine that called it) and try to work out exactly
 where the problem is by looking at the surrounding code. Even if you
@@ -177,8 +181,10 @@ useful.
 Unfortunately some unixes (in particular some recent linux kernels)
 refuse to dump a core file if the task has changed uid (which smbd
 does often). To debug with this sort of system you could try to attach
-to the running process using <userinput>gdb smbd <replaceable>PID</replaceable></userinput> where you get <replaceable>PID</replaceable> from
-<application>smbstatus</application>. Then use <userinput>c</userinput> to continue and try to cause the core dump
+to the running process using
+<userinput>gdb smbd <replaceable>PID</replaceable></userinput> where you get
+<replaceable>PID</replaceable> from <application>smbstatus</application>.
+Then use <command>c</command> to continue and try to cause the core dump
 using the client. The debugger should catch the fault and tell you
 where it occurred.
 </para>
@@ -198,4 +204,3 @@ exactly what version you used.
 
 </sect1>
 </chapter>
-
diff --git a/docs/docbook/projdoc/Compiling.xml b/docs/docbook/projdoc/Compiling.xml
index 9638663dde..fb59dead02 100644
--- a/docs/docbook/projdoc/Compiling.xml
+++ b/docs/docbook/projdoc/Compiling.xml
@@ -7,7 +7,7 @@
 	</author>
 	&author.jelmer;
 	
-	<pubdate> (22 May 2001) </pubdate>
+	<pubdate> 22 May 2001 </pubdate>
 	<pubdate> 18 March 2003 </pubdate>
 </chapterinfo>
 
@@ -45,8 +45,8 @@ This chapter is a modified version of the instructions found at
 <para>
 The machine samba.org runs a publicly accessible CVS 
 repository for access to the source code of several packages, 
-including samba, rsync and jitterbug. There are two main ways of 
-accessing the CVS server on this host.
+including samba, rsync, distcc, ccache and jitterbug. There are two main ways
+of accessing the CVS server on this host.
 </para>
 
 <sect3>
@@ -80,11 +80,12 @@ just a casual browser.
 
 <para>
 To download the latest cvs source code, point your
-browser at the URL : <ulink url="http://www.cyclic.com/">http://www.cyclic.com/</ulink>.
+browser at the URL :
+<ulink url="http://www.cyclic.com/">http://www.cyclic.com/</ulink>.
 and click on the 'How to get cvs' link. CVS is free software under 
 the GNU GPL (as is Samba).  Note that there are several graphical CVS clients
 which provide a graphical interface to the sometimes mundane CVS commands.
-Links to theses clients are also available from http://www.cyclic.com.
+Links to theses clients are also available from the Cyclic website.
 </para>
 
 <para>
@@ -94,16 +95,17 @@ samba source code. For the other source code repositories
 on this system just substitute the correct package name
 </para>
 
-<orderedlist>
-<listitem>
+<procedure>
+	<title>Retrieving samba using CVS</title>
+
+	<step>
 	<para>
 	Install a recent copy of cvs. All you really need is a 
 	copy of the cvs client binary. 
 	</para>
-</listitem>
-
+	</step>
 
-<listitem>
+	<step>
 	<para>
 	Run the command 
 	</para>
@@ -111,14 +113,16 @@ on this system just substitute the correct package name
 	<para>
 	<userinput>cvs -d :pserver:cvs@samba.org:/cvsroot login</userinput>
 	</para>
+	</step>
+
+	<step>
 	
 	<para>
 	When it asks you for a password type <userinput>cvs</userinput>.
 	</para>
-</listitem>
+	</step>
 
-
-<listitem>
+	<step>
 	<para>
 	Run the command 
 	</para>
@@ -134,18 +138,19 @@ on this system just substitute the correct package name
 	</para>
 	
 	<para>
-	CVS branches other then HEAD can be obtained by using the <parameter>-r</parameter>
-	and defining a tag name.  A list of branch tag names can be found on the
-	"Development" page of the samba web site.  A common request is to obtain the
-	latest 2.2 release code.  This could be done by using the following userinput.
+	CVS branches other then HEAD can be obtained by using the
+	<option>-r</option> and defining a tag name.  A list of branch tag names 
+	can be found on the "Development" page of the samba web site.  A common
+	request is to obtain the latest 3.0 release code.  This could be done by 
+	using the following userinput.
 	</para>
 	
 	<para>
-	<userinput>cvs -d :pserver:cvs@samba.org:/cvsroot co -r SAMBA_2_2 samba</userinput>
+	<userinput>cvs -d :pserver:cvs@samba.org:/cvsroot co -r SAMBA_3_0 samba</userinput>
 	</para>
-</listitem>
+	</step>
 
-<listitem>
+	<step>
 	<para>
 	Whenever you want to merge in the latest code changes use 
 	the following command from within the samba directory: 
@@ -154,8 +159,8 @@ on this system just substitute the correct package name
 	<para>
 	<userinput>cvs update -d -P</userinput>
 	</para>
-</listitem>
-</orderedlist>
+	</step>
+</procedure>
 	
 </sect3>
 </sect2>
@@ -166,16 +171,16 @@ on this system just substitute the correct package name
 	<title>Accessing the samba sources via rsync and ftp</title>
 
 	<para>
-	pserver.samba.org also exports unpacked copies of most parts of the CVS tree at <ulink url="ftp://pserver.samba.org/pub/unpacked">ftp://pserver.samba.org/pub/unpacked</ulink> and also via anonymous rsync at rsync://pserver.samba.org/ftp/unpacked/. I recommend using rsync rather than ftp.
+	pserver.samba.org also exports unpacked copies of most parts of the CVS
+	tree at <ulink url="ftp://pserver.samba.org/pub/unpacked">ftp://pserver.samba.org/pub/unpacked</ulink> and also via anonymous rsync at 
+	<ulink url="rsync://pserver.samba.org/ftp/unpacked/">rsync://pserver.samba.org/ftp/unpacked/</ulink>. I recommend using rsync rather than ftp.
 	See <ulink url="http://rsync.samba.org/">the rsync homepage</ulink> for more info on rsync.                       
 	</para>
 
 	<para>
-	The disadvantage of the unpacked trees
-	is that they do not support automatic
-	merging of local changes like CVS does.
-	rsync access is most convenient for an 
-	initial install.                       
+	The disadvantage of the unpacked trees is that they do not support automatic
+	merging of local changes like CVS does.  rsync access is most convenient 
+	for an initial install.                       
 	</para>
 </sect1>
 
@@ -183,11 +188,10 @@ on this system just substitute the correct package name
 <title>Verifying Samba's PGP signature</title>
 
 <para>
-In these days of insecurity, it's strongly recommended that you verify the PGP signature for any
-source file before installing it. According to Jerry Carter of the Samba Team, only about 22% of
-all Samba downloads have had a corresponding PGP signature download (a very low percentage, which
-should be considered a bad thing). Even if you're not downloading from a mirror site, verifying PGP
-signatures should be a standard reflex.
+In these days of insecurity, it's strongly recommended that you verify the PGP
+signature for any source file before installing it. Even if you're not 
+downloading from a mirror site, verifying PGP signatures should be a
+standard reflex.
 </para>
 
 
@@ -195,38 +199,39 @@ signatures should be a standard reflex.
 With that said, go ahead and download the following files:
 </para>
 
-<para><programlisting>
-     $ wget http://us1.samba.org/samba/ftp/samba-2.2.8a.tar.asc
-     $ wget http://us1.samba.org/samba/ftp/samba-pubkey.asc
-</programlisting></para>
+<para><screen>
+<prompt>$ </prompt><userinput> wget http://us1.samba.org/samba/ftp/samba-2.2.8a.tar.asc</userinput>
+<prompt>$ </prompt><userinput> wget http://us1.samba.org/samba/ftp/samba-pubkey.asc</userinput>
+</screen></para>
 
 <para>
 The first file is the PGP signature for the Samba source file; the other is the Samba public
 PGP key itself. Import the public PGP key with:
 </para>
 
-<programlisting>
-     $ gpg --import samba-pubkey.asc
-</programlisting>
+<screen>
+	<prompt>$ </prompt><userinput>gpg --import samba-pubkey.asc</userinput>
+</screen>
 
 <para>
 And verify the Samba source code integrity with:
 </para>
 
-<programlisting>
-     $ gzip -d samba-2.2.8a.tar.gz
-     $ gpg --verify samba-2.2.8a.tar.asc
-</programlisting>
+<screen>
+	<prompt>$ </prompt><userinput>gzip -d samba-2.2.8a.tar.gz</userinput>
+	<prompt>$ </prompt><userinput>gpg --verify samba-2.2.8a.tar.asc</userinput>
+</screen>
 
 <para>
-If you receive a message like, "Good signature from Samba Distribution Verification Key..."
-then all is well. The warnings about trust relationships can be ignored. An example of what
-you would not want to see would be:
+If you receive a message like, "Good signature from Samba Distribution 
+Verification Key..."
+then all is well. The warnings about trust relationships can be ignored. An
+example of what you would not want to see would be:
 </para>
 
-<programlisting>
+<computeroutput>
      gpg: BAD signature from "Samba Distribution Verification Key"
-</programlisting>
+</computeroutput>
 
 </sect1>
 
@@ -288,28 +293,31 @@ you would not want to see would be:
 	</itemizedlist>
 
 	<para>If your kerberos libraries are in a non-standard location then
-	  remember to add the configure option --with-krb5=DIR.</para>
+		remember to add the configure option 
+		<option>--with-krb5=<replaceable>DIR</replaceable></option>.</para>
 
-    <para>After you run configure make sure that <filename>include/config.h</filename> it generates contains lines like this:</para>
+	<para>After you run configure make sure that 
+		<filename>include/config.h</filename> it generates contains lines like 
+		this:</para>
 
-		  <para><programlisting>
+<para><programlisting>
 #define HAVE_KRB5 1
 #define HAVE_LDAP 1
 </programlisting></para>
 
-	  <para>If it doesn't then configure did not find your krb5 libraries or
-	    your ldap libraries. Look in config.log to figure out why and fix
-		  it.</para>
+	<para>If it doesn't then configure did not find your krb5 libraries or
+	your ldap libraries. Look in <filename>config.log</filename> to figure
+	out why and fix it.</para>
 
 	<sect3>
 	<title>Installing the required packages for Debian</title>
 
 	<para>On Debian you need to install the following packages:</para>
 	<para>
-	<itemizedlist>
-	<listitem>libkrb5-dev</listitem>
-	<listitem>krb5-user</listitem>
-	</itemizedlist>
+		<simplelist>
+			<member>libkrb5-dev</member>
+			<member>krb5-user</member>
+		</simplelist>
 	</para>
 	</sect3>
 
@@ -318,11 +326,11 @@ you would not want to see would be:
 
 	<para>On RedHat this means you should have at least: </para>
 	<para>
-	<itemizedlist>
-	<listitem>krb5-workstation (for kinit)</listitem>
-	<listitem>krb5-libs (for linking with)</listitem>
-	<listitem>krb5-devel (because you are compiling from source)</listitem>
-	</itemizedlist>
+		<simplelist>
+			<member>krb5-workstation (for kinit)</member>
+			<member>krb5-libs (for linking with)</member>
+			<member>krb5-devel (because you are compiling from source)</member>
+		</simplelist>
 	</para>
 
 	<para>in addition to the standard development environment.</para>
@@ -337,9 +345,9 @@ you would not want to see would be:
 </sect1>
 
 <sect1>
-	<title>Starting the smbd and nmbd</title>
+	<title>Starting the &smbd; and &nmbd;</title>
 
-	<para>You must choose to start smbd and nmbd either
+	<para>You must choose to start &smbd; and &nmbd; either
 	as daemons or from <application>inetd</application>Don't try
 	to do both!  Either you can put them in <filename>
 	inetd.conf</filename> and have them started on demand
@@ -350,26 +358,28 @@ you would not want to see would be:
 	the bit about what user you need to be in order to start
 	Samba.  In many cases you must be root.</para>
 
-	<para>The main advantage of starting <application>smbd</application>
-	and <application>nmbd</application> using the recommended daemon method
+	<para>The main advantage of starting &smbd;
+	and &nmbd; using the recommended daemon method
 	is that they will respond slightly more quickly to an initial connection
 	request.</para>
 
 	<sect2>
 		<title>Starting from inetd.conf</title>
 
-		<para>NOTE; The following will be different if 
+		<note>
+		<para>The following will be different if 
 		you use NIS, NIS+ or LDAP to distribute services maps.</para>
+		</note>
 		
 		<para>Look at your <filename>/etc/services</filename>. 
 		What is defined at port 139/tcp. If nothing is defined 
 		then add a line like this:</para>
 
-		<para><userinput>netbios-ssn     139/tcp</userinput></para>
+		<para><programlisting>netbios-ssn     139/tcp</programlisting></para>
 
 		<para>similarly for 137/udp you should have an entry like:</para>
 
-		<para><userinput>netbios-ns	137/udp</userinput></para>
+		<para><programlisting>netbios-ns	137/udp</programlisting></para>
 
 		<para>Next edit your <filename>/etc/inetd.conf</filename> 
 		and add two lines something like this:</para>
@@ -386,11 +396,13 @@ you would not want to see would be:
 		<note><para>Some unixes already have entries like netbios_ns 
 		(note the underscore) in <filename>/etc/services</filename>. 
 		You must either edit <filename>/etc/services</filename> or
-		<filename>/etc/inetd.conf</filename> to make them consistent.</para></note>
+		<filename>/etc/inetd.conf</filename> to make them consistent.
+		</para></note>
 
 		<note><para>On many systems you may need to use the 
-		<command>interfaces</command> option in &smb.conf; to specify the IP address 
-		and netmask of your interfaces. Run <application>ifconfig</application> 
+		<parameter>interfaces</parameter> option in &smb.conf; to specify the IP
+		address and netmask of your interfaces. Run 
+		<application>ifconfig</application> 
 		as root if you don't know what the broadcast is for your
 		net. &nmbd; tries to determine it at run 
 		time, but fails on some unixes. 
@@ -402,9 +414,9 @@ you would not want to see would be:
 		arguments, or you should use a script, and start the script 
 		from <command>inetd</command>.</para></warning>
 
-		<para>Restart <command>inetd</command>, perhaps just send 
-		it a HUP. If you have installed an earlier version of <application>
-		nmbd</application> then you may need to kill nmbd as well.</para>
+		<para>Restart <application>inetd</application>, perhaps just send 
+			it a HUP. If you have installed an earlier version of &nmbd; then
+			you may need to kill &nmbd; as well.</para>
 	</sect2>
 	
 	<sect2>
@@ -428,7 +440,7 @@ you would not want to see would be:
 		</para>
 
 		<para>To kill it send a kill signal to the processes 
-		<command>nmbd</command> and <command>smbd</command>.</para>
+			&nmbd; and &smbd;.</para>
 
 		<note><para>If you use the SVR4 style init system then 
 		you may like to look at the <filename>examples/svr4-startup</filename>
diff --git a/docs/docbook/projdoc/DOMAIN_MEMBER.xml b/docs/docbook/projdoc/DOMAIN_MEMBER.xml
index ecb8a3afb3..bb8e95b8a9 100644
--- a/docs/docbook/projdoc/DOMAIN_MEMBER.xml
+++ b/docs/docbook/projdoc/DOMAIN_MEMBER.xml
@@ -4,40 +4,48 @@
 	&author.jht;
 	&author.jeremy;
 	&author.jerry;
+
+<!-- Authors of the ADS-HOWTO -->
+	&author.tridge;
+	&author.jelmer;
 </chapterinfo>
 
 <title>Domain Membership</title>
 
 <para>
-Domain Membership is a subject of vital concern, Samba must be able to participate
-as a member server in a Microsoft Domain security context, and Samba must be capable of
-providing Domain machine member trust accounts, otherwise it would not be capable of offering
-a viable option for many users.
+Domain Membership is a subject of vital concern, Samba must be able to
+participate as a member server in a Microsoft Domain security context, and
+Samba must be capable of providing Domain machine member trust accounts,
+otherwise it would not be capable of offering a viable option for many users.
 </para>
 
 <para>
-This chapter covers background information pertaining to domain membership, Samba
-configuration for it, and MS Windows client procedures for joining a domain.  Why is
-this necessary? Because both are areas in which there exists within the current MS
-Windows networking world and particularly in the Unix/Linux networking and administration
-world, a considerable level of mis-information, incorrect understanding, and a lack of
-knowledge. Hopefully this chapter will fill the voids.
+This chapter covers background information pertaining to domain membership,
+Samba configuration for it, and MS Windows client procedures for joining a
+domain.  Why is this necessary? Because both are areas in which there exists
+within the current MS Windows networking world and particularly in the
+Unix/Linux networking and administration world, a considerable level of
+mis-information, incorrect understanding, and a lack of knowledge. Hopefully
+this chapter will fill the voids.
 </para>
 
 <sect1>
 <title>Features and Benefits</title>
 
 <para>
-MS Windows workstations and servers that want to participate in domain security need to
+MS Windows workstations and servers that want to participate in domain
+security need to
 be made Domain members. Participating in Domain security is often called 
-<emphasis>Single Sign On</emphasis> or SSO for short. This chapter describes the process
-that must be followed to make a workstation (or another server - be it an MS Windows NT4 / 200x
+<emphasis>Single Sign On</emphasis> or <acronym>SSO</acronym> for short. This
+chapter describes the process that must be followed to make a workstation
+(or another server - be it an <application>MS Windows NT4 / 200x</application>
 server) or a Samba server a member of an MS Windows Domain security context.
 </para>
 
 <para>
-Samba-3 can join an MS Windows NT4 style domain as a native member server, an MS Windows
-Active Directory Domain as a native member server, or a Samba Domain Control network.
+Samba-3 can join an MS Windows NT4 style domain as a native member server, an 
+MS Windows Active Directory Domain as a native member server, or a Samba Domain
+Control network.
 </para>
 
 <para>
@@ -50,19 +58,21 @@ Domain membership has many advantages:
 	</para></listitem>
 
 	<listitem><para>
-	Domain user access rights and file ownership / access controls can be set from
-	the single Domain SAM (Security Accounts Management) database (works with Domain member
-	servers as well as with MS Windows workstations that are domain members)
+	Domain user access rights and file ownership / access controls can be set
+	from the single Domain SAM (Security Accounts Management) database 
+	(works with Domain member servers as well as with MS Windows workstations
+	that are domain members)
 	</para></listitem>
 
 	<listitem><para>
-	Only MS Windows NT4 / 200x / XP Professional workstations that are Domain members
+	Only <application>MS Windows NT4 / 200x / XP Professional</application>
+	workstations that are Domain members
 	can use network logon facilities
 	</para></listitem>
 
 	<listitem><para>
-	Domain Member workstations can be better controlled through the use of Policy files
-	(NTConfig.POL) and Desktop Profiles.
+	Domain Member workstations can be better controlled through the use of
+	Policy files (<filename>NTConfig.POL</filename>) and Desktop Profiles.
 	</para></listitem>
 
 	<listitem><para>
@@ -71,10 +81,11 @@ Domain membership has many advantages:
 	</para></listitem>
 
 	<listitem><para>
-	Network administrators gain better application and user access management abilities
-	because there is no need to maintain user accounts on any network client or server,
-	other than the central Domain database (either NT4/Samba SAM style Domain, NT4 Domain
-	that is back ended with an LDAP directory, or via an Active Directory infrastructure)
+	Network administrators gain better application and user access management
+	abilities because there is no need to maintain user accounts on any network
+	client or server, other than the central Domain database 
+	(either NT4/Samba SAM style Domain, NT4 Domain that is back ended with an
+	LDAP directory, or via an Active Directory infrastructure)
 	</para></listitem>
 </itemizedlist>
 
@@ -84,7 +95,8 @@ Domain membership has many advantages:
 <title>MS Windows Workstation/Server Machine Trust Accounts</title>
 
 <para>
-A machine trust account is an account that is used to authenticate a client machine
+A machine trust account is an account that is used to authenticate a client
+machine
 (rather than a user) to the Domain Controller server.  In Windows terminology,
 this is known as a "Computer Account."
 </para>
@@ -113,10 +125,10 @@ as follows:
 
 <itemizedlist>
 	<listitem><para>
-	A Domain Security Account (stored in the <emphasis>passdb backend</emphasis>
-	that has been configured in the &smb.conf; file. The precise nature of the
-	account information that is stored depends on the type of backend database
-	that has been chosen.
+	A Domain Security Account (stored in the 
+	<parameter>passdb backend</parameter> that has been configured in the
+	&smb.conf; file. The precise nature of the account information that is
+	stored depends on the type of backend database that has been chosen.
 	</para>
 
 	<para>
@@ -127,15 +139,17 @@ as follows:
 	</para>
 
 	<para>
-	The two newer database types are called <emphasis>ldapsam, tdbsam</emphasis>.
-	Both store considerably more data than the older <filename>smbpasswd</filename>
-	file did. The extra information enables new user account controls to be used.
+	The two newer database types are called <emphasis>ldapsam</emphasis>,
+	<emphasis>tdbsam</emphasis>.  Both store considerably more data than the
+	older <filename>smbpasswd</filename> file did. The extra information
+	enables new user account controls to be used.
 	</para></listitem>
 
 	<listitem><para>
-	A corresponding Unix account, typically stored in <filename>/etc/passwd</filename>.
-	Work is in progress to allow a simplified mode of operation that does not require
-	Unix user accounts, but this may not be a feature of the early releases of Samba-3.
+	A corresponding Unix account, typically stored in
+	<filename>/etc/passwd</filename>.  Work is in progress to allow a
+	simplified mode of operation that does not require Unix user accounts, but
+	this may not be a feature of the early releases of Samba-3.
 	</para></listitem>
 </itemizedlist>
 </para>
@@ -146,20 +160,22 @@ There are three ways to create machine trust accounts:
 
 <itemizedlist>
 	<listitem><para>
-	Manual creation from the Unix/Linux command line. Here, both the Samba and corresponding
-	Unix account are created by hand.
+	Manual creation from the Unix/Linux command line. Here, both the Samba and
+	corresponding Unix account are created by hand.
 	</para></listitem>
 
 	<listitem><para>
-	Using the MS Windows NT4 Server Manager (either from an NT4 Domain member server, or using
-	the Nexus toolkit available from the Microsoft web site. This tool can be run from any
-	MS Windows machine so long as the user is logged on as the administrator account.
+	Using the MS Windows NT4 Server Manager (either from an NT4 Domain member
+	server, or using the Nexus toolkit available from the Microsoft web site.
+	This tool can be run from any MS Windows machine so long as the user is
+	logged on as the administrator account.
 	</para></listitem>
 	
 	<listitem><para>
-	"On-the-fly" creation. The Samba machine trust account is automatically created by
-	Samba at the time the client is joined to the domain. (For security, this is the
-	recommended method.) The corresponding Unix account may be created automatically or manually. 
+	"On-the-fly" creation. The Samba machine trust account is automatically
+	created by Samba at the time the client is joined to the domain.
+	(For security, this is the recommended method.) The corresponding Unix
+	account may be created automatically or manually. 
 	</para></listitem>
 </itemizedlist>
 
@@ -167,26 +183,26 @@ There are three ways to create machine trust accounts:
 <title>Manual Creation of Machine Trust Accounts</title>
 
 <para>
-The first step in manually creating a machine trust account is to manually create the
-corresponding Unix account in <filename>/etc/passwd</filename>.  This can be done using
-<command>vipw</command> or other 'add user' command that is normally used to create new
-Unix accounts.  The following is an example for a Linux based Samba server:
+The first step in manually creating a machine trust account is to manually
+create the corresponding Unix account in <filename>/etc/passwd</filename>. 
+This can be done using <command>vipw</command> or another 'add user' command
+that is normally used to create new Unix accounts.  The following is an example for a Linux based Samba server:
 </para>
 
 <para>
-<prompt>root# </prompt><command>/usr/sbin/useradd -g 100 -d /dev/null -c <replaceable>"machine nickname"</replaceable> -s /bin/false <replaceable>machine_name</replaceable>$ </command>
+<prompt>root# </prompt><userinput>/usr/sbin/useradd -g 100 -d /dev/null -c <replaceable>"machine nickname"</replaceable> -s /bin/false <replaceable>machine_name</replaceable>$ </userinput>
 </para>
 
 <para>
-<prompt>root# </prompt><command>passwd -l <replaceable>machine_name</replaceable>$</command>
+<prompt>root# </prompt><userinput>passwd -l <replaceable>machine_name</replaceable>$</userinput>
 </para>
 
 <para>
-On *BSD systems, this can be done using the 'chpass' utility:
+On *BSD systems, this can be done using the <command>chpass</command> utility:
 </para>
 
 <para>
-<prompt>root# </prompt><command>chpass -a "<replaceable>machine_name</replaceable>$:*:101:100::0:0:Workstation <replaceable>machine_name</replaceable>:/dev/null:/sbin/nologin"</command>
+<prompt>root# </prompt><userinput>chpass -a "<replaceable>machine_name</replaceable>$:*:101:100::0:0:Workstation <replaceable>machine_name</replaceable>:/dev/null:/sbin/nologin"</userinput>
 </para>
 
 <para>
@@ -235,11 +251,11 @@ the corresponding Unix account.
 	<para>
 	Manually creating a machine trust account using this method is the 
 	equivalent of creating a machine trust account on a Windows NT PDC using 
-	the "Server Manager".  From the time at which the account is created
-	to the time which the client joins the domain and changes the password,
-	your domain is vulnerable to an intruder joining your domain using
-	a machine with the same NetBIOS name.  A PDC inherently trusts
-	members of the domain and will serve out a large degree of user 
+	the <application>Server Manager</application>.  From the time at which the 
+	account is created to the time which the client joins the domain and 
+	changes the password, your domain is vulnerable to an intruder joining 
+	your domain using a machine with the same NetBIOS name.  A PDC inherently 
+	trusts members of the domain and will serve out a large degree of user 
 	information to such clients.  You have been warned!
 	</para>
 </warning>
@@ -249,16 +265,19 @@ the corresponding Unix account.
 <title>Using NT4 Server Manager to Add Machine Accounts to the Domain</title>
 
 <para>
-If the machine from which you are trying to manage the domain is an MS Windows NT4 workstation
-then the tool of choice is the package called SRVTOOLS.EXE. When executed in the target directory
-this will unpack SrvMge.exe and UsrMgr.exe (both are Domain Management tools for MS Windows NT4
-workstation.
+If the machine from which you are trying to manage the domain is an 
+<application>MS Windows NT4 workstation</application>
+then the tool of choice is the package called <command>SRVTOOLS.EXE</command>. 
+When executed in the target directory this will unpack 
+<command>SrvMge.exe</command> and <command>UsrMgr.exe</command> (both are 
+Domain Management tools for MS Windows NT4 workstation.
 </para>
 
 <para>
-If your workstation is any other MS Windows product you should download the Nexus.exe package
-from the Microsoft web site. When executed from the target directory this will unpack the same
-tools but for use on MS Windows 9x/Me/200x/XP.
+If your workstation is any other MS Windows product you should download the
+<command>Nexus.exe</command> package from the Microsoft web site. When executed 
+from the target directory this will unpack the same tools but for use on 
+<application>MS Windows 9x/Me/200x/XP</application>.
 </para>
 
 <para>
@@ -268,29 +287,32 @@ Launch the <command>srvmgr.exe</command> (Server Manager for Domains) and follow
 <procedure>
 <title>Server Manager Account Machine Account Management</title>
 	<step><para>
-	From the menu select Computer
+			From the menu select <guimenu>Computer</guimenu>
 	</para></step>
 
 	<step><para>
-	Click on "Select Domain"
+	Click on <guimenuitem>Select Domain</guimenuitem>
 	</para></step>
 
 	<step><para>
-	Click on the name of the domain you wish to administer in the "Select Domain" panel
-	and then Click OK.
+	Click on the name of the domain you wish to administer in the
+	<guilabel>Select Domain</guilabel> panel and then click 
+	<guibutton>OK</guibutton>.
 	</para></step>
 
 	<step><para>
-	Again from the menu select Computer
+	Again from the menu select <guimenu>Computer</guimenu>
 	</para></step>
 
 	<step><para>
-	Select "Add to Domain"
+	Select <guimenuitem>Add to Domain</guimenuitem>
 	</para></step>
 
 	<step><para>
-	In the dialog box, click on the radio button to "Add NT Workstation of Server", then
-	enter the machine name in the field provided, then Click the "Add" button.
+	In the dialog box, click on the radio button to 
+	<guilabel>Add NT Workstation of Server</guilabel>, then
+	enter the machine name in the field provided, then click the 
+	<guibutton>Add</guibutton> button.
 	</para></step>
 </procedure>
 
@@ -334,8 +356,8 @@ The procedure for making an MS Windows workstation of server a member of the dom
 with the version of Windows:
 </para>
 
-<itemizedlist>
-	<listitem><para><emphasis>Windows 200x XP Professional</emphasis></para>
+<sect3>
+	<title>Windows 200x XP Professional</title>
 
 	<para>
 	When the user elects to make the client a domain member, Windows 200x prompts for
@@ -363,9 +385,11 @@ with the version of Windows:
 	encryption key for setting the password of the machine trust
 	account. The machine trust account will be created on-the-fly, or
 	updated if it already exists.
-	</para></listitem>
+	</para>
+</sect3>
 
-	<listitem><para><emphasis>Windows NT4</emphasis></para>
+<sect3>
+	<title>Windows NT4</title>
 
 	<para>
 	If the machine trust account was created manually, on the
@@ -382,13 +406,16 @@ with the version of Windows:
 	this case, joining the domain proceeds as above for Windows 2000
 	(i.e., you must supply a Samba administrative account when
 	prompted).
-	</para></listitem>
+	</para>
+</sect3>
+
+<sect3>
+	<title>Samba</title>
 
-	<listitem><para><emphasis>Samba</emphasis></para>
 	<para>Joining a samba client to a domain is documented in 
 	the <link linkend="domain-member">Domain Member</link> chapter.
-	</para></listitem>
-</itemizedlist>
+	</para>
+</sect3>
 
 </sect2>
 </sect1>
@@ -398,38 +425,41 @@ with the version of Windows:
 
 <para>
 This mode of server operation involves the samba machine being made a member
-of a domain security context. This means by definition that all user authentication
-will be done from a centrally defined authentication regime. The authentication
-regime may come from an NT3/4 style (old domain technology) server, or it may be
-provided from an Active Directory server (ADS) running on MS Windows 2000 or later.
+of a domain security context. This means by definition that all user
+authentication will be done from a centrally defined authentication regime. 
+The authentication regime may come from an NT3/4 style (old domain technology)
+server, or it may be provided from an Active Directory server (ADS) running on
+MS Windows 2000 or later.
 </para>
 
 <para>
 <emphasis>
-Of course it should be clear that the authentication back end itself could be from any
-distributed directory architecture server that is supported by Samba. This can be
-LDAP (from OpenLDAP), or Sun's iPlanet, of NetWare Directory Server, etc.
+Of course it should be clear that the authentication back end itself could be
+from any distributed directory architecture server that is supported by Samba.
+This can be LDAP (from OpenLDAP), or Sun's iPlanet, of NetWare Directory
+Server, etc.
 </emphasis>
 </para>
 
 <para>
-Please refer to the section on Howto configure Samba as a Primary Domain Controller
-and for more information regarding how to create a domain machine account for a
-domain member server as well as for information regarding how to enable the samba
-domain member machine to join the domain and to be fully trusted by it.
+Please refer to the <link linkend="samba-pdc">Samba as a Primary Domain
+Controller chapter</link> for more information regarding how to create a domain
+machine account for a domain member server as well as for information
+regarding how to enable the samba domain member machine to join the domain and
+to be fully trusted by it.
 </para>
 
 <sect2>
 <title>Joining an NT4 type Domain with Samba-3</title>
 
 <para>
-<emphasis>Assumptions:</emphasis>
-<programlisting>
-	NetBIOS name: SERV1
-	Win2K/NT domain name: DOM
-	Domain's PDC NetBIOS name: DOMPDC
-	Domain's BDC NetBIOS names: DOMBDC1 and DOMBDC2
-</programlisting>
+Assumptions:
+<table><tbody>
+	<row><entry>NetBIOS name:</entry><entry>SERV1</entry></row>
+	<row><entry>Win2K/NT domain name:</entry><entry>DOM</entry></row>
+	<row><entry>Domain's PDC NetBIOS name:</entry><entry>DOMPDC</entry></row>
+	<row><entry>Domain's BDC NetBIOS names:</entry><entry>DOMBDC1 and DOMBDC2</entry></row>
+</tbody></table>
 </para>
 
 <para>
@@ -445,18 +475,19 @@ of your &smb.conf; to read:
 
 <para>
 <programlisting>
-        <command>security = domain</command>
+security = domain
 </programlisting>
 </para>
 
 <para>
 Next change the <ulink url="smb.conf.5.html#WORKGROUP"><parameter>
-workgroup =</parameter></ulink> line in the [global] section to read: 
+workgroup</parameter></ulink> line in the <parameter>[global]</parameter>
+section to read: 
 </para>
 
 <para>
 <programlisting>
-        <command>workgroup = DOM</command>
+workgroup = DOM
 </programlisting>
 </para>
 
@@ -472,13 +503,13 @@ You must also have the parameter <ulink url="smb.conf.5.html#ENCRYPTPASSWORDS">
 
 <para>
 Finally, add (or modify) a <ulink url="smb.conf.5.html#PASSWORDSERVER">
-<parameter>password server =</parameter></ulink> line in the [global]
+<parameter>password server</parameter></ulink> line in the [global]
 section to read: 
 </para>
 
 <para>
 <programlisting>
-        <command>password server = DOMPDC DOMBDC1 DOMBDC2</command>
+password server = DOMPDC DOMBDC1 DOMBDC2
 </programlisting>
 </para>
 
@@ -498,7 +529,7 @@ set this line to be:
 
 <para>
 <programlisting>
-        <command>password server = *</command>
+password server = *
 </programlisting>
 </para>
 
@@ -513,14 +544,14 @@ In order to actually join the domain, you must run this command:
 </para>
 
 <para>
-<programlisting>
-        <prompt>root# </prompt><userinput>net join -S DOMPDC -U<replaceable>Administrator%password</replaceable></userinput>
-</programlisting>
+<screen>
+<prompt>root# </prompt><userinput>net join -S DOMPDC -U<replaceable>Administrator%password</replaceable></userinput>
+</screen>
 </para>
 
 <para>
-If the <userinput>-S DOMPDC</userinput> argument is not given then
-the domain name will be obtained from smb.conf.
+If the <option>-S DOMPDC</option> argument is not given then
+the domain name will be obtained from &smb.conf;.
 </para>
 
 <para>
@@ -573,7 +604,7 @@ clients to begin using domain security!
 </sect2>
 
 <sect2>
-<title>Why is this better than security = server?</title>
+<title>Why is this better than <parameter>security = server</parameter>?</title>
 
 <para>
 Currently, domain security in Samba doesn't free you from 
@@ -604,11 +635,11 @@ domain PDC to an account domain PDC).
 </para>
 
 <para>
-In addition, with <command>security = server</command> every Samba 
+In addition, with <parameter>security = server</parameter> every Samba 
 daemon on a server has to keep a connection open to the 
 authenticating server for as long as that daemon lasts. This can drain 
 the connection resources on a Microsoft NT server and cause it to run 
-out of available connections. With <command>security = domain</command>, 
+out of available connections. With <parameter>security = domain</parameter>, 
 however, the Samba daemons connect to the PDC/BDC only for as long 
 as is necessary to authenticate the user, and then drop the connection, 
 thus conserving PDC connection resources.
@@ -624,8 +655,8 @@ as the user SID, the list of NT groups the user belongs to, etc.
 <note>
 <para>
 Much of the text of this document 
-was first published in the Web magazine <ulink url="http://www.linuxworld.com"> 	
-LinuxWorld</ulink> as the article <ulink
+was first published in the Web magazine 
+<ulink url="http://www.linuxworld.com">LinuxWorld</ulink> as the article <ulink
 url="http://www.linuxworld.com/linuxworld/lw-1998-10/lw-10-samba.html">Doing 
 the NIS/NT Samba</ulink>.
 </para>
@@ -646,7 +677,7 @@ Windows2000 KDC.
 <title>Setup your <filename>smb.conf</filename></title>
 
 <para>
-You must use at least the following 3 options in smb.conf:
+You must use at least the following 3 options in &smb.conf;:
 </para>
 
 <para><programlisting>
@@ -657,17 +688,18 @@ You must use at least the following 3 options in smb.conf:
 
 <para>
 In case samba can't figure out your ads server using your realm name, use the 
-<command>ads server</command> option in <filename>smb.conf</filename>:
+<parameter>ads server</parameter> option in <filename>smb.conf</filename>:
 <programlisting>
 	ads server = your.kerberos.server
 </programlisting>
 </para>
 
 <note><para>
-You do *not* need a smbpasswd file, and older clients will be authenticated as if
-<command>security = domain</command>, although it won't do any harm and allows you
-to have local users not in the domain. I expect that the above required options will
-change soon when we get better active directory integration.
+You do &not; need a smbpasswd file, and older clients will be authenticated as 
+if <parameter>security = domain</parameter>, although it won't do any harm and 
+allows you to have local users not in the domain. It is expected that the above 
+required options will change soon when active directory integration will get 
+better.
 </para></note>
 
 </sect2>
@@ -676,10 +708,6 @@ change soon when we get better active directory integration.
 <title>Setup your <filename>/etc/krb5.conf</filename></title>
 
 <para>
-Note: you will need the krb5 workstation, devel, and libs installed
-</para>
-
-<para>
 The minimal configuration for <filename>krb5.conf</filename> is:
 </para>
 
@@ -697,8 +725,8 @@ making sure that your password is accepted by the Win2000 KDC.
 </para>
 
 <note><para>
-The realm must be uppercase or you will get "Cannot find KDC for requested
-realm while getting initial credentials" error
+The realm must be uppercase or you will get <errorname>Cannot find KDC for
+requested realm while getting initial credentials</errorname> error
 </para></note>
 
 <note><para>
@@ -748,7 +776,7 @@ As a user that has write permission on the Samba private directory
 
 <para>
 <variablelist>
-	<varlistentry><term>"ADS support not compiled in"</term>
+	<varlistentry><term>ADS support not compiled in</term>
 	<listitem><para>Samba must be reconfigured (remove config.cache) and recompiled
 	(make clean all install) after the kerberos libs and headers are installed.
 	</para></listitem></varlistentry>
diff --git a/docs/docbook/projdoc/passdb.xml b/docs/docbook/projdoc/passdb.xml
index 368d7ba863..afe5ae24af 100644
--- a/docs/docbook/projdoc/passdb.xml
+++ b/docs/docbook/projdoc/passdb.xml
@@ -208,9 +208,9 @@ Samba-3 introduces the following new password backend capabilities:
 	In addition to differently encrypted passwords, windows also stores certain data for each
 	user that is not stored in a unix user database. e.g: workstations the user may logon from,
 	the location where the users' profile is stored, and so on. Samba retrieves and stores this
-	information using a "passdb backend".  Commonly available backends are LDAP, plain text
+	information using a <parameter>passdb backend</parameter>.  Commonly available backends are LDAP, plain text
 	file, MySQL and nisplus.  For more information, see the man page for &smb.conf; regarding the 
-	<command>passdb backend = </command> parameter.
+	<parameter>passdb backend</parameter> parameter.
 	</para>
 
 	<sect2>
@@ -756,9 +756,9 @@ objectclass ( 1.3.6.1.4.1.7165.2.2.3 NAME 'sambaAccount' SUP top AUXILIARY
 			</para>
 
 <para>
-<programlisting>
-<prompt>root# </prompt><userinput>cp samba.schema /etc/openldap/schema/</userinput>
-</programlisting>
+<screen>
+&rootprompt;<userinput>cp samba.schema /etc/openldap/schema/</userinput>
+</screen>
 </para>
 
 			<para>
@@ -833,9 +833,9 @@ index   default               sub
 		</para>
 
 <para>
-<programlisting>
-<prompt>root# </prompt><userinput>/etc/init.d/slapd restart</userinput>
-</programlisting>
+<screen>
+&rootprompt;<userinput>/etc/init.d/slapd restart</userinput>
+</screen>
 </para>
 
 		</sect3>
@@ -844,14 +844,13 @@ index   default               sub
 		<title>Configuring Samba</title>
 
 			<para>
-			The following parameters are available in smb.conf only with <parameter>--with-ldapsam</parameter>
-			was included when compiling Samba. The following parameters are available in smb.conf only if your
+			The following parameters are available in smb.conf only if your
 			version of samba was built with LDAP support. Samba automatically builds with LDAP support if the
 			LDAP libraries are found.
 			</para>
 
 		<itemizedlist>
-			<listitem><para><ulink url="smb.conf.5.html#PASSDBBACKEND">passdb backend ldapsam:url</ulink></para></listitem>
+			<listitem><para><ulink url="smb.conf.5.html#PASSDBBACKEND">passdb backend = ldapsam:url</ulink></para></listitem>
 			<listitem><para><ulink url="smb.conf.5.html#LDAPSSL">ldap ssl</ulink></para></listitem>
 			<listitem><para><ulink url="smb.conf.5.html#LDAPADMINDN">ldap admin dn</ulink></para></listitem>
 			<listitem><para><ulink url="smb.conf.5.html#LDAPSUFFIX">ldap suffix</ulink></para></listitem>
@@ -970,12 +969,12 @@ index   default               sub
 
 			<para>
 			To remedy the first security issue, the "ldap ssl" smb.conf parameter defaults
-			to require an encrypted session (<command>ldap ssl = on</command>) using
-			the default port of 636
+			to require an encrypted session (<parameter>ldap ssl = on</parameter>) using
+			the default port of <constant>636</constant>
 			when contacting the directory server.  When using an OpenLDAP server, it
 			is possible to use the use the StartTLS LDAP extended  operation in the place of
 			LDAPS.  In either case, you are strongly discouraged to disable this security
-			(<command>ldap ssl = off</command>).
+			(<parameter>ldap ssl = off</parameter>).
 			</para>
 
 			<para>
@@ -1236,7 +1235,7 @@ index   default               sub
 
 			<para>The identifier can be any string you like, as long as it doesn't collide with 
 			the identifiers of other plugins or other instances of pdb_mysql. If you 
-			specify multiple pdb_mysql.so entries in 'passdb backend', you also need to 
+			specify multiple pdb_mysql.so entries in <parameter>passdb backend</parameter>, you also need to 
 			use different identifiers!
 			</para>
 
@@ -1383,10 +1382,10 @@ index   default               sub
 		</para>
 
 		<para>
-		<programlisting>
 		then execute (as root):
-			pdbedit -i smbpasswd -e tdbsam
-		</programlisting>
+		<screen>
+		&rootprompt;<userinput>pdbedit -i smbpasswd -e tdbsam</userinput>
+		</screen>
 		</para>
 	</sect2>
 </sect1>
diff --git a/docs/docbook/projdoc/printer_driver2.xml b/docs/docbook/projdoc/printer_driver2.xml
index da3eb838f2..76f59c12ea 100644
--- a/docs/docbook/projdoc/printer_driver2.xml
+++ b/docs/docbook/projdoc/printer_driver2.xml
@@ -8,7 +8,7 @@
 			<address><email>papowell@lprng.org</email></address>
 		</affiliation>
 	</author>
-	<pubdate> (3 May 2001) </pubdate>
+	<pubdate> 3 May 2001 </pubdate>
 </chapterinfo>
 
 <title>Printing Support</title>