trying to get HEAD building again. If you want the code

prior to this merge, checkout HEAD_PRE_3_0_0_BETA_3_MERGE
(This used to be commit adb98e7b7cd0f025b52c570e4034eebf4047b1ad)

1 files changed, 252 insertions, 184 deletions

diff --git a/docs/docbook/projdoc/AccessControls.xml b/docs/docbook/projdoc/AccessControls.xml
index 38c3475d34..44780501fe 100644
--- a/docs/docbook/projdoc/AccessControls.xml
+++ b/docs/docbook/projdoc/AccessControls.xml
@@ -9,7 +9,7 @@
 <para>
 Advanced MS Windows users are frequently perplexed when file, directory and share manipulation of
 resources shared via Samba do not behave in the manner they might expect. MS Windows network
-adminstrators are often confused regarding network access controls and what is the best way to
+administrators are often confused regarding network access controls and what is the best way to
 provide users with the type of access they need while protecting resources from the consequences
 of untoward access capabilities.
 </para>
@@ -45,7 +45,7 @@ This is an opportune point to mention that it should be borne in mind that Samba
 provide a means of interoperability and interchange of data between two operating environments
 that are quite different. It was never the intent to make Unix/Linux like MS Windows NT. Instead
 the purpose was an is to provide a sufficient level of exchange of data between the two environments.
-What is available today extends well beyond early plans and expections, yet the gap continues to
+What is available today extends well beyond early plans and expectations, yet the gap continues to
 shrink.
 </para>
 
@@ -66,7 +66,7 @@ shrink.
 			<para>
 			Samba honours and implements Unix file system access controls. Users
 			who access a Samba server will do so as a particular MS Windows user.
-			This information is passed to the Samba server as part of the logon orr
+			This information is passed to the Samba server as part of the logon or
 			connection setup process. Samba uses this user identity to validate
 			whether or not the user should be given access to file system resources
 			(files and directories). This chapter provides an overview for those
@@ -110,7 +110,7 @@ shrink.
 			operating system supports them. If not, then this option will not be
 			available to you. Current Unix technology platforms have native support
 			for POSIX ACLs. There are patches for the Linux kernel that provide
-			this also. Sadly, few Linux paltforms ship today with native ACLs and
+			this also. Sadly, few Linux platforms ship today with native ACLs and
 			Extended Attributes enabled. This chapter has pertinent information
 			for users of platforms that support them.
 			</para>
@@ -142,14 +142,15 @@ at how Samba helps to bridge the differences.
 	<para>
 	It is good news that Samba does this to a very large extent and on top of that provides a high degree
 	of optional configuration to over-ride the default behaviour. We will look at some of these over-rides,
-	but for the greater part we will stay withing the bounds of default behaviour. Those wishing to explore
+	but for the greater part we will stay within the bounds of default behaviour. Those wishing to explore
 	to depths of control ability should review the &smb.conf; man page.
 	</para>
 
-	<itemizedlist>
-	<title>File System Feature Comparison</title>
-		<listitem>
-		<para><emphasis>Name Space</emphasis></para>
+	<variablelist>
+		<title>File System Feature Comparison</title>
+		<varlistentry>
+			<term>Name Space</term>
+			<listitem>
 		<para>
 		MS Windows NT4 / 200x/ XP files names may be up to 254 characters long, Unix file names
 		may be 1023 characters long. In MS Windows file extensions indicate particular file types,
@@ -158,10 +159,12 @@ at how Samba helps to bridge the differences.
 		<para>
 		What MS Windows calls a Folder, Unix calls a directory,
 		</para>
-		</listitem>
+			</listitem>
+		</varlistentry>
 
