[Pkg-samba-maint] [samba] 57/135: docs: use popt.autohelp and remove duplicate -e option from smbclient manpage.

[Ivo De Decker]

This is an automated email from the git hooks/post-receive script.

ivodd pushed a commit to branch master
in repository samba.

commit 6659b3ab9f84ff06ddcd5ffbb785589f9df2e5d2
Author: Günther Deschner <gd at samba.org>
Date:   Mon Nov 18 12:16:00 2013 +0100

    docs: use popt.autohelp and remove duplicate -e option from smbclient manpage.
    
    Guenther
    
    Signed-off-by: Günther Deschner <gd at samba.org>
    Reviewed-by: Andreas Schneider <asn at samba.org>
    (cherry picked from commit a2899b157f6096fd48e0c9a16a8cb7c848736ea4)
---
 docs-xml/manpages/smbclient.1.xml | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/docs-xml/manpages/smbclient.1.xml b/docs-xml/manpages/smbclient.1.xml
index 3b067e5..d531390 100644
--- a/docs-xml/manpages/smbclient.1.xml
+++ b/docs-xml/manpages/smbclient.1.xml
@@ -276,8 +276,6 @@
 		</para></listitem>
 		</varlistentry>
 
-		&stdarg.help;
-
 		<varlistentry>
 		<term>-I|--ip-address IP-address</term>
 		<listitem><para><replaceable>IP address</replaceable> is the address of the server to connect to.
@@ -332,19 +330,6 @@
 		</varlistentry>
 		
 		<varlistentry>
-		<term>-e|--encrypt</term>
-		<listitem><para>
-		This command line parameter requires the remote
-		server support the UNIX extensions or that the SMB3 protocol has been selected.
-		Requests that the connection be encrypted. Negotiates SMB encryption using either
-		SMB3 or POSIX extensions via GSSAPI. Uses the given credentials for
-		the encryption negotiation (either kerberos or NTLMv1/v2 if given
-		domain/username/password triple. Fails the connection if encryption
-		cannot be negotiated.
-		</para></listitem>
-		</varlistentry>
-
-		<varlistentry>
 		<term>-B|--browse</term>
 		<listitem><para>Browse SMB servers using DNS.</para>
 		</listitem>
@@ -354,6 +339,7 @@
 		&popt.common.samba;
 		&popt.common.credentials;
 		&popt.common.connection;
+		&popt.autohelp;
 		
 		<varlistentry>
 		<term>-t|--timeout <timeout-seconds></term>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-samba/samba.git