Further tweaks to usage messages: only show subcommand option lists, not descriptions, make a couple of corrections, explain <regexp>, rearrange, etc.

3 files changed, 53 insertions, 25 deletions

diff --git a/Makefile b/Makefile
index 6b8d6b42..c1f2cf9f 100644
--- a/Makefile
+++ b/Makefile
@@ -204,7 +204,7 @@ distclean: clean
 
 %.usage.erl: %.1.xml
 	echo -n "%% Generated, do not edit!\n-module(`basename $< .1.xml | tr -d -`_usage).\n-export([usage/0]).\nusage() -> io:format(\"" > docs/`basename $< .1.xml`.usage.erl
-	xsltproc docs/usage.xsl $< | sed -e s/\\\"/\\\\\\\"/g | fmt -s >> docs/`basename $< .1.xml`.usage.erl
+	xsltproc docs/usage.xsl $< | sed -e s/\\\"/\\\\\\\"/g | fmt -85 -s >> docs/`basename $< .1.xml`.usage.erl
 	echo '"), halt(1).' >> docs/`basename $< .1.xml`.usage.erl
 
 docs/rabbitmqctl.html: docs/rabbitmqctl.1.xml
diff --git a/docs/rabbitmqctl.1.xml b/docs/rabbitmqctl.1.xml
index f2d49ba8..23253a40 100644
--- a/docs/rabbitmqctl.1.xml
+++ b/docs/rabbitmqctl.1.xml
@@ -1,5 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.docbook.org/xml/4.5/docbookx.dtd">
+<!-- 
+ There is some extra magic in this document besides the usual DocBook semantics
+ to allow us to derive manpages, HTML and usage messages from the same source 
+ document.
+
+ Examples need to be moved to the end for man pages. To this end, <para>s and
+ <screen>s with role="example" will be moved, and with role="example-prefix" 
+ will be removed.
+
+ The usage messages are more involved. We have some magic in usage.xsl to pull
+ out the command synopsis, global option and subcommand synopses. We also pull
+ out <para>s with role="usage".
+
+ Finally we construct lists of possible values for subcommand options, if the 
+ subcommand's <varlistentry> has role="usage-has-option-list". The option which
+ takes the values should be marked with role="usage-option-list".
+-->
+
 <refentry lang="en">
   <refentryinfo>
     <productname>RabbitMQ Server</productname>
@@ -49,7 +67,7 @@
       <varlistentry>
         <term><option>-n</option> <replaceable>node</replaceable></term>
         <listitem>
