Merge branch 'master' of git://git.samba.org/samba

11 files changed, 236 insertions, 99 deletions

diff --git a/docs-xml/build/DTD/samba.entities b/docs-xml/build/DTD/samba.entities
index 2e924d46ba..4ad65ca7c5 100644
--- a/docs-xml/build/DTD/samba.entities
+++ b/docs-xml/build/DTD/samba.entities
@@ -50,8 +50,8 @@
 <!ENTITY person.gd '
 <firstname>Guenther</firstname><surname>Deschner</surname>
 <affiliation>
-	<orgname>SuSE</orgname>
-	<address><email>gd@suse.de</email></address>
+	<orgname>Samba Team</orgname>
+	<address><email>gd@samba.org</email></address>
 </affiliation>'>
 
 <!ENTITY author.gd '<author>&person.gd;</author>'>
@@ -214,7 +214,7 @@ in the &smb.conf; file.</para>
 
 <!ENTITY stdarg.configfile '
 <varlistentry>
-<term>-s &lt;configuration file&gt;</term>
+<term>-s|--configfile &lt;configuration file&gt;</term>
 <listitem><para>The file specified contains the 
 configuration details required by the server.  The 
 information in this file includes server-specific
@@ -227,7 +227,7 @@ compile time.</para></listitem>
 
 <!ENTITY stdarg.version '
 <varlistentry>
-<term>-V</term>
+<term>-V|--version</term>
 <listitem><para>Prints the program version number.
 </para></listitem>
 </varlistentry>'>
@@ -249,7 +249,7 @@ log.smbd, etc...). The log file is never removed by the client.
 
 <!ENTITY stdarg.resolve.order '
 <varlistentry>
-<term>-R &lt;name resolve order&gt;</term> 
+<term>-R|--name-resolve &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 
@@ -307,7 +307,7 @@ resolution methods will be attempted in this order. </para></listitem>
 
 <!ENTITY stdarg.netbios.name '
 <varlistentry>
-<term>-n &lt;primary NetBIOS name&gt;</term>
+<term>-n|--netbiosname &lt;primary NetBIOS name&gt;</term>
 <listitem><para>This option allows you to override
 the NetBIOS name that Samba uses for itself. This is identical
 to setting the <smbconfoption><name>netbios name</name></smbconfoption> parameter in the &smb.conf; file. 
@@ -318,7 +318,7 @@ line setting will take precedence over settings in
 
 <!ENTITY stdarg.scope '
 <varlistentry>
-<term>-i &lt;scope&gt;</term>
+<term>-i|--scope &lt;scope&gt;</term>
 <listitem><para>This specifies a NetBIOS scope that
 <command>nmblookup</command> will use to communicate with when
 generating NetBIOS names. For details on the use of NetBIOS
@@ -340,7 +340,7 @@ SAM (as opposed to the Domain SAM). </para></listitem>
 
 <!ENTITY stdarg.socket.options '
 <varlistentry>
-<term>-O socket options</term>
+<term>-O|--socket-options socket options</term>
 <listitem><para>TCP socket options to set on the client
 socket. See the socket options parameter in
 the &smb.conf; manual page for the list of valid
@@ -357,7 +357,7 @@ options. </para></listitem>
 
 <!ENTITY stdarg.nopass '
 <varlistentry>
-<term>-N</term>
+<term>-N|--no-pass</term>
 <listitem><para>If specified, this parameter suppresses the normal
 password prompt from the client to the user. This is useful when
 accessing a service that does not require a password. </para>
@@ -420,7 +420,7 @@ access from unwanted users. </para></listitem>
 
 <!ENTITY stdarg.kerberos '
 <varlistentry>
-<term>-k</term>
+<term>-k|--kerberos</term>
 <listitem><para>
 Try to authenticate with kerberos. Only useful in
 an Active Directory environment.
diff --git a/docs-xml/manpages-3/mount.cifs.8.xml b/docs-xml/manpages-3/mount.cifs.8.xml
index 372b4772f1..d930600437 100644
--- a/docs-xml/manpages-3/mount.cifs.8.xml
+++ b/docs-xml/manpages-3/mount.cifs.8.xml
@@ -477,12 +477,35 @@ permissions in memory that can't be stored on the server. This information can d
 
         <varlistentry>
                 <term>noserverino</term>
