trying to get HEAD building again. If you want the code

prior to this merge, checkout HEAD_PRE_3_0_0_BETA_3_MERGE
(This used to be commit adb98e7b7cd0f025b52c570e4034eebf4047b1ad)

9 files changed, 78 insertions, 67 deletions

diff --git a/docs/docbook/manpages/.cvsignore b/docs/docbook/manpages/.cvsignore
index 2d6c32d7f2..90c11de0f9 100644
--- a/docs/docbook/manpages/.cvsignore
+++ b/docs/docbook/manpages/.cvsignore
@@ -1 +1 @@
-smb.conf.5.xml
\ No newline at end of file
+smb.conf.5.xml
diff --git a/docs/docbook/manpages/net.8.xml b/docs/docbook/manpages/net.8.xml
index c7874e68fd..9787f4e0b0 100644
--- a/docs/docbook/manpages/net.8.xml
+++ b/docs/docbook/manpages/net.8.xml
@@ -4,15 +4,6 @@
 
 <!ENTITY % globalentities SYSTEM './../global.ent'> %globalentities;
 
-<!-- This one is only used for adding users using RAP -->
-<!ENTITY net.arg.flags '
-<varlistentry>
-<term>-F flags</term>
-<listitem><para>
-FIXME. Defaults to 0x21
-</para></listitem>
-</varlistentry>'>
-
 <!-- This one is only used by shutdown (RPC) -->
 <!ENTITY net.arg.shutdown '
 <varlistentry>
diff --git a/docs/docbook/manpages/pdbedit.8.xml b/docs/docbook/manpages/pdbedit.8.xml
index 6d5127a855..8f7582dcb5 100644
--- a/docs/docbook/manpages/pdbedit.8.xml
+++ b/docs/docbook/manpages/pdbedit.8.xml
@@ -20,7 +20,7 @@
 <refsynopsisdiv>
 	<cmdsynopsis>
 		<command>pdbedit</command>
-		<arg choice="opt">-l</arg>	
+		<arg choice="opt">-L</arg>	
 		<arg choice="opt">-v</arg>	
 		<arg choice="opt">-w</arg>	
 		<arg choice="opt">-u username</arg>	
@@ -34,7 +34,6 @@
 		<arg choice="opt">-x</arg>	
 		<arg choice="opt">-i passdb-backend</arg>	
 		<arg choice="opt">-e passdb-backend</arg>   
-		<arg choice="opt">-g</arg>   
 		<arg choice="opt">-b passdb-backend</arg>
 		<arg choice="opt">-g</arg>
 		<arg choice="opt">-d debuglevel</arg>
@@ -67,12 +66,12 @@
 	<title>OPTIONS</title>
 	<variablelist>
 		<varlistentry>
-		<term>-l</term>
+		<term>-L</term>
 		<listitem><para>This option lists all the user accounts
 		present in the users database.
 		This option prints a list of user/uid pairs separated by
 		the ':' character.</para>
-		<para>Example: <command>pdbedit -l</command></para>
+		<para>Example: <command>pdbedit -L</command></para>
 		<para><screen>
 sorce:500:Simo Sorce
 samba:45:Test User
@@ -88,7 +87,7 @@ samba:45:Test User
 		It causes pdbedit to list the users in the database, printing
 		out the account fields in a descriptive format.</para>
 
-		<para>Example: <command>pdbedit -l -v</command></para>
+		<para>Example: <command>pdbedit -L -v</command></para>
 		<para><screen>
 ---------------
 username:       sorce
@@ -123,7 +122,7 @@ Profile Path:   \\BERSERKER\profile
 		<citerefentry><refentrytitle>smbpasswd</refentrytitle>
 		<manvolnum>5</manvolnum></citerefentry> for details)</para>
 
-		<para>Example: <command>pdbedit -l -w</command></para>
+		<para>Example: <command>pdbedit -L -w</command></para>
 		<screen>
 sorce:500:508818B733CE64BEAAD3B435B51404EE:D2A2418EFC466A8A0F6B1DBB5C3DB80C:[UX         ]:LCT-00000000:
 samba:45:0F2B255F7B67A7A9AAD3B435B51404EE:BC281CE3F53B6A5146629CD4751D3490:[UX         ]:LCT-3BFA1E8D:
