More documentation regarding disabling of roamin profile paraphenalia.

(This used to be commit bb0873dfd09afb4594343699bd0beba122f1390e)

3 files changed, 85 insertions, 60 deletions

diff --git a/docs/smbdotconf/logon/logondrive.xml b/docs/smbdotconf/logon/logondrive.xml
index 2b8f016ece..145a7a8eed 100644
--- a/docs/smbdotconf/logon/logondrive.xml
+++ b/docs/smbdotconf/logon/logondrive.xml
@@ -4,12 +4,15 @@
                  advanced="1" developer="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
-	<para>This parameter specifies the local path to 
-	which the home directory will be connected (see <smbconfoption name="logon home"/>) 
-	and is only used by NT Workstations. </para>
+	<para>
+	This parameter specifies the local path to which the home directory will be
+	connected (see <smbconfoption name="logon home"/>) and is only used by NT
+	Workstations.
+	</para>
 
-	<para>Note that this option is only useful if Samba is set up as a
-		logon server.</para>
+	<para>
+	Note that this option is only useful if Samba is set up as a logon server.
+	</para>
 </description>
 <value type="default">z:</value>
 <value type="example">h:</value>
diff --git a/docs/smbdotconf/logon/logonhome.xml b/docs/smbdotconf/logon/logonhome.xml
index 5939902625..06f3d47375 100644
--- a/docs/smbdotconf/logon/logonhome.xml
+++ b/docs/smbdotconf/logon/logonhome.xml
@@ -4,39 +4,52 @@
                  advanced="1" developer="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
-	<para>This parameter specifies the home directory 
-	location when a Win95/98 or NT Workstation logs into a Samba PDC.  
-	It allows you to do </para>
+	<para>
+	This parameter specifies the home directory location when a Win95/98 or NT Workstation logs into a Samba PDC.  
+	It allows you to do
+	</para>
 		
-	<para><prompt moreinfo="none">C:\&gt;</prompt>
-	<userinput moreinfo="none">NET USE H: /HOME</userinput>
+	<para>
+	<prompt moreinfo="none">C:\&gt;</prompt><userinput moreinfo="none">NET USE H: /HOME</userinput>
 	</para>
 
-	<para>from a command prompt, for example.</para>
+	<para>
+	from a command prompt, for example.
+	</para>
 
-	<para>This option takes the standard substitutions, allowing 
-	you to have separate logon scripts for each user or machine.</para>
+	<para>
+	This option takes the standard substitutions, allowing you to have separate logon scripts for each user or machine.
+	</para>
+
+	<para>
+	This parameter can be used with Win9X workstations to ensure that roaming profiles are stored in a 
+	subdirectory of the user's 	home directory.  This is done in the following way:
+	</para>
 
-	<para>This parameter can be used with Win9X workstations to ensure 
-	that roaming profiles are stored in a subdirectory of the user's 
-	home directory.  This is done in the following way:</para>
+	<para>
+	<command moreinfo="none">logon home = \\%N\%U\profile</command>
+	</para>
 
-	<para><command moreinfo="none">logon home = \\%N\%U\profile</command></para>
+	<para>
+	This tells Samba to return the above string, with substitutions made when a client requests the info, generally 
+	in a NetUserGetInfo request.  Win9X clients truncate the info to \\server\share when a user does 
+	<command moreinfo="none">net use /home</command> but use the whole string when dealing with profiles.
+	</para>
 
-	<para>This tells Samba to return the above string, with 
-	substitutions made when a client requests the info, generally 
-	in a NetUserGetInfo request.  Win9X clients truncate the info to
-	\\server\share when a user does <command moreinfo="none">net use /home</command>
-	but use the whole string when dealing with profiles.</para>
+	<para>
+	Note that in prior versions of Samba, the <smbconfoption name="logon path"/> was returned rather than 
+	<parameter moreinfo="none">logon home</parameter>.  This broke <command moreinfo="none">net use /home</command> 
+	but allowed profiles outside the home directory. The current implementation is correct, and can be used for 
+	profiles if you use the above trick.
+	</para>
 
-	<para>Note that in prior versions of Samba, the <smbconfoption name="logon path"/> was returned rather than 
-	<parameter moreinfo="none">logon home</parameter>.  This broke <command 
-	moreinfo="none">net use /home</command> but allowed profiles outside the home directory.  
-	The current implementation is correct, and can be used for profiles if you use 
-	the above trick.</para>
+	<para>
+	Disable this feature by setting <smbconfoption name="logon home">""</smbconfoption> - using the empty string.
+	</para>
 
-	<para>This option is only useful if Samba is set up as a logon 
-	server.</para>
+	<para>
+	This option is only useful if Samba is set up as a logon server.
+	</para>
 </description>
 
 <value type="default">\\%N\%U</value>