-                <listitem><para>client generates inode numbers (rather than using the actual one
-                from the server) by default.
+		<listitem>
+		<para>
+			Client generates inode numbers (rather than
+		using the actual one from the server) by default.
+		</para>
+		<para>
+			See section <emphasis>INODE NUMBERS</emphasis> for
+		more information.
 		</para></listitem>
         </varlistentry>
 
         <varlistentry>
+		<term>nounix</term>
+		<listitem>
+		<para>
+			Disable the CIFS Unix Extensions for this mount. This
+		can be useful in order to turn off multiple settings at once.
+		This includes POSIX acls, POSIX locks, POSIX paths, symlink
+		support and retrieving uids/gids/mode from the server. This
+		can also be useful to work around a bug in a server that
+		supports Unix Extensions.
+		</para>
+		<para>
+		See section <emphasis>INODE NUMBERS</emphasis> for
+		more information.
+		</para> </listitem>
+        </varlistentry>
+
+        <varlistentry>
                 <term>nouser_xattr</term>
                 <listitem><para>(default) Do not allow getfattr/setfattr to get/set xattrs, even if server would support it otherwise. </para></listitem>
         </varlistentry>
@@ -533,6 +556,33 @@ permissions in memory that can't be stored on the server. This information can d
 </refsect1>
 
 <refsect1>
+	<title>INODE NUMBERS</title>
+	<para>
+		When Unix Extensions are enabled, we use the actual inode
+	number provided by the server in response to the POSIX calls as an
+	inode number.
+	</para>
+	<para>
+		When Unix Extensions are disabled and "serverino" mount option
+	is enabled there is no way to get the server inode number. The
+	client typically maps the server-assigned "UniqueID" onto an inode
+	number.
+	</para>
+	<para>
+		Note that the UniqueID is a different value from the server
+	inode number. The UniqueID value is unique over the scope of the entire
+	server and is often greater than 2 power 32. This value often makes
+	programs that are not compiled with LFS (Large File Support), to
+	trigger a glibc EOVERFLOW error as this won't fit in the target
+	structure field. It is strongly recommended to compile your programs
+	with LFS support (i.e. with -D_FILE_OFFSET_BITS=64) to prevent this
+	problem. You can also use "noserverino" mount option to generate inode
+	numbers smaller than 2 power 32 on the client. But you may not be able
+	to detect hardlinks properly.
+	</para>
+</refsect1>
+
+<refsect1>
 	<title>FILE AND DIRECTORY OWNERSHIP AND PERMISSIONS</title>
 
 	<para> The core CIFS protocol does not provide unix ownership
diff --git a/docs-xml/manpages-3/pdbedit.8.xml b/docs-xml/manpages-3/pdbedit.8.xml
index d0ea811838..2d074d922d 100644
--- a/docs-xml/manpages-3/pdbedit.8.xml
+++ b/docs-xml/manpages-3/pdbedit.8.xml
@@ -19,30 +19,40 @@
 <refsynopsisdiv>
 	<cmdsynopsis>
 		<command>pdbedit</command>
-		<arg choice="opt">-L</arg>	
-		<arg choice="opt">-v</arg>	
-		<arg choice="opt">-w</arg>	
-		<arg choice="opt">-u username</arg>	
-		<arg choice="opt">-f fullname</arg>	
-		<arg choice="opt">-h homedir</arg>	
-		<arg choice="opt">-D drive</arg>	
-		<arg choice="opt">-S script</arg>
-		<arg choice="opt">-p profile</arg>	
-		<arg choice="opt">-a</arg>	
-		<arg choice="opt">-t, --password-from-stdin</arg>
-		<arg choice="opt">-m</arg>	
-		<arg choice="opt">-r</arg>	
-		<arg choice="opt">-x</arg>	
-		<arg choice="opt">-i passdb-backend</arg>	
-		<arg choice="opt">-e passdb-backend</arg>   
+		<arg choice="opt">-a</arg>
 		<arg choice="opt">-b passdb-backend</arg>
