From 15c253a28d03a1fadd12d576f410addcf3a1f151 Mon Sep 17 00:00:00 2001
From: Adam Spiers <aspiers@suse.com>
Date: Tue, 17 Oct 2017 14:20:33 +0100
Subject: [PATCH] fencing: fix help for --quiet

--quiet erroneously referred to a --debug option which does not exist,
and further implied that --debug affected logging to syslog, which is
not even true of --debug-file, which logs to a file independently of
logging to syslog.  So fix the text to clarify that --quiet affects
neither logging to a debug file specified by --debug-file, nor logging
to syslog.
---
 fence/agents/autodetect/fencing.py            | 2 +-
 fence/agents/lib/fencing.py.py                | 2 +-
 tests/data/metadata/fence_alom.xml            | 2 +-
 tests/data/metadata/fence_amt.xml             | 2 +-
 tests/data/metadata/fence_amt_ws.xml          | 2 +-
 tests/data/metadata/fence_apc.xml             | 2 +-
 tests/data/metadata/fence_apc_snmp.xml        | 2 +-
 tests/data/metadata/fence_azure_arm.xml       | 2 +-
 tests/data/metadata/fence_bladecenter.xml     | 2 +-
 tests/data/metadata/fence_brocade.xml         | 2 +-
 tests/data/metadata/fence_cisco_mds.xml       | 2 +-
 tests/data/metadata/fence_cisco_ucs.xml       | 2 +-
 tests/data/metadata/fence_compute.xml         | 2 +-
 tests/data/metadata/fence_docker.xml          | 2 +-
 tests/data/metadata/fence_drac.xml            | 2 +-
 tests/data/metadata/fence_drac5.xml           | 2 +-
 tests/data/metadata/fence_dummy.xml           | 2 +-
 tests/data/metadata/fence_eaton_snmp.xml      | 2 +-
 tests/data/metadata/fence_emerson.xml         | 2 +-
 tests/data/metadata/fence_eps.xml             | 2 +-
 tests/data/metadata/fence_evacuate.xml        | 2 +-
 tests/data/metadata/fence_hds_cb.xml          | 2 +-
 tests/data/metadata/fence_heuristics_ping.xml | 2 +-
 tests/data/metadata/fence_hpblade.xml         | 2 +-
 tests/data/metadata/fence_ibmblade.xml        | 2 +-
 tests/data/metadata/fence_idrac.xml           | 2 +-
 tests/data/metadata/fence_ifmib.xml           | 2 +-
 tests/data/metadata/fence_ilo.xml             | 2 +-
 tests/data/metadata/fence_ilo2.xml            | 2 +-
 tests/data/metadata/fence_ilo3.xml            | 2 +-
 tests/data/metadata/fence_ilo3_ssh.xml        | 2 +-
 tests/data/metadata/fence_ilo4.xml            | 2 +-
 tests/data/metadata/fence_ilo4_ssh.xml        | 2 +-
 tests/data/metadata/fence_ilo_moonshot.xml    | 2 +-
 tests/data/metadata/fence_ilo_mp.xml          | 2 +-
 tests/data/metadata/fence_ilo_ssh.xml         | 2 +-
 tests/data/metadata/fence_imm.xml             | 2 +-
 tests/data/metadata/fence_intelmodular.xml    | 2 +-
 tests/data/metadata/fence_ipdu.xml            | 2 +-
 tests/data/metadata/fence_ipmilan.xml         | 2 +-
 tests/data/metadata/fence_ironic.xml          | 2 +-
 tests/data/metadata/fence_kdump.xml           | 2 +-
 tests/data/metadata/fence_ldom.xml            | 2 +-
 tests/data/metadata/fence_lpar.xml            | 2 +-
 tests/data/metadata/fence_mpath.xml           | 2 +-
 tests/data/metadata/fence_netio.xml           | 2 +-
 tests/data/metadata/fence_ovh.xml             | 2 +-
 tests/data/metadata/fence_powerman.xml        | 2 +-
 tests/data/metadata/fence_pve.xml             | 2 +-
 tests/data/metadata/fence_raritan.xml         | 2 +-
 tests/data/metadata/fence_rcd_serial.xml      | 2 +-
 tests/data/metadata/fence_rhevm.xml           | 2 +-
 tests/data/metadata/fence_rsa.xml             | 2 +-
 tests/data/metadata/fence_rsb.xml             | 2 +-
 tests/data/metadata/fence_sanbox2.xml         | 2 +-
 tests/data/metadata/fence_sbd.xml             | 2 +-
 tests/data/metadata/fence_scsi.xml            | 2 +-
 tests/data/metadata/fence_tripplite_snmp.xml  | 2 +-
 tests/data/metadata/fence_vbox.xml            | 2 +-
 tests/data/metadata/fence_virsh.xml           | 2 +-
 tests/data/metadata/fence_vmware.xml          | 2 +-
 tests/data/metadata/fence_vmware_soap.xml     | 2 +-
 tests/data/metadata/fence_wti.xml             | 2 +-
 tests/data/metadata/fence_xenapi.xml          | 2 +-
 tests/data/metadata/fence_zvmip.xml           | 2 +-
 65 files changed, 65 insertions(+), 65 deletions(-)

