updating documentation on:

profiles; domain master browsing; netlogons; preferred master.

lkcl
(This used to be commit 43c02b4beab9aa19c3ed648fd4251e30b9615ce7)

3 files changed, 56 insertions, 11 deletions

diff --git a/docs/manpages/smb.conf.5 b/docs/manpages/smb.conf.5
index 8e5c2307b5..3065883eb3 100644
--- a/docs/manpages/smb.conf.5
+++ b/docs/manpages/smb.conf.5
@@ -1262,7 +1262,7 @@ This option takes the standard substitutions, allowing you to have
 separate logon scripts for each user or machine.
 
 .B Default:
- 	logon path = \\\\%L\\HOMES
+ 	logon path = \\\\%L\\%U 
 
 .B Example:
 	logon path = \\\\PROFILESERVER\\HOME_DIR\\%U
@@ -1982,6 +1982,12 @@ advantage in winning the election.  It is recommended that this
 parameter is used in conjunction with domain master = yes, so that samba 
 can guarantee becoming a domain master.  
 
+Use this option with caution, because if there are several hosts
+(whether samba servers, Windows 95 or NT) that are preferred master
+browsers on the same subnet, they will each periodically and continuously
+attempt to become the local master browser.  This will result in
+unnecessary broadcast traffic and reduced browsing capabilities.
+
 See
 .B os level = nn
 
@@ -2073,13 +2079,13 @@ parameter controls only non-printing access to the resource.
  	printable = yes
 
 .SS printing (G)
-This parameter controls how printer status information is interpreted
+This parameters controls how printer status information is interpreted
 on your system, and also affects the default values for the "print
 command", "lpq command" and "lprm command".
 
 Currently six printing styles are supported. They are "printing =
 bsd", "printing = sysv", "printing = hpux", "printing = aix",
-"printing = qnx", "printing = plp" and "printing = lprng".
+"printing = qnx" and "printing = plp".
 
 To see what the defaults are for the other print commands when using
 these three options use the "testparm" program.
diff --git a/docs/textdocs/BROWSING.txt b/docs/textdocs/BROWSING.txt
index addca8de4b..cee09813a7 100644
--- a/docs/textdocs/BROWSING.txt
+++ b/docs/textdocs/BROWSING.txt
@@ -79,7 +79,11 @@ The maximum os level is 255
 If you want samba to force an election on startup, then set the
 "preferred master" global option in smb.conf to "yes".  Samba will
 then have a slight advantage over other potential master browsers
-that are not preferred master browsers.
+that are not preferred master browsers.  Use this parameter with
+care, as if you have two hosts (whether they are windows 95 or NT or
+samba) on the same local subnet both set with "preferred master" to
+"yes", then periodically and continually they will force an election
+in order to become the local master browser.
 
 If you want samba to be a "domain master browser", then it is
 recommended that you also set "preferred master" to "yes", because
@@ -87,6 +91,14 @@ samba will not become a domain master browser for the whole of your
 LAN or WAN if it is not also a local master browser on its own
 broadcast isolated subnet.
 
+It is possible to configure two samba servers to attempt to become
+the domain master browser for a domain.  The first server that comes
+up with be the domain master browser.  All other samba servers will
+attempt to become the domain master browser every 5 minutes.  They
+will find that another samba server is already the domain master
+browser and will fail.  This provides automatic redundancy, should
+the current domain master browser fail.
+ 
 
 MAKING SAMBA THE DOMAIN MASTER
 ==============================
diff --git a/docs/textdocs/DOMAIN.txt b/docs/textdocs/DOMAIN.txt
index 39b34c6172..9bdff5dc88 100644
--- a/docs/textdocs/DOMAIN.txt
+++ b/docs/textdocs/DOMAIN.txt
@@ -1,5 +1,5 @@
-Samba now supports domain logons and network logon scripts. The
-support is still experimental, but it seems to work.
+Samba now supports domain logons, network logon scripts and user profiles.
+The support is still experimental, but it seems to work.
 
 The support is also not complete. Samba does not yet support the
 sharing of the SAM database with other systems yet, or remote
@@ -11,10 +11,11 @@ NT and OS/2 clients is still being worked on and currently does not
 work. 
 
 Using these features you can make your clients verify their logon via
-the Samba server and make clients run a batch file when they logon to
-the network. The latter is particularly useful.
+the Samba server, make clients run a batch file when they logon to
+the network and download their preferences, desktop and start menu.
 
-To use domain logons you need to do the following:
+
+To use domain logons and profiles you need to do the following:
 
 1) Setup nmbd and smbd and configure the smb.conf so that Samba is
 acting as the master browser. See INSTALL.txt and BROWSING.txt for
@@ -24,7 +25,8 @@ details.
 be readable by all users, and probably should not be writeable. This
 share will hold your network logon scripts, and the CONFIG.POL file
 (Note: for details on the CONFIG.POL file, refer to the Microsoft
-Windows NT Server Help documentation)
+Windows NT Administration documentation.  The format of these files
+is not known, so you will need to use Microsoft tools.)
 
 For example I have used:
 
@@ -67,9 +69,34 @@ and they are readable by the users.
 \\SERVER\NETLOGON share as drive z: while logging in. You can put some
 useful programs there to execute from the batch files.
 
-
 NOTE: You must be using "security = user" or "security = server" for
 domain logons to work correctly. Share level security won't work
 correctly.
 
 
+User Profiles
+
+1) in the [global] section of smb.conf set the following:
+
+  logon path = \\profileserver\profileshare\profilepath\%U
+
+The default for this option is \\%L\%U, namely \\sambaserver\username,
+The \\L%\%U services is created automatically by the [homes] service.
+
+If you are using a samba server for the profiles, you _must_ make the
+share specified in the logon path browseable.  Windows 95 appears to
+check that it can see the share and any subdirectories within that share
+specified by the logon path option, rather than just connecting straight
+away.  
+
+When a user first logs in on Windows 95, the file user.dat is created,
+as are folders "start menu", "desktop", "programs" and "nethood".  
+These directories and their contents will be merged with the local
+versions stored in c:\windows\profiles\username on subsequent logins,
+taking the most recent from each.
+
+The user.dat file contains all the user's preferences.  If you wish to
+enforce a set of preferences, rename their user.dat file to user.man,
+and deny them write access to the file.
+
+