-		<arg choice="opt">-g</arg>
+		<arg choice="opt">-c account-control</arg>
+		<arg choice="opt">-C value</arg>
 		<arg choice="opt">-d debuglevel</arg>
-		<arg choice="opt">-s configfile</arg>
+		<arg choice="opt">-D drive</arg>
+		<arg choice="opt">-e passdb-backend</arg>
+		<arg choice="opt">-f fullname</arg>
+		<arg choice="opt">--force-initialized-passwords</arg>
+		<arg choice="opt">-g</arg>
+		<arg choice="opt">-h homedir</arg>
+		<arg choice="opt">-i passdb-backend</arg>
+		<arg choice="opt">-I domain</arg>
+		<arg choice="opt">-L </arg>
+		<arg choice="opt">-m</arg>
+		<arg choice="opt">-M SID|RID</arg>
+		<arg choice="opt">-N description</arg>
 		<arg choice="opt">-P account-policy</arg>
-		<arg choice="opt">-C value</arg>
-		<arg choice="opt">-c account-control</arg>
+		<arg choice="opt">-p profile</arg>
+		<arg choice="opt">--policies-reset</arg>
+		<arg choice="opt">-r</arg>
+		<arg choice="opt">-s configfile</arg>
+		<arg choice="opt">-S script</arg>
+		<arg choice="opt">-t</arg>
+		<arg choice="opt">--time-format</arg>
+		<arg choice="opt">-u username</arg>
+		<arg choice="opt">-U SID|RID</arg>
+		<arg choice="opt">-v</arg>
+		<arg choice="opt">-V</arg>
+		<arg choice="opt">-w</arg>
+		<arg choice="opt">-x</arg>
 		<arg choice="opt">-y</arg>
+		<arg choice="opt">-z</arg>
+		<arg choice="opt">-Z</arg>
 	</cmdsynopsis>
 </refsynopsisdiv>
 
@@ -69,7 +79,7 @@
 	<title>OPTIONS</title>
 	<variablelist>
 		<varlistentry>
-		<term>-L</term>
+		<term>-L|--list</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
@@ -85,7 +95,7 @@ samba:45:Test User
 		
 		
 		<varlistentry>
-		<term>-v</term>
+		<term>-v|--verbose</term>
 		<listitem><para>This option enables the verbose listing format.
 		It causes pdbedit to list the users in the database, printing
 		out the account fields in a descriptive format.</para>
@@ -117,7 +127,7 @@ Profile Path:   \\BERSERKER\profile
 		
 		
 		<varlistentry>
-		<term>-w</term>
+		<term>-w|--smbpasswd-style</term>
 		<listitem><para>This option sets the "smbpasswd" listing format.
 		It will make pdbedit list the users in the database, printing
 		out the account fields in a format compatible with the
@@ -139,7 +149,7 @@ samba:45:0F2B255F7B67A7A9AAD3B435B51404EE:
 		
 		
 		<varlistentry>
-		<term>-u username</term>
+		<term>-u|--user username</term>
 		<listitem><para>This option specifies the username to be
 		used for the operation requested (listing, adding, removing).
 		It is <emphasis>required</emphasis> in add, remove and modify
@@ -149,7 +159,7 @@ samba:45:0F2B255F7B67A7A9AAD3B435B51404EE:
 		</varlistentry>
 
 		<varlistentry>
-		<term>-f fullname</term>
+		<term>-f|--fullname fullname</term>
 		<listitem><para>This option can be used while adding or
 		modifing a user account. It will specify the user's full
 		name. </para>
@@ -159,7 +169,7 @@ samba:45:0F2B255F7B67A7A9AAD3B435B51404EE:
 		</varlistentry>
 		
 		<varlistentry>
-		<term>-h homedir</term>
+		<term>-h|--homedir homedir</term>
 		<listitem><para>This option can be used while adding or
 		modifing a user account. It will specify the user's home
 		directory network path.</para>
@@ -170,7 +180,7 @@ samba:45:0F2B255F7B67A7A9AAD3B435B51404EE:
 		</varlistentry>
 		
 		<varlistentry>
