Stage 1 of PHPTR Edits.

(This used to be commit 64a9e3e8619bf33dcf6b0ff8171b47a3e2581239)

1 files changed, 337 insertions, 239 deletions

diff --git a/docs/Samba3-HOWTO/TOSHARG-ProfileMgmt.xml b/docs/Samba3-HOWTO/TOSHARG-ProfileMgmt.xml
index 8b137dd4ef..6cdf87b54f 100644
--- a/docs/Samba3-HOWTO/TOSHARG-ProfileMgmt.xml
+++ b/docs/Samba3-HOWTO/TOSHARG-ProfileMgmt.xml
@@ -12,7 +12,7 @@
 <title>Features and Benefits</title>
 
 <para>
-Roaming profiles are feared by some, hated by a few, loved by many, and a Godsend for
+Roaming profiles are feared by some, hated by a few, loved by many, and a godsend for
 some administrators.
 </para>
 
@@ -73,33 +73,30 @@ This section documents how to configure Samba for MS Windows client profile supp
 For example, to support Windows NT4/200x clients, set the following in the [global] section of the &smb.conf; file:
 </para>
 
-<para>
 <smbconfblock>
 	<smbconfoption name="logon path"> \\profileserver\profileshare\profilepath\%U\moreprofilepath</smbconfoption>
 </smbconfblock>
 
+<para>
 This is typically implemented like:
-
 <smbconfblock>
-<smbconfoption name="logon path">\\%L\Profiles\%u</smbconfoption>
+<smbconfoption name="logon path">\\%L\Profiles\%U</smbconfoption>
 </smbconfblock>
-where <quote>%L</quote> translates to the name of the Samba server and <quote>%u</quote> translates to the user name.
+where <quote>%L</quote> translates to the name of the Samba server and <quote>%U</quote> translates to the username.
 </para>
 
 <para>
-The default for this option is <filename>\\%N\%U\profile</filename>, namely <filename>\\sambaserver\username\profile</filename>. 
+The default for this option is <filename>\\%N\%U\profile</filename>, namely, <filename>\\sambaserver\username\profile</filename>. 
 The <filename>\\%N\%U</filename> service is created automatically by the [homes] service. If you are using
 a Samba server for the profiles, you must make the share that is specified in the logon path
-browseable. Please refer to the man page for &smb.conf; in respect of the different
+browseable. Please refer to the man page for &smb.conf; regarding the different
 semantics of <quote>%L</quote> and <quote>%N</quote>, as well as <quote>%U</quote> and <quote>%u</quote>.
 </para>
 
-<note>
-<para>
+<note><para>
 MS Windows NT/200x clients at times do not disconnect a connection to a server between logons. It is recommended
-to not use the <smbconfsection name="homes"/> meta-service name as part of the profile share path.
-</para>
-</note>
+to not use the <smbconfsection name="homes"/> metaservice name as part of the profile share path.
+</para></note>
 </sect3>
 
 <sect3>
@@ -138,7 +135,7 @@ specified <filename>\\%L\%U</filename> for <smbconfoption name="logon home"/>.
 
 <para>
 You can support profiles for Windows 9x and Windows NT clients by setting both the
-<smbconfoption name="logon home"/> and <smbconfoption name="logon path"/> parameters. For example:
+<smbconfoption name="logon home"/> and <smbconfoption name="logon path"/> parameters. For example,
 </para>
 
 <para><smbconfblock>
@@ -146,12 +143,17 @@ You can support profiles for Windows 9x and Windows NT clients by setting both t
 <smbconfoption name="logon path">\\%L\profiles\%u</smbconfoption>
 </smbconfblock></para>
 
+<para>
+Windows 9x/Me and NT4 and later profiles should not be stored in the same location because
+Windows NT4 and later will experience problems with mixed profile environments.
+</para>
+
 </sect3>
 <sect3>
 <title>Disabling Roaming Profile Support</title>
 
 <para>
-A question often asked is: <quote>How may I enforce use of local profiles?</quote> or
+The question often asked is, <quote>How may I enforce use of local profiles?</quote> or
 <quote>How do I disable roaming profiles?</quote>
 </para>
 
@@ -161,10 +163,9 @@ There are three ways of doing this:
 <indexterm><primary>windows registry settings</primary><secondary>roaming profiles</secondary></indexterm>
 </para>
 
-
 <variablelist>
 	<varlistentry>
-		<term>In &smb.conf;</term>
+		<term>In &smb.conf;</term>:
 		<listitem><para>
 		Affect the following settings and ALL clients will be forced to use a local profile:
 		<smbconfoption name="logon home"> </smbconfoption> and <smbconfoption name="logon path"> </smbconfoption>
@@ -177,9 +178,9 @@ There are three ways of doing this:
 	</varlistentry>
 
 	<varlistentry>
-		<term>MS Windows Registry</term>
+		<term>MS Windows Registry:</term>
 		<listitem><para>
-		By using the Microsoft Management Console gpedit.msc to instruct your MS Windows XP
+		Use the Microsoft Management Console (MMC) gpedit.msc to instruct your MS Windows XP
 		machine to use only a local profile. This, of course, modifies registry settings. The full
 		path to the option is:
 <screen>
@@ -197,7 +198,7 @@ Disable: Prevent Roaming Profile Change from Propagating to the Server
 
 	<varlistentry>
 		<term>Change of Profile Type:</term>
-		<listitem><para>From the start menu right-click on <guiicon>My Computer icon</guiicon>,
+		<listitem><para>From the start menu right-click on the <guiicon>My Computer</guiicon> icon,
 		select <guimenuitem>Properties</guimenuitem>, click on the <guilabel>User Profiles</guilabel>
 		tab, select the profile you wish to change from
 		<guimenu>Roaming</guimenu> type to <guimenu>Local</guimenu>, and click on
@@ -213,26 +214,28 @@ about which registry keys to change to enforce use of only local user profiles.
 
 <note><para>
 The specifics of how to convert a local profile to a roaming profile, or a roaming profile
-to a local one vary according to the version of MS Windows you are running. Consult the Microsoft MS
+to a local one, vary according to the version of MS Windows you are running. Consult the Microsoft MS
 Windows Resource Kit for your version of Windows for specific information.
 </para></note>
 
-</sect3> </sect2>
+</sect3>
+</sect2>
 
-<sect2> <title>Windows Client Profile Configuration Information</title>
+<sect2>
+<title>Windows Client Profile Configuration Information</title>
 
-<sect3> <title>Windows 9x/Me Profile Setup</title>
+<sect3>
+<title>Windows 9x/Me Profile Setup</title>
 
 <para>
-When a user first logs in on Windows 9X, the file user.DAT is created, as are folders
-<filename>Start Menu</filename>, <filename>Desktop</filename>, <filename>Programs</filename>, and
-<filename>Nethood</filename>. These directories and their contents will be merged with the local
-versions stored in <filename>c:\windows\profiles\username</filename> on subsequent logins, taking the
-most recent from each.	You will need to use the <smbconfsection name="[global]"/> options
-<smbconfoption name="preserve case">yes</smbconfoption>,
-<smbconfoption name="short preserve case">yes</smbconfoption> and
-<smbconfoption name="case sensitive">no</smbconfoption>
-in order to maintain capital letters in shortcuts in any of the profile folders.
+When a user first logs in on Windows 9x, the file user.DAT is created, as are folders <filename>Start
+Menu</filename>, <filename>Desktop</filename>, <filename>Programs</filename>, and
+<filename>Nethood</filename>. These directories and their contents will be merged with the local versions
+stored in <filename>c:\windows\profiles\username</filename> on subsequent logins, taking the most recent from
+each.	You will need to use the <smbconfsection name="[global]"/> options <smbconfoption name="preserve
+case">yes</smbconfoption>, <smbconfoption name="short preserve case">yes</smbconfoption>, and <smbconfoption
+name="case sensitive">no</smbconfoption> in order to maintain capital letters in shortcuts in any of the
+profile folders.
 </para>
 
 <para>
@@ -257,43 +260,53 @@ rename their <filename>user.DAT</filename> file to <filename>user.MAN</filename>
 	</para> </listitem>
 </orderedlist>
 
-<para> Under Windows 9x/ME, profiles are downloaded from the Primary Logon. If you have the Primary Logon
+<para>
+Under Windows 9x/Me, profiles are downloaded from the Primary Logon. If you have the Primary Logon
 as <quote>Client for Novell Networks</quote>, then the profiles and logon script will be downloaded from
-your Novell Server. If you have the Primary Logon as <quote>Windows Logon</quote>, then the profiles will
-be loaded from the local machine &smbmdash; a bit against the concept of roaming profiles, it would seem!  </para>
+your Novell server. If you have the Primary Logon as <quote>Windows Logon</quote>, then the profiles will
+be loaded from the local machine &smbmdash; a bit against the concept of roaming profiles, it would seem! 
+</para>
 
 <para>
 You will now find that the Microsoft Networks Login box contains <constant>[user, password, domain]</constant> instead
 of just <constant>[user, password]</constant>. Type in the Samba server's domain name (or any other domain known to exist,
-but bear in mind that the user will be authenticated against this domain and profiles downloaded from it,
+but bear in mind that the user will be authenticated against this domain and profiles downloaded from it
 if that domain logon server supports it), user name and user's password. 
 </para>
 
-<para> Once the user has been successfully validated, the Windows 9x/Me machine will inform you that
-<computeroutput>The user has not logged on before</computeroutput> and asks you <computeroutput>Do you
-wish to save the user's preferences?</computeroutput> Select <guibutton>Yes</guibutton>. </para>
+<para>
+Once the user has been successfully validated, the Windows 9x/Me machine informs you that
+<computeroutput>The user has not logged on before</computeroutput> and asks <computeroutput>Do you
+wish to save the user's preferences?</computeroutput> Select <guibutton>Yes</guibutton>.
+</para>
 
-<para> Once the Windows 9x/Me client comes up with the desktop, you should be able to examine the
+<para>
+Once the Windows 9x/Me client comes up with the desktop, you should be able to examine the
 contents of the directory specified in the <smbconfoption name="logon path"/> on
 the Samba server and verify that the <filename>Desktop</filename>, <filename>Start Menu</filename>,
-<filename>Programs</filename> and <filename>Nethood</filename> folders have been created. </para>
+<filename>Programs</filename>, and <filename>Nethood</filename> folders have been created.
+</para>
 
