summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Sackman <matthew@lshift.net>2010-03-29 15:54:31 +0100
committerMatthew Sackman <matthew@lshift.net>2010-03-29 15:54:31 +0100
commit11783f7e7dd9e0a1382826093680c338664e4c57 (patch)
tree5cb6a6bf9317a2f9d386e7214aef851eb75d9d50
parent5b2bc44ee6707752719fe4778a5de6f4c7c36d80 (diff)
parent9523f79fe9c0c522ba3422f7bce11ac49c4c835b (diff)
downloadrabbitmq-server-git-11783f7e7dd9e0a1382826093680c338664e4c57.tar.gz
Merging heads of default
-rw-r--r--docs/rabbitmqctl.1.xml4
-rw-r--r--docs/usage.xsl2
2 files changed, 2 insertions, 4 deletions
diff --git a/docs/rabbitmqctl.1.xml b/docs/rabbitmqctl.1.xml
index e7fc45e4ba..7634b2d247 100644
--- a/docs/rabbitmqctl.1.xml
+++ b/docs/rabbitmqctl.1.xml
@@ -65,7 +65,7 @@
<title>Options</title>
<variablelist>
<varlistentry>
- <term><option>-n</option> <replaceable>node</replaceable></term>
+ <term><cmdsynopsis><arg choice="opt">-n <replaceable>node</replaceable></arg></cmdsynopsis></term>
<listitem>
<para role="usage">
Default node is "rabbit@server", where server is the local host. On
@@ -79,7 +79,7 @@
</listitem>
</varlistentry>
<varlistentry>
- <term><option>-q</option></term>
+ <term><cmdsynopsis><arg choice="opt">-q</arg></cmdsynopsis></term>
<listitem>
<para role="usage">
Quiet output mode is selected with the "-q" flag. Informational
diff --git a/docs/usage.xsl b/docs/usage.xsl
index a29174016f..72f8880ab1 100644
--- a/docs/usage.xsl
+++ b/docs/usage.xsl
@@ -22,9 +22,7 @@ usage() -> %QUOTE%Usage:
<xsl:value-of select="refentry/refsynopsisdiv/cmdsynopsis/command"/>
<xsl:text> </xsl:text>
<xsl:for-each select="refentry/refsynopsisdiv/cmdsynopsis/arg">
- <xsl:if test="@choice='opt'">[</xsl:if>
<xsl:apply-templates select="." />
- <xsl:if test="@choice='opt'">]</xsl:if>
<xsl:text> </xsl:text>
</xsl:for-each>