-		<term>-D drive</term>
+		<term>-D|--drive drive</term>
 		<listitem><para>This option can be used while adding or
 		modifing a user account. It will specify the windows drive
 		letter to be used to map the home directory.</para>
@@ -182,7 +192,7 @@ samba:45:0F2B255F7B67A7A9AAD3B435B51404EE:
 		
 		
 		<varlistentry>
-		<term>-S script</term>
+		<term>-S|--script script</term>
 		<listitem><para>This option can be used while adding or
 		modifing a user account. It will specify the user's logon
 		script path.</para>
@@ -194,7 +204,7 @@ samba:45:0F2B255F7B67A7A9AAD3B435B51404EE:
 		
 		
 		<varlistentry>
-		<term>-p profile</term>
+		<term>-p|--profile profile</term>
 		<listitem><para>This option can be used while adding or
 		modifing a user account. It will specify the user's profile
 		directory.</para>
@@ -205,29 +215,32 @@ samba:45:0F2B255F7B67A7A9AAD3B435B51404EE:
 		</varlistentry>
 
 		<varlistentry>
-		<term>-G SID|rid</term>
+		<term>-M|'--machine SID' 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 
+		This option can be used while adding or modifying a machine account. It
+		will specify the machines' new primary group SID (Security Identifier) or
 		rid. </para>
 
-		<para>Example: <command>-G S-1-5-21-2447931902-1787058256-3961074038-1201</command></para>
+		<para>Example: <command>-M S-1-5-21-2447931902-1787058256-3961074038-1201</command></para>
 		</listitem>
 		</varlistentry>
 
 		<varlistentry>
-		<term>-U SID|rid</term>
+		<term>-U|'--user SID' 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>
+		<para>Example: <command>'--user SID' S-1-5-21-2447931902-1787058256-3961074038-5004</command></para>
+		<para>Example: <command>-U 5004</command></para>
+		<para>Example: <command>'--user SID' 5004</command></para>
 		</listitem>
 		</varlistentry>
 
 		<varlistentry>
-		<term>-c account-control</term>
+		<term>-c|--account-control 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 are listed below.
 	</para>
@@ -263,7 +276,7 @@ samba:45:0F2B255F7B67A7A9AAD3B435B51404EE:
                 </varlistentry>
 
 		<varlistentry>
-		<term>-a</term>
+		<term>-a|--create</term>
 		<listitem><para>This option is used to add a user into the
 		database. This command needs a user name specified with
 		the -u switch. When adding a new user, pdbedit will also
@@ -289,7 +302,7 @@ retype new password
 		</varlistentry>
 		
 		<varlistentry>
-		<term>-t, --password-from-stdin</term>
+		<term>-t|--password-from-stdin</term>
 		<listitem><para>This option causes pdbedit to read the password
 		from standard input, rather than from /dev/tty (like the
 		<command>passwd(1)</command> program does).  The password has
@@ -298,7 +311,7 @@ retype new password
 		</varlistentry>
 
 		<varlistentry>
-		<term>-r</term>
+		<term>-r|--modify</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 
@@ -308,7 +321,7 @@ retype new password
 		</varlistentry>
 			
 		<varlistentry>
-		<term>-m</term>
+		<term>-m|--machine</term>
 		<listitem><para>This option may only be used in conjunction 
 		with the <parameter>-a</parameter> option. It will make
 		pdbedit to add a machine trust account instead of a user
@@ -321,7 +334,7 @@ retype new password
 		
 		
 		<varlistentry>
-		<term>-x</term>
+		<term>-x|--delete</term>
 		<listitem><para>This option causes pdbedit to delete an account
 		from the database. It needs a username specified with the
 		-u switch.</para>
@@ -332,7 +345,7 @@ retype new password
 		
 
 		<varlistentry>
-		<term>-i passdb-backend</term>
+		<term>-i|--import passdb-backend</term>
 		<listitem><para>Use a different passdb backend to retrieve users
                 than the one specified in smb.conf. Can be used to import data into
                 your local user database.</para>
@@ -346,7 +359,7 @@ retype new password
 		</varlistentry>
 
 		<varlistentry>