-		<listitem>
-		<para><emphasis>Case Sensitivity</emphasis></para>
+		<varlistentry>
+			<term>Case Sensitivity</term>
+			<listitem>
 		<para>
 		MS Windows file names are generally Upper Case if made up of 8.3 (ie: 8 character file name
 		and 3 character extension. If longer than 8.3 file names are Case Preserving, and Case
@@ -176,28 +179,32 @@ 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
 		other solution would be suicidal.
 		</para>
-		</listitem>
+			</listitem>
+		</varlistentry>
 
-		<listitem>
-		<para><emphasis>Directory Separators</emphasis></para>
+		<varlistentry>
+			<term>Directory Separators</term>
+			<listitem>
 		<para>
 		MS Windows and DOS uses the back-slash '\' as a directory delimiter, Unix uses the forward-slash '/'
 		as it's directory delimiter. This is transparently handled by Samba.
 		</para>
-		</listitem>
+			</listitem>
+		</varlistentry>
 
-		<listitem>
-		<para><emphasis>Drive Identification</emphasis></para>
+		<varlistentry>
+			<term>Drive Identification</term>
+			<listitem>
 		<para>
 		MS Windows products support a notion of drive letters, like <command>C:</command> to represent
 		disk partitions. Unix has NO concept if separate identifiers for file partitions since each
@@ -205,20 +212,24 @@ at how Samba helps to bridge the differences.
 		The Unix directory tree begins at '/', just like the root of a DOS drive is specified like
 		<command>C:\</command>.
 		</para>
-		</listitem>
+			</listitem>
+		</varlistentry>
 
-		<listitem>
-		<para><emphasis>File Naming Conventions</emphasis></para>
+		<varlistentry>
+			<term>File Naming Conventions</term>
+			<listitem>
 		<para>
 		MS Windows generally never experiences file names that begin with a '.', while in Unix these
 		are commonly found in a user's home directory. Files that begin with a '.' are typically
 		either start up files for various Unix applications, or they may be files that contain
 		start-up configuration data.
 		</para>
-		</listitem>
-	
-		<listitem>
-		<para><emphasis>Links and Short-Cuts</emphasis></para>
+			</listitem>
+		</varlistentry>
+
+		<varlistentry>
+			<term>Links and Short-Cuts</term>
+			<listitem>
 		<para>
 		MS Windows make use of "links and Short-Cuts" that are actually special types of files that will
 		redirect an attempt to execute the file to the real location of the file. Unix knows of file and directory
@@ -228,10 +239,11 @@ at how Samba helps to bridge the differences.
 		Symbolic links are files in Unix that contain the actual location of the data (file OR directory). An
 		operation (like read or write) will operate directly on the file referenced. Symbolic links are also
 		referred to as 'soft links'. A hard link is something that MS Windows is NOT familiar with. It allows
-		one physical file to be known simulataneously by more than one file name.
+		one physical file to be known simultaneously by more than one file name.
 		</para>
-		</listitem>
-	</itemizedlist>
+			</listitem>
+		</varlistentry>
+	</variablelist>
 
 	<para>
 	There are many other subtle differences that may cause the MS Windows administrator some temporary discomfort
@@ -246,13 +258,20 @@ 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 frame="all">
+		<title>Managing directories with unix and windows</title>
+		<tgroup align="center" cols="3">
+		<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>
+	</tgroup>
+	</table>
 	</para>
 
 	</sect2>
@@ -268,11 +287,11 @@ at how Samba helps to bridge the differences.
 	</para>
 
 	<para>
-	Unix/Linux file and directory access permissions invloves setting three (3) primary sets of data and one (1) control set.
+	Unix/Linux file and directory access permissions involves 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 +312,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 +324,7 @@ at how Samba helps to bridge the differences.
 	The permissions field is made up of:
 
 	<programlisting>
+	<comment> JRV: Put this into a diagram of some sort</comment>
 	[ type  ] [ users ] [ group ] [ others ]   [File, Directory Permissions]
 	[ d | l ] [ r w x ] [ r w x ] [ r w x  ]
 	  |   |     | | |     | | |     | | |
@@ -324,20 +344,24 @@ 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.
-	<programlisting>
-	<title>Example File</title>
+
+	<example>
+		<title>Example File</title>
+		<programlisting>
 		-rwxr-x---   Means: The owner (user) can read, write, execute
 		                    the group can read and execute
 		                    everyone else can NOT do anything with it
-	</programlisting>
+		</programlisting>
+	</example>
+
 	</para>
 
 	<para>
-	Additional posibilities in the [type] field are: c = character device, b = block device, p = pipe device, s = Unix Domain Socket.
+	Additional possibilities in the [type] field are: c = character device, b = block device, p = pipe device, s = Unix Domain Socket.
 	</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),
 	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>
