QPID-3767: update (resync) this branch to latest trunk (r1332660)

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/qpid-3767@1333027 13f79535-47bb-0310-9956-ffa450edef68

122 files changed, 843 insertions, 1142 deletions

diff --git a/qpid/doc/book/Makefile b/qpid/doc/book/Makefile
index db160ac6f8..8a3d4974db 100644
--- a/qpid/doc/book/Makefile
+++ b/qpid/doc/book/Makefile
@@ -17,37 +17,22 @@
 # under the License.
 #
 
-#
-#  This Makefile requires the following:
-#
-#  Apache FOP, version 0.95 or higher
-#  Docbook 4.5
-#  Docbook XSL stylesheets - tested with xsl-stylesheets (1.75.2 and 1.65.1-2)
-#  xsltproc
-#  xmllint
-# 
-
-all: cpp java programming
+DIRS = src/java-broker src/cpp-broker src/programming
 
-cpp: build/AMQP-Messaging-Broker-CPP-Book
 
-java: build/AMQP-Messaging-Broker-Java-Book
+.PHONY: all $(DIRS)
 
-programming: build/Programming-In-Apache-Qpid
+all: $(DIRS)     
 
-qmf: build/QmfBook
-
-build/AMQP-Messaging-Broker-CPP-Book:
-	./build-book.sh AMQP-Messaging-Broker-CPP-Book
+clean: 
+	rm -rf build
 
-build/AMQP-Messaging-Broker-Java-Book:
-	./build-book.sh AMQP-Messaging-Broker-Java-Book
+html: TARGET = html
+html: all
 
-build/Programming-In-Apache-Qpid:
-	./build-book.sh Programming-In-Apache-Qpid
+pdf: TARGET = pdf
+pdf: all
 
-build/QmfBook: src/QmfBook.xml src/QmfIntroduction.xml
-	./build-book.sh QmfBook
+$(DIRS):
+	$(MAKE) -C $@ $(TARGET) OUTPUTDIR=../../build/
 