-		<term>-e passdb-backend</term>
+		<term>-e|--export passdb-backend</term>
 		<listitem><para>Exports all currently available users to the
 		specified password database backend.</para>
 
@@ -358,7 +371,7 @@ retype new password
 		</varlistentry>
 
 		<varlistentry>
-		<term>-g</term>
+		<term>-g|--group</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>
@@ -370,7 +383,7 @@ retype new password
 		</varlistentry>
 
 		<varlistentry>
-		<term>-b passdb-backend</term>
+		<term>-b|--backend passdb-backend</term>
 		<listitem><para>Use a different default passdb backend. </para>
 
 		<para>Example: <command>pdbedit -b xml:/root/pdb-backup.xml -l</command></para>
@@ -378,7 +391,7 @@ retype new password
 		</varlistentry>
 
 		<varlistentry>
-		<term>-P account-policy</term>
+		<term>-P|--account-policy account-policy</term>
 		<listitem><para>Display an account policy</para>
 		<para>Valid policies are: minimum password age, reset count minutes, disconnect time,
 		user must logon to change password, password history, lockout duration, min password length,
@@ -394,7 +407,7 @@ account policy value for bad lockout attempt is 0
 
 
 		<varlistentry>
-		<term>-C account-policy-value</term>
+		<term>-C|--value account-policy-value</term>
 		<listitem><para>Sets an account policy to a specified value. 
 		This option may only be used in conjunction
 		with the <parameter>-P</parameter> option.
@@ -409,7 +422,7 @@ account policy value for bad lockout attempt is now 3
 		</varlistentry>
 
 		<varlistentry>
-		<term>-y</term>
+		<term>-y|--policies</term>
 		<listitem><para>If you specify <parameter>-y</parameter>,
 		then <parameter>-i in-backend -e out-backend</parameter>
 		applies to the account policies instead of the user database.</para>
@@ -422,6 +435,73 @@ account policy value for bad lockout attempt is now 3
 		</listitem>
 		</varlistentry>
 
+		<varlistentry>
+		<term>--force-initialized-passwords</term>
+		<listitem><para>This option forces all users to change their
+				password upon next login.
+		</para>
+		</listitem>
+		</varlistentry>
+
+		<varlistentry>
+		<term>-N|--account-desc description</term>
+		<listitem><para>This option can be used while adding or
+		modifing a user account. It will specify the user's description
+		field.</para>
+
+		<para>Example: <command>-N "test description"</command>
+		</para>
+		</listitem>
+		</varlistentry>
+
+		<varlistentry>
+		<term>-Z|--logon-hours-reset</term>
+		<listitem><para>This option can be used while adding or
+		modifing a user account. It will reset the user's allowed logon
+		hours. A user may login at any time afterwards.</para>
+
+		<para>Example: <command>-Z</command>
+		</para>
+		</listitem>
+		</varlistentry>
+
+		<varlistentry>
+		<term>-z|--bad-password-count-reset</term>
+		<listitem><para>This option can be used while adding or
+		modifing a user account. It will reset the stored bad login
+		counter from a specified user.</para>
+
+		<para>Example: <command>-z</command>
+		</para>
+		</listitem>
+		</varlistentry>
+
+		<varlistentry>
+		<term>--policies-reset</term>
+		<listitem><para>This option can be used to reset the general
+				password policies stored for a domain to their
+				default values.</para>
+		<para>Example: <command>--policies-reset</command>
+		</para>
+		</listitem>
+		</varlistentry>
+
+		<varlistentry>
+		<term>-I|--domain</term>
+		<listitem><para>This option can be used while adding or
+		modifing a user account. It will specify the user's domain field.</para>
+
+		<para>Example: <command>-I "MYDOMAIN"</command>
+		</para>
+		</listitem>
+		</varlistentry>
+
+		<varlistentry>
+		<term>--time-format</term>
+		<listitem><para>This option is currently not being used.</para>
+		</listitem>
+		</varlistentry>
+
 		&stdarg.help;
 		&stdarg.server.debug;
 		&popt.common.samba;