-          <para>
+          <para role="usage">
             Default node is "rabbit@server", where server is the local host.  On
             a host named "server.example.com", the node name of the RabbitMQ
             Erlang node will usually be rabbit@server (unless RABBITMQ_NODENAME
@@ -505,7 +523,7 @@
         </varlistentry>
 
         <varlistentry>
-          <term>set_permissions <option>-p <replaceable>vhostpath</replaceable></option> <replaceable>username</replaceable> <replaceable>regexp</replaceable> <replaceable>regexp</replaceable> <replaceable>regexp</replaceable></term>
+          <term>set_permissions <option>-p <replaceable>vhostpath</replaceable></option> <replaceable>username</replaceable> <replaceable>configurable</replaceable> <replaceable>writable</replaceable> <replaceable>readable</replaceable></term>
           <listitem>
             <variablelist>
               <varlistentry>
@@ -517,8 +535,16 @@
                 <listitem><para>The name of the user to grant access to the specified virtual host.</para></listitem>
               </varlistentry>
               <varlistentry>
-                <term>regexp</term>
-                <listitem><para>The regular expressions for matching resource names for which the user is granted configure, write and read permissions, respectively.</para></listitem>
+                <term>configurable</term>
+                <listitem><para>A regular expression matching resource names for which the user is granted configure permissions.</para></listitem>
+              </varlistentry>
+              <varlistentry>
+                <term>writable</term>
+                <listitem><para>A regular expression matching resource names for which the user is granted write permissions.</para></listitem>
+              </varlistentry>
+              <varlistentry>
+                <term>readable</term>
+                <listitem><para>A regular expression matching resource names for which the user is granted read permissions.</para></listitem>
               </varlistentry>
             </variablelist>
             <para>
@@ -621,8 +647,8 @@
         specified immediately after the query.
       </para>
       <variablelist>
-        <varlistentry>
-          <term>list_queues <option>-p <replaceable>vhostpath</replaceable></option> <option><replaceable>queueinfoitem</replaceable> ...</option></term>
+        <varlistentry role="usage-has-option-list">
+          <term>list_queues <option>-p <replaceable>vhostpath</replaceable></option> <option role="usage-option-list"><replaceable>queueinfoitem</replaceable> ...</option></term>
           <listitem>
             <para>
               Returns queue details. Queue details of the <command>/</command> virtual host
@@ -725,8 +751,8 @@
           </listitem>
         </varlistentry>
 
-        <varlistentry>
-          <term>list_exchanges <option>-p <replaceable>vhostpath</replaceable></option> <option><replaceable>queueinfoitem</replaceable> ...</option></term>
+        <varlistentry role="usage-has-option-list">
+          <term>list_exchanges <option>-p <replaceable>vhostpath</replaceable></option> <option role="usage-option-list"><replaceable>exchangeinfoitem</replaceable> ...</option></term>
           <listitem>
             <para>
               Returns exchange details. Exchange details of the <command>/</command> virtual host
@@ -793,8 +819,8 @@
           </listitem>
         </varlistentry>
 
-        <varlistentry id="list_connections">
-          <term>list_connections <option><replaceable>connectioninfoitem</replaceable> ...</option></term>
+        <varlistentry id="list_connections" role="usage-has-option-list">
+          <term>list_connections <option role="usage-option-list"><replaceable>connectioninfoitem</replaceable> ...</option></term>
           <listitem>
             <para>
               Returns TCP/IP connection statistics.
@@ -893,8 +919,8 @@
           </listitem>
         </varlistentry>
 
-        <varlistentry>
-          <term>list_channels <option><replaceable>channelinfoitem</replaceable> ...</option></term>
+        <varlistentry role="usage-has-option-list">
+          <term>list_channels <option role="usage-option-list"><replaceable>channelinfoitem</replaceable> ...</option></term>
           <listitem>
             <para>
               Returns information on all current channels, the logical
diff --git a/docs/usage.xsl b/docs/usage.xsl
index 14dd3188..3c0d2bfb 100644
--- a/docs/usage.xsl
+++ b/docs/usage.xsl
@@ -22,6 +22,8 @@
   <xsl:text> </xsl:text>
 </xsl:for-each>
 
+<xsl:text>&#10;</xsl:text>
+
 <!-- List options (any variable list in a section called "Options"). --> 
 <xsl:for-each select=".//*[title='Options']/variablelist">
   <xsl:if test="position() = 1">&#10;Options:&#10;</xsl:if>
@@ -34,9 +36,15 @@
   </xsl:for-each>
 </xsl:for-each>
 
+<!-- Any paragraphs which have been marked as role="usage" (principally for global flags). --> 
+<xsl:text>&#10;</xsl:text>
+<xsl:for-each select="//para[@role='usage']">
+<xsl:value-of select="normalize-space(.)"/><xsl:text>&#10;&#10;</xsl:text>
+</xsl:for-each>
+
 <!-- List commands (any first-level variable list in a section called "Commands"). --> 
 <xsl:for-each select=".//*[title='Commands']/variablelist | .//*[title='Commands']/refsect2/variablelist">
-  <xsl:if test="position() = 1">&#10;Commands:&#10;</xsl:if>
+  <xsl:if test="position() = 1">Commands:&#10;</xsl:if>
   <xsl:for-each select="varlistentry">
     <xsl:text>    </xsl:text>
     <xsl:apply-templates select="term"/>
@@ -45,21 +53,15 @@
   <xsl:text>&#10;</xsl:text>
 </xsl:for-each>
 
-<!-- Any paragraphs which have been marked as role="usage" (principally for global flags). --> 
-<xsl:for-each select="//para[@role='usage']">
-<xsl:value-of select="normalize-space(.)"/><xsl:text>&#10;&#10;</xsl:text>
-</xsl:for-each>
-
-<!-- Any second-level variable lists (principally for options for subcommands). --> 
-<xsl:for-each select=".//*[title='Commands']//variablelist//variablelist">
-  <xsl:for-each select="varlistentry">&lt;<xsl:apply-templates select="term"/>&gt; - <xsl:apply-templates select="listitem"/>
-      <xsl:text>&#10;</xsl:text>
-  </xsl:for-each>
-  <xsl:text>&#10;</xsl:text>
+<!-- Any second-level variable lists (for options for subcommands). --> 
+<xsl:for-each select=".//*[title='Commands']//varlistentry[@role='usage-has-option-list']">
+&lt;<xsl:value-of select="term/option[@role='usage-option-list']/replaceable"/>&gt; must be a member of the list [<xsl:for-each select="listitem/variablelist/varlistentry"><xsl:apply-templates select="term"/><xsl:if test="not(position() = last())">, </xsl:if></xsl:for-each>].
 </xsl:for-each>
 
 </xsl:template>
 
+<xsl:template match="option">[<xsl:apply-templates/>]</xsl:template>
+
 <xsl:template match="replaceable">&lt;<xsl:value-of select="normalize-space(.)"/>&gt;</xsl:template>
 
 </xsl:stylesheet>