-clean:
-	rm -rf build
diff --git a/qpid/doc/book/README.txt b/qpid/doc/book/README.txt
deleted file mode 100644
index 1fc99c94a0..0000000000
--- a/qpid/doc/book/README.txt
+++ /dev/null
@@ -1,118 +0,0 @@
-The documentation in this directory is written in DocBook 4.5. The
-original content was taken from the Apache Qpid Wiki. 
-
-1. Building the Documentation
-
-You need the following to build the documentation:
-
-- Apache FOP, version 0.95 or higher
-- Docbook 4.5
-- Docbook XSL stylesheets - Tested with xsl-stylesheets (1.75.2 & 1.65.1-2)
-- xsltproc
-- xmllint
-
-On many Linux machines, these can usually be installed from standard
-repos. For instance, on Fedora they can be installed as follows:
-
-$ sudo yum install fop docbook-dtds docbook-style-xsl libxslt libxml2
-
-After installing, use make to build the documentation:
-
-$ make
-
-The Makefile supports the following targets:
-
-all            Builds the cpp, java, and programming targets.
-cpp            Build html+pdf for the C++ broker.
-java           Build html+pdf for the Java broker.
-programming    Build html+pdf for Programming In Apache Qpid.
-clean          Delete the build directory
-
-
-You will see quite a few error messages. Many of these are due to
-unresolved links, and these should go away. Many are due to the
-verbosity of Apache FOP, which generates many warnings.
-
-2. Editing Tools
-
-For Emacs, I like nxml-mode, especially if you learn how to use tag
-completion, outlining, etc.  This is described in some detail in
-http://www.dpawson.co.uk/relaxng/nxml/info.html. 
-
-For vi, the macros described in this Linux Journal article may be
-helpful: http://www.linuxjournal.com/article/7737.
-
-Commercial XML editors provide good support for DocBook. On Windows, I
-like Stylus Studio (http://www.stylusstudio.com/). On Linux, I like
-Oxygen (http://www.oxygenxml.com/).
-
-Here's a page on authoring tools for DocBook:
-http://wiki.docbook.org/topic/DocBookAuthoringTools
-
-
-3. File Structure
-
-The source files are in qpid/doc/book/src.
-
-The following XInclude tree shows the organization of files in the
-document.
-
-Book.xml
-   Book-Info.xml
-   Introduction.xml
-   AMQP.xml
-   Getting-Started.xml
-   Download.xml
-   AMQP-Messaging-Broker-CPP.xml
-      Running-CPP-Broker.xml
-      Cheat-Sheet-for-configuring-Queue-Options.xml
-      Cheat-Sheet-for-configuring-Exchange-Options.xml
-      Using-Broker-Federation.xml
-      SSL.xml
-      LVQ.xml
-      queue-state-replication.xml
-      Starting-a-cluster.xml
-      ACL.xml
-      Managing-CPP-Broker.xml
-      QMan-Qpid-Management-bridge.xml
-      Qpid-Management-Framework.xml
-      Management-Design-notes.xml
-      QMF-Python-Console-Tutorial.xml
-   AMQP-Messaging-Broker-Java.xml
-      Java-Broker-Feature-Guide.xml
-      Qpid-Java-FAQ.xml
-      Java-Environment-Variables.xml
-      Qpid-Troubleshooting-Guide.xml
-      Add-New-Users.xml
-      Configure-ACLs.xml
-      Configure-Java-Qpid-to-use-a-SSL-connection.xml
-      Configure-Log4j-CompositeRolling-Appender.xml
-      Configure-the-Broker-via-config.xml.xml
-      Configure-the-Virtual-Hosts-via-virtualhosts.xml.xml
-      Debug-using-log4j.xml
-      How-to-Tune-M3-Java-Broker-Performance.xml
-      Qpid-Java-Build-How-To.xml
-      Use-Priority-Queues.xml
-      Qpid-JMX-Management-Console.xml
-         Configuring-Management-Users.xml
-         Configuring-Qpid-JMX-Management-Console.xml
-         Management-Console-Security.xml
-         Qpid-JMX-Management-Console-FAQ.xml
-         Qpid-JMX-Management-Console-User-Guide.xml
-         Qpid-Management-Features.xml
-      MessageStore-Tool.xml
-      Qpid-Java-Broker-Management-CLI.xml
-   AMQP-Java-JMS-Messaging-Client.xml
-      System-Properties.xml
-      Connection-URL-Format.xml
-      Binding-URL-Format.xml
-   AMQP-C++-Messaging-Client.xml
-   AMQP-.NET-Messaging-Client.xml
-      NET-User-Guide.xml
-      Excel-AddIn.xml
-      WCF.xml
-   AMQP-Python-Messaging-Client.xml
-      PythonBrokerTest.xml
-   AMQP-Ruby-Messaging-Client.xml
-   AMQP-Compatibility.xml
-   Qpid-Interoperability-Documentation.xml
diff --git a/qpid/doc/book/build-book.sh b/qpid/doc/book/build-book.sh
deleted file mode 100755
index 5cc02b9fd8..0000000000
--- a/qpid/doc/book/build-book.sh
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/bin/bash -ex
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-########################################################################
-#
-#  Build a PDF and HTML for a single chapter or section
-#
-#  Specify the name of the XML file on the command line, omitting
-#  the file extension, e.g.:
-#
-#  $ ./build-chapter.sh src/High-Level-API
-#
-########################################################################
-
-# DOCBOOK XSL STYLESHEET LOCATION
-# Fedora, RHEL:
-DOCBOOK_XSL=/usr/share/sgml/docbook/xsl-stylesheets
-# Ubuntu:
-# DOCBOOK_XSL=/usr/share/sgml/docbook/stylesheet/xsl/nwalsh
-# Ubuntu 10.4 installed it here:
-# DOCBOOK_XSL=/usr/share/xml/docbook/stylesheet/docbook-xsl-ns
-
-rm -rf build/$1
-mkdir -p build/$1
-mkdir -p build/$1/html-single
-mkdir -p build/$1/html
-mkdir -p build/$1/pdf
-cp -r src/images build/$1/html-single
-cp -r src/images build/$1/html
-cp -r src/css build/$1/html-single
-cp -r src/css build/$1/html
-
-# Create single-page .html
-xsltproc --xinclude --stringparam  section.autolabel 1  --stringparam  callout.graphics 0  --stringparam  callout.unicode 0 --stringparam section.label.includes.component.label 1 ${DOCBOOK_XSL}/html/docbook.xsl src/$1.xml >build/$1/html-single/$1.html
-
-# Create chunked .html
-INFILE=$(readlink -f src/$1.xml)
-pushd build/$1/html
-xsltproc --xinclude --stringparam  chunk.section.depth 1  --stringparam  section.autolabel 1  --stringparam  callout.graphics 0  --stringparam  callout.unicode 0 --stringparam section.label.includes.component.label 1 --stringparam use.id.as.filename 1 --stringparam html.stylesheet css/style.css --stringparam section.autolabel.max.depth 3 --stringparam toc.section.depth 2 --stringparam chunker.output.encoding UTF-8 ${DOCBOOK_XSL}/html/chunk.xsl $INFILE
-popd
-
-# Create the .fo
-xsltproc --xinclude --stringparam  section.autolabel 1  --stringparam  callout.graphics 0  --stringparam  callout.unicode 0 --stringparam section.label.includes.component.label 1 ${DOCBOOK_XSL}/fo/docbook.xsl src/$1.xml >build/$1/pdf/$1.fo
-
-# Use Apache FOP to create the PDF
-fop build/$1/pdf/$1.fo build/$1/pdf/$1.pdf
diff --git a/qpid/doc/book/build.xml b/qpid/doc/book/build.xml
deleted file mode 100644
index 5acd97f982..0000000000
--- a/qpid/doc/book/build.xml
+++ /dev/null
@@ -1,193 +0,0 @@
-<!--
- -
- - Licensed to the Apache Software Foundation (ASF) under one
- - or more contributor license agreements.  See the NOTICE file
- - distributed with this work for additional information
- - regarding copyright ownership.  The ASF licenses this file
- - to you under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
- - 
- - Unless required by applicable law or agreed to in writing,
- - software distributed under the License is distributed on an
- - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- - KIND, either express or implied.  See the License for the
- - specific language governing permissions and limitations
- - under the License.
- -
- -->
-<!-- 
-     Build Apache Qpid documentation.
-
-     For documentation on using XSLT in ant, see http://ant.apache.org/manual/CoreTasks/style.html
-
-     For documentation on using Apache FOP in ant, see http://xmlgraphics.apache.org/fop/0.94/anttask.html
-
-     Note: Validation is currently off by default, too many dangling references. We will tighten this up as soon as we can.
- -->
-
-<project 
-     name="generate"   
-     basedir="."
-     default="pdf"> 
-
-  <property name="Qpid" value="http://qpid.apache.org"/>
-
-
-<!--
-###########################################################################
-# 
-# Directories 
-#
-# Change the directory paths in  this section to the correct paths for
-# your machine.
-#
-###########################################################################
--->
-
-  <property name="src.dir" location="src"/>
-  <property name="build.dir" location="build"/>
-  <property name="out.dir" location="out"/>
-
-  <!-- Docbook schemas and stylesheets -->
-  <property name="schema.dir" location="docbook"/>    
-  <property name="style.dir" location="docbook-xsl"/>    
-  <property name="fo.stylesheet" location="${style.dir}/fo/docbook.xsl" />
-  <property name="html.stylesheet" location="${style.dir}/html/docbook.xsl" />
-
-  <!-- ${lib.dir} has subdirectories for saxon and fop -->
-  <property name="lib.dir" location="lib"/>
-
-  <property name="xmllint" location="/usr/bin/xmllint"/>
-
-<!--
-###########################################################################
-#
-# Setting up tasks
-#
-# You shouldn't need to change anything in this section or following sections.
-#
-###########################################################################
--->
-
-  <path id="saxon6.classpath">
-    <pathelement location="${lib.dir}/saxon/resolver.jar"/>
-    <pathelement location="${lib.dir}/saxon/xml-apis.jar"/>
-    <pathelement location="${lib.dir}/saxon/xercesImpl.jar"/>
-    <pathelement location="${lib.dir}/saxon/saxon.jar"/>
-  </path>
-
-<taskdef name="fop" 
-         classname="org.apache.fop.tools.anttasks.Fop">
-  <classpath>
-    <fileset dir="${lib.dir}/fop-0.95/lib">
-      <include name="*.jar"/>
-    </fileset>
-    <fileset dir="${lib.dir}/fop-0.95/build">
-      <include name="fop.jar"/>
-      <include name="fop-hyph.jar" />
-    </fileset>
-  </classpath>
-</taskdef>
-
-<!--
-###########################################################################
-#
-# Tasks
-#
-###########################################################################
--->
-
-<!--
-    init
--->
-
-<target name="init">
-  <mkdir dir="${build.dir}"/>
-  <mkdir dir="${out.dir}"/>
-</target>
-
-<!--
-    XInclude
--->
-
-<target name="xinclude" depends="init">
-  <exec executable="${xmllint}">
-    <arg value="-o"/>
-    <arg value="${build.dir}/xinclude.xml"/>
-    <arg value="--xinclude"/>
-    <arg value="${src.dir}/Book.xml"/>
-  </exec>
-</target>
-
-
-
-<!--
-    FO
--->
-
- <target name="fo" depends="xinclude" description="Generates qpid-book.fo, which is needed to create a PDF">
-
-    <xslt in="${build.dir}/xinclude.xml" out="${build.dir}/qpid-book.fo"
-          style="${fo.stylesheet}" classpathref="saxon6.classpath">
-      <param name="specdoc" expression="${spec.code}"/>
-      <param name="uri" expression="${spec.uri}"/>
-    </xslt>
-  </target>
-
-
-<!--
-    PDF
--->
-
-<target name="pdf" depends="fo" description="Generates qpid-book.pdf">
-   <fop format="application/pdf" 
-        fofile="${build.dir}/qpid-book.fo"
-        outfile="${out.dir}/qpid-book.pdf"/>
-</target
->
-<!--
-    HTML
--->
-
- <target name="html" depends="xinclude" description="Generates qpid-book.html">
-    <xslt in="${build.dir}/xinclude.xml" out="${out.dir}/qpid-book.html"
-          style="${html.stylesheet}" classpathref="saxon6.classpath">
-    </xslt>
- </target>
-
-<!--
-    Validate
--->
-
-<target name="validate" depends="xinclude">
-  <xmlvalidate file="${build.dir}/xinclude.xml" warn="true">
-    <dtd publicId="-//OASIS//DTD DocBook V4.5//EN"
-	 location="docbook/docbook.dtd"/>
-  </xmlvalidate>
-</target>
-
-<!--
-    Clean
--->
-
-<target name="clean">
-  <delete dir="${build.dir}"/>
-</target>
-
-<!-- 
-    Check
--->
-
-<target name="check" depends="xinclude">
-  <xmlvalidate file="${build.dir}/xinclude.xml" warn="false">
-    <dtd publicId="-//OASIS//DTD DocBook V4.5//EN"
-	 location="docbook/docbook.dtd"/>
-  </xmlvalidate>
-</target>
-
-
-</project>
-
diff --git a/qpid/doc/book/src/AMQP-Messaging-Broker-Java.xml b/qpid/doc/book/src/AMQP-Messaging-Broker-Java.xml
deleted file mode 100644
index 6cd7ce915e..0000000000
--- a/qpid/doc/book/src/AMQP-Messaging-Broker-Java.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0"?>
-<!--
- 
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
- 
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- 
--->
-
-<part id="Java-Broker">
-  <title>AMQP Messaging Broker (Implemented in Java)</title>
-  <partintro>
-    <para>Qpid provides two AMQP messaging brokers:</para>
-
-    <itemizedlist>
-      <listitem><para>Implemented in C++ - high performance, low latency, and RDMA support.</para></listitem>
-      <listitem><para>Implemented in Java - Fully JMS compliant, runs on any Java platform.</para></listitem>
-    </itemizedlist>
-
-    <para>Both AMQP messaging brokers support clients in multiple languages, as long as the messaging client and the messaging broker use the same version of AMQP. See <link linkend="AMQP-Compatibility"/> to see which messaging clients work with each broker.</para>
-
-    <para>This section contains information specific to the broker that is implemented in Java.</para>
-  </partintro>
-
-<chapter id="Java-General-User-Guides">
-  <title>General User Guides</title>
-
-        <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Java-Broker-Feature-Guide.xml"/>
-        <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Qpid-Java-FAQ.xml"/>
-        <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Java-Environment-Variables.xml"/>
-        <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Qpid-Troubleshooting-Guide.xml"/>
-        <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Broker-Configuration-Guide.xml"/>
-</chapter>
-
-<chapter  id="Qpid-Java-Broker-HowTos">
-<title>How Tos</title>
-
-        <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Add-New-Users.xml"/>
-        <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Configure-ACLs.xml"/>
-        <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Configure-Java-Qpid-to-use-a-SSL-connection.xml"/>
-        <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Configure-Log4j-CompositeRolling-Appender.xml"/>
-        <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Configure-the-Broker-via-config.xml.xml"/>
-        <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Configure-the-Virtual-Hosts-via-virtualhosts.xml.xml"/>
-        <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Debug-using-log4j.xml"/>
-        <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="How-to-Tune-M3-Java-Broker-Performance.xml"/>
-        <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Qpid-Java-Build-How-To.xml"/>
-        <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Use-Priority-Queues.xml"/>
-        <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="How-to-Use-SlowConsumerDisconnect.xml"/> 
-</chapter>
-
-
-<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Qpid-JMX-Management-Console.xml"/>
-
-<chapter id="QpidJavaBroker-ManagementTools">
-<title>Management Tools</title>
-        <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="MessageStore-Tool.xml"/>
-        <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Qpid-Java-Broker-Management-CLI.xml"/>
-</chapter>
-</part>
diff --git a/qpid/doc/book/src/Makefile.inc b/qpid/doc/book/src/Makefile.inc
new file mode 100644
index 0000000000..12cab54f8a
--- /dev/null
+++ b/qpid/doc/book/src/Makefile.inc
@@ -0,0 +1,63 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+BOOK=$(wildcard *Book.xml)
+XML=$(wildcard *.xml) $(wildcard ../common/*.xml)
+IMAGES=$(wildcard images/*.png) 
+CSS=$(wilcard ../common/css/*.css)
+
+OUTPUTDIR=output
+OUTPUT= $(BOOK:%.xml=$(OUTPUTDIR)/%/)
+
+all: html pdf 
+
+pdf: $(OUTPUT)/pdf $(BOOK:%.xml=$(OUTPUT)/pdf/%.pdf) 
+
+html: $(OUTPUT)/html $(BOOK:%.xml=$(OUTPUT)/html/index.html) 
+
+$(OUTPUT)/html/images: $(IMAGES)
+	-mkdir -p $(OUTPUT)/html/images
+	-cp images/*.png $(OUTPUT)/html/images/
+
+$(OUTPUT)/html/css: $(CSS)
+	-mkdir -p $(OUTPUT)/html/css
+	-cp ../common/css/*.css $(OUTPUT)/html/css
+
+$(OUTPUT)/html:
+	-mkdir -p $(OUTPUT)/html
+
+$(OUTPUT)/pdf:
+	-mkdir -p $(OUTPUT)/pdf
+
+$(OUTPUT)/html/index.html: $(BOOK) $(OUTPUT)/html/css $(OUTPUT)/html/images $(XML)
+	xsltproc -o $(OUTPUT)/html/ --xinclude --stringparam  chunk.section.depth 1  --stringparam  section.autolabel 1  --stringparam  callout.graphics 0  --stringparam  callout.unicode 0 --stringparam section.label.includes.component.label 1 --stringparam use.id.as.filename 1 --stringparam html.stylesheet css/style.css --stringparam section.autolabel.max.depth 3 --stringparam toc.section.depth 2 --stringparam chunker.output.encoding UTF-8 --stringparam css.decoration 0 ../../xsl/html-custom.xsl $<
+
+%.fo: %.xml
+	xsltproc --xinclude --stringparam  section.autolabel 1  --stringparam  callout.graphics 0  --stringparam  callout.unicode 0 --stringparam section.label.includes.component.label 1 http://docbook.sourceforge.net/release/xsl/current/fo/docbook.xsl $< > $@
+ 
+
+%.pdf: %.fo
+	fop $< $@
+
+$(OUTPUT)/pdf/%.pdf: %.pdf
+	@mv $< $@
+
+clean:
+	-rm -rf $(OUTPUT) *.fo
+
diff --git a/qpid/doc/book/src/amqp-advanced-message-queueing-protocol.html b/qpid/doc/book/src/amqp-advanced-message-queueing-protocol.html
deleted file mode 100644
index 9d46429d03..0000000000
--- a/qpid/doc/book/src/amqp-advanced-message-queueing-protocol.html
+++ /dev/null
@@ -1,237 +0,0 @@
-<!--
- 
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
- 
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
- 
--->
-
-
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML>
-  <HEAD>
-    <LINK type="text/css" rel="stylesheet" href="resources/space.css">
-    <STYLE type="text/css">
-      .footer {
-        background-image:      url('http://cwiki.apache.org/confluence/images/border/border_bottom.gif');
-        background-repeat:     repeat-x;
-        background-position:   left top;
-        padding-top:           4px;
-        color:                 #666;
-        clear:                 both;
-      }
-     .left {
-        padding-top: 5px;
-	float : left;
-        width : 15em;
-      }
-      .pagecontent {
-         float: left;
-         width: 70%;
-      }
-    </STYLE>
-    <SCRIPT type="text/javascript" language="javascript">
-      var hide = null;
-      var show = null;
-      var children = null;
-
-      function init() {
-        /* Search form initialization */
-        var form = document.forms['search'];
-        if (form != null) {
-          form.elements['domains'].value = location.hostname;
-          form.elements['sitesearch'].value = location.hostname;
-        }
-
-        /* Children initialization */
-        hide = document.getElementById('hide');
-        show = document.getElementById('show');
-        children = document.all != null ?
-                   document.all['children'] :
-                   document.getElementById('children');
-        if (children != null) {
-          children.style.display = 'none';
-          show.style.display = 'inline';
-          hide.style.display = 'none';
-        }
-      }
-
-      function showChildren() {
-        children.style.display = 'block';
-        show.style.display = 'none';
-        hide.style.display = 'inline';
-      }
-
-      function hideChildren() {
-        children.style.display = 'none';
-        show.style.display = 'inline';
-        hide.style.display = 'none';
-      }
-    </SCRIPT>
-    <TITLE>Apache Qpid: Open Source AMQP Messaging - AMQP (Advanced Message Queueing Protocol)</TITLE>
-  <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
-  <BODY onload="init()">
-    <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
-      <TR class="topBar">
-        <TD align="left" valign="middle" class="topBarDiv" align="left" nowrap="">
-          &nbsp;<A href="index.html" title="Apache Qpid">Apache Qpid</A>&nbsp;&gt;&nbsp;<A href="index.html" title="Index">Index</A>&nbsp;&gt;&nbsp;<A href="" title="AMQP (Advanced Message Queueing Protocol)">AMQP (Advanced Message Queueing Protocol)</A>
-        </TD>
-        <TD align="right" valign="middle" nowrap="">
-          <FORM name="search" action="http://www.google.com/search" method="get">
-            <INPUT type="hidden" name="ie" value="UTF-8">
-            <INPUT type="hidden" name="oe" value="UTF-8">
-            <INPUT type="hidden" name="domains" value="">
-            <INPUT type="hidden" name="sitesearch" value="">
-            <INPUT type="text" name="q" maxlength="255" value="">        
-            <INPUT type="submit" name="btnG" value="Google Search">
-          </FORM>
-        </TD>
-      </TR> 
-    </TABLE>
-
-    <DIV id="PageContent">
-        <DIV class="pageheader" style="padding: 6px 0px 0px 0px;">
-<DIV>
-<TABLE border="0" width="90%">
-<TR>
-<TD align="left">
-<A href="http://qpid.apache.org/">
-<IMG src="http://qpid.apache.org/images/qpid-logo.png" height="69" width="225" border="0"></A>
-</TD>
-<TD>
-</TD>
-<TD align="right">          <A href="http://www.apache.org/">
-            <IMG src="http://qpid.apache.org/images/asf-logo.png" height="69" width="225" border="0"></A></TD>
-</TR>
-</TABLE>
-</DIV>
-
-      </DIV>
-
-<!--
-
-
-      <div class="pagesubheading" style="margin: 0px 10px 0px 10px;">
-                    Added by <a href="/confluence/display/~jonathan.robie@redhat.com">Jonathan Robie</a>, last edited by <a href="/confluence/display/~jonathan.robie@redhat.com">Jonathan Robie</a> on Feb 18, 2009
-                      &nbsp;(<a class="noprint" href="/confluence/pages/diffpages.action?pageId=110693&originalId=110695">view change</a>)
-              
-      </div>
--->
-
-        <DIV class="left">
-            
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        
-                                    
-                                                
-            <DIV class="panel" style="background-color: E0E0FF;border-color: #202080;border-style: solid;border-width: 1px;"><DIV class="panelContent" style="background-color: E0E0FF;">
-<H3><A name="Navigation-ApacheQpid"></A>Apache Qpid</H3>
-<P> <A href="index.html" title="Index">Home</A><BR>
- <A href="download.html" title="Download">Download</A><BR>
- <A href="getting-started.html" title="Getting Started">Getting Started</A> <BR>
- <A href="documentation.html" title="Documentation">Documentation</A><BR>
- <A href="mailing-lists.html" title="Mailing Lists">Mailing Lists</A><BR>
- <A href="http://issues.apache.org/jira/browse/qpid" rel="nofollow">Issue Reporting</A><BR>
- <A href="faq.html" title="FAQ">FAQ/How to</A></P>
-
-<H3><A name="Navigation-Resources"></A>Resources</H3>
-<P> <A href="getting-involved.html" title="Getting Involved">Getting Involved</A><BR>
- <A href="qpid-integrations.html" title="Qpid Integrations">Qpid Integrated with..</A><BR>
- <A href="source-repository.html" title="Source Repository">Source Repository</A><BR>
- <A href="building.html" title="Building">Building Qpid</A><BR>
- <A href="developer-pages.html" title="Developer Pages">Developer Pages</A><BR>
- <A href="qpid-management-framework.html" title="Qpid Management Framework">QMF</A></P>
-
-<H3><A name="Navigation-AboutQpid"></A>About Qpid</H3>
-<P> <A href="people.html" title="People">People</A><BR>
- <A href="license.html" title="License">License</A><BR>
- <A href="project-status.html" title="Project Status">Project Status</A><BR>
- <A href="acknowledgments.html" title="Acknowledgments">Acknowledgments</A></P>
-
-<H3><A name="Navigation-AboutAMQP"></A>About AMQP</H3>
-<P> <A href="" title="AMQP (Advanced Message Queueing Protocol)">What is AMQP ?</A><BR>
- <A href="" title="AMQP (Advanced Message Queueing Protocol)">AMQP Specification Download</A></P>
-
-<P><IMG src="navigation.data/AMQP_logo_71px-small.jpg" align="absmiddle" border="0"></P>
-</DIV></DIV>
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        </DIV>
-
-      <DIV class="pagecontent">
-        <DIV class="wiki-content">
-          <H2><A name="AMQP%28AdvancedMessageQueueingProtocol%29-WhatisAMQP%3F"></A>What is AMQP?</H2>
-
-<P>AMQP <A href="http://www.amqp.org/" rel="nofollow">Advanced Message Queuing Protocol</A> is an open standard designed to support reliable, high-performance messaging over the Internet. AMQP can be used for any distributed or business application, and supports common messaging paradigms like point-to-point, fanout, publish-subscribe, and request-response.</P>
-
-<P>Apache Qpid implements AMQP, including transaction management, queuing, clustering, federation, security, management and multi-platform support.</P>
-
-
-<P>Apache Qpid implements the latest AMQP specification, providing transaction management, queuing, distribution, security, management, clustering, federation and heterogeneous multi-platform support and a lot more. </P>
-
-<P>Apache Qpid is highly optimized, and <A href="amqp-compatibility.html" title="AMQP compatibility">aims to be 100% AMQP Compliant</A>.</P>
-
-<H2><A name="AMQP%28AdvancedMessageQueueingProtocol%29-DownloadtheAMQPSpecifications"></A>Download the AMQP Specifications</H2>
-
-<H3><A name="AMQP%28AdvancedMessageQueueingProtocol%29-AMQPversion010"></A>AMQP version 0-10</H3>
-
-
-<UL>
-	<LI><A href="https://jira.amqp.org/confluence/download/attachments/720900/amqp.0-10.pdf?version=1" rel="nofollow">AMQP 0-10 Specification (PDF) </A></LI>
-	<LI><A href="https://jira.amqp.org/confluence/download/attachments/720900/amqp.0-10.xml?version=1" rel="nofollow">AMQP 0-10 Protocol Definition XML </A></LI>
-	<LI><A href="https://jira.amqp.org/confluence/download/attachments/720900/amqp.0-10.dfd?version=1" rel="nofollow">AMQP 0-10 Protocol Definition DTD </A></LI>
-</UL>
-
-
-<H3><A name="AMQP%28AdvancedMessageQueueingProtocol%29-AMQPversion091"></A>AMQP version 0-9-1</H3>
-
-<UL>
-	<LI><A href="https://jira.amqp.org/confluence/download/attachments/720900/amqp0-9-1.pdf?version=1" rel="nofollow">AMQP 0-9-1 Specification (PDF) </A></LI>
-	<LI><A href="https://jira.amqp.org/confluence/download/attachments/720900/amqp0-9-1.xml?version=1" rel="nofollow">AMQP 0-9-1 Protocol Documentation (PDF) </A></LI>
-	<LI><A href="https://jira.amqp.org/confluence/download/attachments/720900/amqp0-9-1.dtd?version=1" rel="nofollow">AMQP 0-9-1 Protocol Definitions (XML) </A></LI>
-</UL>
-
-
-<H3><A name="AMQP%28AdvancedMessageQueueingProtocol%29-AMQPversion09"></A>AMQP version 0-9</H3>
-
-<UL>
-	<LI><A href="https://jira.amqp.org/confluence/download/attachments/720900/amqp0-9.pdf?version=1" rel="nofollow">AMQP 0-9 Specification (PDF) </A></LI>
-	<LI><A href="https://jira.amqp.org/confluence/download/attachments/720900/amqp0-9.xml?version=1" rel="nofollow">AMQP 0-9 Protocol Documentation (PDF) </A></LI>
-	<LI><A href="https://jira.amqp.org/confluence/download/attachments/720900/amqp0-9.dtd?version=1" rel="nofollow">AMQP 0-9 Protocol Definitions (XML) </A></LI>
-</UL>
-
-
-<H3><A name="AMQP%28AdvancedMessageQueueingProtocol%29-AMQPversion08"></A>AMQP version 0-8</H3>
-
-<UL>
-	<LI><A href="https://jira.amqp.org/confluence/download/attachments/720900/amqp0-8.pdf?version=1" rel="nofollow">AMQP 0-8 Specification (PDF) </A></LI>
-	<LI><A href="https://jira.amqp.org/confluence/download/attachments/720900/amqp0-8.dtd?version=1" rel="nofollow">AMQP 0-8 Protocol Documentation (PDF) </A></LI>
-	<LI><A href="https://jira.amqp.org/confluence/download/attachments/720900/amqp0-8.xml?version=1" rel="nofollow">AMQP 0-8 Protocol Definitions (XML) </A></LI>
-</UL>
-
-        </DIV>
-
-<!--
-        -->
-
-      </DIV>
-
-    <DIV class="footer">
-      Apache Qpid, Enterprise AMQP Messaging    
-      &nbsp;
-      &copy; 2004-2008 The Apache Software Foundation.
-      &nbsp;
-        (<A href="http://cwiki.apache.org/confluence/pages/editpage.action?pageId=110693">edit this page</A>)
-    </DIV>
-  </BODY>
-</HTML>
diff --git a/qpid/doc/book/src/common/css/style.css b/qpid/doc/book/src/common/css/style.css
new file mode 100644
index 0000000000..c681596592
--- /dev/null
+++ b/qpid/doc/book/src/common/css/style.css
@@ -0,0 +1,279 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+ul {
+    list-style-type:square;
+}
+
+th { 
+    font-weight: bold;
+}
+
+.navfooter td { 
+    font-size:10pt;
+}
+
+.navheader td { 
+    font-size:10pt;
+}
+
+body {
+    margin:0;
+    background:#FFFFFF;
+    font-family:"Verdana", sans-serif;
+    font-size:10pt;
+}
+
+.container {
+    width:950px;
+    margin:0 auto;
+}
+
+body a {
+    color:#000000;
+}
+
+
+div.book {
+    margin-left:10pt;
+    margin-right:10pt;
+}
+
+div.preface {
+    margin-left:10pt;
+    margin-right:10pt;
+}
+
+div.chapter {
+    margin-left:10pt;
+    margin-right:10pt;
+}
+
+div.section {
+    margin-left:10pt;
+    margin-right:10pt;
+}
+
+div.titlepage {
+    margin-left:-10pt;
+    margin-right:-10pt;
+}
+
+.calloutlist td {
+    font-size:10pt;
+}
+
+.table-contents table {
+    border-spacing: 0px;
+}
+
+.table-contents td {
+    font-size:10pt;
+    padding-left:6px;
+    padding-right:6px;
+}
+
+div.breadcrumbs {
+    font-size:9pt;
+    margin-right:10pt;
+    padding-bottom:16px;
+}
+
+.chapter h2.title {
+    font-size:20pt;
+    color:#0c3b82;
+}
+
+.chapter .section h2.title {
+    font-size:18pt;
+    color:#0c3b82;
+}
+
+.section h2.title {
+    font-size:16pt;
+    color:#0c3b82;
+}
+
+.section h3.title {
+    font-size:14pt;
+    color:#0c3b82;
+}
+
+.section h4.title {
+    font-size:12pt;
+    color:#0c3b82;
+}
+
+.section h5.title {
+    font-size:12pt;
+    color:#0c3b82;
+}
+
+.section h6.title {
+    font-size:12pt;
+    color:#0c3b82;
+}
+
+.toc a {
+    font-size:9pt;
+}
+
+.header {
+    height:100px;
+    width:950px;
+    background:url(http://qpid.apache.org/images/header.png)
+}
+
+.logo {
+    text-align:center;
+    font-weight:600;
+    padding:0 0 0 0;
+    font-size:14px;
+    font-family:"Verdana", cursive;
+}
+
+.logo a {
+    color:#000000;
+    text-decoration:none;
+}
+
+.main_text_area {
+    margin-left:200px;
+}
+
+.main_text_area_top {
+    height:14px;
+    font-size:1px;
+}
+
+.main_text_area_bottom {
+    display:none;
+/*  height:14px;
+    margin-bottom:4px;*/
+}
+
+.main_text_area_body {
+    padding:5px 24px;
+}
+
+.main_text_area_body p {
+    text-align:justify;
+}
+
+.main_text_area br {
+    line-height:10px;
+}
+
+.main_text_area h1 {
+    font-size:28px;
+    font-weight:600;
+    margin:0 0 24px 0;
+    color:#0c3b82;
+    font-family:"Verdana", Times, serif;
+}
+
+.main_text_area h2 {
+    font-size:24px;
+    font-weight:600;
+    margin:24px 0 8px 0;
+    color:#0c3b82;
+    font-family:"Verdana",Times, serif;
+}
+
+.main_text_area ol, .main_text_area ul {
+    padding:0;
+    margin:10px 0;
+    margin-left:20px;
+}
+
+.main_text_area li {
+/*    margin-left:40px; */
+}
+
+.main_text_area, .menu_box {
+    font-size:13px;
+    line-height:17px;
+    color:#000000;
+}
+
+.main_text_area {
+    font-size:14px;
+}
+
+.main_text_area a {
+    color:#000000;
+}
+
+.main_text_area a:hover {
+    color:#000000;
+}
+
+.menu_box {
+    width:196px;
+    float:left;
+    margin-left:4px;
+}
+
+.menu_box_top {
+    background:url(http://qpid.apache.org/images/menu_top.png) no-repeat; 
+    height:14px;
+    font-size:1px;
+}
+
+.menu_box_body {
+    background:url(http://qpid.apache.org/images/menu_body.png) repeat-y; 
+    padding:5px 24px 5px 24px;
+}
+
+.menu_box_bottom {
+    background:url(http://qpid.apache.org/images/menu_bottom.png) no-repeat; 
+    height:14px;
+    font-size:1px;
+    margin-bottom:1px;
+}
+
+.menu_box h3 {
+    font-size:20px;
+    font-weight:500;
+    margin:0 0 8px 0;
+    color:#0c3b82;
+    font-family:"Verdana",Times, serif;
+}
+
+.menu_box ul {
+    margin:12px;
+    padding:0px;
+}
+
+.menu_box li {
+    list-style:square; 
+}
+
+.menu_box a {
+    color:#000000;
+    text-decoration:none;
+}
+
+.menu_box a:hover {
+    color:#000000;
+    text-decoration:underline;
+}
+
+
diff --git a/qpid/doc/book/src/AMQP-Compatibility.xml b/qpid/doc/book/src/cpp-broker/AMQP-Compatibility.xml
index e5aa98cf96..e5aa98cf96 100644
--- a/qpid/doc/book/src/AMQP-Compatibility.xml
+++ b/qpid/doc/book/src/cpp-broker/AMQP-Compatibility.xml
diff --git a/qpid/doc/book/src/AMQP-Messaging-Broker-CPP-Book.xml b/qpid/doc/book/src/cpp-broker/AMQP-Messaging-Broker-CPP-Book.xml
index 228c6a5e15..228c6a5e15 100644
--- a/qpid/doc/book/src/AMQP-Messaging-Broker-CPP-Book.xml
+++ b/qpid/doc/book/src/cpp-broker/AMQP-Messaging-Broker-CPP-Book.xml
diff --git a/qpid/doc/book/src/Active-Active-Cluster.xml b/qpid/doc/book/src/cpp-broker/Active-Active-Cluster.xml
index 28db3876e2..28db3876e2 100644
--- a/qpid/doc/book/src/Active-Active-Cluster.xml
+++ b/qpid/doc/book/src/cpp-broker/Active-Active-Cluster.xml
diff --git a/qpid/doc/book/src/Active-Passive-Cluster.xml b/qpid/doc/book/src/cpp-broker/Active-Passive-Cluster.xml
index 52748b2570..5f5823bdd2 100644
--- a/qpid/doc/book/src/Active-Passive-Cluster.xml
+++ b/qpid/doc/book/src/cpp-broker/Active-Passive-Cluster.xml
@@ -51,7 +51,7 @@ under the License.
       This approach depends on an external <firstterm>cluster resource manager</firstterm> to detect
       failures and choose the primary. <ulink
       url="https://fedorahosted.org/cluster/wiki/RGManager">Rgmanager</ulink> is supported
-      initially, but others may be supported in future future.
+      initially, but others may be supported in the future.
     </para>
     <section>
       <title>Why the new approach?</title>
@@ -162,11 +162,12 @@ under the License.
       virtual IP addresses for clients or brokers.
     </para>
   </section>
+  
   <section>
     <title>Configuring the Brokers</title>
     <para>
-      The broker must load the <filename>ha</filename> module, it is loaded by default. The
-      following broker options are available for the HA module.
+      The broker must load the <filename>ha</filename> module, it is loaded by
+      default. The following broker options are available for the HA module.
     </para>
     <table frame="all" id="ha-broker-options">
       <title>Options for High Availability Messaging Cluster</title>
@@ -194,31 +195,50 @@ under the License.
 	      <literal>--ha-brokers <replaceable>URL</replaceable></literal>
 	    </entry>
 	    <entry>
-	      URL use by brokers to connect to each other. The URL lists the addresses of
-	      all the brokers in the cluster
-	      <footnote>
-		<para>
-		  If the resource manager supports virtual IP addresses then the URL can
-		  contain just the single virtual IP.
-		</para>
-	      </footnote>
-	      in the following form:
-	      <programlisting>
-		url = ["amqp:"][ user ["/" password] "@" ] addr ("," addr)*
-		addr = tcp_addr / rmda_addr / ssl_addr / ...
-		tcp_addr = ["tcp:"] host [":" port]
-		rdma_addr = "rdma:" host [":" port]
-		ssl_addr = "ssl:" host [":" port]'
-	      </programlisting>
+	      <para>
+		The URL
+		<footnote>
+		  <para>
+		  The full format of the URL is given by this grammar:
+		  <programlisting>
+		    url = ["amqp:"][ user ["/" password] "@" ] addr ("," addr)*
+		    addr = tcp_addr / rmda_addr / ssl_addr / ...
+		    tcp_addr = ["tcp:"] host [":" port]
+		    rdma_addr = "rdma:" host [":" port]
+		    ssl_addr = "ssl:" host [":" port]'
+		  </programlisting>
+		  </para>
+		</footnote>
+		used by brokers to connect to each other. If you use a virtual IP address
+		then this is a single address, for example
+		<literal>amqp:20.0.20.200</literal>. If you do not use a virtual IP
+		address then the URL must list all the addresses of brokers in the
+		cluster, for example <literal>amqp:node1,node2,node3</literal>
+	      </para>
 	    </entry>
 	  </row>
 	  <row>
-	    <entry> <literal>--ha-public-brokers <replaceable>URL</replaceable></literal> </entry>
+	    <entry><literal>--ha-public-brokers <replaceable>URL</replaceable></literal> </entry>
 	    <entry>
-	      URL used by clients to connect to the brokers in the same format as
-	      <literal>--ha-brokers</literal> above. Use this option if you want client
-	      traffic on a different network from broker replication traffic. If this
-	      option is not set, clients will use the same URL as brokers.
+	      <para>
+		The URL used by clients to connect to the brokers. This has the same
+		format as the <literal>--ha-brokers</literal> URL above.
+	      </para>
+	      <para>
+		If this option is not set, clients will use the same URL as brokers.
+		This option allows you to put client traffic on a different network from
+		broker traffic, which is recommended.
+	      </para>
+	    </entry>
+	  </row>
+	  <row>
+	    <entry><literal>--ha-replicate</literal></entry>
+	    <foo/>
+	    <entry>
+	      <para> 
+		Specifies whether queues and exchanges are replicated by default.
+		For details see <xref linkend="creating-replicated"/>
+	      </para>
 	    </entry>
 	  </row>
 	  <row>
@@ -228,52 +248,248 @@ under the License.
 	      <para><literal>--ha-mechanism <replaceable>MECH</replaceable></literal></para>
 	    </entry>
 	    <entry>
-	      Brokers use <replaceable>USER</replaceable>,
-	      <replaceable>PASS</replaceable>, <replaceable>MECH</replaceable> to
-	      authenticate when connecting to each other.
+	      Authentication settings used by brokers to connect to each other.
 	    </entry>
 	  </row>
 	</tbody>
       </tgroup>
     </table>
     <para>
-      To configure a cluster you must set at least <literal>ha-cluster</literal> and <literal>ha-brokers</literal>.
+      To configure a HA cluster you must set at least <literal>ha-cluster</literal> and
+      <literal>ha-brokers</literal>.
     </para>
   </section>
 
   <section>
+    <title>The Cluster Resource Manager</title>
+    <para>
+      Broker fail-over is managed by a <firstterm>cluster resource
+      manager</firstterm>.  An integration with <ulink
+      url="https://fedorahosted.org/cluster/wiki/RGManager">rgmanager</ulink> is
+      provided, but it is possible to integrate with other resource managers.
+    </para>
+    <para>
+      The resource manager is responsible for starting the <command>qpidd</command> broker
+      on each node in the cluster. The resource manager <firstterm>promotes</firstterm>
+      one of the brokers to be the primary. The other brokers connect to the primary as
+      backups, using the URL provided in the <literal>ha-brokers</literal> configuration
+      option.
+    </para>
+    <para>
+      Once connected, the backup brokers synchronize their state with the
+      primary.  When a backup is synchronized, or "hot", it is ready to take
+      over if the primary fails.  Backup brokers continually receive updates
+      from the primary in order to stay synchronized.
+    </para>
+    <para>
+      If the primary fails, backup brokers go into fail-over mode. The resource
+      manager must detect the failure and promote one of the backups to be the
+      new primary.  The other backups connect to the new primary and synchronize
+      their state with it.
+    </para>
+    <para>
+      The resource manager is also responsible for protecting the cluster from
+      <firstterm>split-brain</firstterm> conditions resulting from a network partition.  A
+      network partition divide a cluster into two sub-groups which cannot see each other.
+      Usually a <firstterm>quorum</firstterm> voting algorithm is used that disables nodes
+      in the inquorate sub-group.
+    </para>
+  </section>
+
+  <section>
+    <title>Configuring <command>rgmanager</command> as resource manager</title>
+    <para>
+      This section assumes that you are already familiar with setting up and configuring
+      clustered services using <command>cman</command> and
+      <command>rgmanager</command>. It will show you how to configure an active-passive,
+      hot-standby <command>qpidd</command> HA cluster with <command>rgmanager</command>.
+    </para>
+    <para>
+      You must provide a <literal>cluster.conf</literal> file to configure
+      <command>cman</command> and <command>rgmanager</command>.  Here is
+      an example <literal>cluster.conf</literal> file for a cluster of 3 nodes named
+      node1, node2 and node3. We will go through the configuration step-by-step.
+    </para>
+    <programlisting>
+      <![CDATA[
+<?xml version="1.0"?>
+<!--
+This is an example of a cluster.conf file to run qpidd HA under rgmanager.
+This example assumes a 3 node cluster, with nodes named node1, node2 and node3.
+
+NOTE: fencing is not shown, you must configure fencing appropriately for your cluster.
+-->
+
+<cluster name="qpid-test" config_version="18">
+  <!-- The cluster has 3 nodes. Each has a unique nodid and one vote
+       for quorum. -->
+  <clusternodes>
+    <clusternode name="node1.example.com" nodeid="1"/>
+    <clusternode name="node2.example.com" nodeid="2"/>
+    <clusternode name="node3.example.com" nodeid="3"/>
+  </clusternodes>
+  <!-- Resouce Manager configuration. -->
+  <rm>
+    <!--
+	There is a failoverdomain for each node containing just that node.
+	This lets us stipulate that the qpidd service should always run on each node.
+    -->
+    <failoverdomains>
+      <failoverdomain name="node1-domain" restricted="1">
+	<failoverdomainnode name="node1.example.com"/>
+      </failoverdomain>
+      <failoverdomain name="node2-domain" restricted="1">
+	<failoverdomainnode name="node2.example.com"/>
+      </failoverdomain>
+      <failoverdomain name="node3-domain" restricted="1">
+	<failoverdomainnode name="node3.example.com"/>
+      </failoverdomain>
+    </failoverdomains>
+
+    <resources>
+      <!-- This script starts a qpidd broker acting as a backup. -->
+      <script file="/etc/init.d/qpidd" name="qpidd"/>
+
+      <!-- This script promotes the qpidd broker on this node to primary. -->
+      <script file="/etc/init.d/qpidd-primary" name="qpidd-primary"/>
+
+      <!-- This is a virtual IP address for broker replication traffic. -->
+      <ip address="20.0.10.200" monitor_link="1"/>
+
+      <!-- This is a virtual IP address on a seprate network for client traffic. -->
+      <ip address="20.0.20.200" monitor_link="1"/>
+    </resources>
+
+    <!-- There is a qpidd service on each node, it should be restarted if it fails. -->
+    <service name="node1-qpidd-service" domain="node1-domain" recovery="restart">
+      <script ref="qpidd"/>
+    </service>
+    <service name="node2-qpidd-service" domain="node2-domain" recovery="restart">
+      <script ref="qpidd"/>
+    </service>
+    <service name="node3-qpidd-service" domain="node3-domain"  recovery="restart">
+      <script ref="qpidd"/>
+    </service>
+
+    <!-- There should always be a single qpidd-primary service, it can run on any node. -->
+    <service name="qpidd-primary-service" autostart="1" exclusive="0" recovery="relocate">
+      <script ref="qpidd-primary"/>
+      <!-- The primary has the IP addresses for brokers and clients to connect. -->
+      <ip ref="20.0.10.200"/>
+      <ip ref="20.0.20.200"/>
+    </service>
+  </rm>
+</cluster>
+      ]]>
+    </programlisting>
+
+    <para>
+      There is a <literal>failoverdomain</literal> for each node containing just that
+      one node.  This lets us stipulate that the qpidd service should always run on all
+      nodes.
+    </para>
+    <para>
+      The <literal>resources</literal> section defines the <command>qpidd</command>
+      script used to start the <command>qpidd</command> service. It also defines the
+      <command>qpid-primary</command> script which does not
+      actually start a new service, rather it promotes the existing
+      <command>qpidd</command> broker to primary status.
+    </para>
+    <para>
+      The <literal>resources</literal> section also defines a pair of virtual IP
+      addresses on different sub-nets. One will be used for broker-to-broker
+      communication, the other for client-to-broker. 
+    </para>
+    <para>
+      To take advantage of the virtual IP addresses, <filename>qpidd.conf</filename>
+      should contain these  lines:
+    </para>
+    <programlisting>
+      ha-cluster=yes
+      ha-brokers=20.0.20.200
+      ha-public-brokers=20.0.10.200
+    </programlisting>
+    <para>
+      This configuration specifies that backup brokers will use 20.0.20.200
+      to connect to the primary and will advertise 20.0.10.200 to clients.
+      Clients should connect to 20.0.10.200.
+    </para>
+    <para>
+      The <literal>service</literal> section defines 3 <literal>qpidd</literal>
+      services, one for each node. Each service is in a restricted fail-over
+      domain containing just that node, and has the <literal>restart</literal>
+      recovery policy. The effect of this is that rgmanager will run
+      <command>qpidd</command> on each node, restarting if it fails.
+    </para>
+    <para>
+      There is a single <literal>qpidd-primary-service</literal> using the
+      <command>qpidd-primary</command> script which is not restricted to a
+      domain and has the <literal>relocate</literal> recovery policy. This means
+      rgmanager will start <command>qpidd-primary</command> on one of the nodes
+      when the cluster starts and will relocate it to another node if the
+      original node fails. Running the <literal>qpidd-primary</literal> script
+      does not start a new broker process, it promotes the existing broker to
+      become the primary.
+    </para>
+  </section>
+
+  <section>
+    <title>Broker Administration Tools</title>
+    <para>
+      Normally, clients are not allowed to connect to a backup broker. However management tools are
+      allowed to connect to a backup brokers. If you use these tools you <emphasis>must
+      not</emphasis> add or remove messages from replicated queues, or delete replicated queues or
+      exchanges as this will corrupt the replication process and may cause message loss.
+    </para>
+    <para>
+      <command>qpid-ha</command> allows you to view and change HA configuration settings.
+    </para>
+    <para>
+      The tools <command>qpid-config</command>, <command>qpid-route</command> and
+      <command>qpid-stat</command> will connect to a backup if you pass the flag <command>--ha-admin</command> on the
+      command line.
+    </para>
+  </section>
+  
+  <section id="ha-creating-replicated">
     <title>Creating replicated queues and exchanges</title>
     <para>
-      To create a replicated queue or exchange, pass the argument
-      <literal>qpid.replicate</literal> when creating the queue or exchange. It should
-      have one of the following three values:
+      By default, queues and exchanges are not replicated automatically. You can change
+      the default behavior by setting the <literal>ha-replicate</literal> configuration
+      option. It has one of the following values:
       <itemizedlist>
 	<listitem>
-	  <firstterm>all</firstterm>: Replicate the queue or exchange, messages and bindings.
+	  <firstterm>all</firstterm>: Replicate everything automatically: queues, exchanges, bindings and messages.
 	</listitem>
 	<listitem>
-	  <firstterm>configuration</firstterm>: Replicate the existence of the queue or
+	  <firstterm>configuration</firstterm>: Replicate the existence of queues,
 	  exchange and bindings but don't replicate messages.
 	</listitem>
 	<listitem>
-	  <firstterm>none</firstterm>: Don't replicate, this is the default.
+	  <firstterm>none</firstterm>: Don't replicate anything, this is the default.
 	</listitem>
       </itemizedlist>
     </para>
     <para>
-      Bindings are automatically replicated if the queue and exchange being bound both have
-      replication argument of <literal>all</literal> or <literal>configuration</literal>, they are
-      not replicated otherwise.
+      You can over-ride the default for a particular queue or exchange by passing the
+      argument <literal>qpid.replicate</literal> when creating the queue or exchange. It
+      takes the same values as <literal>ha-replicate</literal>
+    </para>
+    <para>
+      Bindings are automatically replicated if the queue and exchange being bound both
+      have replication <literal>all</literal> or <literal>configuration</literal>, they
+      are not replicated otherwise.
     </para>
     <para>
-      You can create replicated queues and exchanges with the <command>qpid-config</command>
-      management tool like this:
+      You can create replicated queues and exchanges with the
+      <command>qpid-config</command> management tool like this:
     </para>
     <programlisting>
       qpid-config add queue myqueue --replicate all
     </programlisting>
     <para>
-      To create replicated queues and exchanges via the client API, add a <literal>node</literal> entry to the address like this:
+      To create replicated queues and exchanges via the client API, add a
+      <literal>node</literal> entry to the address like this:
     </para>
     <programlisting>
       "myqueue;{create:always,node:{x-declare:{arguments:{'qpid.replicate':all}}}}"
@@ -439,200 +655,6 @@ under the License.
       </screen>
     </section>
   </section>
-
-  <section>
-    <title>The Cluster Resource Manager</title>
-    <para>
-      Broker fail-over is managed by a <firstterm>cluster resource
-      manager</firstterm>.  An integration with <ulink
-      url="https://fedorahosted.org/cluster/wiki/RGManager">rgmanager</ulink> is
-      provided, but it is possible to integrate with other resource managers.
-    </para>
-    <para>
-      The resource manager is responsible for starting a on each node in the
-      cluster.  The resource manager then <firstterm>promotes</firstterm> one of
-      the brokers to be the primary. The other brokers connect to the primary as
-      backups, using the URL provided in the <literal>ha-brokers</literal>
-      configuration option.
-    </para>
-    <para>
-      Once connected, the backup brokers synchronize their state with the
-      primary.  When a backup is synchronized, or "hot", it is ready to take
-      over if the primary fails.  Backup brokers continually receive updates
-      from the primary in order to stay synchronized.
-    </para>
-    <para>
-      If the primary fails, backup brokers go into fail-over mode. The resource
-      manager must detect the failure and promote one of the backups to be the
-      new primary.  The other backups connect to the new primary and synchronize
-      their state so they can be backups for it.
-    </para>
-    <para>
-      The resource manager is also responsible for protecting the cluster from
-      <firstterm>split-brain</firstterm> conditions resulting from a network partition.
-      A network partition divide a cluster into two sub-groups which cannot see each other.
-      Usually a <firstterm>quorum</firstterm> voting algorithm is used that disables
-      nodes in the inquorate sub-group.
-    </para>
-  </section>
-  <section>
-    <title>Configuring <command>rgmanager</command> as resource manager</title>
-    <para>
-      This section assumes that you are already familiar with setting up and
-      configuring clustered services using <command>cman</command> and
-      <command>rgmanager</command>. It will show you how to configure an
-      active-passive, hot-standby <command>qpidd</command> HA cluster.
-    </para>
-    <para>
-      Here is an example <literal>cluster.conf</literal> file for a cluster of 3
-      nodes named node1, node2 and node3. We will go through the configuration
-      step-by-step.
-    </para>
-    <programlisting>
-      <![CDATA[
-<?xml version="1.0"?>
-<!--
-This is an example of a cluster.conf file to run qpidd HA under rgmanager.
-This example assumes a 3 node cluster, with nodes named node1, node2 and node3.
--->
-
-<cluster name="qpid-test" config_version="18">
-  <!-- The cluster has 3 nodes. Each has a unique nodid and one vote for quorum. -->
-  <clusternodes>
-    <clusternode name="node1" nodeid="1">
-      <fence/>
-    </clusternode>
-    <clusternode name="node2" nodeid="2">
-      <fence/>
-    </clusternode>
-    <clusternode name="node3" nodeid="3">
-      <fence/>
-    </clusternode>
-  </clusternodes>
-  <!-- Resouce Manager configuration. -->
-  <rm log_level="7">		<!-- Verbose logging -->
-    <!--
-	There is a failoverdomain for each node containing just that node.
-	This lets us stipulate that the qpidd service should always run on all nodes.
-    -->
-    <failoverdomains>
-      <failoverdomain name="node1-domain" restricted="1">
-	<failoverdomainnode name="node1"/>
-      </failoverdomain>
-      <failoverdomain name="node2-domain" restricted="1">
-	<failoverdomainnode name="node2"/>
-      </failoverdomain>
-      <failoverdomain name="node3-domain" restricted="1">
-	<failoverdomainnode name="node3"/>
-      </failoverdomain>
-    </failoverdomains>
-
-    <resources>
-      <!-- This script starts a qpidd broker acting as a backup. -->
-      <script file="!!sysconfdir!!/init.d/qpidd" name="qpidd"/>
-
-      <!-- This script promotes the qpidd broker on this node to primary. -->
-      <script file="!!sysconfdir!!/init.d/qpidd-primary" name="qpidd-primary"/>
-
-      <!-- This is a virtual IP address for broker replication traffic. -->
-      <ip address="20.0.10.200" monitor_link="1"/>
-
-      <!-- This is a virtual IP address on a seprate network for client traffic. -->
-      <ip address="20.0.20.200" monitor_link="1"/>
-    </resources>
-
-    <!-- There is a qpidd service on each node, it should be restarted if it fails. -->
-    <service name="node1-qpidd-service" domain="node1-domain" recovery="restart">
-      <script ref="qpidd"/>
-    </service>
-    <service name="node2-qpidd-service" domain="node2-domain" recovery="restart">
-      <script ref="qpidd"/>
-    </service>
-    <service name="node3-qpidd-service" domain="node3-domain"  recovery="restart">
-      <script ref="qpidd"/>
-    </service>
-
-    <!-- There should always be a single qpidd-primary service, it can run on any node. -->
-    <service name="qpidd-primary-service" autostart="1" exclusive="0" recovery="relocate">
-      <script ref="qpidd-primary"/>
-      <!-- The primary has the IP addresses for brokers and clients to connect. -->
-      <ip ref="20.0.10.200"/>
-      <ip ref="20.0.20.200"/>
-    </service>
-  </rm>
-  <fencedevices/>
-  <fence_daemon clean_start="0" post_fail_delay="0" post_join_delay="3"/>
-</cluster>
-      ]]>
-    </programlisting>
-    <para>
-      There is a <literal>failoverdomain</literal> for each node containing just that
-      one node.  This lets us stipulate that the qpidd service should always run on all
-      nodes.
-    </para>
-    <para>
-      The <literal>resources</literal> section defines the usual initialization
-      script to start the <command>qpidd</command> service.
-      <command>qpidd</command>. It also defines the
-      <command>qpid-primary</command> script. Starting this script does not
-      actually start a new service, rather it promotes the existing
-      <command>qpidd</command> broker to primary status.
-    </para>
-    <para>
-      The <literal>resources</literal> section also defines a pair of virtual IP
-      addresses on different sub-nets. One will be used for broker-to-broker
-      communication, the other for client-to-broker. 
-    </para>
-    <para>
-      To take advantage of the virtual IP addresses, <filename>qpidd.conf</filename>
-      should contain these  lines:
-    </para>
-    <programlisting>
-      ha-cluster=yes
-      ha-brokers=20.0.20.200
-      ha-public-brokers=20.0.10.200
-    </programlisting>
-    <para>
-      This configuration specifies that backup brokers will use 20.0.20.200
-      to connect to the primary and will advertise 20.0.10.200 to clients.
-      Clients should connect to 20.0.10.200.
-    </para>
-    <para>
-      The <literal>service</literal> section defines 3 <command>qpidd</command>
-      services, one for each node. Each service is in a restricted fail-over
-      domain containing just that node, and has the <literal>restart</literal>
-      recovery policy. The effect of this is that rgmanager will run
-      <command>qpidd</command> on each node, restarting if it fails.
-    </para>
-    <para>
-      There is a single <literal>qpidd-primary-service</literal> running the
-      <command>qpidd-primary</command> script which is not restricted to a
-      domain and has the <literal>relocate</literal> recovery policy. This means
-      rgmanager will start <command>qpidd-primary</command> on one of the nodes
-      when the cluster starts and will relocate it to another node if the
-      original node fails. Running the <literal>qpidd-primary</literal> script
-      does not start a new broker process, it promotes the existing broker to
-      become the primary.
-    </para>
-  </section>
-
-  <section>
-    <title>Broker Administration</title>
-    <para>
-      Normally, clients are not allowed to connect to a backup broker. However management tools are
-      allowed to connect to a backup brokers. If you use these tools you <emphasis>must
-      not</emphasis> add or remove messages from replicated queues, or delete replicated queues or
-      exchanges as this will corrupt the replication process and may cause message loss.
-    </para>
-    <para>
-      <command>qpid-ha</command> allows you to view and change HA configuration settings.
-    </para>
-    <para>
-      The tools <command>qpid-config</command>, <command>qpid-route</command> and
-      <command>qpid-stat</command> will connect to a backup if you pass the flag <command>--ha-admin</command> on the
-      command line.
-    </para>
-  </section>
 </section>
 
 <!-- LocalWords:  scalability rgmanager multicast RGManager mailto LVQ qpidd IP dequeued Transactional username
diff --git a/qpid/doc/book/src/Cheat-Sheet-for-configuring-Exchange-Options.xml b/qpid/doc/book/src/cpp-broker/Cheat-Sheet-for-configuring-Exchange-Options.xml
index fccdae1b9a..fccdae1b9a 100644
--- a/qpid/doc/book/src/Cheat-Sheet-for-configuring-Exchange-Options.xml
+++ b/qpid/doc/book/src/cpp-broker/Cheat-Sheet-for-configuring-Exchange-Options.xml
diff --git a/qpid/doc/book/src/Cheat-Sheet-for-configuring-Queue-Options.xml b/qpid/doc/book/src/cpp-broker/Cheat-Sheet-for-configuring-Queue-Options.xml
index d50948e0cc..d50948e0cc 100644
--- a/qpid/doc/book/src/Cheat-Sheet-for-configuring-Queue-Options.xml
+++ b/qpid/doc/book/src/cpp-broker/Cheat-Sheet-for-configuring-Queue-Options.xml
diff --git a/qpid/doc/book/src/HA-Queue-Replication.xml b/qpid/doc/book/src/cpp-broker/HA-Queue-Replication.xml
index b7c533e4cb..b7c533e4cb 100644
--- a/qpid/doc/book/src/HA-Queue-Replication.xml
+++ b/qpid/doc/book/src/cpp-broker/HA-Queue-Replication.xml
diff --git a/qpid/doc/book/src/LVQ.xml b/qpid/doc/book/src/cpp-broker/LVQ.xml
index b57c6268be..b57c6268be 100644
--- a/qpid/doc/book/src/LVQ.xml
+++ b/qpid/doc/book/src/cpp-broker/LVQ.xml
diff --git a/qpid/doc/book/build.sh b/qpid/doc/book/src/cpp-broker/Makefile
index 249d2c7439..0266a0f54d 100755..100644
--- a/qpid/doc/book/build.sh
+++ b/qpid/doc/book/src/cpp-broker/Makefile
@@ -1,4 +1,3 @@
-#!/bin/bash -ex
 #
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
@@ -18,23 +17,4 @@
 # under the License.
 #
 
-########################################################################
-#
-#  Build a PDF from Docbook XML
-#
-#  The Makefile is cleaner ....
-#
-########################################################################
-
-rm -rf build
-mkdir -p build
-mkdir -p pdf
-
-# Assemble all documents using XInclude
-xmllint --xinclude src/Book.xml >build/qpid-book.xml
-
-# Create the .fo
-xsltproc /usr/share/sgml/docbook/xsl-stylesheets/fo/docbook.xsl build/qpid-book.xml >build/qpid-book.fo
-
-# Use Apache FOP to create the PDF
-fop build/qpid-book.fo pdf/qpid-book.pdf
+include ../Makefile.inc
diff --git a/qpid/doc/book/src/Managing-CPP-Broker.xml b/qpid/doc/book/src/cpp-broker/Managing-CPP-Broker.xml
index d2abea4296..d2abea4296 100644
--- a/qpid/doc/book/src/Managing-CPP-Broker.xml
+++ b/qpid/doc/book/src/cpp-broker/Managing-CPP-Broker.xml
diff --git a/qpid/doc/book/src/QMF-Python-Console-Tutorial.xml b/qpid/doc/book/src/cpp-broker/QMF-Python-Console-Tutorial.xml
index 2cb802671b..2cb802671b 100644
--- a/qpid/doc/book/src/QMF-Python-Console-Tutorial.xml
+++ b/qpid/doc/book/src/cpp-broker/QMF-Python-Console-Tutorial.xml
diff --git a/qpid/doc/book/src/Qpid-Interoperability-Documentation.xml b/qpid/doc/book/src/cpp-broker/Qpid-Interoperability-Documentation.xml
index 74546693df..74546693df 100644
--- a/qpid/doc/book/src/Qpid-Interoperability-Documentation.xml
+++ b/qpid/doc/book/src/cpp-broker/Qpid-Interoperability-Documentation.xml
diff --git a/qpid/doc/book/src/Qpid-Management-Framework.xml b/qpid/doc/book/src/cpp-broker/Qpid-Management-Framework.xml
index 89bfe9d95e..89bfe9d95e 100644
--- a/qpid/doc/book/src/Qpid-Management-Framework.xml
+++ b/qpid/doc/book/src/cpp-broker/Qpid-Management-Framework.xml
diff --git a/qpid/doc/book/src/Running-CPP-Broker.xml b/qpid/doc/book/src/cpp-broker/Running-CPP-Broker.xml
index 7dba5b41ce..7dba5b41ce 100644
--- a/qpid/doc/book/src/Running-CPP-Broker.xml
+++ b/qpid/doc/book/src/cpp-broker/Running-CPP-Broker.xml
diff --git a/qpid/doc/book/src/Security.xml b/qpid/doc/book/src/cpp-broker/Security.xml
index 49abfbebca..49abfbebca 100644
--- a/qpid/doc/book/src/Security.xml
+++ b/qpid/doc/book/src/cpp-broker/Security.xml
diff --git a/qpid/doc/book/src/Using-Broker-Federation.xml b/qpid/doc/book/src/cpp-broker/Using-Broker-Federation.xml
index f5fedf814c..f5fedf814c 100644
--- a/qpid/doc/book/src/Using-Broker-Federation.xml
+++ b/qpid/doc/book/src/cpp-broker/Using-Broker-Federation.xml
diff --git a/qpid/doc/book/src/Using-message-groups.xml b/qpid/doc/book/src/cpp-broker/Using-message-groups.xml
index 9b904d9f18..9b904d9f18 100644
--- a/qpid/doc/book/src/Using-message-groups.xml
+++ b/qpid/doc/book/src/cpp-broker/Using-message-groups.xml
diff --git a/qpid/doc/book/src/producer-flow-control.xml b/qpid/doc/book/src/cpp-broker/producer-flow-control.xml
index fd44f51e81..fd44f51e81 100644
--- a/qpid/doc/book/src/producer-flow-control.xml
+++ b/qpid/doc/book/src/cpp-broker/producer-flow-control.xml
diff --git a/qpid/doc/book/src/queue-state-replication.xml b/qpid/doc/book/src/cpp-broker/queue-state-replication.xml
index 3ffac805eb..3ffac805eb 100644
--- a/qpid/doc/book/src/queue-state-replication.xml
+++ b/qpid/doc/book/src/cpp-broker/queue-state-replication.xml
diff --git a/qpid/doc/book/src/css/style.css b/qpid/doc/book/src/css/style.css
deleted file mode 100644
index 2a1bee8623..0000000000
--- a/qpid/doc/book/src/css/style.css
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-ul {
-    list-style-type:square;
-}
-
-th { 
-    font-weight: bold;
-}
-
-.navfooter td { 
-    font-size:10pt;
-}
-
-.navheader td { 
-    font-size:10pt;
-}
-
-body {
-    width:950px;
-    margin-left:100px;
-    margin-top:40px;
-
-    background:#FFFFFF;
-    font-family:"Verdana", sans-serif;
-    font-size:10pt;
-}
-
-body a {
-    color:#000000;
-}
-
-
-div.book {
-    margin-left:10pt;
-    margin-right:10pt;
-}
-
-div.preface {
-    margin-left:10pt;
-    margin-right:10pt;
-}
-
-div.chapter {
-    margin-left:10pt;
-    margin-right:10pt;
-}
-
-div.section {
-    margin-left:10pt;
-    margin-right:10pt;
-}
-
-div.titlepage {
-    margin-left:-10pt;
-    margin-right:-10pt;
-}
-
-.calloutlist td {
-    font-size:10pt;
-}
-
-.table-contents table {
-    border-spacing: 0px;
-}
-
-.table-contents td {
-    font-size:10pt;
-    padding-left:6px;
-    padding-right:6px;
-}
-
-.chapter h2.title {
-    font-size:20pt;
-    color:#0c3b82;
-}
-
-.chapter .section h2.title {
-    font-size:18pt;
-    color:#0c3b82;
-}
-
-.section h2.title {
-    font-size:16pt;
-    color:#0c3b82;
-}
-
-.section h3.title {
-    font-size:14pt;
-    color:#0c3b82;
-}
-
-.section h4.title {
-    font-size:12pt;
-    color:#0c3b82;
-}
-
-.section h5.title {
-    font-size:12pt;
-    color:#0c3b82;
-}
-
-.section h6.title {
-    font-size:12pt;
-    color:#0c3b82;
-}
-
-.toc a {
-    font-size:9pt;
-}
-
diff --git a/qpid/doc/book/src/AMQP-Messaging-Broker-Java-Book.xml b/qpid/doc/book/src/java-broker/AMQP-Messaging-Broker-Java-Book.xml
index 0bb40052cd..0bb40052cd 100644
--- a/qpid/doc/book/src/AMQP-Messaging-Broker-Java-Book.xml
+++ b/qpid/doc/book/src/java-broker/AMQP-Messaging-Broker-Java-Book.xml
diff --git a/qpid/doc/book/src/Add-New-Users.xml b/qpid/doc/book/src/java-broker/Add-New-Users.xml
index dc34bcc5c9..dc34bcc5c9 100644
--- a/qpid/doc/book/src/Add-New-Users.xml
+++ b/qpid/doc/book/src/java-broker/Add-New-Users.xml
diff --git a/qpid/doc/book/src/Broker-Configuration-Guide.xml b/qpid/doc/book/src/java-broker/Broker-Configuration-Guide.xml
index 63d2748eee..28a2e9f2d3 100644
--- a/qpid/doc/book/src/Broker-Configuration-Guide.xml
+++ b/qpid/doc/book/src/java-broker/Broker-Configuration-Guide.xml
@@ -24,5 +24,5 @@
     <title>Broker Configuration Guide </title>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-            href="java/broker/configuration/Topic-Configuration.xml"/>
+            href="Topic-Configuration.xml"/>
 </section>
diff --git a/qpid/doc/book/src/Configure-ACLs.xml b/qpid/doc/book/src/java-broker/Configure-ACLs.xml
index e82f2a86d0..e82f2a86d0 100644
--- a/qpid/doc/book/src/Configure-ACLs.xml
+++ b/qpid/doc/book/src/java-broker/Configure-ACLs.xml
diff --git a/qpid/doc/book/src/Configure-Java-Qpid-to-use-a-SSL-connection.xml b/qpid/doc/book/src/java-broker/Configure-Java-Qpid-to-use-a-SSL-connection.xml
index 838b899337..838b899337 100644
--- a/qpid/doc/book/src/Configure-Java-Qpid-to-use-a-SSL-connection.xml
+++ b/qpid/doc/book/src/java-broker/Configure-Java-Qpid-to-use-a-SSL-connection.xml
diff --git a/qpid/doc/book/src/Configure-Log4j-CompositeRolling-Appender.xml b/qpid/doc/book/src/java-broker/Configure-Log4j-CompositeRolling-Appender.xml
index f52bc55399..f52bc55399 100644
--- a/qpid/doc/book/src/Configure-Log4j-CompositeRolling-Appender.xml
+++ b/qpid/doc/book/src/java-broker/Configure-Log4j-CompositeRolling-Appender.xml
diff --git a/qpid/doc/book/src/Configure-the-Broker-via-config.xml.xml b/qpid/doc/book/src/java-broker/Configure-the-Broker-via-config.xml.xml
index 6a7729acd8..6a7729acd8 100644
--- a/qpid/doc/book/src/Configure-the-Broker-via-config.xml.xml
+++ b/qpid/doc/book/src/java-broker/Configure-the-Broker-via-config.xml.xml
diff --git a/qpid/doc/book/src/Configure-the-Virtual-Hosts-via-virtualhosts.xml.xml b/qpid/doc/book/src/java-broker/Configure-the-Virtual-Hosts-via-virtualhosts.xml.xml
index 804970b923..804970b923 100644
--- a/qpid/doc/book/src/Configure-the-Virtual-Hosts-via-virtualhosts.xml.xml
+++ b/qpid/doc/book/src/java-broker/Configure-the-Virtual-Hosts-via-virtualhosts.xml.xml
diff --git a/qpid/doc/book/src/Configuring-Management-Users.xml b/qpid/doc/book/src/java-broker/Configuring-Management-Users.xml
index a2a8d46d88..a2a8d46d88 100644
--- a/qpid/doc/book/src/Configuring-Management-Users.xml
+++ b/qpid/doc/book/src/java-broker/Configuring-Management-Users.xml
diff --git a/qpid/doc/book/src/Configuring-Qpid-JMX-Management-Console.xml b/qpid/doc/book/src/java-broker/Configuring-Qpid-JMX-Management-Console.xml
index 72e4ba8969..72e4ba8969 100644
--- a/qpid/doc/book/src/Configuring-Qpid-JMX-Management-Console.xml
+++ b/qpid/doc/book/src/java-broker/Configuring-Qpid-JMX-Management-Console.xml
diff --git a/qpid/doc/book/src/Debug-using-log4j.xml b/qpid/doc/book/src/java-broker/Debug-using-log4j.xml
index 615fd9e560..615fd9e560 100644
--- a/qpid/doc/book/src/Debug-using-log4j.xml
+++ b/qpid/doc/book/src/java-broker/Debug-using-log4j.xml
diff --git a/qpid/doc/book/src/How-to-Tune-M3-Java-Broker-Performance.xml b/qpid/doc/book/src/java-broker/How-to-Tune-M3-Java-Broker-Performance.xml
index f7fffbaceb..f7fffbaceb 100644
--- a/qpid/doc/book/src/How-to-Tune-M3-Java-Broker-Performance.xml
+++ b/qpid/doc/book/src/java-broker/How-to-Tune-M3-Java-Broker-Performance.xml
diff --git a/qpid/doc/book/src/How-to-Use-SlowConsumerDisconnect.xml b/qpid/doc/book/src/java-broker/How-to-Use-SlowConsumerDisconnect.xml
index 4e0ce0f7e0..4e0ce0f7e0 100644
--- a/qpid/doc/book/src/How-to-Use-SlowConsumerDisconnect.xml
+++ b/qpid/doc/book/src/java-broker/How-to-Use-SlowConsumerDisconnect.xml
diff --git a/qpid/doc/book/src/Java-Broker-Feature-Guide.xml b/qpid/doc/book/src/java-broker/Java-Broker-Feature-Guide.xml
index bbc2a1aaf0..bbc2a1aaf0 100644
--- a/qpid/doc/book/src/Java-Broker-Feature-Guide.xml
+++ b/qpid/doc/book/src/java-broker/Java-Broker-Feature-Guide.xml
diff --git a/qpid/doc/book/src/Java-Environment-Variables.xml b/qpid/doc/book/src/java-broker/Java-Environment-Variables.xml
index 12703190f2..12703190f2 100644
--- a/qpid/doc/book/src/Java-Environment-Variables.xml
+++ b/qpid/doc/book/src/java-broker/Java-Environment-Variables.xml
diff --git a/qpid/doc/book/build-chapter.sh b/qpid/doc/book/src/java-broker/Makefile
index a2c2ad3b0c..0266a0f54d 100755..100644
--- a/qpid/doc/book/build-chapter.sh
+++ b/qpid/doc/book/src/java-broker/Makefile
@@ -1,4 +1,3 @@
-#!/bin/bash -ex
 #
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
@@ -18,27 +17,4 @@
 # under the License.
 #
 
-########################################################################
-#
-#  Build a PDF and HTML for a single chapter or section
-#
-#  Specify the name of the XML file on the command line, omitting
-#  the file extension, e.g.:
-#
-#  $ ./build-chapter.sh src/High-Level-API
-#
-########################################################################
-
-rm -rf build
-mkdir -p build
-mkdir -p pdf
-
-
-# Create the .html
-xsltproc --stringparam  section.autolabel 1 /usr/share/sgml/docbook/xsl-stylesheets/html/docbook.xsl src/$1.xml >build/$1.html
-
-# Create the .fo
-xsltproc --stringparam  section.autolabel 1 /usr/share/sgml/docbook/xsl-stylesheets/fo/docbook.xsl src/$1.xml >build/$1.fo
-
-# Use Apache FOP to create the PDF
-fop build/$1.fo pdf/$1.pdf
+include ../Makefile.inc
diff --git a/qpid/doc/book/src/Management-Console-Security.xml b/qpid/doc/book/src/java-broker/Management-Console-Security.xml
index 31f63c70da..31f63c70da 100644
--- a/qpid/doc/book/src/Management-Console-Security.xml
+++ b/qpid/doc/book/src/java-broker/Management-Console-Security.xml
diff --git a/qpid/doc/book/src/MessageStore-Tool.xml b/qpid/doc/book/src/java-broker/MessageStore-Tool.xml
index fdcb3cd560..fdcb3cd560 100644
--- a/qpid/doc/book/src/MessageStore-Tool.xml
+++ b/qpid/doc/book/src/java-broker/MessageStore-Tool.xml
diff --git a/qpid/doc/book/src/Qpid-JMX-Management-Console-FAQ.xml b/qpid/doc/book/src/java-broker/Qpid-JMX-Management-Console-FAQ.xml
index 1806ab01b1..1806ab01b1 100644
--- a/qpid/doc/book/src/Qpid-JMX-Management-Console-FAQ.xml
+++ b/qpid/doc/book/src/java-broker/Qpid-JMX-Management-Console-FAQ.xml
diff --git a/qpid/doc/book/src/Qpid-JMX-Management-Console-User-Guide.xml b/qpid/doc/book/src/java-broker/Qpid-JMX-Management-Console-User-Guide.xml
index 55e1f8e829..35bb5dfbe8 100644
--- a/qpid/doc/book/src/Qpid-JMX-Management-Console-User-Guide.xml
+++ b/qpid/doc/book/src/java-broker/Qpid-JMX-Management-Console-User-Guide.xml
@@ -178,7 +178,7 @@
             connection tree, disconnecting the selected server connection,
             and removing the server from the connection tree.
           </para><para>
-            <mediaobject><imageobject><imagedata fileref="images/jmx_console/3113098.png" format="PNG" scalefit="1"/></imageobject><textobject><phrase/></textobject><caption><para/></caption></mediaobject>
+            <mediaobject><imageobject><imagedata fileref="images/3113098.png" format="PNG" scalefit="1"/></imageobject><textobject><phrase/></textobject><caption><para/></caption></mediaobject>
             
             
             Beside these buttons is a combo for selecting the refresh
@@ -202,7 +202,7 @@
             hostname, management port, and a username and password. An
             example is shown below:
           </para><para>
-            <mediaobject><imageobject><imagedata fileref="images/jmx_console/3113099.png" format="PNG" scalefit="1"/></imageobject><textobject><phrase/></textobject><caption><para/></caption></mediaobject>
+            <mediaobject><imageobject><imagedata fileref="images/3113099.png" format="PNG" scalefit="1"/></imageobject><textobject><phrase/></textobject><caption><para/></caption></mediaobject>
           </para><para>
             
             Once all the required details are entered, pressing Connect will
@@ -214,7 +214,7 @@
             VirtualHosts present on the server, as can be seen in the figure
             below.
           </para><para>
-            <mediaobject><imageobject><imagedata fileref="images/jmx_console/3113100.png" format="PNG" scalefit="1"/></imageobject><textobject><phrase/></textobject><caption><para/></caption></mediaobject>
+            <mediaobject><imageobject><imagedata fileref="images/3113100.png" format="PNG" scalefit="1"/></imageobject><textobject><phrase/></textobject><caption><para/></caption></mediaobject>
           </para><para>
             
             If the server supports a newer management API than the console in
@@ -284,7 +284,7 @@
             the left side of the application. To open a particular MBean from
             the tree for viewing, simply select it in the tree and it will be
             opened in the main view.
-            <mediaobject><imageobject><imagedata fileref="images/jmx_console/3113101.png" format="PNG" scalefit="1"/></imageobject><textobject><phrase/></textobject><caption><para/></caption></mediaobject>
+            <mediaobject><imageobject><imagedata fileref="images/3113101.png" format="PNG" scalefit="1"/></imageobject><textobject><phrase/></textobject><caption><para/></caption></mediaobject>
           </para><para>
             As there may be vast numbers of Queues, Connections, and
             Exchanges on the server these MBeans are not automatically added
@@ -302,7 +302,7 @@
             from the tree by right clicking on them to expose a context menu
             allowing deletion.
           </para><para>
-            <mediaobject><imageobject><imagedata fileref="images/jmx_console/3113102.png" format="PNG" scalefit="1"/></imageobject><textobject><phrase/></textobject><caption><para/></caption></mediaobject>
+            <mediaobject><imageobject><imagedata fileref="images/3113102.png" format="PNG" scalefit="1"/></imageobject><textobject><phrase/></textobject><caption><para/></caption></mediaobject>
           </para><para>
             As an alternative way to open a particular MBean for viewing,
             without first adding it to the tree, you can simply double click
@@ -334,7 +334,7 @@
             without a restart, and can be performed by clicking the Execute
             button and confirming the prompt which follows.
           </para><para>
-            <mediaobject><imageobject><imagedata fileref="images/jmx_console/3113103.png" format="PNG" scalefit="1"/></imageobject><textobject><phrase/></textobject><caption><para/></caption></mediaobject>
+            <mediaobject><imageobject><imagedata fileref="images/3113103.png" format="PNG" scalefit="1"/></imageobject><textobject><phrase/></textobject><caption><para/></caption></mediaobject>
           </para>
 <!--h1--></section>
 
@@ -362,7 +362,7 @@
 
 	 <para>
             
-            <mediaobject><imageobject><imagedata fileref="images/jmx_console/3113104.png" format="PNG" scalefit="1"/></imageobject><textobject><phrase/></textobject><caption><para/></caption></mediaobject>
+            <mediaobject><imageobject><imagedata fileref="images/3113104.png" format="PNG" scalefit="1"/></imageobject><textobject><phrase/></textobject><caption><para/></caption></mediaobject>
           </para><para>
             The Runtime Options tab allows manipulation of the logging
             settings without affecting the configuration files (this means
@@ -395,7 +395,7 @@
             parent by setting it to an INHERITED level that removes any
             previously set Level of its own.
           </para><para>
-            <mediaobject><imageobject><imagedata fileref="images/jmx_console/3113105.png" format="PNG" scalefit="1"/></imageobject><textobject><phrase/></textobject><caption><para/></caption></mediaobject>
+            <mediaobject><imageobject><imagedata fileref="images/3113105.png" format="PNG" scalefit="1"/></imageobject><textobject><phrase/></textobject><caption><para/></caption></mediaobject>
           </para><para>
             In order to set one of more Loggers to a new Level, they should
             be selected in the table (or double click an individual Logger to
@@ -436,7 +436,7 @@
             Loggers and use the button to load the dialog to set the new
             Level.
           </para><para>
-            <mediaobject><imageobject><imagedata fileref="images/jmx_console/3113106.png" format="PNG" scalefit="1"/></imageobject><textobject><phrase/></textobject><caption><para/></caption></mediaobject>
+            <mediaobject><imageobject><imagedata fileref="images/3113106.png" format="PNG" scalefit="1"/></imageobject><textobject><phrase/></textobject><caption><para/></caption></mediaobject>
           </para><para>
             One issue to note of when reloading the configuration file
             settings, either automatically using LogWatch or manually, is
@@ -469,7 +469,7 @@
 
 	 <para>
             
-            <mediaobject><imageobject><imagedata fileref="images/jmx_console/3113107.png" format="PNG" scalefit="1"/></imageobject><textobject><phrase/></textobject><caption><para/></caption></mediaobject>
+            <mediaobject><imageobject><imagedata fileref="images/3113107.png" format="PNG" scalefit="1"/></imageobject><textobject><phrase/></textobject><caption><para/></caption></mediaobject>
           </para><para>
             The ServerInformation MBean currently only conveys various pieces
             of version information to allow precise identification of the
@@ -490,13 +490,13 @@
             allows manipulation of existing user accounts and creation of new
             user accounts.
           </para><para>
-            <mediaobject><imageobject><imagedata fileref="images/jmx_console/3113108.png" format="PNG" scalefit="1"/></imageobject><textobject><phrase/></textobject><caption><para/></caption></mediaobject>
+            <mediaobject><imageobject><imagedata fileref="images/3113108.png" format="PNG" scalefit="1"/></imageobject><textobject><phrase/></textobject><caption><para/></caption></mediaobject>
           </para><para>
             
             To add a new user, press the <emphasis>Add New User</emphasis> button, which
             will load the dialog shown below.
           </para><para>
-            <mediaobject><imageobject><imagedata fileref="images/jmx_console/3113109.png" format="PNG" scalefit="1"/></imageobject><textobject><phrase/></textobject><caption><para/></caption></mediaobject>
+            <mediaobject><imageobject><imagedata fileref="images/3113109.png" format="PNG" scalefit="1"/></imageobject><textobject><phrase/></textobject><caption><para/></caption></mediaobject>
           </para><para>
             Here you may enter the new users Username, Password, and select
             their JMX Management Rights. This controls whether or not they
@@ -561,7 +561,7 @@
             The console will prompt for confirmation before undertaking the
             operation.
           </para><para>
-            <mediaobject><imageobject><imagedata fileref="images/jmx_console/3113110.png" format="PNG" scalefit="1"/></imageobject><textobject><phrase/></textobject><caption><para/></caption></mediaobject>
+            <mediaobject><imageobject><imagedata fileref="images/3113110.png" format="PNG" scalefit="1"/></imageobject><textobject><phrase/></textobject><caption><para/></caption></mediaobject>
           </para><para>
             Clicking the <emphasis>Create</emphasis> button in the Exchange section will
             open a dialog allowing specification of the Name, Type, and
@@ -602,7 +602,7 @@
             MBeans in that VirtualHost. An example of this can be seen in the
             figure below.
           </para><para>
-            <mediaobject><imageobject><imagedata fileref="images/jmx_console/3113111.png" format="PNG" scalefit="1"/></imageobject><textobject><phrase/></textobject><caption><para/></caption></mediaobject>
+            <mediaobject><imageobject><imagedata fileref="images/3113111.png" format="PNG" scalefit="1"/></imageobject><textobject><phrase/></textobject><caption><para/></caption></mediaobject>
           </para><para>
             All received Notifications will be displayed until such time as
             the user removes them, either in this aggregated view, or in the
@@ -638,7 +638,7 @@
             Attributes</emphasis> button at the bottom right corner of the
             table)<emphasis>.</emphasis>
           </para><para>
-            <mediaobject><imageobject><imagedata fileref="images/jmx_console/3113112.png" format="PNG" scalefit="1"/></imageobject><textobject><phrase/></textobject><caption><para/></caption></mediaobject>
+            <mediaobject><imageobject><imagedata fileref="images/3113112.png" format="PNG" scalefit="1"/></imageobject><textobject><phrase/></textobject><caption><para/></caption></mediaobject>
           </para><para>
             Upon opening a Queue MBean, the Attributes tab is displayed, as
             shown below. This allows viewing the value all attributes,
@@ -647,7 +647,7 @@
             their purpose, and graphing certain numerical attribute values as
             they change over time.
           </para><para>
-            <mediaobject><imageobject><imagedata fileref="images/jmx_console/3113113.png" format="PNG" scalefit="1"/></imageobject><textobject><phrase/></textobject><caption><para/></caption></mediaobject>
+            <mediaobject><imageobject><imagedata fileref="images/3113113.png" format="PNG" scalefit="1"/></imageobject><textobject><phrase/></textobject><caption><para/></caption></mediaobject>
           </para><para>
             The next tab contains the operations that can be performed on the
             queue. The main table serves as a means of viewing the messages
@@ -664,7 +664,7 @@
             information to show this (unless only a single message position
             is requested).
           </para><para>
-            <mediaobject><imageobject><imagedata fileref="images/jmx_console/3113114.png" format="PNG" scalefit="1"/></imageobject><textobject><phrase/></textobject><caption><para/></caption></mediaobject>
+            <mediaobject><imageobject><imagedata fileref="images/3113114.png" format="PNG" scalefit="1"/></imageobject><textobject><phrase/></textobject><caption><para/></caption></mediaobject>
           </para><para>
             Upon selecting a message in the table, its header properties and
             redelivery status are updated in the area below the table. Double
@@ -700,7 +700,7 @@
             fashion as described for Queues, again showing an Attributes tab
             initially, with the Operations tab next:
           </para><para>
-            <mediaobject><imageobject><imagedata fileref="images/jmx_console/3113115.png" format="PNG" scalefit="1"/></imageobject><textobject><phrase/></textobject><caption><para/></caption></mediaobject>
+            <mediaobject><imageobject><imagedata fileref="images/3113115.png" format="PNG" scalefit="1"/></imageobject><textobject><phrase/></textobject><caption><para/></caption></mediaobject>
           </para><para>
             Of the four default Exchange Types <emphasis>(direct, fanout, headers,
             and topic)</emphasis> all but <emphasis>headers</emphasis> have their bindings
@@ -711,12 +711,12 @@
             button opens a dialog allowing association of an existing queue
             with the entered Binding.
           </para><para>
-            <mediaobject><imageobject><imagedata fileref="images/jmx_console/3113116.png" format="PNG" scalefit="1"/></imageobject><textobject><phrase/></textobject><caption><para/></caption></mediaobject>
+            <mediaobject><imageobject><imagedata fileref="images/3113116.png" format="PNG" scalefit="1"/></imageobject><textobject><phrase/></textobject><caption><para/></caption></mediaobject>
           </para><para>
             The <emphasis>headers</emphasis> Exchange type (default instantiation
             <emphasis>amq.match or amq.headers</emphasis>) is presented as below:
           </para><para>
-            <mediaobject><imageobject><imagedata fileref="images/jmx_console/3113117.png" format="PNG" scalefit="1"/></imageobject><textobject><phrase/></textobject><caption><para/></caption></mediaobject>
+            <mediaobject><imageobject><imagedata fileref="images/3113117.png" format="PNG" scalefit="1"/></imageobject><textobject><phrase/></textobject><caption><para/></caption></mediaobject>
           </para><para>
             In the previous figure, the left table indicates the binding
             number, and the Queue associated with the binding. Selecting one
@@ -724,7 +724,7 @@
             the header values that control when the binding matches an
             incoming message.
           </para><para>
-            <mediaobject><imageobject><imagedata fileref="images/jmx_console/3113118.png" format="PNG" scalefit="1"/></imageobject><textobject><phrase/></textobject><caption><para/></caption></mediaobject>
+            <mediaobject><imageobject><imagedata fileref="images/3113118.png" format="PNG" scalefit="1"/></imageobject><textobject><phrase/></textobject><caption><para/></caption></mediaobject>
           </para><para>
             Pressing the <emphasis>Create</emphasis> button when managing a
             <emphasis>headers</emphasis> Exchange opens a dialog allowing creation of a
@@ -760,7 +760,7 @@
             Notifications. The Operations tab can be seen in the figure
             below.
           </para><para>
-            <mediaobject><imageobject><imagedata fileref="images/jmx_console/3113119.png" format="PNG" scalefit="1"/></imageobject><textobject><phrase/></textobject><caption><para/></caption></mediaobject>
+            <mediaobject><imageobject><imagedata fileref="images/3113119.png" format="PNG" scalefit="1"/></imageobject><textobject><phrase/></textobject><caption><para/></caption></mediaobject>
             The main table shows the properties of all the Channels that are
             present on the Connection, including whether they are
             <emphasis>Transactional</emphasis>, the <emphasis>Number of Unacked Messages</emphasis>
diff --git a/qpid/doc/book/src/Qpid-JMX-Management-Console.xml b/qpid/doc/book/src/java-broker/Qpid-JMX-Management-Console.xml
index fb46f4a01a..fb46f4a01a 100644
--- a/qpid/doc/book/src/Qpid-JMX-Management-Console.xml
+++ b/qpid/doc/book/src/java-broker/Qpid-JMX-Management-Console.xml
diff --git a/qpid/doc/book/src/Qpid-Java-Broker-Management-CLI.xml b/qpid/doc/book/src/java-broker/Qpid-Java-Broker-Management-CLI.xml
index 84c4b7b7a4..84c4b7b7a4 100644
--- a/qpid/doc/book/src/Qpid-Java-Broker-Management-CLI.xml
+++ b/qpid/doc/book/src/java-broker/Qpid-Java-Broker-Management-CLI.xml
diff --git a/qpid/doc/book/src/Qpid-Java-Build-How-To.xml b/qpid/doc/book/src/java-broker/Qpid-Java-Build-How-To.xml
index 9f3625760a..9f3625760a 100644
--- a/qpid/doc/book/src/Qpid-Java-Build-How-To.xml
+++ b/qpid/doc/book/src/java-broker/Qpid-Java-Build-How-To.xml
diff --git a/qpid/doc/book/src/Qpid-Java-FAQ.xml b/qpid/doc/book/src/java-broker/Qpid-Java-FAQ.xml
index 845c343350..845c343350 100644
--- a/qpid/doc/book/src/Qpid-Java-FAQ.xml
+++ b/qpid/doc/book/src/java-broker/Qpid-Java-FAQ.xml
diff --git a/qpid/doc/book/src/Qpid-Management-Features.xml b/qpid/doc/book/src/java-broker/Qpid-Management-Features.xml
index c90d7e97c6..c90d7e97c6 100644
--- a/qpid/doc/book/src/Qpid-Management-Features.xml
+++ b/qpid/doc/book/src/java-broker/Qpid-Management-Features.xml
diff --git a/qpid/doc/book/src/Qpid-Troubleshooting-Guide.xml b/qpid/doc/book/src/java-broker/Qpid-Troubleshooting-Guide.xml
index 0920f18798..0920f18798 100644
--- a/qpid/doc/book/src/Qpid-Troubleshooting-Guide.xml
+++ b/qpid/doc/book/src/java-broker/Qpid-Troubleshooting-Guide.xml
diff --git a/qpid/doc/book/src/java/broker/configuration/Topic-Configuration.xml b/qpid/doc/book/src/java-broker/Topic-Configuration.xml
index 1f73bbd7a4..1f73bbd7a4 100644
--- a/qpid/doc/book/src/java/broker/configuration/Topic-Configuration.xml
+++ b/qpid/doc/book/src/java-broker/Topic-Configuration.xml
diff --git a/qpid/doc/book/src/Use-Priority-Queues.xml b/qpid/doc/book/src/java-broker/Use-Priority-Queues.xml
index 466d958d43..466d958d43 100644
--- a/qpid/doc/book/src/Use-Priority-Queues.xml
+++ b/qpid/doc/book/src/java-broker/Use-Priority-Queues.xml
diff --git a/qpid/doc/book/src/images/jmx_console/3113098.png b/qpid/doc/book/src/java-broker/images/3113098.png
index 7de85030c6..7de85030c6 100644
--- a/qpid/doc/book/src/images/jmx_console/3113098.png
+++ b/qpid/doc/book/src/java-broker/images/3113098.png
diff --git a/qpid/doc/book/src/images/jmx_console/3113099.png b/qpid/doc/book/src/java-broker/images/3113099.png
index fb6fc65d73..fb6fc65d73 100644
--- a/qpid/doc/book/src/images/jmx_console/3113099.png
+++ b/qpid/doc/book/src/java-broker/images/3113099.png
diff --git a/qpid/doc/book/src/images/jmx_console/3113100.png b/qpid/doc/book/src/java-broker/images/3113100.png
index a7d727b854..a7d727b854 100644
--- a/qpid/doc/book/src/images/jmx_console/3113100.png
+++ b/qpid/doc/book/src/java-broker/images/3113100.png
diff --git a/qpid/doc/book/src/images/jmx_console/3113101.png b/qpid/doc/book/src/java-broker/images/3113101.png
index 30731277c2..30731277c2 100644
--- a/qpid/doc/book/src/images/jmx_console/3113101.png
+++ b/qpid/doc/book/src/java-broker/images/3113101.png
diff --git a/qpid/doc/book/src/images/jmx_console/3113102.png b/qpid/doc/book/src/java-broker/images/3113102.png
index f150a21b10..f150a21b10 100644
--- a/qpid/doc/book/src/images/jmx_console/3113102.png
+++ b/qpid/doc/book/src/java-broker/images/3113102.png
diff --git a/qpid/doc/book/src/images/jmx_console/3113103.png b/qpid/doc/book/src/java-broker/images/3113103.png
index a91efb4306..a91efb4306 100644
--- a/qpid/doc/book/src/images/jmx_console/3113103.png
+++ b/qpid/doc/book/src/java-broker/images/3113103.png
diff --git a/qpid/doc/book/src/images/jmx_console/3113104.png b/qpid/doc/book/src/java-broker/images/3113104.png
index c5ef12d8b1..c5ef12d8b1 100644
--- a/qpid/doc/book/src/images/jmx_console/3113104.png
+++ b/qpid/doc/book/src/java-broker/images/3113104.png
diff --git a/qpid/doc/book/src/images/jmx_console/3113105.png b/qpid/doc/book/src/java-broker/images/3113105.png
index b155f9d9a1..b155f9d9a1 100644
--- a/qpid/doc/book/src/images/jmx_console/3113105.png
+++ b/qpid/doc/book/src/java-broker/images/3113105.png
diff --git a/qpid/doc/book/src/images/jmx_console/3113106.png b/qpid/doc/book/src/java-broker/images/3113106.png
index 22bcdd084e..22bcdd084e 100644
--- a/qpid/doc/book/src/images/jmx_console/3113106.png
+++ b/qpid/doc/book/src/java-broker/images/3113106.png
diff --git a/qpid/doc/book/src/images/jmx_console/3113107.png b/qpid/doc/book/src/java-broker/images/3113107.png
index cf5dd97e89..cf5dd97e89 100644
--- a/qpid/doc/book/src/images/jmx_console/3113107.png
+++ b/qpid/doc/book/src/java-broker/images/3113107.png
diff --git a/qpid/doc/book/src/images/jmx_console/3113108.png b/qpid/doc/book/src/java-broker/images/3113108.png
index c0e5eafde2..c0e5eafde2 100644
--- a/qpid/doc/book/src/images/jmx_console/3113108.png
+++ b/qpid/doc/book/src/java-broker/images/3113108.png
diff --git a/qpid/doc/book/src/images/jmx_console/3113109.png b/qpid/doc/book/src/java-broker/images/3113109.png
index 139d81d849..139d81d849 100644
--- a/qpid/doc/book/src/images/jmx_console/3113109.png
+++ b/qpid/doc/book/src/java-broker/images/3113109.png
diff --git a/qpid/doc/book/src/images/jmx_console/3113110.png b/qpid/doc/book/src/java-broker/images/3113110.png
index 2207f15cd7..2207f15cd7 100644
--- a/qpid/doc/book/src/images/jmx_console/3113110.png
+++ b/qpid/doc/book/src/java-broker/images/3113110.png
diff --git a/qpid/doc/book/src/images/jmx_console/3113111.png b/qpid/doc/book/src/java-broker/images/3113111.png
index 5737f41caf..5737f41caf 100644
--- a/qpid/doc/book/src/images/jmx_console/3113111.png
+++ b/qpid/doc/book/src/java-broker/images/3113111.png
diff --git a/qpid/doc/book/src/images/jmx_console/3113112.png b/qpid/doc/book/src/java-broker/images/3113112.png
index d9ee094ab4..d9ee094ab4 100644
--- a/qpid/doc/book/src/images/jmx_console/3113112.png
+++ b/qpid/doc/book/src/java-broker/images/3113112.png
diff --git a/qpid/doc/book/src/images/jmx_console/3113113.png b/qpid/doc/book/src/java-broker/images/3113113.png
index e80812f83c..e80812f83c 100644
--- a/qpid/doc/book/src/images/jmx_console/3113113.png
+++ b/qpid/doc/book/src/java-broker/images/3113113.png
diff --git a/qpid/doc/book/src/images/jmx_console/3113114.png b/qpid/doc/book/src/java-broker/images/3113114.png
index b237181150..b237181150 100644
--- a/qpid/doc/book/src/images/jmx_console/3113114.png
+++ b/qpid/doc/book/src/java-broker/images/3113114.png
diff --git a/qpid/doc/book/src/images/jmx_console/3113115.png b/qpid/doc/book/src/java-broker/images/3113115.png
index 84ad42b567..84ad42b567 100644
--- a/qpid/doc/book/src/images/jmx_console/3113115.png
+++ b/qpid/doc/book/src/java-broker/images/3113115.png
diff --git a/qpid/doc/book/src/images/jmx_console/3113116.png b/qpid/doc/book/src/java-broker/images/3113116.png
index 18b979792f..18b979792f 100644
--- a/qpid/doc/book/src/images/jmx_console/3113116.png
+++ b/qpid/doc/book/src/java-broker/images/3113116.png
diff --git a/qpid/doc/book/src/images/jmx_console/3113117.png b/qpid/doc/book/src/java-broker/images/3113117.png
index 3b33ef67ac..3b33ef67ac 100644
--- a/qpid/doc/book/src/images/jmx_console/3113117.png
+++ b/qpid/doc/book/src/java-broker/images/3113117.png
diff --git a/qpid/doc/book/src/images/jmx_console/3113118.png b/qpid/doc/book/src/java-broker/images/3113118.png
index 60451f88cf..60451f88cf 100644
--- a/qpid/doc/book/src/images/jmx_console/3113118.png
+++ b/qpid/doc/book/src/java-broker/images/3113118.png
diff --git a/qpid/doc/book/src/images/jmx_console/3113119.png b/qpid/doc/book/src/java-broker/images/3113119.png
index 16ded074bd..16ded074bd 100644
--- a/qpid/doc/book/src/images/jmx_console/3113119.png
+++ b/qpid/doc/book/src/java-broker/images/3113119.png
diff --git a/qpid/doc/book/src/ACL.xml b/qpid/doc/book/src/old/ACL.xml
index ceb7cecb23..ceb7cecb23 100644
--- a/qpid/doc/book/src/ACL.xml
+++ b/qpid/doc/book/src/old/ACL.xml
diff --git a/qpid/doc/book/src/AMQP-.NET-Messaging-Client.xml b/qpid/doc/book/src/old/AMQP-.NET-Messaging-Client.xml
index 1d4001942b..1d4001942b 100644
--- a/qpid/doc/book/src/AMQP-.NET-Messaging-Client.xml
+++ b/qpid/doc/book/src/old/AMQP-.NET-Messaging-Client.xml
diff --git a/qpid/doc/book/src/AMQP-C++-Messaging-Client.xml b/qpid/doc/book/src/old/AMQP-C++-Messaging-Client.xml
index 73a2cd6c0b..73a2cd6c0b 100644
--- a/qpid/doc/book/src/AMQP-C++-Messaging-Client.xml
+++ b/qpid/doc/book/src/old/AMQP-C++-Messaging-Client.xml
diff --git a/qpid/doc/book/src/AMQP-Java-JMS-Messaging-Client.xml b/qpid/doc/book/src/old/AMQP-Java-JMS-Messaging-Client.xml
index 8c14d67e14..8c14d67e14 100644
--- a/qpid/doc/book/src/AMQP-Java-JMS-Messaging-Client.xml
+++ b/qpid/doc/book/src/old/AMQP-Java-JMS-Messaging-Client.xml
diff --git a/qpid/doc/book/src/AMQP-Messaging-Broker-CPP.xml b/qpid/doc/book/src/old/AMQP-Messaging-Broker-CPP.xml
index b4e0deb13d..b4e0deb13d 100644
--- a/qpid/doc/book/src/AMQP-Messaging-Broker-CPP.xml
+++ b/qpid/doc/book/src/old/AMQP-Messaging-Broker-CPP.xml
diff --git a/qpid/doc/book/src/AMQP-Python-Messaging-Client.xml b/qpid/doc/book/src/old/AMQP-Python-Messaging-Client.xml
index 15baf214ec..15baf214ec 100644
--- a/qpid/doc/book/src/AMQP-Python-Messaging-Client.xml
+++ b/qpid/doc/book/src/old/AMQP-Python-Messaging-Client.xml
diff --git a/qpid/doc/book/src/AMQP-Ruby-Messaging-Client.xml b/qpid/doc/book/src/old/AMQP-Ruby-Messaging-Client.xml
index 45318c0beb..45318c0beb 100644
--- a/qpid/doc/book/src/AMQP-Ruby-Messaging-Client.xml
+++ b/qpid/doc/book/src/old/AMQP-Ruby-Messaging-Client.xml
diff --git a/qpid/doc/book/src/AMQP.xml b/qpid/doc/book/src/old/AMQP.xml
index 1a609649bb..1a609649bb 100644
--- a/qpid/doc/book/src/AMQP.xml
+++ b/qpid/doc/book/src/old/AMQP.xml
diff --git a/qpid/doc/book/src/Binding-URL-Format.xml b/qpid/doc/book/src/old/Binding-URL-Format.xml
index 3d938b740a..3d938b740a 100644
--- a/qpid/doc/book/src/Binding-URL-Format.xml
+++ b/qpid/doc/book/src/old/Binding-URL-Format.xml
diff --git a/qpid/doc/book/src/Book-Info.xml b/qpid/doc/book/src/old/Book-Info.xml
index 2e02fbe8ea..2e02fbe8ea 100644
--- a/qpid/doc/book/src/Book-Info.xml
+++ b/qpid/doc/book/src/old/Book-Info.xml
diff --git a/qpid/doc/book/src/Book.xml b/qpid/doc/book/src/old/Book.xml
index ee69532152..ee69532152 100644
--- a/qpid/doc/book/src/Book.xml
+++ b/qpid/doc/book/src/old/Book.xml
diff --git a/qpid/doc/book/src/Broker-CPP.xml b/qpid/doc/book/src/old/Broker-CPP.xml
index 99584be23d..99584be23d 100644
--- a/qpid/doc/book/src/Broker-CPP.xml
+++ b/qpid/doc/book/src/old/Broker-CPP.xml
diff --git a/qpid/doc/book/src/Broker-Java.xml b/qpid/doc/book/src/old/Broker-Java.xml
index f8ce89b185..f8ce89b185 100644
--- a/qpid/doc/book/src/Broker-Java.xml
+++ b/qpid/doc/book/src/old/Broker-Java.xml
diff --git a/qpid/doc/book/src/Clients.xml b/qpid/doc/book/src/old/Clients.xml
index 3dc2d38e86..3dc2d38e86 100644
--- a/qpid/doc/book/src/Clients.xml
+++ b/qpid/doc/book/src/old/Clients.xml
diff --git a/qpid/doc/book/src/Connection-URL-Format.xml b/qpid/doc/book/src/old/Connection-URL-Format.xml
index cb772487cd..cb772487cd 100644
--- a/qpid/doc/book/src/Connection-URL-Format.xml
+++ b/qpid/doc/book/src/old/Connection-URL-Format.xml
diff --git a/qpid/doc/book/src/Download.xml b/qpid/doc/book/src/old/Download.xml
index 7bc08143ac..7bc08143ac 100644
--- a/qpid/doc/book/src/Download.xml
+++ b/qpid/doc/book/src/old/Download.xml
diff --git a/qpid/doc/book/src/Excel-AddIn.xml b/qpid/doc/book/src/old/Excel-AddIn.xml
index e38f620bd8..e38f620bd8 100644
--- a/qpid/doc/book/src/Excel-AddIn.xml
+++ b/qpid/doc/book/src/old/Excel-AddIn.xml
diff --git a/qpid/doc/book/src/FAQ.xml b/qpid/doc/book/src/old/FAQ.xml
index 5647f18f69..5647f18f69 100644
--- a/qpid/doc/book/src/FAQ.xml
+++ b/qpid/doc/book/src/old/FAQ.xml
diff --git a/qpid/doc/book/src/Getting-Started.xml b/qpid/doc/book/src/old/Getting-Started.xml
index 216a52170e..216a52170e 100644
--- a/qpid/doc/book/src/Getting-Started.xml
+++ b/qpid/doc/book/src/old/Getting-Started.xml
diff --git a/qpid/doc/book/src/How-to-Use-JNDI.xml b/qpid/doc/book/src/old/How-to-Use-JNDI.xml
index 74506dde0f..0d6315c2a3 100644
--- a/qpid/doc/book/src/How-to-Use-JNDI.xml
+++ b/qpid/doc/book/src/old/How-to-Use-JNDI.xml
@@ -167,7 +167,7 @@ ctx.close();
 
 	  <section>
 	    <title>Using Qpid with Other JNDI Providers</title>
-	    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Using Qpid with other JNDI Providers.xml"/>
+	    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Using-Qpid-with-other-JNDI-Providers.xml"/>
 	  </section>
 <!--h2-->
 	  </section>
diff --git a/qpid/doc/book/src/InfoPlugin.xml b/qpid/doc/book/src/old/InfoPlugin.xml
index aebcd08c02..aebcd08c02 100644
--- a/qpid/doc/book/src/InfoPlugin.xml
+++ b/qpid/doc/book/src/old/InfoPlugin.xml
diff --git a/qpid/doc/book/src/Introduction.xml b/qpid/doc/book/src/old/Introduction.xml
index 8f92c207cf..8f92c207cf 100644
--- a/qpid/doc/book/src/Introduction.xml
+++ b/qpid/doc/book/src/old/Introduction.xml
diff --git a/qpid/doc/book/src/Java-Broker-StatusLogMessages.xml b/qpid/doc/book/src/old/Java-Broker-StatusLogMessages.xml
index 98f876e532..98f876e532 100644
--- a/qpid/doc/book/src/Java-Broker-StatusLogMessages.xml
+++ b/qpid/doc/book/src/old/Java-Broker-StatusLogMessages.xml
diff --git a/qpid/doc/book/src/Java-JMS-Selector-Syntax.xml b/qpid/doc/book/src/old/Java-JMS-Selector-Syntax.xml
index 870e277b66..870e277b66 100644
--- a/qpid/doc/book/src/Java-JMS-Selector-Syntax.xml
+++ b/qpid/doc/book/src/old/Java-JMS-Selector-Syntax.xml
diff --git a/qpid/doc/book/src/Management-Design-notes.xml b/qpid/doc/book/src/old/Management-Design-notes.xml
index 76f0dac926..76f0dac926 100644
--- a/qpid/doc/book/src/Management-Design-notes.xml
+++ b/qpid/doc/book/src/old/Management-Design-notes.xml
diff --git a/qpid/doc/book/src/NET-User-Guide.xml b/qpid/doc/book/src/old/NET-User-Guide.xml
index 7bfa20b8c8..7bfa20b8c8 100644
--- a/qpid/doc/book/src/NET-User-Guide.xml
+++ b/qpid/doc/book/src/old/NET-User-Guide.xml
diff --git a/qpid/doc/book/src/PythonBrokerTest.xml b/qpid/doc/book/src/old/PythonBrokerTest.xml
index ae7edade40..ae7edade40 100644
--- a/qpid/doc/book/src/PythonBrokerTest.xml
+++ b/qpid/doc/book/src/old/PythonBrokerTest.xml
diff --git a/qpid/doc/book/src/QMan-Qpid-Management-bridge.xml b/qpid/doc/book/src/old/QMan-Qpid-Management-bridge.xml
index f2c366dcbb..f2c366dcbb 100644
--- a/qpid/doc/book/src/QMan-Qpid-Management-bridge.xml
+++ b/qpid/doc/book/src/old/QMan-Qpid-Management-bridge.xml
diff --git a/qpid/doc/book/src/Qpid-ACLs.xml b/qpid/doc/book/src/old/Qpid-ACLs.xml
index a2b64061c3..a2b64061c3 100644
--- a/qpid/doc/book/src/Qpid-ACLs.xml
+++ b/qpid/doc/book/src/old/Qpid-ACLs.xml
diff --git a/qpid/doc/book/src/Qpid-Book.xml b/qpid/doc/book/src/old/Qpid-Book.xml
index ee69532152..ee69532152 100644
--- a/qpid/doc/book/src/Qpid-Book.xml
+++ b/qpid/doc/book/src/old/Qpid-Book.xml
diff --git a/qpid/doc/book/src/Qpid-Compatibility-And-Interoperability-Book.xml b/qpid/doc/book/src/old/Qpid-Compatibility-And-Interoperability-Book.xml
index f382f390c7..f382f390c7 100644
--- a/qpid/doc/book/src/Qpid-Compatibility-And-Interoperability-Book.xml
+++ b/qpid/doc/book/src/old/Qpid-Compatibility-And-Interoperability-Book.xml
diff --git a/qpid/doc/book/src/SASL-Compatibility.xml b/qpid/doc/book/src/old/SASL-Compatibility.xml
index ad223792b5..ad223792b5 100644
--- a/qpid/doc/book/src/SASL-Compatibility.xml
+++ b/qpid/doc/book/src/old/SASL-Compatibility.xml
diff --git a/qpid/doc/book/src/SSL.xml b/qpid/doc/book/src/old/SSL.xml
index a9a5cb953a..a9a5cb953a 100644
--- a/qpid/doc/book/src/SSL.xml
+++ b/qpid/doc/book/src/old/SSL.xml
diff --git a/qpid/doc/book/src/Security-Plugins.xml b/qpid/doc/book/src/old/Security-Plugins.xml
index bf5cb726b3..bf5cb726b3 100644
--- a/qpid/doc/book/src/Security-Plugins.xml
+++ b/qpid/doc/book/src/old/Security-Plugins.xml
diff --git a/qpid/doc/book/src/System-Properties.xml b/qpid/doc/book/src/old/System-Properties.xml
index 40b823185f..40b823185f 100644
--- a/qpid/doc/book/src/System-Properties.xml
+++ b/qpid/doc/book/src/old/System-Properties.xml
diff --git a/qpid/doc/book/src/Using-Qpid-with-other-JNDI-Providers.xml b/qpid/doc/book/src/old/Using-Qpid-with-other-JNDI-Providers.xml
index 2bd7d761ef..2bd7d761ef 100644
--- a/qpid/doc/book/src/Using-Qpid-with-other-JNDI-Providers.xml
+++ b/qpid/doc/book/src/old/Using-Qpid-with-other-JNDI-Providers.xml
diff --git a/qpid/doc/book/src/WCF.xml b/qpid/doc/book/src/old/WCF.xml
index aaf54463db..aaf54463db 100644
--- a/qpid/doc/book/src/WCF.xml
+++ b/qpid/doc/book/src/old/WCF.xml
diff --git a/qpid/doc/book/src/schemas.xml b/qpid/doc/book/src/old/schemas.xml
index 6102e65f07..6102e65f07 100644
--- a/qpid/doc/book/src/schemas.xml
+++ b/qpid/doc/book/src/old/schemas.xml
diff --git a/qpid/doc/book/src/programming/Makefile b/qpid/doc/book/src/programming/Makefile
new file mode 100644
index 0000000000..0266a0f54d
--- /dev/null
+++ b/qpid/doc/book/src/programming/Makefile
@@ -0,0 +1,20 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+include ../Makefile.inc
diff --git a/qpid/doc/book/src/Message-Groups-Guide.xml b/qpid/doc/book/src/programming/Message-Groups-Guide.xml
index 3e5c549ff9..3e5c549ff9 100644
--- a/qpid/doc/book/src/Message-Groups-Guide.xml
+++ b/qpid/doc/book/src/programming/Message-Groups-Guide.xml
diff --git a/qpid/doc/book/src/Programming-In-Apache-Qpid.xml b/qpid/doc/book/src/programming/Programming-In-Apache-Qpid-Book.xml
index 3052e2acc1..3052e2acc1 100644
--- a/qpid/doc/book/src/Programming-In-Apache-Qpid.xml
+++ b/qpid/doc/book/src/programming/Programming-In-Apache-Qpid-Book.xml
diff --git a/qpid/doc/book/src/QmfBook.xml b/qpid/doc/book/src/qmf/QmfBook.xml
index 64a6545fb5..64a6545fb5 100644
--- a/qpid/doc/book/src/QmfBook.xml
+++ b/qpid/doc/book/src/qmf/QmfBook.xml
diff --git a/qpid/doc/book/src/QmfIntroduction.xml b/qpid/doc/book/src/qmf/QmfIntroduction.xml
index db7b8949a5..db7b8949a5 100644
--- a/qpid/doc/book/src/QmfIntroduction.xml
+++ b/qpid/doc/book/src/qmf/QmfIntroduction.xml
diff --git a/qpid/doc/book/xsl/html-custom.xsl b/qpid/doc/book/xsl/html-custom.xsl
new file mode 100644
index 0000000000..94ba3b67f9
--- /dev/null
+++ b/qpid/doc/book/xsl/html-custom.xsl
@@ -0,0 +1,188 @@
+<?xml version='1.0'?> 
+<!--
+ -
+ - Licensed to the Apache Software Foundation (ASF) under one
+ - or more contributor license agreements.  See the NOTICE file
+ - distributed with this work for additional information
+ - regarding copyright ownership.  The ASF licenses this file
+ - to you under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ - 
+ - Unless required by applicable law or agreed to in writing,
+ - software distributed under the License is distributed on an
+ - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ - KIND, either express or implied.  See the License for the
+ - specific language governing permissions and limitations
+ - under the License.
+ -
+ -->
+<xsl:stylesheet  
+       xmlns:xsl="http://www.w3.org/1999/XSL/Transform"  version="1.0"> 
+  <xsl:import href="http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl"/>
+
+<xsl:template name="chunk-element-content">
+  <xsl:param name="prev"/>
+  <xsl:param name="next"/>
+  <xsl:param name="nav.context"/>
+  <xsl:param name="content">
+    <xsl:apply-imports/>
+  </xsl:param>
+
+  <xsl:call-template name="user.preroot"/>
+
+  <html>
+    <xsl:call-template name="html.head">
+      <xsl:with-param name="prev" select="$prev"/>
+      <xsl:with-param name="next" select="$next"/>
+    </xsl:call-template>
+
+    <body>
+<div class="container">
+      <xsl:call-template name="body.attributes"/>
+      <xsl:call-template name="user.header.navigation"/>
+
+      <xsl:call-template name="header.navigation">
+        <xsl:with-param name="prev" select="$prev"/>
+        <xsl:with-param name="next" select="$next"/>
+        <xsl:with-param name="nav.context" select="$nav.context"/>
+      </xsl:call-template>
+
+<div class="main_text_area">
+ <div class="main_text_area_top">
+ </div>
+ <div class="main_text_area_body">
+      <xsl:call-template name="user.header.content"/>
+      <xsl:copy-of select="$content"/>
+
+      <xsl:call-template name="user.footer.content"/>
+ </div>
+      <xsl:call-template name="footer.navigation">
+        <xsl:with-param name="prev" select="$prev"/>
+        <xsl:with-param name="next" select="$next"/>
+        <xsl:with-param name="nav.context" select="$nav.context"/>
+      </xsl:call-template>
+
+      <xsl:call-template name="user.footer.navigation"/>
+ <div class="main_text_area_bottom">
+ </div>
+</div>
+</div>
+    </body>
+  </html>
+  <xsl:value-of select="$chunk.append"/>
+</xsl:template>
+
+<xsl:template name="breadcrumbs">
+  <xsl:param name="this.node" select="."/>
+  <DIV class="breadcrumbs">
+    <xsl:for-each select="$this.node/ancestor::*">
+      <span class="breadcrumb-link">
+        <a>
+          <xsl:attribute name="href">
+            <xsl:call-template name="href.target">
+              <xsl:with-param name="object" select="."/>
+              <xsl:with-param name="context" select="$this.node"/>
+            </xsl:call-template>
+          </xsl:attribute>
+          <xsl:apply-templates select="." mode="title.markup"/>
+        </a>
+      </span>
+      <xsl:text> &gt; </xsl:text>
+    </xsl:for-each>
+    <!-- And display the current node, but not as a link -->
+    <span class="breadcrumb-node">
+      <xsl:apply-templates select="$this.node" mode="title.markup"/>
+    </span>
+  </DIV>
+</xsl:template>
+
+<xsl:template name="header.navigation">
+   <DIV class="header">
+      <DIV class="logo">
+        <H1>Apache Qpid&#8482;</H1>
+        <H2>Open Source AMQP Messaging</H2>
+      </DIV>
+   </DIV>
+
+   <DIV class="menu_box">
+     <DIV class="menu_box_top"></DIV>
+     <DIV class="menu_box_body">
+       <H3>Apache Qpid</H3>
+       <UL>
+         <LI><A href="http://qpid.apache.org/index.html">Home</A></LI>
+         <LI><A href="http://qpid.apache.org/download.html">Download</A></LI>
+         <LI><A href="http://qpid.apache.org/getting_started.html">Getting Started</A></LI>
+         <LI><A href="http://www.apache.org/licenses/">License</A></LI>
+         <LI><A href="https://cwiki.apache.org/qpid/faq.html">FAQ</A></LI>
+       </UL>
+     </DIV>
+     <DIV class="menu_box_bottom"></DIV>
+
+     <DIV class="menu_box_top"></DIV>
+     <DIV class="menu_box_body">
+       <H3>Documentation</H3>
+       <UL>
+         <LI><A href="http://qpid.apache.org/documentation.html#doc-release">0.14 Release</A></LI>
+         <LI><A href="http://qpid.apache.org/documentation.html#doc-trunk">Trunk</A></LI>
+         <LI><A href="http://qpid.apache.org/documentation.html#doc-archives">Archive</A></LI>
+       </UL>
+     </DIV>
+     <DIV class="menu_box_bottom"></DIV>
+
+     <DIV class="menu_box_top"></DIV>
+     <DIV class="menu_box_body">
+       <H3>Community</H3> 
+       <UL>
+         <LI><A href="http://qpid.apache.org/getting_involved.html">Getting Involved</A></LI>
+         <LI><A href="http://qpid.apache.org/source_repository.html">Source Repository</A></LI>
+         <LI><A href="http://qpid.apache.org/mailing_lists.html">Mailing Lists</A></LI>
+         <LI><A href="https://cwiki.apache.org/qpid/">Wiki</A></LI>
+         <LI><A href="https://issues.apache.org/jira/browse/qpid">Issue Reporting</A></LI>
+         <LI><A href="http://qpid.apache.org/people.html">People</A></LI>
+         <LI><A href="http://qpid.apache.org/acknowledgements.html">Acknowledgements</A></LI>
+       </UL>
+     </DIV>
+     <DIV class="menu_box_bottom"></DIV>
+
+     <DIV class="menu_box_top"></DIV>
+     <DIV class="menu_box_body">
+       <H3>Developers</H3>
+       <UL>
+         <LI><A href="https://cwiki.apache.org/qpid/building.html">Building Qpid</A></LI>
+         <LI><A href="https://cwiki.apache.org/qpid/developer-pages.html">Developer Pages</A></LI>
+       </UL>
+     </DIV>
+     <DIV class="menu_box_bottom"></DIV>
+
+     <DIV class="menu_box_top"></DIV>
+     <DIV class="menu_box_body">
+       <H3>About AMQP</H3>
+       <UL>
+         <LI><A href="http://qpid.apache.org/amqp.html">What is AMQP?</A></LI>
+       </UL>
+     </DIV>
+     <DIV class="menu_box_bottom"></DIV>
+
+     <DIV class="menu_box_top"></DIV>
+     <DIV class="menu_box_body">
+       <H3>About Apache</H3>
+       <UL>
+         <LI><A href="http://www.apache.org">Home</A></LI>
+         <LI><A href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</A></LI>
+         <LI><A href="http://www.apache.org/foundation/thanks.html">Thanks</A></LI>
+         <LI><A href="http://www.apache.org/security/">Security</A></LI>
+       </UL>
+     </DIV>
+     <DIV class="menu_box_bottom"></DIV>
+   </DIV>
+
+</xsl:template> 
+
+<xsl:template name="user.header.content">
+  <xsl:call-template name="breadcrumbs"/>
+</xsl:template>
+
+</xsl:stylesheet>