-<para> These folders will be cached locally on the client, and updated when the user logs off (if
+<para>
+These folders will be cached locally on the client and updated when the user logs off (if
 you haven't made them read-only by then). You will find that if the user creates further folders or
-shortcut, that the client will merge the profile contents downloaded with the contents of the profile
-directory already on the local client, taking the newest folders and shortcut from each set.	</para>
+shortcuts, the client will merge the profile contents downloaded with the contents of the profile
+directory already on the local client, taking the newest folders and shortcut from each set.
+</para>
 
-<para> If you have made the folders/files read-only on the Samba server, then you will get errors from
+<para>
+If you have made the folders/files read-only on the Samba server, then you will get errors from
 the Windows 9x/Me machine on logon and logout as it attempts to merge the local and remote profile.
 Basically, if you have any errors reported by the Windows 9x/Me machine, check the UNIX file permissions
-and ownership rights on the profile directory contents, on the Samba server. </para>
+and ownership rights on the profile directory contents, on the Samba server.
+</para>
 
-<para> If you have problems creating user profiles, you can reset the user's local desktop cache, as
-shown below. When this user next logs in, the user will be told that he/she is logging in <quote>for
-	the first time</quote>.
-	
+<para>
 <indexterm><primary>windows registry settings</primary><secondary>profile path</secondary></indexterm>
-	</para>
+If you have problems creating user profiles, you can reset the user's local desktop cache, as shown below.
+When this user next logs in, the user will be told that he/she is logging in <quote>for the first
+time</quote>.
+</para>
 
 
 <orderedlist>
@@ -310,7 +323,7 @@ shown below. When this user next logs in, the user will be told that he/she is l
 	</para>
 
 	<para>
-	You will find an entry for each user of ProfilePath.	Note the contents of this key
+	You will find an entry for each user of ProfilePath. Note the contents of this key
 	(likely to be <filename>c:\windows\profiles\username</filename>), then delete the key
 	<parameter>ProfilePath</parameter> for the required user.
 	</para></listitem>
@@ -336,8 +349,8 @@ shown below. When this user next logs in, the user will be told that he/she is l
 
 <warning><para>
 Before deleting the contents of the directory listed in the <parameter>ProfilePath</parameter>
-(this is likely to be <filename>c:\windows\profiles\username)</filename>, ask the owner if they have
-any important files stored on their desktop or in their start menu. Delete the contents of the
+(this is likely to be <filename>c:\windows\profiles\username)</filename>, ask whether the owner has
+any important files stored on his or her desktop or start menu. Delete the contents of the
 directory <parameter>ProfilePath</parameter> (making a backup if any of the files are needed).
 </para>
 
@@ -362,43 +375,57 @@ provided with Windows NT4/200x server, and see what the differences are with the
 <sect3>
 <title>Windows NT4 Workstation</title>
 
-<para> When a user first logs in to a Windows NT Workstation, the profile NTuser.DAT is created. The profile
+<para>
+When a user first logs in to a Windows NT workstation, the profile NTuser.DAT is created. The profile
 location can be now specified through the <smbconfoption name="logon path"/> parameter.
 </para>
 
-<para> There is a parameter that is now available for use with NT Profiles: <smbconfoption name="logon drive"/>. 
+<para>
+There is a parameter that is now available for use with NT Profiles: <smbconfoption name="logon drive"/>. 
 This should be set to <filename>H:</filename> or any other drive, and should be used in conjunction with
-the new <smbconfoption name="logon home"/> parameter. </para>
+the new <smbconfoption name="logon home"/> parameter.
+</para>
 
-<para> The entry for the NT4 profile is a directory not a file. The NT help on Profiles mentions that a
+<para>
+The entry for the NT4 profile is a directory, not a file. The NT help on profiles mentions that a
 directory is also created with a .PDS extension. The user, while logging in, must have write permission
 to create the full profile path (and the folder with the .PDS extension for those situations where it
-might be created.)  </para>
+might be created). 
+</para>
 
-<para> In the profile directory, Windows NT4 creates more folders than Windows 9x/Me. It creates
+<para>
+In the profile directory, Windows NT4 creates more folders than Windows 9x/Me. It creates
 <filename>Application Data</filename> and others, as well as <filename>Desktop</filename>,
 <filename>Nethood</filename>, <filename>Start Menu,</filename> and <filename>Programs</filename>.
 The profile itself is stored in a file <filename>NTuser.DAT</filename>. Nothing appears to be stored
-in the .PDS directory, and its purpose is currently unknown. </para>
+in the .PDS directory, and its purpose is currently unknown.
+</para>
 
-<para> You can use the <application>System Control Panel</application> to copy a local profile onto
-a Samba server (see NT Help on Profiles; it is also capable of firing up the correct location in the
-<application>System Control Panel</application> for you). The NT Help file also mentions that renaming
+<para>
+You can use the <application>System Control Panel</application> to copy a local profile onto
+a Samba server (see NT help on profiles; it is also capable of firing up the correct location in the
+<application>System Control Panel</application> for you). The NT help file also mentions that renaming
 <filename>NTuser.DAT</filename> to <filename>NTuser.MAN</filename> turns a profile into a mandatory one.
 </para>
 
-<para> The case of the profile is significant.	The file must be called <filename>NTuser.DAT</filename>
-or, for a mandatory profile, <filename>NTuser.MAN</filename>. </para> </sect3>
+<para>
+The case of the profile is significant.	The file must be called <filename>NTuser.DAT</filename>
+or, for a mandatory profile, <filename>NTuser.MAN</filename>.
+</para>
 
-<sect3> <title>Windows 2000/XP Professional</title>
+</sect3>
 
-<para> You must first convert the profile from a local profile to a domain profile on the MS Windows
+<sect3>
+<title>Windows 2000/XP Professional</title>
+
+<para>
+You must first convert the profile from a local profile to a domain profile on the MS Windows
 workstation as follows: </para>
 
 <procedure>
 	<step><para> Log on as the <emphasis>local</emphasis> workstation administrator. </para></step>
 
-	<step><para> Right-click on the <guiicon>My Computer</guiicon> Icon, select
+	<step><para> Right-click on the <guiicon>My Computer</guiicon> icon, and select
 	<guimenuitem>Properties</guimenuitem>.</para></step>
 
 	<step><para> Click on the <guilabel>User Profiles</guilabel> tab.</para></step>
@@ -425,13 +452,14 @@ workstation as follows: </para>
 	you nominated.	</para></step>
 </procedure>
 
-<para> Done. You now have a profile that can be edited using the Samba <command>profiles</command> tool.
+<para>
+Done. You now have a profile that can be edited using the Samba <command>profiles</command> tool.
 </para>
 
 <note><para>
 Under Windows NT/200x, the use of mandatory profiles forces the use of MS Exchange storage of mail
 data and keeps it out of the desktop profile. That keeps desktop profiles from becoming unusable.
-</para> </note>
+</para></note>
 
 <sect4>
 <title>Windows XP Service Pack 1</title>
@@ -441,7 +469,7 @@ data and keeps it out of the desktop profile. That keeps desktop profiles from b
 	</para>
 
 	<para>
-		<filename>Computer Configuration\Administrative Templates\System\User Profiles\<?latex \linebreak ?>Do not check for
+		<filename>Computer Configuration\Administrative Templates\System\User Profiles\Do not check for
 	user ownership of Roaming Profile Folders</filename>i
 	</para>
 
@@ -454,13 +482,12 @@ data and keeps it out of the desktop profile. That keeps desktop profiles from b
 	</para>
 
 	<para>If you cannot set group policies in Samba, then you may be able to set the policy locally on
-	each machine. If you want to try this, then do the following (N.B. I do not know for sure that this
-	will work in the same way as a domain group policy):
+	each machine. If you want to try this, then do the following:
 	</para>
 
 
 <procedure>
-	<step><para>On the XP workstation, log in with an Administrative account.</para></step>
+	<step><para>On the XP workstation, log in with an administrative account.</para></step>
 
 	<step><para>Click on <guimenu>Start</guimenu> -> <guimenuitem>Run</guimenuitem>.</para></step>
 	<step><para>Type <command>mmc</command>.</para></step>
@@ -485,12 +512,12 @@ data and keeps it out of the desktop profile. That keeps desktop profiles from b
 </sect2>
 
 <sect2>
-        <title>User Profile Hive Cleanup Service</title>
+<title>User Profile Hive Cleanup Service</title>
 
 <para>
-There certain situations that cause a cached local copy of roaming profile not to be deleted on exit, even if
-the policy to force such deletion is set. To deal with that situation special service was created. The application 
-<command>UPHClean</command> (User Profile Hive Cleanup) can be installed as service on Windows NT4/2000/XP Professional,
+There are certain situations that cause a cached local copy of roaming profile not to be deleted on exit, even if
+the policy to force such deletion is set. To deal with that situation, a special service was created. The application 
+<command>UPHClean</command> (User Profile Hive Cleanup) can be installed as a service on Windows NT4/2000/XP Professional
 and Windows 2003.
 </para>
 
@@ -501,43 +528,54 @@ The UPHClean software package can be downloaded from <ulink url="http://www.micr
 </sect2>
 
 <sect2>
-	<title>Sharing Profiles between W9x/Me and NT4/200x/XP Workstations</title>
+<title>Sharing Profiles between Windows 9x/Me and NT4/200x/XP Workstations</title>
 
-<para> Sharing of desktop profiles between Windows versions is not recommended. Desktop profiles are an
-evolving phenomenon and profiles for later versions of MS Windows clients add features that may interfere
+<para>
+Sharing of desktop profiles between Windows versions is not recommended. Desktop profiles are an
+evolving phenomenon, and profiles for later versions of MS Windows clients add features that may interfere
 with earlier versions of MS Windows clients. Probably the more salient reason to not mix profiles is
 that when logging off an earlier version of MS Windows, the older format of profile contents may overwrite
-information that belongs to the newer version resulting in loss of profile information content when that
-user logs on again with the newer version of MS Windows. </para>
+information that belongs to the newer version, resulting in loss of profile information content when that
+user logs on again with the newer version of MS Windows.
+</para>
 
-<para> If you then want to share the same Start Menu/Desktop with W9x/Me, you will need to specify a common
+<para>
+If you then want to share the same Start Menu and Desktop with Windows 9x/Me, you must specify a common
 location for the profiles. The &smb.conf; parameters that need to be common are 
-<smbconfoption name="logon path"/> and 
-<smbconfoption name="logon home"/>. </para>
+<smbconfoption name="logon path"/> and <smbconfoption name="logon home"/>.
+</para>
 
-<para> If you have this set up correctly, you will find separate <filename>user.DAT</filename> and
-<filename>NTuser.DAT</filename> files in the same profile directory. </para>
+<para>
+If you have this set up correctly, you will find separate <filename>user.DAT</filename> and
+<filename>NTuser.DAT</filename> files in the same profile directory.
+</para>
 
 </sect2>
 
 <sect2>
 <title>Profile Migration from Windows NT4/200x Server to Samba</title>
 
-<para> There is nothing to stop you from specifying any path that you like for the location of users' profiles.
-Therefore, you could specify that the profile be stored on a Samba server, or any other SMB server,
-as long as that SMB server supports encrypted passwords. </para>
+<para>
+There is nothing to stop you from specifying any path that you like for the location of users' profiles.
+Therefore, you could specify that the profile be stored on a Samba server or any other SMB server,
+as long as that SMB server supports encrypted passwords.
+</para>
 
-<sect3>
+<sect3 id="profilemigrn">
 <title>Windows NT4 Profile Management Tools</title>
 
-<para> Unfortunately, the Resource Kit information is specific to the version of MS Windows NT4/200x. The
-correct resource kit is required for each platform. </para>
+<para>
+Unfortunately, the resource kit information is specific to the version of MS Windows NT4/200x. The
+correct resource kit is required for each platform.
+</para>
 
 <para>Here is a quick guide:</para>
 
 <procedure>
-	<step><para> On your NT4 Domain Controller, right click on <guiicon>My Computer</guiicon>, then select the
-	tab labeled <guilabel>User Profiles</guilabel>. </para></step>
+<title>Profile Migration Procedure</title>
+
+	<step><para> On your NT4 domain controller, right-click on <guiicon>My Computer</guiicon>, then select 
+	<guilabel>Properties</guilabel>, then the tab labeled <guilabel>User Profiles</guilabel>. </para></step>
 
 	<step><para> Select a user profile you want to migrate and click on it. </para>
 
@@ -548,7 +586,7 @@ correct resource kit is required for each platform. </para>
 
 	<step><para>Click on the <guibutton>Copy To</guibutton> button.</para></step>
 
-	<step><para>In the box labeled <guilabel>Copy Profile to</guilabel> add your new path, e.g.,
+	<step><para>In the box labeled <guilabel>Copy Profile to</guilabel> add your new path, such as,
 	<filename>c:\temp\foobar</filename></para></step>
 
 	<step><para>Click on <guibutton>Change</guibutton> in the <guilabel>Permitted to use</guilabel> box.</para></step>
@@ -559,7 +597,9 @@ correct resource kit is required for each platform. </para>
 	<step><para>Now click on <guibutton>OK</guibutton>.</para></step>
 </procedure>
 
-<para> Follow the above for every profile you need to migrate.	</para>
+<para>
+Follow these steps for every profile you need to migrate.
+</para>
 
 </sect3>
 
@@ -569,15 +609,19 @@ correct resource kit is required for each platform. </para>
 
 <para>
 <indexterm><primary>SID</primary></indexterm>
-You should obtain the SID of your NT4 domain. You can use smbpasswd to do this. Read the man
-page.</para>
+You should obtain the SID of your NT4 domain. You can use the <command>net rpc info</command> to do this.
+See <link linkend="NetCommand">The Net Command Chapter</link>, <link linkend="netmisc1">Other Miscellaneous Operations</link> for more information.
+</para>
 
 </sect3>
 
-<sect3> <title>moveuser.exe</title>
+<sect3>
+<title>moveuser.exe</title>
 
-<para> The Windows 200x professional resource kit has <command>moveuser.exe</command>. <command>moveuser.exe</command> changes the security of a profile
-from one user to another. This allows the account domain to change, and/or the user name to change.</para>
+<para>
+The Windows 200x professional resource kit has <command>moveuser.exe</command>. <command>moveuser.exe</command> changes the security of a profile
+from one user to another. This allows the account domain to change and/or the username to change.
+</para>
 
 <para>
 This command is like the Samba <command>profiles</command> tool.
@@ -590,41 +634,58 @@ This command is like the Samba <command>profiles</command> tool.
 
 <para>
 <indexterm><primary>SID</primary></indexterm>
-You can identify the SID by using <command>GetSID.exe</command> from the Windows NT Server 4.0 Resource Kit. </para>
+You can identify the SID by using <command>GetSID.exe</command> from the Windows NT Server 4.0 Resource Kit.
+</para>
 
-<para> Windows NT 4.0 stores the local profile information in the registry under the following key:
-<filename>HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\ProfileList</filename> </para>
+<para>
+Windows NT 4.0 stores the local profile information in the registry under the following key:
+<filename>HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\ProfileList</filename>
+</para>
 
-<para> Under the ProfileList key, there will be subkeys named with the SIDs of the users who have logged
+<para>
+Under the ProfileList key, there will be subkeys named with the SIDs of the users who have logged
 on to this computer. (To find the profile information for the user whose locally cached profile you want
 to move, find the SID for the user with the <command>GetSID.exe</command> utility.) Inside the appropriate user's subkey,
-you will see a string value named <parameter>ProfileImagePath</parameter>. </para>
+you will see a string value named <parameter>ProfileImagePath</parameter>.
+</para>
 
-</sect3> </sect2> </sect1>
+</sect3>
+</sect2>
+</sect1>
 
-<sect1> <title>Mandatory Profiles</title>
+<sect1>
+<title>Mandatory Profiles</title>
 
 <para>
 <indexterm><primary>mandatory profiles</primary></indexterm>
-A Mandatory Profile is a profile that the user does not have the ability to overwrite. During the
-user's session, it may be possible to change the desktop environment, however, as the user logs out all changes
+A mandatory profile is a profile that the user does not have the ability to overwrite. During the
+user's session, it may be possible to change the desktop environment; however, as the user logs out, all changes
 made will be lost. If it is desired to not allow the user any ability to change the desktop environment,
-then this must be done through policy settings. See the previous chapter. </para>
+then this must be done through policy settings. See <link linkend="PolicyMgmt">System and Account
+Policies</link>.
+</para>
 
-<note><para> Under NO circumstances should the profile directory (or its
-contents) be made read-only as this may render the profile un-usable.
+<note><para>
+ Under NO circumstances should the profile directory (or its
+contents) be made read-only because this may render the profile unusable.
 Where it is essential to make a profile read-only within the UNIX file
-system, this can be done but then you absolutely must use the
+system, this can be done, but then you absolutely must use the
 <command>fake-permissions</command> VFS module to instruct MS Windows
 NT/200x/XP clients that the Profile has write permission for the user.
-See <link linkend="fakeperms">fake_perms VFS module</link>. </para></note>
+See <link linkend="fakeperms">fake_perms VFS module</link>.
+</para></note>
 
-<para> For MS Windows NT4/200x/XP, the above method can also be used to create mandatory profiles. To
-convert a group profile into a mandatory profile, simply locate the <filename>NTUser.DAT</filename> file in the copied profile
-and rename it to <filename>NTUser.MAN</filename>. </para>
+<para>
+For MS Windows NT4/200x/XP, the procedure shown in <link linkend="profilemigrn">Profile Migration from Windows
+NT4/200x Server to Samba</link> can also be used to create mandatory profiles. To convert a group profile into
+a mandatory profile, simply locate the <filename>NTUser.DAT</filename> file in the copied profile and rename
+it to <filename>NTUser.MAN</filename>.
+</para>
 
-<para> For MS Windows 9x/ME, it is the <filename>User.DAT</filename> file that must be renamed to
-<filename>User.MAN</filename> to effect a mandatory profile. </para>
+<para>
+For MS Windows 9x/Me, it is the <filename>User.DAT</filename> file that must be renamed to
+<filename>User.MAN</filename> to effect a mandatory profile.
+</para>
 
 </sect1>
 
@@ -633,19 +694,22 @@ and rename it to <filename>NTUser.MAN</filename>. </para>
 
 <para>
 <indexterm><primary>group profiles</primary></indexterm>
-Most organizations are arranged into departments. There is a nice benefit in this fact since usually
+Most organizations are arranged into departments. There is a nice benefit in this fact, since usually
 most users in a department require the same desktop applications and the same desktop layout. MS
-Windows NT4/200x/XP will allow the use of Group Profiles. A Group Profile is a profile that is created
+Windows NT4/200x/XP will allow the use of group profiles. A group profile is a profile that is created
 first using a template (example) user. Then using the profile migration tool (see above), the profile is
-assigned access rights for the user group that needs to be given access to the group profile. </para>
+assigned access rights for the user group that needs to be given access to the group profile.
+</para>
 
-<para> The next step is rather important. Instead of assigning a group profile to users (Using User Manager)
-on a <quote>per user</quote> basis, the group itself is assigned the now modified profile. </para>
+<para>
+The next step is rather important. Instead of assigning a group profile to users (Using User Manager)
+on a <quote>per-user</quote> basis, the group itself is assigned the now modified profile.
+</para>
 
-<note>
-<para> Be careful with Group Profiles. If the user who is a member of a group also has a personal
-profile, then the result will be a fusion (merge) of the two. </para>
-</note>
+<note><para>
+Be careful with group profiles. If the user who is a member of a group also has a personal
+profile, then the result will be a fusion (merge) of the two.
+</para></note>
 
 </sect1>
 
@@ -656,80 +720,98 @@ profile, then the result will be a fusion (merge) of the two. </para>
 <indexterm><primary>default profile</primary></indexterm>
 MS Windows 9x/Me and NT4/200x/XP will use a default profile for any user for whom a profile
 does not already exist. Armed with a knowledge of where the default profile is located on the Windows
-workstation, and knowing which registry keys effect the path from which the default profile is created,
+workstation, and knowing which registry keys affect the path from which the default profile is created,
 it is possible to modify the default profile to one that has been optimized for the site. This has
-significant administrative advantages.	</para>
+significant administrative advantages.
+</para>
 
 <sect2>
 <title>MS Windows 9x/Me</title>
 
-<para> To enable default per use profiles in Windows 9x/ME, you can either use the <application>Windows
-98 System Policy Editor</application> or change the registry directly.	</para>
+<para>
+To enable default per-use profiles in Windows 9x/Me, you can either use the <application>Windows
+98 System Policy Editor</application> or change the registry directly.
+</para>
 
-<para> To enable default per user profiles in Windows 9x/ME, launch the <application>System Policy
-Editor</application>, then select <guimenu>File</guimenu> -> <guimenuitem>Open Registry</guimenuitem>,
-next click on the <guiicon>Local Computer</guiicon> icon, click on <guilabel>Windows 98 System</guilabel>,
+<para>
+To enable default per-user profiles in Windows 9x/Me, launch the <application>System Policy
+Editor</application>, then select <guimenu>File</guimenu> -> <guimenuitem>Open Registry</guimenuitem>.
+Next click on the <guiicon>Local Computer</guiicon> icon, click on <guilabel>Windows 98 System</guilabel>,
 select <guilabel>User Profiles</guilabel>, and click on the enable box. Remember to save the registry
-changes. </para>
+changes.
+</para>
 
-<para> To modify the registry directly, launch the <application>Registry Editor</application>
-(<command>regedit.exe</command>) and select the hive <filename>HKEY_LOCAL_MACHINE\Network\Logon</filename>. Now
-add a DWORD type key with the name <quote>User Profiles,</quote> to
-enable user profiles to set the value
-to 1; to disable user profiles set it to 0. </para>
+<para>
+To modify the registry directly, launch the <application>Registry Editor</application>
+(<command>regedit.exe</command>) and select the hive <filename>HKEY_LOCAL_MACHINE\Network\Logon</filename>.
+Now add a DWORD type key with the name <quote>User Profiles.</quote> To enable user profiles to set the value
+to 1; to disable user profiles set it to 0.
+</para>
 
 <sect3>
 <title>User Profile Handling with Windows 9x/Me</title>
 
-<para> When a user logs on to a Windows 9x/Me machine, the local profile path,
+<para>
+When a user logs on to a Windows 9x/Me machine, the local profile path,
 <filename>HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\ProfileList</filename>, is checked
-for an existing entry for that user. </para>
+for an existing entry for that user.
+</para>
 
-<para> If the user has an entry in this registry location, Windows 9x/Me checks for a locally cached
+<para>
+If the user has an entry in this registry location, Windows 9x/Me checks for a locally cached
 version of the user profile. Windows 9x/Me also checks the user's home directory (or other specified
-directory if the location has been modified) on the server for the User Profile. If a profile exists
-in both locations, the newer of the two is used. If the User Profile exists on the server, but does not
-exist on the local machine, the profile on the server is downloaded and used. If the User Profile only
-exists on the local machine, that copy is used. </para>
+directory if the location has been modified) on the server for the user profile. If a profile exists
+in both locations, the newer of the two is used. If the user profile exists on the server but does not
+exist on the local machine, the profile on the server is downloaded and used. If the user profile only
+exists on the local machine, that copy is used.
+</para>
 
