- added example config section to winbindd man page

- reran yodldocs with newer version of yodl

17 files changed, 251 insertions, 126 deletions

diff --git a/docs/manpages/lmhosts.5 b/docs/manpages/lmhosts.5
index 534c2484150..3609ca256f0 100644
--- a/docs/manpages/lmhosts.5
+++ b/docs/manpages/lmhosts.5
@@ -76,7 +76,7 @@ This man page is correct for version 2\&.0 of the Samba suite\&.
 .SH "AUTHOR" 
 .PP 
 The original Samba software and related utilities were created by
-Andrew Tridgell \fIsamba-bugs@samba\&.org\fP\&. 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\&.
 .PP 
@@ -85,7 +85,7 @@ sources were converted to YODL format (another excellent piece of Open
 Source software, available at
 \fBftp://ftp\&.icce\&.rug\&.nl/pub/unix/\fP)
 and updated for the Samba2\&.0 release by Jeremy Allison\&.
-\fIsamba-bugs@samba\&.org\fP\&.
+samba@samba\&.org\&.
 .PP 
 See \fBsamba (7)\fP to find out how to get a full
 list of contributors and details on how to submit bug reports,
diff --git a/docs/manpages/make_smbcodepage.1 b/docs/manpages/make_smbcodepage.1
index 9c134201078..e6c76d9855d 100644
--- a/docs/manpages/make_smbcodepage.1
+++ b/docs/manpages/make_smbcodepage.1
@@ -61,7 +61,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 \fIsamba-bugs@samba\&.org\fP\&. All codepage files in the
+them to samba@samba\&.org\&. All codepage files in the
 Samba \fIsource/codepages\fP directory are compiled and installed when a
 \fI\'make install\'\fP command is issued there\&.
 .PP 
@@ -128,7 +128,7 @@ This man page is correct for version 2\&.0 of the Samba suite\&.
 .SH "AUTHOR" 
 .PP 
 The original Samba software and related utilities were created by
-Andrew Tridgell \fIsamba-bugs@samba\&.org\fP\&. 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\&.
 .PP 
@@ -137,7 +137,7 @@ sources were converted to YODL format (another excellent piece of Open
 Source software, available at
 \fBftp://ftp\&.icce\&.rug\&.nl/pub/unix/\fP)
 and updated for the Samba2\&.0 release by Jeremy Allison\&.
-\fIsamba-bugs@samba\&.org\fP\&.
+samba@samba\&.org\&.
 .PP 
 See \fBsamba (7)\fP to find out how to get a full
 list of contributors and details on how to submit bug reports,
diff --git a/docs/manpages/nmbd.8 b/docs/manpages/nmbd.8
index 72aeaf14a77..55930f6629a 100644
--- a/docs/manpages/nmbd.8
+++ b/docs/manpages/nmbd.8
@@ -6,7 +6,7 @@ naming services to clients
 .PP 
 .SH "SYNOPSIS" 
 .PP 
-\fBnmbd\fP [-D] [-a] [-o] [-h] [-V] [-H lmhosts file] [-d debuglevel] [-l log file basename] [-n primary NetBIOS name] [-p port number] [-s configuration file] [-i NetBIOS scope]
+\fBnmbd\fP [-D] [-a] [-o] [-h] [-V] [-H lmhosts file] [-d debuglevel] [-l log file basename] [-n primary NetBIOS name] [-p port number] [-s configuration file]
 .PP 
 .SH "DESCRIPTION" 
 .PP 
@@ -136,14 +136,6 @@ this may be changed when Samba is autoconfigured\&.
 The file specified contains the configuration details required by the
 server\&. See \fBsmb\&.conf (5)\fP for more information\&.
 .IP 
-.IP "\fB-i scope\fP" 
-This specifies a NetBIOS scope that \fBnmbd\fP will use
-to communicate with when generating NetBIOS names\&. For details on the
-use of NetBIOS scopes, see rfc1001\&.txt and rfc1002\&.txt\&. NetBIOS scopes
-are \fIvery\fP rarely used, only set this parameter if you are the
-system administrator in charge of all the NetBIOS systems you
-communicate with\&.
-.IP 
 .PP 
 .SH "FILES" 
 .PP 
@@ -212,7 +204,7 @@ http://samba\&.org/cifs/\&.
 .SH "AUTHOR" 
 .PP 
 The original Samba software and related utilities were created by
-Andrew Tridgell \fIsamba-bugs@samba\&.org\fP\&. 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\&.
 .PP 
@@ -221,7 +213,7 @@ sources were converted to YODL format (another excellent piece of Open
 Source software, available at
 \fBftp://ftp\&.icce\&.rug\&.nl/pub/unix/\fP)
 and updated for the Samba2\&.0 release by Jeremy Allison\&.
-\fIsamba-bugs@samba\&.org\fP\&.
+samba@samba\&.org\&.
 .PP 
 See \fBsamba (7)\fP to find out how to get a full
 list of contributors and details on how to submit bug reports,
diff --git a/docs/manpages/nmblookup.1 b/docs/manpages/nmblookup.1
index a542e6d5074..3d1491e8788 100644
--- a/docs/manpages/nmblookup.1
+++ b/docs/manpages/nmblookup.1
@@ -139,7 +139,7 @@ This man page is correct for version 2\&.0 of the Samba suite\&.
 .SH "AUTHOR" 
 .PP 
 The original Samba software and related utilities were created by
-Andrew Tridgell \fIsamba-bugs@samba\&.org\fP\&. 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\&.
 .PP 
@@ -148,7 +148,7 @@ sources were converted to YODL format (another excellent piece of Open
 Source software, available at
 \fBftp://ftp\&.icce\&.rug\&.nl/pub/unix/\fP)
 and updated for the Samba2\&.0 release by Jeremy Allison\&.
-\fIsamba-bugs@samba\&.org\fP\&.
+samba@samba\&.org\&.
 .PP 
 See \fBsamba (7)\fP to find out how to get a full
 list of contributors and details on how to submit bug reports,
diff --git a/docs/manpages/samba.7 b/docs/manpages/samba.7
index 96975f34c26..a508093b8b6 100644
--- a/docs/manpages/samba.7
+++ b/docs/manpages/samba.7
@@ -20,7 +20,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 \fIsamba-bugs@samba\&.org\fP\&.
+to samba@samba\&.org\&.
 .PP 
 .IP 
 .IP "\fBsmbd\fP" 
@@ -121,13 +121,13 @@ This man page is correct for version 2\&.0 of the Samba suite\&.
 .SH "CONTRIBUTIONS" 
 .PP 
 If you wish to contribute to the Samba project, then I suggest you
-join the Samba mailing list at \fIsamba@samba\&.org\fP\&. See the
+join the Samba mailing list at samba@samba\&.org\&. See the
 Web page at
 http://samba\&.org/listproc
 for details on how to do this\&.
 .PP 
 If you have patches to submit or bugs to report then you may mail them
-directly to \fIsamba-bugs@samba\&.org\fP\&. Note, however, that due to
+directly to 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 \fIdiff -u\fP format\&.
 .PP 
@@ -149,7 +149,7 @@ http://samba\&.org/samba/samba-thanks\&.html\&.
 .SH "AUTHOR" 
 .PP 
 The original Samba software and related utilities were created by
-Andrew Tridgell \fIsamba-bugs@samba\&.org\fP\&. 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\&.
 .PP 
@@ -158,4 +158,4 @@ sources were converted to YODL format (another excellent piece of Open
 Source software, available at
 \fBftp://ftp\&.icce\&.rug\&.nl/pub/unix/\fP)
 and updated for the Samba2\&.0 release by Jeremy Allison\&.
-\fIsamba-bugs@samba\&.org\fP\&.
+samba@samba\&.org\&.
diff --git a/docs/manpages/smb.conf.5 b/docs/manpages/smb.conf.5
index ac227d91821..3847288a03e 100644
--- a/docs/manpages/smb.conf.5
+++ b/docs/manpages/smb.conf.5
@@ -86,7 +86,7 @@ write access to the path \f(CW/home/bar\fP\&. The share is accessed via
 the share name "foo":
 .PP 
 
-.DS 
+.nf 
  
 
 
@@ -95,7 +95,7 @@ the share name "foo":
  		writeable = true
 
 
-.DE 
+.fi 
  
 
 .PP 
@@ -106,7 +106,7 @@ is via calls to open, write to and close a spool file\&. The
 as the default guest user (specified elsewhere):
 .PP 
 
-.DS 
+.nf 
  
 
  	[aprinter]
@@ -115,7 +115,7 @@ as the default guest user (specified elsewhere):
  		printable = true
  		guest ok = true
 
-.DE 
+.fi 
  
 
 .PP 
@@ -175,13 +175,13 @@ section can specify, though some make more sense than others\&. The
 following is a typical and suitable [homes] section:
 .IP 
 
-.DS 
+.nf 
  
 
  	[homes]
  		writeable = yes
 
-.DE 
+.fi 
  
 
 .IP 
@@ -237,7 +237,7 @@ directory with the sticky bit set on it\&. A typical \fB[printers]\fP entry
 would look like this:
 .IP 
 
-.DS 
+.nf 
  
 
  	[printers]
@@ -245,7 +245,7 @@ would look like this:
  		guest ok = yes
  		printable = yes 
 
-.DE 
+.fi 
  
 
 .IP 
@@ -256,10 +256,10 @@ pseudo-printcap\&. This is a file consisting of one or more lines like
 this:
 .IP 
 
-.DS 
+.nf 
  
         alias|alias|alias|alias\&.\&.\&.    
-.DE 
+.fi 
  
 
 .IP 
@@ -377,7 +377,7 @@ negotiation\&. It can be one of CORE, COREPLUS, LANMAN1, LANMAN2 or NT1\&.
 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 \fIsamba@samba\&.org\fP
+then sending a level 3 log to samba@samba\&.org
 should allow it to be fixed\&.
 .IP 
 .IP o 
@@ -1993,7 +1993,7 @@ interesting things\&.
 .IP 
 \fBExample:\fP
 
-.DS 
+.nf 
  
 
 	default service = pub
@@ -2001,7 +2001,7 @@ interesting things\&.
 	[pub]
 		path = /%S
 
-.DE 
+.fi 
  
 
 .IP 
@@ -2138,26 +2138,26 @@ and remaining space will be used\&.\fP
 Where the script dfree (which must be made executable) could be:
 .IP 
 
-.DS 
+.nf 
  
 
 	#!/bin/sh
 	df $1 | tail -1 | awk \'{print $2" "$4}\'
 
-.DE 
+.fi 
  
 
 .IP 
 or perhaps (on Sys V based systems):
 .IP 
 
-.DS 
+.nf 
  
 
 	#!/bin/sh
 	/usr/bin/df -k $1 | tail -1 | awk \'{print $3" "$5}\'
 
-.DE 
+.fi 
  
 
 .IP 
@@ -2267,7 +2267,7 @@ Samba NT Domain Controller Code\&. It may be removed in a later release\&.
 To work with the latest code builds that may have more support for
 Samba NT Domain Controller functionality please subscribe to the
 mailing list \fBSamba-ntdom\fP available by sending email to
-\fIlistproc@samba\&.org\fP
+listproc@samba\&.org
 .IP 
 .IP "\fBdomain admin users (G)\fP" 
 .IP 
@@ -2276,7 +2276,7 @@ Samba NT Domain Controller Code\&. It may be removed in a later release\&.
 To work with the latest code builds that may have more support for
 Samba NT Domain Controller functionality please subscribe to the
 mailing list \fBSamba-ntdom\fP available by sending email to
-\fIlistproc@samba\&.org\fP
+listproc@samba\&.org
 .IP 
 .IP "\fBdomain groups (G)\fP" 
 .IP 
@@ -2285,7 +2285,7 @@ Samba NT Domain Controller Code\&. It may be removed in a later release\&.
 To work with the latest code builds that may have more support for
 Samba NT Domain Controller functionality please subscribe to the
 mailing list \fBSamba-ntdom\fP available by sending email to
-\fIlistproc@samba\&.org\fP
+listproc@samba\&.org
 .IP 
 .IP "\fBdomain guest group (G)\fP" 
 .IP 
@@ -2294,7 +2294,7 @@ Samba NT Domain Controller Code\&. It may be removed in a later release\&.
 To work with the latest code builds that may have more support for
 Samba NT Domain Controller functionality please subscribe to the
 mailing list \fBSamba-ntdom\fP available by sending email to
-\fIlistproc@samba\&.org\fP
+listproc@samba\&.org
 .IP 
 .IP "\fBdomain guest users (G)\fP" 
 .IP 
@@ -2303,7 +2303,7 @@ Samba NT Domain Controller Code\&. It may be removed in a later release\&.
 To work with the latest code builds that may have more support for
 Samba NT Domain Controller functionality please subscribe to the
 mailing list \fBSamba-ntdom\fP available by sending email to
-\fIlistproc@samba\&.org\fP
+listproc@samba\&.org
 .IP 
 .IP "\fBdomain logons (G)\fP" 
 .IP 
@@ -2796,13 +2796,13 @@ files"\fP and \fB"case sensitive"\fP\&.
 .IP 
 \fBDefault\fP
 
-.DS 
+.nf 
  
 
 	No files or directories are hidden by this option (dot files are
 	hidden by default because of the "hide dot files" option)\&.
 
-.DE 
+.fi 
  
 
 .IP 
@@ -4480,20 +4480,20 @@ debug"\fP\&.
 .IP 
 \fBExample:\fP 
 
-.DS 
+.nf 
  
  passwd chat = "*Enter OLD password*" %o\en "*Enter NEW password*" %n\en "*Reenter NEW password*" %n\en "*Password changed*"
 
-.DE 
+.fi 
  
 
 .IP 
 \fBDefault:\fP
 
-.DS 
+.nf 
  
        passwd chat = *old*password* %o\en *new*password* %n\en *new*password* %n\en *changed*
-.DE 
+.fi 
  
 
 .IP 
@@ -4745,12 +4745,12 @@ An interesting example is to send the users a welcome message every
 time they log in\&. Maybe a message of the day? Here is an example:
 .IP 
 
-.DS 
+.nf 
  
 
 	preexec = csh -c \'echo \e"Welcome to %S!\e" | /usr/local/samba/bin/smbclient -M %m -I %I\' &
 
-.DE 
+.fi 
  
 
 .IP 
@@ -4923,7 +4923,7 @@ to obtain a printer list\&.
 A minimal printcap file would look something like this:
 .IP 
 
-.DS 
+.nf 
  
 
 	print1|My Printer 1
@@ -4932,7 +4932,7 @@ A minimal printcap file would look something like this:
 	print4|My Printer 4
 	print5|My Printer 5
 
-.DE 
+.fi 
  
 
 .IP 
@@ -5807,7 +5807,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
-\fIsamba@samba\&.org\fP\&.
+samba@samba\&.org\&.
 .IP 
 Any of the supported socket options may be combined in any way you
 like, as long as your OS allows it\&.
@@ -6474,13 +6474,13 @@ information on how this parameter determines access to the services\&.
 .IP 
 \fBExamples:\fP
 
-.DS 
+.nf 
  
 
  	username = fred
  	username = fred, mary, jack, jane, @users, @pcgroup
 
-.DE 
+.fi 
  
 
 .IP 
@@ -6564,13 +6564,13 @@ and map the rest to guest\&. Note the use of the \f(CW\'!\'\fP to tell Samba
 to stop processing if it gets a match on that line\&.
 .IP 
 
-.DS 
+.nf 
  
 
 	!sys = mary fred
 	guest = *
 
-.DE 
+.fi 
  
 
 .IP 
@@ -6686,14 +6686,14 @@ is a pointless thing to do as it\'s already there) you could do one of
 the following
 .IP 
 
-.DS 
+.nf 
  
 
 	valid chars = Z
 	valid chars = z:Z
 	valid chars = 0132:0172
 
-.DE 
+.fi 
  
 
 .IP 
@@ -6710,13 +6710,13 @@ See also the \fB"client code page"\fP parameter\&.
 .IP 
 \fBDefault:\fP
 
-.DS 
+.nf 
  
 
 	Samba defaults to using a reasonable set of valid characters
 	for English systems
 
-.DE 
+.fi 
  
 
 .IP 
@@ -6728,7 +6728,7 @@ them\&.
 .IP 
 NOTE: It is actually quite difficult to correctly produce a \fB"valid
 chars"\fP line for a particular system\&. To automate the process
-\fItino@augsburg\&.net\fP has written a package called \fB"validchars"\fP
+tino@augsburg\&.net has written a package called \fB"validchars"\fP
 which will automatically produce a complete \fB"valid chars"\fP line for
 a given client system\&. Look in the examples/validchars/ subdirectory
 of your Samba source code distribution for this package\&.
@@ -6792,7 +6792,7 @@ sensitive"\fP\&.
 Example 1\&.
 .IP 
 
-.DS 
+.nf 
  
 
 
@@ -6802,14 +6802,14 @@ Example 1\&.
 
 	veto files = /*Security*/*\&.tmp/*root*/
 
-.DE 
+.fi 
  
 
 .IP 
 Example 2\&.
 .IP 
 
-.DS 
+.nf 
  
 
     Veto the Apple specific files that a NetAtalk server
@@ -6817,7 +6817,7 @@ Example 2\&.
 
     veto files = /\&.AppleDouble/\&.bin/\&.AppleDesktop/Network Trash Folder/
 
-.DE 
+.fi 
  
 
 .IP 
@@ -7037,14 +7037,14 @@ permitting), but only via spooling operations\&.
 .IP 
 \fBExamples:\fP
 
-.DS 
+.nf 
  
 
  	read only = no
  	writeable = yes
  	write ok = yes
 
-.DE 
+.fi 
  
 
 .IP 
@@ -7083,7 +7083,7 @@ This man page is correct for version 2\&.0 of the Samba suite\&.
 .SH "AUTHOR" 
 .PP 
 The original Samba software and related utilities were created by
-Andrew Tridgell \fIsamba@samba\&.org\fP\&. 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\&.
 .PP 
@@ -7092,7 +7092,7 @@ sources were converted to YODL format (another excellent piece of Open
 Source software, available at
 \fBftp://ftp\&.icce\&.rug\&.nl/pub/unix/\fP)
 and updated for the Samba2\&.0 release by Jeremy Allison\&.
-\fIsamba@samba\&.org\fP\&.
+samba@samba\&.org\&.
 .PP 
 See \fBsamba (7)\fP to find out how to get a full
 list of contributors and details on how to submit bug reports,
diff --git a/docs/manpages/smbclient.1 b/docs/manpages/smbclient.1
index 4346629adbd..6b3edb38fc7 100644
--- a/docs/manpages/smbclient.1
+++ b/docs/manpages/smbclient.1
@@ -760,7 +760,7 @@ This man page is correct for version 2\&.0 of the Samba suite\&.
 .SH "AUTHOR" 
 .PP 
 The original Samba software and related utilities were created by
-Andrew Tridgell \fIsamba-bugs@samba\&.org\fP\&. 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\&.
 .PP 
@@ -769,7 +769,7 @@ sources were converted to YODL format (another excellent piece of Open
 Source software, available at
 \fBftp://ftp\&.icce\&.rug\&.nl/pub/unix/\fP)
 and updated for the Samba2\&.0 release by Jeremy Allison\&.
-\fIsamba-bugs@samba\&.org\fP\&.
+samba@samba\&.org\&.
 .PP 
 See \fBsamba (7)\fP to find out how to get a full
 list of contributors and details on how to submit bug reports,
diff --git a/docs/manpages/smbd.8 b/docs/manpages/smbd.8
index 5efd6794787..5ee6cd53082 100644
--- a/docs/manpages/smbd.8
+++ b/docs/manpages/smbd.8
@@ -5,7 +5,7 @@ smbd \- server to provide SMB/CIFS services to clients
 .PP 
 .SH "SYNOPSIS" 
 .PP 
-\fBsmbd\fP [-D] [-a] [-o] [-P] [-h] [-V] [-d debuglevel] [-l log file] [-p port number] [-O socket options] [-s configuration file] [-i scope]
+\fBsmbd\fP [-D] [-a] [-o] [-P] [-h] [-V] [-d debuglevel] [-l log file] [-p port number] [-O socket options] [-s configuration file]
 .PP 
 .SH "DESCRIPTION" 
 .PP 
@@ -137,14 +137,6 @@ of all the services that the server is to provide\&. See \fBsmb\&.conf
 (5)\fP for more information\&.
 The default configuration file name is determined at compile time\&.
 .IP 
-.IP "\fB-i scope\fP" 
-This specifies a NetBIOS scope that the server will use
-to communicate with when generating NetBIOS names\&. For details on the
-use of NetBIOS scopes, see rfc1001\&.txt and rfc1002\&.txt\&. NetBIOS scopes
-are \fIvery\fP rarely used, only set this parameter if you are the
-system administrator in charge of all the NetBIOS systems you
-communicate with\&.
-.IP 
 .PP 
 .SH "FILES" 
 .PP 
@@ -329,7 +321,7 @@ Lastly, edit the configuration file to provide suitable services\&. To
 start with, the following two services should be all you need:
 .PP 
 
-.DS 
+.nf 
  
 
 
@@ -343,7 +335,7 @@ start with, the following two services should be all you need:
  public = yes
 
 
-.DE 
+.fi 
  
 
 .PP 
@@ -423,7 +415,7 @@ http://samba\&.org/cifs/\&.
 .SH "AUTHOR" 
 .PP 
 The original Samba software and related utilities were created by
-Andrew Tridgell \fIsamba-bugs@samba\&.org\fP\&. 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\&.
 .PP 
@@ -432,7 +424,7 @@ sources were converted to YODL format (another excellent piece of Open
 Source software, available at
 \fBftp://ftp\&.icce\&.rug\&.nl/pub/unix/\fP)
 and updated for the Samba2\&.0 release by Jeremy Allison\&.
-\fIsamba-bugs@samba\&.org\fP\&.
+samba@samba\&.org\&.
 .PP 
 See \fBsamba (7)\fP 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/manpages/smbpasswd.5 b/docs/manpages/smbpasswd.5
index e3fbcf161ee..bc87d134d23 100644
--- a/docs/manpages/smbpasswd.5
+++ b/docs/manpages/smbpasswd.5
@@ -166,14 +166,14 @@ Samba \f(CWbin/\fP directory (the same place that the \fBsmbd\fP
 and \fBnmbd\fP binaries are installed) as follows:
 .PP 
 
-.DS 
+.nf 
  
 
 
     cat old_smbpasswd_file | convert_smbpasswd > new_smbpasswd_file
 
 
-.DE 
+.fi 
  
 
 .PP 
@@ -198,7 +198,7 @@ algorithm\&.
 .SH "AUTHOR" 
 .PP 
 The original Samba software and related utilities were created by
-Andrew Tridgell \fIsamba-bugs@samba\&.org\fP\&. 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\&.
 .PP 
@@ -207,7 +207,7 @@ sources were converted to YODL format (another excellent piece of Open
 Source software, available at
 \fBftp://ftp\&.icce\&.rug\&.nl/pub/unix/\fP) 
 and updated for the Samba2\&.0 release by Jeremy
-Allison, \fIsamba-bugs@samba\&.org\fP\&.
+Allison, samba@samba\&.org\&.
 .PP 
 See \fBsamba (7)\fP to find out how to get a full
 list of contributors and details on how to submit bug reports,
diff --git a/docs/manpages/smbpasswd.8 b/docs/manpages/smbpasswd.8
index ad502e01b12..be70fad031d 100644
--- a/docs/manpages/smbpasswd.8
+++ b/docs/manpages/smbpasswd.8
@@ -5,7 +5,7 @@ smbpasswd \- change a users SMB password
 .PP 
 .SH "SYNOPSIS" 
 .PP 
-\fBsmbpasswd\fP [-a] [-d] [-e] [-D debug level] [-n] [-r remote_machine] [-R name resolve order] [-m] [-j DOMAIN] [-U username] [-h] [-s] username
+\fBsmbpasswd\fP [-a] [-x] [-d] [-e] [-D debug level] [-n] [-r remote_machine] [-R name resolve order] [-m] [-j DOMAIN] [-U username] [-h] [-s] username
 .PP 
 .SH "DESCRIPTION" 
 .PP 
@@ -62,6 +62,13 @@ else the request to add the user will fail\&.
 This option is only available when running \fBsmbpasswd\fP as
 root\&.
 .IP 
+.IP "\fB-x\fP" 
+This option specifies that the username following should
+be deleted from the local \fBsmbpasswd\fP file\&.
+.IP 
+This option is only available when running \fBsmbpasswd\fP as
+root\&.
+.IP 
 .IP "\fB-d\fP" 
 This option specifies that the username following should be
 \fIdisabled\fP in the local \fBsmbpasswd\fP file\&.
@@ -199,7 +206,7 @@ being used as an NT Primary Domain Controller\&. PDC support is not a
 supported feature in Samba2\&.0 but will become supported in a later
 release\&. If you wish to know more about using Samba as an NT PDC then
 please subscribe to the mailing list
-\fIsamba-ntdom@samba\&.org\fP\&.
+samba-ntdom@samba\&.org\&.
 .IP 
 This option is only available when running \fBsmbpasswd\fP as root\&.
 .IP 
@@ -285,7 +292,7 @@ This man page is correct for version 2\&.0 of the Samba suite\&.
 .SH "AUTHOR" 
 .IP 
 The original Samba software and related utilities were created by
-Andrew Tridgell \fIsamba-bugs@samba\&.org\fP\&. 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\&.
 .IP 
@@ -294,7 +301,7 @@ sources were converted to YODL format (another excellent piece of Open
 Source software, available at
 \fBftp://ftp\&.icce\&.rug\&.nl/pub/unix/\fP)
 and updated for the Samba2\&.0 release by Jeremy Allison\&.
-\fIsamba-bugs@samba\&.org\fP\&.
+samba@samba\&.org\&.
 .IP 
 See \fBsamba (7)\fP to find out how to get a full
 list of contributors and details on how to submit bug reports,
diff --git a/docs/manpages/smbrun.1 b/docs/manpages/smbrun.1
index d34b408d6bd..24d6efdfcd9 100644
--- a/docs/manpages/smbrun.1
+++ b/docs/manpages/smbrun.1
@@ -53,7 +53,7 @@ This man page is correct for version 2\&.0 of the Samba suite\&.
 .SH "AUTHOR" 
 .PP 
 The original Samba software and related utilities were created by
-Andrew Tridgell \fIsamba-bugs@samba\&.org\fP\&. 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\&.
 .PP 
@@ -62,7 +62,7 @@ sources were converted to YODL format (another excellent piece of Open
 Source software, available at
 \fBftp://ftp\&.icce\&.rug\&.nl/pub/unix/\fP)
 and updated for the Samba2\&.0 release by Jeremy Allison\&.
-\fIsamba-bugs@samba\&.org\fP\&.
+samba@samba\&.org\&.
 .PP 
 See \fBsamba (7)\fP to find out how to get a full
 list of contributors and details on how to submit bug reports,
diff --git a/docs/manpages/smbstatus.1 b/docs/manpages/smbstatus.1
index 7899344d7fb..ac7cba7149d 100644
--- a/docs/manpages/smbstatus.1
+++ b/docs/manpages/smbstatus.1
@@ -59,7 +59,7 @@ This man page is correct for version 2\&.0 of the Samba suite\&.
 .SH "AUTHOR" 
 .PP 
 The original Samba software and related utilities were created by
-Andrew Tridgell \fIsamba-bugs@samba\&.org\fP\&. 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\&.
 .PP 
@@ -68,7 +68,7 @@ sources were converted to YODL format (another excellent piece of Open
 Source software, available at
 \fBftp://ftp\&.icce\&.rug\&.nl/pub/unix/\fP)
 and updated for the Samba2\&.0 release by Jeremy Allison\&.
-\fIsamba-bugs@samba\&.org\fP\&.
+samba@samba\&.org\&.
 .PP 
 See \fBsamba (7)\fP to find out how to get a full
 list of contributors and details on how to submit bug reports,
diff --git a/docs/manpages/smbtar.1 b/docs/manpages/smbtar.1
index 2aaa542231e..f7979b76b1e 100644
--- a/docs/manpages/smbtar.1
+++ b/docs/manpages/smbtar.1
@@ -105,19 +105,19 @@ the \fBsmbclient\fP command\&.
 .SH "AUTHOR" 
 .PP 
 The original Samba software and related utilities were created by
-Andrew Tridgell \fIsamba-bugs@samba\&.org\fP\&. 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\&.
 .PP 
-Ricky Poulten \fIpoultenr@logica\&.co\&.uk\fP wrote the tar extension and
+Ricky Poulten poultenr@logica\&.co\&.uk wrote the tar extension and
 this man page\&. The \fBsmbtar\fP script was heavily rewritten and
-improved by Martin Kraemer \fIMartin\&.Kraemer@mch\&.sni\&.de\fP\&. Many
+improved by Martin Kraemer Martin\&.Kraemer@mch\&.sni\&.de\&. Many
 thanks to everyone who suggested extensions, improvements, bug fixes,
 etc\&. The man page sources were converted to YODL format (another
 excellent piece of Open Source software available at
 \fBftp://ftp\&.icce\&.rug\&.nl/pub/unix/\fP)
 and updated for the Samba2\&.0 release by Jeremy Allison,
-\fIsamba-bugs@samba\&.org\fP\&.
+samba@samba\&.org\&.
 .PP 
 See \fBsamba (7)\fP to find out how to get a full
 list of contributors and details on how to submit bug reports,
diff --git a/docs/manpages/swat.8 b/docs/manpages/swat.8
index 8798c0a566e..3fc450f3854 100644
--- a/docs/manpages/swat.8
+++ b/docs/manpages/swat.8
@@ -49,14 +49,14 @@ swat binary and the various help files and images\&. A default install
 would put these in:
 .PP 
 
-.DS 
+.nf 
  
 
 /usr/local/samba/bin/swat
 /usr/local/samba/swat/images/*
 /usr/local/samba/swat/help/*
 
-.DE 
+.fi 
  
 
 .PP 
@@ -137,7 +137,7 @@ This man page is correct for version 2\&.0 of the Samba suite\&.
 .SH "AUTHOR" 
 .PP 
 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\&.
 .PP 
@@ -146,7 +146,7 @@ sources were converted to YODL format (another excellent piece of Open
 Source software, available at
 \fBftp://ftp\&.icce\&.rug\&.nl/pub/unix/\fP)
 and updated for the Samba2\&.0 release by Jeremy Allison\&.
-\fIsamba-bugs@samba\&.org\fP\&.
+samba@samba\&.org\&.
 .PP 
 See \fBsamba (7)\fP to find out how to get a full
 list of contributors and details on how to submit bug reports,
diff --git a/docs/manpages/testparm.1 b/docs/manpages/testparm.1
index 2d4c03a1641..e02b8873943 100644
--- a/docs/manpages/testparm.1
+++ b/docs/manpages/testparm.1
@@ -88,7 +88,7 @@ This man page is correct for version 2\&.0 of the Samba suite\&.
 .SH "AUTHOR" 
 .PP 
 The original Samba software and related utilities were created by
-Andrew Tridgell \fIsamba-bugs@samba\&.org\fP\&. 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\&.
 .PP 
@@ -97,7 +97,7 @@ sources were converted to YODL format (another excellent piece of Open
 Source software, available at
 \fBftp://ftp\&.icce\&.rug\&.nl/pub/unix/\fP)
 and updated for the Samba2\&.0 release by Jeremy Allison\&.
-\fIsamba-bugs@samba\&.org\fP\&.
+samba@samba\&.org\&.
 .PP 
 See \fBsamba (7)\fP to find out how to get a full
 list of contributors and details on how to submit bug reports,
diff --git a/docs/manpages/testprns.1 b/docs/manpages/testprns.1
index bb366e329c3..a9753d7637c 100644
--- a/docs/manpages/testprns.1
+++ b/docs/manpages/testprns.1
@@ -71,7 +71,7 @@ Other messages are self-explanatory\&.
 .SH "AUTHOR" 
 .PP 
 The original Samba software and related utilities were created by
-Andrew Tridgell \fIsamba-bugs@samba\&.org\fP\&. 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\&.
 .PP 
@@ -80,7 +80,7 @@ sources were converted to YODL format (another excellent piece of Open
 Source software, available at
 \fBftp://ftp\&.icce\&.rug\&.nl/pub/unix/\fP)
 and updated for the Samba2\&.0 release by Jeremy Allison\&.
-\fIsamba-bugs@samba\&.org\fP\&.
+samba@samba\&.org\&.
 .PP 
 See \fBsamba (7)\fP to find out how to get a full
 list of contributors and details on how to submit bug reports,
diff --git a/docs/manpages/winbindd.8 b/docs/manpages/winbindd.8
index 0b0c8b4019f..e35fe0815b4 100644
--- a/docs/manpages/winbindd.8
+++ b/docs/manpages/winbindd.8
@@ -20,8 +20,10 @@ be configured throught the \f(CW/etc/nsswitch\&.conf\fP file\&.  Users and group
 are allocated as they are resolved to a range of user and group ids
 specified by the administrator of the Samba system\&.  
 .PP 
-The service provided by \fBwinbindd\fP is called `winbind\' and can be used to
-resolve user and group information from a Windows NT server\&.  
+The service provided by \fBwinbindd\fP is called `winbind\' and can be
+used to resolve user and group information from a Windows NT server\&.
+The service can also provide authentication services via an associated
+PAM module\&.
 .PP 
 The following nsswitch databases are implemented by the \fBwinbindd\fP
 service:
@@ -43,9 +45,16 @@ For example, the following simple configuration in the
 information from \f(CW/etc/passwd\fP and \f(CW/etc/group\fP and then from the
 Windows NT server\&.
 .PP 
-\f(CWpasswd:         files winbind\fP
-.PP 
-\f(CWgroup:          files winbind\fP
+
+.nf 
+ 
+
+  passwd:         files winbind
+  group:          files winbind
+
+.fi 
+ 
+
 .PP 
 .SH "OPTIONS" 
 .PP 
@@ -91,6 +100,23 @@ should be specified in the [global] section of
 \fBsmb\&.conf\fP\&.
 .PP 
 .IP 
+.IP "winbind separator" 
+.IP 
+The winbind separator option allows you to specify how NT domain names
+and user names are combined into unix user names when presented to
+users\&. By default winbind will use the traditional \e separator so
+that the unix user names look like DOMAIN\eusername\&. In some cases
+this separator character may cause problems as the \e character has
+special meaning in unix shells\&. In that case you can use the winbind
+separator option to specify an alternative sepataror character\&. Good
+alternatives may be / (although that conflicts with the unix directory
+separator) or a + character\&. The + character appears to be the best
+choice for 100% compatibility with existing unix utilities, but may be
+an aesthetically bad choice depending on your taste\&.
+.IP 
+\fBExample:\fP
+\f(CW     winbind separator = +\fP
+.IP 
 .IP "winbind uid" 
 .IP 
 The winbind uid parameter specifies the range of user ids that are
@@ -121,10 +147,17 @@ conflicts can occur otherwise\&.
 .IP 
 This parameter specifies the number of seconds the
 \fBwinbindd\fP daemon will cache user and group
-information before querying a Windows NT server again\&.
+information before querying a Windows NT server again\&. When a item in
+the cache is older than this time winbindd will ask the domain
+controller for the sequence number of the servers account database\&. If
+the sequence number has not changed then the cached item is marked as
+valid for a further "winbind cache time" seconds\&.  Otherwise the item
+is fetched from the server\&. This means that as long as the account
+database is not actively changing winbindd will only have to send one
+sequence number query packet every "winbind cache time" seconds\&.
 .IP 
 \fBDefault:\fP
-\f(CW     winbind cache type = 15\fP
+\f(CW     winbind cache time = 15\fP
 .IP 
 .IP "template homedir" 
 .IP 
@@ -141,14 +174,116 @@ is present it is substituted with the user\'s Windows NT user name\&.
 .IP 
 When filling out the user information for a Windows NT user, the
 \fBwinbindd\fP daemon uses this parameter to fill in
-the home directory for that user\&.  If the string \f(CW%D\fP is present it is
-substituted with the user\'s Windows NT domain name\&.  If the string \f(CW%U\fP
-is present it is substituted with the user\'s Windows NT user name\&.
+the shell for that user\&.  
 .IP 
 \fBDefault:\fP
-\f(CW     template homedir = /home/%D/%U\fP
+\f(CW     template shell = /bin/false\fP
 .IP 
 .PP 
+.SH "EXAMPLE SETUP" 
+.PP 
+To setup winbindd for user and group lookups plus authentication from
+a domain controller use something like the following setup\&. This was
+tested on a RedHat 6\&.2 Linux box\&.
+.PP 
+In /etc/nsswitch\&.conf put the following:
+
+.nf 
+ 
+
+   passwd:     files winbind
+   group:      files winbind
+
+.fi 
+ 
+
+.PP 
+In /etc/pam\&.d/* replace the auth lines with something like this:
+
+.nf 
+ 
+
+	auth       required	/lib/security/pam_securetty\&.so
+	auth       required	/lib/security/pam_nologin\&.so
+	auth       sufficient	/lib/security/pam_winbind\&.so
+	auth       required     /lib/security/pam_pwdb\&.so use_first_pass shadow nullok
+
+.fi 
+ 
+
+.PP 
+Note in particular the use of the sufficient keyword and the
+use_first_pass keyword\&.
+.PP 
+Now replace the account lines with this:
+
+.nf 
+ 
+
+	account    required	/lib/security/pam_winbind\&.so
+
+.fi 
+ 
+
+.PP 
+The next step is to join the domain\&. To do that use the samedit
+program like this:
+
+.nf 
+ 
+
+	samedit -S \'*\' -W DOMAIN -UAdministrator
+
+.fi 
+ 
+
+.PP 
+Then within samedit run the command:
+
+.nf 
+ 
+
+	createuser MACHINE$ -j DOMAIN -L
+
+.fi 
+ 
+
+.PP 
+This assumes your domain is called DOMAIN and your Samba workstation
+is called MACHINE\&.
+.PP 
+Next copy libnss_winbind\&.so\&.2 to /lib and pam_winbind\&.so to
+/lib/security\&.
+.PP 
+Finally, setup a smb\&.conf containing directives like the following:
+
+.nf 
+ 
+
+  [global]
+        winbind separator = +
+        winbind cache time = 10
+        template shell = /bin/bash
+        template homedir = /home/%D/%U
+        winbind uid = 10000-20000
+        winbind gid = 10000-20000
+        workgroup = DOMAIN
+        security = domain
+        password server = *
+
+.fi 
+ 
+
+.PP 
+Now start winbindd and you should find that your user and group
+database is expanded to include your NT users and groups, and that you
+can login to your unix box as a domain user, using the DOMAIN+user
+syntax for the username\&. You may wish to use the commands "getent
+passwd" and "getent group" to confirm the correct operation of
+winbindd\&. 
+.PP 
+NOTE: nmbd must be running on the local machine for winbindd to work\&.
+.PP 
 .SH "FILES" 
 .PP 
 The following files are relevant to the operation of the \fBwinbindd\fP
@@ -192,8 +327,7 @@ Storage for cached user and group information\&.
 .SH "AUTHOR" 
 .PP 
 The original Samba software and related utilities were created by
-Andrew Tridgell samba-bugs@samba\&.org\&. Samba is now developed
-by the Samba Team as an Open Source project similar to the way the
-Linux kernel is developed\&.
+Andrew Tridgell\&. Samba is now developed by the Samba Team as an Open
+Source project\&.
 .PP 
 Winbindd was written by Tim Potter\&.