diff --git a/docs-xml/manpages-3/rpcclient.1.xml b/docs-xml/manpages-3/rpcclient.1.xml
index f7cef5f1fb..1a546a9598 100644
--- a/docs-xml/manpages-3/rpcclient.1.xml
+++ b/docs-xml/manpages-3/rpcclient.1.xml
@@ -29,7 +29,6 @@
 		<arg choice="opt">-s &lt;smb config file&gt;</arg>
 		<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>
@@ -70,7 +69,7 @@
 
 		
 		<varlistentry>
-		<term>-I IP-address</term>
+		<term>-I|--dest-ip 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>
 
@@ -87,6 +86,14 @@
 		above. </para></listitem>
 		</varlistentry>
 
+		<varlistentry>
+		<term>-p|--port port</term>
+		<listitem><para>This number is the TCP port number that will be used
+		when making connections to the server. The standard (well-known)
+		TCP port number for an SMB/CIFS server is 139, which is the
+		default. </para></listitem>
+		</varlistentry>
+
 		&stdarg.server.debug;
 		&popt.common.samba;
 		&popt.common.credentials;		
diff --git a/docs-xml/manpages-3/smbcacls.1.xml b/docs-xml/manpages-3/smbcacls.1.xml
index 30b389e9d0..3e63b9b0d4 100644
--- a/docs-xml/manpages-3/smbcacls.1.xml
+++ b/docs-xml/manpages-3/smbcacls.1.xml
@@ -55,7 +55,7 @@
 
 	<variablelist>
 		<varlistentry>
-		<term>-a acls</term>
+		<term>-a|--add acls</term>
 		<listitem><para>Add the ACLs specified to the ACL list.  Existing 
 		access control entries are unchanged. </para></listitem>
 		</varlistentry>
@@ -63,7 +63,7 @@
 		
 		
 		<varlistentry>
-		<term>-M acls</term>
+		<term>-M|--modify acls</term>
 		<listitem><para>Modify the mask value (permissions) for the ACLs 
 		specified on the command line.  An error will be printed for each 
 		ACL specified that was not already present in the ACL list
@@ -73,7 +73,7 @@
 		
 		
 		<varlistentry>
-		<term>-D acls</term>
+		<term>-D|--delete acls</term>
 		<listitem><para>Delete any ACLs specified on the command line.  
 		An error will be printed for each ACL specified that was not 
 		already present in the ACL list. </para></listitem>
@@ -82,7 +82,7 @@
 		
 		
 		<varlistentry>
-		<term>-S acls</term>
+		<term>-S|--set acls</term>
 		<listitem><para>This command sets the ACLs on the file with 
 		only the ones specified on the command line.  All other ACLs are 
 		erased. Note that the ACL specified must contain at least a revision,
@@ -92,20 +92,7 @@
 		
 		
 		<varlistentry>
-		<term>-U username</term>
-		<listitem><para>Specifies a username used to connect to the 
-		specified service.  The username may be of the form "username" in 
-		which case the user is prompted to enter in a password and the 
-		workgroup specified in the <citerefentry><refentrytitle>smb.conf</refentrytitle>
-		<manvolnum>5</manvolnum></citerefentry> file is 
-		used, or "username%password"  or "DOMAIN\username%password" and the 
-		password and workgroup names are used as provided. </para></listitem>
-		</varlistentry>
-		
-		
-		
-		<varlistentry>
-		<term>-C name</term>
+		<term>-C|--chown name</term>
 		<listitem><para>The owner of a file or directory can be changed 
 		to the name given using the <parameter>-C</parameter> option.  
 		The name can be a sid in the form S-1-x-y-z or a name resolved 
@@ -118,7 +105,7 @@
 		
 		
 		<varlistentry>
-		<term>-G name</term>
+		<term>-G|--chgrp name</term>
 		<listitem><para>The group owner of a file or directory can 
 		be changed to the name given using the <parameter>-G</parameter> 
 		option.  The name can be a sid in the form S-1-x-y-z or a name 
@@ -138,7 +125,7 @@
 		</varlistentry>
 		
 		<varlistentry>