-<para> If a User Profile is not found in either location, the Default User Profile from the Windows
+<para>
+If a user profile is not found in either location, the default user profile from the Windows
 9x/Me machine is used and copied to a newly created folder for the logged on user. At log off, any
 changes that the user made are written to the user's local profile. If the user has a roaming profile,
-the changes are written to the user's profile on the server. </para>
+the changes are written to the user's profile on the server.
+</para>
 
-</sect3> </sect2>
+</sect3>
+</sect2>
 
 <sect2>
 <title>MS Windows NT4 Workstation</title>
 
-<para> On MS Windows NT4, the default user profile is obtained from the location
-<filename>%SystemRoot%\Profiles</filename> which in a default installation will translate to
-<filename>C:\Windows NT\Profiles</filename>. Under this directory on a clean install there will be three
-(3) directories: <filename>Administrator</filename>, <filename>All
+<para>
+On MS Windows NT4, the default user profile is obtained from the location
+<filename>%SystemRoot%\Profiles</filename>, which in a default installation will translate to
+<filename>C:\Windows NT\Profiles</filename>. Under this directory on a clean install, there will be three
+directories: <filename>Administrator</filename>, <filename>All
 Users,</filename> and <filename>Default
-User</filename>. </para>
+User</filename>.
+</para>
 
