17 files changed, 185 insertions, 112 deletions
diff --git a/docs/yodldocs/DOMAIN_MEMBER.yo b/docs/yodldocs/DOMAIN_MEMBER.yo
index f52b6ab97c2..e13a2f2a58f 100644
--- a/docs/yodldocs/DOMAIN_MEMBER.yo
+++ b/docs/yodldocs/DOMAIN_MEMBER.yo
@@ -1,4 +1,4 @@
-mailto(samba-bugs@samba.org)
+mailto(samba@samba.org)
 
 article(Joining an NT Domain with Samba 2.0)(Jeremy Allison, Samba Team)(7th October 1999)
 
diff --git a/docs/yodldocs/lmhosts.5.yo b/docs/yodldocs/lmhosts.5.yo
index a48dedaca8c..e78ce508b00 100644
--- a/docs/yodldocs/lmhosts.5.yo
+++ b/docs/yodldocs/lmhosts.5.yo
@@ -1,4 +1,4 @@
-mailto(samba-bugs@samba.org)
+mailto(samba@samba.org)
 
 manpage(lmhosts htmlcommand((5)))(5)(23 Oct 1998)(Samba)(SAMBA)
 
@@ -78,7 +78,7 @@ label(AUTHOR)
 manpageauthor()
 
 The original Samba software and related utilities were created by
-Andrew Tridgell email(samba-bugs@samba.org). Samba is now developed
+Andrew Tridgell email(samba@samba.org). Samba is now developed
 by the Samba Team as an Open Source project similar to the way the
 Linux kernel is developed.
 
