summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon MacMullen <simon@lshift.net>2010-02-25 15:08:52 +0000
committerSimon MacMullen <simon@lshift.net>2010-02-25 15:08:52 +0000
commit380bdb02088105b1d2ba45462ea2e316a8539097 (patch)
treea9ffa47e81fa81da5b10104df34a77c4d6de4430
parent35df3ffe273dbd2a18aba2e95a332dabda11c009 (diff)
downloadrabbitmq-server-380bdb02088105b1d2ba45462ea2e316a8539097.tar.gz
Remove -85 nastiness, prevent overlong line from wrapping by making it shorter.
-rw-r--r--Makefile2
-rw-r--r--docs/rabbitmqctl.1.xml8
2 files changed, 5 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index c1f2cf9f..6b8d6b42 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 -85 -s >> docs/`basename $< .1.xml`.usage.erl
+ xsltproc docs/usage.xsl $< | sed -e s/\\\"/\\\\\\\"/g | fmt -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 23253a40..d012c16a 100644
--- a/docs/rabbitmqctl.1.xml
+++ b/docs/rabbitmqctl.1.xml
@@ -523,7 +523,7 @@
</varlistentry>
<varlistentry>
- <term>set_permissions <option>-p <replaceable>vhostpath</replaceable></option> <replaceable>username</replaceable> <replaceable>configurable</replaceable> <replaceable>writable</replaceable> <replaceable>readable</replaceable></term>
+ <term>set_permissions <option>-p <replaceable>vhostpath</replaceable></option> <replaceable>username</replaceable> <replaceable>configure</replaceable> <replaceable>write</replaceable> <replaceable>read</replaceable></term>
<listitem>
<variablelist>
<varlistentry>
@@ -535,15 +535,15 @@
<listitem><para>The name of the user to grant access to the specified virtual host.</para></listitem>
</varlistentry>
<varlistentry>
- <term>configurable</term>
+ <term>configure</term>
<listitem><para>A regular expression matching resource names for which the user is granted configure permissions.</para></listitem>
</varlistentry>
<varlistentry>
- <term>writable</term>
+ <term>write</term>
<listitem><para>A regular expression matching resource names for which the user is granted write permissions.</para></listitem>
</varlistentry>
<varlistentry>
- <term>readable</term>
+ <term>read</term>
<listitem><para>A regular expression matching resource names for which the user is granted read permissions.</para></listitem>
</varlistentry>
</variablelist>