fence-agents: master - fence agents: Text in help is changed from foo=<value> to foo=[value]

Marek GrĂ¡c marx at fedoraproject.org
Mon Feb 4 15:49:58 UTC 2013


Gitweb:        http://git.fedorahosted.org/git/?p=fence-agents.git;a=commitdiff;h=110e74e711d1a341d4f40dc3f253170bd6cb7651
Commit:        110e74e711d1a341d4f40dc3f253170bd6cb7651
Parent:        141d2e6d8310e22fa5f678d46089146dfa4691b0
Author:        Marek 'marx' Grac <mgrac at redhat.com>
AuthorDate:    Mon Feb 4 16:48:49 2013 +0100
Committer:     Marek 'marx' Grac <mgrac at redhat.com>
CommitterDate: Mon Feb 4 16:48:49 2013 +0100

fence agents: Text in help is changed from foo=<value> to foo=[value]

Unlike previous patch, this focus on fixing specif fence agents.
---
 fence/agents/baytech/fence_baytech.pl     |   12 ++++++------
 fence/agents/brocade/fence_brocade.pl     |   12 ++++++------
 fence/agents/bullpap/fence_bullpap.pl     |   12 ++++++------
 fence/agents/cisco_ucs/fence_cisco_ucs.py |    2 +-
 fence/agents/cpint/fence_cpint.pl         |    2 +-
 fence/agents/drac/fence_drac.pl           |   20 ++++++++++----------
 fence/agents/drac5/fence_drac5.py         |    2 +-
 fence/agents/egenera/fence_egenera.pl     |   12 ++++++------
 fence/agents/eps/fence_eps.py             |    2 +-
 fence/agents/ilo/fence_ilo.py             |    2 +-
 fence/agents/lpar/fence_lpar.py           |    4 ++--
 fence/agents/mcdata/fence_mcdata.pl       |   12 ++++++------
 fence/agents/rackswitch/do_rack.c         |    8 ++++----
 fence/agents/vixel/fence_vixel.pl         |   10 +++++-----
 fence/agents/xcat/fence_xcat.pl           |    6 +++---
 fence/agents/zvm/fence_zvm.pl             |    8 ++++----
 16 files changed, 63 insertions(+), 63 deletions(-)

diff --git a/fence/agents/baytech/fence_baytech.pl b/fence/agents/baytech/fence_baytech.pl
index e218b78..bb7f42e 100644
--- a/fence/agents/baytech/fence_baytech.pl
+++ b/fence/agents/baytech/fence_baytech.pl
@@ -108,32 +108,32 @@ The  other assumption that is made is that Outlet names do not end in space. The
 <vendor-url>http://www.baytech.net</vendor-url>
 <parameters>
         <parameter name="action" unique="1" required="1">
-                <getopt mixed="-o &lt;action&gt;" />
+                <getopt mixed="-o [action]" />
                 <content type="string" default="disable" />
                 <shortdesc lang="en">Fencing Action</shortdesc>
         </parameter>
         <parameter name="ipaddr" unique="1" required="1">
-                <getopt mixed="-a &lt;ip&gt;" />
+                <getopt mixed="-a [ip]" />
                 <content type="string"  />
                 <shortdesc lang="en">IP Address or Hostname</shortdesc>
         </parameter>
         <parameter name="login" unique="1" required="1">
-                <getopt mixed="-l &lt;name&gt;" />
+                <getopt mixed="-l [name]" />
                 <content type="string"  />
                 <shortdesc lang="en">Login Name</shortdesc>
         </parameter>
         <parameter name="passwd" unique="1" required="0">
-                <getopt mixed="-p &lt;password&gt;" />
+                <getopt mixed="-p [password]" />
                 <content type="string"  />
                 <shortdesc lang="en">Login password or passphrase</shortdesc>
         </parameter>
         <parameter name="passwd_script" unique="1" required="0">
-                <getopt mixed="-S &lt;script&gt;" />
+                <getopt mixed="-S [script]" />
                 <content type="string"  />
                 <shortdesc lang="en">Script to retrieve password</shortdesc>
         </parameter>
         <parameter name="port" unique="1" required="1">
