Merge 3.5.1 from experimental

git-svn-id: svn://svn.debian.org/svn/pkg-samba/trunk/samba@3414 fc4039ab-9d04-0410-8cac-899223bdd6b0

1 files changed, 28 insertions, 28 deletions

diff --git a/docs-xml/manpages-3/smbclient.1.xml b/docs-xml/manpages-3/smbclient.1.xml
index 1a2b0aaff7..cadd2ea9cd 100644
--- a/docs-xml/manpages-3/smbclient.1.xml
+++ b/docs-xml/manpages-3/smbclient.1.xml
@@ -7,7 +7,7 @@
 	<manvolnum>1</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">User Commands</refmiscinfo>
-	<refmiscinfo class="version">3.4</refmiscinfo>
+	<refmiscinfo class="version">3.5</refmiscinfo>
 </refmeta>
 
 
@@ -30,6 +30,7 @@
 		<arg choice="opt">-m maxprotocol</arg>
 		<arg choice="opt">-A authfile</arg>
 		<arg choice="opt">-N</arg>
+		<arg choice="opt">-C</arg>
 		<arg choice="opt">-g</arg>
 		<arg choice="opt">-i scope</arg>
 		<arg choice="opt">-O &lt;socket options&gt;</arg>
@@ -55,6 +56,7 @@
 		<arg choice="opt">-m maxprotocol</arg>
 		<arg choice="opt">-A authfile</arg>
 		<arg choice="opt">-N</arg>
+		<arg choice="opt">-C</arg>
 		<arg choice="opt">-g</arg>
 		<arg choice="opt">-l log-basename</arg>
 		<arg choice="opt">-I destinationIP</arg>
@@ -144,7 +146,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 +203,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 +239,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 +247,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 +255,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 +270,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 +288,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 +298,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
@@ -299,24 +307,8 @@
 		host on another network. </para></listitem>
 		</varlistentry>
 		
-		<varlistentry>
-		<term>-t terminal code</term>
-		<listitem><para>This option tells <command>smbclient</command> how to interpret 
-		filenames coming from the remote server. Usually Asian language 
-		multibyte UNIX implementations use different character sets than 
-		SMB/CIFS servers (<emphasis>EUC</emphasis> instead of <emphasis>
-		SJIS</emphasis> for example). Setting this parameter will let 
-		<command>smbclient</command> convert between the UNIX filenames and 
-		the SMB filenames correctly. This option has not been seriously tested 
-		and may have some problems. </para>
-
-		<para>The terminal codes include CWsjis, CWeuc, CWjis7, CWjis8,
-		CWjunet, CWhex, CWcap. This is not a complete list, check the Samba 
-		source code for the complete list. </para></listitem>
-		</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 
@@ -342,7 +334,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 
@@ -471,13 +463,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>
@@ -916,6 +908,14 @@
 		</varlistentry>
 
 		<varlistentry>
+		<term>readlink symlinkname</term>
+		<listitem><para>This command depends on the server supporting the CIFS
+		UNIX extensions and will fail if the server does not. Print
+		the value of the symlink "symlinkname".
+		</para></listitem>
+		</varlistentry>
+
+		<varlistentry>
 		<term>rd &lt;directory name&gt;</term>
 		<listitem><para>See the rmdir command. </para></listitem>
 		</varlistentry>