https://fedorahosted.org/sssd/ticket/1546

This affected all tools except of sss_obfuscate (the option parser we use in Python generates -h). So the original message is still in use by this tool, but is moved to param_help_py.xml.

Patch attached.

Michal
>From a086f4ca60e322e691e249cfb027634cb874fd00 Mon Sep 17 00:00:00 2001
From: Michal Zidek <mzi...@redhat.com>
Date: Mon, 1 Oct 2012 11:53:00 +0200
Subject: [PATCH] Change option to display help message in man pages.

POPT_AUTOHELP generates -? and --help options and not -h to
display help message.

https://fedorahosted.org/sssd/ticket/1546
---
 src/man/include/param_help.xml    |  2 +-
 src/man/include/param_help_py.xml | 10 ++++++++++
 src/man/sss_obfuscate.8.xml       |  2 +-
 3 files changed, 12 insertions(+), 2 deletions(-)
 create mode 100644 src/man/include/param_help_py.xml

diff --git a/src/man/include/param_help.xml b/src/man/include/param_help.xml
index a2478bf..d28020b 100644
--- a/src/man/include/param_help.xml
+++ b/src/man/include/param_help.xml
@@ -1,6 +1,6 @@
 <varlistentry>
     <term>
-        <option>-h</option>,<option>--help</option>
+        <option>-?</option>,<option>--help</option>
     </term>
     <listitem>
         <para>
diff --git a/src/man/include/param_help_py.xml b/src/man/include/param_help_py.xml
new file mode 100644
index 0000000..a2478bf
--- /dev/null
+++ b/src/man/include/param_help_py.xml
@@ -0,0 +1,10 @@
+<varlistentry>
+    <term>
+        <option>-h</option>,<option>--help</option>
+    </term>
+    <listitem>
+        <para>
+            Display help message and exit.
+        </para>
+    </listitem>
+</varlistentry>
diff --git a/src/man/sss_obfuscate.8.xml b/src/man/sss_obfuscate.8.xml
index 7b152fa..eeea5fa 100644
--- a/src/man/sss_obfuscate.8.xml
+++ b/src/man/sss_obfuscate.8.xml
@@ -57,7 +57,7 @@
     <refsect1 id='options'>
         <title>OPTIONS</title>
         <variablelist remap='IP'>
-            <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="include/param_help.xml" />
+            <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="include/param_help_py.xml" />
             <varlistentry>
                 <term>
                     <option>-s</option>,<option>--stdin</option>
-- 
1.7.11.2

_______________________________________________
sssd-devel mailing list
sssd-devel@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/sssd-devel

Reply via email to