Foratting update.

(This used to be commit e6f2a6d5e2a61c6b9550c41e9039f2d84a407530)

4 files changed, 25 insertions, 19 deletions

diff --git a/docs/Samba-Guide/SBE-2000UserNetwork.xml b/docs/Samba-Guide/SBE-2000UserNetwork.xml
index fb525b4424..30bbf28fb9 100644
--- a/docs/Samba-Guide/SBE-2000UserNetwork.xml
+++ b/docs/Samba-Guide/SBE-2000UserNetwork.xml
@@ -698,12 +698,12 @@
 
 	<image id="chap7net">
 		<imagedescription>Network Topology &smbmdash; 2000 User Complex Design A</imagedescription>
-		<imagefile scale="60">chap7-net-Ar</imagefile>
+		<imagefile scale="70">chap7-net-Ar</imagefile>
 	</image>
 
 	<image id="chap7net2">
 		<imagedescription>Network Topology &smbmdash; 2000 User Complex Design B</imagedescription>
-		<imagefile scale="60">chap7-net2-Br</imagefile>
+		<imagefile scale="70">chap7-net2-Br</imagefile>
 	</image>
 
 	</sect3>
diff --git a/docs/Samba-Guide/SBE-SecureOfficeServer.xml b/docs/Samba-Guide/SBE-SecureOfficeServer.xml
index a2d464565b..39cfa8e435 100644
--- a/docs/Samba-Guide/SBE-SecureOfficeServer.xml
+++ b/docs/Samba-Guide/SBE-SecureOfficeServer.xml
@@ -152,7 +152,7 @@
 
 		<image id="ch04net">
 			<imagedescription>Abmas Network Topology &smbmdash; 130 Users</imagedescription>
-			<imagefile scale="60">chap4-net</imagefile>
+			<imagefile scale="65">chap4-net</imagefile>
 		</image>
 
 		<para>
@@ -512,7 +512,8 @@ Given 500 Users and 2 years:
 	      <primary>name resolve order</primary>
 	    </indexterm>
 		WINS serving is enabled by the <smbconfoption name="wins support">Yes</smbconfoption>,
-		and name resolution is set to use it by means of the <smbconfoption name="name resolve order">wins bcast hosts</smbconfoption> entry.
+		and name resolution is set to use it by means of the
+		<smbconfoption name="name resolve order">wins bcast hosts</smbconfoption> entry.
 		</para></listitem>
 
 	<listitem><para><indexterm>
@@ -546,16 +547,18 @@ Given 500 Users and 2 years:
 		to enable workstations to join the Domain, and is also important so that you can use
 		the Windows NT4 Domain User Manager, as well as the Domain Server Manager. These tools
 		are provided as part of the <filename>SRVTOOLS.EXE</filename> toolkit that can be 
-		downloaded from the Microsoft FTP <ulink url="ftp://ftp.microsoft.com/Softlib/MSLFILES/SRVTOOLS.EXE">site.</ulink>
+		downloaded from the Microsoft FTP
+		<ulink url="ftp://ftp.microsoft.com/Softlib/MSLFILES/SRVTOOLS.EXE">site.</ulink>
 		</para></listitem>
 
 	<listitem><para><indexterm>
 	      <primary>User Mode</primary>
 	    </indexterm>
 		The &smb.conf; file specifies that the Samba server will operate in (default) <parameter>
-			security = user</parameter> mode<footnote><para>See <emphasis>TOSHARG</emphasis>, Chapter 3. This is necessary
-		so that Samba can act as a Domain Controller (PDC); see <emphasis>TOSHARG</emphasis>, Chapter 4 for 
-		additional information.</para></footnote> (User Mode).
+		security = user</parameter> mode<footnote><para>See <emphasis>TOSHARG</emphasis>, Chapter 3.
+		This is necessary so that Samba can act as a Domain Controller (PDC); see
+		<emphasis>TOSHARG</emphasis>, Chapter 4 for additional information.</para></footnote>
+		(User Mode).
 		</para></listitem>
 
 	<listitem><para><indexterm>
@@ -574,7 +577,8 @@ Given 500 Users and 2 years:
 	    </indexterm><indexterm>
 	      <primary>profile share</primary>
 	    </indexterm>
-		Roaming profiles are enabled through the specification of the parameter, <smbconfoption name="logon path">\\%L\profiles\%U</smbconfoption>. The value of this parameter translates the
+		Roaming profiles are enabled through the specification of the parameter,
+		<smbconfoption name="logon path">\\%L\profiles\%U</smbconfoption>. The value of this parameter translates the
 		<constant>%L</constant> to the name by which the Samba server is called by the client (for this
 		configuration, it translates to the name <constant>DIAMOND</constant>), and the <constant>%U</constant>
 		will translate to the name of the user within the context of the connection made to the profile share.
@@ -867,7 +871,8 @@ echo -e "\nNAT firewall done.\n"
 <smbconfoption name="bind interfaces only">Yes</smbconfoption>
 <smbconfoption name="passdb backend">tdbsam</smbconfoption>
 <smbconfoption name="pam password change">Yes</smbconfoption>