Index: fence-agents-4.0.25+git.1485179354.eb43835/fence/agents/autodetect/fencing.py
===================================================================
--- fence-agents-4.0.25+git.1485179354.eb43835.orig/fence/agents/autodetect/fencing.py
+++ fence-agents-4.0.25+git.1485179354.eb43835/fence/agents/autodetect/fencing.py
@@ -439,7 +439,7 @@ all_opt = {
 	"quiet": {
 		"getopt" : "q",
 		"longopt": "quiet",
-		"help" : "-q, --quiet                    Disable logging to stderr. Does not affect --verbose or --debug logging to syslog.",
+		"help" : "-q, --quiet                    Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.",
 		"required" : "0",
 		"order" : 50}
 }
Index: fence-agents-4.0.25+git.1485179354.eb43835/fence/agents/lib/fencing.py.py
===================================================================
--- fence-agents-4.0.25+git.1485179354.eb43835.orig/fence/agents/lib/fencing.py.py
+++ fence-agents-4.0.25+git.1485179354.eb43835/fence/agents/lib/fencing.py.py
@@ -451,7 +451,7 @@ all_opt = {
 	"quiet": {
 		"getopt" : "q",
 		"longopt": "quiet",
-		"help" : "-q, --quiet                    Disable logging to stderr. Does not affect --verbose or --debug logging to syslog.",
+		"help" : "-q, --quiet                    Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.",
 		"required" : "0",
 		"order" : 50}
 }
Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_alom.xml
===================================================================
--- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_alom.xml
+++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_alom.xml
@@ -106,7 +106,7 @@
 	<parameter name="quiet" unique="0" required="0">
 		<getopt mixed="-q, --quiet" />
 		<content type="boolean"  />
-		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug logging to syslog.</shortdesc>
+		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
 	</parameter>
 	<parameter name="verbose" unique="0" required="0">
 		<getopt mixed="-v, --verbose" />
Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_amt.xml
===================================================================
--- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_amt.xml
+++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_amt.xml
@@ -85,7 +85,7 @@
 	<parameter name="quiet" unique="0" required="0">
 		<getopt mixed="-q, --quiet" />
 		<content type="boolean"  />
-		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug logging to syslog.</shortdesc>
+		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
 	</parameter>
 	<parameter name="verbose" unique="0" required="0">
 		<getopt mixed="-v, --verbose" />
Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_amt_ws.xml
===================================================================
--- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_amt_ws.xml
+++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_amt_ws.xml
@@ -85,7 +85,7 @@
 	<parameter name="quiet" unique="0" required="0">
 		<getopt mixed="-q, --quiet" />
 		<content type="boolean"  />
-		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug logging to syslog.</shortdesc>
+		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
 	</parameter>
 	<parameter name="verbose" unique="0" required="0">
 		<getopt mixed="-v, --verbose" />
Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_apc.xml
===================================================================
--- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_apc.xml
+++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_apc.xml
@@ -111,7 +111,7 @@
 	<parameter name="quiet" unique="0" required="0">
 		<getopt mixed="-q, --quiet" />
 		<content type="boolean"  />
-		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug logging to syslog.</shortdesc>
+		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
 	</parameter>
 	<parameter name="verbose" unique="0" required="0">
 		<getopt mixed="-v, --verbose" />
Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_apc_snmp.xml
===================================================================
--- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_apc_snmp.xml
+++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_apc_snmp.xml
@@ -126,7 +126,7 @@
 	<parameter name="quiet" unique="0" required="0">
 		<getopt mixed="-q, --quiet" />
 		<content type="boolean"  />