-<para> The <filename>All Users</filename> directory contains menu settings that are common across all
+<para>
+The <filename>All Users</filename> directory contains menu settings that are common across all
 system users. The <filename>Default User</filename> directory contains menu entries that are customizable
-per user depending on the profile settings chosen/created. </para>
+per user depending on the profile settings chosen/created.
+</para>
 
-<para> When a new user first logs onto an MS Windows NT4 machine, a new profile is created from: </para>
+<para>
+When a new user first logs onto an MS Windows NT4 machine, a new profile is created from:
+</para>
 
 <itemizedlist>
 	<listitem><para>All Users settings.</para></listitem>
 	<listitem><para>Default User settings (contains the default <filename>NTUser.DAT</filename> file).</para></listitem>
 </itemizedlist>
 
-<para> When a user logs onto an MS Windows NT4 machine that is a member of a Microsoft security domain,
-	the following steps are followed in respect of profile handling: 
-
+<para>
 <indexterm><primary>NTConfig.POL</primary></indexterm>
+When a user logs on to an MS Windows NT4 machine that is a member of a Microsoft security domain,
+the following steps are followed for profile handling: 
 </para>
 
-
 <procedure>
-	<step> <para> The users' account information that is obtained during the logon process
-	contains the location of the users' desktop profile. The profile path may be local to
+	<step> <para> The user's account information that is obtained during the logon process
+	contains the location of the user's desktop profile. The profile path may be local to
 	the machine or it may be located on a network share. If there exists a profile at the
 	location of the path from the user account, then this profile is copied to the location
 	<filename>%SystemRoot%\Profiles\%USERNAME%</filename>. This profile then inherits the settings
