updated the 3.0 branch from the head branch - ready for alpha18

(This used to be commit 03ac082dcb375b6f3ca3d810a6a6367542bc23ce)

11 files changed, 629 insertions, 592 deletions

diff --git a/docs/docbook/manpages/nmbd.8.sgml b/docs/docbook/manpages/nmbd.8.sgml
index 46f36834df..d5c89064e7 100644
--- a/docs/docbook/manpages/nmbd.8.sgml
+++ b/docs/docbook/manpages/nmbd.8.sgml
@@ -177,13 +177,14 @@
 		<listitem><para>The -l parameter specifies a directory 
 		into which the "log.nmbd" log file will be created
 		for operational data from the running
-		<command>nmbd</command> server.</para>
-
-		<para>The default log directory is compiled into Samba
+		<command>nmbd</command> server. The default log directory is compiled into Samba
 		as part of the build process. Common defaults are <filename>
 		/usr/local/samba/var/log.nmb</filename>, <filename>
 		/usr/samba/var/log.nmb</filename> or
-		<filename>/var/log/log.nmb</filename>.</para></listitem>
+		<filename>/var/log/log.nmb</filename>.  <emphasis>Beware:</emphasis>
+                If the directory specified does not exist, <command>nmbd</command>
+                will log to the default debug log location defined at compile time.
+		</para></listitem>
 		</varlistentry>
 		
 		
@@ -198,25 +199,25 @@
 		<filename>smb.conf</filename>.</para></listitem>
 		</varlistentry>
 
-		
+
 		<varlistentry>
 		<term>-p &lt;UDP port number&gt;</term>
 		<listitem><para>UDP port number is a positive integer value.
-		This option changes the default UDP port number (normally 137) 
-		that <command>nmbd</command> responds to name queries on. Don't 
-		use this option unless you are an expert, in which case you 
+		This option changes the default UDP port number (normally 137)
+		that <command>nmbd</command> responds to name queries on. Don't
+		use this option unless you are an expert, in which case you
 		won't need help!</para></listitem>
 		</varlistentry>
-		
+
 		<varlistentry>
 		<term>-s &lt;configuration file&gt;</term>
-		<listitem><para>The default configuration file name 
+		<listitem><para>The default configuration file name
 		is set at build time, typically as <filename>
 		/usr/local/samba/lib/smb.conf</filename>, but
 		this may be changed when Samba is autoconfigured.</para>
 
-		<para>The file specified contains the configuration details 
-		required by the server. See <ulink url="smb.conf.5.html"> 
+		<para>The file specified contains the configuration details
+		required by the server. See <ulink url="smb.conf.5.html">
 		<filename>smb.conf(5)</filename></ulink> for more information.
 		</para></listitem>
 		</varlistentry>
@@ -229,55 +230,55 @@
 	<variablelist>
 		<varlistentry>
 		<term><filename>/etc/inetd.conf</filename></term>
-		<listitem><para>If the server is to be run by the 
-		<command>inetd</command> meta-daemon, this file 
-		must contain suitable startup information for the 
+		<listitem><para>If the server is to be run by the
+		<command>inetd</command> meta-daemon, this file
+		must contain suitable startup information for the
 		meta-daemon. See the <ulink
 		url="UNIX_INSTALL.html">UNIX_INSTALL.html</ulink> document
 		for details.
 		</para></listitem>
 		</varlistentry>
-		
+
 		<varlistentry>
 		<term><filename>/etc/rc</filename></term>
-		<listitem><para>or whatever initialization script your 
+		<listitem><para>or whatever initialization script your
 		system uses).</para>
 
-		<para>If running the server as a daemon at startup, 
-		this file will need to contain an appropriate startup 
+		<para>If running the server as a daemon at startup,
+		this file will need to contain an appropriate startup
 		sequence for the server. See the <ulink
 		url="UNIX_INSTALL.html">UNIX_INSTALL.html</ulink> document
 		for details.</para></listitem>
 		</varlistentry>
-		
+
 		<varlistentry>
 		<term><filename>/etc/services</filename></term>
-		<listitem><para>If running the server via the 
-		meta-daemon <command>inetd</command>, this file 
-		must contain a mapping of service name (e.g., netbios-ssn) 
-		to service port (e.g., 139) and protocol type (e.g., tcp). 
+		<listitem><para>If running the server via the
+		meta-daemon <command>inetd</command>, this file
+		must contain a mapping of service name (e.g., netbios-ssn)
+		to service port (e.g., 139) and protocol type (e.g., tcp).
 		See the <ulink url="UNIX_INSTALL.html">UNIX_INSTALL.html</ulink>
 		document for details.</para></listitem>
 		</varlistentry>
-		
+
 		<varlistentry>
 		<term><filename>/usr/local/samba/lib/smb.conf</filename></term>
-		<listitem><para>This is the default location of the 
+		<listitem><para>This is the default location of the
 		<ulink url="smb.conf.5.html"><filename>smb.conf</filename></ulink>
-		server configuration file. Other common places that systems 
-		install this file are <filename>/usr/samba/lib/smb.conf</filename> 
+		server configuration file. Other common places that systems
+		install this file are <filename>/usr/samba/lib/smb.conf</filename>
 		and <filename>/etc/smb.conf</filename>.</para>