-		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug logging to syslog.</shortdesc>
+		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
 	</parameter>
 	<parameter name="verbose" unique="0" required="0">
 		<getopt mixed="-v, --verbose" />
Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_azure_arm.xml
===================================================================
--- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_azure_arm.xml
+++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_azure_arm.xml
@@ -66,7 +66,7 @@
 	<parameter name="quiet" unique="0" required="0">
 		<getopt mixed="-q, --quiet" />
 		<content type="boolean"  />
-		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug logging to syslog.</shortdesc>
+		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
 	</parameter>
 	<parameter name="verbose" unique="0" required="0">
 		<getopt mixed="-v, --verbose" />
Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_bladecenter.xml
===================================================================
--- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_bladecenter.xml
+++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_bladecenter.xml
@@ -106,7 +106,7 @@
 	<parameter name="quiet" unique="0" required="0">
 		<getopt mixed="-q, --quiet" />
 		<content type="boolean"  />
-		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug logging to syslog.</shortdesc>
+		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
 	</parameter>
 	<parameter name="verbose" unique="0" required="0">
 		<getopt mixed="-v, --verbose" />
Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_brocade.xml
===================================================================
--- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_brocade.xml
+++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_brocade.xml
@@ -106,7 +106,7 @@
 	<parameter name="quiet" unique="0" required="0">
 		<getopt mixed="-q, --quiet" />
 		<content type="boolean"  />
-		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug logging to syslog.</shortdesc>
+		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
 	</parameter>
 	<parameter name="verbose" unique="0" required="0">
 		<getopt mixed="-v, --verbose" />
Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_cisco_mds.xml
===================================================================
--- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_cisco_mds.xml
+++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_cisco_mds.xml
@@ -125,7 +125,7 @@
 	<parameter name="quiet" unique="0" required="0">
 		<getopt mixed="-q, --quiet" />
 		<content type="boolean"  />
-		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug logging to syslog.</shortdesc>
+		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
 	</parameter>
 	<parameter name="verbose" unique="0" required="0">
 		<getopt mixed="-v, --verbose" />
Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_cisco_ucs.xml
===================================================================
--- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_cisco_ucs.xml
+++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_cisco_ucs.xml
@@ -101,7 +101,7 @@
 	<parameter name="quiet" unique="0" required="0">
 		<getopt mixed="-q, --quiet" />
 		<content type="boolean"  />
-		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug logging to syslog.</shortdesc>
+		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
 	</parameter>
 	<parameter name="verbose" unique="0" required="0">
 		<getopt mixed="-v, --verbose" />
Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_compute.xml
===================================================================
--- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_compute.xml
+++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_compute.xml
@@ -96,7 +96,7 @@
 	<parameter name="quiet" unique="0" required="0">
 		<getopt mixed="-q, --quiet" />
 		<content type="boolean"  />
-		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug logging to syslog.</shortdesc>
+		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
 	</parameter>
 	<parameter name="verbose" unique="0" required="0">
 		<getopt mixed="-v, --verbose" />
Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_docker.xml
===================================================================
--- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_docker.xml
+++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_docker.xml
@@ -89,7 +89,7 @@
 	<parameter name="quiet" unique="0" required="0">
 		<getopt mixed="-q, --quiet" />
 		<content type="boolean"  />
-		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug logging to syslog.</shortdesc>
+		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
 	</parameter>
 	<parameter name="verbose" unique="0" required="0">
 		<getopt mixed="-v, --verbose" />
Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_drac.xml
===================================================================
--- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_drac.xml
+++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_drac.xml
@@ -86,7 +86,7 @@
 	<parameter name="quiet" unique="0" required="0">
 		<getopt mixed="-q, --quiet" />
 		<content type="boolean"  />
-		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug logging to syslog.</shortdesc>
+		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
 	</parameter>
 	<parameter name="verbose" unique="0" required="0">
 		<getopt mixed="-v, --verbose" />
Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_drac5.xml
===================================================================
--- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_drac5.xml
+++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_drac5.xml
@@ -115,7 +115,7 @@
 	<parameter name="quiet" unique="0" required="0">
 		<getopt mixed="-q, --quiet" />
 		<content type="boolean"  />
-		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug logging to syslog.</shortdesc>
+		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
 	</parameter>
 	<parameter name="verbose" unique="0" required="0">
 		<getopt mixed="-v, --verbose" />
Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_dummy.xml
===================================================================
--- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_dummy.xml
+++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_dummy.xml
@@ -26,7 +26,7 @@
 	<parameter name="quiet" unique="0" required="0">
 		<getopt mixed="-q, --quiet" />
 		<content type="boolean"  />