@@ -742,35 +824,39 @@ per user depending on the profile settings chosen/created. </para>
 
 	<step> <para> If the NETLOGON share on the authenticating server (logon server) contains
 	a policy file (<filename>NTConfig.POL</filename>), then its contents are applied to the
-	<filename>NTUser.DAT</filename> which is applied to the <filename>HKEY_CURRENT_USER</filename>
+	<filename>NTUser.DAT</filename>, which is applied to the <filename>HKEY_CURRENT_USER</filename>
 	part of the registry. 
 	</para> </step>
 
-	<step> <para> When the user logs out, if the profile is set to be a roaming profile it will be
+	<step> <para> When the user logs out, if the profile is set to be a roaming profile, it will be
 	written out to the location of the profile. The <filename>NTuser.DAT</filename> file is then
-	recreated from the contents of the <filename>HKEY_CURRENT_USER</filename> contents. Thus,
+	re-created from the contents of the <filename>HKEY_CURRENT_USER</filename> contents. Thus,
 	should there not exist in the NETLOGON share an <filename>NTConfig.POL</filename> at the next
 	logon, the effect of the previous <filename>NTConfig.POL</filename> will still be held in the
 	profile. The effect of this is known as tattooing.
 	</para> </step>
 </procedure>
 
-<para> MS Windows NT4 profiles may be <emphasis>local</emphasis> or <emphasis>roaming</emphasis>. A local
-profile will stored in the <filename>%SystemRoot%\Profiles\%USERNAME%</filename> location. A roaming
-profile will also remain stored in the same way, unless the following registry key is created as shown: </para>
-
-<para><screen> HKEY_LOCAL_MACHINE\SYSTEM\Software\Microsoft\Windows NT\CurrentVersion\
+<para>
+MS Windows NT4 profiles may be <emphasis>local</emphasis> or <emphasis>roaming</emphasis>. A local
+profile is stored in the <filename>%SystemRoot%\Profiles\%USERNAME%</filename> location. A roaming
+profile will also remain stored in the same way, unless the following registry key is created:
+<screen>
+HKEY_LOCAL_MACHINE\SYSTEM\Software\Microsoft\Windows NT\CurrentVersion\
 winlogon\"DeleteRoamingCache"=dword:0000000
- </screen>
+</screen>
 In this case, the local copy (in <filename>%SystemRoot%\Profiles\%USERNAME%</filename>) will be deleted
-on logout.</para>
+on logout.
+</para>
 
-<para> Under MS Windows NT4, default locations for common resources like <filename>My Documents</filename>
+<para>
+Under MS Windows NT4, default locations for common resources like <filename>My Documents</filename>
 may be redirected to a network share by modifying the following registry keys. These changes may be
-affected via use of the System Policy Editor. To do so may require that you create your own template
-extension for the policy editor to allow this to be done through the GUI. Another way to do this is by
-way of first creating a default user profile, then while logged in as that user, run <command>regedt32</command> to edit
-the key settings. </para>
+made via use of the System Policy Editor. To do so may require that you create your own template
+extension for the Policy Editor to allow this to be done through the GUI. Another way to do this is by
+first creating a default user profile, then while logged in as that user, running <command>regedt32</command> to edit
+the key settings.
+</para>
 
 <para>
 The Registry Hive key that affects the behavior of folders that are part of the default user
@@ -814,12 +900,16 @@ folders. The default entries are shown in <link linkend="ProfileLocs">the next t
 	</tgroup>
 </table>
 
-<para> The registry key that contains the location of the default profile settings is: </para>
-
-<para> <filename>HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\<?latex \linebreak ?>
-User Shell Folders</filename> </para>
+<para> The registry key that contains the location of the default profile settings is:
+<screen>
+HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\
+User Shell Folders
+</screen>
+</para>
 
