Lots of minor, mostly layout fixes.

(This used to be commit 99674fdbd12caca61baa00974a492a9a26d982e9)

1 files changed, 125 insertions, 94 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>