-		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug logging to syslog.</shortdesc>
+		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
 	</parameter>
 	<parameter name="verbose" unique="0" required="0">
 		<getopt mixed="-v, --verbose" />
Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_eaton_snmp.xml
===================================================================
--- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_eaton_snmp.xml
+++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_eaton_snmp.xml
@@ -125,7 +125,7 @@
 	<parameter name="quiet" unique="0" required="0">
 		<getopt mixed="-q, --quiet" />
 		<content type="boolean"  />
-		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug logging to syslog.</shortdesc>
+		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
 	</parameter>
 	<parameter name="verbose" unique="0" required="0">
 		<getopt mixed="-v, --verbose" />
Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_emerson.xml
===================================================================
--- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_emerson.xml
+++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_emerson.xml
@@ -125,7 +125,7 @@
 	<parameter name="quiet" unique="0" required="0">
 		<getopt mixed="-q, --quiet" />
 		<content type="boolean"  />
-		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug logging to syslog.</shortdesc>
+		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
 	</parameter>
 	<parameter name="verbose" unique="0" required="0">
 		<getopt mixed="-v, --verbose" />
Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_eps.xml
===================================================================
--- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_eps.xml
+++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_eps.xml
@@ -88,7 +88,7 @@ Agent basically works by connecting to h
 	<parameter name="quiet" unique="0" required="0">
 		<getopt mixed="-q, --quiet" />
 		<content type="boolean"  />
-		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug logging to syslog.</shortdesc>
+		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
 	</parameter>
 	<parameter name="verbose" unique="0" required="0">
 		<getopt mixed="-v, --verbose" />
Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_evacuate.xml
===================================================================
--- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_evacuate.xml
+++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_evacuate.xml
@@ -91,7 +91,7 @@
 	<parameter name="quiet" unique="0" required="0">
 		<getopt mixed="-q, --quiet" />
 		<content type="boolean"  />
-		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug logging to syslog.</shortdesc>
+		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
 	</parameter>
 	<parameter name="verbose" unique="0" required="0">
 		<getopt mixed="-v, --verbose" />
Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_hds_cb.xml
===================================================================
--- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_hds_cb.xml
+++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_hds_cb.xml
@@ -106,7 +106,7 @@
 	<parameter name="quiet" unique="0" required="0">
 		<getopt mixed="-q, --quiet" />
 		<content type="boolean"  />
-		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug logging to syslog.</shortdesc>
+		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
 	</parameter>
 	<parameter name="verbose" unique="0" required="0">
 		<getopt mixed="-v, --verbose" />
Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_hpblade.xml
===================================================================
--- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_hpblade.xml
+++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_hpblade.xml
@@ -106,7 +106,7 @@
 	<parameter name="quiet" unique="0" required="0">
 		<getopt mixed="-q, --quiet" />
 		<content type="boolean"  />
-		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug logging to syslog.</shortdesc>
+		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
 	</parameter>
 	<parameter name="verbose" unique="0" required="0">
 		<getopt mixed="-v, --verbose" />
Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_ibmblade.xml
===================================================================
--- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_ibmblade.xml
+++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_ibmblade.xml
@@ -125,7 +125,7 @@
 	<parameter name="quiet" unique="0" required="0">
 		<getopt mixed="-q, --quiet" />
 		<content type="boolean"  />
-		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug logging to syslog.</shortdesc>
+		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
 	</parameter>
 	<parameter name="verbose" unique="0" required="0">
 		<getopt mixed="-v, --verbose" />
Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_idrac.xml
===================================================================
--- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_idrac.xml
+++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_idrac.xml
@@ -117,7 +117,7 @@
 	<parameter name="quiet" unique="0" required="0">
 		<getopt mixed="-q, --quiet" />
 		<content type="boolean"  />
-		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug logging to syslog.</shortdesc>
+		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
 	</parameter>
 	<parameter name="verbose" unique="0" required="0">
 		<getopt mixed="-v, --verbose" />
Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_ifmib.xml
===================================================================
--- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_ifmib.xml
+++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_ifmib.xml
@@ -127,7 +127,7 @@ It was written with managed ethernet swi
 	<parameter name="quiet" unique="0" required="0">
 		<getopt mixed="-q, --quiet" />
 		<content type="boolean"  />
-		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug logging to syslog.</shortdesc>
+		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
 	</parameter>
 	<parameter name="verbose" unique="0" required="0">
 		<getopt mixed="-v, --verbose" />
Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_ilo.xml
===================================================================
--- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_ilo.xml
+++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_ilo.xml
@@ -112,7 +112,7 @@
 	<parameter name="quiet" unique="0" required="0">
 		<getopt mixed="-q, --quiet" />
 		<content type="boolean"  />
