[Pkg-samba-maint] [samba] 66/135: docs: fix testparm 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 1d10487b74ad95a830319ada45f6ffe8bc6147d5
Author: Günther Deschner <gd at samba.org>
Date:   Mon Nov 18 13:45:38 2013 +0100

    docs: fix testparm manpage.
    
    Guenther
    
    Signed-off-by: Günther Deschner <gd at samba.org>
    Reviewed-by: Andreas Schneider <asn at samba.org>
    (cherry picked from commit 0674ef7c5b3551564894ee7b8810ee3c18857922)
---
 docs-xml/manpages/testparm.1.xml | 38 +++++++++++++++++++++++---------------
 1 file changed, 23 insertions(+), 15 deletions(-)

diff --git a/docs-xml/manpages/testparm.1.xml b/docs-xml/manpages/testparm.1.xml
index 5d4a6b9..b47a45f 100644
--- a/docs-xml/manpages/testparm.1.xml
+++ b/docs-xml/manpages/testparm.1.xml
@@ -20,10 +20,9 @@
 <refsynopsisdiv>
 	<cmdsynopsis>
 		<command>testparm</command>
-		<arg choice="opt">-s</arg>
-		<arg choice="opt">-h</arg>
-		<arg choice="opt">-v</arg>
-		<arg choice="opt">-t <encoding></arg>
+		<arg choice="opt">-s|--suppress-prompt</arg>
+		<arg choice="opt">--help</arg>
+		<arg choice="opt">-v|--verbose</arg>
 		<arg choice="req">config filename</arg>
 		<arg choice="opt">hostname hostIP</arg>
 	</cmdsynopsis>
@@ -63,17 +62,19 @@
 
 	<variablelist>
 		<varlistentry>
-		<term>-s</term>
+		<term>-s|--suppress-prompt</term>
 		<listitem><para>Without this option, <command>testparm</command> 
 		will prompt for a carriage return after printing the service 
 		names and before dumping the service definitions.</para></listitem>
 		</varlistentry>
 
-		&stdarg.help;
 		&stdarg.version;
-		
+		&stdarg.option;
+		&popt.autohelp;
+		&stdarg.client.debug;
+
 		<varlistentry>
-		<term>-v</term>
+		<term>-v|--verbose</term>
 		<listitem><para>If this option is specified, testparm 
 		will also output all options that were not used in <citerefentry>
 		<refentrytitle>smb.conf</refentrytitle><manvolnum>5</manvolnum>
@@ -81,13 +82,6 @@
 		</varlistentry>
 
 		<varlistentry>
-		<term>-t encoding</term>
-		<listitem><para>
-		Output data in specified encoding.
-		</para></listitem>
-		</varlistentry>
-
-		<varlistentry>
 		<term>--parameter-name parametername</term>
 		<listitem><para>
 		Dumps the named parameter.  If no section-name is set the view
@@ -107,6 +101,20 @@
 		</varlistentry>
 
 		<varlistentry>
+		<term>--show-all-parameters</term>
+		<listitem><para>
+				Show the parameters, type, possible values.
+		</para></listitem>
+		</varlistentry>
+
+		<varlistentry>
+		<term>-l|--skip-logic-checks</term>
+		<listitem><para>
+				Skip the global checks.
+		</para></listitem>
+		</varlistentry>
+
+		<varlistentry>
 		<term>configfilename</term>
 		<listitem><para>This is the name of the configuration file 
 		to check. If this parameter is not present then the 

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