Merging default into amqp_0_9_1

29 files changed, 2379 insertions, 1078 deletions

diff --git a/.hgignore b/.hgignore
index 442425f6..caaa3ace 100644
--- a/.hgignore
+++ b/.hgignore
@@ -11,6 +11,7 @@ syntax: regexp
 ^dist/
 ^include/rabbit_framing\.hrl$
 ^src/rabbit_framing\.erl$
+^src/.*\_usage.erl$
 ^rabbit\.plt$
 ^basic.plt$
 ^ebin/rabbit\.(app|rel|boot|script)$
@@ -25,3 +26,4 @@ syntax: regexp
 ^packaging/windows/rabbitmq-server-windows-.*\.zip$
 
 ^docs/.*\.[15]\.gz$
+^docs/.*\.man\.xml$
diff --git a/Makefile b/Makefile
index 7ed4611c..fcc62fd7 100644
--- a/Makefile
+++ b/Makefile
@@ -10,12 +10,16 @@ DEPS_FILE=deps.mk
 SOURCE_DIR=src
 EBIN_DIR=ebin
 INCLUDE_DIR=include
+DOCS_DIR=docs
 INCLUDES=$(wildcard $(INCLUDE_DIR)/*.hrl) $(INCLUDE_DIR)/rabbit_framing.hrl
-SOURCES=$(wildcard $(SOURCE_DIR)/*.erl) $(SOURCE_DIR)/rabbit_framing.erl
+SOURCES=$(wildcard $(SOURCE_DIR)/*.erl) $(SOURCE_DIR)/rabbit_framing.erl $(USAGES_ERL)
 BEAM_TARGETS=$(patsubst $(SOURCE_DIR)/%.erl, $(EBIN_DIR)/%.beam, $(SOURCES))
 TARGETS=$(EBIN_DIR)/rabbit.app $(INCLUDE_DIR)/rabbit_framing.hrl $(BEAM_TARGETS)
 WEB_URL=http://stage.rabbitmq.com/
-MANPAGES=$(patsubst %.pod, %.gz, $(wildcard docs/*.[0-9].pod))
+MANPAGES=$(patsubst %.xml, %.gz, $(wildcard $(DOCS_DIR)/*.[0-9].xml))
+WEB_MANPAGES=$(patsubst %.xml, %.man.xml, $(wildcard $(DOCS_DIR)/*.[0-9].xml) $(DOCS_DIR)/rabbitmq-service.xml)
+USAGES_XML=$(DOCS_DIR)/rabbitmqctl.1.xml $(DOCS_DIR)/rabbitmq-multi.1.xml
+USAGES_ERL=$(foreach XML, $(USAGES_XML), $(call usage_xml_to_erl, $(XML)))
 
 ifeq ($(shell python -c 'import simplejson' 2>/dev/null && echo yes),yes)
 PYTHON=python
@@ -58,6 +62,14 @@ ERL_CALL=erl_call -sname $(RABBITMQ_NODENAME) -e
 
 ERL_EBIN=erl -noinput -pa $(EBIN_DIR)
 
+define usage_xml_to_erl
+  $(subst __,_,$(patsubst $(DOCS_DIR)/rabbitmq%.1.xml, $(SOURCE_DIR)/rabbit_%_usage.erl, $(subst -,_,$(1))))
+endef
+
+define usage_dep
+  $(call usage_xml_to_erl, $(1)): $(1) $(DOCS_DIR)/usage.xsl
+endef
+
 all: $(TARGETS)
 
 $(DEPS_FILE): $(SOURCES) $(INCLUDES)
@@ -66,9 +78,8 @@ $(DEPS_FILE): $(SOURCES) $(INCLUDES)
 $(EBIN_DIR)/rabbit.app: $(EBIN_DIR)/rabbit_app.in $(BEAM_TARGETS) generate_app
 	escript generate_app $(EBIN_DIR) $@ < $<
 
-$(EBIN_DIR)/%.beam: $(SOURCE_DIR)/%.erl
+$(EBIN_DIR)/%.beam:
 	erlc $(ERLC_OPTS) -pa $(EBIN_DIR) $<
-#	ERLC_EMULATOR="erl -smp" erlc $(ERLC_OPTS) -pa $(EBIN_DIR) $<
 
 $(INCLUDE_DIR)/rabbit_framing.hrl: codegen.py $(AMQP_CODEGEN_DIR)/amqp_codegen.py $(AMQP_SPEC_JSON_PATH)
 	$(PYTHON) codegen.py header $(AMQP_SPEC_JSON_PATH) $@
@@ -100,7 +111,7 @@ clean:
 	rm -f $(EBIN_DIR)/*.beam
 	rm -f $(EBIN_DIR)/rabbit.app $(EBIN_DIR)/rabbit.boot $(EBIN_DIR)/rabbit.script $(EBIN_DIR)/rabbit.rel
 	rm -f $(INCLUDE_DIR)/rabbit_framing.hrl $(SOURCE_DIR)/rabbit_framing.erl codegen.pyc
-	rm -f docs/*.[0-9].gz
+	rm -f $(DOCS_DIR)/*.[0-9].gz $(DOCS_DIR)/*.man.xml $(DOCS_DIR)/*.erl $(USAGES_ERL)
 	rm -f $(RABBIT_PLT)
 	rm -f $(DEPS_FILE)
 
@@ -176,7 +187,7 @@ srcdist: distclean
 	cp codegen.py Makefile generate_app generate_deps calculate-relative $(TARGET_SRC_DIR)
 
 	cp -r scripts $(TARGET_SRC_DIR)
-	cp -r docs $(TARGET_SRC_DIR)
+	cp -r $(DOCS_DIR) $(TARGET_SRC_DIR)
 	chmod 0755 $(TARGET_SRC_DIR)/scripts/*
 
 	(cd dist; tar -zcf $(TARBALL_NAME).tar.gz $(TARBALL_NAME))
@@ -188,16 +199,30 @@ distclean: clean
 	rm -rf dist
 	find . -regex '.*\(~\|#\|\.swp\|\.dump\)' -exec rm {} \;
 
-%.gz: %.pod
-	pod2man \
-		-n `echo $$(basename $*) | sed -e 's/\.[[:digit:]]\+//'` \
-		-s `echo $$(basename $*) | sed -e 's/.*\.\([^.]\+\)/\1/'` \
-		-c "RabbitMQ AMQP Server" \
-		-d "" \
-		-r "" \
-		$< | gzip --best > $@
-
-docs_all: $(MANPAGES)
+# xmlto can not read from standard input, so we mess with a tmp file.
+%.gz: %.xml $(DOCS_DIR)/examples-to-end.xsl
+	xsltproc $(DOCS_DIR)/examples-to-end.xsl $< > $<.tmp && \
+	xmlto man -o $(DOCS_DIR) $<.tmp && \
+	gzip -f $(DOCS_DIR)/`basename $< .xml`
+	rm -f $<.tmp
+
+$(SOURCE_DIR)/%_usage.erl:
+	xsltproc --stringparam modulename "`basename $@ .erl`" \
+	  $(DOCS_DIR)/usage.xsl $< | sed -e s/\\\"/\\\\\\\"/g | sed -e s/%QUOTE%/\\\"/g | \
+	  fold -s > $@
+
+# We rename the file before xmlto sees it since xmlto will use the name of
+# the file to make internal links.
+%.man.xml: %.xml $(DOCS_DIR)/html-to-website-xml.xsl
+	cp $< `basename $< .xml`.xml && \
+		xmlto xhtml-nochunks `basename $< .xml`.xml ; rm `basename $< .xml`.xml
+	cat `basename $< .xml`.html | \
+	    xsltproc --novalid $(DOCS_DIR)/remove-namespaces.xsl - | \
+		xsltproc --stringparam original `basename $<` $(DOCS_DIR)/html-to-website-xml.xsl - | \
+		xmllint --format - > $@
+	rm `basename $< .xml`.html
+
+docs_all: $(MANPAGES) $(WEB_MANPAGES)
 
 install: SCRIPTS_REL_PATH=$(shell ./calculate-relative $(TARGET_DIR)/sbin $(SBIN_DIR))
 install: all docs_all install_dirs
@@ -215,8 +240,8 @@ install: all docs_all install_dirs
 	done
 	for section in 1 5; do \
 		mkdir -p $(MAN_DIR)/man$$section; \
-		for manpage in docs/*.$$section.pod; do \
-			cp docs/`basename $$manpage .pod`.gz $(MAN_DIR)/man$$section; \
+		for manpage in $(DOCS_DIR)/*.$$section.gz; do \
+			cp $$manpage $(MAN_DIR)/man$$section; \
 		done; \
 	done
 
@@ -224,4 +249,22 @@ install_dirs:
 	mkdir -p $(SBIN_DIR)
 	mkdir -p $(TARGET_DIR)/sbin
 
+$(foreach XML, $(USAGES_XML), $(eval $(call usage_dep, $(XML))))
+
+# Note that all targets which depend on clean must have clean in their
+# name.  Also any target that doesn't depend on clean should not have
+# clean in its name, unless you know that you don't need any of the
+# automatic dependency generation for that target (eg cleandb).
+
+# We want to load the dep file if *any* target *doesn't* contain
+# "clean" - i.e. if removing all clean-like targets leaves something
+
+ifeq "$(MAKECMDGOALS)" ""
+TESTABLEGOALS:=$(.DEFAULT_GOAL)
+else
+TESTABLEGOALS:=$(MAKECMDGOALS)
+endif
+
+ifneq "$(strip $(patsubst clean%,,$(patsubst %clean,,$(TESTABLEGOALS))))" ""
 -include $(DEPS_FILE)
+endif
diff --git a/docs/examples-to-end.xsl b/docs/examples-to-end.xsl
new file mode 100644
index 00000000..b63ffcb3
--- /dev/null
+++ b/docs/examples-to-end.xsl
@@ -0,0 +1,83 @@
+<?xml version='1.0'?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                xmlns:exsl="http://exslt.org/common"
+                xmlns:ng="http://docbook.org/docbook-ng"
+                xmlns:db="http://docbook.org/ns/docbook"
+                exclude-result-prefixes="exsl ng db"
+                version='1.0'>
+
+<xsl:output doctype-public="-//OASIS//DTD DocBook XML V4.5//EN" doctype-system="http://www.docbook.org/xml/4.5/docbookx.dtd" />
+
+<!-- Don't copy exmaples through in place -->
+<xsl:template match="*[@role='example-prefix']"/>
+<xsl:template match="*[@role='example']"/>
+
+<!-- Copy everything through (with lower priority) -->
+<xsl:template match="@*|node()">
+  <xsl:copy><xsl:apply-templates select="@*|node()"/></xsl:copy>
+</xsl:template>
+
+<!-- Copy the root node, and add examples at the end-->
+<xsl:template match="/refentry">
+<refentry lang="en">
+<xsl:for-each select="*">
+  <xsl:copy><xsl:apply-templates select="@*|node()"/></xsl:copy>
+</xsl:for-each>
+  <refsect1>
+    <title>Examples</title>
+        <variablelist>
+<xsl:for-each select="//screen[@role='example']">
+            <varlistentry>
+                <term><command><xsl:copy-of select="text()"/></command></term>
+                <listitem>
+                    <xsl:copy-of select="following-sibling::para[@role='example']"/>
+                </listitem>
+            </varlistentry>
+</xsl:for-each>
+        </variablelist>
+  </refsect1>
+</refentry>
+</xsl:template>
+
+<!--
+ We show all the subcommands using XML that looks like this:
+
+  <term>
+    <cmdsynopsis>
+      <command>list_connections</command> 
+      <arg choice="opt">
+      <replaceable>connectioninfoitem</replaceable>
+       ...
+      </arg>
+    </cmdsynopsis>
+  </term>
+
+ However, while DocBook renders this sensibly for HTML, for some reason it
+ doen't show anything inside <cmdsynopsis> at all for man pages. I think what
+ we're doing is semantically correct so this is a bug in DocBook. The following
+ rules essentially do what DocBook does when <cmdsynopsis> is not inside a 
+ <term>.
+-->
+
+<xsl:template match="term/cmdsynopsis">
+  <xsl:apply-templates mode="docbook-bug"/>
+</xsl:template>
+
+<xsl:template match="command" mode="docbook-bug">
+  <emphasis role="bold"><xsl:apply-templates mode="docbook-bug"/></emphasis>
+</xsl:template>
+
+<xsl:template match="arg[@choice='opt']" mode="docbook-bug">
+  [<xsl:apply-templates mode="docbook-bug"/>]
+</xsl:template>
+
+<xsl:template match="arg[@choice='req']" mode="docbook-bug">
+  {<xsl:apply-templates mode="docbook-bug"/>}
+</xsl:template>
+
+<xsl:template match="replaceable" mode="docbook-bug">
+  <emphasis><xsl:apply-templates mode="docbook-bug"/></emphasis>
+</xsl:template>
+
+</xsl:stylesheet>
+
diff --git a/docs/html-to-website-xml.xsl b/docs/html-to-website-xml.xsl
new file mode 100644
index 00000000..a35b8699
--- /dev/null
+++ b/docs/html-to-website-xml.xsl
@@ -0,0 +1,91 @@
+<?xml version='1.0'?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                xmlns:doc="http://www.rabbitmq.com/namespaces/ad-hoc/doc"
+                version='1.0'>
+
+<xsl:param name="original"/>
+
+<xsl:output method="xml" doctype-public="bug in xslt processor requires fake doctype" doctype-system="otherwise css isn't included" />
+
+<xsl:template match="*"/>
+
+<!-- Copy every element through -->
+<xsl:template match="@*|node()">
+  <xsl:copy><xsl:apply-templates select="@*|node()"/></xsl:copy>
+</xsl:template>
+
+<!-- Copy the root node, and munge the outer part of the page -->
+<xsl:template match="/html">
+<xsl:processing-instruction name="xml-stylesheet">type="text/xml" href="page.xsl"</xsl:processing-instruction>
+<html xmlns:doc="http://www.rabbitmq.com/namespaces/ad-hoc/doc">
+  <head>
+    <title><xsl:value-of select="document($original)/refentry/refnamediv/refname"/><xsl:if test="document($original)/refentry/refmeta/manvolnum">(<xsl:value-of select="document($original)/refentry/refmeta/manvolnum"/>)</xsl:if> manual page</title>
+  </head>
+  <body>
+    <doc:div>
+      <xsl:choose>
+      <xsl:when test="document($original)/refentry/refmeta/manvolnum">
+      <p>
+        This is the manual page for 
+        <code><xsl:value-of select="document($original)/refentry/refnamediv/refname"/>(<xsl:value-of select="document($original)/refentry/refmeta/manvolnum"/>)</code>. 
+      </p>
+      <p>
+        <a href="manpages.html">See a list of all manual pages</a>.
+      </p>
+      </xsl:when>
+      <xsl:otherwise>
+      <p>
+        This is the documentation for 
+        <code><xsl:value-of select="document($original)/refentry/refnamediv/refname"/></code>. 
+      </p>
+      </xsl:otherwise>
+      </xsl:choose>
+      <p>
+         For more general documentation, please see the 
+        <a href="admin-guide.html">administrator's guide</a>.
+      </p>
+
+      <doc:toc class="compact">
+        <doc:heading>Table of Contents</doc:heading>
+      </doc:toc>
+
+      <xsl:apply-templates select="body/div[@class='refentry']"/>
+    </doc:div>
+  </body>
+</html>
+</xsl:template>
+
+<!-- Specific instructions to revert the DocBook HTML to be more like our ad-hoc XML schema -->
+
+<xsl:template match="div[@class='refsect1'] | div[@class='refnamediv'] | div[@class='refsynopsisdiv']">
+  <doc:section name="{@title}">
+    <xsl:apply-templates select="node()"/>
+  </doc:section>
+</xsl:template>
+
+<xsl:template match="div[@class='refsect2']">
+  <doc:subsection name="{@title}">
+    <xsl:apply-templates select="node()"/>
+  </doc:subsection>
+</xsl:template>
+
+<xsl:template match="h2 | h3">
+  <doc:heading>
+    <xsl:apply-templates select="node()"/>
+  </doc:heading>
+</xsl:template>
+
+<xsl:template match="pre[@class='screen']">
+  <pre class="sourcecode">
+    <xsl:apply-templates select="node()"/>
+  </pre>
+</xsl:template>
+
+<xsl:template match="div[@class='cmdsynopsis']">
+  <div class="cmdsynopsis" id="{p/code[@class='command']}">
+    <xsl:apply-templates select="node()"/>
+  </div>
+</xsl:template>
+
+</xsl:stylesheet>
+
diff --git a/docs/rabbitmq-activate-plugins.1.pod b/docs/rabbitmq-activate-plugins.1.pod
deleted file mode 100644
index 42f0c4d2..00000000
--- a/docs/rabbitmq-activate-plugins.1.pod
+++ /dev/null
@@ -1,37 +0,0 @@
-=head1 NAME
-
-rabbitmq-activate-plugins - command line tool for activating plugins
-in a RabbitMQ broker
-
-=head1 SYNOPSIS
-
-rabbitmq-activate-plugins
-
-=head1 DESCRIPTION
-
-RabbitMQ is an implementation of AMQP, the emerging standard for high
-performance enterprise messaging. The RabbitMQ server is a robust and
-scalable implementation of an AMQP broker.
-
-rabbitmq-activate-plugins is a command line tool for activating
-plugins installed into the broker's plugins directory.
-
-=head1 EXAMPLES
-
-To activate all of the installed plugins in the current RabbitMQ install,
-execute:
-
-    rabbitmq-activate-plugins
-
-=head1 SEE ALSO
-
-L<rabbitmq.conf(5)>, L<rabbitmq-multi(1)>, L<rabbitmq-server(1)>,
-L<rabbitmqctl(1)>, L<rabbitmq-deactivate-plugins(1)>
-
-=head1 AUTHOR
-
-The RabbitMQ Team <info@rabbitmq.com>
-
-=head1 REFERENCES
-
-RabbitMQ Web Site: L<http://www.rabbitmq.com>
diff --git a/docs/rabbitmq-activate-plugins.1.xml b/docs/rabbitmq-activate-plugins.1.xml
new file mode 100644
index 00000000..ef81c201
--- /dev/null
+++ b/docs/rabbitmq-activate-plugins.1.xml
@@ -0,0 +1,60 @@
+<?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">
+<refentry lang="en">
+    <refentryinfo>
+        <productname>RabbitMQ Server</productname>
+        <authorgroup>
+            <corpauthor>The RabbitMQ Team &lt;<ulink url="mailto:info@rabbitmq.com"><email>info@rabbitmq.com</email></ulink>&gt;</corpauthor>
+        </authorgroup>
+    </refentryinfo>
+
+    <refmeta>
+        <refentrytitle>rabbitmq-activate-plugins</refentrytitle>
+        <manvolnum>1</manvolnum>
+        <refmiscinfo class="manual">RabbitMQ Server</refmiscinfo>
+    </refmeta>
+
+    <refnamediv>
+        <refname>rabbitmq-activate-plugins</refname>
+        <refpurpose>command line tool for activating plugins in a RabbitMQ broker</refpurpose>
+    </refnamediv>
+
+    <refsynopsisdiv>
+        <cmdsynopsis>
+            <command>rabbitmq-activate-plugins</command>
+        </cmdsynopsis>
+    </refsynopsisdiv>
+    
+    <refsect1>
+        <title>Description</title>
+        <para>
+           RabbitMQ is an implementation of AMQP, the emerging standard for high
+performance enterprise messaging. The RabbitMQ server is a robust and
+scalable implementation of an AMQP broker.
+        </para>
+        <para>
+          rabbitmq-activate-plugins is a command line tool for activating
+plugins installed into the broker's plugins directory.
+        </para>
+        <para role="example-prefix">
+          For example:
+        </para>
+        <screen role="example">
+          rabbitmq-activate-plugins
+        </screen>
+        <para role="example">
+          This command activates all of the installed plugins in the current RabbitMQ install.
+        </para>
+    </refsect1>
+
+    <refsect1>
+        <title>See also</title>
+        <para>
+            <citerefentry><refentrytitle>rabbitmq.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>
+            <citerefentry><refentrytitle>rabbitmq-multi</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+            <citerefentry><refentrytitle>rabbitmq-server</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+            <citerefentry><refentrytitle>rabbitmqctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+            <citerefentry><refentrytitle>rabbitmq-deactivate-plugins</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+        </para>
+    </refsect1>
+</refentry>
diff --git a/docs/rabbitmq-deactivate-plugins.1.pod b/docs/rabbitmq-deactivate-plugins.1.pod
deleted file mode 100644
index eb4fbb90..00000000
--- a/docs/rabbitmq-deactivate-plugins.1.pod
+++ /dev/null
@@ -1,37 +0,0 @@
-=head1 NAME
-
-rabbitmq-deactivate-plugins - command line tool for deactivating plugins
-in a RabbitMQ broker
-
-=head1 SYNOPSIS
-
-rabbitmq-deactivate-plugins
-
-=head1 DESCRIPTION
-
-RabbitMQ is an implementation of AMQP, the emerging standard for high
-performance enterprise messaging. The RabbitMQ server is a robust and
-scalable implementation of an AMQP broker.
-
-rabbitmq-deactivate-plugins is a command line tool for deactivating
-plugins installed into the broker.
-
-=head1 EXAMPLES
-
-To deactivate all of the installed plugins in the current RabbitMQ install,
-execute:
-
-    rabbitmq-deactivate-plugins
-
-=head1 SEE ALSO
-
-L<rabbitmq.conf(5)>, L<rabbitmq-multi(1)>, L<rabbitmq-server(1)>,
-L<rabbitmqctl(1)>, L<rabbitmq-activate-plugins(1)>
-
-=head1 AUTHOR
-
-The RabbitMQ Team <info@rabbitmq.com>
-
-=head1 REFERENCES
-
-RabbitMQ Web Site: L<http://www.rabbitmq.com>
diff --git a/docs/rabbitmq-deactivate-plugins.1.xml b/docs/rabbitmq-deactivate-plugins.1.xml
new file mode 100644
index 00000000..eacd014b
--- /dev/null
+++ b/docs/rabbitmq-deactivate-plugins.1.xml
@@ -0,0 +1,60 @@
+<?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">
+<refentry lang="en">
+    <refentryinfo>
+        <productname>RabbitMQ Server</productname>
+        <authorgroup>
+            <corpauthor>The RabbitMQ Team &lt;<ulink url="mailto:info@rabbitmq.com"><email>info@rabbitmq.com</email></ulink>&gt;</corpauthor>
+        </authorgroup>
+    </refentryinfo>
+
+    <refmeta>
+        <refentrytitle>rabbitmq-deactivate-plugins</refentrytitle>
+        <manvolnum>1</manvolnum>
+        <refmiscinfo class="manual">RabbitMQ Server</refmiscinfo>
+    </refmeta>
+
+    <refnamediv>
+        <refname>rabbitmq-deactivate-plugins</refname>
+        <refpurpose>command line tool for deactivating plugins in a RabbitMQ broker</refpurpose>
+    </refnamediv>
+
+    <refsynopsisdiv>
+        <cmdsynopsis>
+            <command>rabbitmq-deactivate-plugins</command>
+        </cmdsynopsis>
+    </refsynopsisdiv>
+    
+    <refsect1>
+        <title>Description</title>
+        <para>
+           RabbitMQ is an implementation of AMQP, the emerging standard for high
+performance enterprise messaging. The RabbitMQ server is a robust and
+scalable implementation of an AMQP broker.
+        </para>
+        <para>
+rabbitmq-deactivate-plugins is a command line tool for deactivating
+plugins installed into the broker.
+        </para>
+        <para role="example-prefix">
+          For example:
+        </para>
+        <screen role="example">
+          rabbitmq-deactivate-plugins
+        </screen>
+        <para role="example">
+          This command deactivates all of the installed plugins in the current RabbitMQ install.
+        </para>
+    </refsect1>
+
+    <refsect1>
+        <title>See also</title>
+        <para>
+            <citerefentry><refentrytitle>rabbitmq.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>
+            <citerefentry><refentrytitle>rabbitmq-multi</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+            <citerefentry><refentrytitle>rabbitmq-server</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+            <citerefentry><refentrytitle>rabbitmqctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+            <citerefentry><refentrytitle>rabbitmq-activate-plugins</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+        </para>
+    </refsect1>
+</refentry>
diff --git a/docs/rabbitmq-multi.1.pod b/docs/rabbitmq-multi.1.pod
deleted file mode 100644
index 640609ee..00000000
--- a/docs/rabbitmq-multi.1.pod
+++ /dev/null
@@ -1,59 +0,0 @@
-=head1 NAME
-
-rabbitmq-multi - start/stop local cluster RabbitMQ nodes
-
-=head1 SYNOPSIS
-
-rabbitmq-multi I<command> [command option]
-
-=head1 DESCRIPTION
-
-RabbitMQ is an implementation of AMQP, the emerging standard for high
-performance enterprise messaging. The RabbitMQ server is a robust and
-scalable implementation of an AMQP broker.
-
-rabbitmq-multi scripts allows for easy set-up of a cluster on a single
-machine.
-
-See also L<rabbitmq-server(1)> for configuration information.
-
-=head1 COMMANDS
-
-=over
-
-=item start_all I<count>
-
-Start count nodes with unique names, listening on all IP addresses and
-on sequential ports starting from 5672.
-
-=item status
-
-Print the status of all running RabbitMQ nodes.
-
-=item stop_all
-
-Stop all local RabbitMQ nodes,
-
-=item rotate_logs
-
-Rotate log files for all local and running RabbitMQ nodes.
-
-=back
-
-=head1 EXAMPLES
-
-Start 3 local RabbitMQ nodes with unique, sequential port numbers:
-
-          rabbitmq-multi start_all 3
-
-=head1 SEE ALSO
-
-L<rabbitmq.conf(5)>, L<rabbitmq-server(1)>, L<rabbitmqctl(1)>
-
-=head1 AUTHOR
-
-The RabbitMQ Team <info@rabbitmq.com>
-
-=head1 REFERENCES
-
-RabbitMQ Web Site: L<http://www.rabbitmq.com>
diff --git a/docs/rabbitmq-multi.1.xml b/docs/rabbitmq-multi.1.xml
new file mode 100644
index 00000000..b3862fdf
--- /dev/null
+++ b/docs/rabbitmq-multi.1.xml
@@ -0,0 +1,100 @@
+<?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">
+<refentry lang="en">
+    <refentryinfo>
+        <productname>RabbitMQ Server</productname>
+        <authorgroup>
+            <corpauthor>The RabbitMQ Team &lt;<ulink url="mailto:info@rabbitmq.com"><email>info@rabbitmq.com</email></ulink>&gt;</corpauthor>
+        </authorgroup>
+    </refentryinfo>
+
+    <refmeta>
+        <refentrytitle>rabbitmq-multi</refentrytitle>
+        <manvolnum>1</manvolnum>
+        <refmiscinfo class="manual">RabbitMQ Server</refmiscinfo>
+    </refmeta>
+
+    <refnamediv>
+        <refname>rabbitmq-multi</refname>
+        <refpurpose>start/stop local cluster RabbitMQ nodes</refpurpose>
+    </refnamediv>
+
+    <refsynopsisdiv>
+        <cmdsynopsis>
+          <command>rabbitmq-multi</command>
+          <arg choice="req"><replaceable>command</replaceable></arg>
+          <arg choice="opt" rep="repeat"><replaceable>command options</replaceable></arg>
+        </cmdsynopsis>
+    </refsynopsisdiv>
+    
+    <refsect1>
+        <title>Description</title>
+        <para>
+           RabbitMQ is an implementation of AMQP, the emerging standard for high
+performance enterprise messaging. The RabbitMQ server is a robust and
+scalable implementation of an AMQP broker.
+        </para>
+        <para>
+rabbitmq-multi scripts allows for easy set-up of a cluster on a single
+machine.
+        </para>
+    </refsect1>
+
+    <refsect1>
+      <title>Commands</title>
+      <variablelist>
+        <varlistentry>
+          <term><cmdsynopsis><command>start_all</command> <arg choice="req"><replaceable>count</replaceable></arg></cmdsynopsis></term>
+          <listitem>
+            <para>
+Start count nodes with unique names, listening on all IP addresses and
+on sequential ports starting from 5672.
+            </para>
+            <para role="example-prefix">For example:</para>
+            <screen role="example">rabbitmq-multi start_all 3</screen>
+            <para role="example">
+              Starts 3 local RabbitMQ nodes with unique, sequential port numbers.
+            </para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term><cmdsynopsis><command>status</command></cmdsynopsis></term>
+          <listitem>
+            <para>
+Print the status of all running RabbitMQ nodes.
+            </para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term><cmdsynopsis><command>stop_all</command></cmdsynopsis></term>
+          <listitem>
+            <para>
+Stop all local RabbitMQ nodes,
+            </para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term><cmdsynopsis><command>rotate_logs</command></cmdsynopsis></term>
+          <listitem>
+            <para>
+Rotate log files for all local and running RabbitMQ nodes.
+            </para>
+          </listitem>
+        </varlistentry>
+
+      </variablelist>
+    </refsect1>
+
+
+    <refsect1>
+        <title>See also</title>
+        <para>
+            <citerefentry><refentrytitle>rabbitmq.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>
+            <citerefentry><refentrytitle>rabbitmq-server</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+            <citerefentry><refentrytitle>rabbitmqctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+        </para>
+    </refsect1>
+</refentry>
diff --git a/docs/rabbitmq-server.1.pod b/docs/rabbitmq-server.1.pod
deleted file mode 100644
index d74ab8d9..00000000
--- a/docs/rabbitmq-server.1.pod
+++ /dev/null
@@ -1,88 +0,0 @@
-=head1 NAME
-
-rabbitmq-server - start RabbitMQ AMQP server
-
-=head1 SYNOPSIS
-
-rabbitmq-server [-detached]
-
-=head1 DESCRIPTION
-
-RabbitMQ is an implementation of AMQP, the emerging standard for high
-performance enterprise messaging. The RabbitMQ server is a robust and
-scalable implementation of an AMQP broker.
-
-Running rabbitmq-server in the foreground displays a banner message,
-and reports on progress in the startup sequence, concluding with the
-message "broker running", indicating that the RabbitMQ broker has been
-started successfully. To shut down the server, just terminate the
-process or use L<rabbitmqctl(1)>.
-
-=head1 ENVIRONMENT
-
-=over
-
-=item B<RABBITMQ_MNESIA_BASE>
-
-Defaults to F</var/lib/rabbitmq/mnesia>. Set this to the directory where
-Mnesia database files should be placed.
-
-=item B<RABBITMQ_LOG_BASE>
-
-Defaults to F</var/log/rabbitmq>. Log files generated by the server will
-be placed in this directory.
-
-=item B<RABBITMQ_NODENAME>
-
-Defaults to rabbit. This can be useful if you want to run more than
-one node per machine - B<RABBITMQ_NODENAME> should be unique per
-erlang-node-and-machine combination. See clustering on a single
-machine guide at
-L<http://www.rabbitmq.com/clustering.html#single-machine> for details.
-
-=item B<RABBITMQ_NODE_IP_ADDRESS>
-
-Defaults to 0.0.0.0. This can be changed if you only want to bind to
-one network interface.
-
-=item B<RABBITMQ_NODE_PORT>
-
-Defaults to 5672. 
-
-=item B<RABBITMQ_CLUSTER_CONFIG_FILE>
-
-Defaults to F</etc/rabbitmq/rabbitmq_cluster.config>. If this file is
-present it is used by the server to auto-configure a RabbitMQ cluster.
-See the clustering guide at L<http://www.rabbitmq.com/clustering.html>
-for details.
-
-=back
-
-=head1 OPTIONS
-
-=over
-
-=item B<-detached>
-
-start the server process in the background
-
-=back
-
-=head1 EXAMPLES
-
-Run RabbitMQ AMQP server in the background:
-
-          rabbitmq-server -detached
-
-=head1 SEE ALSO
-
-L<rabbitmq.conf(5)>, L<rabbitmq-multi(1)>, L<rabbitmqctl(1)>
-
-=head1 AUTHOR
-
-The RabbitMQ Team <info@rabbitmq.com>
-
-=head1 REFERENCES
-
-RabbitMQ Web Site: L<http://www.rabbitmq.com>
-
diff --git a/docs/rabbitmq-server.1.xml b/docs/rabbitmq-server.1.xml
new file mode 100644
index 00000000..25c2aefb
--- /dev/null
+++ b/docs/rabbitmq-server.1.xml
@@ -0,0 +1,143 @@
+<?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">
+<refentry lang="en">
+    <refentryinfo>
+        <productname>RabbitMQ Server</productname>
+        <authorgroup>
+            <corpauthor>The RabbitMQ Team &lt;<ulink url="mailto:info@rabbitmq.com"><email>info@rabbitmq.com</email></ulink>&gt;</corpauthor>
+        </authorgroup>
+    </refentryinfo>
+
+    <refmeta>
+        <refentrytitle>rabbitmq-server</refentrytitle>
+        <manvolnum>1</manvolnum>
+        <refmiscinfo class="manual">RabbitMQ Server</refmiscinfo>
+    </refmeta>
+
+    <refnamediv>
+        <refname>rabbitmq-server</refname>
+        <refpurpose>start RabbitMQ AMQP server</refpurpose>
+    </refnamediv>
+
+    <refsynopsisdiv>
+        <cmdsynopsis>
+          <command>rabbitmq-multi</command>
+          <arg choice="opt">-detached</arg>
+        </cmdsynopsis>
+    </refsynopsisdiv>
+    
+    <refsect1>
+        <title>Description</title>
+        <para>
+           RabbitMQ is an implementation of AMQP, the emerging standard for high
+performance enterprise messaging. The RabbitMQ server is a robust and
+scalable implementation of an AMQP broker.
+        </para>
+        <para>
+Running rabbitmq-server in the foreground displays a banner message,
+and reports on progress in the startup sequence, concluding with the
+message "broker running", indicating that the RabbitMQ broker has been
+started successfully. To shut down the server, just terminate the
+process or use rabbitmqctl(1).
+        </para>
+    </refsect1>
+
+    <refsect1>
+      <title>Environment</title>
+      <variablelist>
+
+        <varlistentry>
+          <term>RABBITMQ_MNESIA_BASE</term>
+          <listitem>
+            <para>
+Defaults to <filename>/var/lib/rabbitmq/mnesia</filename>. Set this to the directory where
+Mnesia database files should be placed.
+            </para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term>RABBITMQ_LOG_BASE</term>
+          <listitem>
+            <para>
+Defaults to <filename>/var/log/rabbitmq</filename>. Log files generated by the server will
+be placed in this directory.
+            </para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term>RABBITMQ_NODENAME</term>
+          <listitem>
+            <para>
+Defaults to rabbit. This can be useful if you want to run more than
+one node per machine - <envar>RABBITMQ_NODENAME</envar> should be unique per
+erlang-node-and-machine combination. See the 
+<ulink url="http://www.rabbitmq.com/clustering.html#single-machine">clustering on a single
+machine guide</ulink> for details.
+            </para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term>RABBITMQ_NODE_IP_ADDRESS</term>
+          <listitem>
+            <para>
+Defaults to 0.0.0.0. This can be changed if you only want to bind to
+one network interface.
+            </para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term>RABBITMQ_NODE_PORT</term>
+          <listitem>
+            <para>
+Defaults to 5672. 
+            </para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term>RABBITMQ_CLUSTER_CONFIG_FILE</term>
+          <listitem>
+            <para>
+Defaults to <filename>/etc/rabbitmq/rabbitmq_cluster.config</filename>. If this file is
+present it is used by the server to auto-configure a RabbitMQ cluster.
+See the <ulink url="http://www.rabbitmq.com/clustering.html">clustering guide</ulink>
+for details.
+            </para>
+          </listitem>
+        </varlistentry>
+
+      </variablelist>
+    </refsect1>
+
+    <refsect1>
+      <title>Options</title>
+      <variablelist>
+        <varlistentry>
+          <term>-detached</term>
+          <listitem>
+            <para>
+              start the server process in the background
+            </para>
+            <para role="example-prefix">For example:</para>
+            <screen role="example">rabbitmq-server -detached</screen>
+            <para role="example">
+              Runs RabbitMQ AMQP server in the background.
+            </para>
+          </listitem>
+        </varlistentry>
+      </variablelist>
+    </refsect1>
+
+    <refsect1>
+        <title>See also</title>
+        <para>
+            <citerefentry><refentrytitle>rabbitmq.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>
+            <citerefentry><refentrytitle>rabbitmq-multi</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+            <citerefentry><refentrytitle>rabbitmqctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+        </para>
+    </refsect1>
+</refentry>
diff --git a/docs/rabbitmq-service.xml b/docs/rabbitmq-service.xml
new file mode 100644
index 00000000..d59ed638
--- /dev/null
+++ b/docs/rabbitmq-service.xml
@@ -0,0 +1,228 @@
+<?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">
+<refentry lang="en">
+    <refentryinfo>
+        <productname>RabbitMQ Server</productname>
+        <authorgroup>
+            <corpauthor>The RabbitMQ Team &lt;<ulink url="mailto:info@rabbitmq.com"><email>info@rabbitmq.com</email></ulink>&gt;</corpauthor>
+        </authorgroup>
+    </refentryinfo>
+
+    <refmeta>
+        <refentrytitle>rabbitmq-service.bat</refentrytitle>
+        <refmiscinfo class="manual">RabbitMQ Server</refmiscinfo>
+    </refmeta>
+
+    <refnamediv>
+        <refname>rabbitmq-service.bat</refname>
+        <refpurpose>manage RabbitMQ AMQP service</refpurpose>
+    </refnamediv>
+
+    <refsynopsisdiv>
+        <cmdsynopsis>
+          <command>rabbitmq-service.bat</command>
+          <arg choice="opt">command</arg>
+        </cmdsynopsis>
+    </refsynopsisdiv>
+    
+    <refsect1>
+        <title>Description</title>
+        <para>
+           RabbitMQ is an implementation of AMQP, the emerging standard for high
+performance enterprise messaging. The RabbitMQ server is a robust and
+scalable implementation of an AMQP broker.
+        </para>
+        <para>
+Running <command>rabbitmq-service</command> allows the RabbitMQ broker to be run as a
+service on NT/2000/2003/XP/Vista® environments. The RabbitMQ broker 
+service can be started and stopped using the Windows® services 
+applet. 
+        </para>
+        <para>
+By default the service will run in the authentication context of the 
+local system account. It is therefore necessary to synchronise Erlang
+cookies between the local system account (typically 
+<filename>C:\WINDOWS\.erlang.cookie</filename> and the account that will be used to
+run <command>rabbitmqctl</command>.
+        </para>
+    </refsect1>
+
+    <refsect1>
+      <title>Commands</title>
+      <variablelist>
+
+        <varlistentry>
+          <term>help</term>
+          <listitem>
+            <para>
+Display usage information.
+            </para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term>install</term>
+          <listitem>
+            <para>
+Install the service. The service will not be started.
+Subsequent invocations will update the service parameters if
+relevant environment variables were modified.
+            </para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term>remove</term>
+          <listitem>
+            <para>
+Remove the service. If the service is running then it will
+automatically be stopped before being removed. No files will be
+deleted as a consequence and <command>rabbitmq-server</command> will remain operable.
+            </para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term>start</term>
+          <listitem>
+            <para>
+Start the service. The service must have been correctly installed
+beforehand. 
+            </para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term>stop</term>
+          <listitem>
+            <para>
+Stop the service. The service must be running for this command to 
+have any effect.
+            </para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term>disable</term>
+          <listitem>
+            <para>
+Disable the service. This is the equivalent of setting the startup
+type to <code>Disabled</code> using the service control panel.
+            </para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term>enable</term>
+          <listitem>
+            <para>
+Enable the service. This is the equivalent of setting the startup
+type to <code>Automatic</code> using the service control panel.
+            </para>
+          </listitem>
+        </varlistentry>
+      </variablelist>
+    </refsect1>
+
+    <refsect1>
+      <title>Environment</title>
+      <variablelist>
+
+        <varlistentry>
+          <term>RABBITMQ_SERVICENAME</term>
+          <listitem>
+            <para>
+Defaults to RabbitMQ.
+            </para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term>RABBITMQ_BASE</term>
+          <listitem>
+            <para>
+Defaults to the application data directory of the current user.
+This is the location of log and database directories.
+
+            </para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term>RABBITMQ_NODENAME</term>
+          <listitem>
+            <para>
+Defaults to rabbit. This can be useful if you want to run more than
+one node per machine - <envar>RABBITMQ_NODENAME</envar> should be unique per
+erlang-node-and-machine combination. See the 
+<ulink url="http://www.rabbitmq.com/clustering.html#single-machine">clustering on a single
+machine guide</ulink> for details.
+            </para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term>RABBITMQ_NODE_IP_ADDRESS</term>
+          <listitem>
+            <para>
+Defaults to 0.0.0.0. This can be changed if you only want to bind to
+one network interface.
+            </para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term>RABBITMQ_NODE_PORT</term>
+          <listitem>
+            <para>
+Defaults to 5672. 
+            </para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term>ERLANG_SERVICE_MANAGER_PATH</term>
+          <listitem>
+            <para>
+Defaults to <filename>C:\Program Files\erl5.5.5\erts-5.5.5\bin</filename>
+(or <filename>C:\Program Files (x86)\erl5.5.5\erts-5.5.5\bin</filename> for 64-bit
+environments). This is the installation location of the Erlang service
+manager.
+            </para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term>RABBITMQ_CLUSTER_CONFIG_FILE</term>
+          <listitem>
+            <para>
+If this file is
+present it is used by the server to auto-configure a RabbitMQ cluster.
+See the <ulink url="http://www.rabbitmq.com/clustering.html">clustering guide</ulink>
+for details.
+            </para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term>RABBITMQ_CONSOLE_LOG</term>
+          <listitem>
+            <para>
+Set this varable to <code>new</code> or <code>reuse</code> to have the console 
+output from the server redirected to a file named <code>SERVICENAME</code>.debug
+in the  application data directory of the user that installed the service.
+Under Vista this will be <filename>C:\Users\AppData\username\SERVICENAME</filename>.
+Under previous versions of Windows this will be 
+<filename>C:\Documents and Settings\username\Application Data\SERVICENAME</filename>.
+If <code>RABBITMQ_CONSOLE_LOG</code> is set to <code>new</code> then a new file will be
+created each time the service starts. If <code>RABBITMQ_CONSOLE_LOG</code> is
+set to <code>reuse</code> then the file will be overwritten each time the
+service starts.  The default behaviour when <code>RABBITMQ_CONSOLE_LOG</code> is
+not set or set to a value other than <code>new</code> or <code>reuse</code> is to discard
+the server output.
+            </para>
+          </listitem>
+        </varlistentry>
+      </variablelist>
+    </refsect1>
+</refentry>
diff --git a/docs/rabbitmq.conf.5.pod b/docs/rabbitmq.conf.5.pod
deleted file mode 100644
index a7bf4c09..00000000
--- a/docs/rabbitmq.conf.5.pod
+++ /dev/null
@@ -1,69 +0,0 @@
-=head1 NAME
-
-F</etc/rabbitmq/rabbitmq.conf> - default settings for RabbitMQ AMQP
-server
-
-=head1 DESCRIPTION
-
-F</etc/rabbitmq/rabbitmq.conf> contains variable settings that override the
-defaults built in to the RabbitMQ startup scripts.
-
-The file is interpreted by the system shell, and so should consist of
-a sequence of shell environment variable definitions. Normal shell
-syntax is permitted (since the file is sourced using the shell "."
-operator), including line comments starting with "#".
-
-In order of preference, the startup scripts get their values from the
-environment, from F</etc/rabbitmq/rabbitmq.conf> and finally from the
-built-in default values. For example, for the B<RABBITMQ_NODENAME>
-setting,
-
-=over
-
-=item B<RABBITMQ_NODENAME>
-
-from the environment is checked first. If it is absent or equal to the
-empty string, then
-
-=item B<NODENAME>
-
-from L</etc/rabbitmq/rabbitmq.conf> is checked. If it is also absent
-or set equal to the empty string then the default value from the
-startup script is used.
-
-The variable names in /etc/rabbitmq/rabbitmq.conf are always equal to the
-environment variable names, with the B<RABBITMQ_> prefix removed:
-B<RABBITMQ_NODE_PORT> from the environment becomes B<NODE_PORT> in the
-F</etc/rabbitmq/rabbitmq.conf> file, etc.
-
-=back
-
-=head1 EXAMPLES
-
-The following is an example of a complete
-F</etc/rabbitmq/rabbitmq.conf> file that overrides the default Erlang
-node name from "rabbit" to "hare":
-
-    # I am a complete /etc/rabbitmq/rabbitmq.conf file.
-    # Comment lines start with a hash character.
-    # This is a /bin/sh script file - use ordinary envt var syntax
-    NODENAME=hare
-
-=head1 SEE ALSO
-
-L<rabbitmq-server(1)>, L<rabbitmq-multi(1)>, L<rabbitmqctl(1)>
-
-=head1 AUTHOR
-
-Originally written by The RabbitMQ Team <info@rabbitmq.com>
-
-=head1 COPYRIGHT
-
-This package, the RabbitMQ server is licensed under the MPL.
-
-If you have any questions regarding licensing, please contact us at 
-info@rabbitmq.com.
-
-=head1 REFERENCES
-
-RabbitMQ Web Site: L<http://www.rabbitmq.com>
diff --git a/docs/rabbitmq.conf.5.xml b/docs/rabbitmq.conf.5.xml
new file mode 100644
index 00000000..dcb1e49c
--- /dev/null
+++ b/docs/rabbitmq.conf.5.xml
@@ -0,0 +1,84 @@
+<?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">
+<refentry lang="en">
+    <refentryinfo>
+        <productname>RabbitMQ Server</productname>
+        <authorgroup>
+            <corpauthor>The RabbitMQ Team &lt;<ulink url="mailto:info@rabbitmq.com"><email>info@rabbitmq.com</email></ulink>&gt;</corpauthor>
+        </authorgroup>
+    </refentryinfo>
+
+    <refmeta>
+        <refentrytitle>/etc/rabbitmq/rabbitmq.conf</refentrytitle>
+        <manvolnum>5</manvolnum>
+        <refmiscinfo class="manual">RabbitMQ Server</refmiscinfo>
+    </refmeta>
+
+    <refnamediv>
+        <refname>rabbitmq.conf</refname>
+        <refpurpose>default settings for RabbitMQ AMQP server</refpurpose>
+    </refnamediv>
+   
+    <refsect1>
+        <title>Description</title>
+        <para>
+<filename>/etc/rabbitmq/rabbitmq.conf</filename> contains variable settings that override the
+defaults built in to the RabbitMQ startup scripts.
+        </para>
+        <para>
+The file is interpreted by the system shell, and so should consist of
+a sequence of shell environment variable definitions. Normal shell
+syntax is permitted (since the file is sourced using the shell "."
+operator), including line comments starting with "#".
+        </para>
+        <para>
+In order of preference, the startup scripts get their values from the
+environment, from <filename>/etc/rabbitmq/rabbitmq.conf</filename> and finally from the
+built-in default values. For example, for the <envar>RABBITMQ_NODENAME</envar>
+setting,
+        </para>
+        <para>
+          <envar>RABBITMQ_NODENAME</envar>
+        </para>
+        <para>
+from the environment is checked first. If it is absent or equal to the
+empty string, then
+        </para>
+        <para>
+          <envar>NODENAME</envar>
+        </para>
+        <para>
+from <filename>/etc/rabbitmq/rabbitmq.conf</filename> is checked. If it is also absent
+or set equal to the empty string then the default value from the
+startup script is used.
+        </para>
+        <para>
+The variable names in /etc/rabbitmq/rabbitmq.conf are always equal to the
+environment variable names, with the <envar>RABBITMQ_</envar> prefix removed:
+<envar>RABBITMQ_NODE_PORT</envar> from the environment becomes <envar>NODE_PORT</envar> in the
+<filename>/etc/rabbitmq/rabbitmq.conf</filename> file, etc.
+        </para>
+        <para role="example-prefix">For example:</para>
+        <screen role="example">
+            # I am a complete /etc/rabbitmq/rabbitmq.conf file.
+            # Comment lines start with a hash character.
+            # This is a /bin/sh script file - use ordinary envt var syntax
+            NODENAME=hare
+        </screen>
+        <para role="example">
+            This is an example of a complete
+            <filename>/etc/rabbitmq/rabbitmq.conf</filename> file that overrides the default Erlang
+            node name from "rabbit" to "hare".
+        </para>
+
+    </refsect1>
+
+    <refsect1>
+        <title>See also</title>
+        <para>
+            <citerefentry><refentrytitle>rabbitmq-multi</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+            <citerefentry><refentrytitle>rabbitmq-server</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+            <citerefentry><refentrytitle>rabbitmqctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+        </para>
+    </refsect1>
+</refentry>
diff --git a/docs/rabbitmqctl.1.pod b/docs/rabbitmqctl.1.pod
deleted file mode 100644
index e26767ab..00000000
--- a/docs/rabbitmqctl.1.pod
+++ /dev/null
@@ -1,536 +0,0 @@
-=head1 NAME
-
-rabbitmqctl - command line tool for managing a RabbitMQ broker
-
-=head1 SYNOPSIS
-
-rabbitmqctl [-n I<node>] I<<command>> [command options]
-
-=head1 DESCRIPTION
-
-RabbitMQ is an implementation of AMQP, the emerging standard for high
-performance enterprise messaging. The RabbitMQ server is a robust and
-scalable implementation of an AMQP broker.
-
-rabbitmqctl is a command line tool for managing a RabbitMQ broker.
-It performs all actions by connecting to one of the broker's nodes.
-
-
-=head1 OPTIONS
-
-=over 
-
-=item B<-n> I<node>
-
-Default node is C<rabbit@server>, where server is the local host.  On
-a host named C<server.example.com>, the node name of the RabbitMQ
-Erlang node will usually be rabbit@server (unless RABBITMQ_NODENAME
-has been set to some non-default value at broker startup time).  The
-output of hostname -s is usually the correct suffix to use after the
-"@" sign. See rabbitmq-server(1) for details of configuring the
-RabbitMQ broker.
-
-=item B<-q>
-
-Quiet output mode is selected with the B<-q> flag. Informational
-messages are suppressed when quiet mode is in effect.
-
-=back
-
-=head1 COMMANDS
-
-=head2 APPLICATION AND CLUSTER MANAGEMENT
-
-=over
-
-=item stop
-
-Stop the Erlang node on which RabbitMQ broker is running.
-
-=item stop_app
-
-Stop the RabbitMQ application, leaving the Erlang node running.  This
-command is typically run prior to performing other management actions
-that require the RabbitMQ application to be stopped, e.g. I<reset>.
-
-=item start_app
-
-Start the RabbitMQ application.  This command is typically run prior
-to performing other management actions that require the RabbitMQ
-application to be stopped, e.g. I<reset>.
-
-=item status
-
-Display various information about the RabbitMQ broker, such as whether
-the RabbitMQ application on the current node, its version number, what
-nodes are part of the broker, which of these are running.
-
-=item reset
-
-Return a RabbitMQ node to its virgin state.  Removes the node from any
-cluster it belongs to, removes all data from the management database,
-such as configured users, vhosts and deletes all persistent messages.
-
-=item force_reset
-
-The same as I<reset> command, but resets the node unconditionally,
-regardless of the current management database state and cluster
-configuration.  It should only be used as a last resort if the
-database or cluster configuration has been corrupted.
-
-=item rotate_logs [suffix]
-
-Instruct the RabbitMQ node to rotate the log files. The RabbitMQ
-broker will attempt to append the current contents of the log file to
-the file with the name composed of the original name and the
-suffix. It will create a new file if such a file does not already
-exist. When no I<suffix> is specified, the empty log file is simply
-created at the original location; no rotation takes place.  When an
-error occurs while appending the contents of the old log file, the
-operation behaves in the same way as if no I<suffix> was specified.
-This command might be helpful when you are e.g. writing your own
-logrotate script and you do not want to restart the RabbitMQ node.
-
-=item cluster I<clusternode> ...
-
-Instruct the node to become member of a cluster with the specified
-nodes determined by I<clusternode> option(s). See
-L<http://www.rabbitmq.com/clustering.html> for more information about
-clustering.
-
-=item close_connection I<connectionpid> I<explanation>
-
-Instruct the broker to close the connection associated with the Erlang
-process id I<connectionpid> (see also the I<list_connections>
-command), passing the I<explanation> string to the connected client as
-part of the AMQP connection shutdown protocol.
-
-=back
-
-=head2 USER MANAGEMENT
-
-=over
-
-=item add_user I<username> I<password>
-
-Create a user named I<username> with (initial) password I<password>.
-
-=item delete_user I<username>
-
-Delete the user named I<username>.
-
-=item change_password I<username> I<newpassword>
-
-Change the password for the user named I<username> to I<newpassword>.
-
-=item list_users
-
-List all users, one per line.
-
-=back
-
-=head2 ACCESS CONTROL
-
-=over
-
-=item add_vhost I<vhostpath>
-
-Create a new virtual host called I<vhostpath>.
-
-=item delete_vhost I<vhostpath>
-
-Delete a virtual host I<vhostpath>.  This command deletes also all its
-exchanges, queues and user mappings.  
-
-=item list_vhosts
-
-List all virtual hosts, one per line.
-
-=item set_permissions [-p I<vhostpath>] I<username> I<regexp> I<regexp> I<regexp>
-
-Set the permissions for the user named I<username> in the virtual host
-I<vhostpath>, granting I<configure>, I<write> and I<read> access to
-resources with names matching the first, second and third I<regexp>,
-respectively.
-
-=item clear_permissions [-p I<vhostpath>] I<username>
-
-Remove the permissions for the user named I<username> in the virtual
-host I<vhostpath>.
-
-=item list_permissions [-p I<vhostpath>]
-
-List all the users and their permissions in the virtual host
-I<vhostpath>.  Each output line contains the username and their
-I<configure>, I<write> and I<read> access regexps, separated by tab
-characters.
-
-=item list_user_permissions I<username> 
-
-List the permissions of the user named I<username> across all virtual
-hosts.
-
-=back
-
-=head2 SERVER STATUS
-
-=over
-
-=item list_queues [-p I<vhostpath>] [I<queueinfoitem> ...]
-
-List queue information by virtual host. Each line printed
-describes a queue, with the requested I<queueinfoitem> values
-separated by tab characters.  If no I<queueinfoitem>s are
-specified then I<name> and I<messages> are assumed.
-
-=back
-
-=head3 Queue information items
-
-=over
-
-=item name
-
-name of the queue
-
-=item durable
-
-whether the queue survives server restarts
-
-=item auto_delete
-
-whether the queue will be deleted when no longer used
-
-=item arguments
-
-queue arguments
-
-=item pid
-
-id of the Erlang process associated with the queue
-
-=item owner_pid
-
-id of the Erlang process representing the connection which is the
-exclusive owner of the queue, or empty if the queue is non-exclusive
-
-=item exclusive_consumer_pid
-
-id of the Erlang process representing the channel of the exclusive
-consumer subscribed to this queue, or empty if there is no exclusive
-consumer
-
-=item exclusive_consumer_tag
-
-consumer tag of the exclusive consumer subscribed to this queue, or
-empty if there is no exclusive consumer
-
-=item messages_ready
-
-number of messages ready to be delivered to clients
-
-=item messages_unacknowledged
-
-number of messages delivered to clients but not yet acknowledged
-
-=item messages_uncommitted
-
-number of messages published in as yet uncommitted transactions
-
-=item messages
-
-sum of ready, unacknowledged and uncommitted messages
-
-=item acks_uncommitted
-
-number of acknowledgements received in as yet uncommitted transactions
-
-=item consumers
-
-number of consumers
-
-=item transactions
-
-number of transactions
-
-=item memory
-
-bytes of memory consumed by the Erlang process for the queue,
-including stack, heap and internal structures
-
-=back
-
-=over
-
-=item list_exchanges [-p I<vhostpath>] [I<exchangeinfoitem> ...]
-
-List queue information by virtual host. Each line printed describes an
-exchange, with the requested I<exchangeinfoitem> values separated by
-tab characters.  If no I<exchangeinfoitem>s are specified then I<name>
-and I<type> are assumed.
-
-=back
-
-=head3 Exchange information items
-
-=over
-
-=item name 
-
-name of the exchange
-
-=item type
-
-exchange type (B<direct>, B<topic>, B<fanout>, or B<headers>)
-
-=item durable
-
-whether the exchange survives server restarts
-
-=item auto_delete
-
-whether the exchange is deleted when no longer used
-
-=item arguments
-
-exchange arguments
-
-=back
-
-=over
-
-=item list_bindings [-p I<vhostpath>]
-
-List bindings by virtual host. Each line printed describes a binding,
-with the exchange name, queue name, routing key and arguments,
-separated by tab characters.
-
-=item list_connections [I<connectioninfoitem> ...]
-
-List current AMQP connections. Each line printed describes a
-connection, with the requested I<connectioninfoitem> values separated
-by tab characters.  If no I<connectioninfoitem>s are specified then
-I<user>, I<peer_address>, I<peer_port> and I<state> are assumed.
-
-=back
-
-=head3 Connection information items
-
-=over
-
-=item pid
-
-id of the Erlang process associated with the connection
-
-=item address
-
-server IP number
-
-=item port
-
-server port
-
-=item peer_address
-
-peer address
-
-=item peer_port
-
-peer port
-
-=item state
-
-connection state (B<pre-init>, B<starting>, B<tuning>, B<opening>,
-B<running>, B<closing>, B<closed>)
-
-=item channels
-
-number of channels using the connection
-
-=item user
-
-username associated with the connection
-
-=item vhost
-
-virtual host
-
-=item timeout
-
-connection timeout
-
-=item frame_max
-
-maximum frame size (bytes)
-
-=item client_properties
-
-informational properties transmitted by the client during connection
-establishment
-
-=item recv_oct
-
-octets received
-
-=item recv_cnt
-
-packets received
-
-=item send_oct
-
-octets sent
-
-=item send_cnt
-
-packets sent
-
-=item send_pend
-
-send queue size
-
-=back
-
-=over
-
-=item list_channels [I<channelinfoitem> ...]
-
-List channel information. Each line printed describes a channel, with
-the requested I<channelinfoitem> values separated by tab characters.
-If no I<channelinfoitem>s are specified then I<pid>, I<user>,
-I<transactional>, I<consumer_count>, and I<messages_unacknowledged>
-are assumed.
-
-The list includes channels which are part of ordinary AMQP connections
-(as listed by list_connections) and channels created by various
-plug-ins and other extensions.
-
-=back
-
-=head3 Channel information items
-
-=over
-
-=item pid
-
-id of the Erlang process associated with the channel
-
-=item connection
-
-id of the Erlang process associated with the connection to which the
-channel belongs
-
-=item number
-
-the number of the channel, which uniquely identifies it within a
-connection
-
-=item user
-
-username associated with the channel
-
-=item vhost
-
-virtual host in which the channel operates
-
-=item transactional
-
-true if the channel is in transactional mode, false otherwise
-
-=item consumer_count
-
-number of logical AMQP consumers retrieving messages via the channel
-
-=item messages_unacknowledged
-
-number of messages delivered via this channel but not yet acknowledged
-
-=item acks_uncommitted
-
-number of acknowledgements received in an as yet uncommitted
-transaction
-
-=item prefetch_count
-
-QoS prefetch count limit in force, 0 if unlimited
-
-=back
-
-=item list_consumers
-
-List consumers, i.e. subscriptions to a queue's message stream. Each
-line printed shows, separated by tab characters, the name of the queue
-subscribed to, the id of the channel process via which the
-subscription was created and is managed, the consumer tag which
-uniquely identifies the subscription within a channel, and a boolean
-indicating whether acknowledgements are expected for messages
-delivered to this consumer.
-
-=back
-
-The list_queues, list_exchanges, list_bindings and list_consumers
-commands accept an optional virtual host parameter for which to
-display results, defaulting to I<"/">. The default can be overridden
-with the B<-p> flag.
-
-=head1 OUTPUT ESCAPING
-
-Various items that may appear in the output of rabbitmqctl can contain
-arbitrary octets.  If a octet corresponds to a non-printing ASCII
-character (values 0 to 31, and 127), it will be escaped in the output,
-using a sequence consisting of a backslash character followed by three
-octal digits giving the octet's value (i.e., as used in string
-literals in the C programming language).  An octet corresponding to
-the backslash character (i.e. with value 92) will be escaped using a
-sequence of two backslash characters.  Octets with a value of 128 or
-above are not escaped, in order to preserve strings encoded with
-UTF-8.
-
-The items to which this escaping scheme applies are:
-
-=over
-
-=item *
-Usernames
-
-=item *
-Virtual host names
-
-=item *
-Queue names
-
-=item *
-Exchange names
-
-=item *
-Regular expressions used for access control
-
-=back
-
-=head1 EXAMPLES
-
-Create a user named foo with (initial) password bar at the Erlang node
-rabbit@test:
-
-    rabbitmqctl -n rabbit@test add_user foo bar
-
-Grant user named foo access to the virtual host called test at the
-default Erlang node:
-
-    rabbitmqctl map_user_vhost foo test
-
-Append the current logs' content to the files with ".1" suffix and reopen
-them:
-
-    rabbitmqctl rotate_logs .1
-
-=head1 SEE ALSO
-
-rabbitmq.conf(5), rabbitmq-multi(1), rabbitmq-server(1)
-
-=head1 AUTHOR
-
-The RabbitMQ Team <info@rabbitmq.com>
-
-=head1 REFERENCES
-
-RabbitMQ Web Site: L<http://www.rabbitmq.com>
diff --git a/docs/rabbitmqctl.1.xml b/docs/rabbitmqctl.1.xml
new file mode 100644
index 00000000..e7fc45e4
--- /dev/null
+++ b/docs/rabbitmqctl.1.xml
@@ -0,0 +1,1042 @@
+<?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>
+    <authorgroup>
+      <corpauthor>The RabbitMQ Team &lt;<ulink url="mailto:info@rabbitmq.com"><email>info@rabbitmq.com</email></ulink>&gt;</corpauthor>
+    </authorgroup>
+  </refentryinfo>
+
+  <refmeta>
+    <refentrytitle>rabbitmqctl</refentrytitle>
+    <manvolnum>1</manvolnum>
+    <refmiscinfo class="manual">RabbitMQ Service</refmiscinfo>
+  </refmeta>
+
+  <refnamediv>
+    <refname>rabbitmqctl</refname>
+    <refpurpose>command line tool for managing a RabbitMQ broker</refpurpose>
+  </refnamediv>
+
+  <refsynopsisdiv>
+    <cmdsynopsis>
+      <command>rabbitmqctl</command>
+      <arg choice="opt">-n <replaceable>node</replaceable></arg>
+      <arg choice="opt">-q</arg>
+      <arg choice="req"><replaceable>command</replaceable></arg>
+      <arg choice="opt" rep="repeat"><replaceable>command options</replaceable></arg>
+    </cmdsynopsis>
+  </refsynopsisdiv>
+
+  <refsect1>
+    <title>Description</title>
+    <para>
+      RabbitMQ is an implementation of AMQP, the emerging standard for high
+      performance enterprise messaging. The RabbitMQ server is a robust and
+      scalable implementation of an AMQP broker.
+    </para>
+    <para>
+      <command>rabbitmqctl</command> is a command line tool for managing a
+      RabbitMQ broker. It performs all actions by connecting to one of the
+      broker's nodes.
+    </para>
+  </refsect1>
+
+  <refsect1>
+    <title>Options</title>
+    <variablelist>
+      <varlistentry>
+        <term><option>-n</option> <replaceable>node</replaceable></term>
+        <listitem>
+          <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
+            has been set to some non-default value at broker startup time).  The
+            output of <command>hostname -s</command> is usually the correct suffix to use after the
+            "@" sign. See rabbitmq-server(1) for details of configuring the
+            RabbitMQ broker.
+          </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>-q</option></term>
+        <listitem>
+          <para role="usage">
+            Quiet output mode is selected with the "-q" flag. Informational
+            messages are suppressed when quiet mode is in effect.
+          </para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+    <para>
+      Flags must precede all other parameters to <command>rabbitmqctl</command>.
+    </para>
+  </refsect1>
+
+  <refsect1>
+    <title>Commands</title>
+
+    <refsect2>
+      <title>Application and Cluster Management</title>
+
+      <variablelist>
+        <varlistentry>
+          <term><cmdsynopsis><command>stop</command></cmdsynopsis></term>
+          <listitem>
+            <para>
+              Stops the Erlang node on which RabbitMQ is running. To
+              restart the node follow the instructions for <citetitle>Running
+              the Server</citetitle> in the <ulink url="http://www.rabbitmq.com/install.html">installation
+              guide</ulink>.
+            </para>
+            <para role="example-prefix">For example:</para>
+            <screen role="example">rabbitmqctl stop</screen>
+            <para role="example">
+              This command instructs the RabbitMQ node to terminate.
+            </para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry id="stop_app">
+          <term><cmdsynopsis><command>stop_app</command></cmdsynopsis></term>
+          <listitem>
+            <para>
+              Stops the RabbitMQ application, leaving the Erlang node
+              running.
+            </para>
+            <para>
+              This command is typically run prior to performing other
+              management actions that require the RabbitMQ application
+              to be stopped, e.g. <link
+                    linkend="reset"><command>reset</command></link>.
+            </para>
+            <para role="example-prefix">For example:</para>
+            <screen role="example">rabbitmqctl stop_app</screen>
+            <para role="example">
+              This command instructs the RabbitMQ node to stop the
+              RabbitMQ application.
+            </para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term><cmdsynopsis><command>start_app</command></cmdsynopsis></term>
+          <listitem>
+            <para>
+              Starts the RabbitMQ application.
+            </para>
+            <para>
+              This command is typically run after performing other
+              management actions that required the RabbitMQ application
+              to be stopped, e.g. <link
+                    linkend="reset"><command>reset</command></link>.
+            </para>
+            <para role="example-prefix">For example:</para>
+            <screen role="example">rabbitmqctl start_app</screen>
+            <para role="example">
+              This command instructs the RabbitMQ node to start the
+              RabbitMQ application.
+            </para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term><cmdsynopsis><command>status</command></cmdsynopsis></term>
+          <listitem>
+            <para>
+              Displays various information about the RabbitMQ broker,
+              such as whether the RabbitMQ application on the current
+              node, its version number, what nodes are part of the
+              broker, which of these are running.
+            </para>
+            <para role="example-prefix">For example:</para>
+            <screen role="example">rabbitmqctl status</screen>
+            <para role="example">
+              This command displays information about the RabbitMQ
+              broker.
+            </para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry id="reset">
+          <term><cmdsynopsis><command>reset</command></cmdsynopsis></term>
+          <listitem>
+            <para>
+              Return a RabbitMQ node to its virgin state.
+            </para>
+            <para>
+              Removes the node from any cluster it belongs to, removes
+              all data from the management database, such as configured
+              users and vhosts, and deletes all persistent
+              messages.
+            </para>
+            <para>
+              For <command>reset</command> and <command>force_reset</command> to
+              succeed the RabbitMQ application must have been stopped,
+              e.g. with <link linkend="stop_app"><command>stop_app</command></link>.
+            </para>
+            <para role="example-prefix">For example:</para>
+            <screen role="example">rabbitmqctl reset</screen>
+            <para role="example">
+              This command resets the RabbitMQ node.
+            </para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term><cmdsynopsis><command>force_reset</command></cmdsynopsis></term>
+          <listitem>
+            <para>
+              Forcefully return a RabbitMQ node to its virgin state.
+            </para>
+            <para>
+              The <command>force_reset</command> command differs from
+              <command>reset</command> in that it resets the node
+              unconditionally, regardless of the current management
+              database state and cluster configuration. It should only
+              be used as a last resort if the database or cluster
+              configuration has been corrupted.
+            </para>
+            <para>
+              For <command>reset</command> and <command>force_reset</command> to
+              succeed the RabbitMQ application must have been stopped,
+              e.g. with <link linkend="stop_app"><command>stop_app</command></link>.
+            </para>
+            <para role="example-prefix">For example:</para>
+            <screen role="example">rabbitmqctl force_reset</screen>
+            <para role="example">
+              This command resets the RabbitMQ node.
+            </para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term><cmdsynopsis><command>rotate_logs</command> <arg choice="req"><replaceable>suffix</replaceable></arg></cmdsynopsis></term>
+          <listitem>
+            <para>
+              Instruct the RabbitMQ node to rotate the log files.
+            </para>
+            <para>
+              The RabbitMQ broker will attempt to append the current contents
+              of the log file to the file with name composed of the original
+              name and the suffix.
+              It will create a new file if such a file does not already exist.
+              When no <option>suffix</option> is specified, the empty log file is
+              simply created at the original location; no rotation takes place.
+            </para>
+            <para>
+              When an error occurs while appending the contents of the old log
+              file, the operation behaves in the same way as if no <option>suffix</option> was
+              specified.
+            </para>
+            <para>
+              This command might be helpful when you are e.g. writing your
+              own logrotate script and you do not want to restart the RabbitMQ
+              node.
+            </para>
+            <para role="example-prefix">For example:</para>
+            <screen role="example">rabbitmqctl rotate_logs .1</screen>
+            <para role="example">
+              This command instructs the RabbitMQ node to append the current content
+              of the log files to the files with names consisting of the original logs'
+              names and ".1" suffix, e.g. rabbit.log.1. Finally, the old log files are reopened.
+            </para>
+          </listitem>
+        </varlistentry>
+      </variablelist>
+    </refsect2>
+
+    <refsect2>
+      <title>Cluster management</title>
+
+      <variablelist>
+        <varlistentry>
+          <term><cmdsynopsis><command>cluster</command> <arg choice="req"><replaceable>clusternode</replaceable></arg></cmdsynopsis></term>
+          <listitem>
+            <variablelist>
+              <varlistentry>
+                <term>clusternode</term>
+                <listitem><para>Subset of the nodes of the cluster to which this node should be connected.</para></listitem>
+              </varlistentry>
+            </variablelist>
+            <para>
+              Instruct the node to become member of a cluster with the
+              specified nodes.
+            </para>
+            <para>
+              Cluster nodes can be of two types: disk or ram. Disk nodes
+              replicate data in ram and on disk, thus providing
+              redundancy in the event of node failure and recovery from
+              global events such as power failure across all nodes. Ram
+              nodes replicate data in ram only and are mainly used for
+              scalability. A cluster must always have at least one disk node.
+            </para>
+            <para>
+              If the current node is to become a disk node it needs to
+              appear in the cluster node list. Otherwise it becomes a
+              ram node. If the node list is empty or only contains the
+              current node then the node becomes a standalone,
+              i.e. non-clustered, (disk) node.
+            </para>
+            <para>
+              After executing the <command>cluster</command> command, whenever
+              the RabbitMQ application is started on the current node it
+              will attempt to connect to the specified nodes, thus
+              becoming an active node in the cluster comprising those
+              nodes (and possibly others).
+            </para>
+            <para>
+              The list of nodes does not have to contain all the
+              cluster's nodes; a subset is sufficient. Also, clustering
+              generally succeeds as long as at least one of the
+              specified nodes is active. Hence adjustments to the list
+              are only necessary if the cluster configuration is to be
+              altered radically.
+            </para>
+            <para>
+              For this command to succeed the RabbitMQ application must
+              have been stopped, e.g. with <link linkend="stop_app"><command>stop_app</command></link>. Furthermore,
+              turning a standalone node into a clustered node requires
+              the node be <link linkend="reset"><command>reset</command></link> first,
+              in order to avoid accidental destruction of data with the
+              <command>cluster</command> command.
+            </para>
+            <para>
+              For more details see the <ulink url="http://www.rabbitmq.com/clustering.html">clustering guide</ulink>.
+            </para>
+            <para role="example-prefix">For example:</para>
+            <screen role="example">rabbitmqctl cluster rabbit@tanto hare@elena</screen>
+            <para role="example">
+              This command instructs the RabbitMQ node to join the
+              cluster with nodes <command>rabbit@tanto</command> and
+              <command>hare@elena</command>. If the node is one of these then
+              it becomes a disk node, otherwise a ram node.
+            </para>
+          </listitem>
+        </varlistentry>
+      </variablelist>
+    </refsect2>
+
+    <refsect2>
+      <title>Closing individual connections</title>
+
+      <variablelist>
+        <varlistentry>
+          <term><cmdsynopsis><command>close_connection</command> <arg choice="req"><replaceable>connectionpid</replaceable></arg> <arg choice="req"><replaceable>explanation</replaceable></arg></cmdsynopsis></term>
+          <listitem>
+            <variablelist>
+              <varlistentry>
+                <term>connectionpid</term>
+                <listitem><para>Id of the Erlang process associated with the connection to close.</para></listitem>
+              </varlistentry>
+              <varlistentry>
+                <term>explanation</term>
+                <listitem><para>Explanation string.</para></listitem>
+              </varlistentry>
+            </variablelist>
+            <para>
+              Instruct the broker to close the connection associated
+              with the Erlang process id <option>connectionpid</option> (see also the
+              <link linkend="list_connections"><command>list_connections</command></link>
+              command), passing the <option>explanation</option> string to the
+              connected client as part of the AMQP connection shutdown
+              protocol.
+            </para>
+            <para role="example-prefix">For example:</para>
+            <screen role="example">rabbitmqctl close_connection "&lt;rabbit@tanto.4262.0&gt;" "go away"</screen>
+            <para role="example">
+              This command instructs the RabbitMQ broker to close the
+              connection associated with the Erlang process
+              id <command>&lt;rabbit@tanto.4262.0&gt;</command>, passing the
+              explanation <command>go away</command> to the connected client.
+            </para>
+          </listitem>
+        </varlistentry>
+      </variablelist>
+    </refsect2>
+
+    <refsect2>
+      <title>User management</title>
+
+      <variablelist>
+        <varlistentry>
+          <term><cmdsynopsis><command>add_user</command> <arg choice="req"><replaceable>username</replaceable></arg> <arg choice="req"><replaceable>password</replaceable></arg></cmdsynopsis></term>
+          <listitem>
+            <variablelist>
+              <varlistentry>
+                <term>username</term>
+                <listitem><para>The name of the user to create.</para></listitem>
+              </varlistentry>
+              <varlistentry>
+                <term>password</term>
+                <listitem><para>The password the created user will use to log in to the broker.</para></listitem>
+              </varlistentry>
+            </variablelist>
+            <para role="example-prefix">For example:</para>
+            <screen role="example">rabbitmqctl add_user tonyg changeit</screen>
+            <para role="example">
+              This command instructs the RabbitMQ broker to create a
+              user named <command>tonyg</command> with (initial) password
+              <command>changeit</command>.
+            </para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term><cmdsynopsis><command>delete_user</command> <arg choice="req"><replaceable>username</replaceable></arg></cmdsynopsis></term>
+          <listitem>
+            <variablelist>
+              <varlistentry>
+                <term>username</term>
+                <listitem><para>The name of the user to delete.</para></listitem>
+              </varlistentry>
+            </variablelist>
+            <para role="example-prefix">For example:</para>
+            <screen role="example">rabbitmqctl delete_user tonyg</screen>
+            <para role="example">
+              This command instructs the RabbitMQ broker to delete the
+              user named <command>tonyg</command>.
+            </para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term><cmdsynopsis><command>change_password</command> <arg choice="req"><replaceable>username</replaceable></arg> <arg choice="req"><replaceable>newpassword</replaceable></arg></cmdsynopsis></term>
+          <listitem>
+            <variablelist>
+              <varlistentry>
+                <term>username</term>
+                <listitem><para>The name of the user whose password is to be changed.</para></listitem>
+              </varlistentry>
+              <varlistentry>
+                <term>newpassword</term>
+                <listitem><para>The new password for the user.</para></listitem>
+              </varlistentry>
+            </variablelist>
+            <para role="example-prefix">For example:</para>
+            <screen role="example">rabbitmqctl change_password tonyg newpass</screen>
+            <para role="example">
+              This command instructs the RabbitMQ broker to change the
+              password for the user named <command>tonyg</command> to
+              <command>newpass</command>.
+            </para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term><cmdsynopsis><command>list_users</command></cmdsynopsis></term>
+          <listitem>
+            <para>Lists users</para>
+            <para role="example-prefix">For example:</para>
+            <screen role="example">rabbitmqctl list_users</screen>
+            <para role="example">
+              This command instructs the RabbitMQ broker to list all users.
+            </para>
+          </listitem>
+        </varlistentry>
+      </variablelist>
+    </refsect2>
+
+    <refsect2>
+      <title>Access control</title>
+
+      <variablelist>
+        <varlistentry>
+          <term><cmdsynopsis><command>add_vhost</command> <arg choice="req"><replaceable>vhostpath</replaceable></arg></cmdsynopsis></term>
+          <listitem>
+            <variablelist>
+              <varlistentry>
+                <term>vhostpath</term>
+                <listitem><para>The name of the virtual host entry to create.</para></listitem>
+              </varlistentry>
+            </variablelist>
+            <para>
+              Creates a virtual host.
+            </para>
+            <para role="example-prefix">For example:</para>
+            <screen role="example">rabbitmqctl add_vhost test</screen>
+            <para role="example">
+              This command instructs the RabbitMQ broker to create a new
+              virtual host called <command>test</command>.
+            </para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term><cmdsynopsis><command>delete_vhost</command> <arg choice="req"><replaceable>vhostpath</replaceable></arg></cmdsynopsis></term>
+          <listitem>
+            <variablelist>
+              <varlistentry>
+                <term>vhostpath</term>
+                <listitem><para>The name of the virtual host entry to delete.</para></listitem>
+              </varlistentry>
+            </variablelist>
+            <para>
+              Deletes a virtual host.
+            </para>
+            <para>
+              Deleting a virtual host deletes all its exchanges,
+              queues, user mappings and associated permissions.
+            </para>
+            <para role="example-prefix">For example:</para>
+            <screen role="example">rabbitmqctl delete_vhost test</screen>
+            <para role="example">
+              This command instructs the RabbitMQ broker to delete the
+              virtual host called <command>test</command>.
+            </para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term><cmdsynopsis><command>list_vhosts</command></cmdsynopsis></term>
+          <listitem>
+            <para>
+              Lists virtual hosts.
+            </para>
+            <para role="example-prefix">For example:</para>
+            <screen role="example">rabbitmqctl list_vhosts</screen>
+            <para role="example">
+              This command instructs the RabbitMQ broker to list all
+              virtual hosts.
+            </para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term><cmdsynopsis><command>set_permissions</command> <arg choice="opt">-p <replaceable>vhostpath</replaceable></arg> <arg choice="req"><replaceable>username</replaceable></arg> <arg choice="req"><replaceable>configure</replaceable></arg> <arg choice="req"><replaceable>write</replaceable></arg> <arg choice="req"><replaceable>read</replaceable></arg></cmdsynopsis></term>
+          <listitem>
+            <variablelist>
+              <varlistentry>
+                <term>vhostpath</term>
+                <listitem><para>The name of the virtual host to which to grant the user access, defaulting to <command>/</command>.</para></listitem>
+              </varlistentry>
+              <varlistentry>
+                <term>username</term>
+                <listitem><para>The name of the user to grant access to the specified virtual host.</para></listitem>
+              </varlistentry>
+              <varlistentry>
+                <term>configure</term>
+                <listitem><para>A regular expression matching resource names for which the user is granted configure permissions.</para></listitem>
+              </varlistentry>
+              <varlistentry>
+                <term>write</term>
+                <listitem><para>A regular expression matching resource names for which the user is granted write permissions.</para></listitem>
+              </varlistentry>
+              <varlistentry>
+                <term>read</term>
+                <listitem><para>A regular expression matching resource names for which the user is granted read permissions.</para></listitem>
+              </varlistentry>
+            </variablelist>
+            <para>
+              Sets user permissions.
+            </para>
+            <para role="example-prefix">For example:</para>
+            <screen role="example">rabbitmqctl set_permissions -p /myvhost tonyg "^tonyg-.*" ".*" ".*"</screen>
+            <para role="example">
+              This command instructs the RabbitMQ broker to grant the
+              user named <command>tonyg</command> access to the virtual host
+              called <command>/myvhost</command>, with configure permissions
+              on all resources whose names starts with "tonyg-", and
+              write and read permissions on all resources.
+            </para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term><cmdsynopsis><command>clear_permissions</command> <arg choice="opt">-p <replaceable>vhostpath</replaceable></arg> <arg choice="req"><replaceable>username</replaceable></arg></cmdsynopsis></term>
+          <listitem>
+            <variablelist>
+              <varlistentry>
+                <term>vhostpath</term>
+                <listitem><para>The name of the virtual host to which to deny the user access, defaulting to <command>/</command>.</para></listitem>
+              </varlistentry>
+              <varlistentry>
+                <term>username</term>
+                <listitem><para>The name of the user to deny access to the specified virtual host.</para></listitem>
+              </varlistentry>
+            </variablelist>
+            <para>
+              Sets user permissions.
+            </para>
+            <para role="example-prefix">For example:</para>
+            <screen role="example">rabbitmqctl clear_permissions -p /myvhost tonyg</screen>
+            <para role="example">
+              This command instructs the RabbitMQ broker to deny the
+              user named <command>tonyg</command> access to the virtual host
+              called <command>/myvhost</command>.
+            </para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term><cmdsynopsis><command>list_permissions</command> <arg choice="opt">-p <replaceable>vhostpath</replaceable></arg></cmdsynopsis></term>
+          <listitem>
+            <variablelist>
+              <varlistentry>
+                <term>vhostpath</term>
+                <listitem><para>The name of the virtual host for which to list the users that have been granted access to it, and their permissions. Defaults to <command>/</command>.</para></listitem>
+              </varlistentry>
+            </variablelist>
+            <para>
+              Lists permissions in a virtual host.
+            </para>
+            <para role="example-prefix">For example:</para>
+            <screen role="example">rabbitmqctl list_permissions -p /myvhost</screen>
+            <para role="example">
+              This command instructs the RabbitMQ broker to list all the
+              users which have been granted access to the virtual host
+              called <command>/myvhost</command>, and the permissions they
+              have for operations on resources in that virtual host.
+            </para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term><cmdsynopsis><command>list_user_permissions</command> <arg choice="opt">-p <replaceable>vhostpath</replaceable></arg> <arg choice="req"><replaceable>username</replaceable></arg></cmdsynopsis></term>
+          <listitem>
+            <variablelist>
+              <varlistentry>
+                <term>username</term>
+                <listitem><para>The name of the user for which to list the permissions.</para></listitem>
+              </varlistentry>
+            </variablelist>
+            <para>
+              Lists user permissions.
+            </para>
+            <para role="example-prefix">For example:</para>
+            <screen role="example">rabbitmqctl list_user_permissions tonyg</screen>
+            <para role="example">
+              This command instructs the RabbitMQ broker to list all the
+              virtual hosts to which the user named <command>tonyg</command>
+              has been granted access, and the permissions the user has
+              for operations on resources in these virtual hosts.
+            </para>
+          </listitem>
+        </varlistentry>
+      </variablelist>
+    </refsect2>
+
+    <refsect2>
+      <title>Server Status</title>
+      <para>
+        The server status queries interrogate the server and return a list of
+        results with tab-delimited columns. Some queries (<command>list_queues</command>,
+        <command>list_exchanges</command>, <command>list_bindings</command>, and
+        <command>list_consumers</command>) accept an
+        optional <command>vhost</command> parameter. This parameter, if present,  must be
+        specified immediately after the query.
+      </para>
+      <para role="usage">
+        The list_queues, list_exchanges and list_bindings commands accept an
+        optional virtual host parameter for which to display results. The
+        default value is "/".
+      </para>
+
+      <variablelist>
+        <varlistentry role="usage-has-option-list">
+          <term><cmdsynopsis><command>list_queues</command> <arg choice="opt">-p <replaceable>vhostpath</replaceable></arg> <arg choice="opt" role="usage-option-list"><replaceable>queueinfoitem</replaceable> ...</arg></cmdsynopsis></term>
+          <listitem>
+            <para>
+              Returns queue details. Queue details of the <command>/</command> virtual host
+              are returned if the "-p" flag is absent. The "-p" flag can be used to
+              override this default.
+            </para>
+            <para>
+              The <command>queueinfoitem</command> parameter is used to indicate which queue
+              information items to include in the results. The column order in the
+              results will match the order of the parameters. 
+              <command>queueinfoitem</command> can take any value from the list
+              that follows:
+            </para>
+            <variablelist>
+              <varlistentry>
+                <term>name</term>
+                <listitem><para>The name of the queue with non-ASCII characters URL-escaped.</para></listitem>
+              </varlistentry>
+              <varlistentry>
+                <term>durable</term>
+                <listitem><para>Whether or not the queue survives server restarts.</para></listitem>
+              </varlistentry>
+              <varlistentry>
+                <term>auto_delete</term>
+                <listitem><para>Whether the queue will be deleted automatically when no longer used.</para></listitem>
+              </varlistentry>
+              <varlistentry>
+                <term>arguments</term>
+                <listitem><para>Queue arguments.</para></listitem>
+              </varlistentry>
+              <varlistentry>
+                <term>pid</term>
+                <listitem><para>Id of the Erlang process associated with the queue.</para></listitem>
+              </varlistentry>
+              <varlistentry>
+                <term>owner_pid</term>
+                <listitem><para>Id of the Erlang process representing the connection
+                  which is the exclusive owner of the queue. Empty if the
+                  queue is non-exclusive.</para></listitem>
+              </varlistentry>
+              <varlistentry>
+                <term>exclusive_consumer_pid</term>
+                <listitem><para>Id of the Erlang process representing the channel of the
+                  exclusive consumer subscribed to this queue. Empty if
+                  there is no exclusive consumer.</para></listitem>
+              </varlistentry>
+              <varlistentry>
+                <term>exclusive_consumer_tag</term>
+                <listitem><para>Consumer tag of the exclusive consumer subscribed to
+                  this queue. Empty if there is no exclusive consumer.</para></listitem>
+              </varlistentry>
+              <varlistentry>
+                <term>messages_ready</term>
+                <listitem><para>Number of messages ready to be delivered to clients.</para></listitem>
+              </varlistentry>
+              <varlistentry>
+                <term>messages_unacknowledged</term>
+                <listitem><para>Number of messages delivered to clients but not yet acknowledged.</para></listitem>
+              </varlistentry>
+              <varlistentry>
+                <term>messages_uncommitted</term>
+                <listitem><para>Number of messages published in as yet uncommitted transactions</para></listitem>
+              </varlistentry>
+              <varlistentry>
+                <term>messages</term>
+                <listitem><para>Sum of ready, unacknowledged and uncommitted messages
+                  (queue depth).</para></listitem>
+              </varlistentry>
+              <varlistentry>
+                <term>acks_uncommitted</term>
+                <listitem><para>Number of acknowledgements received in as yet uncommitted
+                  transactions.</para></listitem>
+              </varlistentry>
+              <varlistentry>
+                <term>consumers</term>
+                <listitem><para>Number of consumers.</para></listitem>
+              </varlistentry>
+              <varlistentry>
+                <term>transactions</term>
+                <listitem><para>Number of transactions.</para></listitem>
+              </varlistentry>
+              <varlistentry>
+                <term>memory</term>
+                <listitem><para>Bytes of memory consumed by the Erlang process associated with the
+                  queue, including stack, heap and internal structures.</para></listitem>
+              </varlistentry>
+            </variablelist>
+            <para>
+              If no <command>queueinfoitem</command>s are specified then queue name and depth are
+              displayed.
+            </para>
+            <para role="example-prefix">
+              For example:
+            </para>
+            <screen role="example">rabbitmqctl list_queues -p /myvhost messages consumers</screen>
+            <para role="example">
+              This command displays the depth and number of consumers for each
+              queue of the virtual host named <command>/myvhost</command>.
+            </para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry role="usage-has-option-list">
+          <term><cmdsynopsis><command>list_exchanges</command> <arg choice="opt">-p <replaceable>vhostpath</replaceable></arg> <arg choice="opt" role="usage-option-list"><replaceable>exchangeinfoitem</replaceable> ...</arg></cmdsynopsis></term>
+          <listitem>
+            <para>
+              Returns exchange details. Exchange details of the <command>/</command> virtual host
+              are returned if the "-p" flag is absent. The "-p" flag can be used to
+              override this default.
+            </para>
+            <para>
+              The <command>exchangeinfoitem</command> parameter is used to indicate which
+              exchange information items to include in the results. The column order in the
+              results will match the order of the parameters. 
+              <command>exchangeinfoitem</command> can take any value from the list
+              that follows:
+            </para>
+            <variablelist>
+              <varlistentry>
+                <term>name</term>
+                <listitem><para>The name of the exchange with non-ASCII characters URL-escaped.</para></listitem>
+              </varlistentry>
+              <varlistentry>
+                <term>type</term>
+                <listitem><para>The exchange type (one of [<command>direct</command>,
+                  <command>topic</command>, <command>headers</command>,
+                  <command>fanout</command>]).</para></listitem>
+              </varlistentry>
+              <varlistentry>
+                <term>durable</term>
+                <listitem><para>Whether or not the exchange survives server restarts.</para></listitem>
+              </varlistentry>
+              <varlistentry>
+                <term>auto_delete</term>
+                <listitem><para>Whether the exchange will be deleted automatically when no longer used.</para></listitem>
+              </varlistentry>
+              <varlistentry>
+                <term>arguments</term>
+                <listitem><para>Exchange arguments.</para></listitem>
+              </varlistentry>
+            </variablelist>
+            <para>
+              If no <command>exchangeinfoitem</command>s are specified then 
+              exchange name and type are displayed.
+            </para>
+            <para role="example-prefix">
+              For example:
+            </para>
+            <screen role="example">rabbitmqctl list_exchanges -p /myvhost name type</screen>
+            <para role="example">
+              This command displays the name and type for each
+              exchange of the virtual host named <command>/myvhost</command>.
+            </para>
+          </listitem>
+        </varlistentry>
+      </variablelist>
+
+      <variablelist>
+        <varlistentry>
+          <term><cmdsynopsis><command>list_bindings</command> <arg choice="opt">-p <replaceable>vhostpath</replaceable></arg></cmdsynopsis></term>
+          <listitem>
+            <para>
+              By default the bindings for the <command>/</command> virtual
+              host are returned. The "-p" flag can be used to override
+              this default.  Each result row will contain an exchange
+              name, queue name, routing key and binding arguments, in
+              that order. Non-ASCII characters will be URL-encoded.
+            </para>
+            <para role="usage">
+              The output format for "list_bindings" is a list of rows containing
+              exchange name, queue name, routing key and arguments, in that order.
+            </para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry id="list_connections" role="usage-has-option-list">
+          <term><cmdsynopsis><command>list_connections</command> <arg choice="opt" role="usage-option-list"><replaceable>connectioninfoitem</replaceable> ...</arg></cmdsynopsis></term>
+          <listitem>
+            <para>
+              Returns TCP/IP connection statistics.
+            </para>
+            <para>
+              The <command>connectioninfoitem</command> parameter is used to indicate
+              which connection information items to include in the results. The
+              column order in the results will match the order of the parameters. 
+              <command>connectioninfoitem</command> can take any value from the list
+              that follows:
+            </para>
+
+            <variablelist>
+              <varlistentry>
+                <term>pid</term>
+                <listitem><para>Id of the Erlang process associated with the connection.</para></listitem>
+              </varlistentry>
+              <varlistentry>
+                <term>address</term>
+                <listitem><para>Server IP address.</para></listitem>
+              </varlistentry>
+              <varlistentry>
+                <term>port</term>
+                <listitem><para>Server port.</para></listitem>
+              </varlistentry>
+              <varlistentry>
+                <term>peer_address</term>
+                <listitem><para>Peer address.</para></listitem>
+              </varlistentry>
+              <varlistentry>
+                <term>peer_port</term>
+                <listitem><para>Peer port.</para></listitem>
+              </varlistentry>
+              <varlistentry>
+                <term>state</term>
+                <listitem><para>Connection state (one of [<command>starting</command>, <command>tuning</command>,
+                  <command>opening</command>, <command>running</command>, <command>closing</command>, <command>closed</command>]).</para></listitem>
+              </varlistentry>
+              <varlistentry>
+                <term>channels</term>
+                <listitem><para>Number of channels using the connection.</para></listitem>
+              </varlistentry>
+              <varlistentry>
+                <term>user</term>
+                <listitem><para>Username associated with the connection.</para></listitem>
+              </varlistentry>
+              <varlistentry>
+                <term>vhost</term>
+                <listitem><para>Virtual host name with non-ASCII characters URL-escaped.</para></listitem>
+              </varlistentry>
+              <varlistentry>
+                <term>timeout</term>
+                <listitem><para>Connection timeout.</para></listitem>
+              </varlistentry>
+              <varlistentry>
+                <term>frame_max</term>
+                <listitem><para>Maximum frame size (bytes).</para></listitem>
+              </varlistentry>
+              <varlistentry>
+                <term>client_properties</term>
+                <listitem><para>Informational properties transmitted by the client
+                  during connection establishment.</para></listitem>
+              </varlistentry>
+              <varlistentry>
+                <term>recv_oct</term>
+                <listitem><para>Octets received.</para></listitem>
+              </varlistentry>
+              <varlistentry>
+                <term>recv_cnt</term>
+                <listitem><para>Packets received.</para></listitem>
+              </varlistentry>
+              <varlistentry>
+                <term>send_oct</term>
+                <listitem><para>Octets send.</para></listitem>
+              </varlistentry>
+              <varlistentry>
+                <term>send_cnt</term>
+                <listitem><para>Packets sent.</para></listitem>
+              </varlistentry>
+              <varlistentry>
+                <term>send_pend</term>
+                <listitem><para>Send queue size.</para></listitem>
+              </varlistentry>
+            </variablelist>
+            <para>
+              If no <command>connectioninfoitem</command>s are specified then  user, peer
+              address, peer port and connection state are displayed.
+            </para>
+
+            <para role="example-prefix">
+              For example:
+            </para>
+            <screen role="example">rabbitmqctl list_connections send_pend server_port</screen>
+            <para role="example">
+              This command displays the send queue size and server port for each
+              connection.
+            </para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry role="usage-has-option-list">
+          <term><cmdsynopsis><command>list_channels</command> <arg choice="opt" role="usage-option-list"><replaceable>channelinfoitem</replaceable> ...</arg></cmdsynopsis></term>
+          <listitem>
+            <para>
+              Returns information on all current channels, the logical
+              containers executing most AMQP commands. This includes
+              channels that are part of ordinary AMQP connections, and
+              channels created by various plug-ins and other extensions.
+            </para>
+            <para>
+              The <command>channelinfoitem</command> parameter is used to
+              indicate which channel information items to include in the
+              results. The column order in the results will match the
+              order of the parameters. 
+              <command>channelinfoitem</command> can take any value from the list
+              that follows:
+            </para>
+
+            <variablelist>
+              <varlistentry>
+                <term>pid</term>
+                <listitem><para>Id of the Erlang process associated with the connection.</para></listitem>
+              </varlistentry>
+              <varlistentry>
+                <term>connection</term>
+                <listitem><para>Id of the Erlang process associated with the connection
+                  to which the channel belongs.</para></listitem>
+              </varlistentry>
+              <varlistentry>
+                <term>number</term>
+                <listitem><para>The number of the channel, which uniquely identifies it within
+                  a connection.</para></listitem>
+              </varlistentry>
+              <varlistentry>
+                <term>user</term>
+                <listitem><para>Username associated with the channel.</para></listitem>
+              </varlistentry>
+              <varlistentry>
+                <term>vhost</term>
+                <listitem><para>Virtual host in which the channel operates.</para></listitem>
+              </varlistentry>
+              <varlistentry>
+                <term>transactional</term>
+                <listitem><para>True if the channel is in transactional mode, false otherwise.</para></listitem>
+              </varlistentry>
+              <varlistentry>
+                <term>consumer_count</term>
+                <listitem><para>Number of logical AMQP consumers retrieving messages via
+                  the channel.</para></listitem>
+              </varlistentry>
+              <varlistentry>
+                <term>messages_unacknowledged</term>
+                <listitem><para>Number of messages delivered via this channel but not
+                  yet acknowledged.</para></listitem>
+              </varlistentry>
+              <varlistentry>
+                <term>acks_uncommitted</term>
+                <listitem><para>Number of acknowledgements received in an as yet
+                  uncommitted transaction.</para></listitem>
+              </varlistentry>
+              <varlistentry>
+                <term>prefetch_count</term>
+                <listitem><para>QoS prefetch count limit in force, 0 if unlimited.</para></listitem>
+              </varlistentry>
+            </variablelist>
+            <para>
+              If no <command>channelinfoitem</command>s are specified then pid,
+              user, transactional, consumer_count, and
+              messages_unacknowledged are assumed.
+            </para>
+
+            <para role="example-prefix">
+              For example:
+            </para>
+            <screen role="example">rabbitmqctl list_channels connection messages_unacknowledged</screen>
+            <para role="example">
+              This command displays the connection process and count
+              of unacknowledged messages for each channel.
+            </para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term><cmdsynopsis><command>list_consumers</command></cmdsynopsis></term>
+          <listitem>
+            <para>
+              List consumers, i.e. subscriptions to a queue's message
+              stream. Each line printed shows, separated by tab
+              characters, the name of the queue subscribed to, the id of
+              the channel process via which the subscription was created
+              and is managed, the consumer tag which uniquely identifies
+              the subscription within a channel, and a boolean
+              indicating whether acknowledgements are expected for
+              messages delivered to this consumer.
+            </para>
+            <para role="usage">
+              The output format for "list_consumers" is a list of rows containing,
+              in order, the queue name, channel process id, consumer tag, and a
+              boolean indicating whether acknowledgements are expected from the
+              consumer.
+            </para>
+          </listitem>
+        </varlistentry>
+      </variablelist>
+    </refsect2>
+  </refsect1>
+
+</refentry>
diff --git a/docs/remove-namespaces.xsl b/docs/remove-namespaces.xsl
new file mode 100644
index 00000000..58a1e826
--- /dev/null
+++ b/docs/remove-namespaces.xsl
@@ -0,0 +1,17 @@
+<?xml version='1.0'?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                xmlns:doc="http://www.rabbitmq.com/namespaces/ad-hoc/doc"
+                version='1.0'>
+
+<xsl:output method="xml" />
+
+  <!-- Copy every element through with local name only -->
+  <xsl:template match="*">
+    <xsl:element name="{local-name()}">
+      <xsl:apply-templates select="@*|node()"/>
+    </xsl:element>
+  </xsl:template>
+
+  <!-- Copy every attribute through -->
+  <xsl:template match="@*"><xsl:copy/></xsl:template>
+</xsl:stylesheet>
diff --git a/docs/usage.xsl b/docs/usage.xsl
new file mode 100644
index 00000000..841b2a84
--- /dev/null
+++ b/docs/usage.xsl
@@ -0,0 +1,80 @@
+<?xml version='1.0'?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                xmlns:exsl="http://exslt.org/common"
+                xmlns:ng="http://docbook.org/docbook-ng"
+                xmlns:db="http://docbook.org/ns/docbook"
+                exclude-result-prefixes="exsl"
+                version='1.0'>
+
+<xsl:param name="modulename"/>
+
+<xsl:output method="text"
+              encoding="UTF-8"
+              indent="no"/>
+<xsl:strip-space elements="*"/> 
+<xsl:preserve-space elements="term" />
+
+<xsl:template match="/">
+<!-- Pull out cmdsynopsis to show the command usage line. -->%% Generated, do not edit!
+-module(<xsl:value-of select="$modulename" />).
+-export([usage/0]).
+usage() -> io:format(%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>
+
+<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>
+  <xsl:for-each select="varlistentry">
+    <xsl:text>    </xsl:text>
+    <xsl:for-each select=".//term">
+      <xsl:value-of select="."/>
+      <xsl:if test="not(position() = last())">, </xsl:if>
+    </xsl:for-each><xsl:text>&#10;</xsl:text>
+  </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=".//*[title='Options']//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">Commands:&#10;</xsl:if>
+  <xsl:for-each select="varlistentry">
+    <xsl:text>    </xsl:text>
+    <xsl:apply-templates select="term"/>
+    <xsl:text>&#10;</xsl:text>
+  </xsl:for-each>
+  <xsl:text>&#10;</xsl:text>
+</xsl:for-each>
+
+<xsl:apply-templates select=".//*[title='Commands']/refsect2" mode="command-usage" />
+%QUOTE%), halt(1).
+</xsl:template>
+
+<!-- Option lists in command usage -->
+<xsl:template match="varlistentry[@role='usage-has-option-list']" mode="command-usage">&lt;<xsl:value-of select="term/cmdsynopsis/arg[@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:text>&#10;&#10;</xsl:text></xsl:template>
+
+<!-- Usage paras in command usage -->
+<xsl:template match="para[@role='usage']" mode="command-usage">
+<xsl:value-of select="normalize-space(.)"/><xsl:text>&#10;&#10;</xsl:text>
+</xsl:template>
+
+<!-- Don't show anything else in command usage -->
+<xsl:template match="text()" mode="command-usage"/>
+
+<xsl:template match="option">[<xsl:apply-templates/>]</xsl:template>
+<xsl:template match="replaceable">&lt;<xsl:value-of select="."/>&gt;</xsl:template>
+
+</xsl:stylesheet>
diff --git a/generate_deps b/generate_deps
index e16624d2..29587b5a 100644
--- a/generate_deps
+++ b/generate_deps
@@ -23,10 +23,11 @@ main([IncludeDir, ErlDir, EbinDir, TargetFile]) ->
               ok;
           (Path, Dep, ok) ->
               Module = filename:basename(Path, ".erl"),
-              ok = file:write(Hdl, [EbinDir, "/", Module, ".beam:"]),
+              ok = file:write(Hdl, [EbinDir, "/", Module, ".beam: ",
+                                   Path]),
               ok = sets:fold(fun (E, ok) -> file:write(Hdl, [" ", E]) end,
                              ok, Dep),
-              file:write(Hdl, [" ", ErlDir, "/", Module, ".erl\n"])
+              file:write(Hdl, ["\n"])
       end, ok, Deps),
     ok = file:write(Hdl, [TargetFile, ": ", escript:script_name(), "\n"]),
     ok = file:sync(Hdl),
diff --git a/packaging/windows/Makefile b/packaging/windows/Makefile
index c9e818ac..50ce1637 100644
--- a/packaging/windows/Makefile
+++ b/packaging/windows/Makefile
@@ -21,10 +21,13 @@ dist:
 	rm -rf $(SOURCE_DIR)/docs
 
 	mv $(SOURCE_DIR) $(TARGET_DIR)
-	pod2text --loose rabbitmq-service.pod $(TARGET_DIR)/readme-service.txt
+	mkdir -p $(TARGET_DIR)
+	xmlto -o . xhtml-nochunks ../../docs/rabbitmq-service.xml
+	elinks -dump -no-references -no-numbering rabbitmq-service.html \
+		> $(TARGET_DIR)/readme-service.txt
 	todos $(TARGET_DIR)/readme-service.txt
 	zip -r $(TARGET_ZIP).zip $(TARGET_DIR)
-	rm -rf $(TARGET_DIR)
+	rm -rf $(TARGET_DIR) rabbitmq-service.html
 
 clean: clean_partial
 	rm -f rabbitmq-server-windows-*.zip
diff --git a/packaging/windows/rabbitmq-service.pod b/packaging/windows/rabbitmq-service.pod
deleted file mode 100644
index 8a2d2e5b..00000000
--- a/packaging/windows/rabbitmq-service.pod
+++ /dev/null
@@ -1,133 +0,0 @@
-=head1 NAME
-
-rabbitmq-service - manage RabbitMQ AMQP service
-
-=head1 SYNOPSIS
-
-rabbitmq-service.bat command
-
-=head1 DESCRIPTION
-
-RabbitMQ is an implementation of AMQP, the emerging standard for high
-performance enterprise messaging. The RabbitMQ server is a robust and
-scalable implementation of an AMQP broker.
-
-Running B<rabbitmq-service> allows the RabbitMQ broker to be run as a
-service on NT/2000/2003/XP/Vista® environments. The RabbitMQ broker 
-service can be started and stopped using the Windows® services 
-applet. 
-
-By default the service will run in the authentication context of the 
-local system account. It is therefore necessary to synchronise Erlang
-cookies between the local system account (typically 
-C<C:\WINDOWS\.erlang.cookie> and the account that will be used to
-run B<rabbitmqctl>.
-
-=head1 COMMANDS
-
-=head2 help
-
-Display usage information.
-
-=head2 install 
-
-Install the service. The service will not be started.
-Subsequent invocations will update the service parameters if
-relevant environment variables were modified.
-
-=head2 remove
-
-Remove the service. If the service is running then it will
-automatically be stopped before being removed. No files will be
-deleted as a consequence and B<rabbitmq-server> will remain operable.
-
-=head2 start
-
-Start the service. The service must have been correctly installed
-beforehand. 
-
-=head2 stop
-
-Stop the service. The service must be running for this command to 
-have any effect.
-
-=head2 disable
-
-Disable the service. This is the equivalent of setting the startup
-type to B<Disabled> using the service control panel.
-
-=head2 enable
-
-Enable the service. This is the equivalent of setting the startup
-type to B<Automatic> using the service control panel.
-
-=head1 ENVIRONMENT
-
-=head2 RABBITMQ_SERVICENAME
-
-Defaults to RabbitMQ.
-This is the location of log and database directories.
-
-=head2 RABBITMQ_BASE
-
-Defaults to the application data directory of the current user.
-This is the location of log and database directories.
-
-=head2 RABBITMQ_NODENAME
-
-Defaults to "rabbit". This can be useful if you want to run more than
-one node per machine - B<RABBITMQ_NODENAME> should be unique per
-erlang-node-and-machine combination. See clustering on a single
-machine guide at
-L<http://www.rabbitmq.com/clustering.html#single-machine> for details.
-
-=head2 RABBITMQ_NODE_IP_ADDRESS
-
-Defaults to "0.0.0.0". This can be changed if you only want to bind
-to one network interface. 
-
-=head2 RABBITMQ_NODE_PORT
-
-Defaults to 5672. 
-
-=head2 ERLANG_SERVICE_MANAGER_PATH
-
-Defaults to F<C:\Program Files\erl5.5.5\erts-5.5.5\bin>
-(or F<C:\Program Files (x86)\erl5.5.5\erts-5.5.5\bin> for 64-bit
-environments). This is the installation location of the Erlang service
-manager.
-
-=head2 CLUSTER_CONFIG_FILE
-
-If this file is present it is used by the server to
-auto-configure a RabbitMQ cluster.  See the clustering guide
-at L<http://www.rabbitmq.com/clustering.html> for details.
-
-=head2 RABBITMQ_CONSOLE_LOG
-
-Set this varable to B<new> or B<reuse> to have the console 
-output from the server redirected to a file named B<SERVICENAME>.debug
-in the  application data directory of the user that installed the service.
-Under Vista this will be F<C:\Documents and Settings\User\AppData\username\SERVICENAME>.
-Under previous versions of Windows this will be 
-F<C:\Documents and Settings\username\Application Data\SERVICENAME>.
-If B<RABBITMQ_CONSOLE_LOG> is set to B<new> then a new file will be
-created each time the service starts. If B<RABBITMQ_CONSOLE_LOG> is
-set to B<reuse> then the file will be overwritten each time the
-service starts.  The default behaviour when B<RABBITMQ_CONSOLE_LOG> is
-not set or set to a value other than B<new> or B<reuse> is to discard
-the server output.
-
-=head1 EXAMPLES
-
-Start a previously-installed RabbitMQ AMQP service:
-
-          rabbitmq-service start
-
-=head1 AUTHOR
-
-The RabbitMQ Team <info@rabbitmq.com>
-
-=head1 REFERENCES
-
-RabbitMQ Web Site: http://www.rabbitmq.com
diff --git a/src/rabbit.erl b/src/rabbit.erl
index 65416f39..2adac0d6 100644
--- a/src/rabbit.erl
+++ b/src/rabbit.erl
@@ -51,27 +51,39 @@
 
 -rabbit_boot_step({database,
                    [{mfa,         {rabbit_mnesia, init, []}},
-                    {enables,     kernel_ready}]}).
+                    {enables,     external_infrastructure}]}).
+
+-rabbit_boot_step({worker_pool,
+                   [{description, "worker pool"},
+                    {mfa,         {rabbit_sup, start_child, [worker_pool_sup]}},
+                    {enables,     external_infrastructure}]}).
+
+-rabbit_boot_step({external_infrastructure,
+                   [{description, "external infrastructure ready"}]}).
 
 -rabbit_boot_step({rabbit_exchange_type_registry,
                    [{description, "exchange type registry"},
                     {mfa,         {rabbit_sup, start_child,
                                    [rabbit_exchange_type_registry]}},
-                    {enables,     kernel_ready}]}).
+                    {enables,     kernel_ready},
+                    {requires,    external_infrastructure}]}).
 
 -rabbit_boot_step({rabbit_log,
                    [{description, "logging server"},
                     {mfa,         {rabbit_sup, start_restartable_child,
                                    [rabbit_log]}},
-                    {enables,     kernel_ready}]}).
+                    {enables,     kernel_ready},
+                    {requires,    external_infrastructure}]}).
 
 -rabbit_boot_step({rabbit_hooks,
                    [{description, "internal event notification system"},
                     {mfa,         {rabbit_hooks, start, []}},
-                    {enables,     kernel_ready}]}).
+                    {enables,     kernel_ready},
+                    {requires,    external_infrastructure}]}).
 
 -rabbit_boot_step({kernel_ready,
-                   [{description, "kernel ready"}]}).
+                   [{description, "kernel ready"},
+                    {requires,    external_infrastructure}]}).
 
 -rabbit_boot_step({rabbit_alarm,
                    [{description, "alarm handler"},
diff --git a/src/rabbit_control.erl b/src/rabbit_control.erl
index 2c6bd5ae..f2f29169 100644
--- a/src/rabbit_control.erl
+++ b/src/rabbit_control.erl
@@ -46,6 +46,7 @@
 -spec(stop/0 :: () -> 'ok').
 -spec(action/4 :: (atom(), erlang_node(), [string()],
                    fun ((string(), [any()]) -> 'ok')) -> 'ok').
+-spec(usage/0 :: () -> no_return()).
 
 -endif.
 
@@ -130,87 +131,7 @@ stop() ->
     ok.
 
 usage() ->
-    io:format("Usage: rabbitmqctl [-q] [-n <node>] <command> [<arg> ...]
-
-Available commands:
-
-  stop      - stops the RabbitMQ application and halts the node
-  stop_app  - stops the RabbitMQ application, leaving the node running
-  start_app - starts the RabbitMQ application on an already-running node
-  reset     - resets node to default configuration, deleting all data
-  force_reset
-  cluster <ClusterNode> ...
-  status
-  rotate_logs [Suffix]
-  close_connection <ConnectionPid> <ExplanationString>
-
-  add_user        <UserName> <Password>
-  delete_user     <UserName>
-  change_password <UserName> <NewPassword>
-  list_users
-
-  add_vhost    <VHostPath>
-  delete_vhost <VHostPath>
-  list_vhosts
-
-  set_permissions   [-p <VHostPath>] <UserName> <Regexp> <Regexp> <Regexp>
-  clear_permissions [-p <VHostPath>] <UserName>
-  list_permissions  [-p <VHostPath>]
-  list_user_permissions <UserName>
-
-  list_queues    [-p <VHostPath>] [<QueueInfoItem> ...]
-  list_exchanges [-p <VHostPath>] [<ExchangeInfoItem> ...]
-  list_bindings  [-p <VHostPath>]
-  list_connections [<ConnectionInfoItem> ...]
-  list_channels [<ChannelInfoItem> ...]
-  list_consumers [-p <VHostPath>]
-
-Quiet output mode is selected with the \"-q\" flag. Informational
-messages are suppressed when quiet mode is in effect.
-
-<node> should be the name of the master node of the RabbitMQ
-cluster. It defaults to the node named \"rabbit\" on the local
-host. On a host named \"server.example.com\", the master node will
-usually be rabbit@server (unless RABBITMQ_NODENAME has been set to
-some non-default value at broker startup time). The output of hostname
--s is usually the correct suffix to use after the \"@\" sign.
-
-The list_queues, list_exchanges and list_bindings commands accept an
-optional virtual host parameter for which to display results. The
-default value is \"/\".
-
-<QueueInfoItem> must be a member of the list [name, durable,
-auto_delete, arguments, pid, owner_pid, exclusive_consumer_pid,
-exclusive_consumer_tag, messages_ready, messages_unacknowledged,
-messages_uncommitted, messages, acks_uncommitted, consumers,
-transactions, memory]. The default is to display name and (number of)
-messages.
-
-<ExchangeInfoItem> must be a member of the list [name, type, durable,
-arguments]. The default is to display name and type.
-
-The output format for \"list_bindings\" is a list of rows containing
-exchange name, queue name, routing key and arguments, in that order.
-
-<ConnectionInfoItem> must be a member of the list [pid, address, port,
-peer_address, peer_port, state, channels, user, vhost, timeout,
-frame_max, client_properties, recv_oct, recv_cnt, send_oct, send_cnt,
-send_pend].  The default is to display user, peer_address, peer_port
-and state.
-
-<ChannelInfoItem> must be a member of the list [pid, connection,
-number, user, vhost, transactional, consumer_count,
-messages_unacknowledged, acks_uncommitted, prefetch_count]. The
-default is to display pid, user, transactional, consumer_count,
-messages_unacknowledged.
-
-The output format for \"list_consumers\" is a list of rows containing,
-in order, the queue name, channel process id, consumer tag, and a
-boolean indicating whether acknowledgements are expected from the
-consumer.
-
-"),
-    halt(1).
+    rabbit_ctl_usage:usage().
 
 action(stop, Node, [], Inform) ->
     Inform("Stopping and halting node ~p", [Node]),
diff --git a/src/rabbit_misc.erl b/src/rabbit_misc.erl
index 9abc1695..81cecb38 100644
--- a/src/rabbit_misc.erl
+++ b/src/rabbit_misc.erl
@@ -307,7 +307,7 @@ execute_mnesia_transaction(TxFun) ->
     %% Making this a sync_transaction allows us to use dirty_read
     %% elsewhere and get a consistent result even when that read
     %% executes on a different node.
-    case mnesia:sync_transaction(TxFun) of
+    case worker_pool:submit({mnesia, sync_transaction, [TxFun]}) of
         {atomic,  Result} -> Result;
         {aborted, Reason} -> throw({error, Reason})
     end.
diff --git a/src/rabbit_multi.erl b/src/rabbit_multi.erl
index 7c56ae3d..9ff2c5cb 100644
--- a/src/rabbit_multi.erl
+++ b/src/rabbit_multi.erl
@@ -42,6 +42,7 @@
 
 -spec(start/0 :: () -> no_return()).
 -spec(stop/0 :: () -> 'ok').
+-spec(usage/0 :: () -> no_return()).
 
 -endif.
 
@@ -86,16 +87,7 @@ stop() ->
     ok.
 
 usage() ->
-    io:format("Usage: rabbitmq-multi <command>
-
-Available commands:
-
-  start_all <NodeCount> - start a local cluster of RabbitMQ nodes.
-  status                - print status of all running nodes
-  stop_all              - stops all local RabbitMQ nodes.
-  rotate_logs [Suffix]  - rotate logs for all local and running RabbitMQ nodes.
-"),
-    halt(3).
+    rabbit_multi_usage:usage().
 
 action(start_all, [NodeCount], RpcTimeout) ->
     io:format("Starting all nodes...~n", []),
diff --git a/src/worker_pool.erl b/src/worker_pool.erl
new file mode 100644
index 00000000..b883d4f0
--- /dev/null
+++ b/src/worker_pool.erl
@@ -0,0 +1,135 @@
+%%   The contents of this file are subject to the Mozilla Public License
+%%   Version 1.1 (the "License"); you may not use this file except in
+%%   compliance with the License. You may obtain a copy of the License at
+%%   http://www.mozilla.org/MPL/
+%%
+%%   Software distributed under the License is distributed on an "AS IS"
+%%   basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+%%   License for the specific language governing rights and limitations
+%%   under the License.
+%%
+%%   The Original Code is RabbitMQ.
+%%
+%%   The Initial Developers of the Original Code are LShift Ltd,
+%%   Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd.
+%%
+%%   Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd,
+%%   Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd
+%%   are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
+%%   Technologies LLC, and Rabbit Technologies Ltd.
+%%
+%%   Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift
+%%   Ltd. Portions created by Cohesive Financial Technologies LLC are
+%%   Copyright (C) 2007-2010 Cohesive Financial Technologies
+%%   LLC. Portions created by Rabbit Technologies Ltd are Copyright
+%%   (C) 2007-2010 Rabbit Technologies Ltd.
+%%
+%%   All Rights Reserved.
+%%
+%%   Contributor(s): ______________________________________.
+%%
+
+-module(worker_pool).
+
+%% Generic worker pool manager.
+%%
+%% Supports nested submission of jobs (nested jobs always run
+%% immediately in current worker process).
+%%
+%% Possible future enhancements:
+%%
+%% 1. Allow priorities (basically, change the pending queue to a
+%% priority_queue).
+%%
+%% 2. Allow the submission to the pool_worker to be async.
+
+-behaviour(gen_server2).
+
+-export([start_link/0, submit/1, idle/1]).
+
+-export([init/1, handle_call/3, handle_cast/2, handle_info/2,
+         terminate/2, code_change/3]).
+
+%%----------------------------------------------------------------------------
+
+-ifdef(use_specs).
+
+-spec(start_link/0 :: () -> {'ok', pid()} | 'ignore' | {'error', any()}).
+-spec(submit/1 :: (fun (() -> A) | {atom(), atom(), [any()]}) -> A).
+
+-endif.
+
+%%----------------------------------------------------------------------------
+
+-define(SERVER, ?MODULE).
+-define(HIBERNATE_AFTER_MIN, 1000).
+-define(DESIRED_HIBERNATE, 10000).
+
+-record(state, { available, pending }).
+
+%%----------------------------------------------------------------------------
+
+start_link() ->
+    gen_server2:start_link({local, ?SERVER}, ?MODULE, [],
+                           [{timeout, infinity}]).
+
+submit(Fun) ->
+    case get(worker_pool_worker) of
+        true -> worker_pool_worker:run(Fun);
+        _    -> Pid = gen_server2:call(?SERVER, next_free, infinity),
+                worker_pool_worker:submit(Pid, Fun)
+    end.
+
+idle(WId) ->
+    gen_server2:cast(?SERVER, {idle, WId}).
+
+%%----------------------------------------------------------------------------
+
+init([]) ->
+    {ok, #state { pending = queue:new(), available = queue:new() }, hibernate,
+     {backoff, ?HIBERNATE_AFTER_MIN, ?HIBERNATE_AFTER_MIN, ?DESIRED_HIBERNATE}}.
+
+handle_call(next_free, From, State = #state { available = Avail,
+                                              pending = Pending }) ->
+    case queue:out(Avail) of
+        {empty, _Avail} ->
+            {noreply, State #state { pending = queue:in(From, Pending) }};
+        {{value, WId}, Avail1} ->
+            {reply, get_worker_pid(WId), State #state { available = Avail1 }}
+    end;
+
+handle_call(Msg, _From, State) ->
+    {stop, {unexpected_call, Msg}, State}.
+
+handle_cast({idle, WId}, State = #state { available = Avail,
+                                          pending = Pending }) ->
+    {noreply, case queue:out(Pending) of
+                  {empty, _Pending} ->
+                      State #state { available = queue:in(WId, Avail) };
+                  {{value, From}, Pending1} ->
+                      gen_server2:reply(From, get_worker_pid(WId)),
+                      State #state { pending = Pending1 }
+              end};
+
+handle_cast(Msg, State) ->
+    {stop, {unexpected_cast, Msg}, State}.
+
+handle_info(Msg, State) ->
+    {stop, {unexpected_info, Msg}, State}.
+
+code_change(_OldVsn, State, _Extra) ->
+    {ok, State}.
+
+terminate(_Reason, State) ->
+    State.
+
+%%----------------------------------------------------------------------------
+
+get_worker_pid(WId) ->
+    [{WId, Pid, _Type, _Modules} | _] =
+        lists:dropwhile(fun ({Id, _Pid, _Type, _Modules})
+                              when Id =:= WId -> false;
+                            (_)               -> true
+                        end,
+                        supervisor:which_children(worker_pool_sup)),
+    Pid.
diff --git a/src/worker_pool_sup.erl b/src/worker_pool_sup.erl
new file mode 100644
index 00000000..4ded63a8
--- /dev/null
+++ b/src/worker_pool_sup.erl
@@ -0,0 +1,69 @@
+%%   The contents of this file are subject to the Mozilla Public License
+%%   Version 1.1 (the "License"); you may not use this file except in
+%%   compliance with the License. You may obtain a copy of the License at
+%%   http://www.mozilla.org/MPL/
+%%
+%%   Software distributed under the License is distributed on an "AS IS"
+%%   basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+%%   License for the specific language governing rights and limitations
+%%   under the License.
+%%
+%%   The Original Code is RabbitMQ.
+%%
+%%   The Initial Developers of the Original Code are LShift Ltd,
+%%   Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd.
+%%
+%%   Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd,
+%%   Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd
+%%   are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
+%%   Technologies LLC, and Rabbit Technologies Ltd.
+%%
+%%   Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift
+%%   Ltd. Portions created by Cohesive Financial Technologies LLC are
+%%   Copyright (C) 2007-2010 Cohesive Financial Technologies
+%%   LLC. Portions created by Rabbit Technologies Ltd are Copyright
+%%   (C) 2007-2010 Rabbit Technologies Ltd.
+%%
+%%   All Rights Reserved.
+%%
+%%   Contributor(s): ______________________________________.
+%%
+
+-module(worker_pool_sup).
+
+-behaviour(supervisor).
+
+-export([start_link/0, start_link/1]).
+
+-export([init/1]).
+
+%%----------------------------------------------------------------------------
+
+-ifdef(use_specs).
+
+-spec(start_link/0 :: () -> {'ok', pid()} | 'ignore' | {'error', any()}).
+-spec(start_link/1 ::
+        (non_neg_integer()) -> {'ok', pid()} | 'ignore' | {'error', any()}).
+
+-endif.
+
+%%----------------------------------------------------------------------------
+
+-define(SERVER, ?MODULE).
+
+%%----------------------------------------------------------------------------
+
+start_link() ->
+    start_link(erlang:system_info(schedulers)).
+
+start_link(WCount) ->
+    supervisor:start_link({local, ?SERVER}, ?MODULE, [WCount]).
+
+%%----------------------------------------------------------------------------
+
+init([WCount]) ->
+    {ok, {{one_for_one, 10, 10},
+          [{worker_pool, {worker_pool, start_link, []}, transient,
+            16#ffffffff, worker, [worker_pool]} |
+           [{N, {worker_pool_worker, start_link, [N]}, transient, 16#ffffffff,
+             worker, [worker_pool_worker]} || N <- lists:seq(1, WCount)]]}}.
diff --git a/src/worker_pool_worker.erl b/src/worker_pool_worker.erl
new file mode 100644
index 00000000..fc3ce371
--- /dev/null
+++ b/src/worker_pool_worker.erl
@@ -0,0 +1,94 @@
+%%   The contents of this file are subject to the Mozilla Public License
+%%   Version 1.1 (the "License"); you may not use this file except in
+%%   compliance with the License. You may obtain a copy of the License at
+%%   http://www.mozilla.org/MPL/
+%%
+%%   Software distributed under the License is distributed on an "AS IS"
+%%   basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+%%   License for the specific language governing rights and limitations
+%%   under the License.
+%%
+%%   The Original Code is RabbitMQ.
+%%
+%%   The Initial Developers of the Original Code are LShift Ltd,
+%%   Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd.
+%%
+%%   Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd,
+%%   Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd
+%%   are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
+%%   Technologies LLC, and Rabbit Technologies Ltd.
+%%
+%%   Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift
+%%   Ltd. Portions created by Cohesive Financial Technologies LLC are
+%%   Copyright (C) 2007-2010 Cohesive Financial Technologies
+%%   LLC. Portions created by Rabbit Technologies Ltd are Copyright
+%%   (C) 2007-2010 Rabbit Technologies Ltd.
+%%
+%%   All Rights Reserved.
+%%
+%%   Contributor(s): ______________________________________.
+%%
+
+-module(worker_pool_worker).
+
+-behaviour(gen_server2).
+
+-export([start_link/1, submit/2, run/1]).
+
+-export([init/1, handle_call/3, handle_cast/2, handle_info/2,
+         terminate/2, code_change/3]).
+
+%%----------------------------------------------------------------------------
+
+-ifdef(use_specs).
+
+-spec(start_link/1 :: (any()) -> {'ok', pid()} | 'ignore' | {'error', any()}).
+-spec(submit/2 :: (pid(), fun (() -> A) | {atom(), atom(), [any()]}) -> A).
+
+-endif.
+
+%%----------------------------------------------------------------------------
+
+-define(HIBERNATE_AFTER_MIN, 1000).
+-define(DESIRED_HIBERNATE, 10000).
+
+%%----------------------------------------------------------------------------
+
+start_link(WId) ->
+    gen_server2:start_link(?MODULE, [WId], [{timeout, infinity}]).
+
+submit(Pid, Fun) ->
+    gen_server2:call(Pid, {submit, Fun}, infinity).
+
+init([WId]) ->
+    ok = worker_pool:idle(WId),
+    put(worker_pool_worker, true),
+    {ok, WId, hibernate,
+     {backoff, ?HIBERNATE_AFTER_MIN, ?HIBERNATE_AFTER_MIN, ?DESIRED_HIBERNATE}}.
+
+handle_call({submit, Fun}, From, WId) ->
+    gen_server2:reply(From, run(Fun)),
+    ok = worker_pool:idle(WId),
+    {noreply, WId};
+
+handle_call(Msg, _From, State) ->
+    {stop, {unexpected_call, Msg}, State}.
+
+handle_cast(Msg, State) ->
+    {stop, {unexpected_cast, Msg}, State}.
+
+handle_info(Msg, State) ->
+    {stop, {unexpected_info, Msg}, State}.
+
+code_change(_OldVsn, State, _Extra) ->
+    {ok, State}.
+
+terminate(_Reason, State) ->
+    State.
+
+%%----------------------------------------------------------------------------
+
+run({M, F, A}) ->
+    apply(M, F, A);
+run(Fun) ->
+    Fun().