@@ -356,7 +380,7 @@ at how Samba helps to bridge the differences.
 	</para>
 
 	<para>
-	When a directory is set <command>drw-r-----</command> this means that the owner can read and create (write) files in it, but because
+	When a directory is set <constant>drw-r-----</constant> this means that the owner can read and create (write) files in it, but because
 	the (x) execute flags are not set files can not be listed (seen) in the directory by anyone. The group can read files in the
 	directory but can NOT create new files. NOTE: If files in the directory are set to be readable and writable for the group, then
 	group members will be able to write to (or delete) them.
@@ -379,17 +403,17 @@ Before using any of the following options please refer to the man page for &smb.
 
 	<para>
 	User and group based controls can prove very useful. In some situations it is distinctly desirable to affect all
-	file system operations as if a single user is doing this, the use of the <emphasis>force user</emphasis> and 
-	<emphasis>force group</emphasis> behaviour will achieve this. In other situations it may be necessary to affect a
+	file system operations as if a single user is doing this, the use of the <parameter>force user</parameter> and 
+	<parameter>force group</parameter> behaviour will achieve this. In other situations it may be necessary to affect a
 	paranoia level of control to ensure that only particular authorised persons will be able to access a share or
-	it's contents, here the use of the <emphasis>valid users</emphasis> or the <emphasis>invalid users</emphasis> may
+	it's contents, here the use of the <parameter>valid users</parameter> or the <parameter>invalid users</parameter> may
 	be most useful.
 	</para>
 
 	<para>
 	As always, it is highly advisable to use the least difficult to maintain and the least ambiguous method for
 	controlling access. Remember, that when you leave the scene someone else will need to provide assistance and
-	if that person finds to great a mess, or if they do not understand what you have done then there is risk of
+	if that person finds too great a mess, or if they do not understand what you have done then there is risk of
 	Samba being removed and an alternative solution being adopted.
 	</para>
 
@@ -482,7 +506,7 @@ Before using any of the following options please refer to the man page for &smb.
 	The following file and directory permission based controls, if misused, can result in considerable difficulty to
 	diagnose the cause of mis-configuration. Use them sparingly and carefully. By gradually introducing each one by one
 	undesirable side-effects may be detected. In the event of a problem, always comment all of them out and then gradually
-	re-instroduce them in a controlled fashion.
+	re-introduce them in a controlled fashion.
 	</para>
 
 	<table frame='all'><title>File and Directory Permission Based Controls</title>
@@ -539,13 +563,13 @@ Before using any of the following options please refer to the man page for &smb.
 		<row>
 			<entry>hide unreadable</entry>
 			<entry><para>
-			Prevents clients from seeing the existance of files that cannot be read.
+			Prevents clients from seeing the existence of files that cannot be read.
 			</para></entry>
 		</row>
 		<row>
 			<entry>hide unwriteable files</entry>
 			<entry><para>
-			Prevents clients from seeing the existance of files that cannot be written to. Unwriteable directories are shown as usual. 
+			Prevents clients from seeing the existence of files that cannot be written to. Unwriteable directories are shown as usual. 
 			</para></entry>
 		</row>
 		<row>
@@ -653,10 +677,10 @@ Before using any of the following options please refer to the man page for &smb.
 
 	<para>
 	This section deals with how to configure Samba per share access control restrictions.
-	By default samba sets no restrictions on the share itself. Restrictions on the share itself
+	By default, Samba sets no restrictions on the share itself. Restrictions on the share itself
 	can be set on MS Windows NT4/200x/XP shares. This can be a very effective way to limit who can
 	connect to a share. In the absence of specific restrictions the default setting is to allow
-	the global user <emphasis>Everyone</emphasis> Full Control (ie: Full control, Change and Read).
+	the global user <constant>Everyone</constant> Full Control (ie: Full control, Change and Read).
 	</para>
 
 	<para>