-		
-		<para>When run as a WINS server (see the 
+
+		<para>When run as a WINS server (see the
 		<ulink url="smb.conf.5.html#WINSSUPPORT">wins support</ulink>
 		parameter in the <filename>smb.conf(5)</filename> man page),
 		<command>nmbd</command>
-		will store the WINS database in the file <filename>wins.dat</filename> 
-		in the <filename>var/locks</filename> directory configured under 
+		will store the WINS database in the file <filename>wins.dat</filename>
+		in the <filename>var/locks</filename> directory configured under
 		wherever Samba was configured to install itself.</para>
 
 		<para>If <command>nmbd</command> is acting as a <emphasis>
-		browse master</emphasis> (see the <ulink 
+		browse master</emphasis> (see the <ulink
 		url="smb.conf.5.html#LOCALMASTER">local master</ulink>
 		parameter in the <filename>smb.conf(5)</filename> man page,
 		<command>nmbd</command>
@@ -292,20 +293,20 @@
 <refsect1>
 	<title>SIGNALS</title>
 
-	<para>To shut down an <command>nmbd</command> process it is recommended 
-	that SIGKILL (-9) <emphasis>NOT</emphasis> be used, except as a last 
-	resort, as this may leave the name database in an inconsistent state. 
-	The correct way to terminate <command>nmbd</command> is to send it 
+	<para>To shut down an <command>nmbd</command> process it is recommended
+	that SIGKILL (-9) <emphasis>NOT</emphasis> be used, except as a last
+	resort, as this may leave the name database in an inconsistent state.
+	The correct way to terminate <command>nmbd</command> is to send it
 	a SIGTERM (-15) signal and wait for it to die on its own.</para>
 
-	<para><command>nmbd</command> will accept SIGHUP, which will cause 
+	<para><command>nmbd</command> will accept SIGHUP, which will cause
 	it to dump out its namelists into the file <filename>namelist.debug
-	</filename> in the <filename>/usr/local/samba/var/locks</filename> 
-	directory (or the <filename>var/locks</filename> directory configured 
-	under wherever Samba was configured to install itself). This will also 
+	</filename> in the <filename>/usr/local/samba/var/locks</filename>
+	directory (or the <filename>var/locks</filename> directory configured
+	under wherever Samba was configured to install itself). This will also
 	cause <command>nmbd</command> to dump out its server database in
 	the <filename>log.nmb</filename> file.</para>
-	
+
 	<para>The debug log level of nmbd may be raised or lowered using
 	<ulink url="smbcontrol.1.html"><command>smbcontrol(1)</command>
 	</ulink> (SIGUSR[1|2] signals are no longer used in Samba 2.2). This is
diff --git a/docs/docbook/manpages/pdbedit.8.sgml b/docs/docbook/manpages/pdbedit.8.sgml
index eeb1fb0d2c..3f6023d16f 100644
--- a/docs/docbook/manpages/pdbedit.8.sgml
+++ b/docs/docbook/manpages/pdbedit.8.sgml
@@ -27,7 +27,9 @@
 		<arg choice="opt">-a</arg>	
 		<arg choice="opt">-m</arg>	
 		<arg choice="opt">-x</arg>	
-		<arg choice="opt">-i file</arg>	
+		<arg choice="opt">-i passdb-backend</arg>	
+		<arg choice="opt">-e passdb-backend</arg>   
+		<arg choice="opt">-D debuglevel</arg>
 	</cmdsynopsis>
 </refsynopsisdiv>
 
@@ -233,18 +235,26 @@
 		
 
 		<varlistentry>
-		<term>-i file</term>
-		<listitem><para>This command is used to import a smbpasswd
-		file into the database.</para>
+		<term>-i passdb-backend</term>
+		<listitem><para>Use a different passdb backend to retrieve users than the one specified in smb.conf.</para>
 
-		<para>This option will ease migration from the plain smbpasswd
-		file database to more powerful backend databases like tdb and
-		ldap.</para>
+		<para>This option will ease migration from one passdb backend to another.
+		</para>
 
-		<para>Example: <command>pdbedit -i /etc/smbpasswd.old</command>
+		<para>Example: <command>pdbedit -i smbpasswd:/etc/smbpasswd.old -e tdbsam:/etc/samba/passwd.tdb</command>
 		</para>
 		</listitem>
 		</varlistentry>
+
+		<varlistentry>
+		<term>-e passdb-backend</term>
+		<listitem><para>Export all currently available users to the specified password database backend.</para>
+
+		<para>This option will ease migration from one passdb backend to another and will ease backupping</para>
+		
+		<para>Example: <command>pdbedit -e smbpasswd:/root/samba-users.backup</command></para>
+		</listitem>
+		</varlistentry>
 	</variablelist>
 </refsect1>
 
diff --git a/docs/docbook/manpages/rpcclient.1.sgml b/docs/docbook/manpages/rpcclient.1.sgml
index 9205439b01..f1ba474cfb 100644
--- a/docs/docbook/manpages/rpcclient.1.sgml
+++ b/docs/docbook/manpages/rpcclient.1.sgml
@@ -26,6 +26,7 @@
 		<arg choice="opt">-U username[%password]</arg>
 		<arg choice="opt">-W workgroup</arg>
 		<arg choice="opt">-N</arg>
+		<arg choice="opt">-I destinationIP</arg>
 		<arg choice="req">server</arg>
 	</cmdsynopsis>
 </refsynopsisdiv>
@@ -104,6 +105,23 @@
 		</varlistentry>
 
 
+		<varlistentry>
+		<term>-I IP-address</term>
+		<listitem><para><replaceable>IP address</replaceable> is the address of the server to connect to. 
+		It should be specified in standard "a.b.c.d" notation. </para>
+
+		<para>Normally the client would attempt to locate a named 
+		SMB/CIFS server by looking it up via the NetBIOS name resolution 
+		mechanism described above in the <parameter>name resolve order</parameter> 
+		parameter above. Using this parameter will force the client
+		to assume that the server is on the machine with the specified IP 
+		address and the NetBIOS name component of the resource being 
+		connected to will be ignored. </para>
+
+		<para>There is no default for this parameter. If not supplied, 
+		it will be determined automatically by the client as described 
+		above. </para></listitem>
+		</varlistentry>
 
 		
 		<varlistentry>
diff --git a/docs/docbook/manpages/smb.conf.5.sgml b/docs/docbook/manpages/smb.conf.5.sgml
index 3cea2d51bc..641e36f57a 100644
--- a/docs/docbook/manpages/smb.conf.5.sgml
+++ b/docs/docbook/manpages/smb.conf.5.sgml
@@ -41,7 +41,7 @@
 	<para>Section and parameter names are not case sensitive.</para>
 
 	<para>Only the first equals sign in a parameter is significant. 
-	Whitespace before or after the first equals sign is discarded. 
+	Whitespace before or after the first equals sign is discarded.
 	Leading, trailing and internal whitespace in section and parameter 
 	names is irrelevant. Leading and trailing whitespace in a parameter 
 	value is discarded. Internal whitespace within a parameter value 
@@ -84,7 +84,7 @@
 	printable services (used by the client to access print services 
 	on the host running the server).</para>
 	
-	<para>Sections may be designated <emphasis>guest</emphasis> services, 
+	<para>Sections may be designated <emphasis>guest</emphasis> services,
 	in which case no password is required to access them. A specified 
 	UNIX <emphasis>guest account</emphasis> is used to define access
 	privileges in this case.</para>
@@ -213,7 +213,7 @@
 		the [homes] section will hide the [homes] share but make
 		any auto home directories visible.</para>
 	</refsect2>
-	
+
 	<refsect2>
 		<title id="PRINTERSSECT">The [printers] section</title>
 		
@@ -433,7 +433,7 @@
 
 		<varlistentry>
 		<term>%d</term>
-		<listitem><para>The process id of the current server 
+		<listitem><para>The process id of the current server
 		process.</para></listitem>
 		</varlistentry>
 		
@@ -519,7 +519,7 @@
 
 		<varlistentry>
 		<term>short preserve case = yes/no</term>
-		<listitem><para>controls if new files which conform to 8.3 syntax, 
+		<listitem><para>controls if new files which conform to 8.3 syntax,
 		that is all in upper case and of suitable length, are created 
 		upper case, or if they are forced to be the "default" 
 		case. This option can be use with "preserve case = yes" 
@@ -542,8 +542,10 @@
 	steps fail, then the connection request is rejected.  However, if one of the 
 	steps succeeds, then the following steps are not checked.</para>
 
-	<para>If the service is marked "guest only = yes" then
-	steps 1 to 5 are skipped.</para>
+	<para>If the service is marked "guest only = yes" and the
+	server is running with share-level security ("security = share")
+	then steps 1 to 5 are skipped.</para>
+
 
 	<orderedlist numeration="Arabic">
 		<listitem><para>If the client has passed a username/password 
@@ -596,6 +598,7 @@
 		<listitem><para><link linkend="ADDSHARECOMMAND"><parameter>add share command</parameter></link></para></listitem>
 		<listitem><para><link linkend="ADDUSERSCRIPT"><parameter>add user script</parameter></link></para></listitem>
 		<listitem><para><link linkend="ADDMACHINESCRIPT"><parameter>add machine script</parameter></link></para></listitem>
+		<listitem><para><link linkend="ALGORITHMICRIDBASE"><parameter>algorithmic rid base</parameter></link></para></listitem>
 		<listitem><para><link linkend="ALLOWTRUSTEDDOMAINS"><parameter>allow trusted domains</parameter></link></para></listitem>
 		<listitem><para><link linkend="ANNOUNCEAS"><parameter>announce as</parameter></link></para></listitem>
 		<listitem><para><link linkend="ANNOUNCEVERSION"><parameter>announce version</parameter></link></para></listitem>
@@ -641,10 +644,10 @@
 		
 		<listitem><para><link linkend="LDAPADMINDN"><parameter>ldap admin dn</parameter></link></para></listitem>
 		<listitem><para><link linkend="LDAPFILTER"><parameter>ldap filter</parameter></link></para></listitem>
-		<listitem><para><link linkend="LDAPPORT"><parameter>ldap port</parameter></link></para></listitem>
-		<listitem><para><link linkend="LDAPSERVER"><parameter>ldap server</parameter></link></para></listitem>
 		<listitem><para><link linkend="LDAPSSL"><parameter>ldap ssl</parameter></link></para></listitem>
 		<listitem><para><link linkend="LDAPSUFFIX"><parameter>ldap suffix</parameter></link></para></listitem>
+		<listitem><para><link linkend="LDAPUSERSUFFIX"><parameter>ldap suffix</parameter></link></para></listitem>
+		<listitem><para><link linkend="LDAPMACHINESUFFIX"><parameter>ldap suffix</parameter></link></para></listitem>
 
 		<listitem><para><link linkend="LMANNOUNCE"><parameter>lm announce</parameter></link></para></listitem>
 		<listitem><para><link linkend="LMINTERVAL"><parameter>lm interval</parameter></link></para></listitem>
@@ -652,6 +655,9 @@
 		<listitem><para><link linkend="LOCALMASTER"><parameter>local master</parameter></link></para></listitem>
 		<listitem><para><link linkend="LOCKDIR"><parameter>lock dir</parameter></link></para></listitem>
 		<listitem><para><link linkend="LOCKDIRECTORY"><parameter>lock directory</parameter></link></para></listitem>
+		<listitem><para><link linkend="LOCKSPINCOUNT"><parameter>lock spin count</parameter></link></para></listitem>
+		<listitem><para><link linkend="LOCKSPINTIME"><parameter>lock spin time</parameter></link></para></listitem>
+		<listitem><para><link linkend="PIDDIRECTORY"><parameter>pid directory</parameter></link></para></listitem>
 		<listitem><para><link linkend="LOGFILE"><parameter>log file</parameter></link></para></listitem>
 		<listitem><para><link linkend="LOGLEVEL"><parameter>log level</parameter></link></para></listitem>
 		<listitem><para><link linkend="LOGONDRIVE"><parameter>logon drive</parameter></link></para></listitem>
@@ -683,6 +689,7 @@
 		<listitem><para><link linkend="NISHOMEDIR"><parameter>nis homedir</parameter></link></para></listitem>
 		<listitem><para><link linkend="NONUNIXACCOUNTRANGE"><parameter>non unix account range</parameter></link></para></listitem>
 		<listitem><para><link linkend="NTPIPESUPPORT"><parameter>nt pipe support</parameter></link></para></listitem>
+		<listitem><para><link linkend="NTSTATUSSUPPORT"><parameter>nt status support</parameter></link></para></listitem>
 		<listitem><para><link linkend="NULLPASSWORDS"><parameter>null passwords</parameter></link></para></listitem>
 		<listitem><para><link linkend="OBEYPAMRESTRICTIONS"><parameter>obey pam restrictions</parameter></link></para></listitem>
 		<listitem><para><link linkend="OPLOCKBREAKWAITTIME"><parameter>oplock break wait time</parameter></link></para></listitem>
@@ -722,24 +729,6 @@
 		<listitem><para><link linkend="SOCKETOPTIONS"><parameter>socket options</parameter></link></para></listitem>
 		<listitem><para><link linkend="SOURCEENVIRONMENT"><parameter>source environment</parameter></link></para></listitem>
 
-		<listitem><para><link linkend="SSL"><parameter>ssl</parameter></link></para></listitem>
-		<listitem><para><link linkend="SSLCACERTDIR"><parameter>ssl CA certDir</parameter></link></para></listitem>
-		<listitem><para><link linkend="SSLCACERTFILE"><parameter>ssl CA certFile</parameter></link></para></listitem>
-		<listitem><para><link linkend="SSLCIPHERS"><parameter>ssl ciphers</parameter></link></para></listitem>
-		<listitem><para><link linkend="SSLCLIENTCERT"><parameter>ssl client cert</parameter></link></para></listitem>
-		<listitem><para><link linkend="SSLCLIENTKEY"><parameter>ssl client key</parameter></link></para></listitem>
-		<listitem><para><link linkend="SSLCOMPATIBILITY"><parameter>ssl compatibility</parameter></link></para></listitem>
-		<listitem><para><link linkend="SSLEGDSOCKET"><parameter>ssl egd socket</parameter></link></para></listitem>
-		<listitem><para><link linkend="SSLENTROPYBYTES"><parameter>ssl entropy bytes</parameter></link></para></listitem>
-		<listitem><para><link linkend="SSLENTROPYFILE"><parameter>ssl entropy file</parameter></link></para></listitem>
-		<listitem><para><link linkend="SSLHOSTS"><parameter>ssl hosts</parameter></link></para></listitem>
-		<listitem><para><link linkend="SSLHOSTSRESIGN"><parameter>ssl hosts resign</parameter></link></para></listitem>
-		<listitem><para><link linkend="SSLREQUIRECLIENTCERT"><parameter>ssl require clientcert</parameter></link></para></listitem>
-		<listitem><para><link linkend="SSLREQUIRESERVERCERT"><parameter>ssl require servercert</parameter></link></para></listitem>
-		<listitem><para><link linkend="SSLSERVERCERT"><parameter>ssl server cert</parameter></link></para></listitem>
-		<listitem><para><link linkend="SSLSERVERKEY"><parameter>ssl server key</parameter></link></para></listitem>
-		<listitem><para><link linkend="SSLVERSION"><parameter>ssl version</parameter></link></para></listitem>
-
 		<listitem><para><link linkend="STATCACHE"><parameter>stat cache</parameter></link></para></listitem>
 		<listitem><para><link linkend="STATCACHESIZE"><parameter>stat cache size</parameter></link></para></listitem>
 		<listitem><para><link linkend="STRIPDOT"><parameter>strip dot</parameter></link></para></listitem>
@@ -796,6 +785,8 @@
 		<listitem><para><link linkend="COPY"><parameter>copy</parameter></link></para></listitem>
 		<listitem><para><link linkend="CREATEMASK"><parameter>create mask</parameter></link></para></listitem>
 		<listitem><para><link linkend="CREATEMODE"><parameter>create mode</parameter></link></para></listitem>
+		<listitem><para><link linkend="CSCPOLICY"><parameter>csc policy</parameter></link></para></listitem>
+		
 		<listitem><para><link linkend="DEFAULTCASE"><parameter>default case</parameter></link></para></listitem>
 		<listitem><para><link linkend="DEFAULTDEVMODE"><parameter>default devmode</parameter></link></para></listitem>
 		<listitem><para><link linkend="DELETEREADONLY"><parameter>delete readonly</parameter></link></para></listitem>
@@ -829,6 +820,7 @@
 		<listitem><para><link linkend="HOSTSALLOW"><parameter>hosts allow</parameter></link></para></listitem>
 		<listitem><para><link linkend="HOSTSDENY"><parameter>hosts deny</parameter></link></para></listitem>
 		<listitem><para><link linkend="INCLUDE"><parameter>include</parameter></link></para></listitem>
+		<listitem><para><link linkend="INHERITACLS"><parameter>inherit acls</parameter></link></para></listitem>
 		<listitem><para><link linkend="INHERITPERMISSIONS"><parameter>inherit permissions</parameter></link></para></listitem>
 		<listitem><para><link linkend="INVALIDUSERS"><parameter>invalid users</parameter></link></para></listitem>
 		<listitem><para><link linkend="LEVEL2OPLOCKS"><parameter>level2 oplocks</parameter></link></para></listitem>
@@ -881,6 +873,7 @@
 		<listitem><para><link linkend="ROOTPREEXECCLOSE"><parameter>root preexec close</parameter></link></para></listitem>
 		<listitem><para><link linkend="SECURITYMASK"><parameter>security mask</parameter></link></para></listitem>
 		<listitem><para><link linkend="SETDIRECTORY"><parameter>set directory</parameter></link></para></listitem>
+		<listitem><para><link linkend="SHAREMODES"><parameter>share modes</parameter></link></para></listitem>
 		<listitem><para><link linkend="SHORTPRESERVECASE"><parameter>short preserve case</parameter></link></para></listitem>
 		<listitem><para><link linkend="STATUS"><parameter>status</parameter></link></para></listitem>
 		<listitem><para><link linkend="STRICTALLOCATE"><parameter>strict allocate</parameter></link></para></listitem>
@@ -1136,8 +1129,29 @@
 		<parameter>hosts allow</parameter></link>.</para></listitem>
 		</varlistentry>
 		
+		<varlistentry>
+		<term><anchor id="ALGORITHMICRIDBASE">algorithmic rid base (G)</term>
+		<listitem><para>This determines how Samba will use its
+                algorithmic mapping from uids/gid to the RIDs needed to construct
+                NT Security Identifiers.</para>
+
+                <para>Setting this option to a larger value could be useful to sites
+                transitioning from WinNT and Win2k, as existing user and 
+                group rids would otherwise clash with sytem users etc. 
+                </para>
 
+                <para>All UIDs and GIDs must be able to be resolved into SIDs for  
+                the correct operation of ACLs on the server.  As such the algorithmic
+                mapping can't be 'turned off', but pushing it 'out of the way' should
+                resolve the issues.  Users and groups can then be assigned 'low' RIDs
+                in arbitary-rid supporting backends. </para>
 
+		<para>Default: <command>algorithmic rid base = 1000</command></para>
+
+		<para>Example: <command>algorithmic rid base = 100000</command></para>
+		</listitem>
+		</varlistentry>
+		
 		<varlistentry>
 		<term><anchor id="ALLOWTRUSTEDDOMAINS">allow trusted domains (G)</term>
 		<listitem><para>This option only takes effect when the <link 
@@ -1570,6 +1584,24 @@
 		</varlistentry>
 		
 		
+		<varlistentry>
+		<term><anchor id="CSCPOLICY">csc policy (S)</term>
+		<listitem><para>This stands for <emphasis>client-side caching 
+		policy</emphasis>, and specifies how clients capable of offline
+		caching will cache the files in the share. The valid values
+		are: manual, documents, programs, disable.</para>
+
+		<para>These values correspond to those used on Windows
+		servers.</para>
+
+		<para>For example, shares containing roaming profiles can have
+		offline caching disabled using <command>csc policy = disable
+		</command>.</para>
+
+		<para>Default: <command>csc policy = manual</command></para>
+		<para>Example: <command>csc policy = programs</command></para>
+		</listitem>
+		</varlistentry>
 		
 		<varlistentry>
 		<term><anchor id="DEADTIME">deadtime (G)</term>
@@ -1871,47 +1903,16 @@
 		<varlistentry>
 		<term><anchor id="DELETEUSERSCRIPT">delete user script (G)</term>
 		<listitem><para>This is the full pathname to a script that will 
-		be run <emphasis>AS ROOT</emphasis> by <ulink url="smbd.8.html">
-		<command>smbd(8)</command></ulink> under special circumstances 
-		described below.</para>
+		be run by <ulink url="smbd.8.html"><command>smbd(8)</command></ulink>
+                when managing user's with remote RPC (NT) tools.
+		</para>
 
-		<para>Normally, a Samba server requires that UNIX users are 
-		created for all users accessing files on this server. For sites 
-		that use Windows NT account databases as their primary user database 
-		creating these users and keeping the user list in sync with the 
-		Windows NT PDC is an onerous task. This option allows <command>
-		smbd</command> to delete the required UNIX users <emphasis>ON 
-		DEMAND</emphasis> when a user accesses the Samba server and the 
-		Windows NT user no longer exists.</para>
-		
-		<para>In order to use this option, <command>smbd</command> must be 
-		set to <parameter>security = domain</parameter> or <parameter>security =
-		user</parameter> and <parameter>delete user script</parameter> 
-		must be set to a full pathname for a script 
-		that will delete a UNIX user given one argument of <parameter>%u</parameter>, 
-		which expands into the UNIX user name to delete.</para>
+                <para>This script is called when a remote client removes a user
+                from the server, normally using 'User Manager for Domains' or
+                <command>rpcclient</command>.
 
-		<para>When the Windows user attempts to access the Samba server, 
-		at <emphasis>login</emphasis> (session setup in the SMB protocol) 
-		time, <command>smbd</command> contacts the <link linkend="PASSWORDSERVER">
-		<parameter>password server</parameter></link> and attempts to authenticate 
-		the given user with the given password. If the authentication fails 
-		with the specific Domain error code meaning that the user no longer 
-		exists then <command>smbd</command> attempts to find a UNIX user in 
-		the UNIX password database that matches the Windows user account. If 
-		this lookup succeeds, and <parameter>delete user script</parameter> is 
-		set then <command>smbd</command> will all the specified script 
-		<emphasis>AS ROOT</emphasis>, expanding any <parameter>%u</parameter> 
-		argument to be the user name to delete.</para>
-
-		<para>This script should delete the given UNIX username. In this way, 
-		UNIX users are dynamically deleted to match existing Windows NT 
-		accounts.</para>
-
-		<para>See also <link linkend="SECURITYEQUALSDOMAIN">security = domain</link>,
-		<link linkend="PASSWORDSERVER"><parameter>password server</parameter>
-		</link>, <link linkend="ADDUSERSCRIPT"><parameter>add user script</parameter>
-		</link>.</para>
+		<para>This script should delete the given UNIX username. 
+		</para>
 
 		<para>Default: <command>delete user script = &lt;empty string&gt;
 		</command></para>
@@ -3050,6 +3051,24 @@
 
 
 		<varlistentry>
+		<term><anchor id="INHERITACLS">inherit acls (S)</term>
+		<listitem><para>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.
+		</para>
+
+		<para>Default: <command>inherit acls = no</command>
+		</para></listitem>
+		</varlistentry>
+		
+
+
+
+		<varlistentry>
 		<term><anchor id="INHERITPERMISSIONS">inherit permissions (S)</term>
 		<listitem><para>The permissions on new files and directories 
 		are normally governed by <link linkend="CREATEMASK"><parameter>
@@ -3262,12 +3281,6 @@
 
 		<varlistentry>
 		<term><anchor id="LDAPADMINDN">ldap admin dn (G)</term>
-		<listitem><para>This parameter is only available if Samba has been
-		configure to include the <command>--with-ldapsam</command> option
-		at compile time. This option should be considered experimental and
-		under active development.
-		</para>
-
 		<para>
 		The <parameter>ldap admin dn</parameter> defines the Distinguished 
 		Name (DN) name used by Samba to contact the <link linkend="LDAPSERVER">ldap
@@ -3288,12 +3301,6 @@
 
 		<varlistentry>
 		<term><anchor id="LDAPFILTER">ldap filter (G)</term>
-		<listitem><para>This parameter is only available if Samba has been
-		configure to include the <command>--with-ldapsam</command> option
-		at compile time. This option should be considered experimental and
-		under active development.
-		</para>
-
 		<para>
 		This parameter specifies the RFC 2254 compliant LDAP search filter.
 		The default is to match the login name with the <constant>uid</constant> 
@@ -3307,69 +3314,15 @@
 		</varlistentry>
 
 
-
-
-		<varlistentry>
-		<term><anchor id="LDAPPORT">ldap port (G)</term>
-		<listitem><para>This parameter is only available if Samba has been
-		configure to include the <command>--with-ldapsam</command> option
-		at compile time. This option should be considered experimental and
-		under active development.
-		</para>
-		
-		<para>
-		This option is used to control the tcp port number used to contact
-		the <link linkend="LDAPSERVER"><parameter>ldap server</parameter></link>.
-		The default is to use the stand LDAPS port 636.
-		</para>
-
-		<para>See Also: <link linkend="LDAPSSL">ldap ssl</link>
-		</para>
-		
-		<para>Default : <command>ldap port = 636</command></para>
-		</listitem>
-		</varlistentry>
-
-
-
-
-		<varlistentry>
-		<term><anchor id="LDAPSERVER">ldap server (G)</term>
-		<listitem><para>This parameter is only available if Samba has been
-		configure to include the <command>--with-ldapsam</command> option
-		at compile time. This option should be considered experimental and
-		under active development.
-		</para>
-		
-		<para>
-		This parameter should contains the FQDN of the ldap directory 
-		server which should be queried to locate user account information.
-		</para>
-		
-	
-		
-		<para>Default : <command>ldap server = localhost</command></para>
-		</listitem>
-		</varlistentry>
-
-
-
-
 		<varlistentry>
 		<term><anchor id="LDAPSSL">ldap ssl (G)</term>
-		<listitem><para>This parameter is only available if Samba has been
-		configure to include the <command>--with-ldapsam</command> option
-		at compile time. This option should be considered experimental and
-		under active development.
-		</para>
-		
 		<para>
 		This option is used to define whether or not Samba should
 		use SSL when connecting to the <link linkend="LDAPSERVER"><parameter>ldap
 		server</parameter></link>.  This is <emphasis>NOT</emphasis> related to
-		Samba SSL support which is enabled by specifying the 
+		Samba's previous SSL support which was enabled by specifying the 
 		<command>--with-ssl</command> option to the <filename>configure</filename> 
-		script (see <link linkend="SSL"><parameter>ssl</parameter></link>).
+		script.
 		</para>
 		
 		<para>
@@ -3391,10 +3344,30 @@
 
 		<varlistentry>
 		<term><anchor id="LDAPSUFFIX">ldap suffix (G)</term>
-		<listitem><para>This parameter is only available if Samba has been
-		configure to include the <command>--with-ldapsam</command> option
-		at compile time. This option should be considered experimental and
-		under active development.
+		<listitem>
+		<para>Default : <emphasis>none</emphasis></para>
+		</listitem>
+		</varlistentry>
+
+
+
+		<varlistentry>
+		<term><anchor id="LDAPUSERSUFFIX">ldap user suffix (G)</term>
+	        <listitem><para>It specifies where users are added to the tree.
+		</para>
+		
+	
+		
+		<para>Default : <emphasis>none</emphasis></para>
+		</listitem>
+		</varlistentry>
+
+
+
+		<varlistentry>
+		<term><anchor id="LDAPSUFFIX">ldap machine suffix (G)</term>
+		<listitem><para>It specifies where machines should be 
+                added to the ldap tree.
 		</para>
 		
 	
@@ -3557,6 +3530,39 @@
 
 
 		<varlistentry>
+		<term><anchor id="LOCKSPINCOUNT">lock spin count (G)</term>
+		<listitem><para>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.
+		</para>
+
+		<para>Default: <command>lock spin count = 2</command>
+		</para></listitem>
+		</varlistentry>
+
+
+
+
+		<varlistentry>
+		<term><anchor id="LOCKSPINTIME">lock spin time (G)</term>
+		<listitem><para>The time in microseconds that smbd should 
+		pause before attempting to gain a failed lock.  See
+		<link linkend="LOCKSPINCOUNT"><parameter>lock spin 
+		count</parameter></link> for more details.
+		</para>
+
+		<para>Default: <command>lock spin time = 10</command>
+		</para></listitem>
+		</varlistentry>
+
+
+
+		<varlistentry>
 		<term><anchor id="LOCKING">locking (S)</term>
 		<listitem><para>This controls whether or not locking will be 
 		performed by the server in response to lock requests from the 
@@ -3845,8 +3851,8 @@
 		takes a printer name as its only parameter and outputs printer 
 		status information.</para>
 
-		<para>Currently eight styles of printer status information 
-		are supported; BSD, AIX, LPRNG, PLP, SYSV, HPUX, QNX and SOFTQ. 
+		<para>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 <parameter>printing =</parameter> option.</para>
 
@@ -3862,7 +3868,10 @@
 
 		<para>Note that it is good practice to include the absolute path 
 		in the <parameter>lpq command</parameter> as the <envar>$PATH
-		</envar> may not be available to the server.</para>
+		</envar> may not be available to the server.  When compiled with
+		the CUPS libraries, no <parameter>lpq command</parameter> is
+		needed because smbd will make a library call to obtain the 
+		print queue listing.</para>
 
 		<para>See also the <link linkend="PRINTING"><parameter>printing
 		</parameter></link> parameter.</para>
@@ -4839,6 +4848,23 @@
 
 
 		<varlistentry>
+		<term><anchor id="NTSTATUSSUPPORT">nt status support (G)</term>
+		<listitem><para>This boolean parameter controls whether <ulink
+		url="smbd.8.html">smbd(8)</ulink> will negotiate NT specific status
+		support with Windows NT/2k/XP clients. This is a developer
+		debugging option and should be left alone.
+	 	If this option is set to <constant>no</constant> then Samba offers
+		exactly the same DOS error codes that versions prior to Samba 2.2.3
+		reported.</para>
+
+		<para>You should not need to ever disable this parameter.</para>
+
+		<para>Default: <command>nt status support = yes</command></para>
+		</listitem>
+		</varlistentry>
+
+
+		<varlistentry>
 		<term><anchor id="NULLPASSWORDS">null passwords (G)</term>
 		<listitem><para>Allow or disallow client access to accounts 
 		that have null passwords. </para>
@@ -5064,10 +5090,10 @@
 
 		<varlistentry>
 		<term><anchor id="PASSDBBACKEND">passdb backend (G)</term>
-		<listitem><para>This option allows the administrator to chose what
-                backend in which to store passwords.  This allows (for example) both 
-                smbpasswd and tdbsam to be used without a recompile.  Only one can
-                be used at a time however, and experimental backends must still be selected
+		<listitem><para>This option allows the administrator to chose which backends to retrieve and store passwords with. This allows (for example) both 
+                smbpasswd and tdbsam to be used without a recompile. 
+                Multiple backends can be specified, seperated by spaces. The backends will be searched in the order they are specified. New users are always added to the first backend specified.
+                Experimental backends must still be selected
                 (eg --with-tdbsam) at configure time.
 		</para>
 
@@ -5115,14 +5141,27 @@
                         <para>Any characters after the (optional) second : are passed to the plugin
                         for its own processing</para>
                         </listitem>
-			
+		
+			<listitem><para><command>unixsam</command> - Allows samba to map all (other) available unix users</para>
+
+			<para>This backend uses the standard unix database for retrieving users. Users included 
+                        in this pdb are NOT listed in samba user listings and users included in this pdb won't be 
+                        able to login. The use of this backend is to always be able to display the owner of a file 
+                        on the samba server - even when the user doesn't have a 'real' samba account in one of the 
+                        other passdb backends.
+			</para>
+
+			<para>This backend should always be the last backend listed, since it contains all users in 
+                        the unix passdb and might 'override' mappings if specified earlier. It's meant to only return 
+                        accounts for users that aren't covered by the previous backends.</para>
+			</listitem>
 		</itemizedlist>
 		</para>
 
-		<para>Default: <command>passdb backend = smbpasswd</command></para>
-		<para>Example: <command>passdb backend = tdbsam:/etc/samba/private/passdb.tdb</command></para>
-		<para>Example: <command>passdb backend = ldapsam_nua:ldaps://ldap.example.com</command></para>
-		<para>Example: <command>passdb backend = plugin:/usr/local/samba/lib/my_passdb.so:my_plugin_args</command></para>
+		<para>Default: <command>passdb backend = smbpasswd unixsam</command></para>
+		<para>Example: <command>passdb backend = tdbsam:/etc/samba/private/passdb.tdb smbpasswd:/etc/samba/smbpasswd unixsam</command></para>
+		<para>Example: <command>passdb backend = ldapsam_nua:ldaps://ldap.example.com unixsam</command></para>
+		<para>Example: <command>passdb backend = plugin:/usr/local/samba/lib/my_passdb.so:my_plugin_args tdbsam:/etc/samba/private/passdb.tdb</command></para>
 		</listitem>
 		</varlistentry>
 
@@ -5418,6 +5457,18 @@
 
 
 		<varlistentry>
+		<term><anchor id="PIDDIRECTORY">pid directory (G)</term>
+		<listitem><para>This option specifies the directory where pid 
+		files will be placed.  </para>
+
+		<para>Default: <command>pid directory = ${prefix}/var/locks</command></para>
+		<para>Example: <command>pid directory = /var/run/</command>
+		</para></listitem>
+		</varlistentry>
+
+
+
+		<varlistentry>
 		<term><anchor id="POSIXLOCKING">posix locking (S)</term>
 		<listitem><para>The <ulink url="smbd.8.html"><command>smbd(8)</command></ulink>
 		daemon maintains an database of file locks obtained by SMB clients.
@@ -5596,14 +5647,23 @@
 		manually remove old spool files.</para>
 		
 		<para>The print command is simply a text string. It will be used 
-		verbatim, with two exceptions: All occurrences of <parameter>%s
-		</parameter> and <parameter>%f</parameter> will be replaced by the 
-		appropriate spool file name, and all occurrences of <parameter>%p
-		</parameter> will be replaced by the appropriate printer name. The 
-		spool file name is generated automatically by the server.  The 
-		<parameter>%J</parameter> macro can be used to access the job 
+		verbatim after macro substitutions have been made:</para>
+
+		<para>s, %p - the path to the spool
+		file name</para>
+
+		<para>%p - the appropriate printer 
+		name</para>
+
+		<para>%J - the job 
 		name as transmitted by the client.</para>
 
+		<para>%c - The number of printed pages
+		of the spooled job (if known).</para>
+
+		<para>%z - the size of the spooled
+		print job (in bytes)</para>
+
 		<para>The print command <emphasis>MUST</emphasis> contain at least 
 		one occurrence of <parameter>%s</parameter> or <parameter>%f
 		</parameter> - the <parameter>%p</parameter> is optional. At the time 
@@ -5647,6 +5707,17 @@
 		<para>For <command>printing = SOFTQ :</command></para>
 		<para><command>print command = lp -d%p -s %s; rm %s</command></para>
 
+		<para>For printing = CUPS :   If SAMBA is compiled against
+		libcups, then <link linkend="PRINTING">printcap = cups</link> 
+		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 <command>lp -c -d%p -oraw; rm %s</command>.   
+		With <command>printing = cups</command>,
+		and if SAMBA is compiled against libcups, any manually 
+		set print command will be ignored.</para>
+
+
 		<para>Example: <command>print command = /usr/local/samba/bin/myprintscript
 		%p %s</command></para>
 		</listitem>
@@ -5700,6 +5771,14 @@
 		linkend="PRINTERSSECT">[printers]</link> section above for reasons 
 		why you might want to do this.</para>
 
+		<para>To use the CUPS printing interface set <command>printcap name = cups
+		</command>. This should be supplemented by an addtional setting 
+		<link linkend="PRINTING">printing = cups</link> in the [global] 
+		section.  <command>printcap name = cups</command> will use the  
+		"dummy" printcap created by CUPS, as specified in your CUPS
+		configuration file.
+		</para>
+
 		<para>On System V systems that use <command>lpstat</command> to 
 		list available printers you can use <command>printcap name = lpstat
 		</command> to automatically obtain lists of available printers. This 
@@ -6622,6 +6701,33 @@
 
 
 
+		<varlistentry>
+		<term><anchor id="SHAREMODES">share modes (S)</term>
+		<listitem><para>This enables or disables the honoring of 
+		the <parameter>share modes</parameter> during a file open. These 
+		modes are used by clients to gain exclusive read or write access 
+		to a file.</para>
+
+		<para>These open modes are not directly supported by UNIX, so
+		they are simulated using shared memory, or lock files if your 
+		UNIX doesn't support shared memory (almost all do).</para>
+
+		<para>The share modes that are enabled by this option are 
+		<constant>DENY_DOS</constant>, <constant>DENY_ALL</constant>,
+		<constant>DENY_READ</constant>, <constant>DENY_WRITE</constant>,
+		<constant>DENY_NONE</constant> and <constant>DENY_FCB</constant>.
+		</para>
+
+		<para>This option gives full share compatibility and enabled 
+		by default.</para>
+
+		<para>You should <emphasis>NEVER</emphasis> turn this parameter 
+		off as many Windows applications will break if you do so.</para>
+
+		<para>Default: <command>share modes = yes</command></para>
+		</listitem>
+		</varlistentry>
+
 
 
 		<varlistentry>
@@ -6855,348 +6961,6 @@
 		</varlistentry>
 
 
-
-		<varlistentry>
-		<term><anchor id="SSL">ssl (G)</term>
-		<listitem><para>This variable is part of SSL-enabled Samba. This 
-		is only available if the SSL libraries have been compiled on your 
-		system and the configure option <command>--with-ssl</command> was 
-		given at configure time.</para>
-
-		<para>This variable enables or disables the entire SSL mode. If 
-		it is set to <constant>no</constant>, the SSL-enabled Samba behaves 
-		exactly like the non-SSL Samba. If set to <constant>yes</constant>, 
-		it depends on the variables <link linkend="SSLHOSTS"><parameter>
-		ssl hosts</parameter></link> and <link linkend="SSLHOSTSRESIGN">
-		<parameter>ssl hosts resign</parameter></link> whether an SSL 
-		connection will be required.</para>
-
-		<para>Default: <command>ssl = no</command></para>
-		</listitem>
-		</varlistentry>
-
-
-
-		<varlistentry>
-		<term><anchor id="SSLCACERTDIR">ssl CA certDir (G)</term>
-		<listitem><para>This variable is part of SSL-enabled Samba. This 
-		is only available if the SSL libraries have been compiled on your 
-		system and the configure option <command>--with-ssl</command> was 
-		given at configure time.</para>
-
-		<para>This variable defines where to look up the Certification
-		Authorities. The given directory should contain one file for 
-		each CA that Samba will trust.  The file name must be the hash 
-		value over the "Distinguished Name" of the CA. How this directory 
-		is set up is explained later in this document. All files within the 
-		directory that don't fit into this naming scheme are ignored. You 
-		don't need this variable if you don't verify client certificates.</para>
-
-		<para>Default: <command>ssl CA certDir = /usr/local/ssl/certs
-		</command></para>
-		</listitem>
-		</varlistentry>
-
-
-
-		<varlistentry>
-		<term><anchor id="SSLCACERTFILE">ssl CA certFile (G)</term>
-		<listitem><para>This variable is part of SSL-enabled Samba. This 
-		is only available if the SSL libraries have been compiled on your 
-		system and the configure option <command>--with-ssl</command> was 
-		given at configure time.</para>
-
-		<para>This variable is a second way to define the trusted CAs. 
-		The certificates of the trusted CAs are collected in one big 
-		file and this variable points to the file. You will probably 
-		only use one of the two ways to define your CAs. The first choice is 
-		preferable if you have many CAs or want to be flexible, the second 
-		is preferable if you only have one CA and want to keep things 
-		simple (you won't need to create the hashed file names). You 
-		don't need this variable if you don't verify client certificates.</para>
-
-		<para>Default: <command>ssl CA certFile = /usr/local/ssl/certs/trustedCAs.pem
-		</command></para>
-		</listitem>
-		</varlistentry>
-
-
-
-		<varlistentry>
-		<term><anchor id="SSLCIPHERS">ssl ciphers (G)</term>
-		<listitem><para>This variable is part of SSL-enabled Samba. This 
-		is only available if the SSL libraries have been compiled on your 
-		system and the configure option <command>--with-ssl</command> was 
-		given at configure time.</para>
-
-		<para>This variable defines the ciphers that should be offered 
-		during SSL negotiation. You should not set this variable unless 
-		you know what you are doing.</para>
-		</listitem>
-		</varlistentry>
-
-
-		<varlistentry>
-		<term><anchor id="SSLCLIENTCERT">ssl client cert (G)</term>
-		<listitem><para>This variable is part of SSL-enabled Samba. This 
-		is only available if the SSL libraries have been compiled on your 
-		system and the configure option <command>--with-ssl</command> was 
-		given at configure time.</para>
-
-		<para>The certificate in this file is used by <ulink url="smbclient.1.html">
-		<command>smbclient(1)</command></ulink> if it exists. It's needed 
-		if the server requires a client certificate.</para>
-
-		<para>Default: <command>ssl client cert = /usr/local/ssl/certs/smbclient.pem
-		</command></para>
-		</listitem>
-		</varlistentry>
-
-
-
-		<varlistentry>
-		<term><anchor id="SSLCLIENTKEY">ssl client key (G)</term>
-		<listitem><para>This variable is part of SSL-enabled Samba. This 
-		is only available if the SSL libraries have been compiled on your 
-		system and the configure option <command>--with-ssl</command> was 
-		given at configure time.</para>
-
-		<para>This is the private key for <ulink url="smbclient.1.html">
-		<command>smbclient(1)</command></ulink>. It's only needed if the 
-		client should have a certificate. </para>
-
-		<para>Default: <command>ssl client key = /usr/local/ssl/private/smbclient.pem
-		</command></para>
-		</listitem>
-		</varlistentry>
-
-
-
-		<varlistentry>
-		<term><anchor id="SSLCOMPATIBILITY">ssl compatibility (G)</term>
-		<listitem><para>This variable is part of SSL-enabled Samba. This 
-		is only available if the SSL libraries have been compiled on your 
-		system and the configure option <command>--with-ssl</command> was 
-		given at configure time.</para>
-
-		<para>This variable defines whether OpenSSL should be configured 
-		for bug compatibility with other SSL implementations. This is 
-		probably not desirable because currently no clients with SSL 
-		implementations other than OpenSSL exist.</para>
-
-		<para>Default: <command>ssl compatibility = no</command></para>
-		</listitem>
-		</varlistentry>
-
-
-		<varlistentry>
-		<term><anchor id="SSLEGDSOCKET">ssl egd socket (G)</term>
-		<listitem><para>This variable is part of SSL-enabled Samba. This 
-		is only available if the SSL libraries have been compiled on your 
-		system and the configure option <command>--with-ssl</command> was 
-		given at configure time.</para>
-		
-		<para>
-		This option is used to define the location of the communiation socket of 
-		an EGD or PRNGD daemon, from which entropy can be retrieved. This option 
-		can be used instead of or together with the <link 
-		linkend="SSLENTROPYFILE"><parameter>ssl entropy file</parameter></link> 
-		directive. 255 bytes of entropy will be retrieved from the daemon.
-		</para>
-
-		<para>Default: <emphasis>none</emphasis></para>
-		</listitem>
-		</varlistentry>
-
-
-		<varlistentry>
-		<term><anchor id="SSLENTROPYBYTES">ssl entropy bytes (G)</term>
-		<listitem><para>This variable is part of SSL-enabled Samba. This 
-		is only available if the SSL libraries have been compiled on your 
-		system and the configure option <command>--with-ssl</command> was 
-		given at configure time.</para>
-		
-		<para>
-		This parameter is used to define the number of bytes which should 
-		be read from the <link linkend="SSLENTROPYFILE"><parameter>ssl entropy 
-		file</parameter></link> If a -1 is specified, the entire file will
-		be read.
-		</para>
-
-		<para>Default: <command>ssl entropy bytes = 255</command></para>
-		</listitem>
-		</varlistentry>
-
-
-
-		<varlistentry>
-		<term><anchor id="SSLENTROPYFILE">ssl entropy file (G)</term>
-		<listitem><para>This variable is part of SSL-enabled Samba. This 
-		is only available if the SSL libraries have been compiled on your 
-		system and the configure option <command>--with-ssl</command> was 
-		given at configure time.</para>
-		
-		<para>
-		This parameter is used to specify a file from which processes will 
-		read "random bytes" on startup.  In order to seed the internal pseudo 
-		random number generator, entropy must be provided. On system with a 
-		<filename>/dev/urandom</filename> device file, the processes
-		will retrieve its entropy from the kernel. On systems without kernel
-		entropy support, a file can be supplied that will be read on startup
-		and that will be used to seed the PRNG.
-		</para>
-
-		<para>Default: <emphasis>none</emphasis></para>
-		</listitem>
-		</varlistentry>
-
-		
-
-		<varlistentry>
-		<term><anchor id="SSLHOSTS">ssl hosts (G)</term>
-		<listitem><para>See <link linkend="SSLHOSTSRESIGN"><parameter>
-		ssl hosts resign</parameter></link>.</para>
-		</listitem>
-		</varlistentry>
-
-
-		<varlistentry>
-		<term><anchor id="SSLHOSTSRESIGN">ssl hosts resign (G)</term>
-		<listitem><para>This variable is part of SSL-enabled Samba. This 
-		is only available if the SSL libraries have been compiled on your 
-		system and the configure option <command>--with-ssl</command> was 
-		given at configure time.</para>
-
-		<para>These two variables define whether Samba will go 
-		into SSL mode or not. If none of them is defined, Samba will 
-		allow only SSL connections. If the <link linkend="SSLHOSTS">
-		<parameter>ssl hosts</parameter></link> variable lists
-		hosts (by IP-address, IP-address range, net group or name), 
-		only these hosts will be forced into SSL mode. If the <parameter>
-		ssl hosts resign</parameter> variable lists hosts, only these 
-		hosts will <emphasis>NOT</emphasis> be forced into SSL mode. The syntax for these two 
-		variables is the same as for the <link linkend="HOSTSALLOW"><parameter>
-		hosts allow</parameter></link> and <link linkend="HOSTSDENY">
-		<parameter>hosts deny</parameter></link> pair of variables, only 
-		that the subject of the decision is different: It's not the access 
-		right but whether SSL is used or not. </para>
-
-		<para>The example below requires SSL connections from all hosts
-		outside the local net (which is 192.168.*.*).</para>
-
-		<para>Default: <command>ssl hosts = &lt;empty string&gt;</command></para>
-		<para><command>ssl hosts resign = &lt;empty string&gt;</command></para>
-
-		<para>Example: <command>ssl hosts resign = 192.168.</command></para>
-		</listitem>
-		</varlistentry>
-
-
-
-		<varlistentry>
-		<term><anchor id="SSLREQUIRECLIENTCERT">ssl require clientcert (G)</term>
-		<listitem><para>This variable is part of SSL-enabled Samba. This 
-		is only available if the SSL libraries have been compiled on your 
-		system and the configure option <command>--with-ssl</command> was 
-		given at configure time.</para>
-
-		<para>If this variable is set to <constant>yes</constant>, the 
-		server will not tolerate connections from clients that don't 
-		have a valid certificate. The directory/file given in <link
-		linkend="SSLCACERTDIR"><parameter>ssl CA certDir</parameter>
-		</link> and <link linkend="SSLCACERTFILE"><parameter>ssl CA certFile
-		</parameter></link> will be used to look up the CAs that issued 
-		the client's certificate. If the certificate can't be verified 
-		positively, the connection will be terminated.  If this variable 
-		is set to <constant>no</constant>, clients don't need certificates. 
-		Contrary to web applications you really <emphasis>should</emphasis> 
-		require client certificates. In the web environment the client's 
-		data is sensitive (credit card numbers) and the server must prove 
-		to be trustworthy. In a file server environment the server's data 
-		will be sensitive and the clients must prove to be trustworthy.</para>
-
-		<para>Default: <command>ssl require clientcert = no</command></para>
-		</listitem>
-		</varlistentry>
-
-
-
-		<varlistentry>
-		<term><anchor id="SSLREQUIRESERVERCERT">ssl require servercert (G)</term>
-		<listitem><para>This variable is part of SSL-enabled Samba. This 
-		is only available if the SSL libraries have been compiled on your 
-		system and the configure option <command>--with-ssl</command> was 
-		given at configure time.</para>
-
-		<para>If this variable is set to <constant>yes</constant>, the 
-		<ulink url="smbclient.1.html"><command>smbclient(1)</command>
-		</ulink> will request a certificate from the server. Same as 
-		<link linkend="SSLREQUIRECLIENTCERT"><parameter>ssl require 
-		clientcert</parameter></link> for the server.</para>
-
-		<para>Default: <command>ssl require servercert = no</command>
-		</para>
-		</listitem>
-		</varlistentry>
-
-		<varlistentry>
-		<term><anchor id="SSLSERVERCERT">ssl server cert (G)</term>
-		<listitem><para>This variable is part of SSL-enabled Samba. This 
-		is only available if the SSL libraries have been compiled on your 
-		system and the configure option <command>--with-ssl</command> was 
-		given at configure time.</para>
-
-		<para>This is the file containing the server's certificate. 
-		The server <emphasis>must</emphasis> have a certificate. The 
-		file may also contain the server's private key. See later for 
-		how certificates and private keys are created.</para>
-
-		<para>Default: <command>ssl server cert = &lt;empty string&gt;
-		</command></para>
-		</listitem>
-		</varlistentry>
-
-
-		<varlistentry>
-		<term><anchor id="SSLSERVERKEY">ssl server key (G)</term>
-		<listitem><para>This variable is part of SSL-enabled Samba. This 
-		is only available if the SSL libraries have been compiled on your 
-		system and the configure option <command>--with-ssl</command> was 
-		given at configure time.</para>
-
-		<para>This file contains the private key of the server. If 
-		this variable is not defined, the key is looked up in the 
-		certificate file (it may be appended to the certificate). 
-		The server <emphasis>must</emphasis> have a private key
-		and the certificate <emphasis>must</emphasis> 
-		match this private key.</para>
-
-		<para>Default: <command>ssl server key = &lt;empty string&gt;
-		</command></para>
-		</listitem>
-		</varlistentry>
-
-
-		<varlistentry>
-		<term><anchor id="SSLVERSION">ssl version (G)</term>
-		<listitem><para>This variable is part of SSL-enabled Samba. This 
-		is only available if the SSL libraries have been compiled on your 
-		system and the configure option <command>--with-ssl</command> was 
-		given at configure time.</para>
-
-		<para>This enumeration variable defines the versions of the 
-		SSL protocol that will be used. <constant>ssl2or3</constant> allows 
-		dynamic negotiation of SSL v2 or v3, <constant>ssl2</constant> results 
-		in SSL v2, <constant>ssl3</constant> results in SSL v3 and
-		<constant>tls1</constant> results in TLS v1. TLS (Transport Layer 
-		Security) is the new standard for SSL.</para>
-
-		<para>Default: <command>ssl version = "ssl2or3"</command></para>
-		</listitem>
-		</varlistentry>
-
-
-
 		<varlistentry>
 		<term><anchor id="STATCACHE">stat cache (G)</term>
 		<listitem><para>This parameter determines if <ulink 
@@ -7458,9 +7222,9 @@
 		<varlistentry>
 		<term><anchor id="UNIXEXTENSIONS">unix extensions(G)</term>
 		<listitem><para>This boolean parameter controls whether Samba 
-		implments the CIFS UNIX extensions, as defined by HP. These
-		extensions enable CIFS to server UNIX clients to UNIX servers
-		better, and allow such things as symbolic links, hard links etc.
+		implments the CIFS UNIX extensions, as defined by HP. 
+		These extensions enable Samba to better serve UNIX CIFS clients
+		by supporting features such as symbolic links, hard links, etc...
 		These extensions require a similarly enabled client, and are of
 		no current use to Windows clients.</para>
 
@@ -7999,7 +7763,7 @@ veto files = /.AppleDouble/.bin/.AppleDesktop/Network Trash Folder/
 
 
 		<varlistentry>
-		<term><anchor id="WINBINDCACHETIME">winbind cache time</term>
+		<term><anchor id="WINBINDCACHETIME">winbind cache time (G)</term>
 		<listitem><para>This parameter specifies the number of seconds the
 		<ulink url="winbindd.8.html">winbindd(8)</ulink> daemon will cache 
 		user and group information before querying a Windows NT server 
@@ -8011,8 +7775,8 @@ veto files = /.AppleDouble/.bin/.AppleDesktop/Network Trash Folder/
 
 
 		<varlistentry>
-		<term><anchor id="WINBINDENUMUSERS">winbind enum
-		users</term> <listitem><para>On large installations using
+		<term><anchor id="WINBINDENUMUSERS">winbind enum users (G)</term> 
+		<listitem><para>On large installations using
 		<ulink url="winbindd.8.html">winbindd(8)</ulink> it may be
 		necessary to suppress the enumeration of users through the
 		<command> setpwent()</command>,
@@ -8033,8 +7797,8 @@ veto files = /.AppleDouble/.bin/.AppleDesktop/Network Trash Folder/
 		</varlistentry>
 		
 		<varlistentry>
-		<term><anchor id="WINBINDENUMGROUPS">winbind enum
-		groups</term> <listitem><para>On large installations using
+		<term><anchor id="WINBINDENUMGROUPS">winbind enum groups (G)</term> 
+		<listitem><para>On large installations using
 		<ulink url="winbindd.8.html">winbindd(8)</ulink> it may be
 		necessary to suppress the enumeration of groups through the
 		<command> setgrent()</command>,
@@ -8054,7 +7818,7 @@ veto files = /.AppleDouble/.bin/.AppleDesktop/Network Trash Folder/
 
 	
 		<varlistentry>
-		<term><anchor id="WINBINDGID">winbind gid</term>
+		<term><anchor id="WINBINDGID">winbind gid (G)</term>
 		<listitem><para>The winbind gid parameter specifies the range of group 
 		ids that are allocated by the <ulink url="winbindd.8.html">
 		winbindd(8)</ulink> daemon.  This range of group ids should have no 
@@ -8070,7 +7834,7 @@ veto files = /.AppleDouble/.bin/.AppleDesktop/Network Trash Folder/
 
 
 		<varlistentry>
-		<term><anchor id="WINBINDSEPARATOR">winbind separator</term>
+		<term><anchor id="WINBINDSEPARATOR">winbind separator (G)</term>
 		<listitem><para>This parameter allows an admin to define the character 
 		used when listing a username of the form of <replaceable>DOMAIN
 		</replaceable>\<replaceable>user</replaceable>.  This parameter 
@@ -8082,8 +7846,8 @@ veto files = /.AppleDouble/.bin/.AppleDesktop/Network Trash Folder/
 		with group membership at least on glibc systems, as the character +
 		is used as a special character for NIS in /etc/group.</para>
 
-		<para>Example: <command>winbind separator = \\</command></para>
-		<para>Example: <command>winbind separator = /</command></para>
+		<para>Default: <command>winbind separator = '\'</command></para>
+		<para>Example: <command>winbind separator = +</command></para>
 		</listitem>
 		</varlistentry>
 
@@ -8091,7 +7855,7 @@ veto files = /.AppleDouble/.bin/.AppleDesktop/Network Trash Folder/
 
 
 		<varlistentry>
-		<term><anchor id="WINBINDUID">winbind uid</term>
+		<term><anchor id="WINBINDUID">winbind uid (G)</term>
 		<listitem><para>The winbind gid parameter specifies the range of group 
 		ids that are allocated by the <ulink url="winbindd.8.html">
 		winbindd(8)</ulink> daemon.  This range of ids should have no 
diff --git a/docs/docbook/manpages/smbclient.1.sgml b/docs/docbook/manpages/smbclient.1.sgml
index 4f36de1576..31031dafc4 100644
--- a/docs/docbook/manpages/smbclient.1.sgml
+++ b/docs/docbook/manpages/smbclient.1.sgml
@@ -434,9 +434,9 @@ domain = &lt;value&gt;
 		
 		<varlistentry>
 		<term>-W WORKGROUP</term>
-		<listitem><para>Override the default workgroup specified in the 
-		workgroup parameter of the <filename>smb.conf</filename> file 
-		for this connection. This may be needed to connect to some 
+		<listitem><para>Override the default workgroup (domain) specified
+		in the workgroup parameter of the <filename>smb.conf</filename>
+		file for this connection. This may be needed to connect to some
 		servers. </para></listitem>
 		</varlistentry>
 		
@@ -634,6 +634,44 @@ domain = &lt;value&gt;
 		</varlistentry>
 		
 		
+		<varlistentry>
+		<term>altname file</term>
+		<listitem><para>The client will request that the server return
+		the "alternate" name (the 8.3 name) for a file or directory.
+		</para></listitem>
+		</varlistentry>
+		
+		
+		<varlistentry>
+		<term>cancel jobid0 [jobid1] ... [jobidN]</term>
+		<listitem><para>The client will request that the server cancel
+		the printjobs identified by the given numeric print job ids.
+		</para></listitem>
+		</varlistentry>
+		
+		
+		
+		<varlistentry>
+		<term>chmod file mode in octal</term>
+		<listitem><para>This command depends on the server supporting the CIFS
+		UNIX extensions and will fail if the server does not. The client requests that the server
+		change the UNIX permissions to the given octal mode, in standard UNIX format.
+		</para></listitem>
+		</varlistentry>
+		
+		
+		
+		<varlistentry>
+		<term>chown file uid gid</term>
+		<listitem><para>This command depends on the server supporting the CIFS
+		UNIX extensions and will fail if the server does not. The client requests that the server
+		change the UNIX user and group ownership to the given decimal values. Note there is
+		currently no way to remotely look up the UNIX uid and gid values for a given name.
+		This may be addressed in future versions of the CIFS UNIX extensions.
+		</para></listitem>
+		</varlistentry>
+		
+		
 		
 		<varlistentry>
 		<term>cd [directory name]</term>
@@ -701,6 +739,17 @@ domain = &lt;value&gt;
 		
 		
 		<varlistentry>
+		<term>link source destination</term>
+		<listitem><para>This command depends on the server supporting the CIFS
+		UNIX extensions and will fail if the server does not. The client requests that the server
+		create a hard link between the source and destination files. The source file
+		must not exist.
+		</para></listitem>
+		</varlistentry>
+
+
+
+		<varlistentry>
 		<term>lowercase</term>
 		<listitem><para>Toggle lowercasing of filenames for the get and 
 		mget commands. </para>
@@ -878,6 +927,30 @@ domain = &lt;value&gt;
 		
 		
 		<varlistentry>
+		<term>setmode &lt;filename&gt; &lt;perm=[+|\-]rsha&gt;</term>
+		<listitem><para>A version of the DOS attrib command to set 
+		file permissions. For example: </para>
+
+		<para><command>setmode myfile +r </command></para>
+		
+		<para>would make myfile read only. </para></listitem>
+		</varlistentry>
+
+
+		
+		<varlistentry>
+		<term>symlink source destination</term>
+		<listitem><para>This command depends on the server supporting the CIFS
+		UNIX extensions and will fail if the server does not. The client requests that the server
+		create a symbolic hard link between the source and destination files. The source file
+		must not exist. Note that the server will not create a link to any path that lies 
+		outside the currently connected share. This is enforced by the Samba server.
+		</para></listitem>
+		</varlistentry>
+
+
+
+		<varlistentry>
 		<term>tar &lt;c|x&gt;[IXbgNa]</term>
 		<listitem><para>Performs a tar operation - see the <parameter>-T
 		</parameter> command line option above. Behavior may be affected 
@@ -907,16 +980,6 @@ domain = &lt;value&gt;
 		</varlistentry>
 		
 		
-		<varlistentry>
-		<term>setmode &lt;filename&gt; &lt;perm=[+|\-]rsha&gt;</term>
-		<listitem><para>A version of the DOS attrib command to set 
-		file permissions. For example: </para>
-
-		<para><command>setmode myfile +r </command></para>
-		
-		<para>would make myfile read only. </para></listitem>
-		</varlistentry>
-		
 	</variablelist>
 </refsect1>
 
diff --git a/docs/docbook/manpages/smbcontrol.1.sgml b/docs/docbook/manpages/smbcontrol.1.sgml
index 05e05f4a6a..517e2ca41f 100644
--- a/docs/docbook/manpages/smbcontrol.1.sgml
+++ b/docs/docbook/manpages/smbcontrol.1.sgml
@@ -9,7 +9,7 @@
 
 <refnamediv>
 	<refname>smbcontrol</refname>
-	<refpurpose>send messages to smbd or nmbd processes</refpurpose>
+	<refpurpose>send messages to smbd, nmbd or winbindd processes</refpurpose>
 </refnamediv>
 
 <refsynopsisdiv>
@@ -33,9 +33,10 @@
 	Samba</ulink> suite.</para>
 
 	<para><command>smbcontrol</command> is a very small program, which 
-	sends messages to an <ulink url="smbd.8.html">smbd(8)</ulink> or 
-	an <ulink url="nmbd.8.html">nmbd(8)</ulink> daemon running on the 
-	system.</para>
+	sends messages to an <ulink url="smbd.8.html">smbd(8)</ulink>, 
+	an <ulink url="nmbd.8.html">nmbd(8)</ulink>
+	or a <ulink url="winbindd.8.html">winbindd(8)</ulink> 
+	daemon running on the system.</para>
 </refsect1>
 
 
@@ -81,8 +82,9 @@
 		message to smbd which will then close the client connections to
 		the named share. Note that this doesn't affect client connections
 		to any other shares. This message-type takes an argument of the
-		share name for which client connections will be close, or the
+		share name for which client connections will be closed, or the
 		"*" character which will close all currently open shares.
+		This may be useful if you made changes to the access controls on the share.
 		This message can only be sent to <constant>smbd</constant>.</para>
 
 		<para>The <constant>debug</constant> message-type allows 
@@ -105,7 +107,7 @@
 		collection, "off" to turn off profile stats collection, "count"
 		to enable only collection of count stats (time stats are 
 		disabled), and "flush" to zero the current profile stats. This can 
-		be sent to any of the destinations.</para>
+		be sent to any smbd or nmbd destinations.</para>
 
 		<para>The <constant>debuglevel</constant> message-type sends 
 		a "request debug level" message. The current debug level setting 
@@ -115,18 +117,13 @@
 		<para>The <constant>profilelevel</constant> message-type sends 
 		a "request profile level" message.  The current profile level 
 		setting is returned by a  "profilelevel" message. This can be sent 
-		to any of the destinations.</para>
+		to any smbd or nmbd destinations.</para>
 
 		<para>The <constant>printer-notify</constant> message-type sends a 
 		message to smbd which in turn sends a printer notify message to 
 		any Windows NT clients connected to  a printer.  This message-type 
 		takes an argument of the printer name to  send notify messages to.   
 		This message can only be sent to <constant>smbd</constant>.</para>
-
-		<para>The <constant>close-share</constant> message-type sends a
-		message to smbd which forces smbd to close the share that was
-		specified as an argument. This may be useful if you made changes
-		to the access controls on the share.  </para>
 		</listitem>
 		</varlistentry>
 
diff --git a/docs/docbook/manpages/smbd.8.sgml b/docs/docbook/manpages/smbd.8.sgml
index 824ae20241..509007c4bc 100644
--- a/docs/docbook/manpages/smbd.8.sgml
+++ b/docs/docbook/manpages/smbd.8.sgml
@@ -176,7 +176,9 @@
 		its size may be controlled by the <ulink 
 		url="smb.conf.5.html#maxlogsize">max log size</ulink>
 		option in the <ulink url="smb.conf.5.html"><filename>
-		smb.conf(5)</filename></ulink> file.
+		smb.conf(5)</filename></ulink> file. <emphasis>Beware:</emphasis>
+		If the directory specified does not exist, <command>smbd</command>
+		will log to the default debug log location defined at compile time.
 		</para>
 
 		<para>The default log directory is specified at
diff --git a/docs/docbook/manpages/smbmount.8.sgml b/docs/docbook/manpages/smbmount.8.sgml
index b4a77e51c9..ec4dbbaff1 100644
--- a/docs/docbook/manpages/smbmount.8.sgml
+++ b/docs/docbook/manpages/smbmount.8.sgml
@@ -14,7 +14,7 @@
 
 <refsynopsisdiv>
 	<cmdsynopsis>
-		<command>smbumount</command>
+		<command>smbmount</command>
 		<arg choice="req">service</arg>
 		<arg choice="req">mount-point</arg>
 		<arg choice="opt">-o options</arg>
diff --git a/docs/docbook/manpages/smbsh.1.sgml b/docs/docbook/manpages/smbsh.1.sgml
index 46adac6b79..82efb334ba 100644
--- a/docs/docbook/manpages/smbsh.1.sgml
+++ b/docs/docbook/manpages/smbsh.1.sgml
@@ -16,6 +16,13 @@
 <refsynopsisdiv>
 	<cmdsynopsis>
 		<command>smbsh</command>
+		<arg choice="opt">-W workgroup</arg>
+		<arg choice="opt">-U username</arg>
+		<arg choice="opt">-P prefix</arg>
+		<arg choice="opt">-R &lt;name resolve order&gt;</arg>
+		<arg choice="opt">-d &lt;debug level&gt;</arg>
+		<arg choice="opt">-l logfile</arg>
+		<arg choice="opt">-L libdir</arg>
 	</cmdsynopsis>
 </refsynopsisdiv>
 
@@ -30,6 +37,129 @@
 	egrep</command>, and <command>rcp</command>. You must use a 
 	shell that is dynamically linked in order for <command>smbsh</command> 
 	to work correctly.</para>
+</refsect1>
+
+<refsect1>
+	<title>OPTIONS</title>
+
+	<variablelist>
+	    <varlistentry>
+		<term>-W WORKGROUP</term>
+		<listitem><para>Override the default workgroup specified in the 
+		workgroup parameter of the <filename>smb.conf</filename> file 
+		for this session. This may be needed to connect to some 
+		servers. </para></listitem>
+	    </varlistentry>
+		
+	    <varlistentry>
+		<term>-U username[%pass]</term>
+		<listitem><para>Sets the SMB username or username and password.
+		If this option is not specified, the user will be prompted for 
+		both the username and the password.  If %pass is not specified, 
+		the user will be prompted for the password.
+		</para></listitem>
+	    </varlistentry>
+
+	    <varlistentry>
+		<term>-P prefix</term><listitem><para>This option allows
+		the user to set the directory prefix for SMB access. The 
+		default value if this option is not specified is 
+		<emphasis>smb</emphasis>.
+		</para></listitem>
+	    </varlistentry>
+
+	    <varlistentry>
+		<term>-R &lt;name resolve order&gt;</term> 
+		<listitem><para>This option is used to determine what naming 
+		services and in what order to resolve 
+		host names to IP addresses. The option takes a space-separated 
+		string of different name resolution options.</para>
+
+		<para>The options are :"lmhosts", "host", "wins" and "bcast". 
+		They cause names to be resolved as follows :</para>
+
+		<itemizedlist>
+			<listitem><para><constant>lmhosts</constant> : 
+			Lookup an IP address in the Samba lmhosts file. If the 
+			line in lmhosts has no name type attached to the 
+			NetBIOS name 
+			(see the <ulink url="lmhosts.5.html">lmhosts(5)</ulink>
+			for details) then any name type matches for lookup.
+			</para></listitem>
+
+			<listitem><para><constant>host</constant> : 
+			Do a standard host name to IP address resolution, using
+			the system <filename>/etc/hosts</filename>, NIS, or DNS
+			lookups. This method of name resolution is operating 
+			system dependent, for instance on IRIX or Solaris this 
+			may be controlled by the <filename>/etc/nsswitch.conf
+			</filename> file).  Note that this method is only used 
+			if the NetBIOS name type being queried is the 0x20 
+			(server) name type, otherwise it is ignored.
+			</para></listitem>
+
+			<listitem><para><constant>wins</constant> : 
+			Query a name with the IP address listed in the 
+			<parameter>wins server</parameter> parameter.  If no 
+			WINS server has been specified this method will be 
+			ignored.
+			</para></listitem>
+
+			<listitem><para><constant>bcast</constant> : 
+			Do a broadcast on each of the known local interfaces 
+			listed in the <parameter>interfaces</parameter>
+			parameter. This is the least reliable of the name 
+			resolution methods as it depends on the target host 
+			being on a locally connected subnet.
+			</para></listitem>
+		</itemizedlist>
+
+		<para>If this parameter is not set then the name resolve order 
+		defined in the <filename>smb.conf</filename> file parameter  
+		(name resolve order) will be used. </para>
+
+		<para>The default order is lmhosts, host, wins, bcast. Without 
+		this parameter or any entry in the <parameter>name resolve order
+		</parameter> parameter of the <filename>smb.conf</filename> 
+		file, the name resolution methods will be attempted in this 
+		order. </para></listitem>
+	    </varlistentry>
+
+	    <varlistentry>
+		<term>-d &lt;debug level&gt;</term>
+		<listitem><para>debug level is an integer from 0 to 10.</para>
+
+		<para>The default value if this parameter is not specified
+		is zero.</para>
+
+		<para>The higher this value, the more detail will be logged
+		about the activities of <command>nmblookup</command>. At level
+		0, only critical errors and serious warnings will be logged.
+		</para></listitem>
+	    </varlistentry>
+
+	    <varlistentry>
+		<term>-l logfilename</term>
+		<listitem><para>If specified causes all debug messages to be
+		written to the file specified by <replaceable>logfilename
+		</replaceable>. If not specified then all messages will be 
+		written to<replaceable>stderr</replaceable>.
+		</para></listitem>
+	    </varlistentry>
+
+	    <varlistentry>
+		<term>-L libdir</term>
+		<listitem><para>This parameter specifies the location of the 
+		shared libraries used by <command>smbsh</command>. The default
+		value is specified at compile time.
+		</para></listitem>
+	    </varlistentry>
+
+	</variablelist>
+</refsect1>
+
+<refsect1>
+	<title>EXAMPLES</title>
 
 	<para>To use the <command>smbsh</command> command, execute <command>
 	smbsh</command> from the prompt and enter the username and password 
diff --git a/docs/docbook/manpages/wbinfo.1.sgml b/docs/docbook/manpages/wbinfo.1.sgml
index 7f2c4624a9..f1461b07b9 100644
--- a/docs/docbook/manpages/wbinfo.1.sgml
+++ b/docs/docbook/manpages/wbinfo.1.sgml
@@ -17,6 +17,8 @@
 		<command>wbinfo</command>
 		<arg choice="opt">-u</arg>
 		<arg choice="opt">-g</arg>
+		<arg choice="opt">-h name</arg>
+		<arg choice="opt">-i ip</arg>
 		<arg choice="opt">-n name</arg>
 		<arg choice="opt">-s sid</arg>
 		<arg choice="opt">-U uid</arg>
@@ -25,8 +27,9 @@
 		<arg choice="opt">-Y sid</arg>
 		<arg choice="opt">-t</arg>
 		<arg choice="opt">-m</arg>
+		<arg choice="opt">-r user</arg>
 		<arg choice="opt">-a user%password</arg>
-		<arg choice="opt">-p</arg>
+		<arg choice="opt">-A user%password</arg>
 	</cmdsynopsis>
 </refsynopsisdiv>
 
@@ -71,6 +74,26 @@
 		
 		
 		<varlistentry>
+		<term>-h name</term>
+		<listitem><para>The <parameter>-h</parameter> option 
+		queries <command>winbindd(8)</command> to query the WINS
+		server for the IP address associated with the NetBIOS name
+		specified by the <parameter>name</parameter> parameter.
+		</para></listitem>
+		</varlistentry>
+
+
+		<varlistentry>
+		<term>-i ip</term>
+		<listitem><para>The <parameter>-i</parameter> option 
+		queries <command>winbindd(8)</command> to send a node status
+		request to get the NetBIOS name associated with the IP address
+		specified by the <parameter>ip</parameter> parameter.
+		</para></listitem>
+		</varlistentry>
+
+
+		<varlistentry>
 		<term>-n name</term>
 		<listitem><para>The <parameter>-n</parameter> option 
 		queries <command>winbindd(8)</command> for the SID 		
@@ -143,6 +166,16 @@
 		</para></listitem>
 		</varlistentry>
 
+
+		<varlistentry>
+		<term>-r username</term>
+		<listitem><para>Try to obtain the list of UNIX group ids
+		to which the user belongs.  This only works for users
+		defined on a Domain Controller.
+		</para></listitem>
+		</varlistentry>
+
+
 		<varlistentry>
 		<term>-a username%password</term>
 		<listitem><para>Attempt to authenticate a user via winbindd. 
@@ -150,10 +183,14 @@
 		</para></listitem>
 		</varlistentry>
 
+
 		<varlistentry>
-		<term>-p</term>
-		<listitem><para>Attempt a simple 'ping' check that the winbindd
-                is indeed alive.
+		<term>-A username%password</term>
+		<listitem><para>Store username and password used by winbindd 
+		during session setup to a domain controller.  This enables
+		winbindd to operate in a Windows 2000 domain with Restrict
+		Anonymous turned on (a.k.a. Permissions compatiable with
+		Windows 2000 servers only).
 		</para></listitem>
 		</varlistentry>
 	</variablelist>
diff --git a/docs/docbook/manpages/winbindd.8.sgml b/docs/docbook/manpages/winbindd.8.sgml
index bd1dafa07e..0325f9bfe1 100644
--- a/docs/docbook/manpages/winbindd.8.sgml
+++ b/docs/docbook/manpages/winbindd.8.sgml
@@ -57,6 +57,15 @@
 
 	<variablelist>
 		<varlistentry>
+		<term>hosts</term>
+		<listitem><para>User information traditionally stored in 
+		the <filename>hosts(5)</filename> file and used by 
+		<command>gethostbyname(3)</command> functions. Names are
+		resolved through the WINS server or by broadcast.
+		</para></listitem>
+		</varlistentry>
+
+		<varlistentry>
 		<term>passwd</term>
 		<listitem><para>User information traditionally stored in 
 		the <filename>passwd(5)</filename> file and used by 
@@ -81,6 +90,12 @@
 passwd:         files winbind
 group:          files winbind
 	</programlisting></para>  
+
+	<para>The following simple configuration in the
+	<filename>/etc/nsswitch.conf</filename> file can be used to initially
+	resolve hostnames from <filename>/etc/hosts</filename> and then from the
+	WINS server.</para>
+
 </refsect1>