-<para> The default entries are shown in <link linkend="regkeys">the next table</link>.</para>
+<para>
+The default entries are shown in <link linkend="regkeys">Defaults of Profile Settings Registry Keys</link>.
+</para>
 
 <table frame="all" id="regkeys">
 	<title>Defaults of Profile Settings Registry Keys</title>
@@ -837,27 +927,32 @@ User Shell Folders</filename> </para>
 
 </sect2>
 
-<sect2> <title>MS Windows 200x/XP</title>
+<sect2>
+<title>MS Windows 200x/XP</title>
 
 <note><para>
 <indexterm><primary>GPOs</primary></indexterm>
-MS Windows XP Home Edition does use default per user profiles, but cannot participate
+MS Windows XP Home Edition does use default per-user profiles, but cannot participate
 in domain security, cannot log onto an NT/ADS-style domain, and thus can obtain the profile only
 from itself. While there are benefits in doing this, the beauty of those MS Windows clients that
-can participate in domain logon processes allows the administrator to create a global default
+can participate in domain logon processes is that they allow the administrator to create a global default
 profile and enforce it through the use of Group Policy Objects (GPOs).
 </para></note>
 
-<para> When a new user first logs onto an MS Windows 200x/XP machine, the default profile is obtained from
+<para>
+When a new user first logs onto an MS Windows 200x/XP machine, the default profile is obtained from
 <filename>C:\Documents and Settings\Default User</filename>. The administrator can modify or change the
-contents of this location and MS Windows 200x/XP will gladly use it. This is far from the optimum arrangement
-since it will involve copying a new default profile to every MS Windows 200x/XP client workstation. </para>
+contents of this location, and MS Windows 200x/XP will gladly use it. This is far from the optimum arrangement,
+since it will involve copying a new default profile to every MS Windows 200x/XP client workstation.
+</para>
 
-<para> When MS Windows 200x/XP participates in a domain security context, and if the default user profile is
-	not found, then the client will search for a default profile in the NETLOGON share of the authenticating
-	server. In MS Windows parlance,<?latex \linebreak ?><filename>%LOGONSERVER%\NETLOGON\Default User,</filename> and if one
-exists there it will copy this to the workstation to the <filename>C:\Documents and Settings\</filename>
-under the Windows login name of the user. </para>
+<para>
+When MS Windows 200x/XP participates in a domain security context, and if the default user profile is not
+found, then the client will search for a default profile in the NETLOGON share of the authenticating server.
+In MS Windows parlance, it is <?latex \linebreak ?><filename>%LOGONSERVER%\NETLOGON\Default User,</filename>
+and if one exists there, it will copy this to the workstation in the <filename>C:\Documents and
+Settings\</filename> under the Windows login name of the use.
+</para>
 
 <note> <para> This path translates, in Samba parlance, to the &smb.conf;
 <smbconfsection name="[NETLOGON]"/> share. The directory should be created at the root
@@ -867,33 +962,33 @@ of this share and must be called <filename>Default User</filename>.
 <para> If a default profile does not exist in this location, then MS Windows 200x/XP will use the local
 default profile. </para>
 
-<para> On logging out, the users' desktop profile will be stored to the location specified in the registry
+<para> On logging out, the user's desktop profile is stored to the location specified in the registry
 settings that pertain to the user. If no specific policies have been created or passed to the client
-during the login process (as Samba does automatically), then the user's profile will be written to the
+during the login process (as Samba does automatically), then the user's profile is written to the
 local machine only under the path <filename>C:\Documents and Settings\%USERNAME%</filename>. </para>
 
 <para> Those wishing to modify the default behavior can do so through these three methods: </para>
 
 <itemizedlist>
 	<listitem> <para> Modify the registry keys on the local machine manually and place the new
-	default profile in the NETLOGON share root. This is not recommended as it is maintenance intensive.
+	default profile in the NETLOGON share root. This is not recommended because it is maintenance intensive.
 	</para> </listitem>
 
-	<listitem> <para> Create an NT4-style NTConfig.POL file that specified this behavior and locate
+	<listitem> <para> Create an NT4-style NTConfig.POL file that specifies this behavior and locate
 	this file in the root of the NETLOGON share along with the new default profile. </para> </listitem>
 
 	<listitem> <para> Create a GPO that enforces this through Active Directory, and place the new
 	default profile in the NETLOGON share.	</para> </listitem>
 </itemizedlist>
 
-<para>The registry hive key that effects the behavior of folders that are part of the default user
+<para>The registry hive key that affects the behavior of folders that are part of the default user
 profile are controlled by entries on Windows 200x/XP is: </para>
 
 <para> <filename>HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\User Shell
 Folders\</filename> </para>
 
 <para>
-The above hive key contains a list of automatically managed folders. The default entries are shown
+This hive key contains a list of automatically managed folders. The default entries are shown
 in <link linkend="defregpthkeys">the next table</link>
 <indexterm><primary>windows registry settings</primary><secondary>default profile locations</secondary></indexterm>
 </para>
@@ -931,31 +1026,34 @@ in <link linkend="defregpthkeys">the next table</link>
 </table>
 
 <para> There is also an entry called <quote>Default</quote> that has no value set. The default entry is
-of type <constant>REG_SZ</constant>, all the others are of type <constant>REG_EXPAND_SZ</constant>. </para>
+of type <constant>REG_SZ</constant>; all the others are of type <constant>REG_EXPAND_SZ</constant>. </para>
 
 <para> It makes a huge difference to the speed of handling roaming user profiles if all the folders are
 stored on a dedicated location on a network server. This means that it will not be necessary to write
 the Outlook PST file over the network for every login and logout. </para>
 
-<para> To set this to a network location, you could use the following examples: </para>
-
-<para><filename>%LOGONSERVER%\%USERNAME%\Default Folders</filename></para>
-
-<para> This would store the folders in the user's home directory under a directory called <filename>Default
-Folders</filename>. You could also use: </para>
-
-<para><filename>\\<replaceable>SambaServer</replaceable>\<replaceable>FolderShare</replaceable>\%USERNAME%</filename></para>
+<para>
+To set this to a network location, you could use the following examples:
+<screen>
+%LOGONSERVER%\%USERNAME%\Default Folders
+</screen>
+This stores the folders in the user's home directory under a directory called <filename>Default
+Folders</filename>. You could also use:
+<screen>
+\\<replaceable>SambaServer</replaceable>\<replaceable>FolderShare</replaceable>\%USERNAME%
+</screen>
+</para>
 
 <para>
-in which case the default folders will be stored in the server named <replaceable>SambaServer</replaceable>
+in which case the default folders are stored in the server named <replaceable>SambaServer</replaceable>
 in the share called <replaceable>FolderShare</replaceable> under a directory that has the name of the
 MS Windows user as seen by the Linux/UNIX file system.	</para>
 