@@ -669,8 +693,8 @@ Before using any of the following options please refer to the man page for &smb.
 	<para>
 	Samba stores the per share access control settings in a file called <filename>share_info.tdb</filename>.
 	The location of this file on your system will depend on how samba was compiled. The default location
-	for samba's tdb files is under <filename>/usr/local/samba/var</filename>. If the <filename>tdbdump</filename>
-	utility has been compiled and installed on your system then you can examine the contents of this file
+	for Samba's tdb files is under <filename>/usr/local/samba/var</filename>. If the <filename>tdbdump</filename>
+	utility has been compiled and installed on your system, then you can examine the contents of this file
 	by: <userinput>tdbdump share_info.tdb</userinput>.
 	</para>
 
@@ -678,7 +702,7 @@ Before using any of the following options please refer to the man page for &smb.
 	<title>Share Permissions Management</title>
 
 		<para>
-		The best tool for the task is platform dependant. Choose the best tool for your environmemt.
+		The best tool for the task is platform dependant. Choose the best tool for your environment.
 		</para>
 
 			<sect3>
@@ -692,13 +716,13 @@ Before using any of the following options please refer to the man page for &smb.
 			<procedure>
 			<title>Instructions</title>
 			<step><para>
-			Launch the NT4 Server Manager, click on the Samba server you want to administer, then from the menu
-			select Computer, then click on the Shared Directories entry.
+			Launch the <application>NT4 Server Manager</application>, click on the Samba server you want to administer, then from the menu
+			select <guimenu>Computer</guimenu>, then click on the <guimenuitem>Shared Directories</guimenuitem> entry.
 			</para></step>
 
 			<step><para>
-				Now click on the share that you wish to manage, then click on the Properties tab, next click on
-				the Permissions tab. Now you can Add or change access control settings as you wish.
+			Now click on the share that you wish to manage, then click on the <guilabel>Properties</guilabel> tab, next click on
+			the <guilabel>Permissions</guilabel> tab. Now you can add or change access control settings as you wish.
 			</para></step>
 			</procedure>
 
@@ -708,14 +732,14 @@ Before using any of the following options please refer to the man page for &smb.
 			<title>Windows 200x/XP</title>
 
 			<para>
-			On MS Windows NT4/200x/XP system access control lists on the share itself are set using native
+			On <application>MS Windows NT4/200x/XP</application> system access control lists on the share itself are set using native
 			tools, usually from filemanager. For example, in Windows 200x: right click on the shared folder,
-			then select 'Sharing', then click on 'Permissions'. The default Windows NT4/200x permission allows
-			<emphasis>Everyone</emphasis> Full Control on the Share.
+			then select <guimenuitem>Sharing</guimenuitem>, then click on <guilabel>Permissions</guilabel>. The default 
+			Windows NT4/200x permission allows <emphasis>Everyone</emphasis> Full Control on the Share.
 			</para>
 
 			<para>
-			MS Windows 200x and later all comes with a tool called the 'Computer Management' snap-in for the
+			MS Windows 200x and later all comes with a tool called the <application>Computer Management</application> snap-in for the
 			Microsoft Management Console (MMC). This tool is located by clicking on <filename>Control Panel ->
 			Administrative Tools -> Computer Management</filename>.
 			</para>
@@ -723,21 +747,22 @@ Before using any of the following options please refer to the man page for &smb.
 			<procedure>
 			<title>Instructions</title>
 			<step><para>
-				After launching the MMC with the Computer Management snap-in, click on the menu item 'Action',
-				select 'Connect to another computer'. If you are not logged onto a domain you will be prompted
+				After launching the MMC with the Computer Management snap-in, click on the menu item <guimenuitem>Action</guimenuitem>,
+				select <guilabel>Connect to another computer</guilabel>. If you are not logged onto a domain you will be prompted
 				to enter a domain login user identifier and a password. This will authenticate you to the domain.
-				If you where already logged in with administrative privilidge this step is not offered.
+				If you where already logged in with administrative privilege this step is not offered.
 			</para></step>
 
 			<step><para>