-		<term>-t</term>
+		<term>-t|--test-args</term>
 		<listitem><para>
 		Don't actually do anything, only validate the correctness of 
 		the arguments.
@@ -148,6 +135,7 @@
 		&stdarg.help;
 		&stdarg.server.debug;
 		&popt.common.samba;
+		&popt.common.credentials;
 	</variablelist>
 </refsect1>
 
diff --git a/docs-xml/manpages-3/smbclient.1.xml b/docs-xml/manpages-3/smbclient.1.xml
index 6b4311d933..9c3a97f6de 100644
--- a/docs-xml/manpages-3/smbclient.1.xml
+++ b/docs-xml/manpages-3/smbclient.1.xml
@@ -144,7 +144,7 @@
 		</varlistentry>
 		
 		<varlistentry>
-		<term>-R &lt;name resolve order&gt;</term> 
+		<term>-R|--name-resolve &lt;name resolve order&gt;</term>
 		<listitem><para>This option is used by the programs in the Samba 
 		suite to determine what naming services and in what order to resolve 
 		host names to IP addresses. The option takes a space-separated 
@@ -201,7 +201,7 @@
 		
 		
 		<varlistentry>
-		<term>-M NetBIOS name</term>
+		<term>-M|--message NetBIOS name</term>
 		<listitem><para>This options allows you to send messages, using 
 		the "WinPopup" protocol, to another computer. Once a connection is 
 		established you then type your message, pressing ^D (control-D) to 
@@ -237,7 +237,7 @@
 		</varlistentry>
 
 		<varlistentry>
-		<term>-p port</term>
+		<term>-p|--port port</term>
 		<listitem><para>This number is the TCP port number that will be used 
 		when making connections to the server. The standard (well-known)
 		TCP port number for an SMB/CIFS server is 139, which is the 
@@ -245,7 +245,7 @@
 		</varlistentry>
 
 		<varlistentry>
-		<term>-g</term>
+		<term>-g|--grepable</term>
 		<listitem><para>This parameter provides combined with
 		<parameter>-L</parameter> easy parseable output	that allows processing
 		with utilities such as grep and cut.
@@ -253,6 +253,12 @@
 		</varlistentry>
 
 		<varlistentry>
+		<term>-m|--max-protocol protocol</term>
+		<listitem><para>This parameter sets the maximum protocol version announced by the client.
+		</para></listitem>
+		</varlistentry>
+
+		<varlistentry>
 		<term>-P</term>
 		<listitem><para>
 		Make queries to the external server using the machine account of the local server.
@@ -262,7 +268,7 @@
 		&stdarg.help;
 
 		<varlistentry>
-		<term>-I IP-address</term>
+		<term>-I|--ip-address 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>
 
@@ -280,7 +286,7 @@
 		</varlistentry>
 		
 		<varlistentry>
-		<term>-E</term>
+		<term>-E|--stderr</term>
 		<listitem><para>This parameter causes the client to write messages 
 		to the standard error stream (stderr) rather than to the standard 
 		output stream. </para>
@@ -290,7 +296,7 @@
 		</varlistentry>
 		
 		<varlistentry>
-		<term>-L</term>
+		<term>-L|--list</term>
 		<listitem><para>This option allows you to look at what services 
 		are available on a server. You use it as <command>smbclient -L 
 		host</command> and a list should appear.  The <parameter>-I
@@ -300,7 +306,7 @@
 		</varlistentry>
 		
 		<varlistentry>	
-		<term>-b buffersize</term>
+		<term>-b|--send-buffer buffersize</term>
 		<listitem><para>This option changes the transmit/send buffer 
 		size when getting or putting a file from/to the server. The default 
 		is 65520 bytes. Setting this value smaller (to 1200 bytes) has been 
@@ -326,7 +332,7 @@
 		&popt.common.connection;
 		
 		<varlistentry>
-		<term>-T tar options</term>
+		<term>-T|--tar tar options</term>
 		<listitem><para>smbclient may be used to create <command>tar(1)
 		</command> compatible backups of all the files on an SMB/CIFS
 		share. The secondary tar flags that can be given to this option 
@@ -455,13 +461,13 @@
 		</varlistentry>
 		
 		<varlistentry>