-                <getopt mixed="-n &lt;id&gt;" />
+                <getopt mixed="-n [id]" />
                 <content type="string"  />
                 <shortdesc lang="en">Physical plug number or name of virtual machine</shortdesc>
         </parameter>
diff --git a/fence/agents/brocade/fence_brocade.pl b/fence/agents/brocade/fence_brocade.pl
index e3f7290..4be0436 100644
--- a/fence/agents/brocade/fence_brocade.pl
+++ b/fence/agents/brocade/fence_brocade.pl
@@ -85,32 +85,32 @@ After  a fence operation has taken place the fenced machine can no longer connec
 <vendor-url>http://www.brocade.com</vendor-url>
 <parameters>
         <parameter name="action" unique="0" required="1">
-                <getopt mixed="-o &lt;action&gt;" />
+                <getopt mixed="-o [action]" />
                 <content type="string" default="disable" />
                 <shortdesc lang="en">Fencing Action</shortdesc>
         </parameter>
         <parameter name="ipaddr" unique="0" required="1">
-                <getopt mixed="-a &lt;ip&gt;" />
+                <getopt mixed="-a [ip]" />
                 <content type="string"  />
                 <shortdesc lang="en">IP Address or Hostname</shortdesc>
         </parameter>
         <parameter name="login" unique="0" required="1">
-                <getopt mixed="-l &lt;name&gt;" />
+                <getopt mixed="-l [name]" />
                 <content type="string"  />
                 <shortdesc lang="en">Login Name</shortdesc>
         </parameter>
         <parameter name="passwd" unique="0" required="0">
-                <getopt mixed="-p &lt;password&gt;" />
+                <getopt mixed="-p [password]" />
                 <content type="string"  />
                 <shortdesc lang="en">Login password or passphrase</shortdesc>
         </parameter>
         <parameter name="passwd_script" unique="0" required="0">
-                <getopt mixed="-S &lt;script&gt;" />
+                <getopt mixed="-S [script]" />
                 <content type="string"  />
                 <shortdesc lang="en">Script to retrieve password</shortdesc>
         </parameter>
         <parameter name="port" unique="0" required="1">
-                <getopt mixed="-n &lt;id&gt;" />
+                <getopt mixed="-n [id]" />
                 <content type="string"  />
                 <shortdesc lang="en">Physical plug number or name of virtual machine</shortdesc>
         </parameter>
diff --git a/fence/agents/bullpap/fence_bullpap.pl b/fence/agents/bullpap/fence_bullpap.pl
index e31ab6d..3012fa2 100644
--- a/fence/agents/bullpap/fence_bullpap.pl
+++ b/fence/agents/bullpap/fence_bullpap.pl
@@ -94,32 +94,32 @@ fence_bullpap is an I/O Fencing agent which can be used with Bull\'s NovaScale m
 <vendor-url>http://www.bull.com</vendor-url>
 <parameters>
         <parameter name="action" unique="1" required="1">
-                <getopt mixed="-o &lt;action&gt;" />
+                <getopt mixed="-o [action]" />
                 <content type="string" default="reboot" />
                 <shortdesc lang="en">Fencing Action</shortdesc>
         </parameter>
         <parameter name="ipaddr" unique="1" required="1">
-                <getopt mixed="-a &lt;ip&gt;" />
+                <getopt mixed="-a [ip]" />
                 <content type="string"  />
                 <shortdesc lang="en">IP Address or Hostname</shortdesc>
         </parameter>
         <parameter name="login" unique="1" required="1">
-                <getopt mixed="-l &lt;name&gt;" />
+                <getopt mixed="-l [name]" />
                 <content type="string"  />
                 <shortdesc lang="en">Login Name</shortdesc>
         </parameter>
         <parameter name="passwd" unique="1" required="0">
-                <getopt mixed="-p &lt;password&gt;" />
+                <getopt mixed="-p [password]" />
                 <content type="string"  />
                 <shortdesc lang="en">Login password or passphrase</shortdesc>
         </parameter>
         <parameter name="passwd_script" unique="1" required="0">