-			If the Samba server is not shown in the Select Computer box, then type in the name of the target
-			Samba server in the field 'Name:'. Now click on the [+] next to 'System Tools', then on the [+]
-			next to 'Shared Folders' in the left panel.
+			If the Samba server is not shown in the <guilabel>Select Computer</guilabel> box, then type in the name of the target
+			Samba server in the field <guilabel>Name:</guilabel>. Now click on the <guibutton>[+]</guibutton> next to 
+			<guilabel>System Tools</guilabel>, then on the <guibutton>[+]</guibutton> next to <guilabel>Shared Folders</guilabel> in the 
+			left panel.
 			</para></step>
 
 			<step><para>
 			Now in the right panel, double-click on the share you wish to set access control permissions on.
-			Then click on the tab 'Share Permissions'. It is now possible to add access control entities
+			Then click on the tab <guilabel>Share Permissions</guilabel>. It is now possible to add access control entities
 			to the shared folder. Do NOT forget to set what type of access (full control, change, read) you
 			wish to assign for each entry.
 			</para></step>
@@ -745,10 +770,10 @@ Before using any of the following options please refer to the man page for &smb.
 
 			<warning>
 			<para>
-			Be careful. If you take away all permissions from the Everyone user without removing this user
+			Be careful. If you take away all permissions from the <constant>Everyone</constant> user without removing this user
 			then effectively no user will be able to access the share. This is a result of what is known as
-			ACL precidence. ie: Everyone with NO ACCESS means that MaryK who is part of the group Everyone
-			will have no access even if this user is given explicit full control access.
+			ACL precedence. ie: Everyone with <emphasis>no access</emphasis> means that MaryK who is part of the group 
+			<constant>Everyone</constant> will have no access even if this user is given explicit full control access.
 			</para>
 			</warning>
 
@@ -789,19 +814,19 @@ Before using any of the following options please refer to the man page for &smb.
 		<para>From an NT4/2000/XP client, single-click with the right 
 		mouse button on any file or directory in a Samba mounted 
 		drive letter or UNC path. When the menu pops-up, click 
-		on the <emphasis>Properties</emphasis> entry at the bottom of 
+		on the <guilabel>Properties</guilabel> entry at the bottom of 
 		the menu. This brings up the file properties dialog
-		box. Click on the tab <emphasis>Security</emphasis> and you 
-		will see three buttons, <emphasis>Permissions</emphasis>,	 
-		<emphasis>Auditing</emphasis>, and <emphasis>Ownership</emphasis>. 
-		The <emphasis>Auditing</emphasis> button will cause either 
+		box. Click on the tab <guilabel>Security</guilabel> and you 
+		will see three buttons, <guibutton>Permissions</guibutton>,	 
+		<guibutton>Auditing</guibutton>, and <guibutton>Ownership</guibutton>. 
+		The <guibutton>Auditing</guibutton> button will cause either 
 		an error message <errorname>A requested privilege is not held 
 		by the client</errorname> to appear if the user is not the 
 		NT Administrator, or a dialog which is intended to allow an 
 		Administrator to add auditing requirements to a file if the 
 		user is logged on as the NT Administrator. This dialog is 
 		non-functional with a Samba share at this time, as the only 
-		useful button, the <command>Add</command> button will not currently 
+		useful button, the <guibutton>Add</guibutton> button will not currently 
 		allow a list of users to be seen.</para>
 
 	</sect2>
@@ -809,7 +834,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 +844,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 
@@ -840,8 +865,8 @@ Before using any of the following options please refer to the man page for &smb.
 		and allow a user with Administrator privilege connected 
 		to a Samba server as root to change the ownership of 
 		files on both a local NTFS filesystem or remote mounted NTFS 
-		or Samba drive. This is available as part of the <emphasis>Seclib
-		</emphasis> NT security library written by Jeremy Allison of 
+		or Samba drive. This is available as part of the <application>Seclib
+		</application> NT security library written by Jeremy Allison of 
 		the Samba Team, available from the main Samba ftp site.</para>
 
 	</sect2>
@@ -849,12 +874,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 +891,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>
 
 
@@ -875,23 +902,23 @@ Before using any of the following options please refer to the man page for &smb.
 		<sect3>
 			<title>File Permissions</title>
 