diff --git a/docs/smbdotconf/logon/logonpath.xml b/docs/smbdotconf/logon/logonpath.xml
index eb2e9de056..77466c1960 100644
--- a/docs/smbdotconf/logon/logonpath.xml
+++ b/docs/smbdotconf/logon/logonpath.xml
@@ -4,40 +4,42 @@
                  advanced="1" developer="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
-	<para>This parameter specifies the home directory 
-	where roaming profiles (NTuser.dat etc files for Windows NT) are 
-	stored.  Contrary to previous versions of these manual pages, it has 
-	nothing to do with Win 9X roaming profiles.  To find out how to 
-	handle roaming profiles for Win 9X system, see the <smbconfoption name="logon home"/> parameter.</para>
+	<para>
+	This parameter specifies the home directory where roaming profiles (NTuser.dat etc files for Windows NT) are 
+	stored.  Contrary to previous versions of these manual pages, it has nothing to do with Win 9X roaming
+	profiles.  To find out how to handle roaming profiles for Win 9X system, see the
+	<smbconfoption name="logon home"/> parameter.
+	</para>
 
-	<para>This option takes the standard substitutions, allowing you 
-	to have separate logon scripts for each user or machine.  It also 
-	specifies the directory from which the &quot;Application Data&quot;, 
-	(<filename moreinfo="none">desktop</filename>, <filename moreinfo="none">start menu</filename>,
-	<filename moreinfo="none">network neighborhood</filename>, <filename moreinfo="none">programs</filename> 
-	and other folders, and their contents, are loaded and displayed on 
-	your Windows NT client.</para>
+	<para>
+	This option takes the standard substitutions, allowing you to have separate logon scripts for each user or
+	machine.  It also specifies the directory from which the &quot;Application Data&quot;, (<filename
+	moreinfo="none">desktop</filename>, <filename moreinfo="none">start menu</filename>, <filename
+	moreinfo="none">network neighborhood</filename>, <filename moreinfo="none">programs</filename> and other
+	folders, and their contents, are loaded and displayed on your Windows NT client.
+	</para>
 
-	<para>The share and the path must be readable by the user for 
-	the preferences and directories to be loaded onto the Windows NT
-	client. The share must be writeable when the user logs in for the first
-	time, in order that the Windows NT client can create the NTuser.dat
-	and other directories.</para>
+	<para>
+	The share and the path must be readable by the user for the preferences and directories to be loaded onto the
+	Windows NT client. The share must be writeable when the user logs in for the first time, in order that the
+	Windows NT client can create the NTuser.dat and other directories.
+	</para>
 
-	<para>Thereafter, the directories and any of the contents can, 
-	if required, be made read-only.  It is not advisable that the 
-	NTuser.dat file be made read-only - rename it to NTuser.man to 
-	achieve the desired effect (a <emphasis>MAN</emphasis>datory 
-	profile). </para>
+	<para>
+	Thereafter, the directories and any of the contents can, if required, be made read-only.  It is not advisable
+	that the NTuser.dat file be made read-only - rename it to NTuser.man to achieve the desired effect (a
+	<emphasis>MAN</emphasis>datory profile).
+	</para>
 
-	<para>Windows clients can sometimes maintain a connection to 
-	the [homes] share, even though there is no user logged in.  
-	Therefore, it is vital that the logon path does not include a 
-	reference to the homes share (i.e. setting this parameter to
-	\%N\%U\profile_path will cause problems).</para>
+	<para>
+	Windows clients can sometimes maintain a connection to the [homes] share, even though there is no user logged
+	in.  Therefore, it is vital that the logon path does not include a reference to the homes share (i.e. setting
+	this parameter to \%N\%U\profile_path will cause problems).
+	</para>
 
-	<para>This option takes the standard substitutions, allowing 
-	you to have separate logon scripts for each user or machine.</para>
+	<para>
+	This option takes the standard substitutions, allowing you to have separate logon scripts for each user or machine.
+	</para>
 
 	<warning>
         <para>
@@ -52,8 +54,15 @@
 		</para>
 	</warning>
 
-	<para>Note that this option is only useful if Samba is set up 
-	as a logon server.</para>
+	<para>Note that this option is only useful if Samba is set up as a logon server.</para>
+
+	<para>
+	Disable the use of roaming profiles by setting the value of this parameter to the empty string. For
+	example, <smbconfoption name="logon path">""</smbconfoption>. Take note that even if the default setting
+	in the smb.conf file is the empty string, any value specified in the user account settings in the passdb
+	backend will over-ride the effect of setting this parameter to null. Disabling of all roaming profile use
+	requires that the user account settings must also be blank.
+	</para>
 
 	<para>
 	An example of use is: