last minute doc update. Doh!

2 files changed, 263 insertions, 306 deletions

diff --git a/docs/htmldocs/Samba-HOWTO-Collection.html b/docs/htmldocs/Samba-HOWTO-Collection.html
index 94622622cf4..d6c92a65cab 100644
--- a/docs/htmldocs/Samba-HOWTO-Collection.html
+++ b/docs/htmldocs/Samba-HOWTO-Collection.html
@@ -878,29 +878,29 @@ HREF="#AEN2015"
 ><DL
 ><DT
 >11.5.1. <A
-HREF="#AEN2020"
+HREF="#AEN2022"
 >Introduction</A
 ></DT
 ><DT
 >11.5.2. <A
-HREF="#AEN2033"
+HREF="#AEN2035"
 >Requirements</A
 ></DT
 ><DT
 >11.5.3. <A
-HREF="#AEN2047"
+HREF="#AEN2049"
 >Testing Things Out</A
 ></DT
 ><DD
 ><DL
 ><DT
 >11.5.3.1. <A
-HREF="#AEN2058"
+HREF="#AEN2060"
 >Configure and compile SAMBA</A
 ></DT
 ><DT
 >11.5.3.2. <A
-HREF="#AEN2077"
+HREF="#AEN2079"
 >Configure <TT
 CLASS="FILENAME"
 >nsswitch.conf</TT
@@ -909,22 +909,22 @@ winbind libraries</A
 ></DT
 ><DT
 >11.5.3.3. <A
-HREF="#AEN2102"
+HREF="#AEN2104"
 >Configure smb.conf</A
 ></DT
 ><DT
 >11.5.3.4. <A
-HREF="#AEN2118"
+HREF="#AEN2120"
 >Join the SAMBA server to the PDC domain</A
 ></DT
 ><DT
 >11.5.3.5. <A
-HREF="#AEN2129"
+HREF="#AEN2131"
 >Start up the winbindd daemon and test it!</A
 ></DT
 ><DT
 >11.5.3.6. <A
-HREF="#AEN2165"
+HREF="#AEN2167"
 >Fix the <TT
 CLASS="FILENAME"
 >/etc/rc.d/init.d/smb</TT
@@ -932,7 +932,7 @@ CLASS="FILENAME"
 ></DT
 ><DT
 >11.5.3.7. <A
-HREF="#AEN2187"
+HREF="#AEN2189"
 >Configure Winbind and PAM</A
 ></DT
 ></DL
@@ -941,12 +941,12 @@ HREF="#AEN2187"
 ></DD
 ><DT
 >11.6. <A
-HREF="#AEN2234"
+HREF="#AEN2236"
 >Limitations</A
 ></DT
 ><DT
 >11.7. <A
-HREF="#AEN2244"
+HREF="#AEN2246"
 >Conclusion</A
 ></DT
 ></DL
@@ -960,32 +960,32 @@ HREF="#OS2"
 ><DL
 ><DT
 >12.1. <A
-HREF="#AEN2258"
+HREF="#AEN2260"
 >FAQs</A
 ></DT
 ><DD
 ><DL
 ><DT
 >12.1.1. <A
-HREF="#AEN2260"
+HREF="#AEN2262"
 >How can I configure OS/2 Warp Connect or 
 		OS/2 Warp 4 as a client for Samba?</A
 ></DT
 ><DT
 >12.1.2. <A
-HREF="#AEN2275"
+HREF="#AEN2277"
 >How can I configure OS/2 Warp 3 (not Connect), 
 		OS/2 1.2, 1.3 or 2.x for Samba?</A
 ></DT
 ><DT
 >12.1.3. <A
-HREF="#AEN2284"
+HREF="#AEN2286"
 >Are there any other issues when OS/2 (any version) 
 		is used as a client?</A
 ></DT
 ><DT
 >12.1.4. <A
-HREF="#AEN2288"
+HREF="#AEN2290"
 >How do I get printer driver download working 
 		for OS/2 clients?</A
 ></DT
@@ -1002,24 +1002,24 @@ HREF="#CVS-ACCESS"
 ><DL
 ><DT
 >13.1. <A
-HREF="#AEN2304"
+HREF="#AEN2306"
 >Introduction</A
 ></DT
 ><DT
 >13.2. <A
-HREF="#AEN2309"
+HREF="#AEN2311"
 >CVS Access to samba.org</A
 ></DT
 ><DD
 ><DL
 ><DT
 >13.2.1. <A
-HREF="#AEN2312"
+HREF="#AEN2314"
 >Access via CVSweb</A
 ></DT
 ><DT
 >13.2.2. <A
-HREF="#AEN2317"
+HREF="#AEN2319"
 >Access via cvs</A
 ></DT
 ></DL
@@ -1028,7 +1028,7 @@ HREF="#AEN2317"
 ></DD
 ><DT
 ><A
-HREF="#AEN2345"
+HREF="#AEN2347"
 >Index</A
 ></DT
 ></DL
@@ -9535,12 +9535,20 @@ for providing the HOWTO for this section.</P
 >This HOWTO describes how to get winbind services up and running 
 to control access and authenticate users on your Linux box using 
 the winbind services which come with SAMBA 2.2.2.</P
+><P
+>There is also some Solaris specific information in 
+<TT
+CLASS="FILENAME"
+>docs/textdocs/Solaris-Winbind-HOWTO.txt</TT
+>.
+Future revisions of this document will incorporate that
+information.</P
 ><DIV
 CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2020"
+NAME="AEN2022"
 >11.5.1. Introduction</A
 ></H2
 ><P
@@ -9591,7 +9599,7 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2033"
+NAME="AEN2035"
 >11.5.2. Requirements</A
 ></H2
 ><P
@@ -9649,7 +9657,7 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2047"
+NAME="AEN2049"
 >11.5.3. Testing Things Out</A
 ></H2
 ><P
@@ -9694,7 +9702,7 @@ CLASS="SECT3"
 ><HR><H3
 CLASS="SECT3"
 ><A
-NAME="AEN2058"
+NAME="AEN2060"
 >11.5.3.1. Configure and compile SAMBA</A
 ></H3
 ><P
@@ -9769,7 +9777,7 @@ CLASS="SECT3"
 ><HR><H3
 CLASS="SECT3"
 ><A
-NAME="AEN2077"
+NAME="AEN2079"
 >11.5.3.2. Configure <TT
 CLASS="FILENAME"
 >nsswitch.conf</TT
@@ -9859,7 +9867,7 @@ CLASS="SECT3"
 ><HR><H3
 CLASS="SECT3"
 ><A
-NAME="AEN2102"
+NAME="AEN2104"
 >11.5.3.3. Configure smb.conf</A
 ></H3
 ><P
@@ -9943,7 +9951,7 @@ CLASS="SECT3"
 ><HR><H3
 CLASS="SECT3"
 ><A
-NAME="AEN2118"
+NAME="AEN2120"
 >11.5.3.4. Join the SAMBA server to the PDC domain</A
 ></H3
 ><P
@@ -9989,7 +9997,7 @@ CLASS="SECT3"
 ><HR><H3
 CLASS="SECT3"
 ><A
-NAME="AEN2129"
+NAME="AEN2131"
 >11.5.3.5. Start up the winbindd daemon and test it!</A
 ></H3
 ><P
@@ -10130,7 +10138,7 @@ CLASS="SECT3"
 ><HR><H3
 CLASS="SECT3"
 ><A
-NAME="AEN2165"
+NAME="AEN2167"
 >11.5.3.6. Fix the <TT
 CLASS="FILENAME"
 >/etc/rc.d/init.d/smb</TT
@@ -10260,7 +10268,7 @@ CLASS="SECT3"
 ><HR><H3
 CLASS="SECT3"
 ><A
-NAME="AEN2187"
+NAME="AEN2189"
 >11.5.3.7. Configure Winbind and PAM</A
 ></H3
 ><P
@@ -10482,7 +10490,7 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2234"
+NAME="AEN2236"
 >11.6. Limitations</A
 ></H1
 ><P
@@ -10523,7 +10531,7 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2244"
+NAME="AEN2246"
 >11.7. Conclusion</A
 ></H1
 ><P
@@ -10547,7 +10555,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2258"
+NAME="AEN2260"
 >12.1. FAQs</A
 ></H1
 ><DIV
@@ -10555,7 +10563,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2260"
+NAME="AEN2262"
 >12.1.1. How can I configure OS/2 Warp Connect or 
 		OS/2 Warp 4 as a client for Samba?</A
 ></H2
@@ -10614,7 +10622,7 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2275"
+NAME="AEN2277"
 >12.1.2. How can I configure OS/2 Warp 3 (not Connect), 
 		OS/2 1.2, 1.3 or 2.x for Samba?</A
 ></H2
@@ -10667,7 +10675,7 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2284"
+NAME="AEN2286"
 >12.1.3. Are there any other issues when OS/2 (any version) 
 		is used as a client?</A
 ></H2
@@ -10689,7 +10697,7 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2288"
+NAME="AEN2290"
 >12.1.4. How do I get printer driver download working 
 		for OS/2 clients?</A
 ></H2
@@ -10745,7 +10753,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2304"
+NAME="AEN2306"
 >13.1. Introduction</A
 ></H1
 ><P
@@ -10767,7 +10775,7 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2309"
+NAME="AEN2311"
 >13.2. CVS Access to samba.org</A
 ></H1
 ><P
@@ -10780,7 +10788,7 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2312"
+NAME="AEN2314"
 >13.2.1. Access via CVSweb</A
 ></H2
 ><P
@@ -10801,7 +10809,7 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2317"
+NAME="AEN2319"
 >13.2.2. Access via cvs</A
 ></H2
 ><P
@@ -10907,7 +10915,7 @@ CLASS="COMMAND"
 ></DIV
 ><HR><H1
 ><A
-NAME="AEN2345"
+NAME="AEN2347"
 >Index</A
 ></H1
 ><DL
diff --git a/docs/htmldocs/smb.conf.5.html b/docs/htmldocs/smb.conf.5.html
index 9fe350570ff..5663fa89446 100644
--- a/docs/htmldocs/smb.conf.5.html
+++ b/docs/htmldocs/smb.conf.5.html
@@ -862,18 +862,6 @@ NAME="AEN254"
 ><LI
 ><P
 ><A
-HREF="#ABORTSHUTDOWNSCRIPT"
-><TT
-CLASS="PARAMETER"
-><I
->abort shutdown script</I
-></TT
-></A
-></P
-></LI
-><LI
-><P
-><A
 HREF="#ADDPRINTERCOMMAND"
 ><TT
 CLASS="PARAMETER"
@@ -910,18 +898,6 @@ CLASS="PARAMETER"
 ><LI
 ><P
 ><A
-HREF="#ADDMACHINESCRIPT"
-><TT
-CLASS="PARAMETER"
-><I
->add machine script</I
-></TT
-></A
-></P
-></LI
-><LI
-><P
-><A
 HREF="#ALLOWTRUSTEDDOMAINS"
 ><TT
 CLASS="PARAMETER"
@@ -1606,6 +1582,30 @@ CLASS="PARAMETER"
 ><LI
 ><P
 ><A
+HREF="#LOCKSPINCOUNT"
+><TT
+CLASS="PARAMETER"
+><I
+>lock spin count</I
+></TT
+></A
+></P
+></LI
+><LI
+><P
+><A
+HREF="#LOCKSPINTIME"
+><TT
+CLASS="PARAMETER"
+><I
+>lock spin time</I
+></TT
+></A
+></P
+></LI
+><LI
+><P
+><A
 HREF="#PIDDIRECTORY"
 ><TT
 CLASS="PARAMETER"
@@ -2374,18 +2374,6 @@ CLASS="PARAMETER"
 ><LI
 ><P
 ><A
-HREF="#SHUTDOWNSCRIPT"
-><TT
-CLASS="PARAMETER"
-><I
->shutdown script</I
-></TT
-></A
-></P
-></LI
-><LI
-><P
-><A
 HREF="#SMBPASSWDFILE"
 ><TT
 CLASS="PARAMETER"
@@ -2962,6 +2950,18 @@ CLASS="PARAMETER"
 ><LI
 ><P
 ><A
+HREF="#WINBINDUSEDEFAULTDOMAIN"
+><TT
+CLASS="PARAMETER"
+><I
+>winbind use default domain</I
+></TT
+></A
+></P
+></LI
+><LI
+><P
+><A
 HREF="#WINSHOOK"
 ><TT
 CLASS="PARAMETER"
@@ -3601,6 +3601,18 @@ CLASS="PARAMETER"
 ><LI
 ><P
 ><A
+HREF="#INHERITACLS"
+><TT
+CLASS="PARAMETER"
+><I
+>inherit acls</I
+></TT
+></A
+></P
+></LI
+><LI
+><P
+><A
 HREF="#INHERITPERMISSIONS"
 ><TT
 CLASS="PARAMETER"
@@ -4503,7 +4515,7 @@ CLASS="PARAMETER"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN1470"
+NAME="AEN1474"
 ></A
 ><H2
 >EXPLANATION OF EACH PARAMETER</H2
@@ -4514,46 +4526,6 @@ CLASS="VARIABLELIST"
 ><DL
 ><DT
 ><A
-NAME="ABORTSHUTDOWNSCRIPT"
-></A
->abort shutdown script (G)</DT
-><DD
-><P
-><EM
->This parameter only exists in the HEAD cvs branch</EM
->
-		This a full path name to a script called by
-		<A
-HREF="smbd.8.html"
-TARGET="_top"
-><B
-CLASS="COMMAND"
->smbd(8)</B
-></A
->  that
-		should stop a shutdown procedure issued by the <A
-HREF="#SHUTDOWNSCRIPT"
-><TT
-CLASS="PARAMETER"
-><I
->shutdown script</I
-></TT
-></A
->.</P
-><P
->This command will be run as user.</P
-><P
->Default: <EM
->None</EM
->.</P
-><P
->Example: <B
-CLASS="COMMAND"
->abort shutdown script = /sbin/shutdown -c</B
-></P
-></DD
-><DT
-><A
 NAME="ADDPRINTERCOMMAND"
 ></A
 >add printer command (G)</DT
@@ -4862,37 +4834,6 @@ CLASS="COMMAND"
 ></DD
 ><DT
 ><A
-NAME="ADDMACHINESCRIPT"
-></A
->add machine script (G)</DT
-><DD
-><P
->This is the full pathname to a script that will 
-		be run by <A
-HREF="smbd.8.html"
-TARGET="_top"
->smbd(8)</A
->  when a machine is added
-                to it's domain using the administrator username and password method. </P
-><P
->This option is only required when using sam back-ends tied to the
-                Unix uid method of RID calculation such as smbpasswd.  This option is only
-                available in Samba 3.0.</P
-><P
->Default: <B
-CLASS="COMMAND"
->add machine script = &#60;empty string&#62;
-		</B
-></P
-><P
->Example: <B
-CLASS="COMMAND"
->add machine script = /usr/sbin/adduser -n -g machines -c Machine -d /dev/null -s /bin/false %u
-                </B
-></P
-></DD
-><DT
-><A
 NAME="ADDUSERSCRIPT"
 ></A
 >add user script (G)</DT
@@ -9366,6 +9307,28 @@ CLASS="COMMAND"
 ></DD
 ><DT
 ><A
+NAME="INHERITACLS"
+></A
+>inherit acls (S)</DT
+><DD
+><P
+>This parameter can be used to ensure
+		that if default acls exist on parent directories,
+		they are always honored when creating a subdirectory.
+		The default behavior is to use the mode specified
+		when creating the directory.  Enabling this option
+		sets the mode to 0777, thus guaranteeing that 
+		default directory acls are propagated.
+		</P
+><P
+>Default: <B
+CLASS="COMMAND"
+>inherit acls = no</B
+>
+		</P
+></DD
+><DT
+><A
 NAME="INHERITPERMISSIONS"
 ></A
 >inherit permissions (S)</DT
@@ -10384,6 +10347,56 @@ CLASS="COMMAND"
 ></DD
 ><DT
 ><A
+NAME="LOCKSPINCOUNT"
+></A
+>lock spin count (G)</DT
+><DD
+><P
+>This parameter controls the number of times
+		that smbd should attempt to gain a byte range lock on the 
+		behalf of a client request.  Experiments have shown that
+		Windows 2k servers do not reply with a failure if the lock
+		could not be immediately granted, but try a few more times
+		in case the lock could later be aquired.  This behavior
+		is used to support PC database formats such as MS Access
+		and FoxPro.
+		</P
+><P
+>Default: <B
+CLASS="COMMAND"
+>lock spin count = 2</B
+>
+		</P
+></DD
+><DT
+><A
+NAME="LOCKSPINTIME"
+></A
+>lock spin time (G)</DT
+><DD
+><P
+>The time in microseconds that smbd should 
+		pause before attempting to gain a failed lock.  See
+		<A
+HREF="#LOCKSPINCOUNT"
+><TT
+CLASS="PARAMETER"
+><I
+>lock spin 
+		count</I
+></TT
+></A
+> for more details.
+		</P
+><P
+>Default: <B
+CLASS="COMMAND"
+>lock spin time = 10</B
+>
+		</P
+></DD
+><DT
+><A
 NAME="LOCKING"
 ></A
 >locking (S)</DT
@@ -10913,8 +10926,8 @@ CLASS="COMMAND"
 		takes a printer name as its only parameter and outputs printer 
 		status information.</P
 ><P
->Currently eight styles of printer status information 
-		are supported; BSD, AIX, LPRNG, PLP, SYSV, HPUX, QNX and SOFTQ. 
+>Currently nine styles of printer status information 
+		are supported; BSD, AIX, LPRNG, PLP, SYSV, HPUX, QNX, CUPS, and SOFTQ. 
 		This covers most UNIX systems. You control which type is expected 
 		using the <TT
 CLASS="PARAMETER"
@@ -10948,7 +10961,15 @@ CLASS="PARAMETER"
 CLASS="ENVAR"
 >$PATH
 		</TT
-> may not be available to the server.</P
+> may not be available to the server.  When compiled with
+		the CUPS libraries, no <TT
+CLASS="PARAMETER"
+><I
+>lpq command</I
+></TT
+> is
+		needed because smbd will make a library call to obtain the 
+		print queue listing.</P
 ><P
 >See also the <A
 HREF="#PRINTING"
@@ -14231,34 +14252,23 @@ CLASS="COMMAND"
 		manually remove old spool files.</P
 ><P
 >The print command is simply a text string. It will be used 
-		verbatim, with two exceptions: All occurrences of <TT
-CLASS="PARAMETER"
-><I
->%s
-		</I
-></TT
-> and <TT
-CLASS="PARAMETER"
-><I
->%f</I
-></TT
-> will be replaced by the 
-		appropriate spool file name, and all occurrences of <TT
-CLASS="PARAMETER"
-><I
->%p
-		</I
-></TT
-> will be replaced by the appropriate printer name. The 
-		spool file name is generated automatically by the server.  The 
-		<TT
-CLASS="PARAMETER"
-><I
->%J</I
-></TT
-> macro can be used to access the job 
+		verbatim after macro substitutions have been made:</P
+><P
+>s, %p - the path to the spool
+		file name</P
+><P
+>%p - the appropriate printer 
+		name</P
+><P
+>%J - the job 
 		name as transmitted by the client.</P
 ><P
+>%c - The number of printed pages
+		of the spooled job (if known).</P
+><P
+>%z - the size of the spooled
+		print job (in bytes)</P
+><P
 >The print command <EM
 >MUST</EM
 > contain at least 
@@ -14365,6 +14375,25 @@ CLASS="COMMAND"
 >print command = lp -d%p -s %s; rm %s</B
 ></P
 ><P
+>For printing = CUPS :   If SAMBA is compiled against
+		libcups, then <A
+HREF="#PRINTING"
+>printcap = cups</A
+> 
+		uses the CUPS API to
+		submit jobs, etc.  Otherwise it maps to the System V
+		commands with the -oraw option for printing, i.e. it
+		uses <B
+CLASS="COMMAND"
+>lp -c -d%p -oraw; rm %s</B
+>.   
+		With <B
+CLASS="COMMAND"
+>printing = cups</B
+>,
+		and if SAMBA is compiled against libcups, any manually 
+		set print command will be ignored.</P
+><P
 >Example: <B
 CLASS="COMMAND"
 >print command = /usr/local/samba/bin/myprintscript
@@ -14459,7 +14488,18 @@ HREF="#AEN79"
 CLASS="COMMAND"
 >printcap name = cups
 		</B
->.</P
+>. This should be supplemented by an addtional setting 
+		<A
+HREF="#PRINTING"
+>printing = cups</A
+> in the [global] 
+		section.  <B
+CLASS="COMMAND"
+>printcap name = cups</B
+> will use the  
+		"dummy" printcap created by CUPS, as specified in your CUPS
+		configuration file.
+		</P
 ><P
 >On System V systems that use <B
 CLASS="COMMAND"
@@ -16448,115 +16488,6 @@ CLASS="COMMAND"
 ></DD
 ><DT
 ><A
-NAME="SHUTDOWNSCRIPT"
-></A
->shutdown script (G)</DT
-><DD
-><P
-><EM
->This parameter only exists in the HEAD cvs branch</EM
->
-		This a full path name to a script called by
-		<A
-HREF="smbd.8.html"
-TARGET="_top"
-><B
-CLASS="COMMAND"
->smbd(8)</B
-></A
-> that
-		should start a shutdown procedure.</P
-><P
->This command will be run as the user connected to the
-		server.</P
-><P
->%m %t %r %f parameters are expanded</P
-><P
-><TT
-CLASS="PARAMETER"
-><I
->%m</I
-></TT
-> will be substituted with the
-		shutdown message sent to the server.</P
-><P
-><TT
-CLASS="PARAMETER"
-><I
->%t</I
-></TT
-> will be substituted with the
-		number of seconds to wait before effectively starting the
-		shutdown procedure.</P
-><P
-><TT
-CLASS="PARAMETER"
-><I
->%r</I
-></TT
-> will be substituted with the
-		switch <EM
->-r</EM
->. It means reboot after shutdown
-		for NT.
-		</P
-><P
-><TT
-CLASS="PARAMETER"
-><I
->%f</I
-></TT
-> will be substituted with the
-		switch <EM
->-f</EM
->. It means force the shutdown
-		even if applications do not respond for NT.</P
-><P
->Default: <EM
->None</EM
->.</P
-><P
->Example: <B
-CLASS="COMMAND"
->abort shutdown script = /usr/local/samba/sbin/shutdown %m %t %r %f</B
-></P
-><P
->Shutdown script example:
-		<TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="90%"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->		#!/bin/bash
-		
-		$time=0
-		let "time/60"
-		let "time++"
-
-		/sbin/shutdown $3 $4 +$time $1 &#38;
-		</PRE
-></TD
-></TR
-></TABLE
->
-		Shutdown does not return so we need to launch it in background.
-		</P
-><P
->See also <A
-HREF="#ABORTSHUTDOWNSCRIPT"
-><TT
-CLASS="PARAMETER"
-><I
->abort shutdown script</I
-></TT
-></A
->.</P
-></DD
-><DT
-><A
 NAME="SMBPASSWDFILE"
 ></A
 >smb passwd file (G)</DT