-<para> Please note that once you have created a default profile share, you MUST migrate a user's profile
+<para> Please note that once you have created a default profile share, you <emphasis>must</emphasis> migrate a user's profile
 (default or custom) to it. </para>
 
-<para> MS Windows 200x/XP profiles may be <emphasis>Local</emphasis> or <emphasis>Roaming</emphasis>.
-	A roaming profile will be cached locally unless the following registry key is created: 
+<para> MS Windows 200x/XP profiles may be <emphasis>local</emphasis> or <emphasis>roaming</emphasis>.
+	A roaming profile is cached locally unless the following registry key is created: 
 
 <indexterm><primary>delete roaming profiles</primary></indexterm>
 </para>
@@ -965,7 +1063,7 @@ MS Windows user as seen by the Linux/UNIX file system.	</para>
 	winlogon\"DeleteRoamingCache"=dword:00000001</programlisting></para>
 
 <para>
-In this case, the local cache copy will be deleted on logout.
+In this case, the local cache copy is deleted on logout.
 </para> 
 </sect2> 
 </sect1>
@@ -973,7 +1071,7 @@ In this case, the local cache copy will be deleted on logout.
 <sect1> <title>Common Errors</title>
 
 <para>
-The following are some typical errors, problems and questions that have been asked on the Samba mailing lists.
+The following are some typical errors, problems, and questions that have been asked on the Samba mailing lists.
 </para>
 
 <sect2>
@@ -981,34 +1079,34 @@ The following are some typical errors, problems and questions that have been ask
 
 <para>
 With Samba-2.2.x, the choice you have is to enable or disable roaming profiles support. It is a
-global only setting. The default is to have roaming profiles and the default path will locate them in
+global-only setting. The default is to have roaming profiles, and the default path will locate them in
 the user's home directory.
 </para>
 
 <para>
 If disabled globally, then no one will have roaming profile ability. If enabled and you want it
-to apply only to certain machines, then on those machines on which roaming profile support is not wanted
-it is then necessary to disable roaming profile handling in the registry of each such machine.
+to apply only to certain machines, then on those machines on which roaming profile support is not wanted,
+it is necessary to disable roaming profile handling in the registry of each such machine.
 </para>
 
 <para>
-With Samba-3, you can have a global profile setting in &smb.conf; and you can override this by
-per-user settings using the Domain User Manager (as with MS Windows NT4/ Win 200xx). </para>
+With Samba-3, you can have a global profile setting in &smb.conf;, and you can override this by
+per-user settings using the Domain User Manager (as with MS Windows NT4/200x). </para>
 
 <para> In any case, you can configure only one profile per user. That profile can be either: </para>
 
 <itemizedlist>
 	<listitem><para>A profile unique to that user.</para></listitem>
 	<listitem><para>A mandatory profile (one the user cannot change).</para></listitem>
-	<listitem><para>A group profile (really should be mandatory, that is unchangable).</para></listitem>
+	<listitem><para>A group profile (really should be mandatory &smbmdash; that is, unchangable).</para></listitem>
 </itemizedlist>
 
 </sect2>
 
 <sect2> <title>Cannot Use Roaming Profiles</title>
 
-<para> A user requested the following: <quote> I do not want Roaming profiles to be implemented. I want
-to give users a local profile alone. Please help me, I am totally lost with this error. For the past
+<para> A user requested the following: <quote> I do not want roaming profiles to be implemented. I want
+to give users a local profile alone. I am totally lost with this error. For the past
 two days I tried everything, I googled around but found no useful pointers. Please help me. </quote></para>
 
 <para> The choices are: </para>
@@ -1016,7 +1114,7 @@ two days I tried everything, I googled around but found no useful pointers. Plea
 <variablelist>
 	<varlistentry>
 		<term>Local profiles</term> <listitem><para> I know of no registry keys that will allow
-		auto-deletion of LOCAL profiles on log out.</para></listitem>
+		autodeletion of LOCAL profiles on log out.</para></listitem>
 	</varlistentry>
 
 	<varlistentry>
@@ -1052,13 +1150,13 @@ two days I tried everything, I googled around but found no useful pointers. Plea
 </variablelist>
 
 <para> A Windows NT4/200x/XP profile can vary in size from 130KB to very large. Outlook PST files are
-most often part of the profile and can be many GB in size. On average (in a well controlled environment),
+most often part of the profile and can be many gigabytes in size. On average (in a well controlled environment),
 roaming profile size of 2MB is a good rule of thumb to use for planning purposes. In an undisciplined
 environment, I have seen up to 2GB profiles. Users tend to complain when it takes an hour to log onto a
-workstation but they harvest the fruits of folly (and ignorance). </para>
+workstation, but they harvest the fruits of folly (and ignorance). </para>
 
-<para> The point of all the above is to show that roaming profiles and good controls of how they can be
-changed as well as good discipline make up for a problem-free site. </para>
+<para> The point of this discussion is to show that roaming profiles and good controls of how they can be
+changed as well as good discipline make for a problem-free site. </para>
 
 <para> Microsoft's answer to the PST problem is to store all email in an MS Exchange Server backend. This
 removes the need for a PST file. </para>
@@ -1084,12 +1182,12 @@ removes the need for a PST file. </para>
 <sect2>
 <title>Changing the Default Profile</title>
 
-<para><quote>When the client logs onto the Domain Controller, it searches
+<para><quote>When the client logs onto the domain controller, it searches
 for a profile to download. Where do I put this default profile?</quote></para>
 
 <para>
 <indexterm><primary>default profile</primary></indexterm>
-First, the Samba server needs to be configured as a Domain Controller. This can be done by
+First, the Samba server needs to be configured as a domain controller. This can be done by
 setting in &smb.conf;: </para>
 
 <smbconfblock>
@@ -1099,16 +1197,16 @@ setting in &smb.conf;: </para>
 </smbconfblock>
 
 <para> There must be a <smbconfsection name="[netlogon]"/> share that is world readable. It is
-a good idea to add a logon script to pre-set printer and drive connections. There is also a facility
+a good idea to add a logon script to preset printer and drive connections. There is also a facility
 for automatically synchronizing the workstation time clock with that of the logon server (another good
 thing to do). </para>
 
-<note><para> To invoke auto-deletion of roaming profile from the local workstation cache (disk storage), use
+<note><para> To invoke autodeletion of roaming profile from the local workstation cache (disk storage), use
 the <application>Group Policy Editor</application> to create a file called <filename>NTConfig.POL</filename>
 with the appropriate entries. This file needs to be located in the <smbconfsection name="netlogon"/>
 share root directory.</para></note>
 
-<para> Windows clients need to be members of the domain. Workgroup machines do not use network logons
+<para> Windows clients need to be members of the domain. Workgroup machines do not use network logons,
 so they do not interoperate with domain profiles. </para>
 
 <para> For roaming profiles, add to &smb.conf;: </para>