-                <getopt mixed="-S &lt;script&gt;" />
+                <getopt mixed="-S [script]" />
                 <content type="string"  />
                 <shortdesc lang="en">Script to retrieve password</shortdesc>
         </parameter>
         <parameter name="domain" unique="1" required="1">
-                <getopt mixed="-d &lt;domain&gt;" />
+                <getopt mixed="-d [domain]" />
                 <content type="string"  />
                 <shortdesc lang="en">Domain name of the Bull machine to power-cycle</shortdesc>
         </parameter>
diff --git a/fence/agents/cisco_ucs/fence_cisco_ucs.py b/fence/agents/cisco_ucs/fence_cisco_ucs.py
index 92c29eb..e66130e 100644
--- a/fence/agents/cisco_ucs/fence_cisco_ucs.py
+++ b/fence/agents/cisco_ucs/fence_cisco_ucs.py
@@ -100,7 +100,7 @@ def define_new_opts():
 	all_opt["suborg"] = {
 		"getopt" : "s:",
 		"longopt" : "suborg",
-		"help" : "--suborg=<path>                Additional path needed to access suborganization",
+		"help" : "--suborg=[path]                Additional path needed to access suborganization",
 		"required" : "0",
 		"shortdesc" : "Additional path needed to access suborganization",
 		"default" : "",
diff --git a/fence/agents/cpint/fence_cpint.pl b/fence/agents/cpint/fence_cpint.pl
index eb2ad3a..7a7a5f5 100644
--- a/fence/agents/cpint/fence_cpint.pl
+++ b/fence/agents/cpint/fence_cpint.pl
@@ -79,7 +79,7 @@ NOTE: for fence_cpint to send a command to another virtual machine, the machine
 <vendor-url>http://www.ibm.com</vendor-url>
 <parameters>
         <parameter name="userid" unique="1" required="1">
-                <getopt mixed="-u &lt;userid&gt;" />
+                <getopt mixed="-u [userid]" />
                 <content type="string"  />
                 <shortdesc lang="en">Userid of the virtual machine to fence</shortdesc>
         </parameter>
diff --git a/fence/agents/drac/fence_drac.pl b/fence/agents/drac/fence_drac.pl
index b26fbcb..536badd 100644
--- a/fence/agents/drac/fence_drac.pl
+++ b/fence/agents/drac/fence_drac.pl
@@ -144,52 +144,52 @@ fence_drac is an I/O Fencing agent which can be used with the Dell Remote Access
 <vendor-url>http://www.dell.com</vendor-url>
 <parameters>
         <parameter name="action" unique="0" required="1">
-                <getopt mixed="-o &lt;action&gt;" />
+                <getopt mixed="-o [action]" />
                 <content type="string" default="reboot" />
                 <shortdesc lang="en">Fencing Action</shortdesc>
         </parameter>
         <parameter name="ipaddr" unique="0" required="1">
-                <getopt mixed="-a &lt;ip&gt;" />
+                <getopt mixed="-a [ip]" />
                 <content type="string"  />
                 <shortdesc lang="en">IP Address or Hostname</shortdesc>
         </parameter>
         <parameter name="login" unique="0" required="1">
-                <getopt mixed="-l &lt;name&gt;" />
+                <getopt mixed="-l [name]" />
                 <content type="string"  />
                 <shortdesc lang="en">Login Name</shortdesc>
         </parameter>
         <parameter name="passwd" unique="0" required="0">
-                <getopt mixed="-p &lt;password&gt;" />
+                <getopt mixed="-p [password]" />
                 <content type="string"  />
                 <shortdesc lang="en">Login password or passphrase</shortdesc>
         </parameter>
         <parameter name="passwd_script" unique="0" required="0">
-                <getopt mixed="-S &lt;script&gt;" />
+                <getopt mixed="-S [script]" />
                 <content type="string"  />
                 <shortdesc lang="en">Script to retrieve password</shortdesc>
         </parameter>
         <parameter name="cmd_prompt" unique="0" required="0">
-                <getopt mixed="-c &lt;prompt&gt;" />
+                <getopt mixed="-c [prompt]" />
                 <content type="string" />
                 <shortdesc lang="en">Force fence_drac to use cmd_prompt as the command prompt</shortdesc>
         </parameter>
         <parameter name="drac_version" unique="0" required="0">
-                <getopt mixed="-d &lt;version&gt;" />
+                <getopt mixed="-d [version]" />
                 <content type="string" />
                 <shortdesc lang="en">Force fence_drac to treat the device as though it was for the specified drac version</shortdesc>
         </parameter>
         <parameter name="module_name" unique="0" required="0">
-                <getopt mixed="-m &lt;modulename&gt;" />
+                <getopt mixed="-m [modulename]" />
                 <content type="string"/>
                 <shortdesc lang="en">The module name of the blade when using DRAC/MC firmware.</shortdesc>
         </parameter>
         <parameter name="debug" unique="0" required="0">
-                <getopt mixed="-D &lt;dumpfile&gt;" />
+                <getopt mixed="-D [dumpfile]" />
                 <content type="string"/>
                 <shortdesc lang="en">Debug file of the telnet interaction</shortdesc>
         </parameter>
         <parameter name="delay" unique="0" required="0">
-                <getopt mixed="-f &lt;seconds&gt;" />
+                <getopt mixed="-f [seconds]" />
                 <content type="string" default="0"/>
                 <shortdesc lang="en">Wait X seconds before fencing is started</shortdesc>
         </parameter>
diff --git a/fence/agents/drac5/fence_drac5.py b/fence/agents/drac5/fence_drac5.py
index 5af0045..2e9a8d3 100644
--- a/fence/agents/drac5/fence_drac5.py
+++ b/fence/agents/drac5/fence_drac5.py
@@ -79,7 +79,7 @@ def define_new_opts():
 	all_opt["drac_version"] = {
 		"getopt" : "d:",
 		"longopt" : "drac-version",
-		"help" : "-d, --drac-version=<version>   Force DRAC version to use",
+		"help" : "-d, --drac-version=[version]   Force DRAC version to use",
 		"required" : "0",
 		"shortdesc" : "Force DRAC version to use",
 		"order" : 1 }
diff --git a/fence/agents/egenera/fence_egenera.pl b/fence/agents/egenera/fence_egenera.pl
index 308338b..2ea4d0c 100644
--- a/fence/agents/egenera/fence_egenera.pl
+++ b/fence/agents/egenera/fence_egenera.pl
@@ -84,32 +84,32 @@ fence_egenera  is  an I/O Fencing agent which can be used with the Egenera Blade
 <vendor-url>http://www.bull.com</vendor-url>
 <parameters>
         <parameter name="action" unique="0" required="1">
-                <getopt mixed="-o &lt;action&gt;" />
+                <getopt mixed="-o [action]" />
                 <content type="string" default="reboot" />
                 <shortdesc lang="en">Fencing Action</shortdesc>
         </parameter>
         <parameter name="cserver" unique="0" required="1">
-                <getopt mixed="-c &lt;cserver&gt;" />
+                <getopt mixed="-c [cserver]" />
                 <content type="string"  />
                 <shortdesc lang="en">The cserver to ssh to. cserver can be in the form user at hostname to specify a different user to login as.</shortdesc>
         </parameter>
         <parameter name="pserver" unique="0" required="1">
-                <getopt mixed="-p &lt;pserver&gt;" />
+                <getopt mixed="-p [pserver]" />
                 <content type="string"  />
                 <shortdesc lang="en">The pserver to operate on.</shortdesc>
         </parameter>
         <parameter name="user" unique="0" required="1">
-                <getopt mixed="-u &lt;name&gt;" />
+                <getopt mixed="-u [name]" />
                 <content type="string" default="root" />
                 <shortdesc lang="en">Login Name</shortdesc>
         </parameter>
         <parameter name="lpan" unique="0" required="1">
-                <getopt mixed="-l &lt;lpan&gt;" />
+                <getopt mixed="-l [lpan]" />
                 <content type="string"  />
                 <shortdesc lang="en">The lpan to operate on.</shortdesc>
         </parameter>
         <parameter name="delay" unique="0" required="0">
-                <getopt mixed="-f &lt;seconds&gt;" />
+                <getopt mixed="-f [seconds]" />
                 <content type="string" default="0"/>
                 <shortdesc lang="en">Wait X seconds before fencing is started</shortdesc>
         </parameter>
diff --git a/fence/agents/eps/fence_eps.py b/fence/agents/eps/fence_eps.py
index 245c1a2..dfb0b5b 100644
--- a/fence/agents/eps/fence_eps.py
+++ b/fence/agents/eps/fence_eps.py
@@ -89,7 +89,7 @@ def eps_define_new_opts():
 	all_opt["hidden_page"] = {
 		"getopt" : "c:",
 		"longopt" : "page",
-		"help":"-c, --page=<page>              Name of hidden page (default hidden.htm)",
+		"help":"-c, --page=[page]              Name of hidden page (default hidden.htm)",
 		"required" : "0",
 		"shortdesc" : "Name of hidden page",
 		"default" : "hidden.htm",
diff --git a/fence/agents/ilo/fence_ilo.py b/fence/agents/ilo/fence_ilo.py
index fc664cc..15e273f 100644
--- a/fence/agents/ilo/fence_ilo.py
+++ b/fence/agents/ilo/fence_ilo.py
@@ -56,7 +56,7 @@ def define_new_opts():
 	all_opt["ribcl"] = {
 		"getopt" : "r:",
 		"longopt" : "ribcl-version",
-		"help" : "-r, --ribcl-version=<version>  Force ribcl version to use",
+		"help" : "-r, --ribcl-version=[version]  Force ribcl version to use",
 		"required" : "0",
 		"shortdesc" : "Force ribcl version to use",
 		"order" : 1 }
diff --git a/fence/agents/lpar/fence_lpar.py b/fence/agents/lpar/fence_lpar.py
index bf658f0..9dc3e4d 100644
--- a/fence/agents/lpar/fence_lpar.py
+++ b/fence/agents/lpar/fence_lpar.py
@@ -103,14 +103,14 @@ def define_new_opts():
 	all_opt["managed"] = {
 		"getopt" : "s:",
 		"longopt" : "managed",
-		"help" : "-s, --managed=<id>             Name of the managed system",
+		"help" : "-s, --managed=[id]             Name of the managed system",
 		"required" : "0",
 		"shortdesc" : "Managed system name",
 		"order" : 1 }
 	all_opt["hmc_version"] = {
 		"getopt" : "H:",
 		"longopt" : "hmc-version",
-		"help" : "-H, --hmc-version=<version>    Force HMC version to use: 3, 4 (default)",
+		"help" : "-H, --hmc-version=[version]    Force HMC version to use: 3, 4 (default)",
 		"required" : "0",
 		"shortdesc" : "Force HMC version to use (3 or 4)",
 		"default" : "4", 
diff --git a/fence/agents/mcdata/fence_mcdata.pl b/fence/agents/mcdata/fence_mcdata.pl
index 5bc9dcf..3148a99 100644
--- a/fence/agents/mcdata/fence_mcdata.pl
+++ b/fence/agents/mcdata/fence_mcdata.pl
@@ -91,32 +91,32 @@ After a fence operation has taken place the fenced machine can no longer connect
 <vendor-url>http://www.brocade.com</vendor-url>
 <parameters>
         <parameter name="action" unique="1" required="1">
-                <getopt mixed="-o &lt;action&gt;" />
+                <getopt mixed="-o [action]" />
                 <content type="string" default="disable" />
                 <shortdesc lang="en">Fencing Action</shortdesc>
         </parameter>
         <parameter name="ipaddr" unique="1" required="1">
-                <getopt mixed="-a &lt;ip&gt;" />
+                <getopt mixed="-a [ip]" />
                 <content type="string"  />
                 <shortdesc lang="en">IP Address or Hostname</shortdesc>
         </parameter>
         <parameter name="login" unique="1" required="1">
-                <getopt mixed="-l &lt;name&gt;" />
+                <getopt mixed="-l [name]" />
                 <content type="string"  />
                 <shortdesc lang="en">Login Name</shortdesc>
         </parameter>
         <parameter name="passwd" unique="1" required="0">
-                <getopt mixed="-p &lt;password&gt;" />
+                <getopt mixed="-p [password]" />
                 <content type="string"  />
                 <shortdesc lang="en">Login password or passphrase</shortdesc>
         </parameter>
         <parameter name="passwd_script" unique="1" required="0">
-                <getopt mixed="-S &lt;script&gt;" />
+                <getopt mixed="-S [script]" />
                 <content type="string"  />
                 <shortdesc lang="en">Script to retrieve password</shortdesc>
         </parameter>
         <parameter name="port" unique="1" required="1">
-                <getopt mixed="-n &lt;id&gt;" />
+                <getopt mixed="-n [id]" />
                 <content type="string"  />
                 <shortdesc lang="en">Physical plug number or name of virtual machine</shortdesc>
         </parameter>
diff --git a/fence/agents/rackswitch/do_rack.c b/fence/agents/rackswitch/do_rack.c
index d8050bf..ee29153 100644
--- a/fence/agents/rackswitch/do_rack.c
+++ b/fence/agents/rackswitch/do_rack.c
@@ -166,22 +166,22 @@ static void print_metadata(void)
 	"<vendor-url>http://www.bladenetwork.net</vendor-url>\n"
 	"<parameters>\n"
         "<parameter name=\"ipaddr\" unique=\"1\" required=\"1\">\n"
-        "\t<getopt mixed=\"-a &lt;ip&gt;\" />\n"
+        "\t<getopt mixed=\"-a [ip]\" />\n"
         "\t<content type=\"string\"  />\n"
         "\t<shortdesc lang=\"en\">IP Address or Hostname</shortdesc>\n"
         "</parameter>\n"
         "<parameter name=\"login\" unique=\"1\" required=\"1\">\n"
-        "\t<getopt mixed=\"-l &lt;name&gt;\" />\n"
+        "\t<getopt mixed=\"-l [name]\" />\n"
         "\t<content type=\"string\"  />\n"
         "\t<shortdesc lang=\"en\">Login Name</shortdesc>\n"
         "</parameter>\n"
         "<parameter name=\"passwd\" unique=\"1\" required=\"0\">\n"
-        "\t<getopt mixed=\"-p &lt;password&gt;\" />\n"
+        "\t<getopt mixed=\"-p [password]\" />\n"
         "\t<content type=\"string\"  />\n"
         "\t<shortdesc lang=\"en\">Login password or passphrase</shortdesc>\n"
         "</parameter>\n"
         "<parameter name=\"passwd_script\" unique=\"1\" required=\"0\">\n"
-        "\t<getopt mixed=\"-S &lt;script&gt;\" />\n"
+        "\t<getopt mixed=\"-S [script]\" />\n"
         "\t<content type=\"string\"  />\n"
         "\t<shortdesc lang=\"en\">Script to retrieve password</shortdesc>\n"
         "</parameter>\n"
diff --git a/fence/agents/vixel/fence_vixel.pl b/fence/agents/vixel/fence_vixel.pl
index 59b9ff0..2080909 100644
--- a/fence/agents/vixel/fence_vixel.pl
+++ b/fence/agents/vixel/fence_vixel.pl
@@ -76,29 +76,29 @@ fence_vixel is an I/O Fencing agent which can be used with Vixel FC switches. It
 
 After a fence operation has taken place the fenced machine can no longer connect to the Vixel FC switch. When the fenced machine is ready to be brought back into the GFS cluster (after reboot) the port on the Vixel FC switch needs to be enabled. In order to do this, log into the Vixel FC switch. Then go to:
 
-config->zones->config &lt;port&gt; &lt;comma-separated-list-of-ports-in-the-zone&gt;
+config->zones->config [port] [comma-separated-list-of-ports-in-the-zone]
 
 Then apply. Consult the Vixel manual for details.
 </longdesc>
 <vendor-url>http://www.emulex.com</vendor-url>
 <parameters>
         <parameter name="ipaddr" unique="1" required="1">
-                <getopt mixed="-a &lt;ip&gt;" />
+                <getopt mixed="-a [ip]" />
                 <content type="string"  />
                 <shortdesc lang="en">IP Address or Hostname</shortdesc>
         </parameter>
         <parameter name="passwd" unique="1" required="0">
-                <getopt mixed="-p &lt;password&gt;" />
+                <getopt mixed="-p [password]" />
                 <content type="string"  />
                 <shortdesc lang="en">Login password or passphrase</shortdesc>
         </parameter>
         <parameter name="passwd_script" unique="1" required="0">
-                <getopt mixed="-S &lt;script&gt;" />
+                <getopt mixed="-S [script]" />
                 <content type="string"  />
                 <shortdesc lang="en">Script to retrieve password</shortdesc>
         </parameter>
         <parameter name="port" unique="1" required="1">
-                <getopt mixed="-n &lt;id&gt;" />
+                <getopt mixed="-n [id]" />
                 <content type="string"  />
                 <shortdesc lang="en">Physical plug number or name of virtual machine</shortdesc>
         </parameter>
diff --git a/fence/agents/xcat/fence_xcat.pl b/fence/agents/xcat/fence_xcat.pl
index 3cd16aa..c2937c9 100644
--- a/fence/agents/xcat/fence_xcat.pl
+++ b/fence/agents/xcat/fence_xcat.pl
@@ -82,17 +82,17 @@ NOTE: It is recommended that fence_bladecenter(8) is used instead of fence_xcat
 <vendor-url>http://www.xcat.org</vendor-url>
 <parameters>
         <parameter name="action" unique="1" required="1">
-                <getopt mixed="-o &lt;action&gt;" />
+                <getopt mixed="-o [action]" />
                 <content type="string" default="restart" />
                 <shortdesc lang="en">Fencing Action</shortdesc>
         </parameter>
         <parameter name="nodename" unique="1" required="1">
-                <getopt mixed="-n &lt;nodename&gt;" />
+                <getopt mixed="-n [nodename]" />
                 <content type="string"  />
                 <shortdesc lang="en">The nodename as defined in nodelist.tab of the xCAT setup.</shortdesc>
         </parameter>
         <parameter name="rpower" unique="1" required="0">
-                <getopt mixed="-r &lt;rpower&gt;" />
+                <getopt mixed="-r [rpower]" />
                 <content type="string"  />
                 <shortdesc lang="en">The path to the rpower binary.</shortdesc>
         </parameter>
diff --git a/fence/agents/zvm/fence_zvm.pl b/fence/agents/zvm/fence_zvm.pl
index 04a29e2..ca3d600 100644
--- a/fence/agents/zvm/fence_zvm.pl
+++ b/fence/agents/zvm/fence_zvm.pl
@@ -84,22 +84,22 @@ fence_zvm is an I/O Fencing agent used on a GFS virtual machine in a s390 or zSe
 <vendor-url>http://www.ibm.com</vendor-url>
 <parameters>
         <parameter name="ipaddr" unique="1" required="1">
-                <getopt mixed="-a &lt;ip&gt;" />
+                <getopt mixed="-a [ip]" />
                 <content type="string"  />
                 <shortdesc lang="en">IP Address or Hostname</shortdesc>
         </parameter>
         <parameter name="userid" unique="1" required="1">
-                <getopt mixed="-u &lt;userid&gt;" />
+                <getopt mixed="-u [userid]" />
                 <content type="string"  />
                 <shortdesc lang="en">Userid of the virtual machine to fence</shortdesc>
         </parameter>
         <parameter name="passwd" unique="1" required="0">
-                <getopt mixed="-p &lt;password&gt;" />
+                <getopt mixed="-p [password]" />
                 <content type="string"  />
                 <shortdesc lang="en">Login password or passphrase</shortdesc>
         </parameter>
         <parameter name="passwd_script" unique="1" required="0">
-                <getopt mixed="-S &lt;script&gt;" />
+                <getopt mixed="-S [script]" />
                 <content type="string"  />
                 <shortdesc lang="en">Script to retrieve password</shortdesc>
         </parameter>


More information about the cluster-commits mailing list