-		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug logging to syslog.</shortdesc>
+		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
 	</parameter>
 	<parameter name="verbose" unique="0" required="0">
 		<getopt mixed="-v, --verbose" />
Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_ilo2.xml
===================================================================
--- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_ilo2.xml
+++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_ilo2.xml
@@ -112,7 +112,7 @@
 	<parameter name="quiet" unique="0" required="0">
 		<getopt mixed="-q, --quiet" />
 		<content type="boolean"  />
-		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug logging to syslog.</shortdesc>
+		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
 	</parameter>
 	<parameter name="verbose" unique="0" required="0">
 		<getopt mixed="-v, --verbose" />
Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_ilo3.xml
===================================================================
--- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_ilo3.xml
+++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_ilo3.xml
@@ -117,7 +117,7 @@
 	<parameter name="quiet" unique="0" required="0">
 		<getopt mixed="-q, --quiet" />
 		<content type="boolean"  />
-		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug logging to syslog.</shortdesc>
+		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
 	</parameter>
 	<parameter name="verbose" unique="0" required="0">
 		<getopt mixed="-v, --verbose" />
Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_ilo3_ssh.xml
===================================================================
--- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_ilo3_ssh.xml
+++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_ilo3_ssh.xml
@@ -116,7 +116,7 @@
 	<parameter name="quiet" unique="0" required="0">
 		<getopt mixed="-q, --quiet" />
 		<content type="boolean"  />
-		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug logging to syslog.</shortdesc>
+		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
 	</parameter>
 	<parameter name="verbose" unique="0" required="0">
 		<getopt mixed="-v, --verbose" />
Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_ilo4.xml
===================================================================
--- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_ilo4.xml
+++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_ilo4.xml
@@ -117,7 +117,7 @@
 	<parameter name="quiet" unique="0" required="0">
 		<getopt mixed="-q, --quiet" />
 		<content type="boolean"  />
-		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug logging to syslog.</shortdesc>
+		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
 	</parameter>
 	<parameter name="verbose" unique="0" required="0">
 		<getopt mixed="-v, --verbose" />
Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_ilo4_ssh.xml
===================================================================
--- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_ilo4_ssh.xml
+++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_ilo4_ssh.xml
@@ -116,7 +116,7 @@
 	<parameter name="quiet" unique="0" required="0">
 		<getopt mixed="-q, --quiet" />
 		<content type="boolean"  />
-		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug logging to syslog.</shortdesc>
+		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
 	</parameter>
 	<parameter name="verbose" unique="0" required="0">
 		<getopt mixed="-v, --verbose" />
Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_ilo_moonshot.xml
===================================================================
--- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_ilo_moonshot.xml
+++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_ilo_moonshot.xml
@@ -106,7 +106,7 @@
 	<parameter name="quiet" unique="0" required="0">
 		<getopt mixed="-q, --quiet" />
 		<content type="boolean"  />
-		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug logging to syslog.</shortdesc>
+		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
 	</parameter>
 	<parameter name="verbose" unique="0" required="0">
 		<getopt mixed="-v, --verbose" />
Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_ilo_mp.xml
===================================================================
--- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_ilo_mp.xml
+++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_ilo_mp.xml
@@ -106,7 +106,7 @@
 	<parameter name="quiet" unique="0" required="0">
 		<getopt mixed="-q, --quiet" />
 		<content type="boolean"  />
-		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug logging to syslog.</shortdesc>
+		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
 	</parameter>
 	<parameter name="verbose" unique="0" required="0">
 		<getopt mixed="-v, --verbose" />
Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_ilo_ssh.xml
===================================================================
--- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_ilo_ssh.xml
+++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_ilo_ssh.xml
@@ -116,7 +116,7 @@
 	<parameter name="quiet" unique="0" required="0">
 		<getopt mixed="-q, --quiet" />
 		<content type="boolean"  />
-		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug logging to syslog.</shortdesc>
+		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
 	</parameter>
 	<parameter name="verbose" unique="0" required="0">
 		<getopt mixed="-v, --verbose" />
Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_imm.xml
===================================================================
--- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_imm.xml
+++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_imm.xml
@@ -117,7 +117,7 @@
 	<parameter name="quiet" unique="0" required="0">
 		<getopt mixed="-q, --quiet" />
 		<content type="boolean"  />