-			<para>The standard UNIX user/group/world triple and 
+			<para>The standard UNIX user/group/world triplet and 
 			the corresponding "read", "write", "execute" permissions 
-			triples are mapped by Samba into a three element NT ACL 
+			triplets 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 
@@ -910,14 +937,14 @@ Before using any of the following options please refer to the man page for &smb.
 			<para>Directories on an NT NTFS file system have two 
 			different sets of permissions. The first set of permissions 
 			is the ACL set on the directory itself, this is usually displayed 
-			in the first set of parentheses in the normal <command>"RW"</command> 
+			in the first set of parentheses in the normal <constant>"RW"</constant> 
 			NT style. This first set of permissions is created by Samba in 
 			exactly the same way as normal file permissions are, described 
 			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,32 +958,32 @@ 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) 
+		<para>If a permission triplet (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 
 		allows you to add permissions back to a file or directory once 
-		you have removed them from a triple component.</para>
+		you have removed them from a triplet component.</para>
 
 		<para>As UNIX supports only the "r", "w" and "x" bits of 
 		an NT ACL then if other NT security attributes such as "Delete 
@@ -966,15 +993,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>
 
@@ -984,16 +1011,20 @@ Before using any of the following options please refer to the man page for &smb.
 
 		<para>There are four parameters 
 		to control interaction with the standard Samba create mask parameters.
-		These are :</para>
+		These are :
 
-		<para><parameter>security mask</parameter></para>
-		<para><parameter>force security mode</parameter></para>
-		<para><parameter>directory security mask</parameter></para>
-		<para><parameter>force directory security mode</parameter></para>
+		<simplelist>
+			<member><parameter>security mask</parameter></member>
+			<member><parameter>force security mode</parameter></member>
+			<member><parameter>directory security mask</parameter></member>
+			<member><parameter>force directory security mode</parameter></member>
+		</simplelist>
 
-		<para>Once a user clicks <command>"OK"</command> to apply the 
+		</para>
+
+		<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 
+		r/w/x triplet set, and then will check the changed permissions for a 
 		file against the bits set in the <ulink url="smb.conf.5.html#SECURITYMASK"> 
 		<parameter>security mask</parameter></ulink> parameter. Any bits that 
 		were changed that are not set to '1' in this parameter are left alone 
@@ -1050,12 +1081,15 @@ Before using any of the following options please refer to the man page for &smb.
 		<para>If you want to set up a share that allows users full control
 		in modifying the permission bits on their files and directories and
 		doesn't force any particular bits to be set 'on', then set the following
-		parameters in the &smb.conf; file in that share specific section :</para>
+		parameters in the &smb.conf; file in that share specific section :
+		</para>
 
-		<para><parameter>security mask = 0777</parameter></para>
-		<para><parameter>force security mode = 0</parameter></para>
-		<para><parameter>directory security mask = 0777</parameter></para>
-		<para><parameter>force directory security mode = 0</parameter></para>
+		<simplelist>
+			<member><parameter>security mask = 0777</parameter></member>
+			<member><parameter>force security mode = 0</parameter></member>
+			<member><parameter>directory security mask = 0777</parameter></member>
+			<member><parameter>force directory security mode = 0</parameter></member>
+		</simplelist>
 	</sect2>
 
 	<sect2>
@@ -1075,13 +1109,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 +1133,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
+	and there's 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 +1148,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
+		You should see that the file <filename>Afile</filename> 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
+		force directory 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 <emphasis>if</emphasis> your users are <emphasis>not</emphasis> 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
@@ -1193,6 +1251,16 @@ are examples taken from the mailing list in recent times.
 	</sect2>
 
 
+	<sect2>
+		<title>I have set force user and Samba still makes <emphasis>root</emphasis> the owner of all the files
+			I touch!</title>
+		<para>
+			When you have a user in 'admin users', Samba will always do file operations for
+			this user as <emphasis>root</emphasis>, even if <parameter>force user</parameter> has been set.
+		</para>
+	</sect2>
+	
+
 </sect1>
 
 </chapter>