@@ -87,7 +87,7 @@ sources were converted to YODL format (another excellent piece of Open
 Source software, available at
 url(bf(ftp://ftp.icce.rug.nl/pub/unix/))(ftp://ftp.icce.rug.nl/pub/unix/))
 and updated for the Samba2.0 release by Jeremy Allison.
-email(samba-bugs@samba.org).
+email(samba@samba.org).
 
 See url(bf(samba (7)))(samba.7.html) to find out how to get a full
 list of contributors and details on how to submit bug reports,
diff --git a/docs/yodldocs/make_smbcodepage.1.yo b/docs/yodldocs/make_smbcodepage.1.yo
index 8ef39e5493d..89191530207 100644
--- a/docs/yodldocs/make_smbcodepage.1.yo
+++ b/docs/yodldocs/make_smbcodepage.1.yo
@@ -1,4 +1,4 @@
-mailto(samba-bugs@samba.org) 
+mailto(samba@samba.org) 
 
 manpage(make_smbcodepage htmlcommand((1)))(1)(23 Oct 1998)(Samba)(SAMBA)
 
@@ -69,7 +69,7 @@ provided in the Samba distribution for codepages 437 (USA), 737
 866 (Cyrillic), 932 (Kanji SJIS), 936 (Simplified Chinese), 949
 (Hangul) and 950 (Traditional Chinese). Users are encouraged to write
 text codepage definition files for their own code pages and donate
-them to email(samba-bugs@samba.org). All codepage files in the
+them to email(samba@samba.org). All codepage files in the
 Samba em(source/codepages) directory are compiled and installed when a
 em('make install') command is issued there.
 
@@ -139,7 +139,7 @@ label(AUTHOR)
 manpageauthor()
 
 The original Samba software and related utilities were created by
-Andrew Tridgell email(samba-bugs@samba.org). Samba is now developed
+Andrew Tridgell email(samba@samba.org). Samba is now developed
 by the Samba Team as an Open Source project similar to the way the
 Linux kernel is developed.
 
@@ -148,7 +148,7 @@ sources were converted to YODL format (another excellent piece of Open
 Source software, available at
 url(bf(ftp://ftp.icce.rug.nl/pub/unix/))(ftp://ftp.icce.rug.nl/pub/unix/))
 and updated for the Samba2.0 release by Jeremy Allison.
-email(samba-bugs@samba.org).
+email(samba@samba.org).
 
 See url(bf(samba (7)))(samba.7.html) to find out how to get a full
 list of contributors and details on how to submit bug reports,
diff --git a/docs/yodldocs/nmbd.8.yo b/docs/yodldocs/nmbd.8.yo
index d7583710ce5..c9031c0e6a0 100644
--- a/docs/yodldocs/nmbd.8.yo
+++ b/docs/yodldocs/nmbd.8.yo
@@ -1,4 +1,4 @@
-mailto(samba-bugs@samba.org) 
+mailto(samba@samba.org) 
 
 manpage(nmbd)(8)(23 Oct 1998)(Samba)(SAMBA)
 
@@ -216,7 +216,7 @@ label(AUTHOR)
 manpageauthor()
 
 The original Samba software and related utilities were created by
-Andrew Tridgell email(samba-bugs@samba.org). Samba is now developed
+Andrew Tridgell email(samba@samba.org). Samba is now developed
 by the Samba Team as an Open Source project similar to the way the
 Linux kernel is developed.
 
@@ -225,7 +225,7 @@ sources were converted to YODL format (another excellent piece of Open
 Source software, available at
 url(bf(ftp://ftp.icce.rug.nl/pub/unix/))(ftp://ftp.icce.rug.nl/pub/unix/))
 and updated for the Samba2.0 release by Jeremy Allison.
-email(samba-bugs@samba.org).
+email(samba@samba.org).
 
 See url(bf(samba (7)))(samba.7.html) to find out how to get a full
 list of contributors and details on how to submit bug reports,
diff --git a/docs/yodldocs/nmblookup.1.yo b/docs/yodldocs/nmblookup.1.yo
index 80ec850be24..f05cf3ea11d 100644
--- a/docs/yodldocs/nmblookup.1.yo
+++ b/docs/yodldocs/nmblookup.1.yo
@@ -1,4 +1,4 @@
-mailto(samba-bugs@samba.org) 
+mailto(samba@samba.org) 
 
 manpage(nmblookup htmlcommand((1)))(1)(23 Oct 1998)(Samba)(SAMBA)
 
@@ -150,7 +150,7 @@ label(AUTHOR)
 manpageauthor()
 
 The original Samba software and related utilities were created by
-Andrew Tridgell email(samba-bugs@samba.org). Samba is now developed
+Andrew Tridgell email(samba@samba.org). Samba is now developed
 by the Samba Team as an Open Source project similar to the way the
 Linux kernel is developed.
 
@@ -159,7 +159,7 @@ sources were converted to YODL format (another excellent piece of Open
 Source software, available at
 url(bf(ftp://ftp.icce.rug.nl/pub/unix/))(ftp://ftp.icce.rug.nl/pub/unix/))
 and updated for the Samba2.0 release by Jeremy Allison.
-email(samba-bugs@samba.org).
+email(samba@samba.org).
 
 See url(bf(samba (7)))(samba.7.html) to find out how to get a full
 list of contributors and details on how to submit bug reports,
diff --git a/docs/yodldocs/samba.7.yo b/docs/yodldocs/samba.7.yo
index dc238bd0fc9..84db537c98e 100644
--- a/docs/yodldocs/samba.7.yo
+++ b/docs/yodldocs/samba.7.yo
@@ -1,4 +1,4 @@
-mailto(samba-bugs@samba.org)
+mailto(samba@samba.org)
 manpage(Samba htmlcommand((7)))(7)(23 Oct 1998)(Samba)()
 
 label(NAME)
@@ -25,7 +25,7 @@ described in a separate manual page. It is strongly recommended that
 you read the documentation that comes with Samba and the manual pages
 of those components that you use. If the manual pages aren't clear
 enough then please send a patch or bug report
-to email(samba-bugs@samba.org).
+to email(samba@samba.org).
 
 startdit() 
 
@@ -110,7 +110,7 @@ url(http://samba.org/listproc)(http://samba.org/listproc)
 for details on how to do this.
 
 If you have patches to submit or bugs to report then you may mail them
-directly to email(samba-bugs@samba.org). Note, however, that due to
+directly to email(samba@samba.org). Note, however, that due to
 the enormous popularity of this package the Samba Team may take some
 time to respond to mail. We prefer patches in em(diff -u) format.
 
@@ -134,7 +134,7 @@ label(AUTHOR)
 manpageauthor()
 
 The original Samba software and related utilities were created by
-Andrew Tridgell email(samba-bugs@samba.org). Samba is now developed
+Andrew Tridgell email(samba@samba.org). Samba is now developed
 by the Samba Team as an Open Source project similar to the way the
 Linux kernel is developed.
 
@@ -143,4 +143,4 @@ sources were converted to YODL format (another excellent piece of Open
 Source software, available at
 url(bf(ftp://ftp.icce.rug.nl/pub/unix/))(ftp://ftp.icce.rug.nl/pub/unix/))
 and updated for the Samba2.0 release by Jeremy Allison.
-email(samba-bugs@samba.org).
+email(samba@samba.org).
diff --git a/docs/yodldocs/smb.conf.5.yo b/docs/yodldocs/smb.conf.5.yo
index 8aedc667fa3..31adf6dadaf 100644
--- a/docs/yodldocs/smb.conf.5.yo
+++ b/docs/yodldocs/smb.conf.5.yo
@@ -1,4 +1,4 @@
-mailto(samba-bugs@samba.org) 
+mailto(samba@samba.org) 
 
 manpage(smb.conf htmlcommand((5)))(5)(23 Oct 1998)(Samba)(SAMBA)
 
@@ -107,7 +107,7 @@ as the default guest user (specified elsewhere):
 verb(
  	[aprinter]
  		path = /usr/spool/public
- 		read only = true
+ 		writeable = false
  		printable = true
  		guest ok = true
 )
@@ -193,7 +193,7 @@ dit(bf(The [printers] section))
 
 This section works like link(bf([homes]))(homes), but for printers.
 
-If a [printers] section occurs in the configuration file, users are
+If a bf([printers]) section occurs in the configuration file, users are
 able to connect to any printer specified in the local host's printcap
 file.
 
@@ -203,7 +203,7 @@ link(bf([homes]))(homes) section exists, it is used as described
 above. Otherwise, the requested section name is treated as a printer
 name and the appropriate printcap file is scanned to see if the
 requested section name is a valid printer share name. If a match is
-found, a new printer share is created by cloning the [printers]
+found, a new printer share is created by cloning the bf([printers])
 section.
 
 A few modifications are then made to the newly created share:
@@ -220,11 +220,11 @@ given, the username is set to the located printer name.
 
 endit()
 
-Note that the [printers] service MUST be printable - if you specify
+Note that the bf([printers]) service MUST be printable - if you specify
 otherwise, the server will refuse to load the configuration file.
 
 Typically the path specified would be that of a world-writeable spool
-directory with the sticky bit set on it. A typical [printers] entry
+directory with the sticky bit set on it. A typical bf([printers]) entry
 would look like this:
 
 verb(
@@ -360,7 +360,7 @@ it() bf(%a) = the architecture of the remote
 machine. Only some are recognized, and those may not be 100%
 reliable. It currently recognizes Samba, WfWg, WinNT and
 Win95. Anything else will be known as "UNKNOWN". If it gets it wrong
-then sending a level 3 log to email(samba-bugs@samba.org)
+then sending a level 3 log to email(samba@samba.org)
 should allow it to be fixed.
 
 label(percentI)
@@ -512,7 +512,7 @@ it() link(bf(debug timestamp))(debugtimestamp)
 
 it() link(bf(debug uid))(debuguid)
 
-it() link(bf(debuglevel))(debuglevel)
+it() link(bf(debug level))(debuglevel)
 
 it() link(bf(default))(default)
 
@@ -528,8 +528,6 @@ it() link(bf(domain admin group))(domainadmingroup)
 
 it() link(bf(domain admin users))(domainadminusers)
 
-it() link(bf(domain controller))(domaincontroller)
-
 it() link(bf(domain groups))(domaingroups)
 
 it() link(bf(domain guest group))(domainguestgroup)
@@ -618,6 +616,8 @@ it() link(bf(message command))(messagecommand)
 
 it() link(bf(min passwd length))(minpasswdlength)
 
+it() link(bf(min password length))(minpasswordlength)
+
 it() link(bf(min wins ttl))(minwinsttl)
 
 it() link(bf(name resolve order))(nameresolveorder)
@@ -706,6 +706,8 @@ it() link(bf(socket address))(socketaddress)
 
 it() link(bf(socket options))(socketoptions)
 
+it() link(bf(source environment))(sourceenvironment)
+
 it() link(bf(ssl))(ssl)
 
 it() link(bf(ssl CA certDir))(sslCAcertDir)
@@ -762,18 +764,16 @@ it() link(bf(username level))(usernamelevel)
 
 it() link(bf(username map))(usernamemap)
 
-it() link(bf(utmp))(utmp)
-
 it() link(bf(utmp directory))(utmpdirectory)
 
 it() link(bf(valid chars))(validchars)
 
+it() link(bf(wins hook))(winshook)
+
 it() link(bf(wins proxy))(winsproxy)
 
 it() link(bf(wins server))(winsserver)
 
-it() link(bf(wins hook))(winshook)
-
 it() link(bf(wins support))(winssupport)
 
 it() link(bf(workgroup))(workgroup)
@@ -922,10 +922,10 @@ it() link(bf(only guest))(onlyguest)
 
 it() link(bf(only user))(onlyuser)
 
-it() link(bf(oplocks))(oplocks)
-
 it() link(bf(oplock contention limit))(oplockcontentionlimit)
 
+it() link(bf(oplocks))(oplocks)
+
 it() link(bf(path))(path)
 
 it() link(bf(postexec))(postexec)
@@ -970,10 +970,10 @@ it() link(bf(root postexec))(rootpostexec)
 
 it() link(bf(root preexec))(rootpreexec)
 
-it() link(bf(security mask))(securitymask)
-
 it() link(bf(root preexec close))(rootpreexecclose)
 
+it() link(bf(security mask))(securitymask)
+
 it() link(bf(set directory))(setdirectory)
 
 it() link(bf(share modes))(sharemodes)
@@ -994,6 +994,8 @@ it() link(bf(username))(username)
 
 it() link(bf(users))(users)
 
+it() link(bf(utmp))(utmp)
+
 it() link(bf(valid users))(validusers)
 
 it() link(bf(veto files))(vetofiles)
@@ -1006,6 +1008,8 @@ it() link(bf(wide links))(widelinks)
 
 it() link(bf(writable))(writable)
 
+it() link(bf(write cache size))(writecachesize)
+
 it() link(bf(write list))(writelist)
 
 it() link(bf(write ok))(writeok)
@@ -1631,7 +1635,7 @@ dit(bf(debug timestamp (G)))
 
 Samba2.0 debug log messages are timestamped by default. If you are
 running at a high link(bf("debug level"))(debuglevel) these timestamps
-can be distracting. This boolean parameter allows them to be turned
+can be distracting. This boolean parameter allows timestamping to be turned
 off.
 
   bf(Default:)
@@ -2002,13 +2006,6 @@ Samba NT Domain Controller functionality please subscribe to the
 mailing list bf(Samba-ntdom) available by sending email to
 email(listproc@samba.org)
 
-label(domain controller)
-dit(bf(domain controller (G)))
-
-This is a bf(DEPRECATED) parameter. It is currently not used within
-the Samba source and should be removed from all current smb.conf
-files. It is left behind for compatibility reasons.
-
 label(domaingroups)
 dit(bf(domain groups (G)))
 
@@ -3143,6 +3140,22 @@ from a command prompt, for example.
 This option takes the standard substitutions, allowing you to have
 separate logon scripts for each user or machine.
 
+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:
+
+tt("     logon home = \\%L\%U\profile")
+
+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 tt("net use /home"),
+but use the whole string when dealing with profiles.
+
+Note that in prior versions of Samba, the tt("logon path") was returned rather than
+tt("logon home").  This broke tt("net use /home") but allowed profiles outside the 
+home directory.  The current implementation is correct, and can be used for profiles
+if you use the above trick.
+
 Note that this option is only useful if Samba is set up as a
 link(bf(logon server))(domainlogons).
 
@@ -3156,24 +3169,27 @@ label(logonpath)
 dit(bf(logon path (G)))
 
 This parameter specifies the home directory where roaming profiles
-(USER.DAT / USER.MAN files for Windows 95/98) are stored.
+(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 tt("logon home") parameter.
 
 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 tt("desktop"), tt("start menu"),
-tt("network neighborhood") and tt("programs") folders, and their
-contents, are loaded and displayed on your Windows 95/98 client.
+the directory from which the tt("application data"), (tt("desktop"), tt("start menu"),
+tt("network neighborhood"), tt("programs") and other folders, and their
+contents, are loaded and displayed on your Windows NT client.
 
 The share and the path must be readable by the user for the
-preferences and directories to be loaded onto the Windows 95/98
+preferences and directories to be loaded onto the Windows NT
 client.  The share must be writeable when the logs in for the first
-time, in order that the Windows 95/98 client can create the user.dat
+time, in order that the Windows NT client can create the NTuser.dat
 and other directories.
 
 Thereafter, the directories and any of the contents can, if required, be
-made read-only.  It is not advisable that the USER.DAT file be made
-read-only - rename it to USER.MAN to achieve the desired effect (a
-em(MAN)datory profile).
+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
+em(MAN)datory profile). 
 
 Windows clients can sometimes maintain a connection to the [homes]
 share, even though there is no user logged in.  Therefore, it is vital
@@ -3787,7 +3803,7 @@ tt(	max open files = 10000)
 label(maxpacket)
 dit(bf(max packet (G)))
 
-Synonym for label(bf("packet size"))(packetsize).
+Synonym for link(bf("packet size"))(packetsize).
 
 label(maxttl)
 dit(bf(max ttl (G)))
@@ -3907,6 +3923,11 @@ tt(	min print space = 2000)
 label(minpasswdlength)
 dit(bf(min passwd length (G)))
 
+Synonym for link(bf("min password length"))(minpasswordlength).
+
+label(minpasswordlength)
+dit(bf(min password length (G)))
+
 This option sets the minimum length in characters of a plaintext password
 than smbd will accept when performing UNIX password changing.
 
@@ -3915,7 +3936,7 @@ link(bf("passwd program"))(passwdprogram) and link(bf("passwd chat
 debug"))(passwdchatdebug).
 
   bf(Default:)
-tt(	min passwd length = 5)
+tt(	min password length = 5)
 
 
 label(minwinsttl)
@@ -4229,7 +4250,7 @@ tt(	os level = 65    ; This will win against any NT Server)
 label(packetsize)
 dit(bf(packet size (G)))
 
-This is a deprecated parameter that how no effect on the current
+This is a deprecated parameter that has no effect on the current
 Samba code. It is left in the parameter list to prevent breaking
 old bf(smb.conf) files.
 
@@ -4304,7 +4325,7 @@ debug their link(bf("passwd chat"))(passwdchat) scripts when calling
 the link(bf("passwd program"))(passwdprogram) and should be turned off
 after this has been done. This parameter is off by default.
 
-See also link(bf("passwd chat"))(passwdchat"), link(bf("passwd
+See also link(bf("passwd chat"))(passwdchat), link(bf("passwd
 program"))(passwdprogram).
 
   bf(Example:)
@@ -4697,7 +4718,7 @@ submit spool files on the directory specified for the service.
 
 Note that a printable service will ALWAYS allow writing to the service
 path (user privileges permitting) via the spooling of print data. The
-link(bf("read only"))(readonly) parameter controls only non-printing
+link(bf("writeable"))(writeable) parameter controls only non-printing
 access to the resource.
 
   bf(Default:)
@@ -4841,11 +4862,12 @@ label(printing)
 dit(bf(printing (S)))
 
 This parameters controls how printer status information is interpreted
-on your system, and also affects the default values for the
+on your system. It also affects the default values for the
 link(bf("print command"))(printcommand), link(bf("lpq
 command"))(lpqcommand) link(bf("lppause command"))(lppausecommand),
 link(bf("lpresume command"))(lpresumecommand), and link(bf("lprm
-command"))(lprmcommand).
+command"))(lprmcommand) if specified in the link(bf([global]))(global)
+section.
 
 Currently eight printing styles are supported. They are
 bf("printing=BSD"), bf("printing=AIX"), bf("printing=LPRNG"),
@@ -4854,7 +4876,7 @@ bf("printing=SYSV"),bf("printing="HPUX"),bf("printing=QNX") and
 bf("printing=SOFTQ").
 
 To see what the defaults are for the other print commands when using
-these three options use the url(bf("testparm"))(testparm.1.html) program.
+the various options use the url(bf("testparm"))(testparm.1.html) program.
 
 This option can be set on a per printer basis
 
@@ -4966,7 +4988,7 @@ dit(bf(read list (S)))
 
 This is a list of users that are given read-only access to a
 service. If the connecting user is in this list then they will not be
-given write access, no matter what the link(bf("read only"))(readonly)
+given write access, no matter what the link(bf("writeable"))(writeable)
 option is set to. The list can include group names using the syntax
 described in the link(bf("invalid users"))(invalidusers) parameter.
 
@@ -4983,10 +5005,7 @@ label(readonly)
 dit(bf(read only (S)))
 
 Note that this is an inverted synonym for
-link(bf("writeable"))(writeable) and link(bf("write ok"))(writeok).
-
-See also link(bf("writeable"))(writeable) and link(bf("write
-ok"))(writeok).
+link(bf("writeable"))(writeable).
 
 label(readprediction)
 dit(bf(read prediction (G)))
@@ -5647,7 +5666,7 @@ You may find that on some systems Samba will say "Unknown socket
 option" when you supply an option. This means you either incorrectly 
 typed it or you need to add an include file to includes.h for your OS. 
 If the latter is the case please send the patch to
-email(samba-bugs@samba.org).
+email(samba@samba.org).
 
 Any of the supported socket options may be combined in any way you
 like, as long as your OS allows it.
@@ -5707,6 +5726,35 @@ tt(	socket options = TCP_NODELAY)
   bf(Example:)
 tt(	socket options = IPTOS_LOWDELAY)
 
+label(sourceenvironment)
+dit(bf(source environment (G)))
+
+This parameter causes Samba to set environment variables as per the
+content of the file named.
+
+The file bf(must) be owned by root and not world writable in order
+to be read (this is a security check).
+
+If the value of this parameter starts with a "|" character then Samba will
+treat that value as a pipe command to open and will set the environment
+variables from the oput of the pipe. This command must not be world writable
+and must reside in a directory that is not world writable.
+
+The contents of the file or the output of the pipe should be formatted
+as the output of the standard Unix env(1) command. This is of the form :
+
+Example environment entry:
+tt( SAMBA_NETBIOS_NAME=myhostname )
+
+  bf(Default:)
+tt(No default value)
+
+  bf(Examples:)
+
+tt(	source environment = |/etc/smb.conf.sh)
+
+tt(	source environment = /usr/local/smb_env_vars)
+
 label(ssl)
 dit(bf(ssl (G)))
 
@@ -6134,15 +6182,7 @@ tt(	time server = True)
 label(timestamplogs)
 dit(bf(timestamp logs (G)))
 
-Samba2.0 will a timestamps to all log entries by default. This
-can be distracting if you are attempting to debug a problem. This
-parameter allows the timestamping to be turned off.
-
-  bf(Default:)
-tt(	timestamp logs = True)
-
-  bf(Example:)
-tt(	timestamp logs = False)
+Synonym for url(bf("debug timestamp"))(debugtimestamp).
 
 label(unixpasswordsync)
 dit(bf(unix password sync (G)))
@@ -6407,7 +6447,7 @@ tt(	no username map)
 tt(	username map = /usr/local/samba/lib/users.map)
 
 label(utmp)
-dit(bf(utmp (G)))
+dit(bf(utmp (S)))
 
 This boolean parameter is only available if Samba has been configured and compiled 
 with the option tt(--with-utmp). If set to True then Samba will attempt
@@ -6730,7 +6770,7 @@ dit(bf(write list (S)))
 
 This is a list of users that are given read-write access to a
 service. If the connecting user is in this list then they will be
-given write access, no matter what the link(bf("read only"))(readonly)
+given write access, no matter what the link(bf("writeable"))(writeable)
 option is set to. The list can include group names using the @group
 syntax.
 
@@ -6745,6 +6785,32 @@ tt(     write list = <empty string>)
   bf(Example:)
 tt(	write list = admin, root, @staff)
 
+label(writecachesize)
+dit(bf(write cache size (S)))
+
+This integer parameter (new with Samba 2.0.7) if set to non-zero causes Samba to create an in-memory
+cache for each oplocked file (it does bf(not) do this for non-oplocked files). All
+writes that the client does not request to be flushed directly to disk will be
+stored in this cache if possible. The cache is flushed onto disk when a write
+comes in whose offset would not fit into the cache or when the file is closed
+by the client. Reads for the file are also served from this cache if the data
+is stored within it.
+
+This cache allows Samba to batch client writes into a more efficient write
+size for RAID disks (ie. writes may be tuned to be the RAID stripe size) and
+can improve performance on systems where the disk subsystem is a bottleneck
+but there is free memory for userspace programs.
+
+The integer parameter specifies the size of this cache (per oplocked file)
+in bytes.
+
+  bf(Default:)
+tt(     write cache size = 0)
+
+  bf(Example:)
+tt(	     write cache size = 262144)
+for a 256k cache size per file.
+
 label(writeok)
 dit(bf(write ok (S)))
 
@@ -6822,7 +6888,7 @@ label(AUTHOR)
 manpageauthor()
 
 The original Samba software and related utilities were created by
-Andrew Tridgell email(samba-bugs@samba.org). Samba is now developed
+Andrew Tridgell email(samba@samba.org). Samba is now developed
 by the Samba Team as an Open Source project similar to the way the
 Linux kernel is developed.
 
@@ -6831,7 +6897,7 @@ sources were converted to YODL format (another excellent piece of Open
 Source software, available at
 url(bf(ftp://ftp.icce.rug.nl/pub/unix/))(ftp://ftp.icce.rug.nl/pub/unix/))
 and updated for the Samba2.0 release by Jeremy Allison.
-email(samba-bugs@samba.org).
+email(samba@samba.org).
 
 See url(bf(samba (7)))(samba.7.html) to find out how to get a full
 list of contributors and details on how to submit bug reports,
diff --git a/docs/yodldocs/smbclient.1.yo b/docs/yodldocs/smbclient.1.yo
index a2d14209b99..7f9ebbb6636 100644
--- a/docs/yodldocs/smbclient.1.yo
+++ b/docs/yodldocs/smbclient.1.yo
@@ -1,4 +1,4 @@
-mailto(samba-bugs@samba.org) 
+mailto(samba@samba.org) 
 
 manpage(smbclient htmlcommand((1)))(1)(23 Oct 1998)(Samba)(SAMBA)
 
@@ -730,7 +730,7 @@ label(AUTHOR)
 manpageauthor()
 
 The original Samba software and related utilities were created by
-Andrew Tridgell email(samba-bugs@samba.org). Samba is now developed
+Andrew Tridgell email(samba@samba.org). Samba is now developed
 by the Samba Team as an Open Source project similar to the way the
 Linux kernel is developed.
 
@@ -739,7 +739,7 @@ sources were converted to YODL format (another excellent piece of Open
 Source software, available at
 url(bf(ftp://ftp.icce.rug.nl/pub/unix/))(ftp://ftp.icce.rug.nl/pub/unix/))
 and updated for the Samba2.0 release by Jeremy Allison.
-email(samba-bugs@samba.org).
+email(samba@samba.org).
 
 See url(bf(samba (7)))(samba.7.html) to find out how to get a full
 list of contributors and details on how to submit bug reports,
diff --git a/docs/yodldocs/smbd.8.yo b/docs/yodldocs/smbd.8.yo
index 1a3b9db475e..2a8cbfbefa2 100644
--- a/docs/yodldocs/smbd.8.yo
+++ b/docs/yodldocs/smbd.8.yo
@@ -1,4 +1,4 @@
-mailto(samba-bugs@samba.org) 
+mailto(samba@samba.org) 
 
 manpage(smbd htmlcommand((8)))(8)(23 Oct 1998)(Samba)(SAMBA)
 
@@ -428,7 +428,7 @@ label(AUTHOR)
 manpageauthor()
 
 The original Samba software and related utilities were created by
-Andrew Tridgell email(samba-bugs@samba.org). Samba is now developed
+Andrew Tridgell email(samba@samba.org). Samba is now developed
 by the Samba Team as an Open Source project similar to the way the
 Linux kernel is developed.
 
@@ -437,7 +437,7 @@ sources were converted to YODL format (another excellent piece of Open
 Source software, available at
 url(bf(ftp://ftp.icce.rug.nl/pub/unix/))(ftp://ftp.icce.rug.nl/pub/unix/))
 and updated for the Samba2.0 release by Jeremy Allison.
-email(samba-bugs@samba.org).
+email(samba@samba.org).
 
 See url(bf(samba (7)))(samba.7.html) to find out how to get a full list of contributors
 and details on how to submit bug reports, comments etc.
diff --git a/docs/yodldocs/smbpasswd.5.yo b/docs/yodldocs/smbpasswd.5.yo
index 8918b248355..53350645c93 100644
--- a/docs/yodldocs/smbpasswd.5.yo
+++ b/docs/yodldocs/smbpasswd.5.yo
@@ -1,4 +1,4 @@
-mailto(samba-bugs@samba.org) 
+mailto(samba@samba.org) 
 
 manpage(smbpasswd htmlcommand((5)))(5)(23 Oct 1998)(Samba)(SAMBA)
 
@@ -197,7 +197,7 @@ label(AUTHOR)
 manpageauthor()
 
 The original Samba software and related utilities were created by
-Andrew Tridgell email(samba-bugs@samba.org). Samba is now developed
+Andrew Tridgell email(samba@samba.org). Samba is now developed
 by the Samba Team as an Open Source project similar to the way the
 Linux kernel is developed.
 
@@ -206,7 +206,7 @@ sources were converted to YODL format (another excellent piece of Open
 Source software, available at
 url(bf(ftp://ftp.icce.rug.nl/pub/unix/))(ftp://ftp.icce.rug.nl/pub/unix/)) 
 and updated for the Samba2.0 release by Jeremy
-Allison, email(samba-bugs@samba.org).
+Allison, email(samba@samba.org).
 
 See url(bf(samba (7)))(samba.7.html) to find out how to get a full
 list of contributors and details on how to submit bug reports,
diff --git a/docs/yodldocs/smbpasswd.8.yo b/docs/yodldocs/smbpasswd.8.yo
index 9e7c401fcf7..3d418e49535 100644
--- a/docs/yodldocs/smbpasswd.8.yo
+++ b/docs/yodldocs/smbpasswd.8.yo
@@ -1,4 +1,4 @@
-mailto(samba-bugs@samba.org) 
+mailto(samba@samba.org) 
 
 manpage(smbpasswd htmlcommand((8)))(8)(23 Oct 1998)(Samba)(SAMBA)
 
@@ -8,7 +8,7 @@ manpagename(smbpasswd)(change a users SMB password)
 label(SYNOPSIS)
 manpagesynopsis() 
 
-bf(smbpasswd) [link(-a)(minusa)] [link(-d)(minusd)] [link(-e)(minuse)] [link(-D debug level)(minusD)] [link(-n)(minusn)] [link(-r remote_machine)(minusr)] [link(-R name resolve order)(minusR)] [link(-m)(minusm)] [link(-j DOMAIN)(minusj)] [link(-U username)(minusU)] [link(-h)(minush)] [link(-s)(minuss)] link(username)(username)
+bf(smbpasswd) [link(-a)(minusa)] [link(-x)(minusx)] [link(-d)(minusd)] [link(-e)(minuse)] [link(-D debug level)(minusD)] [link(-n)(minusn)] [link(-r remote_machine)(minusr)] [link(-R name resolve order)(minusR)] [link(-m)(minusm)] [link(-j DOMAIN)(minusj)] [link(-U username)(minusU)] [link(-h)(minush)] [link(-s)(minuss)] link(username)(username)
 
 label(DESCRIPTION)
 manpagedescription()
@@ -68,6 +68,13 @@ else the request to add the user will fail.
 This option is only available when running bf(smbpasswd) as
 root.
 
+label(minusx)
+dit(bf(-x)) This option specifies that the username following should
+be deleted from the local url(bf(smbpasswd))(smbpasswd.5.html) file.
+
+This option is only available when running bf(smbpasswd) as
+root.
+
 label(minusd)
 dit(bf(-d)) This option specifies that the username following should be
 em(disabled) in the local url(bf(smbpasswd))(smbpasswd.5.html) file.
@@ -296,7 +303,7 @@ label(AUTHOR)
 manpageauthor()
 
 The original Samba software and related utilities were created by
-Andrew Tridgell email(samba-bugs@samba.org). Samba is now developed
+Andrew Tridgell email(samba@samba.org). Samba is now developed
 by the Samba Team as an Open Source project similar to the way the
 Linux kernel is developed.
 
@@ -305,7 +312,7 @@ sources were converted to YODL format (another excellent piece of Open
 Source software, available at
 url(bf(ftp://ftp.icce.rug.nl/pub/unix/))(ftp://ftp.icce.rug.nl/pub/unix/))
 and updated for the Samba2.0 release by Jeremy Allison.
-email(samba-bugs@samba.org).
+email(samba@samba.org).
 
 See url(bf(samba (7)))(samba.7.html) to find out how to get a full
 list of contributors and details on how to submit bug reports,
diff --git a/docs/yodldocs/smbrun.1.yo b/docs/yodldocs/smbrun.1.yo
index 97865e9826f..d9fff9b7a17 100644
--- a/docs/yodldocs/smbrun.1.yo
+++ b/docs/yodldocs/smbrun.1.yo
@@ -1,4 +1,4 @@
-mailto(samba-bugs@samba.org) 
+mailto(samba@samba.org) 
 
 manpage(smbrun htmlcommand((1)))(1)(23 Oct 1998)(Samba)(SAMBA)
 
@@ -65,7 +65,7 @@ label(AUTHOR)
 manpageauthor()
 
 The original Samba software and related utilities were created by
-Andrew Tridgell email(samba-bugs@samba.org). Samba is now developed
+Andrew Tridgell email(samba@samba.org). Samba is now developed
 by the Samba Team as an Open Source project similar to the way the
 Linux kernel is developed.
 
@@ -74,7 +74,7 @@ sources were converted to YODL format (another excellent piece of Open
 Source software, available at
 url(bf(ftp://ftp.icce.rug.nl/pub/unix/))(ftp://ftp.icce.rug.nl/pub/unix/))
 and updated for the Samba2.0 release by Jeremy Allison.
-email(samba-bugs@samba.org).
+email(samba@samba.org).
 
 See url(bf(samba (7)))(samba.7.html) to find out how to get a full
 list of contributors and details on how to submit bug reports,
diff --git a/docs/yodldocs/smbstatus.1.yo b/docs/yodldocs/smbstatus.1.yo
index f412a00a151..8e571d0714c 100644
--- a/docs/yodldocs/smbstatus.1.yo
+++ b/docs/yodldocs/smbstatus.1.yo
@@ -1,4 +1,4 @@
-mailto(samba-bugs@samba.org) 
+mailto(samba@samba.org) 
 
 manpage(smbstatus htmlcommand((1)))(1)(23 Oct 1998)(Samba)(SAMBA)
 
@@ -69,7 +69,7 @@ label(AUTHOR)
 manpageauthor()
 
 The original Samba software and related utilities were created by
-Andrew Tridgell email(samba-bugs@samba.org). Samba is now developed
+Andrew Tridgell email(samba@samba.org). Samba is now developed
 by the Samba Team as an Open Source project similar to the way the
 Linux kernel is developed.
 
@@ -78,7 +78,7 @@ sources were converted to YODL format (another excellent piece of Open
 Source software, available at
 url(bf(ftp://ftp.icce.rug.nl/pub/unix/))(ftp://ftp.icce.rug.nl/pub/unix/))
 and updated for the Samba2.0 release by Jeremy Allison.
-email(samba-bugs@samba.org).
+email(samba@samba.org).
 
 See url(bf(samba (7)))(samba.7.html) to find out how to get a full
 list of contributors and details on how to submit bug reports,
diff --git a/docs/yodldocs/smbtar.1.yo b/docs/yodldocs/smbtar.1.yo
index 217d8d19269..9c321d3853e 100644
--- a/docs/yodldocs/smbtar.1.yo
+++ b/docs/yodldocs/smbtar.1.yo
@@ -1,4 +1,4 @@
-mailto(samba-bugs@samba.org) 
+mailto(samba@samba.org) 
 
 manpage(smbtar htmlcommand((1)))(1)(23 Oct 1998)(Samba)(SAMBA)
 
@@ -119,7 +119,7 @@ label(AUTHOR)
 manpageauthor()
 
 The original Samba software and related utilities were created by
-Andrew Tridgell email(samba-bugs@samba.org). Samba is now developed
+Andrew Tridgell email(samba@samba.org). Samba is now developed
 by the Samba Team as an Open Source project similar to the way the
 Linux kernel is developed.
 
@@ -131,7 +131,7 @@ etc. The man page sources were converted to YODL format (another
 excellent piece of Open Source software available at
 url(bf(ftp://ftp.icce.rug.nl/pub/unix/))(ftp://ftp.icce.rug.nl/pub/unix/))
 and updated for the Samba2.0 release by Jeremy Allison,
-email(samba-bugs@samba.org).
+email(samba@samba.org).
  
 See url(bf(samba (7)))(samba.7.html) to find out how to get a full
 list of contributors and details on how to submit bug reports,
diff --git a/docs/yodldocs/swat.8.yo b/docs/yodldocs/swat.8.yo
index 145a9198797..d320a090d27 100644
--- a/docs/yodldocs/swat.8.yo
+++ b/docs/yodldocs/swat.8.yo
@@ -1,4 +1,4 @@
-mailto(samba-bugs@samba.org) 
+mailto(samba@samba.org) 
 
 manpage(swat htmlcommand((8)))(8)(23 Oct 1998)(Samba)(SAMBA)
 
@@ -146,7 +146,7 @@ label(AUTHOR)
 manpageauthor()
 
 The original Samba software and related utilities were created by
-Andrew Tridgell (samba-bugs@samba.org). Samba is now developed
+Andrew Tridgell (samba@samba.org). Samba is now developed
 by the Samba Team as an Open Source project similar to the way the
 Linux kernel is developed.
 
@@ -155,7 +155,7 @@ sources were converted to YODL format (another excellent piece of Open
 Source software, available at
 url(bf(ftp://ftp.icce.rug.nl/pub/unix/))(ftp://ftp.icce.rug.nl/pub/unix/))
 and updated for the Samba2.0 release by Jeremy Allison.
-email(samba-bugs@samba.org).
+email(samba@samba.org).
 
 See url(bf(samba (7)))(samba.7.html) to find out how to get a full
 list of contributors and details on how to submit bug reports,
diff --git a/docs/yodldocs/testparm.1.yo b/docs/yodldocs/testparm.1.yo
index 35ebce9a982..573f855c3ee 100644
--- a/docs/yodldocs/testparm.1.yo
+++ b/docs/yodldocs/testparm.1.yo
@@ -1,4 +1,4 @@
-mailto(samba-bugs@samba.org) 
+mailto(samba@samba.org) 
 
 manpage(testparm htmlcommand((1)))(1)(23 Oct 1998)(Samba)(SAMBA)
 
@@ -100,7 +100,7 @@ label(AUTHOR)
 manpageauthor()
 
 The original Samba software and related utilities were created by
-Andrew Tridgell email(samba-bugs@samba.org). Samba is now developed
+Andrew Tridgell email(samba@samba.org). Samba is now developed
 by the Samba Team as an Open Source project similar to the way the
 Linux kernel is developed.
 
@@ -109,7 +109,7 @@ sources were converted to YODL format (another excellent piece of Open
 Source software, available at
 url(bf(ftp://ftp.icce.rug.nl/pub/unix/))(ftp://ftp.icce.rug.nl/pub/unix/))
 and updated for the Samba2.0 release by Jeremy Allison.
-email(samba-bugs@samba.org).
+email(samba@samba.org).
 
 See url(bf(samba (7)))(samba.7.html) to find out how to get a full
 list of contributors and details on how to submit bug reports,
diff --git a/docs/yodldocs/testprns.1.yo b/docs/yodldocs/testprns.1.yo
index a29cd0dd858..d9311ffd82b 100644
--- a/docs/yodldocs/testprns.1.yo
+++ b/docs/yodldocs/testprns.1.yo
@@ -1,4 +1,4 @@
-mailto(samba-bugs@samba.org) 
+mailto(samba@samba.org) 
 
 manpage(testprns htmlcommand((1)))(1)(23 Oct 1998)(Samba)(SAMBA)
 
@@ -82,7 +82,7 @@ label(AUTHOR)
 manpageauthor()
 
 The original Samba software and related utilities were created by
-Andrew Tridgell email(samba-bugs@samba.org). Samba is now developed
+Andrew Tridgell email(samba@samba.org). Samba is now developed
 by the Samba Team as an Open Source project similar to the way the
 Linux kernel is developed.
 
@@ -91,7 +91,7 @@ sources were converted to YODL format (another excellent piece of Open
 Source software, available at
 url(bf(ftp://ftp.icce.rug.nl/pub/unix/))(ftp://ftp.icce.rug.nl/pub/unix/))
 and updated for the Samba2.0 release by Jeremy Allison.
-email(samba-bugs@samba.org).
+email(samba@samba.org).
 
 See url(bf(samba (7)))(samba.7.html) to find out how to get a full
 list of contributors and details on how to submit bug reports,