-		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug logging to syslog.</shortdesc>
+		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
 	</parameter>
 	<parameter name="verbose" unique="0" required="0">
 		<getopt mixed="-v, --verbose" />
Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_intelmodular.xml
===================================================================
--- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_intelmodular.xml
+++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_intelmodular.xml
@@ -127,7 +127,7 @@ Note: Since firmware update version 2.7,
 	<parameter name="quiet" unique="0" required="0">
 		<getopt mixed="-q, --quiet" />
 		<content type="boolean"  />
-		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug logging to syslog.</shortdesc>
+		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
 	</parameter>
 	<parameter name="verbose" unique="0" required="0">
 		<getopt mixed="-v, --verbose" />
Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_ipdu.xml
===================================================================
--- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_ipdu.xml
+++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_ipdu.xml
@@ -125,7 +125,7 @@
 	<parameter name="quiet" unique="0" required="0">
 		<getopt mixed="-q, --quiet" />
 		<content type="boolean"  />
-		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug logging to syslog.</shortdesc>
+		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
 	</parameter>
 	<parameter name="verbose" unique="0" required="0">
 		<getopt mixed="-v, --verbose" />
Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_ipmilan.xml
===================================================================
--- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_ipmilan.xml
+++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_ipmilan.xml
@@ -117,7 +117,7 @@
 	<parameter name="quiet" unique="0" required="0">
 		<getopt mixed="-q, --quiet" />
 		<content type="boolean"  />
-		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug logging to syslog.</shortdesc>
+		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
 	</parameter>
 	<parameter name="verbose" unique="0" required="0">
 		<getopt mixed="-v, --verbose" />
Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_ironic.xml
===================================================================
--- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_ironic.xml
+++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_ironic.xml
@@ -71,7 +71,7 @@
 	<parameter name="quiet" unique="0" required="0">
 		<getopt mixed="-q, --quiet" />
 		<content type="boolean"  />
-		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug logging to syslog.</shortdesc>
+		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
 	</parameter>
 	<parameter name="verbose" unique="0" required="0">
 		<getopt mixed="-v, --verbose" />
Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_kdump.xml
===================================================================
--- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_kdump.xml
+++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_kdump.xml
@@ -31,7 +31,7 @@
 	<parameter name="quiet" unique="0" required="0">
 		<getopt mixed="-q, --quiet" />
 		<content type="boolean"  />