@@ -152,8 +151,6 @@ samba:45:0F2B255F7B67A7A9AAD3B435B51404EE:BC281CE3F53B6A5146629CD4751D3490:[UX
 		</listitem>
 		</varlistentry>
 		
-		
-		
 		<varlistentry>
 		<term>-h homedir</term>
 		<listitem><para>This option can be used while adding or
@@ -199,8 +196,40 @@ samba:45:0F2B255F7B67A7A9AAD3B435B51404EE:BC281CE3F53B6A5146629CD4751D3490:[UX
 		</para>
 		</listitem>
 		</varlistentry>
-		
-		
+
+		<varlistentry>
+		<term>-G SID|rid</term>
+		<listitem><para>
+		This option can be used while adding or modifying a user account. It 
+		will specify the users' new primary group SID (Security Identifier) or 
+		rid. </para>
+
+		<para>Example: <command>-G S-1-5-21-2447931902-1787058256-3961074038-1201</command></para>
+		</listitem>
+		</varlistentry>
+
+		<varlistentry>
+		<term>-U SID|rid</term>
+		<listitem><para>
+		This option can be used while adding or modifying a user account. It 
+		will specify the users' new SID (Security Identifier) or 
+		rid. </para>
+
+		<para>Example: <command>-U S-1-5-21-2447931902-1787058256-3961074038-5004</command></para>
+		</listitem>
+		</varlistentry>
+
+		<varlistentry>
+		<term>-c account-control</term>
+		<listitem><para>This option can be used while adding or modifying a user
+		account. It will specify the users' account control property. Possible
+		flags that can be set are: N, D, H, L, X.				
+		</para>
+
+		<para>Example: <command>-c "[X          ]"</command></para>
+		</listitem>
+		</varlistentry>
+
 		<varlistentry>
 		<term>-a</term>
 		<listitem><para>This option is used to add a user into the
@@ -216,8 +245,16 @@ retype new password
 		</listitem>
 		</varlistentry>
 		
-		
-		
+		<varlistentry>
+		<term>-r</term>
+		<listitem><para>This option is used to modify an existing user 
+		in the database. This command needs a user name specified with the -u 
+		switch. Other options can be specified to modify the properties of 
+		the specified user. This flag is kept for backwards compatibility, but 
+		it is no longer necessary to specify it.
+		</para></listitem>
+		</varlistentry>
+			
 		<varlistentry>
 		<term>-m</term>
 		<listitem><para>This option may only be used in conjunction 
@@ -281,18 +318,6 @@ retype new password
 		</varlistentry>
 
 		<varlistentry>
-		<term>-g</term>
-		<listitem><para>If you specify <parameter>-g</parameter>,
-		then <parameter>-i in-backend -e out-backend</parameter>
-		applies to the group mapping instead of the user database.</para>
-
-		<para>This option will ease migration from one passdb backend to
-		another and will ease backing up.</para>
-		
-		</listitem>
-		</varlistentry>
-
-		<varlistentry>
 		<term>-b passdb-backend</term>
 		<listitem><para>Use a different default passdb backend. </para>
 
@@ -315,6 +340,7 @@ account policy value for bad lockout attempt is 0
 		</listitem>
 		</varlistentry>
 
+
 		<varlistentry>
 		<term>-C account-policy-value</term>
 		<listitem><para>Sets an account policy to a specified value. 
@@ -347,7 +373,7 @@ account policy value for bad lockout attempt is now 3
 <refsect1>
 	<title>VERSION</title>
 
-	<para>This man page is correct for version 2.2 of 
+	<para>This man page is correct for version 3.0 of 
 	the Samba suite.</para>
 </refsect1>
 
@@ -365,14 +391,7 @@ account policy value for bad lockout attempt is now 3
 	were created by Andrew Tridgell. Samba is now developed
 	by the Samba Team as an Open Source project similar 
 	to the way the Linux kernel is developed.</para>
-	
-	<para>The original Samba man pages were written by Karl Auer. 
-	The man page sources were converted to YODL format (another 
-	excellent piece of Open Source software, available at <ulink url="ftp://ftp.icce.rug.nl/pub/unix/">
-	ftp://ftp.icce.rug.nl/pub/unix/</ulink>) and updated for the Samba 2.0 
-	release by Jeremy Allison.  The conversion to DocBook for 
-	Samba 2.2 was done by Gerald Carter. The conversion to DocBook
-	XML 4.2 for Samba 3.0 was done by Alexander Bokovoy.</para>
+
 </refsect1>
 
 </refentry>
diff --git a/docs/docbook/manpages/rpcclient.1.xml b/docs/docbook/manpages/rpcclient.1.xml
index c6775d9721..688eef14e8 100644
--- a/docs/docbook/manpages/rpcclient.1.xml
+++ b/docs/docbook/manpages/rpcclient.1.xml
@@ -299,7 +299,7 @@ Comma Separated list of Files
 		<listitem><para>Execute an EnumPrinters() call.  This lists the various installed 
 		and share printers.  Refer to the MS Platform SDK documentation for 
 		more details of the various flags and calling options. Currently
-		supported info levels are 0, 1, and 2.</para></listitem></varlistentry>
+		supported info levels are 1, 2 and 5.</para></listitem></varlistentry>
 
 
 
diff --git a/docs/docbook/manpages/samba.7.xml b/docs/docbook/manpages/samba.7.xml
index 6abde609b9..1339f0bb87 100644
--- a/docs/docbook/manpages/samba.7.xml
+++ b/docs/docbook/manpages/samba.7.xml
@@ -13,7 +13,7 @@
 
 
 <refnamediv>
-	<refname>Samba</refname>
+	<refname>samba</refname>
 	<refpurpose>A Windows SMB/CIFS fileserver for UNIX</refpurpose>
 </refnamediv>
 
@@ -341,21 +341,14 @@
 	
 	<para>Contributors to the project are now too numerous 
 	to mention here but all deserve the thanks of all Samba 
-	users. To see a full list, look at <ulink
-	url="ftp://samba.org/pub/samba/alpha/change-log">
-	ftp://samba.org/pub/samba/alpha/change-log</ulink>
+	users. To see a full list, look at the
+	<filename>change-log</filename> in the source package 
 	for the pre-CVS changes and at <ulink 
-	url="ftp://samba.org/pub/samba/alpha/cvs.log">
-	ftp://samba.org/pub/samba/alpha/cvs.log</ulink>
+	url="http://cvs.samba.org/">
+	http://cvs.samba.org/</ulink>
 	for the contributors to Samba post-CVS. CVS is the Open Source 
 	source code control system used by the Samba Team to develop 
 	Samba. The project would have been unmanageable without it.</para>
-	
-	<para>In addition, several commercial organizations now help 
-	fund the Samba Team with money and equipment. For details see 
-	the Samba Web pages at <ulink
-	url="http://samba.org/samba/samba-thanks.html">
-	http://samba.org/samba/samba-thanks.html</ulink>.</para> 
 </refsect1>
 
 <refsect1>
diff --git a/docs/docbook/manpages/smbcontrol.1.xml b/docs/docbook/manpages/smbcontrol.1.xml
index a0fda2b315..7bcb7420ba 100644
--- a/docs/docbook/manpages/smbcontrol.1.xml
+++ b/docs/docbook/manpages/smbcontrol.1.xml
@@ -254,6 +254,13 @@
 	sent to smbd.</para></listitem>
 	</varlistentry>
 
+	<varlistentry>
+	<term>reload-config</term>
+	<listitem><para>Force daemon to reload smb.conf configuration file. Can be sent
+	to <constant>smbd</constant>, <constant>nmbd</constant>, or <constant>winbindd</constant>.
+	</para></listitem>
+	</varlistentry>
+
 </variablelist>
 </refsect1>
 
diff --git a/docs/docbook/manpages/smbmount.8.xml b/docs/docbook/manpages/smbmount.8.xml
index 356b4f8f61..f3f7d1a99b 100644
--- a/docs/docbook/manpages/smbmount.8.xml
+++ b/docs/docbook/manpages/smbmount.8.xml
@@ -48,11 +48,11 @@
 	typically this output will end up in <filename>log.smbmount</filename>. The <command>
 	smbmount</command> process may also be called mount.smbfs.</para>
 
-	<para><emphasis>NOTE:</emphasis> <command>smbmount</command> 
+	<note><para> <command>smbmount</command> 
 	calls <citerefentry><refentrytitle>smbmnt</refentrytitle>
 	<manvolnum>8</manvolnum></citerefentry> to do the actual mount. You 
 	must make sure that <command>smbmnt</command> is in the path so 
-	that it can be found. </para>
+	that it can be found. </para></note>
 	
 </refsect1>
 
@@ -144,6 +144,7 @@ password = &lt;value&gt;
 		<term>fmask=&lt;arg&gt;</term>
 		<listitem><para>sets the file mask. This determines the 
 		permissions that remote files have in the local filesystem. 
+		This is not a umask, but the actual permissions for the files.
 		The default is based on the current umask. </para></listitem>
 		</varlistentry>
 		
@@ -152,6 +153,7 @@ password = &lt;value&gt;
 		<term>dmask=&lt;arg&gt;</term>
 		<listitem><para>Sets the directory mask. This determines the 
 		permissions that remote directories have in the local filesystem. 
+		This is not a umask, but the actual permissions for the directories.
 		The default is based on the current umask. </para></listitem>
 		</varlistentry>
 		
diff --git a/docs/docbook/manpages/wbinfo.1.xml b/docs/docbook/manpages/wbinfo.1.xml
index f9bd247997..075ce140cc 100644
--- a/docs/docbook/manpages/wbinfo.1.xml
+++ b/docs/docbook/manpages/wbinfo.1.xml
@@ -35,7 +35,7 @@
 		<arg choice="opt">--sequence</arg>
 		<arg choice="opt">-r user</arg>
 		<arg choice="opt">-a user%password</arg>
-		<arg choice="opt">-A user%password</arg>
+		<arg choice="opt">--set-auth-user user%password</arg>
 		<arg choice="opt">--get-auth-user</arg>
 		<arg choice="opt">-p</arg>
 	</cmdsynopsis>
@@ -207,7 +207,7 @@
 
 
 		<varlistentry>
-		<term>-A username%password</term>
+		<term>--set-auth-user 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
diff --git a/docs/docbook/manpages/winbindd.8.xml b/docs/docbook/manpages/winbindd.8.xml
index f19b7b8242..d41620b707 100644
--- a/docs/docbook/manpages/winbindd.8.xml
+++ b/docs/docbook/manpages/winbindd.8.xml
@@ -24,7 +24,7 @@
 		<arg choice="opt">-F</arg>
 		<arg choice="opt">-S</arg>
 		<arg choice="opt">-i</arg>
-		<arg choice="opt">-B</arg>
+		<arg choice="opt">-Y</arg>
 		<arg choice="opt">-d &lt;debug level&gt;</arg>
 		<arg choice="opt">-s &lt;smb config file&gt;</arg>
 		<arg choice="opt">-n</arg>
@@ -159,12 +159,11 @@ group:          files winbind
 		</varlistentry>
 
 		<varlistentry>
-		<term>-B</term>
-		<listitem><para>Dual daemon mode. This means winbindd will run 
-		as 2 threads. The first will answer all requests from the cache, 
-		thus making responses to clients faster. The other will 
-		update the cache for the query that the first has just responded. 
-		Advantage of this is that responses stay accurate and are faster.
+		<term>-Y</term>
+		<listitem><para>Single daemon mode. This means winbindd will run 
+		as a single process (the mode of operation in Samba 2.2).  Winbindd's 
+		default behavior is to launch a child process that is responsible for 
+		updating expired cache entries.
 		</para></listitem>
 		</varlistentry>