fence-agents: master - [doc] Improve wiki export

Marek GrĂ¡c marx at fedoraproject.org
Mon Sep 22 14:39:25 UTC 2014


Gitweb:        http://git.fedorahosted.org/git/?p=fence-agents.git;a=commitdiff;h=b7b26b816be8d79a8ff6e32b1d023a8b5354ab28
Commit:        b7b26b816be8d79a8ff6e32b1d023a8b5354ab28
Parent:        f07ee2abe99ef84ed4bf18b2df111d4c2bb1f43c
Author:        Marek 'marx' Grac <mgrac at redhat.com>
AuthorDate:    Mon Sep 22 16:38:52 2014 +0200
Committer:     Marek 'marx' Grac <mgrac at redhat.com>
CommitterDate: Mon Sep 22 16:38:52 2014 +0200

[doc] Improve wiki export

---
 fence/agents/lib/fence2wiki.xsl     |   10 +++++-----
 fence/agents/ovh/fence_ovh.py       |    2 +-
 fence/agents/xenapi/fence_xenapi.py |    2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/fence/agents/lib/fence2wiki.xsl b/fence/agents/lib/fence2wiki.xsl
index 93853a0..b94cbc1 100644
--- a/fence/agents/lib/fence2wiki.xsl
+++ b/fence/agents/lib/fence2wiki.xsl
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+<xsl:stylesheet version='1.0' xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 
 <xsl:template match="/resource-agent">
-||- <xsl:value-of select="@shortdesc" /> (<xsl:value-of select="@name" />) =||
-|| stdin argument || command-line argument || description ||
+||='''<xsl:value-of select="@shortdesc" />''' =||='''<xsl:value-of select="@name" />''' =||
+|| '''Name Of The Argument For STDIN''' || '''Name Of The Argument For Command-Line''' || '''Default Value''' ||'''Description''' ||
 <xsl:apply-templates select="parameters/parameter" />
--
+<xsl:text>-</xsl:text>
 </xsl:template>
 
-<xsl:template match="parameters/parameter">|| <xsl:value-of select="@name" /> || <xsl:value-of select="getopt/@mixed" /> || <xsl:value-of select="shortdesc" />||
+<xsl:template match="parameters/parameter">|| <xsl:value-of select="@name" /> || <xsl:value-of select="getopt/@mixed" /> || {{{<xsl:value-of select="content/@default" disable-output-escaping="yes"/>}}} || <xsl:value-of select="shortdesc" /> ||
 </xsl:template>
 
 </xsl:stylesheet>
\ No newline at end of file
diff --git a/fence/agents/ovh/fence_ovh.py b/fence/agents/ovh/fence_ovh.py
index 14a0706..170df11 100644
--- a/fence/agents/ovh/fence_ovh.py
+++ b/fence/agents/ovh/fence_ovh.py
@@ -29,7 +29,7 @@ def define_new_opts():
 	all_opt["email"] = {
 		"getopt" : "Z:",
 		"longopt" : "email",
-		"help" : "-Z, --email=<email>          email for reboot message: admin at domain.com",
+		"help" : "-Z, --email=[email]          email for reboot message: admin at domain.com",
 		"required" : "1",
 		"shortdesc" : "Reboot email",
 		"default" : "",
diff --git a/fence/agents/xenapi/fence_xenapi.py b/fence/agents/xenapi/fence_xenapi.py
index 6f759d7..f32c4ea 100644
--- a/fence/agents/xenapi/fence_xenapi.py
+++ b/fence/agents/xenapi/fence_xenapi.py
@@ -206,7 +206,7 @@ def main():
 	options = check_input(device_opt, process_input(device_opt))
 
 	docs = {}
-	docs["shortdesc"] = "XenAPI based fencing for the Citrix XenServer virtual machines."
+	docs["shortdesc"] = "Fence agent fo Citrix XenServer over XenAPI"
 	docs["longdesc"] = "\
 fence_cxs is an I/O Fencing agent used on Citrix XenServer hosts. \
 It uses the XenAPI, supplied by Citrix, to establish an XML-RPC sesssion \


More information about the cluster-commits mailing list