-		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug logging to syslog.</shortdesc>
+		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
 	</parameter>
 	<parameter name="verbose" unique="0" required="0">
 		<getopt mixed="-v, --verbose" />
Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_ldom.xml
===================================================================
--- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_ldom.xml
+++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_ldom.xml
@@ -108,7 +108,7 @@ Very useful parameter is -c (or cmd_prom
 	<parameter name="quiet" unique="0" required="0">
 		<getopt mixed="-q, --quiet" />
 		<content type="boolean"  />
-		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug logging to syslog.</shortdesc>
+		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
 	</parameter>
 	<parameter name="verbose" unique="0" required="0">
 		<getopt mixed="-v, --verbose" />
Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_lpar.xml
===================================================================
--- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_lpar.xml
+++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_lpar.xml
@@ -120,7 +120,7 @@
 	<parameter name="quiet" unique="0" required="0">
 		<getopt mixed="-q, --quiet" />
 		<content type="boolean"  />
-		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug logging to syslog.</shortdesc>
+		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
 	</parameter>
 	<parameter name="verbose" unique="0" required="0">
 		<getopt mixed="-v, --verbose" />
Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_mpath.xml
===================================================================
--- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_mpath.xml
+++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_mpath.xml
@@ -22,7 +22,7 @@ The fence_mpath agent works by having a
 	<parameter name="quiet" unique="0" required="0">
 		<getopt mixed="-q, --quiet" />
 		<content type="boolean"  />
-		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug logging to syslog.</shortdesc>
+		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
 	</parameter>
 	<parameter name="verbose" unique="0" required="0">
 		<getopt mixed="-v, --verbose" />
Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_netio.xml
===================================================================
--- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_netio.xml
+++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_netio.xml
@@ -76,7 +76,7 @@
 	<parameter name="quiet" unique="0" required="0">
 		<getopt mixed="-q, --quiet" />
 		<content type="boolean"  />
-		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug logging to syslog.</shortdesc>
+		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
 	</parameter>
 	<parameter name="verbose" unique="0" required="0">
 		<getopt mixed="-v, --verbose" />
Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_ovh.xml
===================================================================
--- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_ovh.xml
+++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_ovh.xml
@@ -56,7 +56,7 @@
 	<parameter name="quiet" unique="0" required="0">
 		<getopt mixed="-q, --quiet" />
 		<content type="boolean"  />
-		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug logging to syslog.</shortdesc>
+		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
 	</parameter>
 	<parameter name="verbose" unique="0" required="0">
 		<getopt mixed="-v, --verbose" />
Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_powerman.xml
===================================================================
--- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_powerman.xml
+++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_powerman.xml
@@ -46,7 +46,7 @@
 	<parameter name="quiet" unique="0" required="0">
 		<getopt mixed="-q, --quiet" />
 		<content type="boolean"  />
-		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug logging to syslog.</shortdesc>
+		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
 	</parameter>
 	<parameter name="verbose" unique="0" required="0">
 		<getopt mixed="-v, --verbose" />
Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_pve.xml
===================================================================
--- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_pve.xml
+++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_pve.xml
@@ -86,7 +86,7 @@
 	<parameter name="quiet" unique="0" required="0">
 		<getopt mixed="-q, --quiet" />
 		<content type="boolean"  />
-		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug logging to syslog.</shortdesc>
+		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
 	</parameter>
 	<parameter name="verbose" unique="0" required="0">
 		<getopt mixed="-v, --verbose" />
Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_raritan.xml
===================================================================
--- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_raritan.xml
+++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_raritan.xml
@@ -76,7 +76,7 @@
 	<parameter name="quiet" unique="0" required="0">
 		<getopt mixed="-q, --quiet" />
 		<content type="boolean"  />
-		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug logging to syslog.</shortdesc>
+		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
 	</parameter>
 	<parameter name="verbose" unique="0" required="0">
 		<getopt mixed="-v, --verbose" />
Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_rcd_serial.xml
===================================================================
--- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_rcd_serial.xml
+++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_rcd_serial.xml
@@ -24,7 +24,7 @@
 	<parameter name="quiet" unique="0" required="0">
 		<getopt mixed="-q, --quiet" />
 		<content type="boolean"  />
-		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug logging to syslog.</shortdesc>
+		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
 	</parameter>
 	<parameter name="verbose" unique="0" required="0">
 		<getopt mixed="-v, --verbose" />
Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_rhevm.xml
===================================================================
--- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_rhevm.xml
+++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_rhevm.xml
@@ -101,7 +101,7 @@
 	<parameter name="quiet" unique="0" required="0">
 		<getopt mixed="-q, --quiet" />
 		<content type="boolean"  />
-		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug logging to syslog.</shortdesc>
+		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
 	</parameter>
 	<parameter name="verbose" unique="0" required="0">
 		<getopt mixed="-v, --verbose" />
Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_rsa.xml
===================================================================
--- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_rsa.xml
+++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_rsa.xml
@@ -106,7 +106,7 @@
 	<parameter name="quiet" unique="0" required="0">
 		<getopt mixed="-q, --quiet" />
 		<content type="boolean"  />
-		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug logging to syslog.</shortdesc>
+		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
 	</parameter>
 	<parameter name="verbose" unique="0" required="0">
 		<getopt mixed="-v, --verbose" />
Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_rsb.xml
===================================================================
--- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_rsb.xml
+++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_rsb.xml
@@ -106,7 +106,7 @@
 	<parameter name="quiet" unique="0" required="0">
 		<getopt mixed="-q, --quiet" />
 		<content type="boolean"  />
-		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug logging to syslog.</shortdesc>
+		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
 	</parameter>
 	<parameter name="verbose" unique="0" required="0">
 		<getopt mixed="-v, --verbose" />
Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_sanbox2.xml
===================================================================
--- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_sanbox2.xml
+++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_sanbox2.xml
@@ -86,7 +86,7 @@
 	<parameter name="quiet" unique="0" required="0">
 		<getopt mixed="-q, --quiet" />
 		<content type="boolean"  />
-		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug logging to syslog.</shortdesc>
+		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
 	</parameter>
 	<parameter name="verbose" unique="0" required="0">
 		<getopt mixed="-v, --verbose" />
Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_sbd.xml
===================================================================
--- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_sbd.xml
+++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_sbd.xml
@@ -34,7 +34,7 @@
 	<parameter name="quiet" unique="0" required="0">
 		<getopt mixed="-q, --quiet" />
 		<content type="boolean"  />
-		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug logging to syslog.</shortdesc>
+		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
 	</parameter>
 	<parameter name="verbose" unique="0" required="0">
 		<getopt mixed="-v, --verbose" />
Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_scsi.xml
===================================================================
--- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_scsi.xml
+++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_scsi.xml
@@ -37,7 +37,7 @@ The fence_scsi agent works by having eac
 	<parameter name="quiet" unique="0" required="0">
 		<getopt mixed="-q, --quiet" />
 		<content type="boolean"  />
-		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug logging to syslog.</shortdesc>
+		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
 	</parameter>
 	<parameter name="verbose" unique="0" required="0">
 		<getopt mixed="-v, --verbose" />
Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_tripplite_snmp.xml
===================================================================
--- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_tripplite_snmp.xml
+++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_tripplite_snmp.xml
@@ -126,7 +126,7 @@
 	<parameter name="quiet" unique="0" required="0">
 		<getopt mixed="-q, --quiet" />
 		<content type="boolean"  />
-		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug logging to syslog.</shortdesc>
+		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
 	</parameter>
 	<parameter name="verbose" unique="0" required="0">
 		<getopt mixed="-v, --verbose" />
Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_vbox.xml
===================================================================
--- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_vbox.xml
+++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_vbox.xml
@@ -108,7 +108,7 @@ By default, vbox needs to log in as a us
 	<parameter name="quiet" unique="0" required="0">
 		<getopt mixed="-q, --quiet" />
 		<content type="boolean"  />
-		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug logging to syslog.</shortdesc>
+		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
 	</parameter>
 	<parameter name="verbose" unique="0" required="0">
 		<getopt mixed="-v, --verbose" />
Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_virsh.xml
===================================================================
--- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_virsh.xml
+++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_virsh.xml
@@ -108,7 +108,7 @@ By default, virsh needs root account to
 	<parameter name="quiet" unique="0" required="0">
 		<getopt mixed="-q, --quiet" />
 		<content type="boolean"  />
-		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug logging to syslog.</shortdesc>
+		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
 	</parameter>
 	<parameter name="verbose" unique="0" required="0">
 		<getopt mixed="-v, --verbose" />
Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_vmware.xml
===================================================================
--- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_vmware.xml
+++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_vmware.xml
@@ -119,7 +119,7 @@ After you have successfully installed VI
 	<parameter name="quiet" unique="0" required="0">
 		<getopt mixed="-q, --quiet" />
 		<content type="boolean"  />
-		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug logging to syslog.</shortdesc>
+		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
 	</parameter>
 	<parameter name="verbose" unique="0" required="0">
 		<getopt mixed="-v, --verbose" />
Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_vmware_soap.xml
===================================================================
--- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_vmware_soap.xml
+++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_vmware_soap.xml
@@ -98,7 +98,7 @@ Name of virtual machine (-n / port) has
 	<parameter name="quiet" unique="0" required="0">
 		<getopt mixed="-q, --quiet" />
 		<content type="boolean"  />
-		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug logging to syslog.</shortdesc>
+		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
 	</parameter>
 	<parameter name="verbose" unique="0" required="0">
 		<getopt mixed="-v, --verbose" />
Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_wti.xml
===================================================================
--- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_wti.xml
+++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_wti.xml
@@ -106,7 +106,7 @@
 	<parameter name="quiet" unique="0" required="0">
 		<getopt mixed="-q, --quiet" />
 		<content type="boolean"  />
-		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug logging to syslog.</shortdesc>
+		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
 	</parameter>
 	<parameter name="verbose" unique="0" required="0">
 		<getopt mixed="-v, --verbose" />
Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_xenapi.xml
===================================================================
--- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_xenapi.xml
+++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_xenapi.xml
@@ -56,7 +56,7 @@
 	<parameter name="quiet" unique="0" required="0">
 		<getopt mixed="-q, --quiet" />
 		<content type="boolean"  />
-		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug logging to syslog.</shortdesc>
+		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
 	</parameter>
 	<parameter name="verbose" unique="0" required="0">
 		<getopt mixed="-v, --verbose" />
Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_zvmip.xml
===================================================================
--- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_zvmip.xml
+++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_zvmip.xml
@@ -98,7 +98,7 @@ Where XXXXXXX is the name of the virtual
 	<parameter name="quiet" unique="0" required="0">
 		<getopt mixed="-q, --quiet" />
 		<content type="boolean"  />
-		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug logging to syslog.</shortdesc>
+		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
 	</parameter>
 	<parameter name="verbose" unique="0" required="0">
 		<getopt mixed="-v, --verbose" />