-<smbconfoption name="passwd chat">*New*Password* %n\n *Re-enter*new*password*%n\n *Password*changed*</smbconfoption>
+<smbconfoption name="passwd chat"></smbconfoption>
+<member><parameter>*New*Password* %n\n *Re-enter*new*password*%n\n *Password*changed*</parameter></member>
 <smbconfoption name="username map">/etc/samba/smbusers</smbconfoption>
 <smbconfoption name="unix password sync">Yes</smbconfoption>
 <smbconfoption name="log level">1</smbconfoption>
diff --git a/docs/Samba-Guide/SBE-SimpleOfficeServer.xml b/docs/Samba-Guide/SBE-SimpleOfficeServer.xml
index 3037630116..ae9b73b957 100644
--- a/docs/Samba-Guide/SBE-SimpleOfficeServer.xml
+++ b/docs/Samba-Guide/SBE-SimpleOfficeServer.xml
@@ -504,7 +504,7 @@
 
 		<image id="charitynet">
 			<imagedescription>Charity Administration Office Network</imagedescription>
-			<imagefile scale="66">Charity-Network</imagefile>
+			<imagefile scale="80">Charity-Network</imagefile>
 		</image>
 
 		<procedure>
@@ -589,9 +589,9 @@ Password changed
 				with the same owner and group as the directory in which they are created. Any new
 				directories created still have the same owner, group, and permissions as the
 				directory they are in. This should eliminate all permissions-based file access problems.
-				For more information on this subject, refer to <emphasis>TOSHARG</emphasis>, Chapter 13, <emphasis>File, Directory
-				and Share Access Controls</emphasis>, or refer to the UNIX man page for the 
-				<command>chmod</command> and the <command>chown</command> commands.
+				For more information on this subject, refer to <emphasis>TOSHARG</emphasis>,
+				Chapter on: <emphasis>File, Directory and Share Access Controls</emphasis>, or refer to
+				the UNIX man page for the <command>chmod</command> and the <command>chown</command> commands.
 				
 				</para></step>
 
@@ -996,7 +996,7 @@ C:\WINDOWS: regedit ME-dpwc.reg
 
 		<image id="acctingnet2">
 			<imagedescription>Accounting Office Network Topology</imagedescription>
-			<imagefile scale="66">AccountingNetwork</imagefile>
+			<imagefile scale="85">AccountingNetwork</imagefile>
 		</image>
 
 		<table id="acctingnet">
@@ -1300,7 +1300,6 @@ application/octet-stream
 <smbconfsection name="[files]"/>
 <smbconfoption name="comment">Work area files</smbconfoption>
 <smbconfoption name="path">/data/%U</smbconfoption>
-<smbconfoption name="valid users">%S</smbconfoption>
 <smbconfoption name="read only">No</smbconfoption>
 
 <smbconfsection name="[master]"/>
diff --git a/docs/Samba-Guide/SBE-TheSmallOffice.xml b/docs/Samba-Guide/SBE-TheSmallOffice.xml
index cb62f66e78..e4473b865b 100644
--- a/docs/Samba-Guide/SBE-TheSmallOffice.xml
+++ b/docs/Samba-Guide/SBE-TheSmallOffice.xml
@@ -292,7 +292,7 @@
 
 	<image id="acct2net">
 		<imagedescription>Abmas Accounting &smbmdash; 52 User Network Topology</imagedescription>
-		<imagefile scale="65">acct2net</imagefile>
+		<imagefile scale="100">acct2net</imagefile>
 	</image>
 
 	<procedure>
@@ -644,7 +644,8 @@ hosts:	files wins
 <smbconfcomment>Global parameters</smbconfcomment>
 <smbconfsection name="[global]"/>
 <smbconfoption name="workgroup">BILLMORE</smbconfoption>
-<smbconfoption name="passwd chat">*New*Password* %n\n*Re-enter*new*password* %n\n *Password*changed*</smbconfoption>
+<smbconfoption name="passwd chat"></smbconfoption>
+<member><parameter>*New*Password* %n\n*Re-enter*new*password* %n\n *Password*changed*</parameter></member>
 <smbconfoption name="username map">/etc/samba/smbusers</smbconfoption>
 <smbconfoption name="syslog">0</smbconfoption>
 <smbconfoption name="name resolve order">wins bcast hosts</smbconfoption>
@@ -655,7 +656,8 @@ hosts:	files wins
 <smbconfoption name="add group script">/usr/sbin/groupadd '%g'</smbconfoption>
 <smbconfoption name="delete group script">/usr/sbin/groupdel '%g'</smbconfoption>
 <smbconfoption name="add user to group script">/usr/sbin/usermod -G '%g' '%u'</smbconfoption>
-<smbconfoption name="add machine script">/usr/sbin/useradd -s /bin/false -d /var/lib/nobody '%u'</smbconfoption>
+<smbconfoption name="add machine script"></smbconfoption>
+<member><parameter>/usr/sbin/useradd -s /bin/false -d /var/lib/nobody '%u'</parameter></member>
 <smbconfoption name="logon script">scripts\login.bat</smbconfoption>
 <smbconfoption name="logon path"> </smbconfoption>
 <smbconfoption name="logon drive">X:</smbconfoption>