@@ -18871,7 +18802,7 @@ CLASS="COMMAND"
 ><A
 NAME="WINBINDCACHETIME"
 ></A
->winbind cache time</DT
+>winbind cache time (G)</DT
 ><DD
 ><P
 >This parameter specifies the number of seconds the
@@ -18892,8 +18823,7 @@ CLASS="COMMAND"
 ><A
 NAME="WINBINDENUMUSERS"
 ></A
->winbind enum
-		users</DT
+>winbind enum users (G)</DT
 ><DD
 ><P
 >On large installations using
@@ -18944,8 +18874,7 @@ CLASS="COMMAND"
 ><A
 NAME="WINBINDENUMGROUPS"
 ></A
->winbind enum
-		groups</DT
+>winbind enum groups (G)</DT
 ><DD
 ><P
 >On large installations using
@@ -18995,7 +18924,7 @@ CLASS="COMMAND"
 ><A
 NAME="WINBINDGID"
 ></A
->winbind gid</DT
+>winbind gid (G)</DT
 ><DD
 ><P
 >The winbind gid parameter specifies the range of group 
@@ -19022,7 +18951,7 @@ CLASS="COMMAND"
 ><A
 NAME="WINBINDSEPARATOR"
 ></A
->winbind separator</DT
+>winbind separator (G)</DT
 ><DD
 ><P
 >This parameter allows an admin to define the character 
@@ -19052,21 +18981,21 @@ CLASS="FILENAME"
 		with group membership at least on glibc systems, as the character +
 		is used as a special character for NIS in /etc/group.</P
 ><P
->Example: <B
+>Default: <B
 CLASS="COMMAND"
->winbind separator = \\</B
+>winbind separator = '\'</B
 ></P
 ><P
 >Example: <B
 CLASS="COMMAND"
->winbind separator = /</B
+>winbind separator = +</B
 ></P
 ></DD
 ><DT
 ><A
 NAME="WINBINDUID"
 ></A
->winbind uid</DT
+>winbind uid (G)</DT
 ><DD
 ><P
 >The winbind gid parameter specifies the range of group 
@@ -19091,6 +19020,26 @@ CLASS="COMMAND"
 ></DD
 ><DT
 ><A
+NAME="WINBINDUSEDEFAULTDOMAIN"
+></A
+>winbind use default domain (G)</DT
+><DD
+><P
+>This option controls whether or not smbd
+		should lookup 'username' as 'DOMAIN\username' when winbindd is
+		running on a system.  This is most useful when used in conjunction
+		with pam_winbind.so to prevent a Windows user from having to enter
+		commands like "ssh 'DOMAIN\username@hostname'".  This option is disabled 
+		by default, thus requiring that the DOMAIN\username format be used.</P
+><P
+>Default: <B
+CLASS="COMMAND"
+>winbind use default domain = no</B
+>
+		</P
+></DD
+><DT
+><A
 NAME="WINSHOOK"
 ></A
 >wins hook (G)</DT
@@ -19458,7 +19407,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN6147"
+NAME="AEN6134"
 ></A
 ><H2
 >WARNINGS</H2
@@ -19488,7 +19437,7 @@ TARGET="_top"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN6153"
+NAME="AEN6140"
 ></A
 ><H2
 >VERSION</H2
@@ -19499,7 +19448,7 @@ NAME="AEN6153"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN6156"
+NAME="AEN6143"
 ></A
 ><H2
 >SEE ALSO</H2
@@ -19578,7 +19527,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN6176"
+NAME="AEN6163"
 ></A
 ><H2
 >AUTHOR</H2