-		<term>-D initial directory</term>
+		<term>-D|--directory initial directory</term>
 		<listitem><para>Change to initial directory before starting. Probably 
 		only of any use with the tar -T option. </para></listitem>
 		</varlistentry>
 		
 		<varlistentry>
-		<term>-c command string</term>
+		<term>-c|--comand command string</term>
 		<listitem><para>command string is a semicolon-separated list of 
 		commands to be executed instead of prompting from stdin. <parameter>
 		-N</parameter> is implied by <parameter>-c</parameter>.</para>
diff --git a/docs-xml/manpages-3/smbget.1.xml b/docs-xml/manpages-3/smbget.1.xml
index 1260ad1d88..e4094ab096 100644
--- a/docs-xml/manpages-3/smbget.1.xml
+++ b/docs-xml/manpages-3/smbget.1.xml
@@ -34,6 +34,7 @@
 		<arg choice="opt">-q, --quiet</arg>
 		<arg choice="opt">-v, --verbose</arg>
 		<arg choice="opt">-b, --blocksize</arg>
+		<arg choice="opt">-O, --stdout</arg>
 		<arg choice="opt">-?, --help</arg>
 		<arg choice="opt">--usage</arg>
 		<arg choice="req">smb://host/share/path/to/file</arg>
@@ -112,7 +113,12 @@
 
 	<varlistentry>
 		<term>-o, --outputfile</term>
-		<listitem><para>Write the file that is being download to the specified file. Can not be used together with -R.</para></listitem>
+		<listitem><para>Write the file that is being downloaded to the specified file. Can not be used together with -R.</para></listitem>
+	</varlistentry>
+
+	<varlistentry>
+		<term>-O, --stdout</term>
+		<listitem><para>Write the file that is being downloaded to standard output.</para></listitem>
 	</varlistentry>
 
 	<varlistentry>
diff --git a/docs-xml/manpages-3/smbtree.1.xml b/docs-xml/manpages-3/smbtree.1.xml
index 3864a61620..d69aef13ba 100644
--- a/docs-xml/manpages-3/smbtree.1.xml
+++ b/docs-xml/manpages-3/smbtree.1.xml
@@ -46,21 +46,21 @@
 
 	<variablelist>
 		<varlistentry>
-		<term>-b</term>
+		<term>-b|--broadcast</term>
 		<listitem><para>Query network nodes by sending requests 
 		as broadcasts instead of querying the local master browser.
 		</para></listitem>
 		</varlistentry>
 
 		<varlistentry>
-		<term>-D</term>
+		<term>-D|--domains</term>
 		<listitem><para>Only print a list of all 
 		the domains known on broadcast or by the 
 		master browser</para></listitem>
 		</varlistentry>
 
 		<varlistentry>
-		<term>-S</term>
+		<term>-S|--servers</term>
 		<listitem><para>Only print a list of 
 		all the domains and servers responding on broadcast or 
 		known by the master browser. 
diff --git a/docs-xml/manpages-3/tdbbackup.8.xml b/docs-xml/manpages-3/tdbbackup.8.xml
index 5c42371ea2..78fe32eb8e 100644
--- a/docs-xml/manpages-3/tdbbackup.8.xml
+++ b/docs-xml/manpages-3/tdbbackup.8.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <refentry id="tdbbackup.8">
 
 <refmeta>
diff --git a/docs-xml/manpages-3/tdbdump.8.xml b/docs-xml/manpages-3/tdbdump.8.xml
index 8e42e08622..90465e53e8 100644
--- a/docs-xml/manpages-3/tdbdump.8.xml
+++ b/docs-xml/manpages-3/tdbdump.8.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <refentry id="tdbdump.8">
 
 <refmeta>
diff --git a/docs-xml/manpages-3/tdbtool.8.xml b/docs-xml/manpages-3/tdbtool.8.xml
index 042c88cdc6..9f96db277d 100644
--- a/docs-xml/manpages-3/tdbtool.8.xml
+++ b/docs-xml/manpages-3/tdbtool.8.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <refentry id="tdbtool.8">
 
 <refmeta>