You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ro...@apache.org on 2019/07/10 10:51:48 UTC

[qpid-site] 01/02: remove ancient stale 'trunk' doc content

This is an automated email from the ASF dual-hosted git repository.

robbie pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/qpid-site.git

commit 49ced241a211c49dee58bd61bc51c7f6b4cc00a1
Author: Robbie Gemmell <ro...@apache.org>
AuthorDate: Wed Jul 10 11:16:57 2019 +0100

    remove ancient stale 'trunk' doc content
---
 content/releases/qpid-java-trunk/index.html        | 180 -----
 .../book/AMQP-Messaging-Broker-Java-Book.html      | 151 -----
 ...Java-Broker-Appendix-Environment-Variables.html | 197 ------
 .../Java-Broker-Appendix-Operation-Logging.html    | 542 ---------------
 .../book/Java-Broker-Appendix-Queue-Alerts.html    | 171 -----
 .../Java-Broker-Appendix-System-Properties.html    | 156 -----
 ...roker-Backup-And-Recovery-Virtualhost-Node.html | 161 -----
 ...ava-Broker-Backup-And-Recovery-Virtualhost.html | 153 -----
 .../book/Java-Broker-Backup-And-Recovery.html      | 147 -----
 ...a-Broker-Concepts-Authentication-Providers.html | 148 -----
 .../book/Java-Broker-Concepts-Broker.html          | 144 ----
 .../book/Java-Broker-Concepts-Exchanges.html       | 202 ------
 .../book/Java-Broker-Concepts-Other-Services.html  | 151 -----
 .../book/Java-Broker-Concepts-Ports.html           | 155 -----
 .../book/Java-Broker-Concepts-Queues.html          | 290 --------
 ...ava-Broker-Concepts-RemoteReplicationNodes.html | 145 ----
 .../Java-Broker-Concepts-Virtualhost-Nodes.html    | 150 -----
 .../book/Java-Broker-Concepts-Virtualhosts.html    | 158 -----
 .../java-broker/book/Java-Broker-Concepts.html     | 168 -----
 .../Java-Broker-Getting-Started-CommandLine.html   | 206 ------
 .../book/Java-Broker-Getting-Started-Logging.html  | 147 -----
 ...ker-Getting-Started-Starting-Stopping-Unix.html | 156 -----
 ...-Getting-Started-Starting-Stopping-Windows.html | 156 -----
 .../book/Java-Broker-Getting-Started.html          | 151 -----
 .../book/Java-Broker-High-Availability-Backup.html | 145 ----
 .../Java-Broker-High-Availability-Behaviour.html   | 220 -------
 ...va-Broker-High-Availability-ClientFailover.html | 148 -----
 ...ava-Broker-High-Availability-CreatingGroup.html | 182 ------
 .../Java-Broker-High-Availability-DiskSpace.html   | 147 -----
 ...ker-High-Availability-Network-Requirements.html | 148 -----
 ...va-Broker-High-Availability-NodeOperations.html | 164 -----
 ...Java-Broker-High-Availability-OverviewOfHA.html | 169 -----
 ...High-Availability-Reset-Group-Infomational.html | 151 -----
 .../Java-Broker-High-Availability-Security.html    | 146 -----
 .../book/Java-Broker-High-Availability.html        | 153 -----
 ...ial-Configuration-Configuration-Properties.html | 167 -----
 ...nitial-Configuration-Create-Initial-Config.html | 159 -----
 .../Java-Broker-Initial-Configuration-Example.html | 233 -------
 ...tial-Configuration-Initial-Config-Location.html | 154 -----
 ...Java-Broker-Initial-Configuration-Location.html | 151 -----
 ...itial-Configuration-Overwrite-Config-Store.html | 154 -----
 .../Java-Broker-Initial-Configuration-Type.html    | 161 -----
 .../book/Java-Broker-Initial-Configuration.html    | 154 -----
 .../book/Java-Broker-Installation-Download.html    | 146 -----
 .../Java-Broker-Installation-InstallationUnix.html | 168 -----
 ...va-Broker-Installation-InstallationWindows.html | 169 -----
 ...a-Broker-Installation-OptionalDependencies.html | 146 -----
 .../Java-Broker-Installation-Prerequistes.html     | 163 -----
 .../java-broker/book/Java-Broker-Installation.html | 145 ----
 .../java-broker/book/Java-Broker-Introduction.html | 150 -----
 ...-Broker-Management-Channel-AMQP-Intrinstic.html | 146 -----
 .../book/Java-Broker-Management-Channel-QMF.html   | 144 ----
 .../Java-Broker-Management-Channel-REST-API.html   | 287 --------
 ...Java-Broker-Management-Channel-Web-Console.html | 191 ------
 .../book/Java-Broker-Management-Channel.html       | 156 -----
 ...nagement-Managing-Access-Control-Providers.html | 146 -----
 ...nagement-Managing-Authentication-Providers.html | 163 -----
 .../Java-Broker-Management-Managing-Broker.html    | 171 -----
 .../Java-Broker-Management-Managing-Consumers.html | 151 -----
 ...Broker-Management-Managing-Entities-Matrix.html | 145 ----
 .../Java-Broker-Management-Managing-Entities.html  | 165 -----
 .../Java-Broker-Management-Managing-Exchanges.html | 149 -----
 ...Broker-Management-Managing-Group-Providers.html | 144 ----
 .../Java-Broker-Management-Managing-Keystores.html | 186 ------
 ...ava-Broker-Management-Managing-Plugin-HTTP.html | 153 -----
 .../Java-Broker-Management-Managing-Ports.html     | 176 -----
 .../Java-Broker-Management-Managing-Queues.html    | 162 -----
 ...Management-Managing-RemoteReplicationNodes.html | 167 -----
 ...ava-Broker-Management-Managing-Truststores.html | 168 -----
 ...oker-Management-Managing-Virtualhost-Nodes.html | 177 -----
 ...va-Broker-Management-Managing-Virtualhosts.html | 171 -----
 ...cellaneous-Installing-External-JDBC-Driver.html | 148 -----
 ...ker-Miscellaneous-Installing-Oracle-BDB-JE.html | 150 -----
 .../book/Java-Broker-Miscellaneous.html            | 152 -----
 .../Java-Broker-Runtime-Background-Recovery.html   | 157 -----
 ...ker-Runtime-Close-Connection-When-No-Route.html | 173 -----
 .../book/Java-Broker-Runtime-Connection-Limit.html | 167 -----
 .../Java-Broker-Runtime-Disk-Space-Management.html | 239 -------
 .../book/Java-Broker-Runtime-Flow-To-Disk.html     | 159 -----
 ...er-Runtime-Handling-Undeliverable-Messages.html | 182 ------
 .../book/Java-Broker-Runtime-Memory.html           | 266 --------
 .../Java-Broker-Runtime-Message-Compression.html   | 158 -----
 ...roker-Runtime-Producer-Transaction-Timeout.html | 200 ------
 .../java-broker/book/Java-Broker-Runtime.html      | 238 -------
 .../book/Java-Broker-Security-ACLs.html            | 418 ------------
 ...a-Broker-Security-Configuration-Encryption.html | 163 -----
 .../book/Java-Broker-Security-Group-Providers.html | 179 -----
 .../java-broker/book/Java-Broker-Security.html     | 295 ---------
 .../qpid-java-trunk/java-broker/book/css/style.css | 131 ----
 .../java-broker/book/images/Broker-MessageFlow.png | Bin 36827 -> 0 bytes
 .../java-broker/book/images/Broker-Model.png       | Bin 56499 -> 0 bytes
 .../book/images/Broker-PortAuthFlow.png            | Bin 56560 -> 0 bytes
 .../java-broker/book/images/Exchange-Direct.png    | Bin 36554 -> 0 bytes
 .../java-broker/book/images/Exchange-Direct.svg    |  23 -
 .../java-broker/book/images/Exchange-Fanout.png    | Bin 23348 -> 0 bytes
 .../java-broker/book/images/Exchange-Fanout.svg    |  23 -
 .../book/images/Exchange-Topic-Hierarchical.png    | Bin 40952 -> 0 bytes
 .../book/images/Exchange-Topic-Hierarchical.svg    |  23 -
 .../book/images/Exchange-Topic-JMSSelector.png     | Bin 44744 -> 0 bytes
 .../book/images/Exchange-Topic-JMSSelector.svg     |  23 -
 .../java-broker/book/images/Exchange-Topic.png     | Bin 26939 -> 0 bytes
 .../java-broker/book/images/Exchange-Topic.svg     |  23 -
 .../images/HA-BDBHAMessageStore-MBean-jconsole.png | Bin 52533 -> 0 bytes
 .../java-broker/book/images/HA-Create-1.png        | Bin 50328 -> 0 bytes
 .../java-broker/book/images/HA-Create-2.png        | Bin 51814 -> 0 bytes
 .../java-broker/book/images/HA-Create-3.png        | Bin 83561 -> 0 bytes
 .../java-broker/book/images/HA-Overview.png        | Bin 54044 -> 0 bytes
 .../java-broker/book/images/JMX-Connect-MBeans.png | Bin 66586 -> 0 bytes
 .../java-broker/book/images/JMX-Connect-Remote.png | Bin 66411 -> 0 bytes
 .../book/images/Management-Web-Add-Dialogue.png    | Bin 70733 -> 0 bytes
 .../book/images/Management-Web-Auth.png            | Bin 85993 -> 0 bytes
 .../book/images/Management-Web-Console.png         | Bin 232164 -> 0 bytes
 .../book/images/Management-Web-ContextVar.png      | Bin 29470 -> 0 bytes
 .../book/images/Management-Web-Edit-Dialogue.png   | Bin 27262 -> 0 bytes
 .../images/Management-Web-Logging-FileLogger.png   | Bin 136172 -> 0 bytes
 .../Management-Web-Logging-InclusionRule.png       | Bin 149497 -> 0 bytes
 .../images/Management-Web-Logging-MemoryLogger.png | Bin 229299 -> 0 bytes
 .../java-broker/book/images/Management-Web-Tab.png | Bin 119713 -> 0 bytes
 .../java-broker/book/images/VirtualHost-Model.png  | Bin 24672 -> 0 bytes
 .../qpid-java-trunk/java-broker/book/index.html    | 151 -----
 .../jms-client-0-10/book/JMS-Client-0-10-Book.html | 144 ----
 .../JMS-Client-0-10-Configuring-Addresses.html     | 727 ---------------------
 .../book/JMS-Client-0-10-Configuring-JNDI.html     | 432 ------------
 ...JMS-Client-0-10-Configuring-JVM-Properties.html | 186 ------
 .../book/JMS-Client-0-10-Configuring-Logging.html  | 152 -----
 .../book/JMS-Client-0-10-Configuring.html          | 154 -----
 .../book/JMS-Client-0-10-Example.html              | 221 -------
 .../JMS-Client-0-10-Miscellaneous-MapMessages.html | 191 ------
 .../book/JMS-Client-0-10-Miscellaneous.html        | 151 -----
 .../jms-client-0-10/book/css/style.css             | 131 ----
 .../jms-client-0-10/book/index.html                | 144 ----
 .../book/JMS-Client-0-8-Appendix-Exceptions.html   | 187 ------
 ...Client-0-8-Appendix-JMS-Extensions-Binding.html | 163 -----
 .../JMS-Client-0-8-Appendix-JMS-Extensions.html    | 158 -----
 .../book/JMS-Client-0-8-Appendix-Maven.html        | 175 -----
 ...ient-0-8-Appendix-PooledConnecytionFactory.html | 195 ------
 ...lient-0-8-Appendix-Tomcat-JNDI-Integration.html | 266 --------
 .../book/JMS-Client-0-8-Binding-URL.html           | 222 -------
 ...Client-0-8-Client-Understanding-Connection.html | 215 ------
 ...0-8-Client-Understanding-ConnectionFactory.html | 151 -----
 ...ient-0-8-Client-Understanding-Destinations.html | 149 -----
 ...t-0-8-Client-Understanding-MessageConsumer.html | 171 -----
 ...t-0-8-Client-Understanding-MessageProducer.html | 190 ------
 ...MS-Client-0-8-Client-Understanding-Session.html | 208 ------
 .../book/JMS-Client-0-8-Client-Understanding.html  | 150 -----
 .../book/JMS-Client-0-8-Connection-URL.html        | 257 --------
 ...t-0-8-Document-Scope-And-Intended-Audience.html | 161 -----
 .../book/JMS-Client-0-8-Examples-PubSub.html       | 216 ------
 .../book/JMS-Client-0-8-Examples.html              | 218 ------
 .../book/JMS-Client-0-8-Introduction.html          | 153 -----
 ...-JMS-Getting-And-Dependencies-Dependencies.html | 146 -----
 ...MS-Client-0-8-JMS-Getting-And-Dependencies.html | 154 -----
 ...ent-0-8-JNDI-Properties-Format-Destination.html | 146 -----
 ...MS-Client-0-8-JNDI-Properties-Format-Queue.html | 145 ----
 ...MS-Client-0-8-JNDI-Properties-Format-Topic.html | 147 -----
 .../JMS-Client-0-8-JNDI-Properties-Format.html     | 157 -----
 ...MS-Client-0-8-Logging-EnablingDebugLogging.html | 151 -----
 .../book/JMS-Client-0-8-Logging.html               | 155 -----
 .../book/JMS-Client-0-8-System-Properties.html     | 254 -------
 .../jms-client-0-8/book/JMS-Client-Book.html       | 149 -----
 .../JMS-Client-Message-Encryption-Receiving.html   | 154 -----
 .../JMS-Client-Message-Encryption-Sending.html     | 196 ------
 .../book/JMS-Client-Message-Encryption.html        | 174 -----
 .../jms-client-0-8/book/css/style.css              | 131 ----
 .../jms-client-0-8/book/images/JndiOverview.png    | Bin 67726 -> 0 bytes
 .../jms-client-0-8/book/images/JndiOverview.svg    |  23 -
 .../jms-client-0-8/book/images/QpidJmsOverview.png | Bin 52377 -> 0 bytes
 .../jms-client-0-8/book/images/QpidJmsOverview.svg |  23 -
 .../qpid-java-trunk/jms-client-0-8/book/index.html | 149 -----
 .../qpid-java-trunk/qpid-jms/examples/Drain.java   | 103 ---
 .../qpid-jms/examples/Drain.java.html              | 232 -------
 .../qpid-java-trunk/qpid-jms/examples/Hello.java   |  83 ---
 .../qpid-jms/examples/Hello.java.html              | 211 ------
 .../qpid-jms/examples/ListReceiver.java            | 101 ---
 .../qpid-jms/examples/ListReceiver.java.html       | 229 -------
 .../qpid-jms/examples/ListSender.java              |  86 ---
 .../qpid-jms/examples/ListSender.java.html         | 214 ------
 .../qpid-jms/examples/MapReceiver.java             |  52 --
 .../qpid-jms/examples/MapReceiver.java.html        | 180 -----
 .../qpid-jms/examples/MapSender.java               |  83 ---
 .../qpid-jms/examples/MapSender.java.html          | 211 ------
 .../qpid-jms/examples/OptionParser.java            | 351 ----------
 .../qpid-jms/examples/OptionParser.java.html       | 480 --------------
 .../qpid-java-trunk/qpid-jms/examples/Spout.java   | 149 -----
 .../qpid-jms/examples/Spout.java.html              | 278 --------
 .../qpid-jms/examples/hello.properties             |  28 -
 .../qpid-jms/examples/hello.properties.html        | 158 -----
 .../qpid-java-trunk/qpid-jms/examples/index.html   | 166 -----
 input/releases/qpid-java-trunk/index.md            |  53 --
 .../book/AMQP-Messaging-Broker-Java-Book.html.in   |   8 -
 ...a-Broker-Appendix-Environment-Variables.html.in |  54 --
 .../Java-Broker-Appendix-Operation-Logging.html.in | 399 -----------
 .../book/Java-Broker-Appendix-Queue-Alerts.html.in |  28 -
 .../Java-Broker-Appendix-System-Properties.html.in |  13 -
 ...er-Backup-And-Recovery-Virtualhost-Node.html.in |  18 -
 ...-Broker-Backup-And-Recovery-Virtualhost.html.in |  10 -
 .../book/Java-Broker-Backup-And-Recovery.html.in   |   4 -
 ...roker-Concepts-Authentication-Providers.html.in |   5 -
 .../book/Java-Broker-Concepts-Broker.html.in       |   1 -
 .../book/Java-Broker-Concepts-Exchanges.html.in    |  59 --
 .../Java-Broker-Concepts-Other-Services.html.in    |   8 -
 .../book/Java-Broker-Concepts-Ports.html.in        |  12 -
 .../book/Java-Broker-Concepts-Queues.html.in       | 147 -----
 ...-Broker-Concepts-RemoteReplicationNodes.html.in |   2 -
 .../Java-Broker-Concepts-Virtualhost-Nodes.html.in |   7 -
 .../book/Java-Broker-Concepts-Virtualhosts.html.in |  15 -
 .../java-broker/book/Java-Broker-Concepts.html.in  |  25 -
 ...Java-Broker-Getting-Started-CommandLine.html.in |  63 --
 .../Java-Broker-Getting-Started-Logging.html.in    |   4 -
 ...-Getting-Started-Starting-Stopping-Unix.html.in |  13 -
 ...tting-Started-Starting-Stopping-Windows.html.in |  13 -
 .../book/Java-Broker-Getting-Started.html.in       |   8 -
 .../Java-Broker-High-Availability-Backup.html.in   |   2 -
 ...Java-Broker-High-Availability-Behaviour.html.in |  77 ---
 ...Broker-High-Availability-ClientFailover.html.in |   5 -
 ...-Broker-High-Availability-CreatingGroup.html.in |  39 --
 ...Java-Broker-High-Availability-DiskSpace.html.in |   4 -
 ...-High-Availability-Network-Requirements.html.in |   5 -
 ...Broker-High-Availability-NodeOperations.html.in |  21 -
 ...a-Broker-High-Availability-OverviewOfHA.html.in |  26 -
 ...h-Availability-Reset-Group-Infomational.html.in |   8 -
 .../Java-Broker-High-Availability-Security.html.in |   3 -
 .../book/Java-Broker-High-Availability.html.in     |  10 -
 ...-Configuration-Configuration-Properties.html.in |  24 -
 ...ial-Configuration-Create-Initial-Config.html.in |  16 -
 ...va-Broker-Initial-Configuration-Example.html.in |  90 ---
 ...l-Configuration-Initial-Config-Location.html.in |  11 -
 ...a-Broker-Initial-Configuration-Location.html.in |   8 -
 ...al-Configuration-Overwrite-Config-Store.html.in |  11 -
 .../Java-Broker-Initial-Configuration-Type.html.in |  18 -
 .../book/Java-Broker-Initial-Configuration.html.in |  11 -
 .../book/Java-Broker-Installation-Download.html.in |   3 -
 ...va-Broker-Installation-InstallationUnix.html.in |  25 -
 ...Broker-Installation-InstallationWindows.html.in |  26 -
 ...roker-Installation-OptionalDependencies.html.in |   3 -
 .../Java-Broker-Installation-Prerequistes.html.in  |  20 -
 .../book/Java-Broker-Installation.html.in          |   2 -
 .../book/Java-Broker-Introduction.html.in          |   7 -
 ...oker-Management-Channel-AMQP-Intrinstic.html.in |   3 -
 .../Java-Broker-Management-Channel-QMF.html.in     |   1 -
 ...Java-Broker-Management-Channel-REST-API.html.in | 144 ----
 ...a-Broker-Management-Channel-Web-Console.html.in |  48 --
 .../book/Java-Broker-Management-Channel.html.in    |  13 -
 ...ement-Managing-Access-Control-Providers.html.in |   3 -
 ...ement-Managing-Authentication-Providers.html.in |  20 -
 .../Java-Broker-Management-Managing-Broker.html.in |  28 -
 ...va-Broker-Management-Managing-Consumers.html.in |   8 -
 ...ker-Management-Managing-Entities-Matrix.html.in |   2 -
 ...ava-Broker-Management-Managing-Entities.html.in |  22 -
 ...va-Broker-Management-Managing-Exchanges.html.in |   6 -
 ...ker-Management-Managing-Group-Providers.html.in |   1 -
 ...va-Broker-Management-Managing-Keystores.html.in |  43 --
 ...-Broker-Management-Managing-Plugin-HTTP.html.in |  10 -
 .../Java-Broker-Management-Managing-Ports.html.in  |  33 -
 .../Java-Broker-Management-Managing-Queues.html.in |  19 -
 ...agement-Managing-RemoteReplicationNodes.html.in |  24 -
 ...-Broker-Management-Managing-Truststores.html.in |  25 -
 ...r-Management-Managing-Virtualhost-Nodes.html.in |  34 -
 ...Broker-Management-Managing-Virtualhosts.html.in |  28 -
 ...laneous-Installing-External-JDBC-Driver.html.in |   5 -
 ...-Miscellaneous-Installing-Oracle-BDB-JE.html.in |   7 -
 .../book/Java-Broker-Miscellaneous.html.in         |   9 -
 ...Java-Broker-Runtime-Background-Recovery.html.in |  14 -
 ...-Runtime-Close-Connection-When-No-Route.html.in |  30 -
 .../Java-Broker-Runtime-Connection-Limit.html.in   |  24 -
 ...va-Broker-Runtime-Disk-Space-Management.html.in |  96 ---
 .../book/Java-Broker-Runtime-Flow-To-Disk.html.in  |  16 -
 ...Runtime-Handling-Undeliverable-Messages.html.in |  39 --
 .../book/Java-Broker-Runtime-Memory.html.in        | 123 ----
 ...Java-Broker-Runtime-Message-Compression.html.in |  15 -
 ...er-Runtime-Producer-Transaction-Timeout.html.in |  57 --
 .../java-broker/book/Java-Broker-Runtime.html.in   |  95 ---
 .../book/Java-Broker-Security-ACLs.html.in         | 275 --------
 ...roker-Security-Configuration-Encryption.html.in |  20 -
 .../Java-Broker-Security-Group-Providers.html.in   |  36 -
 .../java-broker/book/Java-Broker-Security.html.in  | 152 -----
 .../qpid-java-trunk/java-broker/book/css/style.css | 131 ----
 .../java-broker/book/images/Broker-MessageFlow.png | Bin 36827 -> 0 bytes
 .../java-broker/book/images/Broker-Model.png       | Bin 56499 -> 0 bytes
 .../book/images/Broker-PortAuthFlow.png            | Bin 56560 -> 0 bytes
 .../java-broker/book/images/Exchange-Direct.png    | Bin 36554 -> 0 bytes
 .../java-broker/book/images/Exchange-Direct.svg    |  23 -
 .../java-broker/book/images/Exchange-Fanout.png    | Bin 23348 -> 0 bytes
 .../java-broker/book/images/Exchange-Fanout.svg    |  23 -
 .../book/images/Exchange-Topic-Hierarchical.png    | Bin 40952 -> 0 bytes
 .../book/images/Exchange-Topic-Hierarchical.svg    |  23 -
 .../book/images/Exchange-Topic-JMSSelector.png     | Bin 44744 -> 0 bytes
 .../book/images/Exchange-Topic-JMSSelector.svg     |  23 -
 .../java-broker/book/images/Exchange-Topic.png     | Bin 26939 -> 0 bytes
 .../java-broker/book/images/Exchange-Topic.svg     |  23 -
 .../images/HA-BDBHAMessageStore-MBean-jconsole.png | Bin 52533 -> 0 bytes
 .../java-broker/book/images/HA-Create-1.png        | Bin 50328 -> 0 bytes
 .../java-broker/book/images/HA-Create-2.png        | Bin 51814 -> 0 bytes
 .../java-broker/book/images/HA-Create-3.png        | Bin 83561 -> 0 bytes
 .../java-broker/book/images/HA-Overview.png        | Bin 54044 -> 0 bytes
 .../java-broker/book/images/JMX-Connect-MBeans.png | Bin 66586 -> 0 bytes
 .../java-broker/book/images/JMX-Connect-Remote.png | Bin 66411 -> 0 bytes
 .../book/images/Management-Web-Add-Dialogue.png    | Bin 70733 -> 0 bytes
 .../book/images/Management-Web-Auth.png            | Bin 85993 -> 0 bytes
 .../book/images/Management-Web-Console.png         | Bin 232164 -> 0 bytes
 .../book/images/Management-Web-ContextVar.png      | Bin 29470 -> 0 bytes
 .../book/images/Management-Web-Edit-Dialogue.png   | Bin 27262 -> 0 bytes
 .../images/Management-Web-Logging-FileLogger.png   | Bin 136172 -> 0 bytes
 .../Management-Web-Logging-InclusionRule.png       | Bin 149497 -> 0 bytes
 .../images/Management-Web-Logging-MemoryLogger.png | Bin 229299 -> 0 bytes
 .../java-broker/book/images/Management-Web-Tab.png | Bin 119713 -> 0 bytes
 .../java-broker/book/images/VirtualHost-Model.png  | Bin 24672 -> 0 bytes
 .../qpid-java-trunk/java-broker/book/index.html.in |   8 -
 .../book/JMS-Client-0-10-Book.html.in              |   1 -
 .../JMS-Client-0-10-Configuring-Addresses.html.in  | 584 -----------------
 .../book/JMS-Client-0-10-Configuring-JNDI.html.in  | 289 --------
 ...-Client-0-10-Configuring-JVM-Properties.html.in |  43 --
 .../JMS-Client-0-10-Configuring-Logging.html.in    |   9 -
 .../book/JMS-Client-0-10-Configuring.html.in       |  11 -
 .../book/JMS-Client-0-10-Example.html.in           |  78 ---
 ...S-Client-0-10-Miscellaneous-MapMessages.html.in |  48 --
 .../book/JMS-Client-0-10-Miscellaneous.html.in     |   8 -
 .../jms-client-0-10/book/css/style.css             | 131 ----
 .../jms-client-0-10/book/index.html.in             |   1 -
 .../JMS-Client-0-8-Appendix-Exceptions.html.in     |  44 --
 ...ent-0-8-Appendix-JMS-Extensions-Binding.html.in |  20 -
 .../JMS-Client-0-8-Appendix-JMS-Extensions.html.in |  15 -
 .../book/JMS-Client-0-8-Appendix-Maven.html.in     |  32 -
 ...t-0-8-Appendix-PooledConnecytionFactory.html.in |  52 --
 ...nt-0-8-Appendix-Tomcat-JNDI-Integration.html.in | 123 ----
 .../book/JMS-Client-0-8-Binding-URL.html.in        |  79 ---
 ...ent-0-8-Client-Understanding-Connection.html.in |  72 --
 ...-Client-Understanding-ConnectionFactory.html.in |   8 -
 ...t-0-8-Client-Understanding-Destinations.html.in |   6 -
 ...-8-Client-Understanding-MessageConsumer.html.in |  28 -
 ...-8-Client-Understanding-MessageProducer.html.in |  47 --
 ...Client-0-8-Client-Understanding-Session.html.in |  65 --
 .../JMS-Client-0-8-Client-Understanding.html.in    |   7 -
 .../book/JMS-Client-0-8-Connection-URL.html.in     | 114 ----
 ...-8-Document-Scope-And-Intended-Audience.html.in |  18 -
 .../book/JMS-Client-0-8-Examples-PubSub.html.in    |  73 ---
 .../book/JMS-Client-0-8-Examples.html.in           |  75 ---
 .../book/JMS-Client-0-8-Introduction.html.in       |  10 -
 ...S-Getting-And-Dependencies-Dependencies.html.in |   3 -
 ...Client-0-8-JMS-Getting-And-Dependencies.html.in |  11 -
 ...-0-8-JNDI-Properties-Format-Destination.html.in |   3 -
 ...Client-0-8-JNDI-Properties-Format-Queue.html.in |   2 -
 ...Client-0-8-JNDI-Properties-Format-Topic.html.in |   4 -
 .../JMS-Client-0-8-JNDI-Properties-Format.html.in  |  14 -
 ...Client-0-8-Logging-EnablingDebugLogging.html.in |   8 -
 .../book/JMS-Client-0-8-Logging.html.in            |  12 -
 .../book/JMS-Client-0-8-System-Properties.html.in  | 111 ----
 .../jms-client-0-8/book/JMS-Client-Book.html.in    |   6 -
 ...JMS-Client-Message-Encryption-Receiving.html.in |  11 -
 .../JMS-Client-Message-Encryption-Sending.html.in  |  53 --
 .../book/JMS-Client-Message-Encryption.html.in     |  31 -
 .../jms-client-0-8/book/css/style.css              | 131 ----
 .../jms-client-0-8/book/images/JndiOverview.png    | Bin 67726 -> 0 bytes
 .../jms-client-0-8/book/images/JndiOverview.svg    |  23 -
 .../jms-client-0-8/book/images/QpidJmsOverview.png | Bin 52377 -> 0 bytes
 .../jms-client-0-8/book/images/QpidJmsOverview.svg |  23 -
 .../jms-client-0-8/book/index.html.in              |   6 -
 .../qpid-java-trunk/qpid-jms/examples/Drain.java   | 103 ---
 .../qpid-jms/examples/Drain.java.html.in           |  88 ---
 .../qpid-java-trunk/qpid-jms/examples/Hello.java   |  83 ---
 .../qpid-jms/examples/Hello.java.html.in           |  67 --
 .../qpid-jms/examples/ListReceiver.java            | 101 ---
 .../qpid-jms/examples/ListReceiver.java.html.in    |  85 ---
 .../qpid-jms/examples/ListSender.java              |  86 ---
 .../qpid-jms/examples/ListSender.java.html.in      |  70 --
 .../qpid-jms/examples/MapReceiver.java             |  52 --
 .../qpid-jms/examples/MapReceiver.java.html.in     |  36 -
 .../qpid-jms/examples/MapSender.java               |  83 ---
 .../qpid-jms/examples/MapSender.java.html.in       |  67 --
 .../qpid-jms/examples/OptionParser.java            | 351 ----------
 .../qpid-jms/examples/OptionParser.java.html.in    | 336 ----------
 .../qpid-java-trunk/qpid-jms/examples/Spout.java   | 149 -----
 .../qpid-jms/examples/Spout.java.html.in           | 134 ----
 .../qpid-jms/examples/hello.properties             |  28 -
 .../qpid-jms/examples/hello.properties.html.in     |  14 -
 .../qpid-java-trunk/qpid-jms/examples/index.md     |  19 -
 376 files changed, 35745 deletions(-)

diff --git a/content/releases/qpid-java-trunk/index.html b/content/releases/qpid-java-trunk/index.html
deleted file mode 100644
index e157d14..0000000
--- a/content/releases/qpid-java-trunk/index.html
+++ /dev/null
@@ -1,180 +0,0 @@
-<!DOCTYPE html>
-<!--
- -
- - 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.
- -
--->
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-  <head>
-    <title>Qpid for Java Trunk - Apache Qpid&#8482;</title>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-    <link rel="stylesheet" href="/site.css" type="text/css" async="async"/>
-    <link rel="stylesheet" href="/deferred.css" type="text/css" defer="defer"/>
-    <script type="text/javascript">var _deferredFunctions = [];</script>
-    <script type="text/javascript" src="/deferred.js" defer="defer"></script>
-    <!--[if lte IE 8]>
-      <link rel="stylesheet" href="/ie.css" type="text/css"/>
-      <script type="text/javascript" src="/html5shiv.js"></script>
-    <![endif]-->
-
-    <!-- Redirects for `go get` and godoc.org -->
-    <meta name="go-import"
-          content="qpid.apache.org git https://gitbox.apache.org/repos/asf/qpid-proton.git"/>
-    <meta name="go-source"
-          content="qpid.apache.org
-https://github.com/apache/qpid-proton/blob/go1/README.md
-https://github.com/apache/qpid-proton/tree/go1{/dir}
-https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
-  </head>
-  <body>
-    <div id="-content">
-      <div id="-top" class="panel">
-        <a id="-menu-link"><img width="16" height="16" src="" alt="Menu"/></a>
-
-        <a id="-search-link"><img width="22" height="16" src="" alt="Search"/></a>
-
-        <ul id="-global-navigation">
-          <li><a id="-logotype" href="/index.html">Apache Qpid<sup>&#8482;</sup></a></li>
-          <li><a href="/documentation.html">Documentation</a></li>
-          <li><a href="/download.html">Download</a></li>
-          <li><a href="/discussion.html">Discussion</a></li>
-        </ul>
-      </div>
-
-      <div id="-menu" class="panel" style="display: none;">
-        <div class="flex">
-          <section>
-            <h3>Project</h3>
-
-            <ul>
-              <li><a href="/overview.html">Overview</a></li>
-              <li><a href="/components/index.html">Components</a></li>
-              <li><a href="/releases/index.html">Releases</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Messaging APIs</h3>
-
-            <ul>
-              <li><a href="/proton/index.html">Qpid Proton</a></li>
-              <li><a href="/components/jms/index.html">Qpid JMS</a></li>
-              <li><a href="/components/messaging-api/index.html">Qpid Messaging API</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Servers and tools</h3>
-
-            <ul>
-              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
-              <li><a href="/components/cpp-broker/index.html">C++ broker</a></li>
-              <li><a href="/components/dispatch-router/index.html">Dispatch router</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Resources</h3>
-
-            <ul>
-              <li><a href="/dashboard.html">Dashboard</a></li>
-              <li><a href="https://cwiki.apache.org/confluence/display/qpid/Index">Wiki</a></li>
-              <li><a href="/resources.html">More resources</a></li>
-            </ul>
-          </section>
-        </div>
-      </div>
-
-      <div id="-search" class="panel" style="display: none;">
-        <form action="http://www.google.com/search" method="get">
-          <input type="hidden" name="sitesearch" value="qpid.apache.org"/>
-          <input type="text" name="q" maxlength="255" autofocus="autofocus" tabindex="1"/>
-          <button type="submit">Search</button>
-          <a href="/search.html">More ways to search</a>
-        </form>
-      </div>
-
-      <div id="-middle" class="panel">
-        <ul id="-path-navigation"><li><a href="/index.html">Home</a></li><li><a href="/releases/index.html">Releases</a></li><li>Qpid for Java Trunk</li></ul>
-
-        <div id="-middle-content">
-          <h1 id="qpid-for-java-trunk">Qpid for Java Trunk</h1>
-
-<div class="feature">
-
-<h2 id="warning-this-is-a-snapshot-of-work-in-progress">Warning! This is a snapshot of work in progress</h2>
-
-<p>Code and documentation found here may be unstable, incorrect, or
-incomplete.  For a smoother experience, see the <a href="/releases/qpid-java-6.1.7/index.html">current stable
-release</a>.</p>
-
-<p>This content was generated at 14:16  on Monday, 01 August 2016.</p>
-
-</div>
-
-<h2 id="documentation">Documentation</h2>
-
-<div class="two-column">
-
-<ul>
-<li><a href="java-broker/book/Java-Broker-Installation.html">Installing Qpid Broker for Java</a></li>
-<li><a href="java-broker/book/index.html">Broker book</a></li>
-<li><a href="http://docs.oracle.com/javaee/1.4/api/javax/jms/package-summary.html">API reference</a></li>
-<li><a href="jms-client-0-10/book/index.html">Using the Qpid JMS client for AMQP 0-10</a></li>
-<li><a href="jms-client-0-8/book/index.html">Using the Qpid JMS client for AMQP 0-9-1</a></li>
-<li><a href="qpid-jms/examples/index.html">JMS examples for AMQP 0-10</a></li>
-<li><a href="jms-client-0-8/book/JMS-Client-0-8-Examples.html">JMS examples for AMQP 0-9-1, 0-9, 0-8</a></li>
-<li><a href="http://svn.apache.org/repos/asf/qpid/java/trunk/jca/example/">JCA examples</a></li>
-</ul>
-
-</div>
-
-<h2 id="more-information">More information</h2>
-
-<ul>
-<li><a href="http://svn.apache.org/repos/asf/qpid/java/trunk">Source repository</a></li>
-</ul>
-
-
-          <hr/>
-
-          <ul id="-apache-navigation">
-            <li><a href="http://www.apache.org/">Apache</a></li>
-            <li><a href="http://www.apache.org/licenses/">License</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="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
-          </ul>
-
-          <p id="-legal">
-            Apache Qpid, Messaging built on AMQP; Copyright &#169; 2015
-            The Apache Software Foundation; Licensed under
-            the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
-            License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
-            project logo are trademarks of The Apache Software
-            Foundation; All other marks mentioned may be trademarks or
-            registered trademarks of their respective owners
-          </p>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/content/releases/qpid-java-trunk/java-broker/book/AMQP-Messaging-Broker-Java-Book.html b/content/releases/qpid-java-trunk/java-broker/book/AMQP-Messaging-Broker-Java-Book.html
deleted file mode 100644
index 11e3ca6..0000000
--- a/content/releases/qpid-java-trunk/java-broker/book/AMQP-Messaging-Broker-Java-Book.html
+++ /dev/null
@@ -1,151 +0,0 @@
-<!DOCTYPE html>
-<!--
- -
- - 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.
- -
--->
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-  <head>
-    <title>Apache Qpid Broker for Java - Apache Qpid&#8482;</title>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-    <link rel="stylesheet" href="/site.css" type="text/css" async="async"/>
-    <link rel="stylesheet" href="/deferred.css" type="text/css" defer="defer"/>
-    <script type="text/javascript">var _deferredFunctions = [];</script>
-    <script type="text/javascript" src="/deferred.js" defer="defer"></script>
-    <!--[if lte IE 8]>
-      <link rel="stylesheet" href="/ie.css" type="text/css"/>
-      <script type="text/javascript" src="/html5shiv.js"></script>
-    <![endif]-->
-
-    <!-- Redirects for `go get` and godoc.org -->
-    <meta name="go-import"
-          content="qpid.apache.org git https://gitbox.apache.org/repos/asf/qpid-proton.git"/>
-    <meta name="go-source"
-          content="qpid.apache.org
-https://github.com/apache/qpid-proton/blob/go1/README.md
-https://github.com/apache/qpid-proton/tree/go1{/dir}
-https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
-  </head>
-  <body>
-    <div id="-content">
-      <div id="-top" class="panel">
-        <a id="-menu-link"><img width="16" height="16" src="" alt="Menu"/></a>
-
-        <a id="-search-link"><img width="22" height="16" src="" alt="Search"/></a>
-
-        <ul id="-global-navigation">
-          <li><a id="-logotype" href="/index.html">Apache Qpid<sup>&#8482;</sup></a></li>
-          <li><a href="/documentation.html">Documentation</a></li>
-          <li><a href="/download.html">Download</a></li>
-          <li><a href="/discussion.html">Discussion</a></li>
-        </ul>
-      </div>
-
-      <div id="-menu" class="panel" style="display: none;">
-        <div class="flex">
-          <section>
-            <h3>Project</h3>
-
-            <ul>
-              <li><a href="/overview.html">Overview</a></li>
-              <li><a href="/components/index.html">Components</a></li>
-              <li><a href="/releases/index.html">Releases</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Messaging APIs</h3>
-
-            <ul>
-              <li><a href="/proton/index.html">Qpid Proton</a></li>
-              <li><a href="/components/jms/index.html">Qpid JMS</a></li>
-              <li><a href="/components/messaging-api/index.html">Qpid Messaging API</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Servers and tools</h3>
-
-            <ul>
-              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
-              <li><a href="/components/cpp-broker/index.html">C++ broker</a></li>
-              <li><a href="/components/dispatch-router/index.html">Dispatch router</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Resources</h3>
-
-            <ul>
-              <li><a href="/dashboard.html">Dashboard</a></li>
-              <li><a href="https://cwiki.apache.org/confluence/display/qpid/Index">Wiki</a></li>
-              <li><a href="/resources.html">More resources</a></li>
-            </ul>
-          </section>
-        </div>
-      </div>
-
-      <div id="-search" class="panel" style="display: none;">
-        <form action="http://www.google.com/search" method="get">
-          <input type="hidden" name="sitesearch" value="qpid.apache.org"/>
-          <input type="text" name="q" maxlength="255" autofocus="autofocus" tabindex="1"/>
-          <button type="submit">Search</button>
-          <a href="/search.html">More ways to search</a>
-        </form>
-      </div>
-
-      <div id="-middle" class="panel">
-        <ul id="-path-navigation"><li><a href="/index.html">Home</a></li><li><a href="/releases/index.html">Releases</a></li><li><a href="/releases/qpid-java-trunk/index.html">Qpid for Java Trunk</a></li><li><a href="/releases/qpid-java-trunk/java-broker/book/index.html">Apache Qpid Broker for Java</a></li><li>Apache Qpid Broker for Java</li></ul>
-
-        <div id="-middle-content">
-          <div class="docbook"><div class="navheader"><table summary="Navigation header" width="100%"><tr><th align="center" colspan="3">Apache Qpid Broker for Java</th></tr><tr><td align="left" width="20%">&#160;</td><th align="center" width="60%">&#160;</th><td align="right" width="20%">&#160;<a accesskey="n" href="Java-Broker-Introduction.html">Next</a></td></tr></table><hr /></div><div class="book"><div class="titlepage"><div><div><h1 class="title"><a id="d0e2"></a>Apache Qpid Broker [...]
-       Writing .acl files
-    </a></span></dt><dt><span class="section"><a href="Java-Broker-Security-ACLs.html#Java-Broker-Security-ACLs-Syntax">8.3.2. 
-       Syntax
-    </a></span></dt><dt><span class="section"><a href="Java-Broker-Security-ACLs.html#Java-Broker-Security-ACLs-WorkedExamples">8.3.3. 
-      Worked Examples
-    </a></span></dt></dl></dd><dt><span class="section"><a href="Java-Broker-Security-Configuration-Encryption.html">8.4. Configuration Encryption</a></span></dt><dd><dl><dt><span class="section"><a href="Java-Broker-Security-Configuration-Encryption.html#Java-Broker-Security-Configuration-Encryption-Configuration">8.4.1. Configuration</a></span></dt><dt><span class="section"><a href="Java-Broker-Security-Configuration-Encryption.html#Java-Broker-Security-Configuration-Encryption-Alterna [...]
-          directly</a></dt><dt>11.2. <a href="Java-Broker-Backup-And-Recovery-Virtualhost-Node.html#d0e6818">Performing store backup by using <code class="classname">backup.sh</code> bash script</a></dt></dl></div></div><div class="navfooter"><hr /><table summary="Navigation footer" width="100%"><tr><td align="left" width="40%">&#160;</td><td align="center" width="20%">&#160;</td><td align="right" width="40%">&#160;<a accesskey="n" href="Java-Broker-Introduction.html">Next</a></td></tr>< [...]
-
-          <hr/>
-
-          <ul id="-apache-navigation">
-            <li><a href="http://www.apache.org/">Apache</a></li>
-            <li><a href="http://www.apache.org/licenses/">License</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="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
-          </ul>
-
-          <p id="-legal">
-            Apache Qpid, Messaging built on AMQP; Copyright &#169; 2015
-            The Apache Software Foundation; Licensed under
-            the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
-            License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
-            project logo are trademarks of The Apache Software
-            Foundation; All other marks mentioned may be trademarks or
-            registered trademarks of their respective owners
-          </p>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Appendix-Environment-Variables.html b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Appendix-Environment-Variables.html
deleted file mode 100644
index 828a457..0000000
--- a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Appendix-Environment-Variables.html
+++ /dev/null
@@ -1,197 +0,0 @@
-<!DOCTYPE html>
-<!--
- -
- - 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.
- -
--->
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-  <head>
-    <title>Appendix&#160;A.&#160;Environment Variables - Apache Qpid&#8482;</title>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-    <link rel="stylesheet" href="/site.css" type="text/css" async="async"/>
-    <link rel="stylesheet" href="/deferred.css" type="text/css" defer="defer"/>
-    <script type="text/javascript">var _deferredFunctions = [];</script>
-    <script type="text/javascript" src="/deferred.js" defer="defer"></script>
-    <!--[if lte IE 8]>
-      <link rel="stylesheet" href="/ie.css" type="text/css"/>
-      <script type="text/javascript" src="/html5shiv.js"></script>
-    <![endif]-->
-
-    <!-- Redirects for `go get` and godoc.org -->
-    <meta name="go-import"
-          content="qpid.apache.org git https://gitbox.apache.org/repos/asf/qpid-proton.git"/>
-    <meta name="go-source"
-          content="qpid.apache.org
-https://github.com/apache/qpid-proton/blob/go1/README.md
-https://github.com/apache/qpid-proton/tree/go1{/dir}
-https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
-  </head>
-  <body>
-    <div id="-content">
-      <div id="-top" class="panel">
-        <a id="-menu-link"><img width="16" height="16" src="" alt="Menu"/></a>
-
-        <a id="-search-link"><img width="22" height="16" src="" alt="Search"/></a>
-
-        <ul id="-global-navigation">
-          <li><a id="-logotype" href="/index.html">Apache Qpid<sup>&#8482;</sup></a></li>
-          <li><a href="/documentation.html">Documentation</a></li>
-          <li><a href="/download.html">Download</a></li>
-          <li><a href="/discussion.html">Discussion</a></li>
-        </ul>
-      </div>
-
-      <div id="-menu" class="panel" style="display: none;">
-        <div class="flex">
-          <section>
-            <h3>Project</h3>
-
-            <ul>
-              <li><a href="/overview.html">Overview</a></li>
-              <li><a href="/components/index.html">Components</a></li>
-              <li><a href="/releases/index.html">Releases</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Messaging APIs</h3>
-
-            <ul>
-              <li><a href="/proton/index.html">Qpid Proton</a></li>
-              <li><a href="/components/jms/index.html">Qpid JMS</a></li>
-              <li><a href="/components/messaging-api/index.html">Qpid Messaging API</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Servers and tools</h3>
-
-            <ul>
-              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
-              <li><a href="/components/cpp-broker/index.html">C++ broker</a></li>
-              <li><a href="/components/dispatch-router/index.html">Dispatch router</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Resources</h3>
-
-            <ul>
-              <li><a href="/dashboard.html">Dashboard</a></li>
-              <li><a href="https://cwiki.apache.org/confluence/display/qpid/Index">Wiki</a></li>
-              <li><a href="/resources.html">More resources</a></li>
-            </ul>
-          </section>
-        </div>
-      </div>
-
-      <div id="-search" class="panel" style="display: none;">
-        <form action="http://www.google.com/search" method="get">
-          <input type="hidden" name="sitesearch" value="qpid.apache.org"/>
-          <input type="text" name="q" maxlength="255" autofocus="autofocus" tabindex="1"/>
-          <button type="submit">Search</button>
-          <a href="/search.html">More ways to search</a>
-        </form>
-      </div>
-
-      <div id="-middle" class="panel">
-        <ul id="-path-navigation"><li><a href="/index.html">Home</a></li><li><a href="/releases/index.html">Releases</a></li><li><a href="/releases/qpid-java-trunk/index.html">Qpid for Java Trunk</a></li><li><a href="/releases/qpid-java-trunk/java-broker/book/index.html">Apache Qpid Broker for Java</a></li><li>Appendix&#160;A.&#160;Environment Variables</li></ul>
-
-        <div id="-middle-content">
-          <div class="docbook"><div class="navheader"><table summary="Navigation header" width="100%"><tr><th align="center" colspan="3">Appendix&#160;A.&#160;Environment Variables</th></tr><tr><td align="left" width="20%"><a accesskey="p" href="Java-Broker-Backup-And-Recovery-Virtualhost.html">Prev</a>&#160;</td><th align="center" width="60%">&#160;</th><td align="right" width="20%">&#160;<a accesskey="n" href="Java-Broker-Appendix-System-Properties.html">Next</a></td></tr></table><hr / [...]
-    contained within the <code class="literal">/bin</code> directory within the Broker distribution.</p><p>To take effect, these variables must be set within the shell (and exported - if using Unix)
-    before invoking the script.</p><div class="table"><a id="d0e6908"></a><p class="title"><strong>Table&#160;A.1.&#160;Environment variables</strong></p><div class="table-contents"><table border="1" summary="Environment variables" width="100%"><colgroup><col /><col /><col /></colgroup><thead><tr><th>Environment variable</th><th>Default</th><th>Purpose</th></tr></thead><tbody><tr><td><a id="Java-Broker-Appendix-Environment-Variables-Qpid-Home"></a>QPID_HOME</td><td>
-            <p>None</p>
-          </td><td>
-            <p>The variable used to tell the Broker its installation directory. It must be an
-              absolute path. This is used to determine the location of Qpid's dependency JARs and
-              some configuration files.</p>
-            <p>Typically the value of this variable will look similar to
-                <code class="literal">c:\qpid\qpid-broker\\6.1.0-SNAPSHOT</code> (Windows) or
-                <code class="literal">/usr/local/qpid/qpid-broker/6.1.0-SNAPSHOT</code> (Unix). The
-              installation prefix will differ from installation to installation. </p>
-            <p>If not set, a value for <code class="literal">QPID_HOME</code> is derived from the location
-              of the script itself.</p>
-          </td></tr><tr><td><a id="Java-Broker-Appendix-Environment-Variables-Qpid-Work"></a>QPID_WORK</td><td>
-            <p>User's home directory</p>
-          </td><td>
-            <p>Used as the default root directory for any data written by the Broker. This is the
-              default location for any message data written to persistent stores and the Broker's
-              log file.</p>
-            <p>For example, <code class="literal">QPID_WORK=/var/qpidwork</code>.</p>
-          </td></tr><tr><td><a id="Java-Broker-Appendix-Environment-Variables-Qpid-Opts"></a>QPID_OPTS</td><td>
-            <p>None</p>
-          </td><td>
-            <p>This is the preferred mechanism for passing <a class="link" href="Java-Broker-Appendix-System-Properties.html" title="Appendix&#160;B.&#160;System Properties">Java system properties</a> to the
-              Broker. The value must be a list of system properties each separate by a space.
-                  <code class="literal">-D<em class="replaceable"><code>name1</code></em>=<em class="replaceable"><code>value1</code></em>
-                  -D<em class="replaceable"><code>name2</code></em>=<em class="replaceable"><code>value2</code></em></code>.
-            </p>
-          </td></tr><tr><td><a id="Java-Broker-Appendix-Environment-Variables-Qpid-Java-Gc"></a>QPID_JAVA_GC</td><td>
-            <code class="literal">-XX:+HeapDumpOnOutOfMemoryError -XX:+UseConcMarkSweepGC</code>
-          </td><td>
-            <p>This is the preferred mechanism for customising garbage collection behaviour. The
-              value should contain valid garbage collection options(s) for the target JVM.</p>
-            <p>Refer to the JVM's documentation for details.</p>
-          </td></tr><tr><td><a id="Java-Broker-Appendix-Environment-Variables-Qpid-Java-Mem"></a>QPID_JAVA_MEM</td><td>
-            <code class="literal">-Xmx512m -XX:MaxDirectMemorySize=1536m</code>
-          </td><td>
-            <p>This is the preferred mechanism for customising the size of the JVM's heap and
-              direct memory.
-              The value should contain valid memory option(s) for the target JVM. Oracle JVMs
-              understand <code class="literal">-Xmx</code> to specify a maximum heap size,
-               <code class="literal">-Xms</code> an initial size, and
-               <code class="literal">-XX:MaxDirectMemorySize</code> for the maximum amount of direct
-               memory.</p>
-            <p>For example, <code class="code">QPID_JAVA_MEM="-Xmx6g -XX:MaxDirectMemorySize=12g"</code> would
-              set a maximum heap size of 6GB and 12GB of direct memory.</p>
-            <p>Refer to the JVM's documentation for details.</p>
-          </td></tr><tr><td><a id="Java-Broker-Appendix-Environment-Variables-Java-Opts"></a>JAVA_OPTS</td><td>None</td><td>
-            <p>This is the preferred mechanism for passing any other JVM options. This variable is
-              commonly used to pass options for diagnostic purposes, for instance to turn on verbose
-              GC. <code class="literal">-verbose:gc</code>.</p>
-            <p>Refer to the JVM's documentation for details.</p>
-          </td></tr></tbody></table></div></div><br class="table-break" /></div><div class="navfooter"><hr /><table summary="Navigation footer" width="100%"><tr><td align="left" width="40%"><a accesskey="p" href="Java-Broker-Backup-And-Recovery-Virtualhost.html">Prev</a>&#160;</td><td align="center" width="20%">&#160;</td><td align="right" width="40%">&#160;<a accesskey="n" href="Java-Broker-Appendix-System-Properties.html">Next</a></td></tr><tr><td align="left" valign="top" width="40%"> [...]
-
-          <hr/>
-
-          <ul id="-apache-navigation">
-            <li><a href="http://www.apache.org/">Apache</a></li>
-            <li><a href="http://www.apache.org/licenses/">License</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="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
-          </ul>
-
-          <p id="-legal">
-            Apache Qpid, Messaging built on AMQP; Copyright &#169; 2015
-            The Apache Software Foundation; Licensed under
-            the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
-            License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
-            project logo are trademarks of The Apache Software
-            Foundation; All other marks mentioned may be trademarks or
-            registered trademarks of their respective owners
-          </p>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Appendix-Operation-Logging.html b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Appendix-Operation-Logging.html
deleted file mode 100644
index 4806b43..0000000
--- a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Appendix-Operation-Logging.html
+++ /dev/null
@@ -1,542 +0,0 @@
-<!DOCTYPE html>
-<!--
- -
- - 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.
- -
--->
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-  <head>
-    <title>Appendix&#160;C.&#160;Operational Logging - Apache Qpid&#8482;</title>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-    <link rel="stylesheet" href="/site.css" type="text/css" async="async"/>
-    <link rel="stylesheet" href="/deferred.css" type="text/css" defer="defer"/>
-    <script type="text/javascript">var _deferredFunctions = [];</script>
-    <script type="text/javascript" src="/deferred.js" defer="defer"></script>
-    <!--[if lte IE 8]>
-      <link rel="stylesheet" href="/ie.css" type="text/css"/>
-      <script type="text/javascript" src="/html5shiv.js"></script>
-    <![endif]-->
-
-    <!-- Redirects for `go get` and godoc.org -->
-    <meta name="go-import"
-          content="qpid.apache.org git https://gitbox.apache.org/repos/asf/qpid-proton.git"/>
-    <meta name="go-source"
-          content="qpid.apache.org
-https://github.com/apache/qpid-proton/blob/go1/README.md
-https://github.com/apache/qpid-proton/tree/go1{/dir}
-https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
-  </head>
-  <body>
-    <div id="-content">
-      <div id="-top" class="panel">
-        <a id="-menu-link"><img width="16" height="16" src="" alt="Menu"/></a>
-
-        <a id="-search-link"><img width="22" height="16" src="" alt="Search"/></a>
-
-        <ul id="-global-navigation">
-          <li><a id="-logotype" href="/index.html">Apache Qpid<sup>&#8482;</sup></a></li>
-          <li><a href="/documentation.html">Documentation</a></li>
-          <li><a href="/download.html">Download</a></li>
-          <li><a href="/discussion.html">Discussion</a></li>
-        </ul>
-      </div>
-
-      <div id="-menu" class="panel" style="display: none;">
-        <div class="flex">
-          <section>
-            <h3>Project</h3>
-
-            <ul>
-              <li><a href="/overview.html">Overview</a></li>
-              <li><a href="/components/index.html">Components</a></li>
-              <li><a href="/releases/index.html">Releases</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Messaging APIs</h3>
-
-            <ul>
-              <li><a href="/proton/index.html">Qpid Proton</a></li>
-              <li><a href="/components/jms/index.html">Qpid JMS</a></li>
-              <li><a href="/components/messaging-api/index.html">Qpid Messaging API</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Servers and tools</h3>
-
-            <ul>
-              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
-              <li><a href="/components/cpp-broker/index.html">C++ broker</a></li>
-              <li><a href="/components/dispatch-router/index.html">Dispatch router</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Resources</h3>
-
-            <ul>
-              <li><a href="/dashboard.html">Dashboard</a></li>
-              <li><a href="https://cwiki.apache.org/confluence/display/qpid/Index">Wiki</a></li>
-              <li><a href="/resources.html">More resources</a></li>
-            </ul>
-          </section>
-        </div>
-      </div>
-
-      <div id="-search" class="panel" style="display: none;">
-        <form action="http://www.google.com/search" method="get">
-          <input type="hidden" name="sitesearch" value="qpid.apache.org"/>
-          <input type="text" name="q" maxlength="255" autofocus="autofocus" tabindex="1"/>
-          <button type="submit">Search</button>
-          <a href="/search.html">More ways to search</a>
-        </form>
-      </div>
-
-      <div id="-middle" class="panel">
-        <ul id="-path-navigation"><li><a href="/index.html">Home</a></li><li><a href="/releases/index.html">Releases</a></li><li><a href="/releases/qpid-java-trunk/index.html">Qpid for Java Trunk</a></li><li><a href="/releases/qpid-java-trunk/java-broker/book/index.html">Apache Qpid Broker for Java</a></li><li>Appendix&#160;C.&#160;Operational Logging</li></ul>
-
-        <div id="-middle-content">
-          <div class="docbook"><div class="navheader"><table summary="Navigation header" width="100%"><tr><th align="center" colspan="3">Appendix&#160;C.&#160;Operational Logging</th></tr><tr><td align="left" width="20%"><a accesskey="p" href="Java-Broker-Appendix-System-Properties.html">Prev</a>&#160;</td><th align="center" width="60%">&#160;</th><td align="right" width="20%">&#160;<a accesskey="n" href="Java-Broker-Appendix-Queue-Alerts.html">Next</a></td></tr></table><hr /></div><div  [...]
-    the lives of objects within the Broker. These concise messages are designed to allow the user to
-    understand the actions of the Broker in retrospect. This is valuable for problem diagnosis and
-    provides a useful audit trail.</p><p>Each log message includes details of the entity causing the action (e.g. a management user
-    or messaging client connection), the entity receiving the action (e.g. a queue or connection)
-    and a description of operation itself.</p><p>The log messages have the following format:</p><pre class="screen">
-    [<code class="literal">Actor</code>] {[<code class="literal">Subject</code>]} [<code class="literal">Message Id</code>] [<code class="literal">Message Text</code>]
-  </pre><p>Where:</p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p><code class="literal">Actor</code> is the entity within the Broker that is
-          <span class="emphasis"><em>performing</em></span> the action. There are actors corresponding to the Broker
-        itself, Management, Connection, and Channels. Their format is described in the <a class="link" href="Java-Broker-Appendix-Operation-Logging.html#Java-Broker-Appendix-Operation-Logging-Actor-Format" title="Table&#160;C.1.&#160;Actors Entities">table</a> below.</p></li><li class="listitem"><p><code class="literal">Subject</code> (optional) is the entity within the Broker that is
-          <span class="emphasis"><em>receiving</em></span> the action. There are subjects corresponding to the
-        Connections, Channels, Queues, Exchanges, Subscriptions, and Message Stores. Their format is
-        described in the <a class="link" href="Java-Broker-Appendix-Operation-Logging.html#Java-Broker-Appendix-Operation-Logging-Subject-Format" title="Table&#160;C.2.&#160;Subject Entities">table</a> below.</p><p>Some actions are reflexive, in these cases the Actor and Subject will be equal.</p></li><li class="listitem"><p><code class="literal">Message Id</code> is an identifier for the type of message. It has the form
-        three alphas and four digits separated by a hyphen <code class="literal">AAA-9999</code>.</p></li><li class="listitem"><p><code class="literal">Message Text</code> is a textual description</p></li></ul></div><p>To illustrate, let's look at two examples.</p><p><code class="literal"><a class="link" href="Java-Broker-Appendix-Operation-Logging.html#Java-Broker-Appendix-Operation-Logging-Message-CON-1001">CON-1001</a></code> is used when a messages client makes an AMQP connection. The
-    connection actor (<code class="literal">con</code>) provides us with details of the peer's connection: the
-    user id used by the client (myapp1), their IP, ephemeral port number and the name of the virtual
-    host. The message text itself gives us further details about the connection: the client id, the
-    protocol version in used, and details of the client's qpid library.</p><pre class="screen">[con:8(myapp1@/127.0.0.1:52851/default)] CON-1001 : Open : Destination : AMQP(127.0.0.1:5672) :
-    Protocol Version : 0-10 : Client ID : myapp1 : Client Version : 6.1.0-SNAPSHOT : Client Product : qpid</pre><p><code class="literal"><a class="link" href="Java-Broker-Appendix-Operation-Logging.html#Java-Broker-Appendix-Operation-Logging-Message-QUE-1001">QUE-1001</a></code> is used when a queue is created. The connection actor
-      <code class="literal">con</code> tells us details of the connection performing the queue creation: the
-    user id used by the client (myapp1), the IP, ephemeral port number and the name of the virtual
-    host. The queue subject tells use the queue's name (myqueue) and the virtualhost. The message
-    itself tells us more information about the queue that is being created. </p><pre class="screen">[con:8(myapp1@/127.0.0.1:52851/default)/ch:0] [vh(/default)/qu(myqueue)] QUE-1001 : Create : Owner: myapp1 Transient</pre><p>The first two tables that follow describe the actor and subject entities, then the later
-    provide a complete catalogue of all supported messages.</p><div class="table"><a id="Java-Broker-Appendix-Operation-Logging-Actor-Format"></a><p class="title"><strong>Table&#160;C.1.&#160;Actors Entities</strong></p><div class="table-contents"><table border="1" summary="Actors Entities" width="100%"><colgroup><col /><col /></colgroup><thead><tr><th>Actor Type</th><th>Format and Purpose</th></tr></thead><tbody><tr><td rowspan="2">Broker</td><td>[Broker]</td></tr><tr><td>
-            <p>Used during startup and shutdown</p>
-          </td></tr><tr><td rowspan="2">Management</td><td>
-              [mng:<em class="replaceable"><code>userid</code></em>(<em class="replaceable"><code>clientip</code></em>:<em class="replaceable"><code>ephemeralport</code></em>)] </td></tr><tr><td>
-            <p>Used for operations performed by the Web Management interfaces.</p>
-          </td></tr><tr><td rowspan="2">Connection</td><td>
-              [con:<em class="replaceable"><code>connectionnumber</code></em>(<em class="replaceable"><code>userid</code></em>@/<em class="replaceable"><code>clientip</code></em>:<em class="replaceable"><code>ephemeralport</code></em>/<em class="replaceable"><code>virtualhostname</code></em>)]</td></tr><tr><td>
-            <p>Used for operations performed by a client connection. Note that connections are
-              numbered by a sequence number that begins at 1.</p>
-          </td></tr><tr><td rowspan="2">Channel</td><td>
-              [con:<em class="replaceable"><code>connectionnumber</code></em>(<em class="replaceable"><code>userid</code></em>@/<em class="replaceable"><code>clientip</code></em>:<em class="replaceable"><code>ephemeralport</code></em>/<em class="replaceable"><code>virtualhostname</code></em>/ch:<em class="replaceable"><code>channelnumber</code></em>)]</td></tr><tr><td>
-            <p>Used for operations performed by a client's channel (corresponds to the JMS
-              concept of Session). Note that channels are numbered by a sequence number that is
-              scoped by the owning connection.</p>
-          </td></tr><tr><td rowspan="2">Group</td><td> [grp(/<em class="replaceable"><code>groupname</code></em>)/vhn(/<em class="replaceable"><code>virtualhostnode
-              name</code></em>)]</td></tr><tr><td>
-            <p>Used for HA. Used for operations performed by the system itself often as a result
-              of actions performed on another node..</p>
-          </td></tr></tbody></table></div></div><br class="table-break" /><div class="table"><a id="Java-Broker-Appendix-Operation-Logging-Subject-Format"></a><p class="title"><strong>Table&#160;C.2.&#160;Subject Entities</strong></p><div class="table-contents"><table border="1" summary="Subject Entities" width="100%"><colgroup><col /><col /></colgroup><thead><tr><th>Subject Type</th><th>Format and Purpose</th></tr></thead><tbody><tr><td rowspan="2">Connection</td><td>
-              [con:<em class="replaceable"><code>connectionnumber</code></em>(<em class="replaceable"><code>userid</code></em>@/<em class="replaceable"><code>clientip</code></em>:<em class="replaceable"><code>ephemeralport</code></em>/<em class="replaceable"><code>virtualhostname</code></em>)]</td></tr><tr><td>
-            <p>A connection to the Broker.</p>
-          </td></tr><tr><td rowspan="2">Channel</td><td>
-              [con:<em class="replaceable"><code>connectionnumber</code></em>(<em class="replaceable"><code>userid</code></em>@/<em class="replaceable"><code>clientip</code></em>:<em class="replaceable"><code>ephemeralport</code></em>/<em class="replaceable"><code>virtualhostname</code></em>/ch:<em class="replaceable"><code>channelnumber</code></em>)]</td></tr><tr><td>
-            <p>A client's channel within a connection.</p>
-          </td></tr><tr><td rowspan="2">Subscription</td><td>
-              [sub:<em class="replaceable"><code>subscriptionnumber</code></em>(vh(/<em class="replaceable"><code>virtualhostname</code></em>)/qu(<em class="replaceable"><code>queuename</code></em>)]</td></tr><tr><td>
-            <p>A subscription to a queue. This corresponds to the JMS concept of a
-              Consumer.</p>
-          </td></tr><tr><td rowspan="2">Queue</td><td>[vh(/<em class="replaceable"><code>virtualhostname</code></em>)/qu(<em class="replaceable"><code>queuename</code></em>)]</td></tr><tr><td>
-            <p>A queue on a virtualhost</p>
-          </td></tr><tr><td rowspan="2">Exchange</td><td>[vh(/<em class="replaceable"><code>virtualhostname</code></em>)/ex(<em class="replaceable"><code>exchangetype</code></em>/<em class="replaceable"><code>exchangename</code></em>)]</td></tr><tr><td>
-            <p>An exchange on a virtualhost</p>
-          </td></tr><tr><td rowspan="2">Binding</td><td>
-              [vh(/<em class="replaceable"><code>virtualhostname</code></em>)/ex(<em class="replaceable"><code>exchangetype</code></em>/<em class="replaceable"><code>exchangename</code></em>)/qu(<em class="replaceable"><code>queuename</code></em>)/rk(<em class="replaceable"><code>bindingkey</code></em>)]</td></tr><tr><td>
-            <p>A binding between a queue and exchange with the giving binding key.</p>
-          </td></tr><tr><td rowspan="2">Message Store</td><td>
-              [vh(/<em class="replaceable"><code>virtualhostname</code></em>)/ms(<em class="replaceable"><code>messagestorename</code></em>)]</td></tr><tr><td>
-            <p>A virtualhost/message store on the Broker.</p>
-          </td></tr><tr><td rowspan="2">HA Group</td><td> [grp(/<em class="replaceable"><code>group name</code></em>)]</td></tr><tr><td>
-            <p>A HA group</p>
-          </td></tr></tbody></table></div></div><br class="table-break" /><p>The following tables lists all the operation log messages that can be produced by the
-    Broker, and the describes the circumstances under which each may be seen.</p><div class="table"><a id="Java-Broker-Appendix-Operation-Logging-Message-List-Broker"></a><p class="title"><strong>Table&#160;C.3.&#160;Broker Log Messages</strong></p><div class="table-contents"><table border="1" summary="Broker Log Messages" width="100%"><colgroup><col /><col /></colgroup><thead><tr><th>Message Id</th><th>Message Text / Purpose</th></tr></thead><tbody><tr><td rowspan="2"><a id="Java-Broker [...]
-              <em class="replaceable"><code>build</code></em>
-          </td></tr><tr><td>
-            <p>Indicates that the Broker is starting up</p>
-          </td></tr><tr><td rowspan="2"><a id="Java-Broker-Appendix-Operation-Logging-Message-BRK-1002"></a>BRK-1002</td><td>Starting : Listening on <em class="replaceable"><code>transporttype</code></em> port
-              <em class="replaceable"><code>portnumber</code></em>
-          </td></tr><tr><td>
-            <p>Indicates that the Broker has begun listening on a port.</p>
-          </td></tr><tr><td rowspan="2"><a id="Java-Broker-Appendix-Operation-Logging-Message-BRK-1003"></a>BRK-1003</td><td>Shutting down : <em class="replaceable"><code>transporttype</code></em> port
-              <em class="replaceable"><code>portnumber</code></em>
-          </td></tr><tr><td>
-            <p>Indicates that the Broker has stopped listening on a port.</p>
-          </td></tr><tr><td rowspan="2"><a id="Java-Broker-Appendix-Operation-Logging-Message-BRK-1004"></a>BRK-1004</td><td>Qpid Broker Ready</td></tr><tr><td>
-            <p>Indicates that the Broker is ready for normal operations.</p>
-          </td></tr><tr><td rowspan="2"><a id="Java-Broker-Appendix-Operation-Logging-Message-BRK-1005"></a>BRK-1005</td><td>Stopped</td></tr><tr><td>
-            <p>Indicates that the Broker is stopped.</p>
-          </td></tr><tr><td rowspan="2"><a id="Java-Broker-Appendix-Operation-Logging-Message-BRK-1006"></a>BRK-1006</td><td>Using configuration : <em class="replaceable"><code>file</code></em>
-          </td></tr><tr><td>
-            <p>Indicates the name of the configuration store in use by the Broker.</p>
-          </td></tr><tr><td rowspan="2"><a id="Java-Broker-Appendix-Operation-Logging-Message-BRK-1008"></a>BRK-1008</td><td><em class="replaceable"><code>delivered|received</code></em> : <em class="replaceable"><code>size</code></em>
-            kB/s peak : <em class="replaceable"><code>size</code></em> bytes total</td></tr><tr><td>
-            <p>Statistic - bytes delivered or received by the Broker.</p>
-          </td></tr><tr><td rowspan="2"><a id="Java-Broker-Appendix-Operation-Logging-Message-BRK-1009"></a>BRK-1009</td><td><em class="replaceable"><code>delivered|received</code></em> : <em class="replaceable"><code>size</code></em>
-            msg/s peak : <em class="replaceable"><code>size</code></em> msgs total</td></tr><tr><td>
-            <p>Statistic - messages delivered or received by the Broker.</p>
-          </td></tr><tr><td rowspan="2"><a id="Java-Broker-Appendix-Operation-Logging-Message-BRK-1010"></a>BRK-1010</td><td>Platform : JVM : <em class="replaceable"><code>vendor</code></em> version: <em class="replaceable"><code>version
-          </code></em> OS : <em class="replaceable"><code>operating system vendor</code></em> version:
-            <em class="replaceable"><code>operating system version</code></em>} arch: <em class="replaceable"><code>processor
-              architecture</code></em> cores: <em class="replaceable"><code>number of CPU cores</code></em></td></tr><tr><td>
-            <p>Key information about the environment hosting the Broker</p>
-          </td></tr><tr><td rowspan="2"><a id="Java-Broker-Appendix-Operation-Logging-Message-BRK-1011"></a>BRK-1011</td><td>Maximum Memory : Heap : <em class="replaceable"><code>size</code></em> bytes Direct : <em class="replaceable"><code>
-            bytes</code></em> size</td></tr><tr><td>
-            <p>Configured memory paramters for the Broker.</p>
-          </td></tr><tr><td rowspan="2"><a id="Java-Broker-Appendix-Operation-Logging-Message-BRK-1012"></a>BRK-1012</td><td>Management Mode : User Details : <em class="replaceable"><code>management node user id</code></em> /
-            <em class="replaceable"><code>management mode password</code></em></td></tr><tr><td>
-            <p>Used when Broker is started in management mode to indicate the
-             management credentials that may be used connect to the Broker.</p>
-          </td></tr><tr><td rowspan="2"><a id="Java-Broker-Appendix-Operation-Logging-Message-BRK-1014"></a>BRK-1014</td><td>Message flow to disk active : Message memory use <em class="replaceable"><code>size of all
-              messages</code></em> exceeds threshold <em class="replaceable"><code>threshold
-            size</code></em></td></tr><tr><td>
-            <p>Indicates that the memory space occupied by messages has exceeded the
-              threshold so the flow to disk feature has been activated.</p>
-          </td></tr><tr><td rowspan="2"><a id="Java-Broker-Appendix-Operation-Logging-Message-BRK-1015"></a>BRK-1015</td><td>Message flow to disk inactive : Message memory use <em class="replaceable"><code>size of all
-              messages</code></em> within threshold <em class="replaceable"><code>threshold
-            size</code></em></td></tr><tr><td>
-            <p>Indicates that the memory space occupied by messages has fallen below the
-              threshold so the flow to disk feature has been deactivated.</p>
-          </td></tr><tr><td rowspan="2"><a id="Java-Broker-Appendix-Operation-Logging-Message-BRK-1016"></a>BRK-1016</td><td>Fatal error : <em class="replaceable"><code>root cause</code></em> : See log file for more information</td></tr><tr><td>
-            <p>Indicates that broker was shut down due to fatal error.</p>
-          </td></tr><tr><td rowspan="2"><a id="Java-Broker-Appendix-Operation-Logging-Message-BRK-1017"></a>BRK-1017</td><td>Process : PID <em class="replaceable"><code>process identifier</code></em></td></tr><tr><td>
-            <p>Process identifier (PID) of the Broker process.</p>
-          </td></tr></tbody></table></div></div><br class="table-break" /><div class="table"><a id="Java-Broker-Appendix-Operation-Logging-Message-List-Management"></a><p class="title"><strong>Table&#160;C.4.&#160;Management Log Messages</strong></p><div class="table-contents"><table border="1" summary="Management Log Messages" width="100%"><colgroup><col /><col /></colgroup><thead><tr><th>Message Id</th><th>Message Text / Purpose</th></tr></thead><tbody><tr><td rowspan="2"><a id="Java-B [...]
-            <p>Indicates that a Management plugin is starting up. Supported by Web management plugin.</p>
-          </td></tr><tr><td rowspan="2"><a id="Java-Broker-Appendix-Operation-Logging-Message-MNG-1002"></a>MNG-1002</td><td>Starting : <em class="replaceable"><code>type</code></em> : Listening on <em class="replaceable"><code>transporttype</code></em> port
-              <em class="replaceable"><code>port</code></em>
-          </td></tr><tr><td>
-            <p>Indicates that a Management plugin is listening on the given port.</p>
-          </td></tr><tr><td rowspan="2"><a id="Java-Broker-Appendix-Operation-Logging-Message-MNG-1003"></a>MNG-1003</td><td>Shutting down : <em class="replaceable"><code>type</code></em> : port
-              <em class="replaceable"><code>port</code></em></td></tr><tr><td>
-            <p>Indicates that a Management plugin is ceasing to listen on the given port.</p>
-          </td></tr><tr><td rowspan="2"><a id="Java-Broker-Appendix-Operation-Logging-Message-MNG-1004"></a>MNG-1004</td><td><em class="replaceable"><code>type</code></em> Management Ready</td></tr><tr><td>
-            <p>Indicates that a Management plugin is ready for work.</p>
-          </td></tr><tr><td rowspan="2"><a id="Java-Broker-Appendix-Operation-Logging-Message-MNG-1005"></a>MNG-1005</td><td><em class="replaceable"><code>type</code></em> Management Stopped</td></tr><tr><td>
-            <p>Indicates that a Management plugin is stopped.</p>
-          </td></tr><tr><td rowspan="2"><a id="Java-Broker-Appendix-Operation-Logging-Message-MNG-1007"></a>MNG-1007</td><td>Open : User <em class="replaceable"><code>username</code></em></td></tr><tr><td>
-            <p>Indicates the opening of a connection to Management has by the given
-              username.</p>
-          </td></tr><tr><td rowspan="2"><a id="Java-Broker-Appendix-Operation-Logging-Message-MNG-1008"></a>MNG-1008</td><td>Close : User <em class="replaceable"><code>username</code></em></td></tr><tr><td>
-            <p>Indicates the closing of a connection to Management has by the given
-              username.</p>
-          </td></tr></tbody></table></div></div><br class="table-break" /><div class="table"><a id="Java-Broker-Appendix-Operation-Logging-Message-List-VirtualHost"></a><p class="title"><strong>Table&#160;C.5.&#160;Virtual Host Log Messages</strong></p><div class="table-contents"><table border="1" summary="Virtual Host Log Messages" width="100%"><colgroup><col /><col /></colgroup><thead><tr><th>Message Id</th><th>Message Text / Purpose</th></tr></thead><tbody><tr><td rowspan="2"><a id="J [...]
-            <p>Indicates that a virtualhost has been created.</p>
-          </td></tr><tr><td rowspan="2"><a id="Java-Broker-Appendix-Operation-Logging-Message-VHT-1002"></a>VHT-1002</td><td>Closed</td></tr><tr><td>
-            <p>Indicates that a virtualhost has been closed. This occurs on Broker
-              shutdown.</p>
-          </td></tr><tr><td rowspan="2"><a id="Java-Broker-Appendix-Operation-Logging-Message-VHT-1003"></a>VHT-1003</td><td><em class="replaceable"><code>virtualhostname</code></em> :
-              <em class="replaceable"><code>delivered|received</code></em> : <em class="replaceable"><code>size</code></em> kB/s
-            peak : <em class="replaceable"><code>size</code></em> bytes total</td></tr><tr><td>
-            <p>Statistic - bytes delivered or received by the virtualhost.</p>
-          </td></tr><tr><td rowspan="2"><a id="Java-Broker-Appendix-Operation-Logging-Message-VHT-1004"></a>VHT-1004</td><td><em class="replaceable"><code>virtualhostname</code></em> :
-              <em class="replaceable"><code>delivered|received</code></em> : <em class="replaceable"><code>size</code></em> msg/s
-            peak : <em class="replaceable"><code>size</code></em> msgs total</td></tr><tr><td>
-            <p>Statistic - messages delivered or received by the virtualhost.</p>
-          </td></tr><tr><td rowspan="2"><a id="Java-Broker-Appendix-Operation-Logging-Message-VHT-1005"></a>VHT-1005</td><td>Unexpected fatal error</td></tr><tr><td>
-            <p>Virtualhost has suffered an unexpected fatal error, check the logs for more
-              details.</p>
-          </td></tr><tr><td rowspan="2"><a id="Java-Broker-Appendix-Operation-Logging-Message-VHT-1006"></a>VHT-1006</td><td>Filesystem is over <em class="replaceable"><code>size in %</code></em> per cent full, enforcing flow control.</td></tr><tr><td>
-            <p>Indicates that virtual host flow control is activated
-                  when the usage of file system containing Virtualhost  message store exceeded predefined limit.</p>
-          </td></tr><tr><td rowspan="2"><a id="Java-Broker-Appendix-Operation-Logging-Message-VHT-1007"></a>VHT-1007</td><td>Filesystem is no longer over <em class="replaceable"><code>size in %</code></em> per cent full.</td></tr><tr><td>
-            <p>Indicates that virtual host flow control is deactivated
-                  when the usage of file system containing Virtualhost message falls under predefined limit.</p>
-          </td></tr></tbody></table></div></div><br class="table-break" /><div class="table"><a id="Java-Broker-Appendix-Operation-Logging-Message-List-Queue"></a><p class="title"><strong>Table&#160;C.6.&#160;Queue Log Messages</strong></p><div class="table-contents"><table border="1" summary="Queue Log Messages" width="100%"><colgroup><col /><col /></colgroup><thead><tr><th>Message Id</th><th>Message Text / Purpose</th></tr></thead><tbody><tr><td rowspan="2"><a id="Java-Broker-Appendix- [...]
-            <em class="replaceable"><code>AutoDelete</code></em> [<em class="replaceable"><code>Durable</code></em>]
-              <em class="replaceable"><code>Transient</code></em> Priority:
-              <em class="replaceable"><code>numberofpriorities</code></em></td></tr><tr><td>
-            <p>Indicates that a queue has been created.</p>
-          </td></tr><tr><td rowspan="2"><a id="Java-Broker-Appendix-Operation-Logging-Message-QUE-1002"></a>QUE-1002</td><td>Deleted</td></tr><tr><td>
-            <p>Indicates that a queue has been deleted.</p>
-          </td></tr><tr><td rowspan="2"><a id="Java-Broker-Appendix-Operation-Logging-Message-QUE-1003"></a>QUE-1003</td><td>Overfull : Size : <em class="replaceable"><code>size</code></em> bytes, Capacity :
-              <em class="replaceable"><code>maximumsize</code></em></td></tr><tr><td>
-            <p>Indicates that a queue has exceeded its permitted capacity. See <a class="xref" href="Java-Broker-Runtime-Disk-Space-Management.html#Qpid-Producer-Flow-Control" title="9.2.1.&#160;Producer Flow Control">Section&#160;9.2.1, &#8220;Producer Flow Control&#8221;</a> for details.</p>
-          </td></tr><tr><td rowspan="2"><a id="Java-Broker-Appendix-Operation-Logging-Message-QUE-1004"></a>QUE-1004</td><td>Underfull : Size : <em class="replaceable"><code>size</code></em> bytes, Resume Capacity :
-              <em class="replaceable"><code>resumesize</code></em></td></tr><tr><td>
-            <p>Indicates that a queue has fallen to its resume capacity. See <a class="xref" href="Java-Broker-Runtime-Disk-Space-Management.html#Qpid-Producer-Flow-Control" title="9.2.1.&#160;Producer Flow Control">Section&#160;9.2.1, &#8220;Producer Flow Control&#8221;</a> for details.</p>
-          </td></tr><tr><td rowspan="2"><a id="Java-Broker-Appendix-Operation-Logging-Message-QUE-1014"></a>QUE-1014</td><td>Message flow to disk active : Message memory use <em class="replaceable"><code>size of all
-            messages</code></em> exceeds threshold <em class="replaceable"><code>threshold
-              size</code></em></td></tr><tr><td>
-            <p>Indicates that the memory space occupied by messages for this queue
-              has exceeded thevthreshold so the flow to disk feature has been activated.</p>
-          </td></tr><tr><td rowspan="2"><a id="Java-Broker-Appendix-Operation-Logging-Message-QUE-1015"></a>QUE-1015</td><td>Message flow to disk inactive : Message memory use <em class="replaceable"><code>size of all
-            messages</code></em> within threshold <em class="replaceable"><code>threshold
-              size</code></em></td></tr><tr><td>
-            <p>Indicates that the memory space occupied by messages for this queue has fallen
-              below the threshold so the flow to disk feature has been deactivated.</p>
-          </td></tr></tbody></table></div></div><br class="table-break" /><div class="table"><a id="Java-Broker-Appendix-Operation-Logging-Message-List-Exchange"></a><p class="title"><strong>Table&#160;C.7.&#160;Exchange Log Messages</strong></p><div class="table-contents"><table border="1" summary="Exchange Log Messages" width="100%"><colgroup><col /><col /></colgroup><thead><tr><th>Message Id</th><th>Message Text / Purpose</th></tr></thead><tbody><tr><td rowspan="2"><a id="Java-Broker- [...]
-            Name: <em class="replaceable"><code>exchange name</code></em></td></tr><tr><td>
-            <p>Indicates that an exchange has been created.</p>
-          </td></tr><tr><td rowspan="2"><a id="Java-Broker-Appendix-Operation-Logging-Message-EXH-1002"></a>EXH-1002</td><td>Deleted</td></tr><tr><td>
-            <p>Indicates that an exchange has been deleted.</p>
-          </td></tr><tr><td rowspan="2"><a id="Java-Broker-Appendix-Operation-Logging-Message-EXH-1003"></a>EXH-1003</td><td>Discarded Message : Name: <em class="replaceable"><code>exchange name</code></em> Routing Key:
-              <em class="replaceable"><code>routing key</code></em></td></tr><tr><td>
-            <p>Indicates that an exchange received a message that could not be routed to at least
-              one queue. queue has exceeded its permitted capacity. See <a class="xref" href="Java-Broker-Concepts-Exchanges.html#Java-Broker-Concepts-Exchanges-UnroutableMessage" title="4.6.4.&#160;Unrouteable Messages">Section&#160;4.6.4, &#8220;Unrouteable Messages&#8221;</a> for details.</p>
-          </td></tr></tbody></table></div></div><br class="table-break" /><div class="table"><a id="Java-Broker-Appendix-Operation-Logging-Message-List-Binding"></a><p class="title"><strong>Table&#160;C.8.&#160;Binding Log Messages</strong></p><div class="table-contents"><table border="1" summary="Binding Log Messages" width="100%"><colgroup><col /><col /></colgroup><thead><tr><th>Message Id</th><th>Message Text / Purpose</th></tr></thead><tbody><tr><td rowspan="2"><a id="Java-Broker-App [...]
-            <p>Indicates that a binding has been made between an exchange and a queue.</p>
-          </td></tr><tr><td rowspan="2"><a id="Java-Broker-Appendix-Operation-Logging-Message-BND-1002"></a>BND-1002</td><td>Deleted</td></tr><tr><td>
-            <p>Indicates that a binding has been deleted</p>
-          </td></tr></tbody></table></div></div><br class="table-break" /><div class="table"><a id="Java-Broker-Appendix-Operation-Logging-Message-List-Connection"></a><p class="title"><strong>Table&#160;C.9.&#160;Connection Log Messages</strong></p><div class="table-contents"><table border="1" summary="Connection Log Messages" width="100%"><colgroup><col /><col /></colgroup><thead><tr><th>Message Id</th><th>Message Text / Purpose</th></tr></thead><tbody><tr><td rowspan="2"><a id="Java-B [...]
-            <em class="replaceable"><code>protocol version</code></em> : Client ID : <em class="replaceable"><code>clientid</code></em> :
-            Client Version : <em class="replaceable"><code>client version</code></em> :
-            Client Product : <em class="replaceable"><code>client product</code></em></td></tr><tr><td>
-            <p>Indicates that a connection has been opened. The Broker logs one of these message
-              each time it learns more about the client as the connection is negotiated.</p>
-          </td></tr><tr><td rowspan="2"><a id="Java-Broker-Appendix-Operation-Logging-Message-CON-1002"></a>CON-1002</td><td>Close</td></tr><tr><td>
-            <p>Indicates that a connection has been closed. This message is logged regardless of
-              if the connection is closed normally, or if the connection is somehow lost e.g network
-              error. </p>
-          </td></tr><tr><td rowspan="2"><a id="Java-Broker-Appendix-Operation-Logging-Message-CON-1003"></a>CON-1003</td><td>Closed due to inactivity</td></tr><tr><td>
-            <p>Used when heart beating is in-use. Indicates that the connection has not received
-              a heartbeat for too long and is therefore closed as being inactive. </p>
-          </td></tr><tr><td rowspan="2"><a id="Java-Broker-Appendix-Operation-Logging-Message-CON-1004"></a>CON-1004</td><td>Connection dropped</td></tr><tr><td>
-            <p>Indicates that a connection has been unexpectedly closed by the peer. This usually
-            occurs if a machine hosting an application fails or the application's process is
-            abruptly terminated.</p>
-          </td></tr><tr><td rowspan="2"><a id="Java-Broker-Appendix-Operation-Logging-Message-CON-1005"></a>CON-1005</td><td>Client version <em class="replaceable"><code>version</code></em> logged by validation</td></tr><tr><td>
-            <p>Indicates that a connection has been received from client with a version number
-              that is configured to be logged.  This feature may help teams manage software currency.</p>
-          </td></tr><tr><td rowspan="2"><a id="Java-Broker-Appendix-Operation-Logging-Message-CON-1006"></a>CON-1006</td><td>Client version <em class="replaceable"><code>version</code></em> rejected by validation</td></tr><tr><td>
-            <p>Indicates that a connection attempt has been received from client with a version number
-              that is configured to be rejected.  This feature may help manage software currency.</p>
-          </td></tr><tr><td rowspan="2"><a id="Java-Broker-Appendix-Operation-Logging-Message-CON-1007"></a>CON-1007</td><td>Connection close initiated by operator</td></tr><tr><td>
-            <p>Indicates that a connection has been closed by the actions of an
-            Operator using manangement.</p>
-          </td></tr></tbody></table></div></div><br class="table-break" /><div class="table"><a id="Java-Broker-Appendix-Operation-Logging-Message-List-Channel"></a><p class="title"><strong>Table&#160;C.10.&#160;Channel Log Messages</strong></p><div class="table-contents"><table border="1" summary="Channel Log Messages" width="100%"><colgroup><col /><col /></colgroup><thead><tr><th>Message Id</th><th>Message Text / Purpose</th></tr></thead><tbody><tr><td rowspan="2"><a id="Java-Broker-Ap [...]
-            <p>Indicates that a channel (corresponds to the JMS concept of Session) has been
-              created.</p>
-          </td></tr><tr><td rowspan="2"><a id="Java-Broker-Appendix-Operation-Logging-Message-CHN-1002"></a>CHN-1002</td><td>Flow Started</td></tr><tr><td>
-            <p>Indicates message flow to a session has begun.</p>
-          </td></tr><tr><td rowspan="2"><a id="Java-Broker-Appendix-Operation-Logging-Message-CHN-1003"></a>CHN-1003</td><td>Close</td></tr><tr><td>
-            <p>Indicates that a channel has been closed.</p>
-          </td></tr><tr><td rowspan="2"><a id="Java-Broker-Appendix-Operation-Logging-Message-CHN-1004"></a>CHN-1004</td><td>Prefetch Size (bytes) <em class="replaceable"><code>size</code></em> : Count <em class="replaceable"><code>number
-              of messages</code></em></td></tr><tr><td>
-            <p>Indicates the prefetch size in use by a channel.</p>
-          </td></tr><tr><td rowspan="2"><a id="Java-Broker-Appendix-Operation-Logging-Message-CHN-1005"></a>CHN-1005</td><td>Flow Control Enforced (Queue <em class="replaceable"><code>queue name</code></em>)</td></tr><tr><td>
-            <p>Indicates that producer flow control has been imposed on a channel owning to
-              excessive queue depth in the indicated queue. Produces using the channel will be
-              requested to pause the sending of messages. See <a class="xref" href="Java-Broker-Runtime-Disk-Space-Management.html#Qpid-Producer-Flow-Control" title="9.2.1.&#160;Producer Flow Control">Section&#160;9.2.1, &#8220;Producer Flow Control&#8221;</a> for more details.</p>
-          </td></tr><tr><td rowspan="2"><a id="Java-Broker-Appendix-Operation-Logging-Message-CHN-1006"></a>CHN-1006</td><td>Flow Control Removed</td></tr><tr><td>
-            <p>Indicates that producer flow control has been removed from a channel. See <a class="xref" href="Java-Broker-Runtime-Disk-Space-Management.html#Qpid-Producer-Flow-Control" title="9.2.1.&#160;Producer Flow Control">Section&#160;9.2.1, &#8220;Producer Flow Control&#8221;</a> for more details.</p>
-          </td></tr><tr><td rowspan="2"><a id="Java-Broker-Appendix-Operation-Logging-Message-CHN-1007"></a>CHN-1007</td><td>Open Transaction : <em class="replaceable"><code>time</code></em> ms</td></tr><tr><td>
-            <p>Indicates that a producer transaction has been open for longer than that
-              permitted. See <a class="xref" href="Java-Broker-Runtime-Producer-Transaction-Timeout.html" title="9.3.&#160;Producer Transaction Timeout">Section&#160;9.3, &#8220;Producer Transaction Timeout&#8221;</a> for
-              more details.</p>
-          </td></tr><tr><td rowspan="2"><a id="Java-Broker-Appendix-Operation-Logging-Message-CHN-1008"></a>CHN-1008</td><td>Idle Transaction : <em class="replaceable"><code>time</code></em> ms</td></tr><tr><td>
-            <p>Indicates that a producer transaction has been idle for longer than that
-              permitted. See <a class="xref" href="Java-Broker-Runtime-Producer-Transaction-Timeout.html" title="9.3.&#160;Producer Transaction Timeout">Section&#160;9.3, &#8220;Producer Transaction Timeout&#8221;</a> for
-              more details.</p>
-          </td></tr><tr><td rowspan="2"><a id="Java-Broker-Appendix-Operation-Logging-Message-CHN-1009"></a>CHN-1009</td><td>Discarded message : <em class="replaceable"><code>message number</code></em> as no alternate
-            exchange configured for queue : <em class="replaceable"><code>queue name</code></em>{1} routing key :
-              <em class="replaceable"><code>routing key</code></em></td></tr><tr><td>
-            <p>Indicates that a channel has discarded a message as the maximum delivery count has
-              been exceeded but the queue defines no alternate exchange. See <a class="xref" href="Java-Broker-Runtime-Handling-Undeliverable-Messages.html#Java-Broker-Runtime-Handling-Undeliverable-Messages-Maximum-Delivery-Count" title="9.4.2.&#160;Maximum Delivery Count">Section&#160;9.4.2, &#8220;Maximum Delivery Count&#8221;</a> for more details. Note that <em class="replaceable"><code>message number</code></em> is an
-              internal message reference.</p>
-          </td></tr><tr><td rowspan="2"><a id="Java-Broker-Appendix-Operation-Logging-Message-CHN-1010"></a>CHN-1010</td><td>Discarded message : <em class="replaceable"><code>message number</code></em> as no binding on
-            alternate exchange : <em class="replaceable"><code>exchange name</code></em></td></tr><tr><td>
-            <p>Indicates that a channel has discarded a message as the maximum delivery count has
-              been exceeded but the queue's alternate exchange has no binding to a queue. See <a class="xref" href="Java-Broker-Runtime-Handling-Undeliverable-Messages.html#Java-Broker-Runtime-Handling-Undeliverable-Messages-Maximum-Delivery-Count" title="9.4.2.&#160;Maximum Delivery Count">Section&#160;9.4.2, &#8220;Maximum Delivery Count&#8221;</a> for more details. Note that <em class="replaceable"><code>message number</code></em> is an
-              internal message reference.</p>
-          </td></tr><tr><td rowspan="2"><a id="Java-Broker-Appendix-Operation-Logging-Message-CHN-1011"></a>CHN-1011</td><td>Message : <em class="replaceable"><code>message number</code></em> moved to dead letter queue :
-              <em class="replaceable"><code>queue name</code></em></td></tr><tr><td>
-            <p>Indicates that a channel has moved a message to the named dead letter queue
-            </p>
-          </td></tr><tr><td rowspan="2"><a id="Java-Broker-Appendix-Operation-Logging-Message-CHN-1012"></a>CHN-1012</td><td>Flow Control Ignored. Channel will be closed.</td></tr><tr><td>
-            <p>Indicates that a channel violating the imposed flow control has been closed
-            </p>
-          </td></tr><tr><td rowspan="2"><a id="Java-Broker-Appendix-Operation-Logging-Message-CHN-1013"></a>CHN-1013</td><td>Uncommitted transaction contains <em class="replaceable"><code>size</code></em> bytes of incoming message data.</td></tr><tr><td>
-              <p>Warns about uncommitted transaction with large message(s)
-              </p>
-          </td></tr></tbody></table></div></div><br class="table-break" /><div class="table"><a id="Java-Broker-Appendix-Operation-Logging-Message-List-Subscription"></a><p class="title"><strong>Table&#160;C.11.&#160;Subscription Log Messages</strong></p><div class="table-contents"><table border="1" summary="Subscription Log Messages" width="100%"><colgroup><col /><col /></colgroup><thead><tr><th>Message Id</th><th>Message Text / Purpose</th></tr></thead><tbody><tr><td rowspan="2"><a id= [...]
-              <em class="replaceable"><code>arguments</code></em></td></tr><tr><td>
-            <p>Indicates that a subscription (corresponds to JMS concept of a MessageConsumer)
-              has been created.</p>
-          </td></tr><tr><td rowspan="2"><a id="Java-Broker-Appendix-Operation-Logging-Message-SUB-1002"></a>SUB-1002</td><td>Close</td></tr><tr><td>
-            <p>Indicates that a subscription has been closed.</p>
-          </td></tr><tr><td rowspan="2"><a id="Java-Broker-Appendix-Operation-Logging-Message-SUB-1003"></a>SUB-1003</td><td>SUB-1003 : Suspended for <em class="replaceable"><code>time</code></em> ms</td></tr><tr><td>
-            <p>Indicates that a subscription has been in a suspened state for an unusual length
-              of time.  This may be indicative of an consuming application that has stopped taking
-              messages from the consumer (i.e. a JMS application is not calling receive() or its
-              asynchronous message listener onMessage() is blocked in application code).  It may also
-              indicate a generally overloaded system.
-              </p>
-          </td></tr></tbody></table></div></div><br class="table-break" /><div class="table"><a id="Java-Broker-Appendix-Operation-Logging-Message-List-MessageStore"></a><p class="title"><strong>Table&#160;C.12.&#160;Message Store Log Messages</strong></p><div class="table-contents"><table border="1" summary="Message Store Log Messages" width="100%"><colgroup><col /><col /></colgroup><thead><tr><th>Message Id</th><th>Message Text / Purpose</th></tr></thead><tbody><tr><td rowspan="2"><a i [...]
-            <p>Indicates that a message store has been created. The message store is responsible
-              for the storage of the messages themselves, including the message body and any
-              headers.</p>
-          </td></tr><tr><td rowspan="2"><a id="Java-Broker-Appendix-Operation-Logging-Message-MST-1002"></a>MST-1002</td><td>Store location : <em class="replaceable"><code>path</code></em></td></tr><tr><td>
-            <p>Indicates that the message store is using <em class="replaceable"><code>path</code></em> for the
-              location of the message store.</p>
-          </td></tr><tr><td rowspan="2"><a id="Java-Broker-Appendix-Operation-Logging-Message-MST-1003"></a>MST-1003</td><td>Closed</td></tr><tr><td>
-            <p>Indicates that the message store has been closed.</p>
-          </td></tr><tr><td rowspan="2"><a id="Java-Broker-Appendix-Operation-Logging-Message-MST-1004"></a>MST-1004</td><td>Recovery Start</td></tr><tr><td>
-            <p>Indicates that message recovery has begun.</p>
-          </td></tr><tr><td rowspan="2"><a id="Java-Broker-Appendix-Operation-Logging-Message-MST-1005"></a>MST-1005</td><td>Recovered <em class="replaceable"><code>number of messages</code></em> messages.</td></tr><tr><td>
-            <p>Indicates that recovery recovered the given number of messages from the
-              store.</p>
-          </td></tr><tr><td rowspan="2"><a id="Java-Broker-Appendix-Operation-Logging-Message-MST-1006"></a>MST-1006</td><td>Recovered Complete</td></tr><tr><td>
-            <p>Indicates that the message recovery is concluded.</p>
-          </td></tr><tr><td rowspan="2"><a id="Java-Broker-Appendix-Operation-Logging-Message-MST-1007"></a>MST-1007</td><td>Store Passivated</td></tr><tr><td>
-            <p>The store is entering a passive state where is it unavailable for normal
-              operations. Currently this message is used by HA when the node is in replica
-              state.</p>
-          </td></tr><tr><td rowspan="2"><a id="Java-Broker-Appendix-Operation-Logging-Message-MST-1008"></a>MST-1008</td><td>Store overfull, flow control will be enforced</td></tr><tr><td>
-            <p>The store has breached is maximum configured size. See <a class="xref" href="Java-Broker-Runtime-Disk-Space-Management.html#Qpid-Producer-Flow-Control" title="9.2.1.&#160;Producer Flow Control">Section&#160;9.2.1, &#8220;Producer Flow Control&#8221;</a> for details.</p>
-          </td></tr><tr><td rowspan="2"><a id="Java-Broker-Appendix-Operation-Logging-Message-MST-1009"></a>MST-1009</td><td>Store overfull condition cleared</td></tr><tr><td>
-            <p>The store size has fallen beneath its resume capacity and therefore flow control
-              has been rescinded. See <a class="xref" href="Java-Broker-Runtime-Disk-Space-Management.html#Qpid-Producer-Flow-Control" title="9.2.1.&#160;Producer Flow Control">Section&#160;9.2.1, &#8220;Producer Flow Control&#8221;</a> for
-              details.</p>
-          </td></tr></tbody></table></div></div><br class="table-break" /><div class="table"><a id="Java-Broker-Appendix-Operation-Logging-Message-List-TransactionStore"></a><p class="title"><strong>Table&#160;C.13.&#160;Transaction Store Log Messages</strong></p><div class="table-contents"><table border="1" summary="Transaction Store Log Messages" width="100%"><colgroup><col /><col /></colgroup><thead><tr><th>Message Id</th><th>Message Text / Purpose</th></tr></thead><tbody><tr><td rows [...]
-            <p>Indicates that a transaction store has been created. The transaction store is
-              responsible for the storage of messages instances, that is, the presence of a message
-              on a queue.</p>
-          </td></tr><tr><td rowspan="2"><a id="Java-Broker-Appendix-Operation-Logging-Message-TXN-1002"></a>TXN-1002</td><td>Store location : <em class="replaceable"><code>path</code></em></td></tr><tr><td>
-            <p>Indicates that the transaction store is using <em class="replaceable"><code>path</code></em> for
-              the location of the store.</p>
-          </td></tr><tr><td rowspan="2"><a id="Java-Broker-Appendix-Operation-Logging-Message-TXN-1003"></a>TXN-1003</td><td>Closed</td></tr><tr><td>
-            <p>Indicates that the transaction store has been closed.</p>
-          </td></tr><tr><td rowspan="2"><a id="Java-Broker-Appendix-Operation-Logging-Message-TXN-1004"></a>TXN-1004</td><td>Recovery Start</td></tr><tr><td>
-            <p>Indicates that transaction recovery has begun.</p>
-          </td></tr><tr><td rowspan="2"><a id="Java-Broker-Appendix-Operation-Logging-Message-MST-TXN"></a>TXN-1005</td><td>Recovered <em class="replaceable"><code>number</code></em> messages for queue
-              <em class="replaceable"><code>name</code></em>.</td></tr><tr><td>
-            <p>Indicates that recovery recovered the given number of message instances for the
-              given queue.</p>
-          </td></tr><tr><td rowspan="2"><a id="Java-Broker-Appendix-Operation-Logging-Message-TXN-1006"></a>TXN-1006</td><td>Recovered Complete</td></tr><tr><td>
-            <p>Indicates that the message recovery is concluded.</p>
-          </td></tr></tbody></table></div></div><br class="table-break" /><div class="table"><a id="Java-Broker-Appendix-Operation-Logging-Message-List-ConfigurationStore"></a><p class="title"><strong>Table&#160;C.14.&#160;Configuration Store Log Messages</strong></p><div class="table-contents"><table border="1" summary="Configuration Store Log Messages" width="100%"><colgroup><col /><col /></colgroup><thead><tr><th>Message Id</th><th>Message Text / Purpose</th></tr></thead><tbody><tr><t [...]
-            <p>Indicates that a configuration store has been created. The configuration store is
-              responsible for the storage of the definition of objects such as queues, exchanges,
-              and bindings.</p>
-          </td></tr><tr><td rowspan="2"><a id="Java-Broker-Appendix-Operation-Logging-Message-CFG-1002"></a>CFG-1002</td><td>Store location : <em class="replaceable"><code>path</code></em></td></tr><tr><td>
-            <p>Indicates that the configuration store is using <em class="replaceable"><code>path</code></em>
-              for the location of the store.</p>
-          </td></tr><tr><td rowspan="2"><a id="Java-Broker-Appendix-Operation-Logging-Message-CFG-1003"></a>CFG-1003</td><td>Closed</td></tr><tr><td>
-            <p>Indicates that the configuration store has been closed.</p>
-          </td></tr><tr><td rowspan="2"><a id="Java-Broker-Appendix-Operation-Logging-Message-CFG-1004"></a>CFG-1004</td><td>Recovery Start</td></tr><tr><td>
-            <p>Indicates that configuration recovery has begun.</p>
-          </td></tr><tr><td rowspan="2"><a id="Java-Broker-Appendix-Operation-Logging-Message-CFG-1005"></a>CFG-1005</td><td>Recovered Complete</td></tr><tr><td>
-            <p>Indicates that the configuration recovery is concluded.</p>
-          </td></tr></tbody></table></div></div><br class="table-break" /><div class="table"><a id="Java-Broker-Appendix-Operation-Logging-Message-List-HA"></a><p class="title"><strong>Table&#160;C.15.&#160;HA Log Messages</strong></p><div class="table-contents"><table border="1" summary="HA Log Messages" width="100%"><colgroup><col /><col /></colgroup><thead><tr><th>Message Id</th><th>Message Text / Purpose</th></tr></thead><tbody><tr><td rowspan="2"><a id="Java-Broker-Appendix-Operatio [...]
-            <p>This HA node has been created.</p>
-          </td></tr><tr><td rowspan="2"><a id="Java-Broker-Appendix-Operation-Logging-Message-HA-1002"></a>HA-1002</td><td>Deleted</td></tr><tr><td>
-            <p>This HA node has been deleted</p>
-          </td></tr><tr><td rowspan="2"><a id="Java-Broker-Appendix-Operation-Logging-Message-HA-1003"></a>HA-1003</td><td>Added : Node : '<em class="replaceable"><code>name</code></em>'
-              (<em class="replaceable"><code>host:port</code></em>)</td></tr><tr><td>
-            <p>A new node has been added to the group.</p>
-          </td></tr><tr><td rowspan="2"><a id="Java-Broker-Appendix-Operation-Logging-Message-HA-1004"></a>HA-1004</td><td>Removed : Node : '<em class="replaceable"><code>name</code></em>'
-              (<em class="replaceable"><code>host:port</code></em>)</td></tr><tr><td>
-            <p>The node has been removed from the group. This removal is permanent.</p>
-          </td></tr><tr><td rowspan="2"><a id="Java-Broker-Appendix-Operation-Logging-Message-HA-1005"></a>HA-1005</td><td>Joined : Node : '<em class="replaceable"><code>name</code></em>'
-              (<em class="replaceable"><code>host:port</code></em>)</td></tr><tr><td>
-            <p>The node has become reachable. This may be as a result of the node being
-              restarted, or a network problem may have been resolved.</p>
-          </td></tr><tr><td rowspan="2"><a id="Java-Broker-Appendix-Operation-Logging-Message-HA-1006"></a>HA-1006</td><td>Left : Node : '<em class="replaceable"><code>name</code></em>'
-              (<em class="replaceable"><code>host:port</code></em>)</td></tr><tr><td>
-            <p>The node is no longer reachable. This may be as a result of the node being stopped
-              or a network partition may be preventing it from being connected. The node is still a
-              member of the group.</p>
-          </td></tr><tr><td rowspan="2"><a id="Java-Broker-Appendix-Operation-Logging-Message-HA-1007"></a>HA-1007</td><td>HA-1007 : Master transfer requested : to '<em class="replaceable"><code>name</code></em>'
-              (<em class="replaceable"><code>host:port</code></em>)</td></tr><tr><td>
-            <p>Indicates that a master transfer operation has been requested.</p>
-          </td></tr><tr><td rowspan="2"><a id="Java-Broker-Appendix-Operation-Logging-Message-HA-1008"></a>HA-1008</td><td>HA-1008 : Intruder detected : Node '<em class="replaceable"><code>name</code></em>'
-              (<em class="replaceable"><code>host:port</code></em>)</td></tr><tr><td>
-            <p>Indicates that an unexpected node has joined the group. The virtualhost node will
-              go into the ERROR state in response to the condition.</p>
-          </td></tr><tr><td rowspan="2"><a id="Java-Broker-Appendix-Operation-Logging-Message-HA-1009"></a>HA-1009</td><td>HA-1009 : Insufficient replicas contactable</td></tr><tr><td>
-            <p>This node (which was in the master role) no longer has sufficient replica in
-              contact in order to complete transactions.</p>
-          </td></tr><tr><td rowspan="2"><a id="Java-Broker-Appendix-Operation-Logging-Message-HA-1010"></a>HA-1010</td><td>HA-1010 : Role change reported: Node : '<em class="replaceable"><code>name</code></em>'
-              (<em class="replaceable"><code>host:port</code></em>) : from <em class="replaceable"><code>role</code></em> to
-              <em class="replaceable"><code>role</code></em></td></tr><tr><td>
-            <p>Indicates that the node has changed role within the group.</p>
-          </td></tr><tr><td rowspan="2"><a id="Java-Broker-Appendix-Operation-Logging-Message-HA-1011"></a>HA-1011</td><td>HA-1011 : Minimum group size : <em class="replaceable"><code>new group size</code></em></td></tr><tr><td>
-            <p>The quorum requirements from completing elections or transactions has been
-              changed.</p>
-          </td></tr><tr><td rowspan="2"><a id="Java-Broker-Appendix-Operation-Logging-Message-HA-1012"></a>HA-1012</td><td>HA-1012 : Priority : <em class="replaceable"><code>priority</code></em></td></tr><tr><td>
-            <p>The priority of the object node has been changed. Zero indicates that the node
-              cannot be elected master.</p>
-          </td></tr><tr><td rowspan="2"><a id="Java-Broker-Appendix-Operation-Logging-Message-HA-1013"></a>HA-1013</td><td>HA-1013 : Designated primary : <em class="replaceable"><code>true|false</code></em></td></tr><tr><td>
-            <p>This node has been designated primary and can now operate solo. Applies to two
-              node groups only.</p>
-          </td></tr><tr><td rowspan="2"><a id="Java-Broker-Appendix-Operation-Logging-Message-HA-1014"></a>HA-1014</td><td>HA-1014 : Diverged transactions discarded</td></tr><tr><td>
-            <p>This node is in the process of rejoining the group but has discovered that some
-              of its transactions differ from those of the current master. The node will
-              automatically roll-back (i.e. discard) the diverging transactions in order to be
-              allowed to rejoin the group. This situation can only usually occur as a result of use
-              of the weak durability options. These allow the group to operate with fewer than
-              quorum nodes and therefore allow the inconsistencies to develop. </p>
-            <p>On encountering this condition, it is <span class="emphasis"><em>strongly</em></span> recommendend
-              to run an application level reconcilation to determine the data that has been
-              lost.</p>
-          </td></tr></tbody></table></div></div><br class="table-break" /><div class="table"><a id="Java-Broker-Appendix-Operation-Logging-Message-List-Port"></a><p class="title"><strong>Table&#160;C.16.&#160;Port Log Messages</strong></p><div class="table-contents"><table border="1" summary="Port Log Messages" width="100%"><colgroup><col /><col /></colgroup><thead><tr><th>Message Id</th><th>Message Text / Purpose</th></tr></thead><tbody><tr><td rowspan="2"><a id="Java-Broker-Appendix-Op [...]
-            <p>Port has been created.</p>
-          </td></tr><tr><td rowspan="2"><a id="Java-Broker-Appendix-Operation-Logging-Message-PRT-1002"></a>PRT-1002</td><td>Open</td></tr><tr><td>
-            <p>Port has been open</p>
-          </td></tr><tr><td rowspan="2"><a id="Java-Broker-Appendix-Operation-Logging-Message-PRT-1003"></a>PRT-1003</td><td>Close</td></tr><tr><td>
-            <p>Port has been closed</p>
-          </td></tr><tr><td rowspan="2"><a id="Java-Broker-Appendix-Operation-Logging-Message-PRT-1004"></a>PRT-1004</td><td>Connection count <em class="replaceable"><code>number</code></em> within <em class="replaceable"><code>warn limit</code></em> % of maximum <em class="replaceable"><code>limit</code></em>
-          </td></tr><tr><td>
-            <p>Warns that number of open connections approaches maximum allowed limit</p>
-          </td></tr><tr><td rowspan="2"><a id="Java-Broker-Appendix-Operation-Logging-Message-PRT-1005"></a>PRT-1005</td><td>Connection from <em class="replaceable"><code>peer</code></em> rejected. Maximum connection count (<em class="replaceable"><code>limit</code></em>) for this port already reached.</td></tr><tr><td>
-            <p>Connection from given host is rejected because of reaching the maximum allowed limit</p>
-          </td></tr><tr><td rowspan="2"><a id="Java-Broker-Appendix-Operation-Logging-Message-PRT-1007"></a>PRT-1007</td><td>Unsupported protocol header received, replying with <em class="replaceable"><code>AMQP version</code></em></td></tr><tr><td>
-            <p>Ususualy indicates an attempt to make an non-AMQP connection on an AMQP port, for instance,
-             with a web browser.</p>
-          </td></tr></tbody></table></div></div><br class="table-break" /></div><div class="navfooter"><hr /><table summary="Navigation footer" width="100%"><tr><td align="left" width="40%"><a accesskey="p" href="Java-Broker-Appendix-System-Properties.html">Prev</a>&#160;</td><td align="center" width="20%">&#160;</td><td align="right" width="40%">&#160;<a accesskey="n" href="Java-Broker-Appendix-Queue-Alerts.html">Next</a></td></tr><tr><td align="left" valign="top" width="40%">Appendix&# [...]
-
-          <hr/>
-
-          <ul id="-apache-navigation">
-            <li><a href="http://www.apache.org/">Apache</a></li>
-            <li><a href="http://www.apache.org/licenses/">License</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="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
-          </ul>
-
-          <p id="-legal">
-            Apache Qpid, Messaging built on AMQP; Copyright &#169; 2015
-            The Apache Software Foundation; Licensed under
-            the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
-            License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
-            project logo are trademarks of The Apache Software
-            Foundation; All other marks mentioned may be trademarks or
-            registered trademarks of their respective owners
-          </p>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Appendix-Queue-Alerts.html b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Appendix-Queue-Alerts.html
deleted file mode 100644
index 423cbea..0000000
--- a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Appendix-Queue-Alerts.html
+++ /dev/null
@@ -1,171 +0,0 @@
-<!DOCTYPE html>
-<!--
- -
- - 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.
- -
--->
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-  <head>
-    <title>Appendix&#160;D.&#160;Queue Alerts - Apache Qpid&#8482;</title>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-    <link rel="stylesheet" href="/site.css" type="text/css" async="async"/>
-    <link rel="stylesheet" href="/deferred.css" type="text/css" defer="defer"/>
-    <script type="text/javascript">var _deferredFunctions = [];</script>
-    <script type="text/javascript" src="/deferred.js" defer="defer"></script>
-    <!--[if lte IE 8]>
-      <link rel="stylesheet" href="/ie.css" type="text/css"/>
-      <script type="text/javascript" src="/html5shiv.js"></script>
-    <![endif]-->
-
-    <!-- Redirects for `go get` and godoc.org -->
-    <meta name="go-import"
-          content="qpid.apache.org git https://gitbox.apache.org/repos/asf/qpid-proton.git"/>
-    <meta name="go-source"
-          content="qpid.apache.org
-https://github.com/apache/qpid-proton/blob/go1/README.md
-https://github.com/apache/qpid-proton/tree/go1{/dir}
-https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
-  </head>
-  <body>
-    <div id="-content">
-      <div id="-top" class="panel">
-        <a id="-menu-link"><img width="16" height="16" src="" alt="Menu"/></a>
-
-        <a id="-search-link"><img width="22" height="16" src="" alt="Search"/></a>
-
-        <ul id="-global-navigation">
-          <li><a id="-logotype" href="/index.html">Apache Qpid<sup>&#8482;</sup></a></li>
-          <li><a href="/documentation.html">Documentation</a></li>
-          <li><a href="/download.html">Download</a></li>
-          <li><a href="/discussion.html">Discussion</a></li>
-        </ul>
-      </div>
-
-      <div id="-menu" class="panel" style="display: none;">
-        <div class="flex">
-          <section>
-            <h3>Project</h3>
-
-            <ul>
-              <li><a href="/overview.html">Overview</a></li>
-              <li><a href="/components/index.html">Components</a></li>
-              <li><a href="/releases/index.html">Releases</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Messaging APIs</h3>
-
-            <ul>
-              <li><a href="/proton/index.html">Qpid Proton</a></li>
-              <li><a href="/components/jms/index.html">Qpid JMS</a></li>
-              <li><a href="/components/messaging-api/index.html">Qpid Messaging API</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Servers and tools</h3>
-
-            <ul>
-              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
-              <li><a href="/components/cpp-broker/index.html">C++ broker</a></li>
-              <li><a href="/components/dispatch-router/index.html">Dispatch router</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Resources</h3>
-
-            <ul>
-              <li><a href="/dashboard.html">Dashboard</a></li>
-              <li><a href="https://cwiki.apache.org/confluence/display/qpid/Index">Wiki</a></li>
-              <li><a href="/resources.html">More resources</a></li>
-            </ul>
-          </section>
-        </div>
-      </div>
-
-      <div id="-search" class="panel" style="display: none;">
-        <form action="http://www.google.com/search" method="get">
-          <input type="hidden" name="sitesearch" value="qpid.apache.org"/>
-          <input type="text" name="q" maxlength="255" autofocus="autofocus" tabindex="1"/>
-          <button type="submit">Search</button>
-          <a href="/search.html">More ways to search</a>
-        </form>
-      </div>
-
-      <div id="-middle" class="panel">
-        <ul id="-path-navigation"><li><a href="/index.html">Home</a></li><li><a href="/releases/index.html">Releases</a></li><li><a href="/releases/qpid-java-trunk/index.html">Qpid for Java Trunk</a></li><li><a href="/releases/qpid-java-trunk/java-broker/book/index.html">Apache Qpid Broker for Java</a></li><li>Appendix&#160;D.&#160;Queue Alerts</li></ul>
-
-        <div id="-middle-content">
-          <div class="docbook"><div class="navheader"><table summary="Navigation header" width="100%"><tr><th align="center" colspan="3">Appendix&#160;D.&#160;Queue Alerts</th></tr><tr><td align="left" width="20%"><a accesskey="p" href="Java-Broker-Appendix-Operation-Logging.html">Prev</a>&#160;</td><th align="center" width="60%">&#160;</th><td align="right" width="20%">&#160;<a accesskey="n" href="Java-Broker-Miscellaneous.html">Next</a></td></tr></table><hr /></div><div class="appendix [...]
-    these limits will be periodically written to the log if these limits are breached, until the
-    condition is rectified.</p><p>For example, if queue <code class="literal">myqueue</code> is configured with a message count alert of
-    1000, and then owing to a failure of a downstream system messages begin to accumulate on the
-    queue, the following alerts will be written periodically to the log. </p><pre class="screen">
-INFO [default:VirtualHostHouseKeepingTask] (queue.NotificationCheck) - MESSAGE_COUNT_ALERT
-           On Queue myqueue - 1272: Maximum count on queue threshold (1000) breached.
-  </pre><p>Note that queue alerts are <span class="emphasis"><em>soft</em></span> in nature; breaching the limit will
-    merely cause the alerts to be generated but messages will still be accepted to the queue.</p><div class="table"><a id="Java-Broker-Appendix-Queue-Alerts-Alerting-Messages"></a><p class="title"><strong>Table&#160;D.1.&#160;Queue Alerts</strong></p><div class="table-contents"><table border="1" summary="Queue Alerts" width="100%"><colgroup><col /><col /></colgroup><thead><tr><th>Alert Name</th><th>Alert Format and Purpose</th></tr></thead><tbody><tr><td rowspan="2">MESSAGE_COUNT_ALERT</ [...]
-              <em class="replaceable"><code>number of messages</code></em>: Maximum count on queue threshold
-              (<em class="replaceable"><code>limit</code></em>) breached. </td></tr><tr><td>
-            <p>The number of messages on the given queue has breached its configured
-              limit.</p>
-          </td></tr><tr><td rowspan="2">MESSAGE_SIZE_ALERT</td><td> MESSAGE_SIZE_ALERT On Queue <em class="replaceable"><code>queuename</code></em>
-              -<em class="replaceable"><code>message size</code></em> : Maximum message size threshold
-              (<em class="replaceable"><code>limit</code></em>) breached. [Message ID=<em class="replaceable"><code>message
-              id</code></em>]</td></tr><tr><td>
-            <p>The size of an individual messages has breached its configured limit.</p>
-          </td></tr><tr><td rowspan="2">QUEUE_DEPTH_ALERT</td><td> QUEUE_DEPTH_ALERT On Queue <em class="replaceable"><code>queuename</code></em> -
-              <em class="replaceable"><code>total size of all messages on queue</code></em> : Maximum queue depth
-            threshold (<em class="replaceable"><code>limit</code></em>) breached.</td></tr><tr><td>
-            <p>The total size of all messages on the queue has breached its configured
-              limit.</p>
-          </td></tr><tr><td rowspan="2">MESSAGE_AGE_ALERT</td><td>MESSAGE_AGE_ALERT On Queue <em class="replaceable"><code>queuename</code></em> - <em class="replaceable"><code>age
-              of message</code></em> : Maximum age on queue threshold
-              (<em class="replaceable"><code>limit</code></em>) breached. </td></tr><tr><td>
-            <p>The age of a message on the given queue has breached its configured limit.</p>
-          </td></tr></tbody></table></div></div><br class="table-break" /></div><div class="navfooter"><hr /><table summary="Navigation footer" width="100%"><tr><td align="left" width="40%"><a accesskey="p" href="Java-Broker-Appendix-Operation-Logging.html">Prev</a>&#160;</td><td align="center" width="20%">&#160;</td><td align="right" width="40%">&#160;<a accesskey="n" href="Java-Broker-Miscellaneous.html">Next</a></td></tr><tr><td align="left" valign="top" width="40%">Appendix&#160;C.&# [...]
-
-          <hr/>
-
-          <ul id="-apache-navigation">
-            <li><a href="http://www.apache.org/">Apache</a></li>
-            <li><a href="http://www.apache.org/licenses/">License</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="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
-          </ul>
-
-          <p id="-legal">
-            Apache Qpid, Messaging built on AMQP; Copyright &#169; 2015
-            The Apache Software Foundation; Licensed under
-            the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
-            License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
-            project logo are trademarks of The Apache Software
-            Foundation; All other marks mentioned may be trademarks or
-            registered trademarks of their respective owners
-          </p>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Appendix-System-Properties.html b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Appendix-System-Properties.html
deleted file mode 100644
index 4927850..0000000
--- a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Appendix-System-Properties.html
+++ /dev/null
@@ -1,156 +0,0 @@
-<!DOCTYPE html>
-<!--
- -
- - 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.
- -
--->
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-  <head>
-    <title>Appendix&#160;B.&#160;System Properties - Apache Qpid&#8482;</title>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-    <link rel="stylesheet" href="/site.css" type="text/css" async="async"/>
-    <link rel="stylesheet" href="/deferred.css" type="text/css" defer="defer"/>
-    <script type="text/javascript">var _deferredFunctions = [];</script>
-    <script type="text/javascript" src="/deferred.js" defer="defer"></script>
-    <!--[if lte IE 8]>
-      <link rel="stylesheet" href="/ie.css" type="text/css"/>
-      <script type="text/javascript" src="/html5shiv.js"></script>
-    <![endif]-->
-
-    <!-- Redirects for `go get` and godoc.org -->
-    <meta name="go-import"
-          content="qpid.apache.org git https://gitbox.apache.org/repos/asf/qpid-proton.git"/>
-    <meta name="go-source"
-          content="qpid.apache.org
-https://github.com/apache/qpid-proton/blob/go1/README.md
-https://github.com/apache/qpid-proton/tree/go1{/dir}
-https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
-  </head>
-  <body>
-    <div id="-content">
-      <div id="-top" class="panel">
-        <a id="-menu-link"><img width="16" height="16" src="" alt="Menu"/></a>
-
-        <a id="-search-link"><img width="22" height="16" src="" alt="Search"/></a>
-
-        <ul id="-global-navigation">
-          <li><a id="-logotype" href="/index.html">Apache Qpid<sup>&#8482;</sup></a></li>
-          <li><a href="/documentation.html">Documentation</a></li>
-          <li><a href="/download.html">Download</a></li>
-          <li><a href="/discussion.html">Discussion</a></li>
-        </ul>
-      </div>
-
-      <div id="-menu" class="panel" style="display: none;">
-        <div class="flex">
-          <section>
-            <h3>Project</h3>
-
-            <ul>
-              <li><a href="/overview.html">Overview</a></li>
-              <li><a href="/components/index.html">Components</a></li>
-              <li><a href="/releases/index.html">Releases</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Messaging APIs</h3>
-
-            <ul>
-              <li><a href="/proton/index.html">Qpid Proton</a></li>
-              <li><a href="/components/jms/index.html">Qpid JMS</a></li>
-              <li><a href="/components/messaging-api/index.html">Qpid Messaging API</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Servers and tools</h3>
-
-            <ul>
-              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
-              <li><a href="/components/cpp-broker/index.html">C++ broker</a></li>
-              <li><a href="/components/dispatch-router/index.html">Dispatch router</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Resources</h3>
-
-            <ul>
-              <li><a href="/dashboard.html">Dashboard</a></li>
-              <li><a href="https://cwiki.apache.org/confluence/display/qpid/Index">Wiki</a></li>
-              <li><a href="/resources.html">More resources</a></li>
-            </ul>
-          </section>
-        </div>
-      </div>
-
-      <div id="-search" class="panel" style="display: none;">
-        <form action="http://www.google.com/search" method="get">
-          <input type="hidden" name="sitesearch" value="qpid.apache.org"/>
-          <input type="text" name="q" maxlength="255" autofocus="autofocus" tabindex="1"/>
-          <button type="submit">Search</button>
-          <a href="/search.html">More ways to search</a>
-        </form>
-      </div>
-
-      <div id="-middle" class="panel">
-        <ul id="-path-navigation"><li><a href="/index.html">Home</a></li><li><a href="/releases/index.html">Releases</a></li><li><a href="/releases/qpid-java-trunk/index.html">Qpid for Java Trunk</a></li><li><a href="/releases/qpid-java-trunk/java-broker/book/index.html">Apache Qpid Broker for Java</a></li><li>Appendix&#160;B.&#160;System Properties</li></ul>
-
-        <div id="-middle-content">
-          <div class="docbook"><div class="navheader"><table summary="Navigation header" width="100%"><tr><th align="center" colspan="3">Appendix&#160;B.&#160;System Properties</th></tr><tr><td align="left" width="20%"><a accesskey="p" href="Java-Broker-Appendix-Environment-Variables.html">Prev</a>&#160;</td><th align="center" width="60%">&#160;</th><td align="right" width="20%">&#160;<a accesskey="n" href="Java-Broker-Appendix-Operation-Logging.html">Next</a></td></tr></table><hr /></di [...]
-    various optional behaviours.</p><p>The preferred method of enabling these system properties is using the <a class="link" href="Java-Broker-Appendix-Environment-Variables.html#Java-Broker-Appendix-Environment-Variables-Qpid-Opts"><code class="literal">QPID_OPTS</code></a> environment variable described in the previous
-    section.</p><div class="table"><a id="d0e7073"></a><p class="title"><strong>Table&#160;B.1.&#160;System properties</strong></p><div class="table-contents"><table border="1" summary="System properties" width="100%"><colgroup><col /><col /><col /></colgroup><thead><tr><th>System property</th><th>Default</th><th>Purpose</th></tr></thead><tbody><tr><td><a id="Java-Broker-Appendix-System-Properties-Broker-Heartbeat-Timeout-Factor"></a>qpid.broker_heartbeat_timeout_factor</td><td>2</td><td [...]
-            received from the peer before a connection is deemed to have been broken.</td></tr><tr><td><a id="Java-Broker-Appendix-System-Properties-Broker-Dead-Letter-Exchange-Suffix"></a>qpid.broker_dead_letter_exchange_suffix</td><td>_DLE</td><td>Used with the <a class="xref" href="Java-Broker-Runtime-Handling-Undeliverable-Messages.html#Java-Broker-Runtime-Handling-Undeliverable-Messages-Dead-Letter-Queues" title="9.4.3.&#160;Dead Letter Queues (DLQ)">Section&#160;9.4.3, &#8220;Dead  [...]
-            feature. Governs the suffix used when generating a name for a Dead Letter
-            Exchange.</td></tr><tr><td><a id="Java-Broker-Appendix-System-Properties-Broker-Dead-Letter-Queue-Suffix"></a>qpid.broker_dead_letter_queue_suffix</td><td>_DLQ</td><td>Used with the <a class="xref" href="Java-Broker-Runtime-Handling-Undeliverable-Messages.html#Java-Broker-Runtime-Handling-Undeliverable-Messages-Dead-Letter-Queues" title="9.4.3.&#160;Dead Letter Queues (DLQ)">Section&#160;9.4.3, &#8220;Dead Letter Queues (DLQ)&#8221;</a>
-            feature. Governs the suffix used when generating a name for a Dead Letter Queue.</td></tr><tr><td><a id="Java-Broker-Appendix-System-Properties-Broker-Status-Updates"></a>qpid.broker_status_updates</td><td>true</td><td>
-            <p>If set true, the Broker will produce operational logging messages.</p>
-          </td></tr><tr><td><a id="Java-Broker-Appendix-System-Properties-Broker-Disabled-Features"></a>qpid.broker_disabled_features</td><td>none</td><td>
-            <p>Allows optional Broker features to be disabled. Currently understood feature
-              names are: <code class="literal">qpid.jms-selector</code></p>
-            <p>Feature names should be comma separated.</p>
-          </td></tr></tbody></table></div></div><br class="table-break" /></div><div class="navfooter"><hr /><table summary="Navigation footer" width="100%"><tr><td align="left" width="40%"><a accesskey="p" href="Java-Broker-Appendix-Environment-Variables.html">Prev</a>&#160;</td><td align="center" width="20%">&#160;</td><td align="right" width="40%">&#160;<a accesskey="n" href="Java-Broker-Appendix-Operation-Logging.html">Next</a></td></tr><tr><td align="left" valign="top" width="40%">A [...]
-
-          <hr/>
-
-          <ul id="-apache-navigation">
-            <li><a href="http://www.apache.org/">Apache</a></li>
-            <li><a href="http://www.apache.org/licenses/">License</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="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
-          </ul>
-
-          <p id="-legal">
-            Apache Qpid, Messaging built on AMQP; Copyright &#169; 2015
-            The Apache Software Foundation; Licensed under
-            the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
-            License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
-            project logo are trademarks of The Apache Software
-            Foundation; All other marks mentioned may be trademarks or
-            registered trademarks of their respective owners
-          </p>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Backup-And-Recovery-Virtualhost-Node.html b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Backup-And-Recovery-Virtualhost-Node.html
deleted file mode 100644
index f71f152..0000000
--- a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Backup-And-Recovery-Virtualhost-Node.html
+++ /dev/null
@@ -1,161 +0,0 @@
-<!DOCTYPE html>
-<!--
- -
- - 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.
- -
--->
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-  <head>
-    <title>11.2.&#160;Virtualhost Node - Apache Qpid&#8482;</title>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-    <link rel="stylesheet" href="/site.css" type="text/css" async="async"/>
-    <link rel="stylesheet" href="/deferred.css" type="text/css" defer="defer"/>
-    <script type="text/javascript">var _deferredFunctions = [];</script>
-    <script type="text/javascript" src="/deferred.js" defer="defer"></script>
-    <!--[if lte IE 8]>
-      <link rel="stylesheet" href="/ie.css" type="text/css"/>
-      <script type="text/javascript" src="/html5shiv.js"></script>
-    <![endif]-->
-
-    <!-- Redirects for `go get` and godoc.org -->
-    <meta name="go-import"
-          content="qpid.apache.org git https://gitbox.apache.org/repos/asf/qpid-proton.git"/>
-    <meta name="go-source"
-          content="qpid.apache.org
-https://github.com/apache/qpid-proton/blob/go1/README.md
-https://github.com/apache/qpid-proton/tree/go1{/dir}
-https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
-  </head>
-  <body>
-    <div id="-content">
-      <div id="-top" class="panel">
-        <a id="-menu-link"><img width="16" height="16" src="" alt="Menu"/></a>
-
-        <a id="-search-link"><img width="22" height="16" src="" alt="Search"/></a>
-
-        <ul id="-global-navigation">
-          <li><a id="-logotype" href="/index.html">Apache Qpid<sup>&#8482;</sup></a></li>
-          <li><a href="/documentation.html">Documentation</a></li>
-          <li><a href="/download.html">Download</a></li>
-          <li><a href="/discussion.html">Discussion</a></li>
-        </ul>
-      </div>
-
-      <div id="-menu" class="panel" style="display: none;">
-        <div class="flex">
-          <section>
-            <h3>Project</h3>
-
-            <ul>
-              <li><a href="/overview.html">Overview</a></li>
-              <li><a href="/components/index.html">Components</a></li>
-              <li><a href="/releases/index.html">Releases</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Messaging APIs</h3>
-
-            <ul>
-              <li><a href="/proton/index.html">Qpid Proton</a></li>
-              <li><a href="/components/jms/index.html">Qpid JMS</a></li>
-              <li><a href="/components/messaging-api/index.html">Qpid Messaging API</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Servers and tools</h3>
-
-            <ul>
-              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
-              <li><a href="/components/cpp-broker/index.html">C++ broker</a></li>
-              <li><a href="/components/dispatch-router/index.html">Dispatch router</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Resources</h3>
-
-            <ul>
-              <li><a href="/dashboard.html">Dashboard</a></li>
-              <li><a href="https://cwiki.apache.org/confluence/display/qpid/Index">Wiki</a></li>
-              <li><a href="/resources.html">More resources</a></li>
-            </ul>
-          </section>
-        </div>
-      </div>
-
-      <div id="-search" class="panel" style="display: none;">
-        <form action="http://www.google.com/search" method="get">
-          <input type="hidden" name="sitesearch" value="qpid.apache.org"/>
-          <input type="text" name="q" maxlength="255" autofocus="autofocus" tabindex="1"/>
-          <button type="submit">Search</button>
-          <a href="/search.html">More ways to search</a>
-        </form>
-      </div>
-
-      <div id="-middle" class="panel">
-        <ul id="-path-navigation"><li><a href="/index.html">Home</a></li><li><a href="/releases/index.html">Releases</a></li><li><a href="/releases/qpid-java-trunk/index.html">Qpid for Java Trunk</a></li><li><a href="/releases/qpid-java-trunk/java-broker/book/index.html">Apache Qpid Broker for Java</a></li><li>11.2.&#160;Virtualhost Node</li></ul>
-
-        <div id="-middle-content">
-          <div class="docbook"><div class="navheader"><table summary="Navigation header" width="100%"><tr><th align="center" colspan="3">11.2.&#160;Virtualhost Node</th></tr><tr><td align="left" width="20%"><a accesskey="p" href="Java-Broker-Backup-And-Recovery.html">Prev</a>&#160;</td><th align="center" width="60%">Chapter&#160;11.&#160;Backup And Recovery</th><td align="right" width="20%">&#160;<a accesskey="n" href="Java-Broker-Backup-And-Recovery-Virtualhost.html">Next</a></td></tr>< [...]
-      simply copy all the files the exist beneath
-        <code class="literal">${QPID_WORK}/&lt;nodename&gt;/config</code>, assuming the virtualhost node is in
-      the standard location. This will copy all configuration that belongs to that virtualhost
-      node.</p><p>The technique for backing up a virtualhost node whilst it is running depends on its
-      type.</p><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="Java-Broker-Backup-And-Recovery-Virtualhost-Node-BDB"></a>11.2.1.&#160;BDB</h3></div></div></div><p>Qpid Broker distribution includes the "hot" backup utility <code class="literal">backup.sh</code>
-        which can be found at broker bin folder. This utility can perform the backup when broker is
-        running.</p><p><code class="literal">backup.sh</code> script invokes
-          <code class="classname">org.apache.qpid.server.store.berkeleydb.BDBBackup</code> to do the
-        job.</p><p>You can also run this class from command line like in an example below:</p><div class="example"><a id="d0e6783"></a><p class="title"><strong>Example&#160;11.1.&#160;Performing store backup by using <code class="classname">BDBBackup</code> class
-          directly</strong></p><div class="example-contents"><div class="cmdsynopsis"><p><code class="command">java</code>   -cp qpid-bdbstore-6.1.0-SNAPSHOT.jar   org.apache.qpid.server.store.berkeleydb.BDBBackup <br />  -fromdir <em class="replaceable"><code>${QPID_WORK}/&lt;nodename&gt;/config</code></em>   -todir <em class="replaceable"><code>path/to/backup/folder</code></em> </p></div></div></div><br class="example-break" /><p>In the example above BDBBackup utility is called from
-        qpid-bdbstore-6.1.0-SNAPSHOT.jar to backup the store at
-          <code class="literal">${QPID_WORK}/&lt;nodename&gt;/config</code> and copy store logs into
-          <code class="literal">path/to/backup/folder</code>.</p><p>Linux and Unix users can take advantage of <code class="literal">backup.sh</code> bash script by
-        running this script in a similar way.</p><div class="example"><a id="d0e6818"></a><p class="title"><strong>Example&#160;11.2.&#160;Performing store backup by using <code class="classname">backup.sh</code> bash script</strong></p><div class="example-contents"><div class="cmdsynopsis"><p><code class="command">backup.sh</code>   -fromdir <em class="replaceable"><code>${QPID_WORK}/&lt;nodename&gt;/config</code></em>   -todir <em class="replaceable"><code>path/to/backup/folder</code>< [...]
-        documentation accompanying it. Any technique that takes a consistent snapshot of the
-        database is acceptable.</p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="Java-Broker-Backup-And-Recovery-Virtualhost-Node-JSON"></a>11.2.5.&#160;JSON</h3></div></div></div><p>JSON stores its config in a single text file. It can be safely backed up using standard
-        command line tools.</p></div></div><div class="navfooter"><hr /><table summary="Navigation footer" width="100%"><tr><td align="left" width="40%"><a accesskey="p" href="Java-Broker-Backup-And-Recovery.html">Prev</a>&#160;</td><td align="center" width="20%"><a accesskey="u" href="Java-Broker-Backup-And-Recovery.html">Up</a></td><td align="right" width="40%">&#160;<a accesskey="n" href="Java-Broker-Backup-And-Recovery-Virtualhost.html">Next</a></td></tr><tr><td align="left" valign=" [...]
-
-          <hr/>
-
-          <ul id="-apache-navigation">
-            <li><a href="http://www.apache.org/">Apache</a></li>
-            <li><a href="http://www.apache.org/licenses/">License</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="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
-          </ul>
-
-          <p id="-legal">
-            Apache Qpid, Messaging built on AMQP; Copyright &#169; 2015
-            The Apache Software Foundation; Licensed under
-            the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
-            License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
-            project logo are trademarks of The Apache Software
-            Foundation; All other marks mentioned may be trademarks or
-            registered trademarks of their respective owners
-          </p>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Backup-And-Recovery-Virtualhost.html b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Backup-And-Recovery-Virtualhost.html
deleted file mode 100644
index 2372d83..0000000
--- a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Backup-And-Recovery-Virtualhost.html
+++ /dev/null
@@ -1,153 +0,0 @@
-<!DOCTYPE html>
-<!--
- -
- - 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.
- -
--->
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-  <head>
-    <title>11.3.&#160;Virtualhost - Apache Qpid&#8482;</title>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-    <link rel="stylesheet" href="/site.css" type="text/css" async="async"/>
-    <link rel="stylesheet" href="/deferred.css" type="text/css" defer="defer"/>
-    <script type="text/javascript">var _deferredFunctions = [];</script>
-    <script type="text/javascript" src="/deferred.js" defer="defer"></script>
-    <!--[if lte IE 8]>
-      <link rel="stylesheet" href="/ie.css" type="text/css"/>
-      <script type="text/javascript" src="/html5shiv.js"></script>
-    <![endif]-->
-
-    <!-- Redirects for `go get` and godoc.org -->
-    <meta name="go-import"
-          content="qpid.apache.org git https://gitbox.apache.org/repos/asf/qpid-proton.git"/>
-    <meta name="go-source"
-          content="qpid.apache.org
-https://github.com/apache/qpid-proton/blob/go1/README.md
-https://github.com/apache/qpid-proton/tree/go1{/dir}
-https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
-  </head>
-  <body>
-    <div id="-content">
-      <div id="-top" class="panel">
-        <a id="-menu-link"><img width="16" height="16" src="" alt="Menu"/></a>
-
-        <a id="-search-link"><img width="22" height="16" src="" alt="Search"/></a>
-
-        <ul id="-global-navigation">
-          <li><a id="-logotype" href="/index.html">Apache Qpid<sup>&#8482;</sup></a></li>
-          <li><a href="/documentation.html">Documentation</a></li>
-          <li><a href="/download.html">Download</a></li>
-          <li><a href="/discussion.html">Discussion</a></li>
-        </ul>
-      </div>
-
-      <div id="-menu" class="panel" style="display: none;">
-        <div class="flex">
-          <section>
-            <h3>Project</h3>
-
-            <ul>
-              <li><a href="/overview.html">Overview</a></li>
-              <li><a href="/components/index.html">Components</a></li>
-              <li><a href="/releases/index.html">Releases</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Messaging APIs</h3>
-
-            <ul>
-              <li><a href="/proton/index.html">Qpid Proton</a></li>
-              <li><a href="/components/jms/index.html">Qpid JMS</a></li>
-              <li><a href="/components/messaging-api/index.html">Qpid Messaging API</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Servers and tools</h3>
-
-            <ul>
-              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
-              <li><a href="/components/cpp-broker/index.html">C++ broker</a></li>
-              <li><a href="/components/dispatch-router/index.html">Dispatch router</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Resources</h3>
-
-            <ul>
-              <li><a href="/dashboard.html">Dashboard</a></li>
-              <li><a href="https://cwiki.apache.org/confluence/display/qpid/Index">Wiki</a></li>
-              <li><a href="/resources.html">More resources</a></li>
-            </ul>
-          </section>
-        </div>
-      </div>
-
-      <div id="-search" class="panel" style="display: none;">
-        <form action="http://www.google.com/search" method="get">
-          <input type="hidden" name="sitesearch" value="qpid.apache.org"/>
-          <input type="text" name="q" maxlength="255" autofocus="autofocus" tabindex="1"/>
-          <button type="submit">Search</button>
-          <a href="/search.html">More ways to search</a>
-        </form>
-      </div>
-
-      <div id="-middle" class="panel">
-        <ul id="-path-navigation"><li><a href="/index.html">Home</a></li><li><a href="/releases/index.html">Releases</a></li><li><a href="/releases/qpid-java-trunk/index.html">Qpid for Java Trunk</a></li><li><a href="/releases/qpid-java-trunk/java-broker/book/index.html">Apache Qpid Broker for Java</a></li><li>11.3.&#160;Virtualhost</li></ul>
-
-        <div id="-middle-content">
-          <div class="docbook"><div class="navheader"><table summary="Navigation header" width="100%"><tr><th align="center" colspan="3">11.3.&#160;Virtualhost</th></tr><tr><td align="left" width="20%"><a accesskey="p" href="Java-Broker-Backup-And-Recovery-Virtualhost-Node.html">Prev</a>&#160;</td><th align="center" width="60%">Chapter&#160;11.&#160;Backup And Recovery</th><td align="right" width="20%">&#160;<a accesskey="n" href="Java-Broker-Appendix-Environment-Variables.html">Next</a> [...]
-      simply copy all the files the exist beneath
-        <code class="literal">${QPID_WORK}/&lt;name&gt;/messages</code>, assuming the virtualhost is in the
-      standard location. This will copy all messages that belongs to that virtualhost.</p><p>The technique for backing up a virtualhost whilst it is running depends on its
-      type.</p><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="Java-Broker-Backup-And-Recovery-Virtualhost-BDB"></a>11.3.1.&#160;BDB</h3></div></div></div><p>Use the same backup utility described above, but use the path
-          <code class="literal">${QPID_WORK}/&lt;name&gt;/messages</code> instead.</p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="Java-Broker-Backup-And-Recovery-Virtualhost-Derby"></a>11.3.2.&#160;Derby</h3></div></div></div><p>Not yet supported</p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="Java-Broker-Backup-And-Recovery-Virtualhost-JDBC"></a>11.3.3.&#160;JDBC</h3></div></div></div><p>The responsibility  [...]
-        documentation accompanying it. Any technique that takes a consistent snapshot of the
-        database is acceptable.</p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="Java-Broker-Backup-And-Recovery-Virtualhost-Provided"></a>11.3.4.&#160;Provided</h3></div></div></div><p>The contents of the virtualhost will be backed up as part of virtualhost node that
-        contains it.</p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="Java-Broker-Backup-And-Recovery-Virtualhost-BDBHA"></a>11.3.5.&#160;BDB-HA</h3></div></div></div><p>The contents of the virtualhost will be backed up as part of virtualhost node that
-        contains it.</p></div></div><div class="navfooter"><hr /><table summary="Navigation footer" width="100%"><tr><td align="left" width="40%"><a accesskey="p" href="Java-Broker-Backup-And-Recovery-Virtualhost-Node.html">Prev</a>&#160;</td><td align="center" width="20%"><a accesskey="u" href="Java-Broker-Backup-And-Recovery.html">Up</a></td><td align="right" width="40%">&#160;<a accesskey="n" href="Java-Broker-Appendix-Environment-Variables.html">Next</a></td></tr><tr><td align="left" [...]
-
-          <hr/>
-
-          <ul id="-apache-navigation">
-            <li><a href="http://www.apache.org/">Apache</a></li>
-            <li><a href="http://www.apache.org/licenses/">License</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="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
-          </ul>
-
-          <p id="-legal">
-            Apache Qpid, Messaging built on AMQP; Copyright &#169; 2015
-            The Apache Software Foundation; Licensed under
-            the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
-            License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
-            project logo are trademarks of The Apache Software
-            Foundation; All other marks mentioned may be trademarks or
-            registered trademarks of their respective owners
-          </p>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Backup-And-Recovery.html b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Backup-And-Recovery.html
deleted file mode 100644
index 8458004..0000000
--- a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Backup-And-Recovery.html
+++ /dev/null
@@ -1,147 +0,0 @@
-<!DOCTYPE html>
-<!--
- -
- - 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.
- -
--->
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-  <head>
-    <title>Chapter&#160;11.&#160;Backup And Recovery - Apache Qpid&#8482;</title>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-    <link rel="stylesheet" href="/site.css" type="text/css" async="async"/>
-    <link rel="stylesheet" href="/deferred.css" type="text/css" defer="defer"/>
-    <script type="text/javascript">var _deferredFunctions = [];</script>
-    <script type="text/javascript" src="/deferred.js" defer="defer"></script>
-    <!--[if lte IE 8]>
-      <link rel="stylesheet" href="/ie.css" type="text/css"/>
-      <script type="text/javascript" src="/html5shiv.js"></script>
-    <![endif]-->
-
-    <!-- Redirects for `go get` and godoc.org -->
-    <meta name="go-import"
-          content="qpid.apache.org git https://gitbox.apache.org/repos/asf/qpid-proton.git"/>
-    <meta name="go-source"
-          content="qpid.apache.org
-https://github.com/apache/qpid-proton/blob/go1/README.md
-https://github.com/apache/qpid-proton/tree/go1{/dir}
-https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
-  </head>
-  <body>
-    <div id="-content">
-      <div id="-top" class="panel">
-        <a id="-menu-link"><img width="16" height="16" src="" alt="Menu"/></a>
-
-        <a id="-search-link"><img width="22" height="16" src="" alt="Search"/></a>
-
-        <ul id="-global-navigation">
-          <li><a id="-logotype" href="/index.html">Apache Qpid<sup>&#8482;</sup></a></li>
-          <li><a href="/documentation.html">Documentation</a></li>
-          <li><a href="/download.html">Download</a></li>
-          <li><a href="/discussion.html">Discussion</a></li>
-        </ul>
-      </div>
-
-      <div id="-menu" class="panel" style="display: none;">
-        <div class="flex">
-          <section>
-            <h3>Project</h3>
-
-            <ul>
-              <li><a href="/overview.html">Overview</a></li>
-              <li><a href="/components/index.html">Components</a></li>
-              <li><a href="/releases/index.html">Releases</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Messaging APIs</h3>
-
-            <ul>
-              <li><a href="/proton/index.html">Qpid Proton</a></li>
-              <li><a href="/components/jms/index.html">Qpid JMS</a></li>
-              <li><a href="/components/messaging-api/index.html">Qpid Messaging API</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Servers and tools</h3>
-
-            <ul>
-              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
-              <li><a href="/components/cpp-broker/index.html">C++ broker</a></li>
-              <li><a href="/components/dispatch-router/index.html">Dispatch router</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Resources</h3>
-
-            <ul>
-              <li><a href="/dashboard.html">Dashboard</a></li>
-              <li><a href="https://cwiki.apache.org/confluence/display/qpid/Index">Wiki</a></li>
-              <li><a href="/resources.html">More resources</a></li>
-            </ul>
-          </section>
-        </div>
-      </div>
-
-      <div id="-search" class="panel" style="display: none;">
-        <form action="http://www.google.com/search" method="get">
-          <input type="hidden" name="sitesearch" value="qpid.apache.org"/>
-          <input type="text" name="q" maxlength="255" autofocus="autofocus" tabindex="1"/>
-          <button type="submit">Search</button>
-          <a href="/search.html">More ways to search</a>
-        </form>
-      </div>
-
-      <div id="-middle" class="panel">
-        <ul id="-path-navigation"><li><a href="/index.html">Home</a></li><li><a href="/releases/index.html">Releases</a></li><li><a href="/releases/qpid-java-trunk/index.html">Qpid for Java Trunk</a></li><li><a href="/releases/qpid-java-trunk/java-broker/book/index.html">Apache Qpid Broker for Java</a></li><li>Chapter&#160;11.&#160;Backup And Recovery</li></ul>
-
-        <div id="-middle-content">
-          <div class="docbook"><div class="navheader"><table summary="Navigation header" width="100%"><tr><th align="center" colspan="3">Chapter&#160;11.&#160;Backup And Recovery</th></tr><tr><td align="left" width="20%"><a accesskey="p" href="Java-Broker-High-Availability-Reset-Group-Infomational.html">Prev</a>&#160;</td><th align="center" width="60%">&#160;</th><td align="right" width="20%">&#160;<a accesskey="n" href="Java-Broker-Backup-And-Recovery-Virtualhost-Node.html">Next</a></td [...]
-      exist beneath <code class="literal">${QPID_WORK}</code>, assuming all virtualhost nodes and virtualhost
-      are in their standard location, this will copy all configuration and persistent message data. </p><p>There is currently no safe mechanism to take a complete copy of the entire Broker whilst
-      it is running.</p></div></div><div class="navfooter"><hr /><table summary="Navigation footer" width="100%"><tr><td align="left" width="40%"><a accesskey="p" href="Java-Broker-High-Availability-Reset-Group-Infomational.html">Prev</a>&#160;</td><td align="center" width="20%">&#160;</td><td align="right" width="40%">&#160;<a accesskey="n" href="Java-Broker-Backup-And-Recovery-Virtualhost-Node.html">Next</a></td></tr><tr><td align="left" valign="top" width="40%">10.11.&#160;Reset Group [...]
-
-          <hr/>
-
-          <ul id="-apache-navigation">
-            <li><a href="http://www.apache.org/">Apache</a></li>
-            <li><a href="http://www.apache.org/licenses/">License</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="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
-          </ul>
-
-          <p id="-legal">
-            Apache Qpid, Messaging built on AMQP; Copyright &#169; 2015
-            The Apache Software Foundation; Licensed under
-            the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
-            License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
-            project logo are trademarks of The Apache Software
-            Foundation; All other marks mentioned may be trademarks or
-            registered trademarks of their respective owners
-          </p>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Concepts-Authentication-Providers.html b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Concepts-Authentication-Providers.html
deleted file mode 100644
index a775203..0000000
--- a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Concepts-Authentication-Providers.html
+++ /dev/null
@@ -1,148 +0,0 @@
-<!DOCTYPE html>
-<!--
- -
- - 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.
- -
--->
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-  <head>
-    <title>4.9.&#160;Authentication Providers - Apache Qpid&#8482;</title>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-    <link rel="stylesheet" href="/site.css" type="text/css" async="async"/>
-    <link rel="stylesheet" href="/deferred.css" type="text/css" defer="defer"/>
-    <script type="text/javascript">var _deferredFunctions = [];</script>
-    <script type="text/javascript" src="/deferred.js" defer="defer"></script>
-    <!--[if lte IE 8]>
-      <link rel="stylesheet" href="/ie.css" type="text/css"/>
-      <script type="text/javascript" src="/html5shiv.js"></script>
-    <![endif]-->
-
-    <!-- Redirects for `go get` and godoc.org -->
-    <meta name="go-import"
-          content="qpid.apache.org git https://gitbox.apache.org/repos/asf/qpid-proton.git"/>
-    <meta name="go-source"
-          content="qpid.apache.org
-https://github.com/apache/qpid-proton/blob/go1/README.md
-https://github.com/apache/qpid-proton/tree/go1{/dir}
-https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
-  </head>
-  <body>
-    <div id="-content">
-      <div id="-top" class="panel">
-        <a id="-menu-link"><img width="16" height="16" src="" alt="Menu"/></a>
-
-        <a id="-search-link"><img width="22" height="16" src="" alt="Search"/></a>
-
-        <ul id="-global-navigation">
-          <li><a id="-logotype" href="/index.html">Apache Qpid<sup>&#8482;</sup></a></li>
-          <li><a href="/documentation.html">Documentation</a></li>
-          <li><a href="/download.html">Download</a></li>
-          <li><a href="/discussion.html">Discussion</a></li>
-        </ul>
-      </div>
-
-      <div id="-menu" class="panel" style="display: none;">
-        <div class="flex">
-          <section>
-            <h3>Project</h3>
-
-            <ul>
-              <li><a href="/overview.html">Overview</a></li>
-              <li><a href="/components/index.html">Components</a></li>
-              <li><a href="/releases/index.html">Releases</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Messaging APIs</h3>
-
-            <ul>
-              <li><a href="/proton/index.html">Qpid Proton</a></li>
-              <li><a href="/components/jms/index.html">Qpid JMS</a></li>
-              <li><a href="/components/messaging-api/index.html">Qpid Messaging API</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Servers and tools</h3>
-
-            <ul>
-              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
-              <li><a href="/components/cpp-broker/index.html">C++ broker</a></li>
-              <li><a href="/components/dispatch-router/index.html">Dispatch router</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Resources</h3>
-
-            <ul>
-              <li><a href="/dashboard.html">Dashboard</a></li>
-              <li><a href="https://cwiki.apache.org/confluence/display/qpid/Index">Wiki</a></li>
-              <li><a href="/resources.html">More resources</a></li>
-            </ul>
-          </section>
-        </div>
-      </div>
-
-      <div id="-search" class="panel" style="display: none;">
-        <form action="http://www.google.com/search" method="get">
-          <input type="hidden" name="sitesearch" value="qpid.apache.org"/>
-          <input type="text" name="q" maxlength="255" autofocus="autofocus" tabindex="1"/>
-          <button type="submit">Search</button>
-          <a href="/search.html">More ways to search</a>
-        </form>
-      </div>
-
-      <div id="-middle" class="panel">
-        <ul id="-path-navigation"><li><a href="/index.html">Home</a></li><li><a href="/releases/index.html">Releases</a></li><li><a href="/releases/qpid-java-trunk/index.html">Qpid for Java Trunk</a></li><li><a href="/releases/qpid-java-trunk/java-broker/book/index.html">Apache Qpid Broker for Java</a></li><li>4.9.&#160;Authentication Providers</li></ul>
-
-        <div id="-middle-content">
-          <div class="docbook"><div class="navheader"><table summary="Navigation header" width="100%"><tr><th align="center" colspan="3">4.9.&#160;Authentication Providers</th></tr><tr><td align="left" width="20%"><a accesskey="p" href="Java-Broker-Concepts-Ports.html">Prev</a>&#160;</td><th align="center" width="60%">Chapter&#160;4.&#160;Concepts</th><td align="right" width="20%">&#160;<a accesskey="n" href="Java-Broker-Concepts-Other-Services.html">Next</a></td></tr></table><hr /></div [...]
-        <span class="emphasis"><em>Authentication Providers</em></span> are used by <span class="emphasis"><em>Ports</em></span> to authenticate connections.
-        Many <span class="emphasis"><em>Authentication Providers</em></span> can be configured on the Broker at the same time, from which
-        each <span class="emphasis"><em>Port</em></span> can be assigned one.
-    </p><p>Some Authentication Providers offer facilities for creation and deletion of users.</p></div><div class="navfooter"><hr /><table summary="Navigation footer" width="100%"><tr><td align="left" width="40%"><a accesskey="p" href="Java-Broker-Concepts-Ports.html">Prev</a>&#160;</td><td align="center" width="20%"><a accesskey="u" href="Java-Broker-Concepts.html">Up</a></td><td align="right" width="40%">&#160;<a accesskey="n" href="Java-Broker-Concepts-Other-Services.html">Next</a></t [...]
-
-          <hr/>
-
-          <ul id="-apache-navigation">
-            <li><a href="http://www.apache.org/">Apache</a></li>
-            <li><a href="http://www.apache.org/licenses/">License</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="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
-          </ul>
-
-          <p id="-legal">
-            Apache Qpid, Messaging built on AMQP; Copyright &#169; 2015
-            The Apache Software Foundation; Licensed under
-            the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
-            License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
-            project logo are trademarks of The Apache Software
-            Foundation; All other marks mentioned may be trademarks or
-            registered trademarks of their respective owners
-          </p>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Concepts-Broker.html b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Concepts-Broker.html
deleted file mode 100644
index bafcfe3..0000000
--- a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Concepts-Broker.html
+++ /dev/null
@@ -1,144 +0,0 @@
-<!DOCTYPE html>
-<!--
- -
- - 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.
- -
--->
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-  <head>
-    <title>4.2.&#160;Broker - Apache Qpid&#8482;</title>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-    <link rel="stylesheet" href="/site.css" type="text/css" async="async"/>
-    <link rel="stylesheet" href="/deferred.css" type="text/css" defer="defer"/>
-    <script type="text/javascript">var _deferredFunctions = [];</script>
-    <script type="text/javascript" src="/deferred.js" defer="defer"></script>
-    <!--[if lte IE 8]>
-      <link rel="stylesheet" href="/ie.css" type="text/css"/>
-      <script type="text/javascript" src="/html5shiv.js"></script>
-    <![endif]-->
-
-    <!-- Redirects for `go get` and godoc.org -->
-    <meta name="go-import"
-          content="qpid.apache.org git https://gitbox.apache.org/repos/asf/qpid-proton.git"/>
-    <meta name="go-source"
-          content="qpid.apache.org
-https://github.com/apache/qpid-proton/blob/go1/README.md
-https://github.com/apache/qpid-proton/tree/go1{/dir}
-https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
-  </head>
-  <body>
-    <div id="-content">
-      <div id="-top" class="panel">
-        <a id="-menu-link"><img width="16" height="16" src="" alt="Menu"/></a>
-
-        <a id="-search-link"><img width="22" height="16" src="" alt="Search"/></a>
-
-        <ul id="-global-navigation">
-          <li><a id="-logotype" href="/index.html">Apache Qpid<sup>&#8482;</sup></a></li>
-          <li><a href="/documentation.html">Documentation</a></li>
-          <li><a href="/download.html">Download</a></li>
-          <li><a href="/discussion.html">Discussion</a></li>
-        </ul>
-      </div>
-
-      <div id="-menu" class="panel" style="display: none;">
-        <div class="flex">
-          <section>
-            <h3>Project</h3>
-
-            <ul>
-              <li><a href="/overview.html">Overview</a></li>
-              <li><a href="/components/index.html">Components</a></li>
-              <li><a href="/releases/index.html">Releases</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Messaging APIs</h3>
-
-            <ul>
-              <li><a href="/proton/index.html">Qpid Proton</a></li>
-              <li><a href="/components/jms/index.html">Qpid JMS</a></li>
-              <li><a href="/components/messaging-api/index.html">Qpid Messaging API</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Servers and tools</h3>
-
-            <ul>
-              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
-              <li><a href="/components/cpp-broker/index.html">C++ broker</a></li>
-              <li><a href="/components/dispatch-router/index.html">Dispatch router</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Resources</h3>
-
-            <ul>
-              <li><a href="/dashboard.html">Dashboard</a></li>
-              <li><a href="https://cwiki.apache.org/confluence/display/qpid/Index">Wiki</a></li>
-              <li><a href="/resources.html">More resources</a></li>
-            </ul>
-          </section>
-        </div>
-      </div>
-
-      <div id="-search" class="panel" style="display: none;">
-        <form action="http://www.google.com/search" method="get">
-          <input type="hidden" name="sitesearch" value="qpid.apache.org"/>
-          <input type="text" name="q" maxlength="255" autofocus="autofocus" tabindex="1"/>
-          <button type="submit">Search</button>
-          <a href="/search.html">More ways to search</a>
-        </form>
-      </div>
-
-      <div id="-middle" class="panel">
-        <ul id="-path-navigation"><li><a href="/index.html">Home</a></li><li><a href="/releases/index.html">Releases</a></li><li><a href="/releases/qpid-java-trunk/index.html">Qpid for Java Trunk</a></li><li><a href="/releases/qpid-java-trunk/java-broker/book/index.html">Apache Qpid Broker for Java</a></li><li>4.2.&#160;Broker</li></ul>
-
-        <div id="-middle-content">
-          <div class="docbook"><div class="navheader"><table summary="Navigation header" width="100%"><tr><th align="center" colspan="3">4.2.&#160;Broker</th></tr><tr><td align="left" width="20%"><a accesskey="p" href="Java-Broker-Concepts.html">Prev</a>&#160;</td><th align="center" width="60%">Chapter&#160;4.&#160;Concepts</th><td align="right" width="20%">&#160;<a accesskey="n" href="Java-Broker-Concepts-Virtualhost-Nodes.html">Next</a></td></tr></table><hr /></div><div class="section" [...]
-
-          <hr/>
-
-          <ul id="-apache-navigation">
-            <li><a href="http://www.apache.org/">Apache</a></li>
-            <li><a href="http://www.apache.org/licenses/">License</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="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
-          </ul>
-
-          <p id="-legal">
-            Apache Qpid, Messaging built on AMQP; Copyright &#169; 2015
-            The Apache Software Foundation; Licensed under
-            the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
-            License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
-            project logo are trademarks of The Apache Software
-            Foundation; All other marks mentioned may be trademarks or
-            registered trademarks of their respective owners
-          </p>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Concepts-Exchanges.html b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Concepts-Exchanges.html
deleted file mode 100644
index 8da0349..0000000
--- a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Concepts-Exchanges.html
+++ /dev/null
@@ -1,202 +0,0 @@
-<!DOCTYPE html>
-<!--
- -
- - 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.
- -
--->
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-  <head>
-    <title>4.6.&#160;Exchanges - Apache Qpid&#8482;</title>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-    <link rel="stylesheet" href="/site.css" type="text/css" async="async"/>
-    <link rel="stylesheet" href="/deferred.css" type="text/css" defer="defer"/>
-    <script type="text/javascript">var _deferredFunctions = [];</script>
-    <script type="text/javascript" src="/deferred.js" defer="defer"></script>
-    <!--[if lte IE 8]>
-      <link rel="stylesheet" href="/ie.css" type="text/css"/>
-      <script type="text/javascript" src="/html5shiv.js"></script>
-    <![endif]-->
-
-    <!-- Redirects for `go get` and godoc.org -->
-    <meta name="go-import"
-          content="qpid.apache.org git https://gitbox.apache.org/repos/asf/qpid-proton.git"/>
-    <meta name="go-source"
-          content="qpid.apache.org
-https://github.com/apache/qpid-proton/blob/go1/README.md
-https://github.com/apache/qpid-proton/tree/go1{/dir}
-https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
-  </head>
-  <body>
-    <div id="-content">
-      <div id="-top" class="panel">
-        <a id="-menu-link"><img width="16" height="16" src="" alt="Menu"/></a>
-
-        <a id="-search-link"><img width="22" height="16" src="" alt="Search"/></a>
-
-        <ul id="-global-navigation">
-          <li><a id="-logotype" href="/index.html">Apache Qpid<sup>&#8482;</sup></a></li>
-          <li><a href="/documentation.html">Documentation</a></li>
-          <li><a href="/download.html">Download</a></li>
-          <li><a href="/discussion.html">Discussion</a></li>
-        </ul>
-      </div>
-
-      <div id="-menu" class="panel" style="display: none;">
-        <div class="flex">
-          <section>
-            <h3>Project</h3>
-
-            <ul>
-              <li><a href="/overview.html">Overview</a></li>
-              <li><a href="/components/index.html">Components</a></li>
-              <li><a href="/releases/index.html">Releases</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Messaging APIs</h3>
-
-            <ul>
-              <li><a href="/proton/index.html">Qpid Proton</a></li>
-              <li><a href="/components/jms/index.html">Qpid JMS</a></li>
-              <li><a href="/components/messaging-api/index.html">Qpid Messaging API</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Servers and tools</h3>
-
-            <ul>
-              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
-              <li><a href="/components/cpp-broker/index.html">C++ broker</a></li>
-              <li><a href="/components/dispatch-router/index.html">Dispatch router</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Resources</h3>
-
-            <ul>
-              <li><a href="/dashboard.html">Dashboard</a></li>
-              <li><a href="https://cwiki.apache.org/confluence/display/qpid/Index">Wiki</a></li>
-              <li><a href="/resources.html">More resources</a></li>
-            </ul>
-          </section>
-        </div>
-      </div>
-
-      <div id="-search" class="panel" style="display: none;">
-        <form action="http://www.google.com/search" method="get">
-          <input type="hidden" name="sitesearch" value="qpid.apache.org"/>
-          <input type="text" name="q" maxlength="255" autofocus="autofocus" tabindex="1"/>
-          <button type="submit">Search</button>
-          <a href="/search.html">More ways to search</a>
-        </form>
-      </div>
-
-      <div id="-middle" class="panel">
-        <ul id="-path-navigation"><li><a href="/index.html">Home</a></li><li><a href="/releases/index.html">Releases</a></li><li><a href="/releases/qpid-java-trunk/index.html">Qpid for Java Trunk</a></li><li><a href="/releases/qpid-java-trunk/java-broker/book/index.html">Apache Qpid Broker for Java</a></li><li>4.6.&#160;Exchanges</li></ul>
-
-        <div id="-middle-content">
-          <div class="docbook"><div class="navheader"><table summary="Navigation header" width="100%"><tr><th align="center" colspan="3">4.6.&#160;Exchanges</th></tr><tr><td align="left" width="20%"><a accesskey="p" href="Java-Broker-Concepts-Virtualhosts.html">Prev</a>&#160;</td><th align="center" width="60%">Chapter&#160;4.&#160;Concepts</th><td align="right" width="20%">&#160;<a accesskey="n" href="Java-Broker-Concepts-Queues.html">Next</a></td></tr></table><hr /></div><div class="sec [...]
-  messages from producers and routes them to matching <span class="emphasis"><em>Queue</em></span>s within the <span class="emphasis"><em>Virtualhost</em></span>.</p><p>The server provides a set of exchange types with each exchange type implementing a different routing algorithm. For details of how
-  these exchanges types work see <a class="xref" href="Java-Broker-Concepts-Exchanges.html#Java-Broker-Concepts-Exchanges-Types" title="4.6.2.&#160;Exchange Types">Section&#160;4.6.2, &#8220;Exchange Types&#8221;</a> below.</p><p>The server predeclares a number of exchange instances with names starting with "<code class="literal">amq.</code>". These are defined in
-  <a class="xref" href="Java-Broker-Concepts-Exchanges.html#Java-Broker-Concepts-Exchanges-Predeclared" title="4.6.1.&#160;Predeclared Exchanges">Section&#160;4.6.1, &#8220;Predeclared Exchanges&#8221;</a>.</p><p>Applications can make use of the pre-declared exchanges, or they may declare their own. The number of exchanges within a <span class="emphasis"><em>Virtualhost</em></span> is
-  limited only by resource constraints.</p><p>The behaviour when an <span class="emphasis"><em>Exchange</em></span> is unable to route a message to any queue is defined in <a class="xref" href="Java-Broker-Concepts-Exchanges.html#Java-Broker-Concepts-Exchanges-UnroutableMessage" title="4.6.4.&#160;Unrouteable Messages">Section&#160;4.6.4, &#8220;Unrouteable Messages&#8221;</a></p><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="Java-Broker-Concepts-Exchanges [...]
-   </p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p>amq.direct (an instance of a direct exchange)</p></li><li class="listitem"><p>amq.topic (an instance of a topic exchange)</p></li><li class="listitem"><p>amq.fanout (an instance of a fanout exchange)</p></li><li class="listitem"><p>amq.match (an instance of a headers exchange)</p></li></ul></div><p>
-  </p><p>The conceptual "<code class="literal">default exchange</code>" always exists, effectively a special instance of
-   direct exchange which uses the empty string as its name. All queues are automatically bound to it upon their creation
-   using the queue name as the binding key, and unbound upon their deletion. It is not possible to manually add or remove
-   bindings within this exchange.</p><p>Applications may not declare exchanges with names beginning with "<code class="literal">amq.</code>". Such names are reserved for system use.</p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="Java-Broker-Concepts-Exchanges-Types"></a>4.6.2.&#160;Exchange Types</h3></div></div></div><p>
-   The following Exchange types are supported.
-   </p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p>Direct</p></li><li class="listitem"><p>Topic</p></li><li class="listitem"><p>Fanout</p></li><li class="listitem"><p>Headers</p></li></ul></div><p>
-   These exchange types are described in the following sub-sections.</p><div class="section"><div class="titlepage"><div><div><h4 class="title"><a id="Java-Broker-Concepts-Exchanges-Types-Direct"></a>4.6.2.1.&#160;Direct</h4></div></div></div><p>The direct exchange type routes messages to queues based on an exact match between
-    the routing key of the message, and the binding key used to bind the queue to the exchange. Additional
-    filter rules may be specified using a <a class="link" href="Java-Broker-Concepts-Exchanges.html#Java-Broker-Concepts-Exchanges-BindingArguments-JMSSelector" title="4.6.3.1.&#160;JMS Selector">
-    binding argument specifying a JMS message selector</a>.
-   </p><p>This exchange type is often used to implement point to point messaging. When used in this manner, the normal
-   convention is that the binding key matches the name of the queue. It is also possible to use this exchange type
-   for multi-cast, in this case the same binding key is associated with many queues.</p><div class="figure"><a id="d0e619"></a><p class="title"><strong>Figure&#160;4.4.&#160;Direct exchange</strong></p><div class="figure-contents"><div class="mediaobject"><img alt="Direct exchange" src="images/Exchange-Direct.png" /></div></div></div><br class="figure-break" /><p>The figure above illustrates the operation of direct exchange type. The yellow messages published with the routing key
-    "<code class="literal">myqueue</code>" match the binding key corresponding to queue "<code class="literal">myqueue</code>" and so are routed there.  The red
-    messages published with the routing key "<code class="literal">foo</code>" match two bindings in the table so a copy of the message is
-    routed to both the "<code class="literal">bar1</code>" and "<code class="literal">bar2</code>" queues.</p><p>The routing key of the blue message matches no binding keys, so the message is unroutable. It is handled as described
-     in <a class="xref" href="Java-Broker-Concepts-Exchanges.html#Java-Broker-Concepts-Exchanges-UnroutableMessage" title="4.6.4.&#160;Unrouteable Messages">Section&#160;4.6.4, &#8220;Unrouteable Messages&#8221;</a>.</p></div><div class="section"><div class="titlepage"><div><div><h4 class="title"><a id="Java-Broker-Concepts-Exchanges-Types-Topic"></a>4.6.2.2.&#160;Topic</h4></div></div></div><p>This exchange type is used to support the classic publish/subscribe paradigm.</p><p>The topic  [...]
-     binding key pattern defined by the queue binding. Routing keys are formed from one or more words, with each word delimited
-     by a full-stop (.). The pattern matching characters are the * and # symbols. The * symbol matches a single word  and the #
-     symbol matches zero or more words.</p><p>Additional filter rules may be specified using a <a class="link" href="Java-Broker-Concepts-Exchanges.html#Java-Broker-Concepts-Exchanges-BindingArguments-JMSSelector" title="4.6.3.1.&#160;JMS Selector">
-     binding argument specifying a JMS message selector</a>.</p><p>The following three figures help explain how the topic exchange functions.</p><p /><div class="figure"><a id="d0e661"></a><p class="title"><strong>Figure&#160;4.5.&#160;Topic exchange - exact match on topic name</strong></p><div class="figure-contents"><div class="mediaobject"><img alt="Topic exchange - exact match on topic name" src="images/Exchange-Topic.png" /></div></div></div><br class="figure-break" /><p>The figure  [...]
-    message to every bound queue whose binding key matches the routing key.</p><p>In the case illustrated, this means that each subscriber's queue receives every yellow message.</p><div class="figure"><a id="d0e674"></a><p class="title"><strong>Figure&#160;4.6.&#160;Topic exchange - matching on hierarchical topic patterns</strong></p><div class="figure-contents"><div class="mediaobject"><img alt="Topic exchange - matching on hierarchical topic patterns" src="images/Exchange-Topic-Hierarc [...]
-    message to every bound queue whose binding key matches the routing key but as the binding keys contain wildcards, the
-    wildcard rules described above apply.</p><p>In the case illustrated, <code class="literal">sub1</code> has received the red and green message as "<code class="literal">news.uk</code>" and "<code class="literal">news.de</code>"
-    match binding key "<code class="literal">news.#</code>". The red message has also gone to <code class="literal">sub2</code> and <code class="literal">sub3</code> as it's routing key
-    is matched exactly by "<code class="literal">news.uk</code>" and by "<code class="literal">*.uk</code>".</p><p>The routing key of the yellow message matches no binding keys, so the message is unroutable. It is handled as described
-    in <a class="xref" href="Java-Broker-Concepts-Exchanges.html#Java-Broker-Concepts-Exchanges-UnroutableMessage" title="4.6.4.&#160;Unrouteable Messages">Section&#160;4.6.4, &#8220;Unrouteable Messages&#8221;</a>.</p><div class="figure"><a id="d0e712"></a><p class="title"><strong>Figure&#160;4.7.&#160;Topic exchange - matching on JMS message selector</strong></p><div class="figure-contents"><div class="mediaobject"><img alt="Topic exchange - matching on JMS message selector" src="image [...]
-    argument has been specified, the expression is evaluated against each matching message. Only messages whose message header values or properties
-    match the expression are routed to the queue.</p><p>In the case illustrated, <code class="literal">sub1</code> has received the yellow and blue message as their property "<code class="literal">area</code>"
-    cause expression "<code class="literal">area in ('Forties', 'Cromarty')</code>" to evaluate true.  Similarly, the yellow message has also gone to
-    <code class="literal">gale_alert</code> as its property "<code class="literal">speed</code>" causes expression "<code class="literal">speed &gt; 7 and speed &lt; 10</code>"
-    to evaluate true.</p><p>The properties of purple message cause no expressions to evaluate true, so the message is unroutable. It is handled as described in
-    <a class="xref" href="Java-Broker-Concepts-Exchanges.html#Java-Broker-Concepts-Exchanges-UnroutableMessage" title="4.6.4.&#160;Unrouteable Messages">Section&#160;4.6.4, &#8220;Unrouteable Messages&#8221;</a>.</p></div><div class="section"><div class="titlepage"><div><div><h4 class="title"><a id="Java-Broker-Concepts-Exchanges-Types-Fanout"></a>4.6.2.3.&#160;Fanout</h4></div></div></div><p>The fanout exchange type routes messages to all queues bound to the exchange, regardless of the  [...]
-    binding argument specifying a JMS message selector</a>.</p><div class="figure"><a id="d0e759"></a><p class="title"><strong>Figure&#160;4.8.&#160;Fanout exchange</strong></p><div class="figure-contents"><div class="mediaobject"><img alt="Fanout exchange" src="images/Exchange-Fanout.png" /></div></div></div><br class="figure-break" /></div><div class="section"><div class="titlepage"><div><div><h4 class="title"><a id="Java-Broker-Concepts-Exchanges-Types-Headers"></a>4.6.2.4.&#160;Heade [...]
-     a queue if the header properties of the message satisfy the <a class="link" href="Java-Broker-Concepts-Exchanges.html#Java-Broker-Concepts-Exchanges-BindingArguments-x-match" title="4.6.3.2.&#160;x-match">
-     x-match expression</a> specified by the binding arguments with which the queue was bound.
-   </p></div></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="Java-Broker-Concepts-Exchanges-BindingArguments"></a>4.6.3.&#160;Binding Arguments</h3></div></div></div><p>Binding arguments are used by certain exchange types to further filter messages.</p><div class="section"><div class="titlepage"><div><div><h4 class="title"><a id="Java-Broker-Concepts-Exchanges-BindingArguments-JMSSelector"></a>4.6.3.1.&#160;JMS Selector</h4></div></div></div><p>The bi [...]
-    is written in terms of message header and message property names.  If the expression evaluates to true, the message is routed to the queue.
-    This type of binding argument is understood by exchange types direct, topic and fanout.<a class="footnote" href="#ftn.d0e786" id="d0e786"><sup class="footnote">[5]</sup></a>.</p></div><div class="section"><div class="titlepage"><div><div><h4 class="title"><a id="Java-Broker-Concepts-Exchanges-BindingArguments-x-match"></a>4.6.3.2.&#160;x-match</h4></div></div></div><p>The binding argument <code class="literal">x-match</code> is understood by exchange type headers.  It can take two va [...]
-    rest of the name value pairs are treated during matching.</p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p><code class="literal">all</code> implies that all the other pairs must match the headers property of a message for that message to be routed
-      (i.e. an AND match)</p></li><li class="listitem"><p><code class="literal">any</code> implies that the message should be routed if any of the fields in the headers property match one of the
-      fields in the arguments table (i.e. an OR match)</p></li></ul></div><p>A field in the bind arguments matches a field in the message if either the field in the bind arguments has no value and a field of the
-    same name is present in the message headers or if the field in the bind arguments has a value and a field of the same name exists in the
-    message headers and has that same value.</p></div></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="Java-Broker-Concepts-Exchanges-UnroutableMessage"></a>4.6.4.&#160;Unrouteable Messages</h3></div></div></div><p>If an exchange is unable to route a message to any queues, the Broker will:
-   </p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p>If using the AMQP 1.0 protocol, and an alternate exchange has been set on the exchange, the message is routed to the alternate exchange.
-     The alternate exchange routes the message according to its routing algorithm and its binding table.  If the message is still unroutable,
-     the message is discarded unless the sending link has requested the <code class="literal">REJECT_UNROUTABLE</code> target capability, or the Exchange has its
-     <code class="literal">unroutableMessageBehaviour</code> attribute set to <code class="literal">REJECT</code>.</p></li><li class="listitem"><p>If using the AMQP 0-10 protocol, and an alternate exchange has been set on the exchange, the message is routed to the alternate exchange.
-    The alternate exchange routes the message according to its routing algorithm and its binding table.  If the message is still unroutable,
-    the message is discarded.</p></li><li class="listitem"><p>If using AMQP protocols 0-8..0-9-1, and the publisher set the mandatory flag and the<a class="link" href="Java-Broker-Runtime-Close-Connection-When-No-Route.html" title="9.5.&#160;Closing client connections on unroutable mandatory messages">
-     close when no route</a> feature did not close the connection, the message is returned to the Producer.</p></li><li class="listitem"><p>Otherwise, the message is discarded.</p></li></ul></div><p>
-  </p></div><div class="footnotes"><br /><hr style="width:100; text-align:left;margin-left: 0" /><div class="footnote" id="ftn.d0e786"><p><a class="para" href="#d0e786"><sup class="para">[5] </sup></a>
-    This is a Qpid specific extension.</p></div></div></div><div class="navfooter"><hr /><table summary="Navigation footer" width="100%"><tr><td align="left" width="40%"><a accesskey="p" href="Java-Broker-Concepts-Virtualhosts.html">Prev</a>&#160;</td><td align="center" width="20%"><a accesskey="u" href="Java-Broker-Concepts.html">Up</a></td><td align="right" width="40%">&#160;<a accesskey="n" href="Java-Broker-Concepts-Queues.html">Next</a></td></tr><tr><td align="left" valign="top" wid [...]
-
-          <hr/>
-
-          <ul id="-apache-navigation">
-            <li><a href="http://www.apache.org/">Apache</a></li>
-            <li><a href="http://www.apache.org/licenses/">License</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="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
-          </ul>
-
-          <p id="-legal">
-            Apache Qpid, Messaging built on AMQP; Copyright &#169; 2015
-            The Apache Software Foundation; Licensed under
-            the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
-            License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
-            project logo are trademarks of The Apache Software
-            Foundation; All other marks mentioned may be trademarks or
-            registered trademarks of their respective owners
-          </p>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Concepts-Other-Services.html b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Concepts-Other-Services.html
deleted file mode 100644
index e749984..0000000
--- a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Concepts-Other-Services.html
+++ /dev/null
@@ -1,151 +0,0 @@
-<!DOCTYPE html>
-<!--
- -
- - 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.
- -
--->
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-  <head>
-    <title>4.10.&#160;Other Services - Apache Qpid&#8482;</title>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-    <link rel="stylesheet" href="/site.css" type="text/css" async="async"/>
-    <link rel="stylesheet" href="/deferred.css" type="text/css" defer="defer"/>
-    <script type="text/javascript">var _deferredFunctions = [];</script>
-    <script type="text/javascript" src="/deferred.js" defer="defer"></script>
-    <!--[if lte IE 8]>
-      <link rel="stylesheet" href="/ie.css" type="text/css"/>
-      <script type="text/javascript" src="/html5shiv.js"></script>
-    <![endif]-->
-
-    <!-- Redirects for `go get` and godoc.org -->
-    <meta name="go-import"
-          content="qpid.apache.org git https://gitbox.apache.org/repos/asf/qpid-proton.git"/>
-    <meta name="go-source"
-          content="qpid.apache.org
-https://github.com/apache/qpid-proton/blob/go1/README.md
-https://github.com/apache/qpid-proton/tree/go1{/dir}
-https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
-  </head>
-  <body>
-    <div id="-content">
-      <div id="-top" class="panel">
-        <a id="-menu-link"><img width="16" height="16" src="" alt="Menu"/></a>
-
-        <a id="-search-link"><img width="22" height="16" src="" alt="Search"/></a>
-
-        <ul id="-global-navigation">
-          <li><a id="-logotype" href="/index.html">Apache Qpid<sup>&#8482;</sup></a></li>
-          <li><a href="/documentation.html">Documentation</a></li>
-          <li><a href="/download.html">Download</a></li>
-          <li><a href="/discussion.html">Discussion</a></li>
-        </ul>
-      </div>
-
-      <div id="-menu" class="panel" style="display: none;">
-        <div class="flex">
-          <section>
-            <h3>Project</h3>
-
-            <ul>
-              <li><a href="/overview.html">Overview</a></li>
-              <li><a href="/components/index.html">Components</a></li>
-              <li><a href="/releases/index.html">Releases</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Messaging APIs</h3>
-
-            <ul>
-              <li><a href="/proton/index.html">Qpid Proton</a></li>
-              <li><a href="/components/jms/index.html">Qpid JMS</a></li>
-              <li><a href="/components/messaging-api/index.html">Qpid Messaging API</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Servers and tools</h3>
-
-            <ul>
-              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
-              <li><a href="/components/cpp-broker/index.html">C++ broker</a></li>
-              <li><a href="/components/dispatch-router/index.html">Dispatch router</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Resources</h3>
-
-            <ul>
-              <li><a href="/dashboard.html">Dashboard</a></li>
-              <li><a href="https://cwiki.apache.org/confluence/display/qpid/Index">Wiki</a></li>
-              <li><a href="/resources.html">More resources</a></li>
-            </ul>
-          </section>
-        </div>
-      </div>
-
-      <div id="-search" class="panel" style="display: none;">
-        <form action="http://www.google.com/search" method="get">
-          <input type="hidden" name="sitesearch" value="qpid.apache.org"/>
-          <input type="text" name="q" maxlength="255" autofocus="autofocus" tabindex="1"/>
-          <button type="submit">Search</button>
-          <a href="/search.html">More ways to search</a>
-        </form>
-      </div>
-
-      <div id="-middle" class="panel">
-        <ul id="-path-navigation"><li><a href="/index.html">Home</a></li><li><a href="/releases/index.html">Releases</a></li><li><a href="/releases/qpid-java-trunk/index.html">Qpid for Java Trunk</a></li><li><a href="/releases/qpid-java-trunk/java-broker/book/index.html">Apache Qpid Broker for Java</a></li><li>4.10.&#160;Other Services</li></ul>
-
-        <div id="-middle-content">
-          <div class="docbook"><div class="navheader"><table summary="Navigation header" width="100%"><tr><th align="center" colspan="3">4.10.&#160;Other Services</th></tr><tr><td align="left" width="20%"><a accesskey="p" href="Java-Broker-Concepts-Authentication-Providers.html">Prev</a>&#160;</td><th align="center" width="60%">Chapter&#160;4.&#160;Concepts</th><td align="right" width="20%">&#160;<a accesskey="n" href="Java-Broker-Initial-Configuration.html">Next</a></td></tr></table><hr [...]
-        The Broker can also have <span class="emphasis"><em>Access Control Providers</em></span>, <span class="emphasis"><em>Group Providers</em></span>,
-        <span class="emphasis"><em>Keystores</em></span>, <span class="emphasis"><em>Trustores</em></span> and [Management] <span class="emphasis"><em>Plugins</em></span> configured.
-    </p><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="Java-Broker-Concepts-Access-Control-Providers"></a>4.10.1.&#160;Access Control Providers</h3></div></div></div><p><span class="emphasis"><em>Access Control Providers</em></span> are used to authorize various operations relating to Broker objects.</p><p>Access Control Provider configuration and management details are covered in <a class="xref" href="Java-Broker-Security-ACLs.html" title="8.3.&#160;Acces [...]
-        which can be then be used in Access Control rules applicable to the whole group.</p><p>Group Provider configuration and management is covered in <a class="xref" href="Java-Broker-Security-Group-Providers.html" title="8.2.&#160;Group Providers">Section&#160;8.2, &#8220;Group Providers&#8221;</a>.</p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="Java-Broker-Concepts-Keystores"></a>4.10.3.&#160;Keystores</h3></div></div></div><p><span class="em [...]
-        for the SSL transports on Ports.</p><p>Keystore configuration and management is covered in <a class="xref" href="Java-Broker-Management-Managing-Keystores.html" title="7.12.&#160;Keystores">Section&#160;7.12, &#8220;Keystores&#8221;</a>.</p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="Java-Broker-Concepts-Truststores"></a>4.10.4.&#160;Truststores</h3></div></div></div><p><span class="emphasis"><em>Truststores</em></span> are used to configu [...]
-            on SSL ports or making SSL connections to other external services like LDAP, etc.</p><p>Truststore configuration and management is covered in <a class="xref" href="Java-Broker-Management-Managing-Truststores.html" title="7.13.&#160;Truststores">Section&#160;7.13, &#8220;Truststores&#8221;</a>.</p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="Java-Broker-Concepts-Loggers"></a>4.10.5.&#160;Loggers</h3></div></div></div><p><span class="emph [...]
-            an individual Virtualhost. These are described in <a class="xref" href="Java-Broker-Runtime.html#Java-Broker-Runtime-Logging" title="9.1.&#160;Logging">Section&#160;9.1, &#8220;Logging&#8221;</a>.</p></div></div><div class="navfooter"><hr /><table summary="Navigation footer" width="100%"><tr><td align="left" width="40%"><a accesskey="p" href="Java-Broker-Concepts-Authentication-Providers.html">Prev</a>&#160;</td><td align="center" width="20%"><a accesskey="u" href="Java-Broke [...]
-
-          <hr/>
-
-          <ul id="-apache-navigation">
-            <li><a href="http://www.apache.org/">Apache</a></li>
-            <li><a href="http://www.apache.org/licenses/">License</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="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
-          </ul>
-
-          <p id="-legal">
-            Apache Qpid, Messaging built on AMQP; Copyright &#169; 2015
-            The Apache Software Foundation; Licensed under
-            the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
-            License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
-            project logo are trademarks of The Apache Software
-            Foundation; All other marks mentioned may be trademarks or
-            registered trademarks of their respective owners
-          </p>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Concepts-Ports.html b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Concepts-Ports.html
deleted file mode 100644
index 79ea327..0000000
--- a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Concepts-Ports.html
+++ /dev/null
@@ -1,155 +0,0 @@
-<!DOCTYPE html>
-<!--
- -
- - 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.
- -
--->
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-  <head>
-    <title>4.8.&#160;Ports - Apache Qpid&#8482;</title>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-    <link rel="stylesheet" href="/site.css" type="text/css" async="async"/>
-    <link rel="stylesheet" href="/deferred.css" type="text/css" defer="defer"/>
-    <script type="text/javascript">var _deferredFunctions = [];</script>
-    <script type="text/javascript" src="/deferred.js" defer="defer"></script>
-    <!--[if lte IE 8]>
-      <link rel="stylesheet" href="/ie.css" type="text/css"/>
-      <script type="text/javascript" src="/html5shiv.js"></script>
-    <![endif]-->
-
-    <!-- Redirects for `go get` and godoc.org -->
-    <meta name="go-import"
-          content="qpid.apache.org git https://gitbox.apache.org/repos/asf/qpid-proton.git"/>
-    <meta name="go-source"
-          content="qpid.apache.org
-https://github.com/apache/qpid-proton/blob/go1/README.md
-https://github.com/apache/qpid-proton/tree/go1{/dir}
-https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
-  </head>
-  <body>
-    <div id="-content">
-      <div id="-top" class="panel">
-        <a id="-menu-link"><img width="16" height="16" src="" alt="Menu"/></a>
-
-        <a id="-search-link"><img width="22" height="16" src="" alt="Search"/></a>
-
-        <ul id="-global-navigation">
-          <li><a id="-logotype" href="/index.html">Apache Qpid<sup>&#8482;</sup></a></li>
-          <li><a href="/documentation.html">Documentation</a></li>
-          <li><a href="/download.html">Download</a></li>
-          <li><a href="/discussion.html">Discussion</a></li>
-        </ul>
-      </div>
-
-      <div id="-menu" class="panel" style="display: none;">
-        <div class="flex">
-          <section>
-            <h3>Project</h3>
-
-            <ul>
-              <li><a href="/overview.html">Overview</a></li>
-              <li><a href="/components/index.html">Components</a></li>
-              <li><a href="/releases/index.html">Releases</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Messaging APIs</h3>
-
-            <ul>
-              <li><a href="/proton/index.html">Qpid Proton</a></li>
-              <li><a href="/components/jms/index.html">Qpid JMS</a></li>
-              <li><a href="/components/messaging-api/index.html">Qpid Messaging API</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Servers and tools</h3>
-
-            <ul>
-              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
-              <li><a href="/components/cpp-broker/index.html">C++ broker</a></li>
-              <li><a href="/components/dispatch-router/index.html">Dispatch router</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Resources</h3>
-
-            <ul>
-              <li><a href="/dashboard.html">Dashboard</a></li>
-              <li><a href="https://cwiki.apache.org/confluence/display/qpid/Index">Wiki</a></li>
-              <li><a href="/resources.html">More resources</a></li>
-            </ul>
-          </section>
-        </div>
-      </div>
-
-      <div id="-search" class="panel" style="display: none;">
-        <form action="http://www.google.com/search" method="get">
-          <input type="hidden" name="sitesearch" value="qpid.apache.org"/>
-          <input type="text" name="q" maxlength="255" autofocus="autofocus" tabindex="1"/>
-          <button type="submit">Search</button>
-          <a href="/search.html">More ways to search</a>
-        </form>
-      </div>
-
-      <div id="-middle" class="panel">
-        <ul id="-path-navigation"><li><a href="/index.html">Home</a></li><li><a href="/releases/index.html">Releases</a></li><li><a href="/releases/qpid-java-trunk/index.html">Qpid for Java Trunk</a></li><li><a href="/releases/qpid-java-trunk/java-broker/book/index.html">Apache Qpid Broker for Java</a></li><li>4.8.&#160;Ports</li></ul>
-
-        <div id="-middle-content">
-          <div class="docbook"><div class="navheader"><table summary="Navigation header" width="100%"><tr><th align="center" colspan="3">4.8.&#160;Ports</th></tr><tr><td align="left" width="20%"><a accesskey="p" href="Java-Broker-Concepts-Queues.html">Prev</a>&#160;</td><th align="center" width="60%">Chapter&#160;4.&#160;Concepts</th><td align="right" width="20%">&#160;<a accesskey="n" href="Java-Broker-Concepts-Authentication-Providers.html">Next</a></td></tr></table><hr /></div><div cl [...]
-        AMQP messaging and HTTP management connectivity it offers for use. </p><p> Each Port is configured with the particular <span class="emphasis"><em>Protocols</em></span> and
-            <span class="emphasis"><em>Transports</em></span> it supports, as well as the <span class="emphasis"><em>Authentication
-            Provider</em></span> to be used to authenticate connections. Where SSL is in use, the
-            <span class="emphasis"><em>Port</em></span> configuration also defines which <span class="emphasis"><em>Keystore</em></span>
-        to use and (where supported) which <span class="emphasis"><em>TrustStore(s)</em></span> and whether Client
-        Certificates should be requested/required. </p><p> Different <span class="emphasis"><em>Ports</em></span> can support different protocols, and many
-            <span class="emphasis"><em>Ports</em></span> can be configured on the Broker.</p><p> The following AMQP protocols are currently supported by the Broker: </p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p><span class="emphasis"><em>AMQP 0-8</em></span></p></li><li class="listitem"><p><span class="emphasis"><em>AMQP 0-9</em></span></p></li><li class="listitem"><p><span class="emphasis"><em>AMQP 0-9-1</em></span></p></l [...]
-    </p><p> Additionally, HTTP ports can be configured for use by the associated management
-        plugin. </p><p>This diagram explains how Ports, <a class="link" href="Java-Broker-Concepts-Authentication-Providers.html" title="4.9.&#160;Authentication Providers">Authentication Providers</a>
-        and an Access Control Provider work together to allow an application to form a connection to
-        a Virtualhost.</p><div class="figure"><a id="d0e1289"></a><p class="title"><strong>Figure&#160;4.9.&#160;Control flow during Authentication</strong></p><div class="figure-contents"><div class="mediaobject"><img alt="Control flow during Authentication" src="images/Broker-PortAuthFlow.png" /></div></div></div><p><br class="figure-break" /></p></div><div class="navfooter"><hr /><table summary="Navigation footer" width="100%"><tr><td align="left" width="40%"><a accesskey="p" href="Ja [...]
-
-          <hr/>
-
-          <ul id="-apache-navigation">
-            <li><a href="http://www.apache.org/">Apache</a></li>
-            <li><a href="http://www.apache.org/licenses/">License</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="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
-          </ul>
-
-          <p id="-legal">
-            Apache Qpid, Messaging built on AMQP; Copyright &#169; 2015
-            The Apache Software Foundation; Licensed under
-            the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
-            License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
-            project logo are trademarks of The Apache Software
-            Foundation; All other marks mentioned may be trademarks or
-            registered trademarks of their respective owners
-          </p>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Concepts-Queues.html b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Concepts-Queues.html
deleted file mode 100644
index b24f12f..0000000
--- a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Concepts-Queues.html
+++ /dev/null
@@ -1,290 +0,0 @@
-<!DOCTYPE html>
-<!--
- -
- - 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.
- -
--->
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-  <head>
-    <title>4.7.&#160;Queues - Apache Qpid&#8482;</title>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-    <link rel="stylesheet" href="/site.css" type="text/css" async="async"/>
-    <link rel="stylesheet" href="/deferred.css" type="text/css" defer="defer"/>
-    <script type="text/javascript">var _deferredFunctions = [];</script>
-    <script type="text/javascript" src="/deferred.js" defer="defer"></script>
-    <!--[if lte IE 8]>
-      <link rel="stylesheet" href="/ie.css" type="text/css"/>
-      <script type="text/javascript" src="/html5shiv.js"></script>
-    <![endif]-->
-
-    <!-- Redirects for `go get` and godoc.org -->
-    <meta name="go-import"
-          content="qpid.apache.org git https://gitbox.apache.org/repos/asf/qpid-proton.git"/>
-    <meta name="go-source"
-          content="qpid.apache.org
-https://github.com/apache/qpid-proton/blob/go1/README.md
-https://github.com/apache/qpid-proton/tree/go1{/dir}
-https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
-  </head>
-  <body>
-    <div id="-content">
-      <div id="-top" class="panel">
-        <a id="-menu-link"><img width="16" height="16" src="" alt="Menu"/></a>
-
-        <a id="-search-link"><img width="22" height="16" src="" alt="Search"/></a>
-
-        <ul id="-global-navigation">
-          <li><a id="-logotype" href="/index.html">Apache Qpid<sup>&#8482;</sup></a></li>
-          <li><a href="/documentation.html">Documentation</a></li>
-          <li><a href="/download.html">Download</a></li>
-          <li><a href="/discussion.html">Discussion</a></li>
-        </ul>
-      </div>
-
-      <div id="-menu" class="panel" style="display: none;">
-        <div class="flex">
-          <section>
-            <h3>Project</h3>
-
-            <ul>
-              <li><a href="/overview.html">Overview</a></li>
-              <li><a href="/components/index.html">Components</a></li>
-              <li><a href="/releases/index.html">Releases</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Messaging APIs</h3>
-
-            <ul>
-              <li><a href="/proton/index.html">Qpid Proton</a></li>
-              <li><a href="/components/jms/index.html">Qpid JMS</a></li>
-              <li><a href="/components/messaging-api/index.html">Qpid Messaging API</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Servers and tools</h3>
-
-            <ul>
-              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
-              <li><a href="/components/cpp-broker/index.html">C++ broker</a></li>
-              <li><a href="/components/dispatch-router/index.html">Dispatch router</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Resources</h3>
-
-            <ul>
-              <li><a href="/dashboard.html">Dashboard</a></li>
-              <li><a href="https://cwiki.apache.org/confluence/display/qpid/Index">Wiki</a></li>
-              <li><a href="/resources.html">More resources</a></li>
-            </ul>
-          </section>
-        </div>
-      </div>
-
-      <div id="-search" class="panel" style="display: none;">
-        <form action="http://www.google.com/search" method="get">
-          <input type="hidden" name="sitesearch" value="qpid.apache.org"/>
-          <input type="text" name="q" maxlength="255" autofocus="autofocus" tabindex="1"/>
-          <button type="submit">Search</button>
-          <a href="/search.html">More ways to search</a>
-        </form>
-      </div>
-
-      <div id="-middle" class="panel">
-        <ul id="-path-navigation"><li><a href="/index.html">Home</a></li><li><a href="/releases/index.html">Releases</a></li><li><a href="/releases/qpid-java-trunk/index.html">Qpid for Java Trunk</a></li><li><a href="/releases/qpid-java-trunk/java-broker/book/index.html">Apache Qpid Broker for Java</a></li><li>4.7.&#160;Queues</li></ul>
-
-        <div id="-middle-content">
-          <div class="docbook"><div class="navheader"><table summary="Navigation header" width="100%"><tr><th align="center" colspan="3">4.7.&#160;Queues</th></tr><tr><td align="left" width="20%"><a accesskey="p" href="Java-Broker-Concepts-Exchanges.html">Prev</a>&#160;</td><th align="center" width="60%">Chapter&#160;4.&#160;Concepts</th><td align="right" width="20%">&#160;<a accesskey="n" href="Java-Broker-Concepts-Ports.html">Next</a></td></tr></table><hr /></div><div class="section">< [...]
-  hold/buffer messages for later delivery to consumer applications. An <a class="link" href="Java-Broker-Concepts-Exchanges.html" title="4.6.&#160;Exchanges">Exchange</a> for passing messages to a queue.
-  Consumers subscribe to a queue in order to receive messages for it. </p><p>The Broker supports different queue types, each with different delivery semantics.  Queues also have the ability to group messages
-   together for delivery to a single consumer.</p><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="Java-Broker-Concepts-Queues-Types"></a>4.7.1.&#160;Types</h3></div></div></div><p>The Broker supports four different queue types, each with different delivery semantics.</p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p><a class="link" href="Java-Broker-Concepts-Queues.html#Java-Broker-Concepts-Queues- [...]
-            delivery order depends on the value of the sorting key property in each message</p></li><li class="listitem"><p><a class="link" href="Java-Broker-Concepts-Queues.html#Java-Broker-Concepts-Queues-Types-LVQ" title="4.7.1.4.&#160;Last Value Queues (LVQ)">Last Value
-              Queue</a> - also known as an LVQ, retains only the last (newest) message received
-            with a given LVQ key value</p></li></ul></div><div class="section"><div class="titlepage"><div><div><h4 class="title"><a id="Java-Broker-Concepts-Queues-Types-Standard"></a>4.7.1.1.&#160;Standard</h4></div></div></div><p>A simple First-In-First-Out (FIFO) queue</p></div><div class="section"><div class="titlepage"><div><div><h4 class="title"><a id="Java-Broker-Concepts-Queues-Types-Priority"></a>4.7.1.2.&#160;Priority</h4></div></div></div><p>In a priority queue, messages on t [...]
-          <a class="link" href="http://docs.oracle.com/javaee/6/api/javax/jms/Message.html#getJMSPriority()" target="_top">JMS priority message
-          header</a> within the message. By default Qpid supports the 10 priority levels
-        mandated by JMS, with priority value 0 as the lowest priority and 9 as the highest. </p><p>It is possible to reduce the effective number of priorities if desired.</p><p>JMS defines the <a class="link" href="http://docs.oracle.com/javaee/6/api/javax/jms/Message.html#DEFAULT_PRIORITY" target="_top">
-          default message priority</a> as 4. Messages sent without a specified priority use this
-        default. </p></div><div class="section"><div class="titlepage"><div><div><h4 class="title"><a id="Java-Broker-Concepts-Queues-Types-Sorted"></a>4.7.1.3.&#160;Sorted Queues</h4></div></div></div><p>Sorted queues allow the message delivery order to be determined by value of an arbitrary
-          <a class="link" href="http://docs.oracle.com/javaee/6/api/javax/jms/Message.html#getStringProperty()" target="_top">JMS message
-          property</a>. Sort order is alpha-numeric and the property value must have a type
-        java.lang.String.</p><p>Messages sent to a sorted queue without the specified JMS message property will be
-        put at the head of the queue.</p></div><div class="section"><div class="titlepage"><div><div><h4 class="title"><a id="Java-Broker-Concepts-Queues-Types-LVQ"></a>4.7.1.4.&#160;Last Value Queues (LVQ)</h4></div></div></div><p>LVQs (or conflation queues) are special queues that automatically discard any message
-        when a newer message arrives with the same key value. The key is specified by arbitrary
-          <a class="link" href="http://docs.oracle.com/javaee/6/api/javax/jms/Message.html#getPropertyNames()" target="_top">JMS message
-          property</a>.</p><p>An example of an LVQ might be where a queue represents prices on a stock exchange: when
-        you first consume from the queue you get the latest quote for each stock, and then as new
-        prices come in you are sent only these updates. </p><p>Like other queues, LVQs can either be browsed or consumed from. When browsing an
-        individual subscriber does not remove the message from the queue when receiving it. This
-        allows for many subscriptions to browse the same LVQ (i.e. you do not need to create and
-        bind a separate LVQ for each subscriber who wishes to receive the contents of the
-        LVQ).</p><p>Messages sent to an LVQ without the specified property will be delivered as normal and
-        will never be "replaced".</p></div></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="Java-Broker-Concepts-Queues-QueueDeclareArguments"></a>4.7.2.&#160;Queue Declare Arguments</h3></div></div></div><p>To create a priority, sorted or LVQ queue programmatically from AMQP, pass the
-      appropriate queue-declare arguments.</p><div class="table"><a id="d0e933"></a><p class="title"><strong>Table&#160;4.1.&#160;Queue-declare arguments understood for priority, sorted and LVQ queues</strong></p><div class="table-contents"><table border="1" summary="Queue-declare arguments understood for priority, sorted and LVQ queues"><colgroup><col /><col /><col /><col /></colgroup><thead><tr><th>Queue type</th><th>Argument name</th><th>Argument name</th><th>Argument Description</th> [...]
-              entries</td></tr><tr><td>lvq</td><td>qpid.last_value_queue_key</td><td>java.lang.String</td><td>Specifies lvq queue with given message property used to conflate the
-              entries</td></tr></tbody></table></div></div><br class="table-break" /></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="Java-Broker-Concepts-Queues-Message-Grouping"></a>4.7.3.&#160;Messaging Grouping</h3></div></div></div><p> The broker allows messaging applications to classify a set of related messages as
-      belonging to a group. This allows a message producer to indicate to the consumer that a group
-      of messages should be considered a single logical operation with respect to the application. </p><p> The broker can use this group identification to enforce policies controlling how messages
-      from a given group can be distributed to consumers. For instance, the broker can be configured
-      to guarantee all the messages from a particular group are processed in order across multiple
-      consumers. </p><p> For example, assume we have a shopping application that manages items in a virtual
-      shopping cart. A user may add an item to their shopping cart, then change their mind and
-      remove it. If the application sends an <span class="emphasis"><em>add</em></span> message to the broker,
-      immediately followed by a <span class="emphasis"><em>remove</em></span> message, they will be queued in the
-      proper order - <span class="emphasis"><em>add</em></span>, followed by <span class="emphasis"><em>remove</em></span>. </p><p> However, if there are multiple consumers, it is possible that once a consumer acquires
-      the <span class="emphasis"><em>add</em></span> message, a different consumer may acquire the
-        <span class="emphasis"><em>remove</em></span> message. This allows both messages to be processed in parallel,
-      which could result in a "race" where the <span class="emphasis"><em>remove</em></span> operation is incorrectly
-      performed before the <span class="emphasis"><em>add</em></span> operation. </p><div class="section"><div class="titlepage"><div><div><h4 class="title"><a id="Java-Broker-Concepts-Queues-GroupingMessages"></a>4.7.3.1.&#160;Grouping Messages</h4></div></div></div><p> In order to group messages, the application would designate a particular message header
-        as containing a message's <span class="emphasis"><em>group identifier</em></span>. The group identifier stored
-        in that header field would be a string value set by the message producer. Messages from the
-        same group would have the same group identifier value. The key that identifies the header
-        must also be known to the message consumers. This allows the consumers to determine a
-        message's assigned group. </p><p> The header that is used to hold the group identifier, as well as the values used as
-        group identifiers, are totally under control of the application. </p></div><div class="section"><div class="titlepage"><div><div><h4 class="title"><a id="Java-Broker-Concepts-Queues-BrokerRole"></a>4.7.3.2.&#160; The Role of the Broker in Message Grouping </h4></div></div></div><p> The broker will apply the following processing on each grouped message: </p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p>Enqueue a received [...]
-              header.</p></li><li class="listitem"><p>Enforce <span class="emphasis"><em>consumption ordering</em></span> among messages belonging to the
-              same group. <span class="emphasis"><em>Consumption ordering</em></span> means one of two things
-              depending on how the queue has been configured. </p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: circle; "><li class="listitem"><p> In default mode, a group gets assigned to a single consumer for the lifetime
-                  of that consumer, and the broker will pass all subsequent messages in the group to
-                  that consumer. </p></li><li class="listitem"><p>In 'shared groups' mode (which gives the same behaviour as the Qpid C++
-                  Broker) the broker enforces a looser guarantee, namely that all the
-                    <span class="emphasis"><em>currently unacknowledged messages</em></span> in a group are sent to
-                  the same consumer, but the consumer used may change over time even if the
-                  consumers do not. This means that only one consumer can be processing messages
-                  from a particular group at any given time, however if the consumer acknowledges
-                  all of its acquired messages then the broker <span class="emphasis"><em>may</em></span> pass the
-                  next pending message in that group to a different consumer. </p></li></ul></div></li></ul></div><p>
-      </p><p> The absence of a value in the designated group header field of a message is treated as
-        follows: </p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p> In default mode, failure for a message to specify a group is treated as a desire
-              for the message not to be grouped at all. Such messages will be distributed to any
-              available consumer, without the ordering quarantees imposed by grouping. </p></li><li class="listitem"><p> In 'shared groups' mode (which gives the same behaviour as the Qpid C++ Broker)
-              the broker assigns messages without a group value to a 'default group'. Therefore, all
-              such "unidentified" messages are considered by the broker as part of the same group,
-              which will handled like any other group. The name of this default group is
-              "qpid.no-group", although it can be customised as detailed below. </p></li></ul></div><p>
-      </p><p> Note that message grouping has no effect on queue browsers.</p><p> Note well that distinct message groups would not block each other from delivery. For
-        example, assume a queue contains messages from two different message groups - say group "A"
-        and group "B" - and they are enqueued such that "A"'s messages are in front of "B". If the
-        first message of group "A" is in the process of being consumed by a client, then the
-        remaining "A" messages are blocked, but the messages of the "B" group are available for
-        consumption by other consumers - even though it is "behind" group "A" in the queue. </p></div></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="Java-Broker-Concepts-Queues-SetLowPrefetch"></a>4.7.4.&#160;Using low pre-fetch with special queue types</h3></div></div></div><p>Qpid clients receive buffered messages in batches, sized according to the pre-fetch value.
-      The current default is 500. </p><p>However, if you use the default value you will probably <span class="emphasis"><em>not</em></span> see
-      desirable behaviour when using priority, sorted, lvq or grouped queues. Once the broker has
-      sent a message to the client its delivery order is then fixed, regardless of the special
-      behaviour of the queue. </p><p>For example, if using a priority queue and a prefetch of 100, and 100 messages arrive with
-      priority 2, the broker will send these messages to the client. If then a new message arrives
-      with priority 1, the broker cannot leap frog messages of lower priority. The priority 1 will
-      be delivered at the front of the next batch of messages to be sent to the client.</p><p> So, you need to set the prefetch values for your client (consumer) to make this sensible.
-      To do this set the Java system property <code class="varname">max_prefetch</code> on the client
-      environment (using -D) before creating your consumer. </p><p>A default for all client connections can be set via a system property: </p><pre class="programlisting">
--Dmax_prefetch=1
-</pre><p> The prefetch can be also be adjusted on a per connection basis by adding a
-        <code class="varname">maxprefetch</code> value to the <a class="link" href="../../jms-client-0-8/book/JMS-Client-0-8-Connection-URL.html" target="_top">Connection URLs</a>
-    </p><pre class="programlisting">
-amqp://guest:guest@client1/development?maxprefetch='1'&amp;brokerlist='tcp://localhost:5672'
-</pre><p>Setting the Qpid pre-fetch to 1 will give exact queue-type semantics as perceived by the
-      client however, this brings a performance cost. You could test with a slightly higher
-      pre-fetch to trade-off between throughput and exact semantics.</p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="Java-Broker-Concepts-Queue-EnsureNonDestructiveConsumers"></a>4.7.5.&#160;Forcing all consumers to be non-destructive</h3></div></div></div><p>When a consumer attaches to a queue, the normal behaviour is that messages are
-          sent to that consumer are acquired exclusively by that consumer, and when the consumer
-          acknowledges them, the messages are removed from the queue.</p><p>Another common pattern is to have queue "browsers" which send all messages to the
-          browser, but do not prevent other consumers from receiving the messages, and do not
-          remove them from the queue when the browser is done with them.  Such a browser is an
-          instance of a "non-destructive" consumer.</p><p>If every consumer on a queue is non destructive then we can obtain some interesting
-          behaviours. In the case of a LVQ
-           then the queue will always contain the most up to date value for every key. For
-          a standard queue, if every consumer is non-destructive then we have something that
-          behaves like a topic (every consumer receives every message) except that instead of
-          only seeing messages that arrive after the point at which the consumer is created, all
-          messages which have not been removed due to TTL expiry (or, in the case of LVQs,
-          overwirtten by newer values for the same key).</p><p>A queue can be created to enforce all consumers are non-destructive. This can be
-          be achieved using the following queue declare argument:</p><div class="table"><a id="d0e1116"></a><p class="title"><strong>Table&#160;4.2.&#160;</strong></p><div class="table-contents"><table border="1"><colgroup><col /><col /><col /></colgroup><thead><tr><th>Argument Name</th><th>Argument Type</th><th>Argument Description</th></tr></thead><tbody><tr><td>qpid.ensure_nondestructive_consumers</td><td>java.lang.Boolean</td><td>Set to true if the queue should make all consumers att [...]
-                  non-destructively. (Default is false).</td></tr></tbody></table></div></div><br class="table-break" /><p>Through the <a class="link" href="Java-Broker-Management-Channel-REST-API.html" title="6.3.&#160;REST API">REST</a> api,
-        the equivalent attribute is named <code class="varname">ensureNondestructiveConsumers</code>.
-    </p><div class="section"><div class="titlepage"><div><div><h4 class="title"><a id="d0e1142"></a>4.7.5.1.&#160;Bounding size using min/max TTL</h4></div></div></div><p>For queues other than LVQs, having only non-destructive consumers could mean that
-            messages would never get deleted, leaving the queue to grow unconstrainedly. To
-            prevent this you can use the ability to set the maximum TTL of the queue. To ensure
-            all messages have the same TTL you could also set the minimum TTL to the same value.
-        </p><p>Minimum/Maximum TTL for a queue can be set though the HTTP Management UI, using the
-            REST API or by hand editing the configuration file (for JSON configuration stores).
-            The attribute names are <code class="varname">minimumMessageTtl</code> and
-            <code class="varname">maximumMessageTtl</code> and the TTL value is given in milliseconds.</p></div><div class="section"><div class="titlepage"><div><div><h4 class="title"><a id="d0e1155"></a>4.7.5.2.&#160;Choosing to receive messages based on arrival time</h4></div></div></div><p>A queue with no destructive consumers will retain all messages until they expire
-            due to TTL. It may be the case that a consumer only wishes to receive messages
-            that have been sent in the last 60 minutes, and any new messages that arrive, or
-            alternatively it may wish only to receive newly arriving messages and not any that
-            are already in the queue. This can be achieved by using a filter on the arrival
-            time.</p><p>A special parameter <code class="varname">x-qpid-replay-period</code> can be used in the
-            consumer declaration to control the messages the consumer wishes to receive. The
-            value of <code class="varname">x-qpid-replay-period</code> is the time, in seconds, for which
-            the consumer wishes to see messages. A replay period of 0 indicates only newly
-            arriving messages should be sent. A replay period of 3600 indicates that only
-            messages sent in the last hour - along with any newly arriving messages - should be
-            sent.</p><div class="table"><a id="d0e1168"></a><p class="title"><strong>Table&#160;4.3.&#160;Setting the replay period</strong></p><div class="table-contents"><table border="1" summary="Setting the replay period"><colgroup><col /><col /></colgroup><thead><tr><th>Syntax</th><th>Example</th></tr></thead><tbody><tr><td>Addressing</td><td>myqueue : { link : { x-subscribe: { arguments : { x-qpid-replay-period : '3600' } } } }</td></tr><tr><td>Binding URL</td><td>direct://amq.dire [...]
-            see only newly arriving messages (i.e. standard topic-like behaviour) but other consumers
-            may wish to start their message stream from some point in the past. This can be achieved by
-            setting a default filter on the queue so that consumers which do not explicitly set a replay
-            period get a default (in this case the desired default would be 0).</p><p>The default filter set for a queue can be set via the REST API using the attribute named
-            <code class="varname">defaultFilters</code>. This value is a map from filter name to type and arguments.
-            To set the default behaviour for the queue to be that consumers only receive newly arrived
-            messages, then you should set this attribute to the value:</p><pre class="screen">
-            { "x-qpid-replay-period" : { "x-qpid-replay-period" : [ "0" ] } }
-        </pre><p>
-            If the desired default behaviour is that each consumer should see all messages arriving in
-            the last minute, as well as all new messages then the value would need to be:</p><pre class="screen">
-            { "x-qpid-replay-period" : { "x-qpid-replay-period" : [ "60" ] } }
-        </pre></div></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="Java-Broker-Concepts-Queue-HoldingEntries"></a>4.7.6.&#160;Holding messages on a Queue</h3></div></div></div><p>Sometimes it is required that while a message has been placed on a queue, it is not released to consumers
-            until some external condition is met. </p><div class="section"><div class="titlepage"><div><div><h4 class="title"><a id="d0e1210"></a>4.7.6.1.&#160;Hold until valid</h4></div></div></div><p>Currently Queues support the "holding" of messages until a (per-message) provided point in time.
-                By default this support is not enabled (since it requires extra work to be performed against every
-                message entering the queue.  To enable support, the attribute <code class="varname">holdOnPublishEnabled</code>
-                must evaluate to true for the Queue.  When enabled messages on the queue will be checked for the header
-                (for AMQP 0-8, 0-9, 0-9-1 and 0-10 messages) or message annotation (for AMQP 1.0 messages)
-                <code class="varname">x-qpid-not-valid-before</code>. If this header/annotation exists and contains a numeric value,
-                it will be treated as a point in time given in milliseconds since the UNIX epoch.  The message will not
-                be released from the Queue to consumers until this time has been reached.
-            </p></div></div></div><div class="navfooter"><hr /><table summary="Navigation footer" width="100%"><tr><td align="left" width="40%"><a accesskey="p" href="Java-Broker-Concepts-Exchanges.html">Prev</a>&#160;</td><td align="center" width="20%"><a accesskey="u" href="Java-Broker-Concepts.html">Up</a></td><td align="right" width="40%">&#160;<a accesskey="n" href="Java-Broker-Concepts-Ports.html">Next</a></td></tr><tr><td align="left" valign="top" width="40%">4.6.&#160;Exchanges&# [...]
-
-          <hr/>
-
-          <ul id="-apache-navigation">
-            <li><a href="http://www.apache.org/">Apache</a></li>
-            <li><a href="http://www.apache.org/licenses/">License</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="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
-          </ul>
-
-          <p id="-legal">
-            Apache Qpid, Messaging built on AMQP; Copyright &#169; 2015
-            The Apache Software Foundation; Licensed under
-            the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
-            License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
-            project logo are trademarks of The Apache Software
-            Foundation; All other marks mentioned may be trademarks or
-            registered trademarks of their respective owners
-          </p>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Concepts-RemoteReplicationNodes.html b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Concepts-RemoteReplicationNodes.html
deleted file mode 100644
index 927b5ae..0000000
--- a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Concepts-RemoteReplicationNodes.html
+++ /dev/null
@@ -1,145 +0,0 @@
-<!DOCTYPE html>
-<!--
- -
- - 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.
- -
--->
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-  <head>
-    <title>4.4.&#160;Remote Replication Nodes - Apache Qpid&#8482;</title>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-    <link rel="stylesheet" href="/site.css" type="text/css" async="async"/>
-    <link rel="stylesheet" href="/deferred.css" type="text/css" defer="defer"/>
-    <script type="text/javascript">var _deferredFunctions = [];</script>
-    <script type="text/javascript" src="/deferred.js" defer="defer"></script>
-    <!--[if lte IE 8]>
-      <link rel="stylesheet" href="/ie.css" type="text/css"/>
-      <script type="text/javascript" src="/html5shiv.js"></script>
-    <![endif]-->
-
-    <!-- Redirects for `go get` and godoc.org -->
-    <meta name="go-import"
-          content="qpid.apache.org git https://gitbox.apache.org/repos/asf/qpid-proton.git"/>
-    <meta name="go-source"
-          content="qpid.apache.org
-https://github.com/apache/qpid-proton/blob/go1/README.md
-https://github.com/apache/qpid-proton/tree/go1{/dir}
-https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
-  </head>
-  <body>
-    <div id="-content">
-      <div id="-top" class="panel">
-        <a id="-menu-link"><img width="16" height="16" src="" alt="Menu"/></a>
-
-        <a id="-search-link"><img width="22" height="16" src="" alt="Search"/></a>
-
-        <ul id="-global-navigation">
-          <li><a id="-logotype" href="/index.html">Apache Qpid<sup>&#8482;</sup></a></li>
-          <li><a href="/documentation.html">Documentation</a></li>
-          <li><a href="/download.html">Download</a></li>
-          <li><a href="/discussion.html">Discussion</a></li>
-        </ul>
-      </div>
-
-      <div id="-menu" class="panel" style="display: none;">
-        <div class="flex">
-          <section>
-            <h3>Project</h3>
-
-            <ul>
-              <li><a href="/overview.html">Overview</a></li>
-              <li><a href="/components/index.html">Components</a></li>
-              <li><a href="/releases/index.html">Releases</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Messaging APIs</h3>
-
-            <ul>
-              <li><a href="/proton/index.html">Qpid Proton</a></li>
-              <li><a href="/components/jms/index.html">Qpid JMS</a></li>
-              <li><a href="/components/messaging-api/index.html">Qpid Messaging API</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Servers and tools</h3>
-
-            <ul>
-              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
-              <li><a href="/components/cpp-broker/index.html">C++ broker</a></li>
-              <li><a href="/components/dispatch-router/index.html">Dispatch router</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Resources</h3>
-
-            <ul>
-              <li><a href="/dashboard.html">Dashboard</a></li>
-              <li><a href="https://cwiki.apache.org/confluence/display/qpid/Index">Wiki</a></li>
-              <li><a href="/resources.html">More resources</a></li>
-            </ul>
-          </section>
-        </div>
-      </div>
-
-      <div id="-search" class="panel" style="display: none;">
-        <form action="http://www.google.com/search" method="get">
-          <input type="hidden" name="sitesearch" value="qpid.apache.org"/>
-          <input type="text" name="q" maxlength="255" autofocus="autofocus" tabindex="1"/>
-          <button type="submit">Search</button>
-          <a href="/search.html">More ways to search</a>
-        </form>
-      </div>
-
-      <div id="-middle" class="panel">
-        <ul id="-path-navigation"><li><a href="/index.html">Home</a></li><li><a href="/releases/index.html">Releases</a></li><li><a href="/releases/qpid-java-trunk/index.html">Qpid for Java Trunk</a></li><li><a href="/releases/qpid-java-trunk/java-broker/book/index.html">Apache Qpid Broker for Java</a></li><li>4.4.&#160;Remote Replication Nodes</li></ul>
-
-        <div id="-middle-content">
-          <div class="docbook"><div class="navheader"><table summary="Navigation header" width="100%"><tr><th align="center" colspan="3">4.4.&#160;Remote Replication Nodes</th></tr><tr><td align="left" width="20%"><a accesskey="p" href="Java-Broker-Concepts-Virtualhost-Nodes.html">Prev</a>&#160;</td><th align="center" width="60%">Chapter&#160;4.&#160;Concepts</th><td align="right" width="20%">&#160;<a accesskey="n" href="Java-Broker-Concepts-Virtualhosts.html">Next</a></td></tr></table>< [...]
-    another virtualhost node in the group.</p></div><div class="navfooter"><hr /><table summary="Navigation footer" width="100%"><tr><td align="left" width="40%"><a accesskey="p" href="Java-Broker-Concepts-Virtualhost-Nodes.html">Prev</a>&#160;</td><td align="center" width="20%"><a accesskey="u" href="Java-Broker-Concepts.html">Up</a></td><td align="right" width="40%">&#160;<a accesskey="n" href="Java-Broker-Concepts-Virtualhosts.html">Next</a></td></tr><tr><td align="left" valign="top"  [...]
-
-          <hr/>
-
-          <ul id="-apache-navigation">
-            <li><a href="http://www.apache.org/">Apache</a></li>
-            <li><a href="http://www.apache.org/licenses/">License</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="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
-          </ul>
-
-          <p id="-legal">
-            Apache Qpid, Messaging built on AMQP; Copyright &#169; 2015
-            The Apache Software Foundation; Licensed under
-            the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
-            License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
-            project logo are trademarks of The Apache Software
-            Foundation; All other marks mentioned may be trademarks or
-            registered trademarks of their respective owners
-          </p>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Concepts-Virtualhost-Nodes.html b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Concepts-Virtualhost-Nodes.html
deleted file mode 100644
index 0f3ddd7..0000000
--- a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Concepts-Virtualhost-Nodes.html
+++ /dev/null
@@ -1,150 +0,0 @@
-<!DOCTYPE html>
-<!--
- -
- - 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.
- -
--->
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-  <head>
-    <title>4.3.&#160;Virtualhost Nodes - Apache Qpid&#8482;</title>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-    <link rel="stylesheet" href="/site.css" type="text/css" async="async"/>
-    <link rel="stylesheet" href="/deferred.css" type="text/css" defer="defer"/>
-    <script type="text/javascript">var _deferredFunctions = [];</script>
-    <script type="text/javascript" src="/deferred.js" defer="defer"></script>
-    <!--[if lte IE 8]>
-      <link rel="stylesheet" href="/ie.css" type="text/css"/>
-      <script type="text/javascript" src="/html5shiv.js"></script>
-    <![endif]-->
-
-    <!-- Redirects for `go get` and godoc.org -->
-    <meta name="go-import"
-          content="qpid.apache.org git https://gitbox.apache.org/repos/asf/qpid-proton.git"/>
-    <meta name="go-source"
-          content="qpid.apache.org
-https://github.com/apache/qpid-proton/blob/go1/README.md
-https://github.com/apache/qpid-proton/tree/go1{/dir}
-https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
-  </head>
-  <body>
-    <div id="-content">
-      <div id="-top" class="panel">
-        <a id="-menu-link"><img width="16" height="16" src="" alt="Menu"/></a>
-
-        <a id="-search-link"><img width="22" height="16" src="" alt="Search"/></a>
-
-        <ul id="-global-navigation">
-          <li><a id="-logotype" href="/index.html">Apache Qpid<sup>&#8482;</sup></a></li>
-          <li><a href="/documentation.html">Documentation</a></li>
-          <li><a href="/download.html">Download</a></li>
-          <li><a href="/discussion.html">Discussion</a></li>
-        </ul>
-      </div>
-
-      <div id="-menu" class="panel" style="display: none;">
-        <div class="flex">
-          <section>
-            <h3>Project</h3>
-
-            <ul>
-              <li><a href="/overview.html">Overview</a></li>
-              <li><a href="/components/index.html">Components</a></li>
-              <li><a href="/releases/index.html">Releases</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Messaging APIs</h3>
-
-            <ul>
-              <li><a href="/proton/index.html">Qpid Proton</a></li>
-              <li><a href="/components/jms/index.html">Qpid JMS</a></li>
-              <li><a href="/components/messaging-api/index.html">Qpid Messaging API</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Servers and tools</h3>
-
-            <ul>
-              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
-              <li><a href="/components/cpp-broker/index.html">C++ broker</a></li>
-              <li><a href="/components/dispatch-router/index.html">Dispatch router</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Resources</h3>
-
-            <ul>
-              <li><a href="/dashboard.html">Dashboard</a></li>
-              <li><a href="https://cwiki.apache.org/confluence/display/qpid/Index">Wiki</a></li>
-              <li><a href="/resources.html">More resources</a></li>
-            </ul>
-          </section>
-        </div>
-      </div>
-
-      <div id="-search" class="panel" style="display: none;">
-        <form action="http://www.google.com/search" method="get">
-          <input type="hidden" name="sitesearch" value="qpid.apache.org"/>
-          <input type="text" name="q" maxlength="255" autofocus="autofocus" tabindex="1"/>
-          <button type="submit">Search</button>
-          <a href="/search.html">More ways to search</a>
-        </form>
-      </div>
-
-      <div id="-middle" class="panel">
-        <ul id="-path-navigation"><li><a href="/index.html">Home</a></li><li><a href="/releases/index.html">Releases</a></li><li><a href="/releases/qpid-java-trunk/index.html">Qpid for Java Trunk</a></li><li><a href="/releases/qpid-java-trunk/java-broker/book/index.html">Apache Qpid Broker for Java</a></li><li>4.3.&#160;Virtualhost Nodes</li></ul>
-
-        <div id="-middle-content">
-          <div class="docbook"><div class="navheader"><table summary="Navigation header" width="100%"><tr><th align="center" colspan="3">4.3.&#160;Virtualhost Nodes</th></tr><tr><td align="left" width="20%"><a accesskey="p" href="Java-Broker-Concepts-Broker.html">Prev</a>&#160;</td><th align="center" width="60%">Chapter&#160;4.&#160;Concepts</th><td align="right" width="20%">&#160;<a accesskey="n" href="Java-Broker-Concepts-RemoteReplicationNodes.html">Next</a></td></tr></table><hr /></d [...]
-    one virtualhost.</p><p>A <span class="emphasis"><em>virtualhost node</em></span> is backed by storage. This storage is used to record
-    the durable entities that exist beneath the virtualhost node (the virtualhost, queues, exchanges
-    etc).</p><p>When HA is in use, it is the virtualhost nodes of many Brokers that come together to form
-    the group. The virtualhost nodes together elect a master. When the high availability feature is
-    in use, the virtualhost node has <a class="link" href="Java-Broker-Concepts-RemoteReplicationNodes.html" title="4.4.&#160;Remote Replication Nodes">remote replications nodes</a>. There is a remote replication node corresponding to each
-    remote virtualhost node that form part of the group.</p></div><div class="navfooter"><hr /><table summary="Navigation footer" width="100%"><tr><td align="left" width="40%"><a accesskey="p" href="Java-Broker-Concepts-Broker.html">Prev</a>&#160;</td><td align="center" width="20%"><a accesskey="u" href="Java-Broker-Concepts.html">Up</a></td><td align="right" width="40%">&#160;<a accesskey="n" href="Java-Broker-Concepts-RemoteReplicationNodes.html">Next</a></td></tr><tr><td align="left"  [...]
-
-          <hr/>
-
-          <ul id="-apache-navigation">
-            <li><a href="http://www.apache.org/">Apache</a></li>
-            <li><a href="http://www.apache.org/licenses/">License</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="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
-          </ul>
-
-          <p id="-legal">
-            Apache Qpid, Messaging built on AMQP; Copyright &#169; 2015
-            The Apache Software Foundation; Licensed under
-            the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
-            License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
-            project logo are trademarks of The Apache Software
-            Foundation; All other marks mentioned may be trademarks or
-            registered trademarks of their respective owners
-          </p>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Concepts-Virtualhosts.html b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Concepts-Virtualhosts.html
deleted file mode 100644
index c7fa547..0000000
--- a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Concepts-Virtualhosts.html
+++ /dev/null
@@ -1,158 +0,0 @@
-<!DOCTYPE html>
-<!--
- -
- - 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.
- -
--->
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-  <head>
-    <title>4.5.&#160;Virtualhosts - Apache Qpid&#8482;</title>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-    <link rel="stylesheet" href="/site.css" type="text/css" async="async"/>
-    <link rel="stylesheet" href="/deferred.css" type="text/css" defer="defer"/>
-    <script type="text/javascript">var _deferredFunctions = [];</script>
-    <script type="text/javascript" src="/deferred.js" defer="defer"></script>
-    <!--[if lte IE 8]>
-      <link rel="stylesheet" href="/ie.css" type="text/css"/>
-      <script type="text/javascript" src="/html5shiv.js"></script>
-    <![endif]-->
-
-    <!-- Redirects for `go get` and godoc.org -->
-    <meta name="go-import"
-          content="qpid.apache.org git https://gitbox.apache.org/repos/asf/qpid-proton.git"/>
-    <meta name="go-source"
-          content="qpid.apache.org
-https://github.com/apache/qpid-proton/blob/go1/README.md
-https://github.com/apache/qpid-proton/tree/go1{/dir}
-https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
-  </head>
-  <body>
-    <div id="-content">
-      <div id="-top" class="panel">
-        <a id="-menu-link"><img width="16" height="16" src="" alt="Menu"/></a>
-
-        <a id="-search-link"><img width="22" height="16" src="" alt="Search"/></a>
-
-        <ul id="-global-navigation">
-          <li><a id="-logotype" href="/index.html">Apache Qpid<sup>&#8482;</sup></a></li>
-          <li><a href="/documentation.html">Documentation</a></li>
-          <li><a href="/download.html">Download</a></li>
-          <li><a href="/discussion.html">Discussion</a></li>
-        </ul>
-      </div>
-
-      <div id="-menu" class="panel" style="display: none;">
-        <div class="flex">
-          <section>
-            <h3>Project</h3>
-
-            <ul>
-              <li><a href="/overview.html">Overview</a></li>
-              <li><a href="/components/index.html">Components</a></li>
-              <li><a href="/releases/index.html">Releases</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Messaging APIs</h3>
-
-            <ul>
-              <li><a href="/proton/index.html">Qpid Proton</a></li>
-              <li><a href="/components/jms/index.html">Qpid JMS</a></li>
-              <li><a href="/components/messaging-api/index.html">Qpid Messaging API</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Servers and tools</h3>
-
-            <ul>
-              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
-              <li><a href="/components/cpp-broker/index.html">C++ broker</a></li>
-              <li><a href="/components/dispatch-router/index.html">Dispatch router</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Resources</h3>
-
-            <ul>
-              <li><a href="/dashboard.html">Dashboard</a></li>
-              <li><a href="https://cwiki.apache.org/confluence/display/qpid/Index">Wiki</a></li>
-              <li><a href="/resources.html">More resources</a></li>
-            </ul>
-          </section>
-        </div>
-      </div>
-
-      <div id="-search" class="panel" style="display: none;">
-        <form action="http://www.google.com/search" method="get">
-          <input type="hidden" name="sitesearch" value="qpid.apache.org"/>
-          <input type="text" name="q" maxlength="255" autofocus="autofocus" tabindex="1"/>
-          <button type="submit">Search</button>
-          <a href="/search.html">More ways to search</a>
-        </form>
-      </div>
-
-      <div id="-middle" class="panel">
-        <ul id="-path-navigation"><li><a href="/index.html">Home</a></li><li><a href="/releases/index.html">Releases</a></li><li><a href="/releases/qpid-java-trunk/index.html">Qpid for Java Trunk</a></li><li><a href="/releases/qpid-java-trunk/java-broker/book/index.html">Apache Qpid Broker for Java</a></li><li>4.5.&#160;Virtualhosts</li></ul>
-
-        <div id="-middle-content">
-          <div class="docbook"><div class="navheader"><table summary="Navigation header" width="100%"><tr><th align="center" colspan="3">4.5.&#160;Virtualhosts</th></tr><tr><td align="left" width="20%"><a accesskey="p" href="Java-Broker-Concepts-RemoteReplicationNodes.html">Prev</a>&#160;</td><th align="center" width="60%">Chapter&#160;4.&#160;Concepts</th><td align="right" width="20%">&#160;<a accesskey="n" href="Java-Broker-Concepts-Exchanges.html">Next</a></td></tr></table><hr /></div [...]
-    the messaging that goes on within one virtualhost is independent of any messaging that goes on
-    in another virtualhost. For instance, a queue named <span class="emphasis"><em>foo</em></span> defined in one
-    virtualhost is completely independent of a queue named <span class="emphasis"><em>foo</em></span> in another
-    virtualhost.</p><p>A virtualhost is identified by a name which must be unique broker-wide. Clients use the name
-    to identify the virtualhost to which they wish to connect when they connect.</p><p>A virtualhost exists in a container called a virtualhost node.</p><p>The virtualhost comprises a number of entities. This section summaries the purpose of
-    each of the entities and describes the relationships between them. These details are developed
-    further in the sub-sections that follow.</p><p><span class="emphasis"><em>Exchanges</em></span> is a named entity within the Virtual Host which receives
-    messages from producers and routes them to matching Queues.</p><p><span class="emphasis"><em>Queues</em></span> are named entities that hold messages for delivery to consumer
-    applications.</p><p><span class="emphasis"><em>Bindings</em></span> are relationships between Exchanges and Queue that facilitate
-    routing of messages from the Exchange to the Queue.</p><p><span class="emphasis"><em>Connections</em></span> represent a live connection to the virtualhost from a
-    messaging client.</p><p>A <span class="emphasis"><em>Session</em></span> represents a context for the production or consumption of
-    messages. A Connection can have many Sessions.</p><p>A <span class="emphasis"><em>Consumer</em></span> represents a live consumer that is attached to queue.</p><p><span class="emphasis"><em>Loggers</em></span> are responsible for producing logs for this virtualhost.</p><p> The following diagram depicts the Virtualhost model: </p><div class="figure"><a id="d0e503"></a><p class="title"><strong>Figure&#160;4.3.&#160;Virtualhost Model showing major entities</strong></p><div class="figure [...]
-  </p><p>A <span class="emphasis"><em>virtualhost</em></span> is backed by storage which is used to store the
-    messages.</p></div><div class="navfooter"><hr /><table summary="Navigation footer" width="100%"><tr><td align="left" width="40%"><a accesskey="p" href="Java-Broker-Concepts-RemoteReplicationNodes.html">Prev</a>&#160;</td><td align="center" width="20%"><a accesskey="u" href="Java-Broker-Concepts.html">Up</a></td><td align="right" width="40%">&#160;<a accesskey="n" href="Java-Broker-Concepts-Exchanges.html">Next</a></td></tr><tr><td align="left" valign="top" width="40%">4.4.&#160;Remot [...]
-
-          <hr/>
-
-          <ul id="-apache-navigation">
-            <li><a href="http://www.apache.org/">Apache</a></li>
-            <li><a href="http://www.apache.org/licenses/">License</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="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
-          </ul>
-
-          <p id="-legal">
-            Apache Qpid, Messaging built on AMQP; Copyright &#169; 2015
-            The Apache Software Foundation; Licensed under
-            the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
-            License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
-            project logo are trademarks of The Apache Software
-            Foundation; All other marks mentioned may be trademarks or
-            registered trademarks of their respective owners
-          </p>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Concepts.html b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Concepts.html
deleted file mode 100644
index d8cd44f..0000000
--- a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Concepts.html
+++ /dev/null
@@ -1,168 +0,0 @@
-<!DOCTYPE html>
-<!--
- -
- - 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.
- -
--->
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-  <head>
-    <title>Chapter&#160;4.&#160;Concepts - Apache Qpid&#8482;</title>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-    <link rel="stylesheet" href="/site.css" type="text/css" async="async"/>
-    <link rel="stylesheet" href="/deferred.css" type="text/css" defer="defer"/>
-    <script type="text/javascript">var _deferredFunctions = [];</script>
-    <script type="text/javascript" src="/deferred.js" defer="defer"></script>
-    <!--[if lte IE 8]>
-      <link rel="stylesheet" href="/ie.css" type="text/css"/>
-      <script type="text/javascript" src="/html5shiv.js"></script>
-    <![endif]-->
-
-    <!-- Redirects for `go get` and godoc.org -->
-    <meta name="go-import"
-          content="qpid.apache.org git https://gitbox.apache.org/repos/asf/qpid-proton.git"/>
-    <meta name="go-source"
-          content="qpid.apache.org
-https://github.com/apache/qpid-proton/blob/go1/README.md
-https://github.com/apache/qpid-proton/tree/go1{/dir}
-https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
-  </head>
-  <body>
-    <div id="-content">
-      <div id="-top" class="panel">
-        <a id="-menu-link"><img width="16" height="16" src="" alt="Menu"/></a>
-
-        <a id="-search-link"><img width="22" height="16" src="" alt="Search"/></a>
-
-        <ul id="-global-navigation">
-          <li><a id="-logotype" href="/index.html">Apache Qpid<sup>&#8482;</sup></a></li>
-          <li><a href="/documentation.html">Documentation</a></li>
-          <li><a href="/download.html">Download</a></li>
-          <li><a href="/discussion.html">Discussion</a></li>
-        </ul>
-      </div>
-
-      <div id="-menu" class="panel" style="display: none;">
-        <div class="flex">
-          <section>
-            <h3>Project</h3>
-
-            <ul>
-              <li><a href="/overview.html">Overview</a></li>
-              <li><a href="/components/index.html">Components</a></li>
-              <li><a href="/releases/index.html">Releases</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Messaging APIs</h3>
-
-            <ul>
-              <li><a href="/proton/index.html">Qpid Proton</a></li>
-              <li><a href="/components/jms/index.html">Qpid JMS</a></li>
-              <li><a href="/components/messaging-api/index.html">Qpid Messaging API</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Servers and tools</h3>
-
-            <ul>
-              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
-              <li><a href="/components/cpp-broker/index.html">C++ broker</a></li>
-              <li><a href="/components/dispatch-router/index.html">Dispatch router</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Resources</h3>
-
-            <ul>
-              <li><a href="/dashboard.html">Dashboard</a></li>
-              <li><a href="https://cwiki.apache.org/confluence/display/qpid/Index">Wiki</a></li>
-              <li><a href="/resources.html">More resources</a></li>
-            </ul>
-          </section>
-        </div>
-      </div>
-
-      <div id="-search" class="panel" style="display: none;">
-        <form action="http://www.google.com/search" method="get">
-          <input type="hidden" name="sitesearch" value="qpid.apache.org"/>
-          <input type="text" name="q" maxlength="255" autofocus="autofocus" tabindex="1"/>
-          <button type="submit">Search</button>
-          <a href="/search.html">More ways to search</a>
-        </form>
-      </div>
-
-      <div id="-middle" class="panel">
-        <ul id="-path-navigation"><li><a href="/index.html">Home</a></li><li><a href="/releases/index.html">Releases</a></li><li><a href="/releases/qpid-java-trunk/index.html">Qpid for Java Trunk</a></li><li><a href="/releases/qpid-java-trunk/java-broker/book/index.html">Apache Qpid Broker for Java</a></li><li>Chapter&#160;4.&#160;Concepts</li></ul>
-
-        <div id="-middle-content">
-          <div class="docbook"><div class="navheader"><table summary="Navigation header" width="100%"><tr><th align="center" colspan="3">Chapter&#160;4.&#160;Concepts</th></tr><tr><td align="left" width="20%"><a accesskey="p" href="Java-Broker-Getting-Started-CommandLine.html">Prev</a>&#160;</td><th align="center" width="60%">&#160;</th><td align="right" width="20%">&#160;<a accesskey="n" href="Java-Broker-Concepts-Broker.html">Next</a></td></tr></table><hr /></div><div class="chapter">< [...]
-    the entities and describes the relationships between them. These details are developed further
-    in the sub-sections that follow.</p><p>The most important entity is the <span class="emphasis"><em>Virtualhost</em></span>. A virtualhost is an
-    independent namespace in which messaging is performed. A <span class="emphasis"><em>virtualhost</em></span> exists
-    in a container called a <span class="emphasis"><em>virtualhost node</em></span>. A virtualhost node has exactly
-    one virtualhost.</p><p><span class="emphasis"><em>Ports</em></span> accept connections for messaging and management. The Broker
-    supports any number of ports. When connecting for messaging, the user specifies a virtualhost
-    name to indicate the virtualhost to which it is to be connected.</p><p><span class="emphasis"><em>Authentication Providers</em></span> assert the identity of the user as it connects
-    for messaging or management. The Broker supports any number of authentication providers. Each
-    port is associated with exactly one authentication provider. The port uses the authentication
-    provider to assert the identity of the user as new connections are received.</p><p><span class="emphasis"><em>Group Providers</em></span> provide mechanisms that provide grouping of users. A
-    Broker supports zero or more group providers.</p><p><span class="emphasis"><em>Access Control Provider</em></span> allows the abilities of users (or groups of
-    users) to be restrained. A Broker can have zero or one access control providers.</p><p><span class="emphasis"><em>Keystores</em></span> provide a repositories of certificates and are used when the
-    Broker accepts SSL connections. Any number of keystore providers can be defined. Keystores are
-    be associated with Ports defined to accepts SSL.</p><p><span class="emphasis"><em>Truststores</em></span> provide a repositories of trust and are used to validate a
-    peer. Any number of truststore provides can be defined. Truststores can be associated with Ports
-    and other entities that form SSL connections.</p><p><span class="emphasis"><em>Remote Replication Nodes</em></span> are used when the high availability feature is
-    in use. It is the remote representation of other virtualhost nodes that form part of the same
-    group.</p><p><span class="emphasis"><em>Loggers</em></span>, at this point in the hierarchy, are responsible for the
-    production of a log for the Broker.</p><p>These concepts will be developed over the forthcoming pages. The diagrams below also help
-    put these entities in context of one and other.</p><p>
-    </p><div class="figure"><a id="d0e392"></a><p class="title"><strong>Figure&#160;4.1.&#160;Message Flow through Key Entities</strong></p><div class="figure-contents"><div class="mediaobject"><img alt="Message Flow through the Key Entities of the Broker" src="images/Broker-MessageFlow.png" /></div></div></div><p><br class="figure-break" />
-  </p><p>
-    </p><div class="figure"><a id="d0e404"></a><p class="title"><strong>Figure&#160;4.2.&#160;Broker Structure showing major entities</strong></p><div class="figure-contents"><div class="mediaobject"><img alt="Broker Structure" src="images/Broker-Model.png" /></div></div></div><p><br class="figure-break" />
-  </p></div></div><div class="navfooter"><hr /><table summary="Navigation footer" width="100%"><tr><td align="left" width="40%"><a accesskey="p" href="Java-Broker-Getting-Started-CommandLine.html">Prev</a>&#160;</td><td align="center" width="20%">&#160;</td><td align="right" width="40%">&#160;<a accesskey="n" href="Java-Broker-Concepts-Broker.html">Next</a></td></tr><tr><td align="left" valign="top" width="40%">3.5.&#160;Using the command line&#160;</td><td align="center" width="20%"><a  [...]
-
-          <hr/>
-
-          <ul id="-apache-navigation">
-            <li><a href="http://www.apache.org/">Apache</a></li>
-            <li><a href="http://www.apache.org/licenses/">License</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="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
-          </ul>
-
-          <p id="-legal">
-            Apache Qpid, Messaging built on AMQP; Copyright &#169; 2015
-            The Apache Software Foundation; Licensed under
-            the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
-            License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
-            project logo are trademarks of The Apache Software
-            Foundation; All other marks mentioned may be trademarks or
-            registered trademarks of their respective owners
-          </p>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Getting-Started-CommandLine.html b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Getting-Started-CommandLine.html
deleted file mode 100644
index f3e7966..0000000
--- a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Getting-Started-CommandLine.html
+++ /dev/null
@@ -1,206 +0,0 @@
-<!DOCTYPE html>
-<!--
- -
- - 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.
- -
--->
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-  <head>
-    <title>3.5.&#160;Using the command line - Apache Qpid&#8482;</title>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-    <link rel="stylesheet" href="/site.css" type="text/css" async="async"/>
-    <link rel="stylesheet" href="/deferred.css" type="text/css" defer="defer"/>
-    <script type="text/javascript">var _deferredFunctions = [];</script>
-    <script type="text/javascript" src="/deferred.js" defer="defer"></script>
-    <!--[if lte IE 8]>
-      <link rel="stylesheet" href="/ie.css" type="text/css"/>
-      <script type="text/javascript" src="/html5shiv.js"></script>
-    <![endif]-->
-
-    <!-- Redirects for `go get` and godoc.org -->
-    <meta name="go-import"
-          content="qpid.apache.org git https://gitbox.apache.org/repos/asf/qpid-proton.git"/>
-    <meta name="go-source"
-          content="qpid.apache.org
-https://github.com/apache/qpid-proton/blob/go1/README.md
-https://github.com/apache/qpid-proton/tree/go1{/dir}
-https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
-  </head>
-  <body>
-    <div id="-content">
-      <div id="-top" class="panel">
-        <a id="-menu-link"><img width="16" height="16" src="" alt="Menu"/></a>
-
-        <a id="-search-link"><img width="22" height="16" src="" alt="Search"/></a>
-
-        <ul id="-global-navigation">
-          <li><a id="-logotype" href="/index.html">Apache Qpid<sup>&#8482;</sup></a></li>
-          <li><a href="/documentation.html">Documentation</a></li>
-          <li><a href="/download.html">Download</a></li>
-          <li><a href="/discussion.html">Discussion</a></li>
-        </ul>
-      </div>
-
-      <div id="-menu" class="panel" style="display: none;">
-        <div class="flex">
-          <section>
-            <h3>Project</h3>
-
-            <ul>
-              <li><a href="/overview.html">Overview</a></li>
-              <li><a href="/components/index.html">Components</a></li>
-              <li><a href="/releases/index.html">Releases</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Messaging APIs</h3>
-
-            <ul>
-              <li><a href="/proton/index.html">Qpid Proton</a></li>
-              <li><a href="/components/jms/index.html">Qpid JMS</a></li>
-              <li><a href="/components/messaging-api/index.html">Qpid Messaging API</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Servers and tools</h3>
-
-            <ul>
-              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
-              <li><a href="/components/cpp-broker/index.html">C++ broker</a></li>
-              <li><a href="/components/dispatch-router/index.html">Dispatch router</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Resources</h3>
-
-            <ul>
-              <li><a href="/dashboard.html">Dashboard</a></li>
-              <li><a href="https://cwiki.apache.org/confluence/display/qpid/Index">Wiki</a></li>
-              <li><a href="/resources.html">More resources</a></li>
-            </ul>
-          </section>
-        </div>
-      </div>
-
-      <div id="-search" class="panel" style="display: none;">
-        <form action="http://www.google.com/search" method="get">
-          <input type="hidden" name="sitesearch" value="qpid.apache.org"/>
-          <input type="text" name="q" maxlength="255" autofocus="autofocus" tabindex="1"/>
-          <button type="submit">Search</button>
-          <a href="/search.html">More ways to search</a>
-        </form>
-      </div>
-
-      <div id="-middle" class="panel">
-        <ul id="-path-navigation"><li><a href="/index.html">Home</a></li><li><a href="/releases/index.html">Releases</a></li><li><a href="/releases/qpid-java-trunk/index.html">Qpid for Java Trunk</a></li><li><a href="/releases/qpid-java-trunk/java-broker/book/index.html">Apache Qpid Broker for Java</a></li><li>3.5.&#160;Using the command line</li></ul>
-
-        <div id="-middle-content">
-          <div class="docbook"><div class="navheader"><table summary="Navigation header" width="100%"><tr><th align="center" colspan="3">3.5.&#160;Using the command line</th></tr><tr><td align="left" width="20%"><a accesskey="p" href="Java-Broker-Getting-Started-Logging.html">Prev</a>&#160;</td><th align="center" width="60%">Chapter&#160;3.&#160;Getting Started</th><td align="right" width="20%">&#160;<a accesskey="n" href="Java-Broker-Concepts.html">Next</a></td></tr></table><hr /></div> [...]
-      For additional details about the broker configuration and related command line arguments see
-      <a class="xref" href="Java-Broker-Initial-Configuration.html" title="Chapter&#160;5.&#160;Initial Configuration">Chapter&#160;5, <em>Initial Configuration</em></a>.
-      The broker is fully configurable via its Web Management Console, for details of this see
-      <a class="xref" href="Java-Broker-Management-Channel-Web-Console.html" title="6.2.&#160;Web Management Console">Section&#160;6.2, &#8220;Web Management Console&#8221;</a>.
-    </p><p>To see usage information for all command line options, use the <code class="option">--help</code> option</p><pre class="programlisting">bin/qpid-server --help</pre><pre class="screen">usage: Qpid [-cic &lt;path&gt;] [-h] [-icp &lt;path&gt;] [-mm] [-mmhttp &lt;port&gt;]
-       [-mmpass &lt;password&gt;] [-mmqv] [-os]
-       [-prop &lt;name=value&gt;] [-props &lt;path&gt;] [-sp &lt;path&gt;] [-st &lt;type&gt;] [-v]
- -cic,--create-initial-config &lt;path&gt;                  create a copy of the
-                                                      initial config file,
-                                                      either to an
-                                                      optionally specified
-                                                      file path, or as
-                                                      initial-config.json
-                                                      in the current
-                                                      directory
- -h,--help                                            print this message
- -icp,--initial-config-path &lt;path&gt;                    set the location of
-                                                      initial JSON config
-                                                      to use when
-                                                      creating/overwriting
-                                                      a broker
-                                                      configuration store
- -mm,--management-mode                                start broker in
-                                                      management mode,
-                                                      disabling the AMQP
-                                                      ports
- -mmhttp,--management-mode-http-port &lt;port&gt;           override http
-                                                      management port in
-                                                      management mode
- -mmpass,--management-mode-password &lt;password&gt;        Set the password for
-                                                      the management mode
-                                                      user mm_admin
- -mmqv,--management-mode-quiesce-virtualhosts         make virtualhosts
-                                                      stay in the quiesced
-                                                      state during
-                                                      management mode.
- -os,--overwrite-store                                overwrite the broker
-                                                      configuration store
-                                                      with the current
-                                                      initial
-                                                      configuration
- -prop,--config-property &lt;name=value&gt;                 set a configuration
-                                                      property to use when
-                                                      resolving variables
-                                                      in the broker
-                                                      configuration store,
-                                                      with format
-                                                      "name=value"
- -props,--system-properties-file &lt;path&gt;               set the location of
-                                                      initial properties
-                                                      file to set
-                                                      otherwise unset
-                                                      system properties
- -sp,--store-path &lt;path&gt;                              use given
-                                                      configuration store
-                                                      location
- -st,--store-type &lt;type&gt;                              use given broker
-                                                      configuration store
-                                                      type
- -v,--version                                         print the version
-                                                      information and exit
-</pre></div><div class="navfooter"><hr /><table summary="Navigation footer" width="100%"><tr><td align="left" width="40%"><a accesskey="p" href="Java-Broker-Getting-Started-Logging.html">Prev</a>&#160;</td><td align="center" width="20%"><a accesskey="u" href="Java-Broker-Getting-Started.html">Up</a></td><td align="right" width="40%">&#160;<a accesskey="n" href="Java-Broker-Concepts.html">Next</a></td></tr><tr><td align="left" valign="top" width="40%">3.4.&#160;Log file&#160;</td><td alig [...]
-
-          <hr/>
-
-          <ul id="-apache-navigation">
-            <li><a href="http://www.apache.org/">Apache</a></li>
-            <li><a href="http://www.apache.org/licenses/">License</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="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
-          </ul>
-
-          <p id="-legal">
-            Apache Qpid, Messaging built on AMQP; Copyright &#169; 2015
-            The Apache Software Foundation; Licensed under
-            the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
-            License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
-            project logo are trademarks of The Apache Software
-            Foundation; All other marks mentioned may be trademarks or
-            registered trademarks of their respective owners
-          </p>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Getting-Started-Logging.html b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Getting-Started-Logging.html
deleted file mode 100644
index 91446ac..0000000
--- a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Getting-Started-Logging.html
+++ /dev/null
@@ -1,147 +0,0 @@
-<!DOCTYPE html>
-<!--
- -
- - 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.
- -
--->
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-  <head>
-    <title>3.4.&#160;Log file - Apache Qpid&#8482;</title>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-    <link rel="stylesheet" href="/site.css" type="text/css" async="async"/>
-    <link rel="stylesheet" href="/deferred.css" type="text/css" defer="defer"/>
-    <script type="text/javascript">var _deferredFunctions = [];</script>
-    <script type="text/javascript" src="/deferred.js" defer="defer"></script>
-    <!--[if lte IE 8]>
-      <link rel="stylesheet" href="/ie.css" type="text/css"/>
-      <script type="text/javascript" src="/html5shiv.js"></script>
-    <![endif]-->
-
-    <!-- Redirects for `go get` and godoc.org -->
-    <meta name="go-import"
-          content="qpid.apache.org git https://gitbox.apache.org/repos/asf/qpid-proton.git"/>
-    <meta name="go-source"
-          content="qpid.apache.org
-https://github.com/apache/qpid-proton/blob/go1/README.md
-https://github.com/apache/qpid-proton/tree/go1{/dir}
-https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
-  </head>
-  <body>
-    <div id="-content">
-      <div id="-top" class="panel">
-        <a id="-menu-link"><img width="16" height="16" src="" alt="Menu"/></a>
-
-        <a id="-search-link"><img width="22" height="16" src="" alt="Search"/></a>
-
-        <ul id="-global-navigation">
-          <li><a id="-logotype" href="/index.html">Apache Qpid<sup>&#8482;</sup></a></li>
-          <li><a href="/documentation.html">Documentation</a></li>
-          <li><a href="/download.html">Download</a></li>
-          <li><a href="/discussion.html">Discussion</a></li>
-        </ul>
-      </div>
-
-      <div id="-menu" class="panel" style="display: none;">
-        <div class="flex">
-          <section>
-            <h3>Project</h3>
-
-            <ul>
-              <li><a href="/overview.html">Overview</a></li>
-              <li><a href="/components/index.html">Components</a></li>
-              <li><a href="/releases/index.html">Releases</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Messaging APIs</h3>
-
-            <ul>
-              <li><a href="/proton/index.html">Qpid Proton</a></li>
-              <li><a href="/components/jms/index.html">Qpid JMS</a></li>
-              <li><a href="/components/messaging-api/index.html">Qpid Messaging API</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Servers and tools</h3>
-
-            <ul>
-              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
-              <li><a href="/components/cpp-broker/index.html">C++ broker</a></li>
-              <li><a href="/components/dispatch-router/index.html">Dispatch router</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Resources</h3>
-
-            <ul>
-              <li><a href="/dashboard.html">Dashboard</a></li>
-              <li><a href="https://cwiki.apache.org/confluence/display/qpid/Index">Wiki</a></li>
-              <li><a href="/resources.html">More resources</a></li>
-            </ul>
-          </section>
-        </div>
-      </div>
-
-      <div id="-search" class="panel" style="display: none;">
-        <form action="http://www.google.com/search" method="get">
-          <input type="hidden" name="sitesearch" value="qpid.apache.org"/>
-          <input type="text" name="q" maxlength="255" autofocus="autofocus" tabindex="1"/>
-          <button type="submit">Search</button>
-          <a href="/search.html">More ways to search</a>
-        </form>
-      </div>
-
-      <div id="-middle" class="panel">
-        <ul id="-path-navigation"><li><a href="/index.html">Home</a></li><li><a href="/releases/index.html">Releases</a></li><li><a href="/releases/qpid-java-trunk/index.html">Qpid for Java Trunk</a></li><li><a href="/releases/qpid-java-trunk/java-broker/book/index.html">Apache Qpid Broker for Java</a></li><li>3.4.&#160;Log file</li></ul>
-
-        <div id="-middle-content">
-          <div class="docbook"><div class="navheader"><table summary="Navigation header" width="100%"><tr><th align="center" colspan="3">3.4.&#160;Log file</th></tr><tr><td align="left" width="20%"><a accesskey="p" href="Java-Broker-Getting-Started-Starting-Stopping-Unix.html">Prev</a>&#160;</td><th align="center" width="60%">Chapter&#160;3.&#160;Getting Started</th><td align="right" width="20%">&#160;<a accesskey="n" href="Java-Broker-Getting-Started-CommandLine.html">Next</a></td></tr> [...]
-      conditions.  By default the log file is written within the log subdirectory beneath the work directory
-      - <code class="computeroutput">$QPID_WORK/log/qpid.log</code> (UNIX) and
-      <code class="computeroutput">%QPID_WORK%\log\qpid.log</code> (Windows).</p><p>For details of how to control the logging, see <a class="xref" href="Java-Broker-Runtime.html#Java-Broker-Runtime-Logging" title="9.1.&#160;Logging">Section&#160;9.1, &#8220;Logging&#8221;</a></p></div><div class="navfooter"><hr /><table summary="Navigation footer" width="100%"><tr><td align="left" width="40%"><a accesskey="p" href="Java-Broker-Getting-Started-Starting-Stopping-Unix.html">Prev</a>&#160;</ [...]
-
-          <hr/>
-
-          <ul id="-apache-navigation">
-            <li><a href="http://www.apache.org/">Apache</a></li>
-            <li><a href="http://www.apache.org/licenses/">License</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="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
-          </ul>
-
-          <p id="-legal">
-            Apache Qpid, Messaging built on AMQP; Copyright &#169; 2015
-            The Apache Software Foundation; Licensed under
-            the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
-            License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
-            project logo are trademarks of The Apache Software
-            Foundation; All other marks mentioned may be trademarks or
-            registered trademarks of their respective owners
-          </p>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Getting-Started-Starting-Stopping-Unix.html b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Getting-Started-Starting-Stopping-Unix.html
deleted file mode 100644
index f9d5e90..0000000
--- a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Getting-Started-Starting-Stopping-Unix.html
+++ /dev/null
@@ -1,156 +0,0 @@
-<!DOCTYPE html>
-<!--
- -
- - 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.
- -
--->
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-  <head>
-    <title>3.3.&#160;Starting/Stopping the broker on Unix - Apache Qpid&#8482;</title>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-    <link rel="stylesheet" href="/site.css" type="text/css" async="async"/>
-    <link rel="stylesheet" href="/deferred.css" type="text/css" defer="defer"/>
-    <script type="text/javascript">var _deferredFunctions = [];</script>
-    <script type="text/javascript" src="/deferred.js" defer="defer"></script>
-    <!--[if lte IE 8]>
-      <link rel="stylesheet" href="/ie.css" type="text/css"/>
-      <script type="text/javascript" src="/html5shiv.js"></script>
-    <![endif]-->
-
-    <!-- Redirects for `go get` and godoc.org -->
-    <meta name="go-import"
-          content="qpid.apache.org git https://gitbox.apache.org/repos/asf/qpid-proton.git"/>
-    <meta name="go-source"
-          content="qpid.apache.org
-https://github.com/apache/qpid-proton/blob/go1/README.md
-https://github.com/apache/qpid-proton/tree/go1{/dir}
-https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
-  </head>
-  <body>
-    <div id="-content">
-      <div id="-top" class="panel">
-        <a id="-menu-link"><img width="16" height="16" src="" alt="Menu"/></a>
-
-        <a id="-search-link"><img width="22" height="16" src="" alt="Search"/></a>
-
-        <ul id="-global-navigation">
-          <li><a id="-logotype" href="/index.html">Apache Qpid<sup>&#8482;</sup></a></li>
-          <li><a href="/documentation.html">Documentation</a></li>
-          <li><a href="/download.html">Download</a></li>
-          <li><a href="/discussion.html">Discussion</a></li>
-        </ul>
-      </div>
-
-      <div id="-menu" class="panel" style="display: none;">
-        <div class="flex">
-          <section>
-            <h3>Project</h3>
-
-            <ul>
-              <li><a href="/overview.html">Overview</a></li>
-              <li><a href="/components/index.html">Components</a></li>
-              <li><a href="/releases/index.html">Releases</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Messaging APIs</h3>
-
-            <ul>
-              <li><a href="/proton/index.html">Qpid Proton</a></li>
-              <li><a href="/components/jms/index.html">Qpid JMS</a></li>
-              <li><a href="/components/messaging-api/index.html">Qpid Messaging API</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Servers and tools</h3>
-
-            <ul>
-              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
-              <li><a href="/components/cpp-broker/index.html">C++ broker</a></li>
-              <li><a href="/components/dispatch-router/index.html">Dispatch router</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Resources</h3>
-
-            <ul>
-              <li><a href="/dashboard.html">Dashboard</a></li>
-              <li><a href="https://cwiki.apache.org/confluence/display/qpid/Index">Wiki</a></li>
-              <li><a href="/resources.html">More resources</a></li>
-            </ul>
-          </section>
-        </div>
-      </div>
-
-      <div id="-search" class="panel" style="display: none;">
-        <form action="http://www.google.com/search" method="get">
-          <input type="hidden" name="sitesearch" value="qpid.apache.org"/>
-          <input type="text" name="q" maxlength="255" autofocus="autofocus" tabindex="1"/>
-          <button type="submit">Search</button>
-          <a href="/search.html">More ways to search</a>
-        </form>
-      </div>
-
-      <div id="-middle" class="panel">
-        <ul id="-path-navigation"><li><a href="/index.html">Home</a></li><li><a href="/releases/index.html">Releases</a></li><li><a href="/releases/qpid-java-trunk/index.html">Qpid for Java Trunk</a></li><li><a href="/releases/qpid-java-trunk/java-broker/book/index.html">Apache Qpid Broker for Java</a></li><li>3.3.&#160;Starting/Stopping the broker on Unix</li></ul>
-
-        <div id="-middle-content">
-          <div class="docbook"><div class="navheader"><table summary="Navigation header" width="100%"><tr><th align="center" colspan="3">3.3.&#160;Starting/Stopping the broker on Unix</th></tr><tr><td align="left" width="20%"><a accesskey="p" href="Java-Broker-Getting-Started-Starting-Stopping-Windows.html">Prev</a>&#160;</td><th align="center" width="60%">Chapter&#160;3.&#160;Getting Started</th><td align="right" width="20%">&#160;<a accesskey="n" href="Java-Broker-Getting-Started-Loggi [...]
-      and ensure that the <a class="link" href="Java-Broker-Installation-InstallationUnix.html#Java-Broker-Installation-InstallationUnix-SettingQPIDWORK" title="2.5.1.&#160;Setting the working directory">QPID_WORK environment variable is set</a>.</p><p>Now use the <span class="command"><strong>qpid-server</strong></span> script to start the server:</p><pre class="programlisting">bin/qpid-server</pre><p>Output similar to the following will be seen:</p><pre class="screen">[Broker] BRK-1006 [...]
-[Broker] BRK-1001 : Startup : Version: 6.1.0-SNAPSHOT Build: exported
-[Broker] BRK-1010 : Platform : JVM : Oracle Corporation version: 1.7.0_79-b15 OS : Mac OS X version: 10.10.5 arch: x86_64 cores: 4
-[Broker] BRK-1011 : Maximum Memory : Heap : 518,979,584 bytes Direct : 1,610,612,736 bytes
-[Broker] BRK-1002 : Starting : Listening on TCP port 5672
-[Broker] MNG-1001 : Web Management Startup
-[Broker] MNG-1002 : Starting : HTTP : Listening on port 8080
-[Broker] MNG-1004 : Web Management Ready
-[Broker] BRK-1004 : Qpid Broker Ready</pre><p>The BRK-1004 message confirms that the Broker is ready for work.  The MNG-1002 and BRK-1002 confirm the ports on
-    which the Broker is listening (for HTTP management and AMQP respectively).</p><p>To stop the Broker, use Control-C from the controlling shell, use the
-        <span class="command"><strong>bin/qpid.stop</strong></span> script, use <span class="command"><strong>kill -TERM &lt;pid&gt;</strong></span>, or
-      the <a class="link" href="Java-Broker-Management-Channel-REST-API.html#Java-Broker-Management-Channel-REST-API-Operations" title="6.3.8.&#160;Configured Object operations">REST operation broker/shutdown</a>.</p></div><div class="navfooter"><hr /><table summary="Navigation footer" width="100%"><tr><td align="left" width="40%"><a accesskey="p" href="Java-Broker-Getting-Started-Starting-Stopping-Windows.html">Prev</a>&#160;</td><td align="center" width="20%"><a accesskey="u" href="Jav [...]
-
-          <hr/>
-
-          <ul id="-apache-navigation">
-            <li><a href="http://www.apache.org/">Apache</a></li>
-            <li><a href="http://www.apache.org/licenses/">License</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="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
-          </ul>
-
-          <p id="-legal">
-            Apache Qpid, Messaging built on AMQP; Copyright &#169; 2015
-            The Apache Software Foundation; Licensed under
-            the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
-            License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
-            project logo are trademarks of The Apache Software
-            Foundation; All other marks mentioned may be trademarks or
-            registered trademarks of their respective owners
-          </p>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Getting-Started-Starting-Stopping-Windows.html b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Getting-Started-Starting-Stopping-Windows.html
deleted file mode 100644
index eb6d878..0000000
--- a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Getting-Started-Starting-Stopping-Windows.html
+++ /dev/null
@@ -1,156 +0,0 @@
-<!DOCTYPE html>
-<!--
- -
- - 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.
- -
--->
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-  <head>
-    <title>3.2.&#160;Starting/Stopping the broker on Windows - Apache Qpid&#8482;</title>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-    <link rel="stylesheet" href="/site.css" type="text/css" async="async"/>
-    <link rel="stylesheet" href="/deferred.css" type="text/css" defer="defer"/>
-    <script type="text/javascript">var _deferredFunctions = [];</script>
-    <script type="text/javascript" src="/deferred.js" defer="defer"></script>
-    <!--[if lte IE 8]>
-      <link rel="stylesheet" href="/ie.css" type="text/css"/>
-      <script type="text/javascript" src="/html5shiv.js"></script>
-    <![endif]-->
-
-    <!-- Redirects for `go get` and godoc.org -->
-    <meta name="go-import"
-          content="qpid.apache.org git https://gitbox.apache.org/repos/asf/qpid-proton.git"/>
-    <meta name="go-source"
-          content="qpid.apache.org
-https://github.com/apache/qpid-proton/blob/go1/README.md
-https://github.com/apache/qpid-proton/tree/go1{/dir}
-https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
-  </head>
-  <body>
-    <div id="-content">
-      <div id="-top" class="panel">
-        <a id="-menu-link"><img width="16" height="16" src="" alt="Menu"/></a>
-
-        <a id="-search-link"><img width="22" height="16" src="" alt="Search"/></a>
-
-        <ul id="-global-navigation">
-          <li><a id="-logotype" href="/index.html">Apache Qpid<sup>&#8482;</sup></a></li>
-          <li><a href="/documentation.html">Documentation</a></li>
-          <li><a href="/download.html">Download</a></li>
-          <li><a href="/discussion.html">Discussion</a></li>
-        </ul>
-      </div>
-
-      <div id="-menu" class="panel" style="display: none;">
-        <div class="flex">
-          <section>
-            <h3>Project</h3>
-
-            <ul>
-              <li><a href="/overview.html">Overview</a></li>
-              <li><a href="/components/index.html">Components</a></li>
-              <li><a href="/releases/index.html">Releases</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Messaging APIs</h3>
-
-            <ul>
-              <li><a href="/proton/index.html">Qpid Proton</a></li>
-              <li><a href="/components/jms/index.html">Qpid JMS</a></li>
-              <li><a href="/components/messaging-api/index.html">Qpid Messaging API</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Servers and tools</h3>
-
-            <ul>
-              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
-              <li><a href="/components/cpp-broker/index.html">C++ broker</a></li>
-              <li><a href="/components/dispatch-router/index.html">Dispatch router</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Resources</h3>
-
-            <ul>
-              <li><a href="/dashboard.html">Dashboard</a></li>
-              <li><a href="https://cwiki.apache.org/confluence/display/qpid/Index">Wiki</a></li>
-              <li><a href="/resources.html">More resources</a></li>
-            </ul>
-          </section>
-        </div>
-      </div>
-
-      <div id="-search" class="panel" style="display: none;">
-        <form action="http://www.google.com/search" method="get">
-          <input type="hidden" name="sitesearch" value="qpid.apache.org"/>
-          <input type="text" name="q" maxlength="255" autofocus="autofocus" tabindex="1"/>
-          <button type="submit">Search</button>
-          <a href="/search.html">More ways to search</a>
-        </form>
-      </div>
-
-      <div id="-middle" class="panel">
-        <ul id="-path-navigation"><li><a href="/index.html">Home</a></li><li><a href="/releases/index.html">Releases</a></li><li><a href="/releases/qpid-java-trunk/index.html">Qpid for Java Trunk</a></li><li><a href="/releases/qpid-java-trunk/java-broker/book/index.html">Apache Qpid Broker for Java</a></li><li>3.2.&#160;Starting/Stopping the broker on Windows</li></ul>
-
-        <div id="-middle-content">
-          <div class="docbook"><div class="navheader"><table summary="Navigation header" width="100%"><tr><th align="center" colspan="3">3.2.&#160;Starting/Stopping the broker on Windows</th></tr><tr><td align="left" width="20%"><a accesskey="p" href="Java-Broker-Getting-Started.html">Prev</a>&#160;</td><th align="center" width="60%">Chapter&#160;3.&#160;Getting Started</th><td align="right" width="20%">&#160;<a accesskey="n" href="Java-Broker-Getting-Started-Starting-Stopping-Unix.html" [...]
-      and ensure that the <a class="link" href="Java-Broker-Installation-InstallationWindows.html#Java-Broker-Installation-InstallationWindows-SettingQPIDWORK" title="2.4.1.&#160;Setting the working directory">QPID_WORK environment variable is set</a>.</p><p>Now use the <span class="command"><strong>qpid-server.bat</strong></span> to start the server</p><pre class="programlisting">bin\qpid-server.bat</pre><p>Output similar to the following will be seen:</p><pre class="screen">[Broker] BR [...]
-[Broker] BRK-1001 : Startup : Version: 6.1.0-SNAPSHOT Build: 1478262
-[Broker] BRK-1010 : Platform : JVM : Oracle Corporation version: 1.7.0_79-b15 OS : Windows 7 version: 6.1 arch: x86 cores: 4
-[Broker] BRK-1011 : Maximum Memory : Heap : 518,979,584 bytes Direct : 1,610,612,736 bytes
-[Broker] BRK-1002 : Starting : Listening on TCP port 5672
-[Broker] MNG-1001 : Web Management Startup
-[Broker] MNG-1002 : Starting : HTTP : Listening on port 8080
-[Broker] MNG-1004 : Web Management Ready
-[Broker] BRK-1004 : Qpid Broker Ready</pre><p>The BRK-1004 message confirms that the Broker is ready for work.  The MNG-1002 and BRK-1002 confirm the ports on
-      which the Broker is listening (for HTTP management and AMQP respectively).</p><p>To stop the Broker, use Control-C from the controlling command prompt or
-      <a class="link" href="Java-Broker-Management-Channel-REST-API.html#Java-Broker-Management-Channel-REST-API-Operations" title="6.3.8.&#160;Configured Object operations">REST operation broker/shutdown</a>.
-    </p></div><div class="navfooter"><hr /><table summary="Navigation footer" width="100%"><tr><td align="left" width="40%"><a accesskey="p" href="Java-Broker-Getting-Started.html">Prev</a>&#160;</td><td align="center" width="20%"><a accesskey="u" href="Java-Broker-Getting-Started.html">Up</a></td><td align="right" width="40%">&#160;<a accesskey="n" href="Java-Broker-Getting-Started-Starting-Stopping-Unix.html">Next</a></td></tr><tr><td align="left" valign="top" width="40%">Chapter&#160; [...]
-
-          <hr/>
-
-          <ul id="-apache-navigation">
-            <li><a href="http://www.apache.org/">Apache</a></li>
-            <li><a href="http://www.apache.org/licenses/">License</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="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
-          </ul>
-
-          <p id="-legal">
-            Apache Qpid, Messaging built on AMQP; Copyright &#169; 2015
-            The Apache Software Foundation; Licensed under
-            the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
-            License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
-            project logo are trademarks of The Apache Software
-            Foundation; All other marks mentioned may be trademarks or
-            registered trademarks of their respective owners
-          </p>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Getting-Started.html b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Getting-Started.html
deleted file mode 100644
index c6a9558..0000000
--- a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Getting-Started.html
+++ /dev/null
@@ -1,151 +0,0 @@
-<!DOCTYPE html>
-<!--
- -
- - 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.
- -
--->
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-  <head>
-    <title>Chapter&#160;3.&#160;Getting Started - Apache Qpid&#8482;</title>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-    <link rel="stylesheet" href="/site.css" type="text/css" async="async"/>
-    <link rel="stylesheet" href="/deferred.css" type="text/css" defer="defer"/>
-    <script type="text/javascript">var _deferredFunctions = [];</script>
-    <script type="text/javascript" src="/deferred.js" defer="defer"></script>
-    <!--[if lte IE 8]>
-      <link rel="stylesheet" href="/ie.css" type="text/css"/>
-      <script type="text/javascript" src="/html5shiv.js"></script>
-    <![endif]-->
-
-    <!-- Redirects for `go get` and godoc.org -->
-    <meta name="go-import"
-          content="qpid.apache.org git https://gitbox.apache.org/repos/asf/qpid-proton.git"/>
-    <meta name="go-source"
-          content="qpid.apache.org
-https://github.com/apache/qpid-proton/blob/go1/README.md
-https://github.com/apache/qpid-proton/tree/go1{/dir}
-https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
-  </head>
-  <body>
-    <div id="-content">
-      <div id="-top" class="panel">
-        <a id="-menu-link"><img width="16" height="16" src="" alt="Menu"/></a>
-
-        <a id="-search-link"><img width="22" height="16" src="" alt="Search"/></a>
-
-        <ul id="-global-navigation">
-          <li><a id="-logotype" href="/index.html">Apache Qpid<sup>&#8482;</sup></a></li>
-          <li><a href="/documentation.html">Documentation</a></li>
-          <li><a href="/download.html">Download</a></li>
-          <li><a href="/discussion.html">Discussion</a></li>
-        </ul>
-      </div>
-
-      <div id="-menu" class="panel" style="display: none;">
-        <div class="flex">
-          <section>
-            <h3>Project</h3>
-
-            <ul>
-              <li><a href="/overview.html">Overview</a></li>
-              <li><a href="/components/index.html">Components</a></li>
-              <li><a href="/releases/index.html">Releases</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Messaging APIs</h3>
-
-            <ul>
-              <li><a href="/proton/index.html">Qpid Proton</a></li>
-              <li><a href="/components/jms/index.html">Qpid JMS</a></li>
-              <li><a href="/components/messaging-api/index.html">Qpid Messaging API</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Servers and tools</h3>
-
-            <ul>
-              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
-              <li><a href="/components/cpp-broker/index.html">C++ broker</a></li>
-              <li><a href="/components/dispatch-router/index.html">Dispatch router</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Resources</h3>
-
-            <ul>
-              <li><a href="/dashboard.html">Dashboard</a></li>
-              <li><a href="https://cwiki.apache.org/confluence/display/qpid/Index">Wiki</a></li>
-              <li><a href="/resources.html">More resources</a></li>
-            </ul>
-          </section>
-        </div>
-      </div>
-
-      <div id="-search" class="panel" style="display: none;">
-        <form action="http://www.google.com/search" method="get">
-          <input type="hidden" name="sitesearch" value="qpid.apache.org"/>
-          <input type="text" name="q" maxlength="255" autofocus="autofocus" tabindex="1"/>
-          <button type="submit">Search</button>
-          <a href="/search.html">More ways to search</a>
-        </form>
-      </div>
-
-      <div id="-middle" class="panel">
-        <ul id="-path-navigation"><li><a href="/index.html">Home</a></li><li><a href="/releases/index.html">Releases</a></li><li><a href="/releases/qpid-java-trunk/index.html">Qpid for Java Trunk</a></li><li><a href="/releases/qpid-java-trunk/java-broker/book/index.html">Apache Qpid Broker for Java</a></li><li>Chapter&#160;3.&#160;Getting Started</li></ul>
-
-        <div id="-middle-content">
-          <div class="docbook"><div class="navheader"><table summary="Navigation header" width="100%"><tr><th align="center" colspan="3">Chapter&#160;3.&#160;Getting Started</th></tr><tr><td align="left" width="20%"><a accesskey="p" href="Java-Broker-Installation-OptionalDependencies.html">Prev</a>&#160;</td><th align="center" width="60%">&#160;</th><td align="right" width="20%">&#160;<a accesskey="n" href="Java-Broker-Getting-Started-Starting-Stopping-Windows.html">Next</a></td></tr></t [...]
-      This section describes how to start and stop the Broker, and outlines the various command line options.
-    </p><p>
-      For additional details about the broker configuration store and related command line arguments see
-      <a class="xref" href="Java-Broker-Initial-Configuration.html" title="Chapter&#160;5.&#160;Initial Configuration">Chapter&#160;5, <em>Initial Configuration</em></a>.
-      The broker is fully configurable via its Web Management Console, for details of this see
-      <a class="xref" href="Java-Broker-Management-Channel-Web-Console.html" title="6.2.&#160;Web Management Console">Section&#160;6.2, &#8220;Web Management Console&#8221;</a>.
-    </p></div></div><div class="navfooter"><hr /><table summary="Navigation footer" width="100%"><tr><td align="left" width="40%"><a accesskey="p" href="Java-Broker-Installation-OptionalDependencies.html">Prev</a>&#160;</td><td align="center" width="20%">&#160;</td><td align="right" width="40%">&#160;<a accesskey="n" href="Java-Broker-Getting-Started-Starting-Stopping-Windows.html">Next</a></td></tr><tr><td align="left" valign="top" width="40%">2.6.&#160;Optional Dependencies&#160;</td>< [...]
-
-          <hr/>
-
-          <ul id="-apache-navigation">
-            <li><a href="http://www.apache.org/">Apache</a></li>
-            <li><a href="http://www.apache.org/licenses/">License</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="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
-          </ul>
-
-          <p id="-legal">
-            Apache Qpid, Messaging built on AMQP; Copyright &#169; 2015
-            The Apache Software Foundation; Licensed under
-            the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
-            License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
-            project logo are trademarks of The Apache Software
-            Foundation; All other marks mentioned may be trademarks or
-            registered trademarks of their respective owners
-          </p>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-High-Availability-Backup.html b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-High-Availability-Backup.html
deleted file mode 100644
index 239e479..0000000
--- a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-High-Availability-Backup.html
+++ /dev/null
@@ -1,145 +0,0 @@
-<!DOCTYPE html>
-<!--
- -
- - 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.
- -
--->
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-  <head>
-    <title>10.10.&#160;Backups - Apache Qpid&#8482;</title>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-    <link rel="stylesheet" href="/site.css" type="text/css" async="async"/>
-    <link rel="stylesheet" href="/deferred.css" type="text/css" defer="defer"/>
-    <script type="text/javascript">var _deferredFunctions = [];</script>
-    <script type="text/javascript" src="/deferred.js" defer="defer"></script>
-    <!--[if lte IE 8]>
-      <link rel="stylesheet" href="/ie.css" type="text/css"/>
-      <script type="text/javascript" src="/html5shiv.js"></script>
-    <![endif]-->
-
-    <!-- Redirects for `go get` and godoc.org -->
-    <meta name="go-import"
-          content="qpid.apache.org git https://gitbox.apache.org/repos/asf/qpid-proton.git"/>
-    <meta name="go-source"
-          content="qpid.apache.org
-https://github.com/apache/qpid-proton/blob/go1/README.md
-https://github.com/apache/qpid-proton/tree/go1{/dir}
-https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
-  </head>
-  <body>
-    <div id="-content">
-      <div id="-top" class="panel">
-        <a id="-menu-link"><img width="16" height="16" src="" alt="Menu"/></a>
-
-        <a id="-search-link"><img width="22" height="16" src="" alt="Search"/></a>
-
-        <ul id="-global-navigation">
-          <li><a id="-logotype" href="/index.html">Apache Qpid<sup>&#8482;</sup></a></li>
-          <li><a href="/documentation.html">Documentation</a></li>
-          <li><a href="/download.html">Download</a></li>
-          <li><a href="/discussion.html">Discussion</a></li>
-        </ul>
-      </div>
-
-      <div id="-menu" class="panel" style="display: none;">
-        <div class="flex">
-          <section>
-            <h3>Project</h3>
-
-            <ul>
-              <li><a href="/overview.html">Overview</a></li>
-              <li><a href="/components/index.html">Components</a></li>
-              <li><a href="/releases/index.html">Releases</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Messaging APIs</h3>
-
-            <ul>
-              <li><a href="/proton/index.html">Qpid Proton</a></li>
-              <li><a href="/components/jms/index.html">Qpid JMS</a></li>
-              <li><a href="/components/messaging-api/index.html">Qpid Messaging API</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Servers and tools</h3>
-
-            <ul>
-              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
-              <li><a href="/components/cpp-broker/index.html">C++ broker</a></li>
-              <li><a href="/components/dispatch-router/index.html">Dispatch router</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Resources</h3>
-
-            <ul>
-              <li><a href="/dashboard.html">Dashboard</a></li>
-              <li><a href="https://cwiki.apache.org/confluence/display/qpid/Index">Wiki</a></li>
-              <li><a href="/resources.html">More resources</a></li>
-            </ul>
-          </section>
-        </div>
-      </div>
-
-      <div id="-search" class="panel" style="display: none;">
-        <form action="http://www.google.com/search" method="get">
-          <input type="hidden" name="sitesearch" value="qpid.apache.org"/>
-          <input type="text" name="q" maxlength="255" autofocus="autofocus" tabindex="1"/>
-          <button type="submit">Search</button>
-          <a href="/search.html">More ways to search</a>
-        </form>
-      </div>
-
-      <div id="-middle" class="panel">
-        <ul id="-path-navigation"><li><a href="/index.html">Home</a></li><li><a href="/releases/index.html">Releases</a></li><li><a href="/releases/qpid-java-trunk/index.html">Qpid for Java Trunk</a></li><li><a href="/releases/qpid-java-trunk/java-broker/book/index.html">Apache Qpid Broker for Java</a></li><li>10.10.&#160;Backups</li></ul>
-
-        <div id="-middle-content">
-          <div class="docbook"><div class="navheader"><table summary="Navigation header" width="100%"><tr><th align="center" colspan="3">10.10.&#160;Backups</th></tr><tr><td align="left" width="20%"><a accesskey="p" href="Java-Broker-High-Availability-Security.html">Prev</a>&#160;</td><th align="center" width="60%">Chapter&#160;10.&#160;High Availability</th><td align="right" width="20%">&#160;<a accesskey="n" href="Java-Broker-High-Availability-Reset-Group-Infomational.html">Next</a></t [...]
-      group. <a class="xref" href="Java-Broker-Backup-And-Recovery-Virtualhost-Node.html#Java-Broker-Backup-And-Recovery-Virtualhost-Node-BDB-HA" title="11.2.2.&#160;BDB-HA">Section&#160;11.2.2, &#8220;BDB-HA&#8221;</a>.</p></div><div class="navfooter"><hr /><table summary="Navigation footer" width="100%"><tr><td align="left" width="40%"><a accesskey="p" href="Java-Broker-High-Availability-Security.html">Prev</a>&#160;</td><td align="center" width="20%"><a accesskey="u" href="Java-Broker [...]
-
-          <hr/>
-
-          <ul id="-apache-navigation">
-            <li><a href="http://www.apache.org/">Apache</a></li>
-            <li><a href="http://www.apache.org/licenses/">License</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="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
-          </ul>
-
-          <p id="-legal">
-            Apache Qpid, Messaging built on AMQP; Copyright &#169; 2015
-            The Apache Software Foundation; Licensed under
-            the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
-            License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
-            project logo are trademarks of The Apache Software
-            Foundation; All other marks mentioned may be trademarks or
-            registered trademarks of their respective owners
-          </p>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-High-Availability-Behaviour.html b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-High-Availability-Behaviour.html
deleted file mode 100644
index 63f6ca5..0000000
--- a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-High-Availability-Behaviour.html
+++ /dev/null
@@ -1,220 +0,0 @@
-<!DOCTYPE html>
-<!--
- -
- - 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.
- -
--->
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-  <head>
-    <title>10.4.&#160;Behaviour of the Group - Apache Qpid&#8482;</title>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-    <link rel="stylesheet" href="/site.css" type="text/css" async="async"/>
-    <link rel="stylesheet" href="/deferred.css" type="text/css" defer="defer"/>
-    <script type="text/javascript">var _deferredFunctions = [];</script>
-    <script type="text/javascript" src="/deferred.js" defer="defer"></script>
-    <!--[if lte IE 8]>
-      <link rel="stylesheet" href="/ie.css" type="text/css"/>
-      <script type="text/javascript" src="/html5shiv.js"></script>
-    <![endif]-->
-
-    <!-- Redirects for `go get` and godoc.org -->
-    <meta name="go-import"
-          content="qpid.apache.org git https://gitbox.apache.org/repos/asf/qpid-proton.git"/>
-    <meta name="go-source"
-          content="qpid.apache.org
-https://github.com/apache/qpid-proton/blob/go1/README.md
-https://github.com/apache/qpid-proton/tree/go1{/dir}
-https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
-  </head>
-  <body>
-    <div id="-content">
-      <div id="-top" class="panel">
-        <a id="-menu-link"><img width="16" height="16" src="" alt="Menu"/></a>
-
-        <a id="-search-link"><img width="22" height="16" src="" alt="Search"/></a>
-
-        <ul id="-global-navigation">
-          <li><a id="-logotype" href="/index.html">Apache Qpid<sup>&#8482;</sup></a></li>
-          <li><a href="/documentation.html">Documentation</a></li>
-          <li><a href="/download.html">Download</a></li>
-          <li><a href="/discussion.html">Discussion</a></li>
-        </ul>
-      </div>
-
-      <div id="-menu" class="panel" style="display: none;">
-        <div class="flex">
-          <section>
-            <h3>Project</h3>
-
-            <ul>
-              <li><a href="/overview.html">Overview</a></li>
-              <li><a href="/components/index.html">Components</a></li>
-              <li><a href="/releases/index.html">Releases</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Messaging APIs</h3>
-
-            <ul>
-              <li><a href="/proton/index.html">Qpid Proton</a></li>
-              <li><a href="/components/jms/index.html">Qpid JMS</a></li>
-              <li><a href="/components/messaging-api/index.html">Qpid Messaging API</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Servers and tools</h3>
-
-            <ul>
-              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
-              <li><a href="/components/cpp-broker/index.html">C++ broker</a></li>
-              <li><a href="/components/dispatch-router/index.html">Dispatch router</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Resources</h3>
-
-            <ul>
-              <li><a href="/dashboard.html">Dashboard</a></li>
-              <li><a href="https://cwiki.apache.org/confluence/display/qpid/Index">Wiki</a></li>
-              <li><a href="/resources.html">More resources</a></li>
-            </ul>
-          </section>
-        </div>
-      </div>
-
-      <div id="-search" class="panel" style="display: none;">
-        <form action="http://www.google.com/search" method="get">
-          <input type="hidden" name="sitesearch" value="qpid.apache.org"/>
-          <input type="text" name="q" maxlength="255" autofocus="autofocus" tabindex="1"/>
-          <button type="submit">Search</button>
-          <a href="/search.html">More ways to search</a>
-        </form>
-      </div>
-
-      <div id="-middle" class="panel">
-        <ul id="-path-navigation"><li><a href="/index.html">Home</a></li><li><a href="/releases/index.html">Releases</a></li><li><a href="/releases/qpid-java-trunk/index.html">Qpid for Java Trunk</a></li><li><a href="/releases/qpid-java-trunk/java-broker/book/index.html">Apache Qpid Broker for Java</a></li><li>10.4.&#160;Behaviour of the Group</li></ul>
-
-        <div id="-middle-content">
-          <div class="docbook"><div class="navheader"><table summary="Navigation header" width="100%"><tr><th align="center" colspan="3">10.4.&#160;Behaviour of the Group</th></tr><tr><td align="left" width="20%"><a accesskey="p" href="Java-Broker-High-Availability-CreatingGroup.html">Prev</a>&#160;</td><th align="center" width="60%">Chapter&#160;10.&#160;High Availability</th><td align="right" width="20%">&#160;<a accesskey="n" href="Java-Broker-High-Availability-NodeOperations.html">Ne [...]
-      then goes on to talk about the various controls that are available to override it. It
-      describes the controls available that affect the <a class="link" href="http://en.wikipedia.org/wiki/ACID#Durability" target="_top">durability</a> of transactions and
-      the data consistency between the master and replicas and thus make trade offs between
-      performance and reliability.</p><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="Java-Broker-High-Availability-Behaviour-Default-Behaviour"></a>10.4.1.&#160;Default Behaviour</h3></div></div></div><p>Let's first look at the behaviour of a group in default configuration.</p><p>In the default configuration, for any messaging work to be done, there must be at least
-          <span class="emphasis"><em>quorum</em></span> nodes present. This means for example, in a three node group,
-        this means there must be at least two nodes available.</p><p>When a messaging client sends a transaction, it can be assured that, before the control
-        returns back to his application after the commit call that the following is true:</p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p>At the master, the transaction is <span class="emphasis"><em>written to disk and OS level caches
-                are flushed</em></span> meaning the data is on the storage device.</p></li><li class="listitem"><p>At least quorum minus 1 replicas, <span class="emphasis"><em>acknowledge the receipt of
-                transaction</em></span>. The replicas will write the data to the storage device
-              sometime later.</p></li></ul></div><p>If there were to be a master failure immediately after the transaction was committed,
-        the transaction would be held by at least quorum minus one replicas. For example, if we had
-        a group of three, then we would be assured that at least one replica held the
-        transaction.</p><p>In the event of a master failure, if quorum nodes remain, those nodes hold an election.
-        The nodes will elect master the node with the most recent transaction. If two or more nodes
-        have the most recent transaction the group makes an arbitrary choice. If quorum number of
-        nodes does not remain, the nodes cannot elect a new master and will wait until nodes rejoin.
-        You will see later that manual controls are available allow service to be restored from
-        fewer than quorum nodes and to influence which node gets elected in the event of a
-        tie.</p><p>Whenever a group has fewer than quorum nodes present, the virtualhost will be
-        unavailable and messaging connections will be refused. If quorum disappears at the very
-        moment a messaging client sends a transaction that transaction will fail.</p><p>You will have noticed the difference in the synchronization policies applied the master
-        and the replicas. The replicas send the acknowledgement back before the data is written to
-        disk. The master synchronously writes the transaction to storage. This is an example of a
-        trade off between durability and performance. We will see more about how to control this
-        trade off later.</p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="Java-Broker-High-Availability-Behaviour-SynchronizationPolicy"></a>10.4.2.&#160;Synchronization Policy</h3></div></div></div><p>The <span class="emphasis"><em>synchronization policy</em></span> dictates what a node must do when it
-        receives a transaction before it acknowledges that transaction to the rest of the
-        group.</p><p>The following options are available: </p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p><span class="emphasis"><em>SYNC</em></span>. The node must write the transaction to disk and flush
-              any OS level buffers before sending the acknowledgement. SYNC is offers the highest
-              durability but offers the least performance.</p></li><li class="listitem"><p><span class="emphasis"><em>WRITE_NO_SYNC</em></span>. The node must write the transaction to disk
-              before sending the acknowledgement. OS level buffers will be flush as some point
-              later. This typically provides an assurance against failure of the application but not
-              the operating system or hardware.</p></li><li class="listitem"><p><span class="emphasis"><em>NO_SYNC</em></span>. The node immediately sends the acknowledgement. The
-              transaction will be written and OS level buffers flushed as some point later. NO_SYNC
-              offers the highest performance but the lowest durability level. This synchronization
-              policy is sometimes known as <span class="emphasis"><em>commit to the network</em></span>.</p></li></ul></div><p>It is possible to assign a one policy to the master and a different policy to the
-        replicas. These are configured as <a class="link" href="Java-Broker-Management-Managing-Virtualhosts.html#Java-Broker-Management-Managing-Virtualhost-Attributes" title="7.5.3.&#160;Attributes">attributes on the
-          virtualhost</a>. By default the master uses <span class="emphasis"><em>SYNC</em></span> and replicas use
-          <span class="emphasis"><em>NO_SYNC</em></span>.</p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="Java-Broker-High-Availability-Behaviour-NodePriority"></a>10.4.3.&#160;Node Priority</h3></div></div></div><p>Node priority can be used to influence the behaviour of the election algorithm. It is
-        useful in the case were you want to favour some nodes over others. For instance, if you wish
-        to favour nodes located in a particular data centre over those in a remote site. </p><p>The following options are available: </p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p><span class="emphasis"><em>Highest</em></span>. Nodes with this priority will be more favoured. In
-              the event of two or more nodes having the most recent transaction, the node with this
-              priority will be elected master. If two or more nodes have this priority the algorithm
-              will make an arbitrary choice.</p></li><li class="listitem"><p><span class="emphasis"><em>High</em></span>. Nodes with this priority will be favoured but not as
-              much so as those with Highest.</p></li><li class="listitem"><p><span class="emphasis"><em>Normal</em></span>. This is default election priority.</p></li><li class="listitem"><p><span class="emphasis"><em>Never</em></span>. The node will never be elected <span class="emphasis"><em>even if the
-                node has the most recent transaction</em></span>. The node will still keep up to date
-              with the replication stream and will still vote itself, but can just never be
-              elected.</p></li></ul></div><p>
-      </p><p>Node priority is configured as an <a class="link" href="Java-Broker-Management-Managing-Virtualhost-Nodes.html#Java-Broker-Management-Managing-Virtualhost-Nodes-Attributes" title="7.4.2.&#160;Attributes">attribute on the
-          virtualhost node</a> and can be changed at runtime and is effective immediately.</p><div class="important" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title">Important</h3><p>Use of the Never priority can lead to transaction loss. For example, consider a group
-          of three where replica-2 is marked as Never. If a transaction were to arrive and it be
-          acknowledged only by Master and Replica-2, the transaction would succeed. Replica 1 is
-          running behind for some reason (perhaps a full-GC). If a Master failure were to occur at
-          that moment, the replicas would elect Replica-1 even though Replica-2 had the most recent
-          transaction.</p><p>Transaction loss is reported by message <a class="link" href="Java-Broker-Appendix-Operation-Logging.html#Java-Broker-Appendix-Operation-Logging-Message-HA-1014">HA-1014</a>.</p></div></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="Java-Broker-High-Availability-Behaviour-MinimumNumberOfNodes"></a>10.4.4.&#160;Required Minimum Number Of Nodes</h3></div></div></div><p>This controls the required minimum number of nodes to com [...]
-        elect a new master. By default, the required number of nodes is set to
-          <span class="emphasis"><em>Default</em></span> (which signifies quorum).</p><p>It is possible to reduce the required minimum number of nodes. The rationale for doing
-        this is normally to temporarily restore service from fewer than quorum nodes following an
-        extraordinary failure.</p><p>For example, consider a group of three. If one node were to fail, as quorum still
-        remained, the system would continue work without any intervention. If the failing node were
-        the master, a new master would be elected.</p><p>What if a further node were to fail? Quorum no longer remains, and the remaining node
-        would just wait. It cannot elect itself master. What if we wanted to restore service from
-        just this one node?</p><p>In this case, Required Number of Nodes can be reduced to 1 on the remain node, allowing
-        the node to elect itself and service to be restored from the singleton. Required minimum
-        number of nodes is configured as an <a class="link" href="Java-Broker-Management-Managing-Virtualhost-Nodes.html#Java-Broker-Management-Managing-Virtualhost-Nodes-Attributes" title="7.4.2.&#160;Attributes">attribute on the
-          virtualhost node</a> and can be changed at runtime and is effective immediately.</p><div class="important" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title">Important</h3><p>The attribute must be used cautiously. Careless use will lead to lost transactions and
-          can lead to a <a class="link" href="http://en.wikipedia.org/wiki/Split-brain_(computing)" target="_top">split-brain</a> in the event of a network partition. If used to temporarily restore
-          service from fewer than quorum nodes, it is <span class="emphasis"><em>imperative</em></span> to revert it
-          to the Default value as the failed nodes are restored.</p><p>Transaction loss is reported by message <a class="link" href="Java-Broker-Appendix-Operation-Logging.html#Java-Broker-Appendix-Operation-Logging-Message-HA-1014">HA-1014</a>.</p></div></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="Java-Broker-High-Availability-Behaviour-DesignatedPrimary"></a>10.4.5.&#160;Designated Primary</h3></div></div></div><p>This attribute applies to the gr [...]
-        as quorum no longer exists. A single node cannot elect itself master. </p><p>The designated primary flag allows a node in a two node group to elect itself master and
-        to operate sole. Designated Primary is configured as an <a class="link" href="Java-Broker-Management-Managing-Virtualhost-Nodes.html#Java-Broker-Management-Managing-Virtualhost-Nodes-Attributes" title="7.4.2.&#160;Attributes">attribute on the
-          virtualhost node</a> and can be changed at runtime and is effective immediately.</p><p>For example, consider a group of two where the master fails. Service will be interrupted
-        as the remaining node cannot elect itself master. To allow it to become master, apply the
-        designated primary flag to it. It will elect itself master and work can continue, albeit
-        from one node.</p><div class="important" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title">Important</h3><p>It is imperative not to allow designated primary to be set on both nodes at once. To
-          do so will mean, in the event of a network partition, a <a class="link" href="http://en.wikipedia.org/wiki/Split-brain_(computing)" target="_top">split-brain</a> will
-            occur.</p><p>Transaction loss is reported by message <a class="link" href="Java-Broker-Appendix-Operation-Logging.html#Java-Broker-Appendix-Operation-Logging-Message-HA-1014">HA-1014</a>.</p></div></div></div><div class="navfooter"><hr /><table summary="Navigation footer" width="100%"><tr><td align="left" width="40%"><a accesskey="p" href="Java-Broker-High-Availability-CreatingGroup.html">Prev</a>&#160;</td><td align="center" width="20%"><a accesskey="u" href="Java-Broker-Hig [...]
-
-          <hr/>
-
-          <ul id="-apache-navigation">
-            <li><a href="http://www.apache.org/">Apache</a></li>
-            <li><a href="http://www.apache.org/licenses/">License</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="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
-          </ul>
-
-          <p id="-legal">
-            Apache Qpid, Messaging built on AMQP; Copyright &#169; 2015
-            The Apache Software Foundation; Licensed under
-            the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
-            License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
-            project logo are trademarks of The Apache Software
-            Foundation; All other marks mentioned may be trademarks or
-            registered trademarks of their respective owners
-          </p>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-High-Availability-ClientFailover.html b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-High-Availability-ClientFailover.html
deleted file mode 100644
index 4b08622..0000000
--- a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-High-Availability-ClientFailover.html
+++ /dev/null
@@ -1,148 +0,0 @@
-<!DOCTYPE html>
-<!--
- -
- - 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.
- -
--->
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-  <head>
-    <title>10.6.&#160;Client failover - Apache Qpid&#8482;</title>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-    <link rel="stylesheet" href="/site.css" type="text/css" async="async"/>
-    <link rel="stylesheet" href="/deferred.css" type="text/css" defer="defer"/>
-    <script type="text/javascript">var _deferredFunctions = [];</script>
-    <script type="text/javascript" src="/deferred.js" defer="defer"></script>
-    <!--[if lte IE 8]>
-      <link rel="stylesheet" href="/ie.css" type="text/css"/>
-      <script type="text/javascript" src="/html5shiv.js"></script>
-    <![endif]-->
-
-    <!-- Redirects for `go get` and godoc.org -->
-    <meta name="go-import"
-          content="qpid.apache.org git https://gitbox.apache.org/repos/asf/qpid-proton.git"/>
-    <meta name="go-source"
-          content="qpid.apache.org
-https://github.com/apache/qpid-proton/blob/go1/README.md
-https://github.com/apache/qpid-proton/tree/go1{/dir}
-https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
-  </head>
-  <body>
-    <div id="-content">
-      <div id="-top" class="panel">
-        <a id="-menu-link"><img width="16" height="16" src="" alt="Menu"/></a>
-
-        <a id="-search-link"><img width="22" height="16" src="" alt="Search"/></a>
-
-        <ul id="-global-navigation">
-          <li><a id="-logotype" href="/index.html">Apache Qpid<sup>&#8482;</sup></a></li>
-          <li><a href="/documentation.html">Documentation</a></li>
-          <li><a href="/download.html">Download</a></li>
-          <li><a href="/discussion.html">Discussion</a></li>
-        </ul>
-      </div>
-
-      <div id="-menu" class="panel" style="display: none;">
-        <div class="flex">
-          <section>
-            <h3>Project</h3>
-
-            <ul>
-              <li><a href="/overview.html">Overview</a></li>
-              <li><a href="/components/index.html">Components</a></li>
-              <li><a href="/releases/index.html">Releases</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Messaging APIs</h3>
-
-            <ul>
-              <li><a href="/proton/index.html">Qpid Proton</a></li>
-              <li><a href="/components/jms/index.html">Qpid JMS</a></li>
-              <li><a href="/components/messaging-api/index.html">Qpid Messaging API</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Servers and tools</h3>
-
-            <ul>
-              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
-              <li><a href="/components/cpp-broker/index.html">C++ broker</a></li>
-              <li><a href="/components/dispatch-router/index.html">Dispatch router</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Resources</h3>
-
-            <ul>
-              <li><a href="/dashboard.html">Dashboard</a></li>
-              <li><a href="https://cwiki.apache.org/confluence/display/qpid/Index">Wiki</a></li>
-              <li><a href="/resources.html">More resources</a></li>
-            </ul>
-          </section>
-        </div>
-      </div>
-
-      <div id="-search" class="panel" style="display: none;">
-        <form action="http://www.google.com/search" method="get">
-          <input type="hidden" name="sitesearch" value="qpid.apache.org"/>
-          <input type="text" name="q" maxlength="255" autofocus="autofocus" tabindex="1"/>
-          <button type="submit">Search</button>
-          <a href="/search.html">More ways to search</a>
-        </form>
-      </div>
-
-      <div id="-middle" class="panel">
-        <ul id="-path-navigation"><li><a href="/index.html">Home</a></li><li><a href="/releases/index.html">Releases</a></li><li><a href="/releases/qpid-java-trunk/index.html">Qpid for Java Trunk</a></li><li><a href="/releases/qpid-java-trunk/java-broker/book/index.html">Apache Qpid Broker for Java</a></li><li>10.6.&#160;Client failover</li></ul>
-
-        <div id="-middle-content">
-          <div class="docbook"><div class="navheader"><table summary="Navigation header" width="100%"><tr><th align="center" colspan="3">10.6.&#160;Client failover</th></tr><tr><td align="left" width="20%"><a accesskey="p" href="Java-Broker-High-Availability-NodeOperations.html">Prev</a>&#160;</td><th align="center" width="60%">Chapter&#160;10.&#160;High Availability</th><td align="right" width="20%">&#160;<a accesskey="n" href="Java-Broker-High-Availability-DiskSpace.html">Next</a></td> [...]
-      virtualhost within the group.</p><p>Clients can do this using a static technique, for example , utilising the <a class="link" href="../../jms-client-0-8/book/JMS-Client-0-8-Connection-URL.html" target="_top">failover feature of the Qpid connection url</a>
-      where the client has a list of all the nodes, and tries each node in sequence until it
-      discovers the node with the active virtualhost.</p><p>Another possibility is a dynamic technique utilising a proxy or Virtual IP (VIP). These
-      require other software and/or hardware and are outside the scope of this document.</p></div><div class="navfooter"><hr /><table summary="Navigation footer" width="100%"><tr><td align="left" width="40%"><a accesskey="p" href="Java-Broker-High-Availability-NodeOperations.html">Prev</a>&#160;</td><td align="center" width="20%"><a accesskey="u" href="Java-Broker-High-Availability.html">Up</a></td><td align="right" width="40%">&#160;<a accesskey="n" href="Java-Broker-High-Availability-D [...]
-
-          <hr/>
-
-          <ul id="-apache-navigation">
-            <li><a href="http://www.apache.org/">Apache</a></li>
-            <li><a href="http://www.apache.org/licenses/">License</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="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
-          </ul>
-
-          <p id="-legal">
-            Apache Qpid, Messaging built on AMQP; Copyright &#169; 2015
-            The Apache Software Foundation; Licensed under
-            the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
-            License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
-            project logo are trademarks of The Apache Software
-            Foundation; All other marks mentioned may be trademarks or
-            registered trademarks of their respective owners
-          </p>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-High-Availability-CreatingGroup.html b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-High-Availability-CreatingGroup.html
deleted file mode 100644
index 2bda371..0000000
--- a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-High-Availability-CreatingGroup.html
+++ /dev/null
@@ -1,182 +0,0 @@
-<!DOCTYPE html>
-<!--
- -
- - 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.
- -
--->
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-  <head>
-    <title>10.3.&#160;Creating a group - Apache Qpid&#8482;</title>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-    <link rel="stylesheet" href="/site.css" type="text/css" async="async"/>
-    <link rel="stylesheet" href="/deferred.css" type="text/css" defer="defer"/>
-    <script type="text/javascript">var _deferredFunctions = [];</script>
-    <script type="text/javascript" src="/deferred.js" defer="defer"></script>
-    <!--[if lte IE 8]>
-      <link rel="stylesheet" href="/ie.css" type="text/css"/>
-      <script type="text/javascript" src="/html5shiv.js"></script>
-    <![endif]-->
-
-    <!-- Redirects for `go get` and godoc.org -->
-    <meta name="go-import"
-          content="qpid.apache.org git https://gitbox.apache.org/repos/asf/qpid-proton.git"/>
-    <meta name="go-source"
-          content="qpid.apache.org
-https://github.com/apache/qpid-proton/blob/go1/README.md
-https://github.com/apache/qpid-proton/tree/go1{/dir}
-https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
-  </head>
-  <body>
-    <div id="-content">
-      <div id="-top" class="panel">
-        <a id="-menu-link"><img width="16" height="16" src="" alt="Menu"/></a>
-
-        <a id="-search-link"><img width="22" height="16" src="" alt="Search"/></a>
-
-        <ul id="-global-navigation">
-          <li><a id="-logotype" href="/index.html">Apache Qpid<sup>&#8482;</sup></a></li>
-          <li><a href="/documentation.html">Documentation</a></li>
-          <li><a href="/download.html">Download</a></li>
-          <li><a href="/discussion.html">Discussion</a></li>
-        </ul>
-      </div>
-
-      <div id="-menu" class="panel" style="display: none;">
-        <div class="flex">
-          <section>
-            <h3>Project</h3>
-
-            <ul>
-              <li><a href="/overview.html">Overview</a></li>
-              <li><a href="/components/index.html">Components</a></li>
-              <li><a href="/releases/index.html">Releases</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Messaging APIs</h3>
-
-            <ul>
-              <li><a href="/proton/index.html">Qpid Proton</a></li>
-              <li><a href="/components/jms/index.html">Qpid JMS</a></li>
-              <li><a href="/components/messaging-api/index.html">Qpid Messaging API</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Servers and tools</h3>
-
-            <ul>
-              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
-              <li><a href="/components/cpp-broker/index.html">C++ broker</a></li>
-              <li><a href="/components/dispatch-router/index.html">Dispatch router</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Resources</h3>
-
-            <ul>
-              <li><a href="/dashboard.html">Dashboard</a></li>
-              <li><a href="https://cwiki.apache.org/confluence/display/qpid/Index">Wiki</a></li>
-              <li><a href="/resources.html">More resources</a></li>
-            </ul>
-          </section>
-        </div>
-      </div>
-
-      <div id="-search" class="panel" style="display: none;">
-        <form action="http://www.google.com/search" method="get">
-          <input type="hidden" name="sitesearch" value="qpid.apache.org"/>
-          <input type="text" name="q" maxlength="255" autofocus="autofocus" tabindex="1"/>
-          <button type="submit">Search</button>
-          <a href="/search.html">More ways to search</a>
-        </form>
-      </div>
-
-      <div id="-middle" class="panel">
-        <ul id="-path-navigation"><li><a href="/index.html">Home</a></li><li><a href="/releases/index.html">Releases</a></li><li><a href="/releases/qpid-java-trunk/index.html">Qpid for Java Trunk</a></li><li><a href="/releases/qpid-java-trunk/java-broker/book/index.html">Apache Qpid Broker for Java</a></li><li>10.3.&#160;Creating a group</li></ul>
-
-        <div id="-middle-content">
-          <div class="docbook"><div class="navheader"><table summary="Navigation header" width="100%"><tr><th align="center" colspan="3">10.3.&#160;Creating a group</th></tr><tr><td align="left" width="20%"><a accesskey="p" href="Java-Broker-High-Availability-OverviewOfHA.html">Prev</a>&#160;</td><th align="center" width="60%">Chapter&#160;10.&#160;High Availability</th><td align="right" width="20%">&#160;<a accesskey="n" href="Java-Broker-High-Availability-Behaviour.html">Next</a></td>< [...]
-      first creating the first node standalone, then creating subsequent nodes referencing the first
-      node so the nodes can introduce themselves and gradually the group is built up.</p><p>A group is created through either <a class="link" href="Java-Broker-Management-Channel-Web-Console.html" title="6.2.&#160;Web Management Console">Web Management</a> or the <a class="link" href="Java-Broker-Management-Channel-REST-API.html" title="6.3.&#160;REST API">REST API</a>. These instructions
-      presume you are using Web Management. To illustrate the example it builds the group
-      illustrated in figure <a class="xref" href="Java-Broker-High-Availability-OverviewOfHA.html#Java-Broker-High-Availability-OverviewOfHA-Figure" title="Figure&#160;10.1.&#160;3-node group deployed across three Brokers.">Figure&#160;10.1, &#8220;3-node group deployed across three Brokers.&#8221;</a></p><div class="orderedlist"><ol class="orderedlist" type="1"><li class="listitem"><p>Install a Broker on each machine that will be used to host the group. As messaging
-            clients will need to be able to connect to and authentication to all Brokers, it usually
-            makes sense to choose a common authentication mechanism e.g. Simple LDAP Authentication,
-            External with SSL client authentication or Kerberos.</p></li><li class="listitem"><p>Select one Broker instance to host the first node instance. This choice is an
-            arbitrary one. The node is special only whilst creating group. Once creation is
-            complete, all nodes will be considered equal.</p></li><li class="listitem"><p>Click the <code class="literal">Add</code> button on the Virtualhost Panel on the Broker
-            tab.</p><p>
-            </p><div class="orderedlist"><ol class="orderedlist" type="a"><li class="listitem"><p>Give the Virtualhost node a unique name e.g. <code class="literal">weather1</code>. The
-                  name must be unique within the group and unique to that Broker. It is best if the
-                  node names are chosen from a different nomenclature than the machine names
-                  themselves.</p></li><li class="listitem"><p>Choose <code class="literal">BDB_HA</code> and select <code class="literal">New group</code>
-                </p></li><li class="listitem"><p>Give the group a name e.g. <code class="literal">weather</code>. The group name must be
-                  unique and will be the name also given to the virtualhost, so this is the name the
-                  messaging clients will use in their connection url.</p></li><li class="listitem"><p>Give the address of this node. This is an address on this node's host that
-                  will be used for replication purposes. The hostname <span class="emphasis"><em>must</em></span> be
-                  resolvable by all the other nodes in the group. This is separate from the address
-                  used by messaging clients to connect to the Broker. It is usually best to choose a
-                  symbolic name, rather than an IP address.</p></li><li class="listitem"><p>Now add the node addresses of all the other nodes that will form the group. In
-                  our example we are building a three node group so we give the node addresses of
-                    <code class="literal">chaac:5000</code> and <code class="literal">indra:5000</code>.</p></li><li class="listitem"><p>Click Add to create the node. The virtualhost node will be created with the
-                  virtualhost. As there is only one node at this stage, the role will be
-                  master.</p></li></ol></div><p>
-            </p><div class="figure"><a id="d0e6314"></a><p class="title"><strong>Figure&#160;10.2.&#160;Creating 1st node in a group</strong></p><div class="figure-contents"><div class="mediaobject"><img alt="Creating 1st node in a group" src="images/HA-Create-1.png" /></div></div></div><p><br class="figure-break" />
-          </p></li><li class="listitem"><p>Now move to the second Broker to be the group. Click the <code class="literal">Add</code>
-            button on the Virtualhost Panel on the Broker tab of the second Broker.</p><p>
-            </p><div class="orderedlist"><ol class="orderedlist" type="a"><li class="listitem"><p>Give the Virtualhost node a unique name e.g.
-                  <code class="literal">weather2</code>.</p></li><li class="listitem"><p>Choose <code class="literal">BDB_HA</code> and choose <code class="literal">Existing group</code>
-                </p></li><li class="listitem"><p>Give the details of the <span class="emphasis"><em>existing node</em></span>. Following our
-                  example, specify <code class="literal">weather</code>, <code class="literal">weather1</code> and
-                    <code class="literal">thor:5000</code></p></li><li class="listitem"><p>Give the address of this node.</p></li><li class="listitem"><p>Click Add to create the node. The node will use the existing details to
-                  contact it and introduce itself into the group. At this stage, the group will have
-                  two nodes, with the second node in the replica role.</p></li><li class="listitem"><p>Repeat these steps until you have added all the nodes to the group.</p></li></ol></div><p>
-            </p><div class="figure"><a id="d0e6372"></a><p class="title"><strong>Figure&#160;10.3.&#160;Adding subsequent nodes to the group</strong></p><div class="figure-contents"><div class="mediaobject"><img alt="Adding subsequent nodes to the group" src="images/HA-Create-2.png" /></div></div></div><p><br class="figure-break" />
-          </p></li></ol></div><p>The group is now formed and is ready for us. Looking at the virtualhost node of any of the
-      nodes shows a complete view of the whole group. </p><div class="figure"><a id="d0e6384"></a><p class="title"><strong>Figure&#160;10.4.&#160;View of group from one node</strong></p><div class="figure-contents"><div class="mediaobject"><img alt="View of group from one node" src="images/HA-Create-3.png" /></div></div></div><p><br class="figure-break" /></p></div><div class="navfooter"><hr /><table summary="Navigation footer" width="100%"><tr><td align="left" width="40%"><a accesskey=" [...]
-
-          <hr/>
-
-          <ul id="-apache-navigation">
-            <li><a href="http://www.apache.org/">Apache</a></li>
-            <li><a href="http://www.apache.org/licenses/">License</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="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
-          </ul>
-
-          <p id="-legal">
-            Apache Qpid, Messaging built on AMQP; Copyright &#169; 2015
-            The Apache Software Foundation; Licensed under
-            the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
-            License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
-            project logo are trademarks of The Apache Software
-            Foundation; All other marks mentioned may be trademarks or
-            registered trademarks of their respective owners
-          </p>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-High-Availability-DiskSpace.html b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-High-Availability-DiskSpace.html
deleted file mode 100644
index dab4037..0000000
--- a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-High-Availability-DiskSpace.html
+++ /dev/null
@@ -1,147 +0,0 @@
-<!DOCTYPE html>
-<!--
- -
- - 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.
- -
--->
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-  <head>
-    <title>10.7.&#160;Disk space requirements - Apache Qpid&#8482;</title>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-    <link rel="stylesheet" href="/site.css" type="text/css" async="async"/>
-    <link rel="stylesheet" href="/deferred.css" type="text/css" defer="defer"/>
-    <script type="text/javascript">var _deferredFunctions = [];</script>
-    <script type="text/javascript" src="/deferred.js" defer="defer"></script>
-    <!--[if lte IE 8]>
-      <link rel="stylesheet" href="/ie.css" type="text/css"/>
-      <script type="text/javascript" src="/html5shiv.js"></script>
-    <![endif]-->
-
-    <!-- Redirects for `go get` and godoc.org -->
-    <meta name="go-import"
-          content="qpid.apache.org git https://gitbox.apache.org/repos/asf/qpid-proton.git"/>
-    <meta name="go-source"
-          content="qpid.apache.org
-https://github.com/apache/qpid-proton/blob/go1/README.md
-https://github.com/apache/qpid-proton/tree/go1{/dir}
-https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
-  </head>
-  <body>
-    <div id="-content">
-      <div id="-top" class="panel">
-        <a id="-menu-link"><img width="16" height="16" src="" alt="Menu"/></a>
-
-        <a id="-search-link"><img width="22" height="16" src="" alt="Search"/></a>
-
-        <ul id="-global-navigation">
-          <li><a id="-logotype" href="/index.html">Apache Qpid<sup>&#8482;</sup></a></li>
-          <li><a href="/documentation.html">Documentation</a></li>
-          <li><a href="/download.html">Download</a></li>
-          <li><a href="/discussion.html">Discussion</a></li>
-        </ul>
-      </div>
-
-      <div id="-menu" class="panel" style="display: none;">
-        <div class="flex">
-          <section>
-            <h3>Project</h3>
-
-            <ul>
-              <li><a href="/overview.html">Overview</a></li>
-              <li><a href="/components/index.html">Components</a></li>
-              <li><a href="/releases/index.html">Releases</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Messaging APIs</h3>
-
-            <ul>
-              <li><a href="/proton/index.html">Qpid Proton</a></li>
-              <li><a href="/components/jms/index.html">Qpid JMS</a></li>
-              <li><a href="/components/messaging-api/index.html">Qpid Messaging API</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Servers and tools</h3>
-
-            <ul>
-              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
-              <li><a href="/components/cpp-broker/index.html">C++ broker</a></li>
-              <li><a href="/components/dispatch-router/index.html">Dispatch router</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Resources</h3>
-
-            <ul>
-              <li><a href="/dashboard.html">Dashboard</a></li>
-              <li><a href="https://cwiki.apache.org/confluence/display/qpid/Index">Wiki</a></li>
-              <li><a href="/resources.html">More resources</a></li>
-            </ul>
-          </section>
-        </div>
-      </div>
-
-      <div id="-search" class="panel" style="display: none;">
-        <form action="http://www.google.com/search" method="get">
-          <input type="hidden" name="sitesearch" value="qpid.apache.org"/>
-          <input type="text" name="q" maxlength="255" autofocus="autofocus" tabindex="1"/>
-          <button type="submit">Search</button>
-          <a href="/search.html">More ways to search</a>
-        </form>
-      </div>
-
-      <div id="-middle" class="panel">
-        <ul id="-path-navigation"><li><a href="/index.html">Home</a></li><li><a href="/releases/index.html">Releases</a></li><li><a href="/releases/qpid-java-trunk/index.html">Qpid for Java Trunk</a></li><li><a href="/releases/qpid-java-trunk/java-broker/book/index.html">Apache Qpid Broker for Java</a></li><li>10.7.&#160;Disk space requirements</li></ul>
-
-        <div id="-middle-content">
-          <div class="docbook"><div class="navheader"><table summary="Navigation header" width="100%"><tr><th align="center" colspan="3">10.7.&#160;Disk space requirements</th></tr><tr><td align="left" width="20%"><a accesskey="p" href="Java-Broker-High-Availability-ClientFailover.html">Prev</a>&#160;</td><th align="center" width="60%">Chapter&#160;10.&#160;High Availability</th><td align="right" width="20%">&#160;<a accesskey="n" href="Java-Broker-High-Availability-Network-Requirements. [...]
-      for them to allow them to return to the replica role quickly.</p><p>By default, the master will retain up to 1hour of missed transactions. In a busy
-      production system, the disk space occupied could be considerable.</p><p>This setting is controlled by virtualhost context variable
-        <code class="literal">je.rep.repStreamTimeout</code>.</p></div><div class="navfooter"><hr /><table summary="Navigation footer" width="100%"><tr><td align="left" width="40%"><a accesskey="p" href="Java-Broker-High-Availability-ClientFailover.html">Prev</a>&#160;</td><td align="center" width="20%"><a accesskey="u" href="Java-Broker-High-Availability.html">Up</a></td><td align="right" width="40%">&#160;<a accesskey="n" href="Java-Broker-High-Availability-Network-Requirements.html">N [...]
-
-          <hr/>
-
-          <ul id="-apache-navigation">
-            <li><a href="http://www.apache.org/">Apache</a></li>
-            <li><a href="http://www.apache.org/licenses/">License</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="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
-          </ul>
-
-          <p id="-legal">
-            Apache Qpid, Messaging built on AMQP; Copyright &#169; 2015
-            The Apache Software Foundation; Licensed under
-            the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
-            License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
-            project logo are trademarks of The Apache Software
-            Foundation; All other marks mentioned may be trademarks or
-            registered trademarks of their respective owners
-          </p>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-High-Availability-Network-Requirements.html b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-High-Availability-Network-Requirements.html
deleted file mode 100644
index bfd193c..0000000
--- a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-High-Availability-Network-Requirements.html
+++ /dev/null
@@ -1,148 +0,0 @@
-<!DOCTYPE html>
-<!--
- -
- - 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.
- -
--->
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-  <head>
-    <title>10.8.&#160;Network Requirements - Apache Qpid&#8482;</title>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-    <link rel="stylesheet" href="/site.css" type="text/css" async="async"/>
-    <link rel="stylesheet" href="/deferred.css" type="text/css" defer="defer"/>
-    <script type="text/javascript">var _deferredFunctions = [];</script>
-    <script type="text/javascript" src="/deferred.js" defer="defer"></script>
-    <!--[if lte IE 8]>
-      <link rel="stylesheet" href="/ie.css" type="text/css"/>
-      <script type="text/javascript" src="/html5shiv.js"></script>
-    <![endif]-->
-
-    <!-- Redirects for `go get` and godoc.org -->
-    <meta name="go-import"
-          content="qpid.apache.org git https://gitbox.apache.org/repos/asf/qpid-proton.git"/>
-    <meta name="go-source"
-          content="qpid.apache.org
-https://github.com/apache/qpid-proton/blob/go1/README.md
-https://github.com/apache/qpid-proton/tree/go1{/dir}
-https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
-  </head>
-  <body>
-    <div id="-content">
-      <div id="-top" class="panel">
-        <a id="-menu-link"><img width="16" height="16" src="" alt="Menu"/></a>
-
-        <a id="-search-link"><img width="22" height="16" src="" alt="Search"/></a>
-
-        <ul id="-global-navigation">
-          <li><a id="-logotype" href="/index.html">Apache Qpid<sup>&#8482;</sup></a></li>
-          <li><a href="/documentation.html">Documentation</a></li>
-          <li><a href="/download.html">Download</a></li>
-          <li><a href="/discussion.html">Discussion</a></li>
-        </ul>
-      </div>
-
-      <div id="-menu" class="panel" style="display: none;">
-        <div class="flex">
-          <section>
-            <h3>Project</h3>
-
-            <ul>
-              <li><a href="/overview.html">Overview</a></li>
-              <li><a href="/components/index.html">Components</a></li>
-              <li><a href="/releases/index.html">Releases</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Messaging APIs</h3>
-
-            <ul>
-              <li><a href="/proton/index.html">Qpid Proton</a></li>
-              <li><a href="/components/jms/index.html">Qpid JMS</a></li>
-              <li><a href="/components/messaging-api/index.html">Qpid Messaging API</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Servers and tools</h3>
-
-            <ul>
-              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
-              <li><a href="/components/cpp-broker/index.html">C++ broker</a></li>
-              <li><a href="/components/dispatch-router/index.html">Dispatch router</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Resources</h3>
-
-            <ul>
-              <li><a href="/dashboard.html">Dashboard</a></li>
-              <li><a href="https://cwiki.apache.org/confluence/display/qpid/Index">Wiki</a></li>
-              <li><a href="/resources.html">More resources</a></li>
-            </ul>
-          </section>
-        </div>
-      </div>
-
-      <div id="-search" class="panel" style="display: none;">
-        <form action="http://www.google.com/search" method="get">
-          <input type="hidden" name="sitesearch" value="qpid.apache.org"/>
-          <input type="text" name="q" maxlength="255" autofocus="autofocus" tabindex="1"/>
-          <button type="submit">Search</button>
-          <a href="/search.html">More ways to search</a>
-        </form>
-      </div>
-
-      <div id="-middle" class="panel">
-        <ul id="-path-navigation"><li><a href="/index.html">Home</a></li><li><a href="/releases/index.html">Releases</a></li><li><a href="/releases/qpid-java-trunk/index.html">Qpid for Java Trunk</a></li><li><a href="/releases/qpid-java-trunk/java-broker/book/index.html">Apache Qpid Broker for Java</a></li><li>10.8.&#160;Network Requirements</li></ul>
-
-        <div id="-middle-content">
-          <div class="docbook"><div class="navheader"><table summary="Navigation header" width="100%"><tr><th align="center" colspan="3">10.8.&#160;Network Requirements</th></tr><tr><td align="left" width="20%"><a accesskey="p" href="Java-Broker-High-Availability-DiskSpace.html">Prev</a>&#160;</td><th align="center" width="60%">Chapter&#160;10.&#160;High Availability</th><td align="right" width="20%">&#160;<a accesskey="n" href="Java-Broker-High-Availability-Security.html">Next</a></td>< [...]
-      and quality of service.</p><p>In order to achieve the best performance it is recommended to use a separate network
-      infrastructure for the Qpid HA Nodes which might include installation of dedicated network
-      hardware on Broker hosts, assigning a higher priority to replication ports, installing a group
-      in a separate network not impacted by any other traffic.</p></div><div class="navfooter"><hr /><table summary="Navigation footer" width="100%"><tr><td align="left" width="40%"><a accesskey="p" href="Java-Broker-High-Availability-DiskSpace.html">Prev</a>&#160;</td><td align="center" width="20%"><a accesskey="u" href="Java-Broker-High-Availability.html">Up</a></td><td align="right" width="40%">&#160;<a accesskey="n" href="Java-Broker-High-Availability-Security.html">Next</a></td></tr [...]
-
-          <hr/>
-
-          <ul id="-apache-navigation">
-            <li><a href="http://www.apache.org/">Apache</a></li>
-            <li><a href="http://www.apache.org/licenses/">License</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="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
-          </ul>
-
-          <p id="-legal">
-            Apache Qpid, Messaging built on AMQP; Copyright &#169; 2015
-            The Apache Software Foundation; Licensed under
-            the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
-            License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
-            project logo are trademarks of The Apache Software
-            Foundation; All other marks mentioned may be trademarks or
-            registered trademarks of their respective owners
-          </p>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-High-Availability-NodeOperations.html b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-High-Availability-NodeOperations.html
deleted file mode 100644
index ff33429..0000000
--- a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-High-Availability-NodeOperations.html
+++ /dev/null
@@ -1,164 +0,0 @@
-<!DOCTYPE html>
-<!--
- -
- - 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.
- -
--->
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-  <head>
-    <title>10.5.&#160;Node Operations - Apache Qpid&#8482;</title>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-    <link rel="stylesheet" href="/site.css" type="text/css" async="async"/>
-    <link rel="stylesheet" href="/deferred.css" type="text/css" defer="defer"/>
-    <script type="text/javascript">var _deferredFunctions = [];</script>
-    <script type="text/javascript" src="/deferred.js" defer="defer"></script>
-    <!--[if lte IE 8]>
-      <link rel="stylesheet" href="/ie.css" type="text/css"/>
-      <script type="text/javascript" src="/html5shiv.js"></script>
-    <![endif]-->
-
-    <!-- Redirects for `go get` and godoc.org -->
-    <meta name="go-import"
-          content="qpid.apache.org git https://gitbox.apache.org/repos/asf/qpid-proton.git"/>
-    <meta name="go-source"
-          content="qpid.apache.org
-https://github.com/apache/qpid-proton/blob/go1/README.md
-https://github.com/apache/qpid-proton/tree/go1{/dir}
-https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
-  </head>
-  <body>
-    <div id="-content">
-      <div id="-top" class="panel">
-        <a id="-menu-link"><img width="16" height="16" src="" alt="Menu"/></a>
-
-        <a id="-search-link"><img width="22" height="16" src="" alt="Search"/></a>
-
-        <ul id="-global-navigation">
-          <li><a id="-logotype" href="/index.html">Apache Qpid<sup>&#8482;</sup></a></li>
-          <li><a href="/documentation.html">Documentation</a></li>
-          <li><a href="/download.html">Download</a></li>
-          <li><a href="/discussion.html">Discussion</a></li>
-        </ul>
-      </div>
-
-      <div id="-menu" class="panel" style="display: none;">
-        <div class="flex">
-          <section>
-            <h3>Project</h3>
-
-            <ul>
-              <li><a href="/overview.html">Overview</a></li>
-              <li><a href="/components/index.html">Components</a></li>
-              <li><a href="/releases/index.html">Releases</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Messaging APIs</h3>
-
-            <ul>
-              <li><a href="/proton/index.html">Qpid Proton</a></li>
-              <li><a href="/components/jms/index.html">Qpid JMS</a></li>
-              <li><a href="/components/messaging-api/index.html">Qpid Messaging API</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Servers and tools</h3>
-
-            <ul>
-              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
-              <li><a href="/components/cpp-broker/index.html">C++ broker</a></li>
-              <li><a href="/components/dispatch-router/index.html">Dispatch router</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Resources</h3>
-
-            <ul>
-              <li><a href="/dashboard.html">Dashboard</a></li>
-              <li><a href="https://cwiki.apache.org/confluence/display/qpid/Index">Wiki</a></li>
-              <li><a href="/resources.html">More resources</a></li>
-            </ul>
-          </section>
-        </div>
-      </div>
-
-      <div id="-search" class="panel" style="display: none;">
-        <form action="http://www.google.com/search" method="get">
-          <input type="hidden" name="sitesearch" value="qpid.apache.org"/>
-          <input type="text" name="q" maxlength="255" autofocus="autofocus" tabindex="1"/>
-          <button type="submit">Search</button>
-          <a href="/search.html">More ways to search</a>
-        </form>
-      </div>
-
-      <div id="-middle" class="panel">
-        <ul id="-path-navigation"><li><a href="/index.html">Home</a></li><li><a href="/releases/index.html">Releases</a></li><li><a href="/releases/qpid-java-trunk/index.html">Qpid for Java Trunk</a></li><li><a href="/releases/qpid-java-trunk/java-broker/book/index.html">Apache Qpid Broker for Java</a></li><li>10.5.&#160;Node Operations</li></ul>
-
-        <div id="-middle-content">
-          <div class="docbook"><div class="navheader"><table summary="Navigation header" width="100%"><tr><th align="center" colspan="3">10.5.&#160;Node Operations</th></tr><tr><td align="left" width="20%"><a accesskey="p" href="Java-Broker-High-Availability-Behaviour.html">Prev</a>&#160;</td><th align="center" width="60%">Chapter&#160;10.&#160;High Availability</th><td align="right" width="20%">&#160;<a accesskey="n" href="Java-Broker-High-Availability-ClientFailover.html">Next</a></td> [...]
-            messaging clients will be disconnected and any in-flight transaction rollbacked. The
-            remaining nodes will elect a new master if quorum number of nodes still remains.</p><p>Stopping a replica node will cause the node to temporarily leave the group too.
-            Providing quorum still exists, the current master will continue without interruption. If
-            by leaving the group, quorum no longer exists, all the nodes will begin waiting,
-            disconnecting any messaging clients, and the virtualhost will become unavailable.</p><p>A stopped virtualhost node is still considered to be a member of the group.</p></li><li class="listitem"><p><span class="emphasis"><em>Start</em></span></p><p>Starting a virtualhost node allows it to rejoin the group.</p><p>If the group already has a master, the node will catch up from the master and then
-            become a replica once it has done so.</p><p>If the group did not have quorum and so had no master, but the rejoining of this
-            node means quorum now exists, an election will take place. The node with the most up to
-            date transaction will become master unless influenced by the priority rules described
-            above.</p><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title">Note</h3><p>The length of time taken to catch up will depend on how long the node has been
-              stopped. The worst case is where the node has been stopped for more than one hour. In
-              this case, the master will perform an automated <code class="literal">network restore</code>.
-              This involves streaming all the data held by the master over to the replica. This
-              could take considerable time.</p></div></li><li class="listitem"><p><span class="emphasis"><em>Delete</em></span></p><p>A virtualhost node can be deleted. Deleting a node permanently removes the node from
-            the group. The data stored locally is removed but this does not affect the data held by
-            the remainder of the group.</p><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title">Note</h3><p>The names of deleted virtualhost node cannot be reused within a group.</p></div></li></ul></div><p>It is also possible to add nodes to an existing group using the procedure described
-        above.</p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="Java-Broker-High-Availability-NodeOperations-TransferMaster"></a>10.5.2.&#160;Transfer Master</h3></div></div></div><p>This operation allows the mastership to be moved from node to node. This is useful for
-        restoring a business as usual state after a failure.</p><p>When using this function, the following occurs. </p><div class="orderedlist"><ol class="orderedlist" type="1"><li class="listitem"><p>The system first gives time for the chosen new master to become reasonable up to
-              date. </p></li><li class="listitem"><p>It then suspends transactions on the old master and allows the chosen node to
-              become up to date.</p></li><li class="listitem"><p>The suspended transactions are aborted and any messaging clients connected to the
-              old master are disconnected.</p></li><li class="listitem"><p>The chosen master becomes the new master. The old master becomes a replica.</p></li><li class="listitem"><p>Messaging clients reconnect the new master.</p></li></ol></div></div></div><div class="navfooter"><hr /><table summary="Navigation footer" width="100%"><tr><td align="left" width="40%"><a accesskey="p" href="Java-Broker-High-Availability-Behaviour.html">Prev</a>&#160;</td><td align="center" width="20%"><a ac [...]
-
-          <hr/>
-
-          <ul id="-apache-navigation">
-            <li><a href="http://www.apache.org/">Apache</a></li>
-            <li><a href="http://www.apache.org/licenses/">License</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="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
-          </ul>
-
-          <p id="-legal">
-            Apache Qpid, Messaging built on AMQP; Copyright &#169; 2015
-            The Apache Software Foundation; Licensed under
-            the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
-            License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
-            project logo are trademarks of The Apache Software
-            Foundation; All other marks mentioned may be trademarks or
-            registered trademarks of their respective owners
-          </p>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-High-Availability-OverviewOfHA.html b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-High-Availability-OverviewOfHA.html
deleted file mode 100644
index 6133e37..0000000
--- a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-High-Availability-OverviewOfHA.html
+++ /dev/null
@@ -1,169 +0,0 @@
-<!DOCTYPE html>
-<!--
- -
- - 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.
- -
--->
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-  <head>
-    <title>10.2.&#160;High Availability Overview - Apache Qpid&#8482;</title>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-    <link rel="stylesheet" href="/site.css" type="text/css" async="async"/>
-    <link rel="stylesheet" href="/deferred.css" type="text/css" defer="defer"/>
-    <script type="text/javascript">var _deferredFunctions = [];</script>
-    <script type="text/javascript" src="/deferred.js" defer="defer"></script>
-    <!--[if lte IE 8]>
-      <link rel="stylesheet" href="/ie.css" type="text/css"/>
-      <script type="text/javascript" src="/html5shiv.js"></script>
-    <![endif]-->
-
-    <!-- Redirects for `go get` and godoc.org -->
-    <meta name="go-import"
-          content="qpid.apache.org git https://gitbox.apache.org/repos/asf/qpid-proton.git"/>
-    <meta name="go-source"
-          content="qpid.apache.org
-https://github.com/apache/qpid-proton/blob/go1/README.md
-https://github.com/apache/qpid-proton/tree/go1{/dir}
-https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
-  </head>
-  <body>
-    <div id="-content">
-      <div id="-top" class="panel">
-        <a id="-menu-link"><img width="16" height="16" src="" alt="Menu"/></a>
-
-        <a id="-search-link"><img width="22" height="16" src="" alt="Search"/></a>
-
-        <ul id="-global-navigation">
-          <li><a id="-logotype" href="/index.html">Apache Qpid<sup>&#8482;</sup></a></li>
-          <li><a href="/documentation.html">Documentation</a></li>
-          <li><a href="/download.html">Download</a></li>
-          <li><a href="/discussion.html">Discussion</a></li>
-        </ul>
-      </div>
-
-      <div id="-menu" class="panel" style="display: none;">
-        <div class="flex">
-          <section>
-            <h3>Project</h3>
-
-            <ul>
-              <li><a href="/overview.html">Overview</a></li>
-              <li><a href="/components/index.html">Components</a></li>
-              <li><a href="/releases/index.html">Releases</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Messaging APIs</h3>
-
-            <ul>
-              <li><a href="/proton/index.html">Qpid Proton</a></li>
-              <li><a href="/components/jms/index.html">Qpid JMS</a></li>
-              <li><a href="/components/messaging-api/index.html">Qpid Messaging API</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Servers and tools</h3>
-
-            <ul>
-              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
-              <li><a href="/components/cpp-broker/index.html">C++ broker</a></li>
-              <li><a href="/components/dispatch-router/index.html">Dispatch router</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Resources</h3>
-
-            <ul>
-              <li><a href="/dashboard.html">Dashboard</a></li>
-              <li><a href="https://cwiki.apache.org/confluence/display/qpid/Index">Wiki</a></li>
-              <li><a href="/resources.html">More resources</a></li>
-            </ul>
-          </section>
-        </div>
-      </div>
-
-      <div id="-search" class="panel" style="display: none;">
-        <form action="http://www.google.com/search" method="get">
-          <input type="hidden" name="sitesearch" value="qpid.apache.org"/>
-          <input type="text" name="q" maxlength="255" autofocus="autofocus" tabindex="1"/>
-          <button type="submit">Search</button>
-          <a href="/search.html">More ways to search</a>
-        </form>
-      </div>
-
-      <div id="-middle" class="panel">
-        <ul id="-path-navigation"><li><a href="/index.html">Home</a></li><li><a href="/releases/index.html">Releases</a></li><li><a href="/releases/qpid-java-trunk/index.html">Qpid for Java Trunk</a></li><li><a href="/releases/qpid-java-trunk/java-broker/book/index.html">Apache Qpid Broker for Java</a></li><li>10.2.&#160;High Availability Overview</li></ul>
-
-        <div id="-middle-content">
-          <div class="docbook"><div class="navheader"><table summary="Navigation header" width="100%"><tr><th align="center" colspan="3">10.2.&#160;High Availability Overview</th></tr><tr><td align="left" width="20%"><a accesskey="p" href="Java-Broker-High-Availability.html">Prev</a>&#160;</td><th align="center" width="60%">Chapter&#160;10.&#160;High Availability</th><td align="right" width="20%">&#160;<a accesskey="n" href="Java-Broker-High-Availability-CreatingGroup.html">Next</a></td> [...]
-      When using HA, many instances of the Broker work together to form an high availability group of two or more nodes.</p><p>The remainder of this section now talks about the specifics of how HA is achieved in terms
-      of the <a class="link" href="Java-Broker-Concepts.html" title="Chapter&#160;4.&#160;Concepts">concepts</a> introduced earlier in this
-      book.</p><p>The <a class="link" href="Java-Broker-Concepts-Virtualhosts.html" title="4.5.&#160;Virtualhosts">Virtualhost</a> is the unit of
-      replication. This means that any <span class="emphasis"><em>durable</em></span> queues, exchanges, and bindings
-      belonging to that virtualhost, any <span class="emphasis"><em>persistent</em></span> messages contained within
-      the queues and any attribute settings applied to the virtualhost itself are automatically
-      replicated to all nodes within the group.<a class="footnote" href="#ftn.d0e6198" id="d0e6198"><sup class="footnote">[14]</sup></a></p><p>It is the <a class="link" href="Java-Broker-Concepts-Virtualhost-Nodes.html" title="4.3.&#160;Virtualhost Nodes">Virtualhost Nodes</a>
-      (from different Broker instances) that join together to form a group. The virtualhost nodes
-      collectively to coordinate the group: they organise replication between the master and
-      replicas and conduct elections to determine who becomes the new master in the event of the old
-      failing.</p><p>When a virtualhost node is in the <span class="emphasis"><em>master</em></span> role, the virtualhost
-      beneath it is available for messaging work. Any write operations sent to the virtualhost are
-      automatically replicated to all other nodes in group.</p><p>When a virtualhost node is in the <span class="emphasis"><em>replica</em></span> role, the virtualhost
-      beneath it is always unavailable for message work. Any attempted connections to a virtualhost
-      in this state are automatically turned away, allowing a messaging client to discover where the
-      master currently resides. When in replica role, the node sole responsibility is to consume a
-      replication stream in order that it remains up to date with the master.</p><p>Messaging clients discover the active virtualhost.This can be achieved using a static
-      technique (for instance, a failover url (a feature of a Apache Qpid JMS Client for AMQP 0-9-1/0-10)), or a dynamic one
-      utilising some kind of proxy or virtual IP (VIP).</p><p>The figure that follows illustrates a group formed of three virtualhost nodes from three
-      separate Broker instances. A client is connected to the virtualhost node that is in the master
-      role. The two virtualhost nodes <code class="literal">weather1</code> and <code class="literal">weather3</code>
-      are replicas and are receiving a stream of updates.</p><div class="figure"><a id="Java-Broker-High-Availability-OverviewOfHA-Figure"></a><p class="title"><strong>Figure&#160;10.1.&#160;3-node group deployed across three Brokers.</strong></p><div class="figure-contents"><div class="mediaobject"><img alt="Diagram showing a 3 node group deployed across three Brokers" src="images/HA-Overview.png" /></div></div></div><br class="figure-break" /><p>Currently, the only virtualhost/virtualh [...]
-      this leverages the HA capabilities of the Berkeley DB JE edition. BDB JE is an <a class="link" href="Java-Broker-Miscellaneous-Installing-Oracle-BDB-JE.html" title="E.3.&#160;Installing Oracle BDB JE">optional dependency</a> of
-      the Broker.</p><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title">Note</h3><p>The HA solution from the Apache Qpid Broker for Java is incompatible with the HA solution offered by the CPP
-        Broker. It is not possible to co-locate Broker for Java and CPP Brokers within the same group.</p></div><div class="footnotes"><br /><hr style="width:100; text-align:left;margin-left: 0" /><div class="footnote" id="ftn.d0e6198"><p><a class="para" href="#d0e6198"><sup class="para">[14] </sup></a>Transient messages and messages on non-durable queues are not replicated.</p></div></div></div><div class="navfooter"><hr /><table summary="Navigation footer" width="100%"><tr><td align="l [...]
-
-          <hr/>
-
-          <ul id="-apache-navigation">
-            <li><a href="http://www.apache.org/">Apache</a></li>
-            <li><a href="http://www.apache.org/licenses/">License</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="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
-          </ul>
-
-          <p id="-legal">
-            Apache Qpid, Messaging built on AMQP; Copyright &#169; 2015
-            The Apache Software Foundation; Licensed under
-            the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
-            License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
-            project logo are trademarks of The Apache Software
-            Foundation; All other marks mentioned may be trademarks or
-            registered trademarks of their respective owners
-          </p>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-High-Availability-Reset-Group-Infomational.html b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-High-Availability-Reset-Group-Infomational.html
deleted file mode 100644
index 162003e..0000000
--- a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-High-Availability-Reset-Group-Infomational.html
+++ /dev/null
@@ -1,151 +0,0 @@
-<!DOCTYPE html>
-<!--
- -
- - 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.
- -
--->
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-  <head>
-    <title>10.11.&#160;Reset Group Information - Apache Qpid&#8482;</title>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-    <link rel="stylesheet" href="/site.css" type="text/css" async="async"/>
-    <link rel="stylesheet" href="/deferred.css" type="text/css" defer="defer"/>
-    <script type="text/javascript">var _deferredFunctions = [];</script>
-    <script type="text/javascript" src="/deferred.js" defer="defer"></script>
-    <!--[if lte IE 8]>
-      <link rel="stylesheet" href="/ie.css" type="text/css"/>
-      <script type="text/javascript" src="/html5shiv.js"></script>
-    <![endif]-->
-
-    <!-- Redirects for `go get` and godoc.org -->
-    <meta name="go-import"
-          content="qpid.apache.org git https://gitbox.apache.org/repos/asf/qpid-proton.git"/>
-    <meta name="go-source"
-          content="qpid.apache.org
-https://github.com/apache/qpid-proton/blob/go1/README.md
-https://github.com/apache/qpid-proton/tree/go1{/dir}
-https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
-  </head>
-  <body>
-    <div id="-content">
-      <div id="-top" class="panel">
-        <a id="-menu-link"><img width="16" height="16" src="" alt="Menu"/></a>
-
-        <a id="-search-link"><img width="22" height="16" src="" alt="Search"/></a>
-
-        <ul id="-global-navigation">
-          <li><a id="-logotype" href="/index.html">Apache Qpid<sup>&#8482;</sup></a></li>
-          <li><a href="/documentation.html">Documentation</a></li>
-          <li><a href="/download.html">Download</a></li>
-          <li><a href="/discussion.html">Discussion</a></li>
-        </ul>
-      </div>
-
-      <div id="-menu" class="panel" style="display: none;">
-        <div class="flex">
-          <section>
-            <h3>Project</h3>
-
-            <ul>
-              <li><a href="/overview.html">Overview</a></li>
-              <li><a href="/components/index.html">Components</a></li>
-              <li><a href="/releases/index.html">Releases</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Messaging APIs</h3>
-
-            <ul>
-              <li><a href="/proton/index.html">Qpid Proton</a></li>
-              <li><a href="/components/jms/index.html">Qpid JMS</a></li>
-              <li><a href="/components/messaging-api/index.html">Qpid Messaging API</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Servers and tools</h3>
-
-            <ul>
-              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
-              <li><a href="/components/cpp-broker/index.html">C++ broker</a></li>
-              <li><a href="/components/dispatch-router/index.html">Dispatch router</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Resources</h3>
-
-            <ul>
-              <li><a href="/dashboard.html">Dashboard</a></li>
-              <li><a href="https://cwiki.apache.org/confluence/display/qpid/Index">Wiki</a></li>
-              <li><a href="/resources.html">More resources</a></li>
-            </ul>
-          </section>
-        </div>
-      </div>
-
-      <div id="-search" class="panel" style="display: none;">
-        <form action="http://www.google.com/search" method="get">
-          <input type="hidden" name="sitesearch" value="qpid.apache.org"/>
-          <input type="text" name="q" maxlength="255" autofocus="autofocus" tabindex="1"/>
-          <button type="submit">Search</button>
-          <a href="/search.html">More ways to search</a>
-        </form>
-      </div>
-
-      <div id="-middle" class="panel">
-        <ul id="-path-navigation"><li><a href="/index.html">Home</a></li><li><a href="/releases/index.html">Releases</a></li><li><a href="/releases/qpid-java-trunk/index.html">Qpid for Java Trunk</a></li><li><a href="/releases/qpid-java-trunk/java-broker/book/index.html">Apache Qpid Broker for Java</a></li><li>10.11.&#160;Reset Group Information</li></ul>
-
-        <div id="-middle-content">
-          <div class="docbook"><div class="navheader"><table summary="Navigation header" width="100%"><tr><th align="center" colspan="3">10.11.&#160;Reset Group Information</th></tr><tr><td align="left" width="20%"><a accesskey="p" href="Java-Broker-High-Availability-Backup.html">Prev</a>&#160;</td><th align="center" width="60%">Chapter&#160;10.&#160;High Availability</th><td align="right" width="20%">&#160;<a accesskey="n" href="Java-Broker-Backup-And-Recovery.html">Next</a></td></tr></ [...]
-      circumstances when resetting this information is useful.</p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p>Copying data between environments (e.g. production to UAT)</p></li><li class="listitem"><p>Some disaster recovery situations where a group must be recreated on new
-            hardware</p></li></ul></div><p>This is not an normal operation and is not usually required</p><p>The following command replaces the group table contained within the JE logs files with the
-      provided information. </p><div class="example"><a id="d0e6708"></a><p class="title"><strong>Example&#160;10.1.&#160;Resetting of replication group with <code class="classname">DbResetRepGroup</code></strong></p><div class="example-contents"><div class="cmdsynopsis"><p><code class="command">java</code>   -cp je-5.0.104.jar   com.sleepycat.je.rep.util.DbResetRepGroup   -h <em class="replaceable"><code>path/to/jelogfiles</code></em> <br />  -groupName <em class="replaceable"><code>new [...]
-        <code class="literal">${QPID_WORK}/&lt;nodename&gt;/config</code> directory of a target Broker. Then
-      start the Broker, and add a BDB HA Virtualhost node specify the same group name, node name and
-      node address. You will then have a group with a single node, ready to start re-adding
-      additional nodes as described above. </p></div><div class="navfooter"><hr /><table summary="Navigation footer" width="100%"><tr><td align="left" width="40%"><a accesskey="p" href="Java-Broker-High-Availability-Backup.html">Prev</a>&#160;</td><td align="center" width="20%"><a accesskey="u" href="Java-Broker-High-Availability.html">Up</a></td><td align="right" width="40%">&#160;<a accesskey="n" href="Java-Broker-Backup-And-Recovery.html">Next</a></td></tr><tr><td align="left" valign= [...]
-
-          <hr/>
-
-          <ul id="-apache-navigation">
-            <li><a href="http://www.apache.org/">Apache</a></li>
-            <li><a href="http://www.apache.org/licenses/">License</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="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
-          </ul>
-
-          <p id="-legal">
-            Apache Qpid, Messaging built on AMQP; Copyright &#169; 2015
-            The Apache Software Foundation; Licensed under
-            the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
-            License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
-            project logo are trademarks of The Apache Software
-            Foundation; All other marks mentioned may be trademarks or
-            registered trademarks of their respective owners
-          </p>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-High-Availability-Security.html b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-High-Availability-Security.html
deleted file mode 100644
index bfd8a84..0000000
--- a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-High-Availability-Security.html
+++ /dev/null
@@ -1,146 +0,0 @@
-<!DOCTYPE html>
-<!--
- -
- - 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.
- -
--->
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-  <head>
-    <title>10.9.&#160;Security - Apache Qpid&#8482;</title>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-    <link rel="stylesheet" href="/site.css" type="text/css" async="async"/>
-    <link rel="stylesheet" href="/deferred.css" type="text/css" defer="defer"/>
-    <script type="text/javascript">var _deferredFunctions = [];</script>
-    <script type="text/javascript" src="/deferred.js" defer="defer"></script>
-    <!--[if lte IE 8]>
-      <link rel="stylesheet" href="/ie.css" type="text/css"/>
-      <script type="text/javascript" src="/html5shiv.js"></script>
-    <![endif]-->
-
-    <!-- Redirects for `go get` and godoc.org -->
-    <meta name="go-import"
-          content="qpid.apache.org git https://gitbox.apache.org/repos/asf/qpid-proton.git"/>
-    <meta name="go-source"
-          content="qpid.apache.org
-https://github.com/apache/qpid-proton/blob/go1/README.md
-https://github.com/apache/qpid-proton/tree/go1{/dir}
-https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
-  </head>
-  <body>
-    <div id="-content">
-      <div id="-top" class="panel">
-        <a id="-menu-link"><img width="16" height="16" src="" alt="Menu"/></a>
-
-        <a id="-search-link"><img width="22" height="16" src="" alt="Search"/></a>
-
-        <ul id="-global-navigation">
-          <li><a id="-logotype" href="/index.html">Apache Qpid<sup>&#8482;</sup></a></li>
-          <li><a href="/documentation.html">Documentation</a></li>
-          <li><a href="/download.html">Download</a></li>
-          <li><a href="/discussion.html">Discussion</a></li>
-        </ul>
-      </div>
-
-      <div id="-menu" class="panel" style="display: none;">
-        <div class="flex">
-          <section>
-            <h3>Project</h3>
-
-            <ul>
-              <li><a href="/overview.html">Overview</a></li>
-              <li><a href="/components/index.html">Components</a></li>
-              <li><a href="/releases/index.html">Releases</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Messaging APIs</h3>
-
-            <ul>
-              <li><a href="/proton/index.html">Qpid Proton</a></li>
-              <li><a href="/components/jms/index.html">Qpid JMS</a></li>
-              <li><a href="/components/messaging-api/index.html">Qpid Messaging API</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Servers and tools</h3>
-
-            <ul>
-              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
-              <li><a href="/components/cpp-broker/index.html">C++ broker</a></li>
-              <li><a href="/components/dispatch-router/index.html">Dispatch router</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Resources</h3>
-
-            <ul>
-              <li><a href="/dashboard.html">Dashboard</a></li>
-              <li><a href="https://cwiki.apache.org/confluence/display/qpid/Index">Wiki</a></li>
-              <li><a href="/resources.html">More resources</a></li>
-            </ul>
-          </section>
-        </div>
-      </div>
-
-      <div id="-search" class="panel" style="display: none;">
-        <form action="http://www.google.com/search" method="get">
-          <input type="hidden" name="sitesearch" value="qpid.apache.org"/>
-          <input type="text" name="q" maxlength="255" autofocus="autofocus" tabindex="1"/>
-          <button type="submit">Search</button>
-          <a href="/search.html">More ways to search</a>
-        </form>
-      </div>
-
-      <div id="-middle" class="panel">
-        <ul id="-path-navigation"><li><a href="/index.html">Home</a></li><li><a href="/releases/index.html">Releases</a></li><li><a href="/releases/qpid-java-trunk/index.html">Qpid for Java Trunk</a></li><li><a href="/releases/qpid-java-trunk/java-broker/book/index.html">Apache Qpid Broker for Java</a></li><li>10.9.&#160;Security</li></ul>
-
-        <div id="-middle-content">
-          <div class="docbook"><div class="navheader"><table summary="Navigation header" width="100%"><tr><th align="center" colspan="3">10.9.&#160;Security</th></tr><tr><td align="left" width="20%"><a accesskey="p" href="Java-Broker-High-Availability-Network-Requirements.html">Prev</a>&#160;</td><th align="center" width="60%">Chapter&#160;10.&#160;High Availability</th><td align="right" width="20%">&#160;<a accesskey="n" href="Java-Broker-High-Availability-Backup.html">Next</a></td></tr [...]
-      intercepted by anyone having access to the replication network.</p><p>In order to reduce the security risks the entire HA group is recommended to run in a
-      separate network protected from general access and/or utilise SSH-tunnels/IPsec.</p></div><div class="navfooter"><hr /><table summary="Navigation footer" width="100%"><tr><td align="left" width="40%"><a accesskey="p" href="Java-Broker-High-Availability-Network-Requirements.html">Prev</a>&#160;</td><td align="center" width="20%"><a accesskey="u" href="Java-Broker-High-Availability.html">Up</a></td><td align="right" width="40%">&#160;<a accesskey="n" href="Java-Broker-High-Availabili [...]
-
-          <hr/>
-
-          <ul id="-apache-navigation">
-            <li><a href="http://www.apache.org/">Apache</a></li>
-            <li><a href="http://www.apache.org/licenses/">License</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="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
-          </ul>
-
-          <p id="-legal">
-            Apache Qpid, Messaging built on AMQP; Copyright &#169; 2015
-            The Apache Software Foundation; Licensed under
-            the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
-            License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
-            project logo are trademarks of The Apache Software
-            Foundation; All other marks mentioned may be trademarks or
-            registered trademarks of their respective owners
-          </p>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-High-Availability.html b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-High-Availability.html
deleted file mode 100644
index e7eb6c5..0000000
--- a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-High-Availability.html
+++ /dev/null
@@ -1,153 +0,0 @@
-<!DOCTYPE html>
-<!--
- -
- - 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.
- -
--->
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-  <head>
-    <title>Chapter&#160;10.&#160;High Availability - Apache Qpid&#8482;</title>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-    <link rel="stylesheet" href="/site.css" type="text/css" async="async"/>
-    <link rel="stylesheet" href="/deferred.css" type="text/css" defer="defer"/>
-    <script type="text/javascript">var _deferredFunctions = [];</script>
-    <script type="text/javascript" src="/deferred.js" defer="defer"></script>
-    <!--[if lte IE 8]>
-      <link rel="stylesheet" href="/ie.css" type="text/css"/>
-      <script type="text/javascript" src="/html5shiv.js"></script>
-    <![endif]-->
-
-    <!-- Redirects for `go get` and godoc.org -->
-    <meta name="go-import"
-          content="qpid.apache.org git https://gitbox.apache.org/repos/asf/qpid-proton.git"/>
-    <meta name="go-source"
-          content="qpid.apache.org
-https://github.com/apache/qpid-proton/blob/go1/README.md
-https://github.com/apache/qpid-proton/tree/go1{/dir}
-https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
-  </head>
-  <body>
-    <div id="-content">
-      <div id="-top" class="panel">
-        <a id="-menu-link"><img width="16" height="16" src="" alt="Menu"/></a>
-
-        <a id="-search-link"><img width="22" height="16" src="" alt="Search"/></a>
-
-        <ul id="-global-navigation">
-          <li><a id="-logotype" href="/index.html">Apache Qpid<sup>&#8482;</sup></a></li>
-          <li><a href="/documentation.html">Documentation</a></li>
-          <li><a href="/download.html">Download</a></li>
-          <li><a href="/discussion.html">Discussion</a></li>
-        </ul>
-      </div>
-
-      <div id="-menu" class="panel" style="display: none;">
-        <div class="flex">
-          <section>
-            <h3>Project</h3>
-
-            <ul>
-              <li><a href="/overview.html">Overview</a></li>
-              <li><a href="/components/index.html">Components</a></li>
-              <li><a href="/releases/index.html">Releases</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Messaging APIs</h3>
-
-            <ul>
-              <li><a href="/proton/index.html">Qpid Proton</a></li>
-              <li><a href="/components/jms/index.html">Qpid JMS</a></li>
-              <li><a href="/components/messaging-api/index.html">Qpid Messaging API</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Servers and tools</h3>
-
-            <ul>
-              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
-              <li><a href="/components/cpp-broker/index.html">C++ broker</a></li>
-              <li><a href="/components/dispatch-router/index.html">Dispatch router</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Resources</h3>
-
-            <ul>
-              <li><a href="/dashboard.html">Dashboard</a></li>
-              <li><a href="https://cwiki.apache.org/confluence/display/qpid/Index">Wiki</a></li>
-              <li><a href="/resources.html">More resources</a></li>
-            </ul>
-          </section>
-        </div>
-      </div>
-
-      <div id="-search" class="panel" style="display: none;">
-        <form action="http://www.google.com/search" method="get">
-          <input type="hidden" name="sitesearch" value="qpid.apache.org"/>
-          <input type="text" name="q" maxlength="255" autofocus="autofocus" tabindex="1"/>
-          <button type="submit">Search</button>
-          <a href="/search.html">More ways to search</a>
-        </form>
-      </div>
-
-      <div id="-middle" class="panel">
-        <ul id="-path-navigation"><li><a href="/index.html">Home</a></li><li><a href="/releases/index.html">Releases</a></li><li><a href="/releases/qpid-java-trunk/index.html">Qpid for Java Trunk</a></li><li><a href="/releases/qpid-java-trunk/java-broker/book/index.html">Apache Qpid Broker for Java</a></li><li>Chapter&#160;10.&#160;High Availability</li></ul>
-
-        <div id="-middle-content">
-          <div class="docbook"><div class="navheader"><table summary="Navigation header" width="100%"><tr><th align="center" colspan="3">Chapter&#160;10.&#160;High Availability</th></tr><tr><td align="left" width="20%"><a accesskey="p" href="Java-Broker-Runtime-Memory.html">Prev</a>&#160;</td><th align="center" width="60%">&#160;</th><td align="right" width="20%">&#160;<a accesskey="n" href="Java-Broker-High-Availability-OverviewOfHA.html">Next</a></td></tr></table><hr /></div><div class [...]
-      service such as a Message Broker available so that should a service unexpectedly fail, or
-      requires to be shutdown for maintenance, users may quickly connect to another instance and
-      continue their work with minimal interruption. HA is one way to make a overall system more
-      resilient by eliminating a single point of failure from a system.</p><p>HA offerings are usually categorised as <span class="bold"><strong>Active/Active</strong></span> or
-        <span class="bold"><strong>Active/Passive</strong></span>. An Active/Active system is one where all
-      nodes within the group are usually available for use by clients all of the time. In an
-      Active/Passive system, one only node within the group is available for use by clients at any
-      one time, whilst the others are in some kind of standby state, awaiting to quickly step-in in
-      the event the active node becomes unavailable. </p></div></div><div class="navfooter"><hr /><table summary="Navigation footer" width="100%"><tr><td align="left" width="40%"><a accesskey="p" href="Java-Broker-Runtime-Memory.html">Prev</a>&#160;</td><td align="center" width="20%">&#160;</td><td align="right" width="40%">&#160;<a accesskey="n" href="Java-Broker-High-Availability-OverviewOfHA.html">Next</a></td></tr><tr><td align="left" valign="top" width="40%">9.10.&#160;Memory&#160;< [...]
-
-          <hr/>
-
-          <ul id="-apache-navigation">
-            <li><a href="http://www.apache.org/">Apache</a></li>
-            <li><a href="http://www.apache.org/licenses/">License</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="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
-          </ul>
-
-          <p id="-legal">
-            Apache Qpid, Messaging built on AMQP; Copyright &#169; 2015
-            The Apache Software Foundation; Licensed under
-            the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
-            License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
-            project logo are trademarks of The Apache Software
-            Foundation; All other marks mentioned may be trademarks or
-            registered trademarks of their respective owners
-          </p>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Initial-Configuration-Configuration-Properties.html b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Initial-Configuration-Configuration-Properties.html
deleted file mode 100644
index 40725d5..0000000
--- a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Initial-Configuration-Configuration-Properties.html
+++ /dev/null
@@ -1,167 +0,0 @@
-<!DOCTYPE html>
-<!--
- -
- - 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.
- -
--->
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-  <head>
-    <title>5.7.&#160;Customising Configuration using Configuration Properties - Apache Qpid&#8482;</title>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-    <link rel="stylesheet" href="/site.css" type="text/css" async="async"/>
-    <link rel="stylesheet" href="/deferred.css" type="text/css" defer="defer"/>
-    <script type="text/javascript">var _deferredFunctions = [];</script>
-    <script type="text/javascript" src="/deferred.js" defer="defer"></script>
-    <!--[if lte IE 8]>
-      <link rel="stylesheet" href="/ie.css" type="text/css"/>
-      <script type="text/javascript" src="/html5shiv.js"></script>
-    <![endif]-->
-
-    <!-- Redirects for `go get` and godoc.org -->
-    <meta name="go-import"
-          content="qpid.apache.org git https://gitbox.apache.org/repos/asf/qpid-proton.git"/>
-    <meta name="go-source"
-          content="qpid.apache.org
-https://github.com/apache/qpid-proton/blob/go1/README.md
-https://github.com/apache/qpid-proton/tree/go1{/dir}
-https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
-  </head>
-  <body>
-    <div id="-content">
-      <div id="-top" class="panel">
-        <a id="-menu-link"><img width="16" height="16" src="" alt="Menu"/></a>
-
-        <a id="-search-link"><img width="22" height="16" src="" alt="Search"/></a>
-
-        <ul id="-global-navigation">
-          <li><a id="-logotype" href="/index.html">Apache Qpid<sup>&#8482;</sup></a></li>
-          <li><a href="/documentation.html">Documentation</a></li>
-          <li><a href="/download.html">Download</a></li>
-          <li><a href="/discussion.html">Discussion</a></li>
-        </ul>
-      </div>
-
-      <div id="-menu" class="panel" style="display: none;">
-        <div class="flex">
-          <section>
-            <h3>Project</h3>
-
-            <ul>
-              <li><a href="/overview.html">Overview</a></li>
-              <li><a href="/components/index.html">Components</a></li>
-              <li><a href="/releases/index.html">Releases</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Messaging APIs</h3>
-
-            <ul>
-              <li><a href="/proton/index.html">Qpid Proton</a></li>
-              <li><a href="/components/jms/index.html">Qpid JMS</a></li>
-              <li><a href="/components/messaging-api/index.html">Qpid Messaging API</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Servers and tools</h3>
-
-            <ul>
-              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
-              <li><a href="/components/cpp-broker/index.html">C++ broker</a></li>
-              <li><a href="/components/dispatch-router/index.html">Dispatch router</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Resources</h3>
-
-            <ul>
-              <li><a href="/dashboard.html">Dashboard</a></li>
-              <li><a href="https://cwiki.apache.org/confluence/display/qpid/Index">Wiki</a></li>
-              <li><a href="/resources.html">More resources</a></li>
-            </ul>
-          </section>
-        </div>
-      </div>
-
-      <div id="-search" class="panel" style="display: none;">
-        <form action="http://www.google.com/search" method="get">
-          <input type="hidden" name="sitesearch" value="qpid.apache.org"/>
-          <input type="text" name="q" maxlength="255" autofocus="autofocus" tabindex="1"/>
-          <button type="submit">Search</button>
-          <a href="/search.html">More ways to search</a>
-        </form>
-      </div>
-
-      <div id="-middle" class="panel">
-        <ul id="-path-navigation"><li><a href="/index.html">Home</a></li><li><a href="/releases/index.html">Releases</a></li><li><a href="/releases/qpid-java-trunk/index.html">Qpid for Java Trunk</a></li><li><a href="/releases/qpid-java-trunk/java-broker/book/index.html">Apache Qpid Broker for Java</a></li><li>5.7.&#160;Customising Configuration using Configuration Properties</li></ul>
-
-        <div id="-middle-content">
-          <div class="docbook"><div class="navheader"><table summary="Navigation header" width="100%"><tr><th align="center" colspan="3">5.7.&#160;Customising Configuration using Configuration Properties</th></tr><tr><td align="left" width="20%"><a accesskey="p" href="Java-Broker-Initial-Configuration-Type.html">Prev</a>&#160;</td><th align="center" width="60%">Chapter&#160;5.&#160;Initial Configuration</th><td align="right" width="20%">&#160;<a accesskey="n" href="Java-Broker-Initial-Co [...]
-            ${properties} that can be resolved to String values at startup, allowing a degree of
-            customisation using a fixed file. Configuration Property values can be set either via
-            Java System Properties, or by specifying ConfigurationProperties on the broker command
-            line. If both are defined, System Property values take precedence. </p><p> The broker has the following set of core configuration properties, with the indicated
-            default values if not otherwise configured by the user: </p><div class="table"><a id="d0e1625"></a><p class="title"><strong>Table&#160;5.1.&#160;Base Configuration Properties</strong></p><div class="table-contents"><table border="1" summary="Base Configuration Properties"><colgroup><col /><col /><col /></colgroup><thead><tr><th> Name </th><th> Description </th><th> Value </th></tr></thead><tbody><tr><td> qpid.amqp_port </td><td> Port number used for the brokers default AMQP m [...]
-                                the 'lib' directory and the 'etc' directory often used to store
-                                files such as group and ACL files. </td><td> Defaults to the value set into the QPID_HOME system property if
-                                it is set, or remains unset otherwise unless configured by the user.
-                            </td></tr><tr><td> qpid.work_dir </td><td> Location of the broker working directory, which might contain
-                                the persistent message store and broker configuration store files. </td><td> Defaults to the value set into the QPID_WORK system property if
-                                it is set, or the 'work' subdirectory of the JVMs current working
-                                directory. </td></tr></tbody></table></div></div><p><br class="table-break" />
-        </p><p> Use of these core properties can be seen in the <a class="link" href="Java-Broker-Initial-Configuration-Example.html" title="5.8.&#160;Example of JSON 'Initial Configuration'">default 'Initial Configuration' example</a>. </p><p> Configuration Properties can be set on the command line using the
-                <span class="emphasis"><em>-prop</em></span> (or <span class="emphasis"><em>--configuration-property</em></span>)
-            command line argument: </p><pre class="screen">
-$ ./qpid-server -prop "qpid.amqp_port=10000" -prop "qpid.http_port=10001"
-        </pre><p> In the example above, property used to set the port number of the default AMQP port
-            is specified with the value 10000, overriding the default value of 5672, and similarly
-            the value 10001 is used to override the default HTTP port number of 8080. When using the
-            'Initial Configuration' to initialise a new Configuration Store (either at first broker
-            startup, when requesting to <a class="link" href="Java-Broker-Initial-Configuration-Location.html" title="5.2.&#160;Configuration Store Location">overwrite the configuration store</a>) these new values will be used for the
-            port numbers instead. </p><p> NOTE: When running the broker on Windows and starting it via the qpid-server.bat
-            file, the "name=value" argument MUST be quoted. </p></div><div class="navfooter"><hr /><table summary="Navigation footer" width="100%"><tr><td align="left" width="40%"><a accesskey="p" href="Java-Broker-Initial-Configuration-Type.html">Prev</a>&#160;</td><td align="center" width="20%"><a accesskey="u" href="Java-Broker-Initial-Configuration.html">Up</a></td><td align="right" width="40%">&#160;<a accesskey="n" href="Java-Broker-Initial-Configuration-Example.html">Next</a></td> [...]
-
-          <hr/>
-
-          <ul id="-apache-navigation">
-            <li><a href="http://www.apache.org/">Apache</a></li>
-            <li><a href="http://www.apache.org/licenses/">License</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="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
-          </ul>
-
-          <p id="-legal">
-            Apache Qpid, Messaging built on AMQP; Copyright &#169; 2015
-            The Apache Software Foundation; Licensed under
-            the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
-            License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
-            project logo are trademarks of The Apache Software
-            Foundation; All other marks mentioned may be trademarks or
-            registered trademarks of their respective owners
-          </p>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Initial-Configuration-Create-Initial-Config.html b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Initial-Configuration-Create-Initial-Config.html
deleted file mode 100644
index adb2cf4..0000000
--- a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Initial-Configuration-Create-Initial-Config.html
+++ /dev/null
@@ -1,159 +0,0 @@
-<!DOCTYPE html>
-<!--
- -
- - 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.
- -
--->
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-  <head>
-    <title>5.4.&#160;Creating an 'Initial Configuration' JSON File - Apache Qpid&#8482;</title>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-    <link rel="stylesheet" href="/site.css" type="text/css" async="async"/>
-    <link rel="stylesheet" href="/deferred.css" type="text/css" defer="defer"/>
-    <script type="text/javascript">var _deferredFunctions = [];</script>
-    <script type="text/javascript" src="/deferred.js" defer="defer"></script>
-    <!--[if lte IE 8]>
-      <link rel="stylesheet" href="/ie.css" type="text/css"/>
-      <script type="text/javascript" src="/html5shiv.js"></script>
-    <![endif]-->
-
-    <!-- Redirects for `go get` and godoc.org -->
-    <meta name="go-import"
-          content="qpid.apache.org git https://gitbox.apache.org/repos/asf/qpid-proton.git"/>
-    <meta name="go-source"
-          content="qpid.apache.org
-https://github.com/apache/qpid-proton/blob/go1/README.md
-https://github.com/apache/qpid-proton/tree/go1{/dir}
-https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
-  </head>
-  <body>
-    <div id="-content">
-      <div id="-top" class="panel">
-        <a id="-menu-link"><img width="16" height="16" src="" alt="Menu"/></a>
-
-        <a id="-search-link"><img width="22" height="16" src="" alt="Search"/></a>
-
-        <ul id="-global-navigation">
-          <li><a id="-logotype" href="/index.html">Apache Qpid<sup>&#8482;</sup></a></li>
-          <li><a href="/documentation.html">Documentation</a></li>
-          <li><a href="/download.html">Download</a></li>
-          <li><a href="/discussion.html">Discussion</a></li>
-        </ul>
-      </div>
-
-      <div id="-menu" class="panel" style="display: none;">
-        <div class="flex">
-          <section>
-            <h3>Project</h3>
-
-            <ul>
-              <li><a href="/overview.html">Overview</a></li>
-              <li><a href="/components/index.html">Components</a></li>
-              <li><a href="/releases/index.html">Releases</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Messaging APIs</h3>
-
-            <ul>
-              <li><a href="/proton/index.html">Qpid Proton</a></li>
-              <li><a href="/components/jms/index.html">Qpid JMS</a></li>
-              <li><a href="/components/messaging-api/index.html">Qpid Messaging API</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Servers and tools</h3>
-
-            <ul>
-              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
-              <li><a href="/components/cpp-broker/index.html">C++ broker</a></li>
-              <li><a href="/components/dispatch-router/index.html">Dispatch router</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Resources</h3>
-
-            <ul>
-              <li><a href="/dashboard.html">Dashboard</a></li>
-              <li><a href="https://cwiki.apache.org/confluence/display/qpid/Index">Wiki</a></li>
-              <li><a href="/resources.html">More resources</a></li>
-            </ul>
-          </section>
-        </div>
-      </div>
-
-      <div id="-search" class="panel" style="display: none;">
-        <form action="http://www.google.com/search" method="get">
-          <input type="hidden" name="sitesearch" value="qpid.apache.org"/>
-          <input type="text" name="q" maxlength="255" autofocus="autofocus" tabindex="1"/>
-          <button type="submit">Search</button>
-          <a href="/search.html">More ways to search</a>
-        </form>
-      </div>
-
-      <div id="-middle" class="panel">
-        <ul id="-path-navigation"><li><a href="/index.html">Home</a></li><li><a href="/releases/index.html">Releases</a></li><li><a href="/releases/qpid-java-trunk/index.html">Qpid for Java Trunk</a></li><li><a href="/releases/qpid-java-trunk/java-broker/book/index.html">Apache Qpid Broker for Java</a></li><li>5.4.&#160;Creating an 'Initial Configuration' JSON File</li></ul>
-
-        <div id="-middle-content">
-          <div class="docbook"><div class="navheader"><table summary="Navigation header" width="100%"><tr><th align="center" colspan="3">5.4.&#160;Creating an 'Initial Configuration' JSON File</th></tr><tr><td align="left" width="20%"><a accesskey="p" href="Java-Broker-Initial-Configuration-Initial-Config-Location.html">Prev</a>&#160;</td><th align="center" width="60%">Chapter&#160;5.&#160;Initial Configuration</th><td align="right" width="20%">&#160;<a accesskey="n" href="Java-Broker-In [...]
-            file to disk using the command line argument <span class="emphasis"><em>-cic</em></span> (or
-                <span class="emphasis"><em>--create-initial-config</em></span>). If the option is used without
-            providing a path, a file called <span class="emphasis"><em>initial-config.json</em></span> will be created
-            in the current directory, or alternatively the file can be created at a specified
-            location: </p><pre class="screen">
-$ ./qpid-server -cic ./initial-config.json
-        </pre><p> The 'Initial Configuration' JSON file shares a common format with the brokers JSON
-            Configuration Store implementation, so it is possible to use a Broker's Configuration
-            Store output as an initial configuration. Typically 'Initial Configuration' files would
-            not to contain IDs for the configured entities, so that IDs will be generated when the
-            configuration store is initialised and prevent use of the same IDs across multiple
-            brokers, however it may prove useful to include IDs if using the Memory <a class="link" href="Java-Broker-Initial-Configuration-Type.html" title="5.6.&#160;Configuration Store Type">Configuration Store Type</a>. </p><p> It can be useful to use <a class="link" href="Java-Broker-Initial-Configuration-Configuration-Properties.html" title="5.7.&#160;Customising Configuration using Configuration Properties">Configuration
-                Properties</a> within 'Initial Configuration' files to allow a degree of
-            customisation with an otherwise fixed file. </p><p> For an example file, see <a class="xref" href="Java-Broker-Initial-Configuration-Example.html" title="5.8.&#160;Example of JSON 'Initial Configuration'">Section&#160;5.8, &#8220;Example of JSON 'Initial Configuration'&#8221;</a>
-        </p></div><div class="navfooter"><hr /><table summary="Navigation footer" width="100%"><tr><td align="left" width="40%"><a accesskey="p" href="Java-Broker-Initial-Configuration-Initial-Config-Location.html">Prev</a>&#160;</td><td align="center" width="20%"><a accesskey="u" href="Java-Broker-Initial-Configuration.html">Up</a></td><td align="right" width="40%">&#160;<a accesskey="n" href="Java-Broker-Initial-Configuration-Overwrite-Config-Store.html">Next</a></td></tr><tr><td align [...]
-
-          <hr/>
-
-          <ul id="-apache-navigation">
-            <li><a href="http://www.apache.org/">Apache</a></li>
-            <li><a href="http://www.apache.org/licenses/">License</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="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
-          </ul>
-
-          <p id="-legal">
-            Apache Qpid, Messaging built on AMQP; Copyright &#169; 2015
-            The Apache Software Foundation; Licensed under
-            the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
-            License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
-            project logo are trademarks of The Apache Software
-            Foundation; All other marks mentioned may be trademarks or
-            registered trademarks of their respective owners
-          </p>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Initial-Configuration-Example.html b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Initial-Configuration-Example.html
deleted file mode 100644
index 09fb383..0000000
--- a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Initial-Configuration-Example.html
+++ /dev/null
@@ -1,233 +0,0 @@
-<!DOCTYPE html>
-<!--
- -
- - 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.
- -
--->
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-  <head>
-    <title>5.8.&#160;Example of JSON 'Initial Configuration' - Apache Qpid&#8482;</title>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-    <link rel="stylesheet" href="/site.css" type="text/css" async="async"/>
-    <link rel="stylesheet" href="/deferred.css" type="text/css" defer="defer"/>
-    <script type="text/javascript">var _deferredFunctions = [];</script>
-    <script type="text/javascript" src="/deferred.js" defer="defer"></script>
-    <!--[if lte IE 8]>
-      <link rel="stylesheet" href="/ie.css" type="text/css"/>
-      <script type="text/javascript" src="/html5shiv.js"></script>
-    <![endif]-->
-
-    <!-- Redirects for `go get` and godoc.org -->
-    <meta name="go-import"
-          content="qpid.apache.org git https://gitbox.apache.org/repos/asf/qpid-proton.git"/>
-    <meta name="go-source"
-          content="qpid.apache.org
-https://github.com/apache/qpid-proton/blob/go1/README.md
-https://github.com/apache/qpid-proton/tree/go1{/dir}
-https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
-  </head>
-  <body>
-    <div id="-content">
-      <div id="-top" class="panel">
-        <a id="-menu-link"><img width="16" height="16" src="" alt="Menu"/></a>
-
-        <a id="-search-link"><img width="22" height="16" src="" alt="Search"/></a>
-
-        <ul id="-global-navigation">
-          <li><a id="-logotype" href="/index.html">Apache Qpid<sup>&#8482;</sup></a></li>
-          <li><a href="/documentation.html">Documentation</a></li>
-          <li><a href="/download.html">Download</a></li>
-          <li><a href="/discussion.html">Discussion</a></li>
-        </ul>
-      </div>
-
-      <div id="-menu" class="panel" style="display: none;">
-        <div class="flex">
-          <section>
-            <h3>Project</h3>
-
-            <ul>
-              <li><a href="/overview.html">Overview</a></li>
-              <li><a href="/components/index.html">Components</a></li>
-              <li><a href="/releases/index.html">Releases</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Messaging APIs</h3>
-
-            <ul>
-              <li><a href="/proton/index.html">Qpid Proton</a></li>
-              <li><a href="/components/jms/index.html">Qpid JMS</a></li>
-              <li><a href="/components/messaging-api/index.html">Qpid Messaging API</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Servers and tools</h3>
-
-            <ul>
-              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
-              <li><a href="/components/cpp-broker/index.html">C++ broker</a></li>
-              <li><a href="/components/dispatch-router/index.html">Dispatch router</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Resources</h3>
-
-            <ul>
-              <li><a href="/dashboard.html">Dashboard</a></li>
-              <li><a href="https://cwiki.apache.org/confluence/display/qpid/Index">Wiki</a></li>
-              <li><a href="/resources.html">More resources</a></li>
-            </ul>
-          </section>
-        </div>
-      </div>
-
-      <div id="-search" class="panel" style="display: none;">
-        <form action="http://www.google.com/search" method="get">
-          <input type="hidden" name="sitesearch" value="qpid.apache.org"/>
-          <input type="text" name="q" maxlength="255" autofocus="autofocus" tabindex="1"/>
-          <button type="submit">Search</button>
-          <a href="/search.html">More ways to search</a>
-        </form>
-      </div>
-
-      <div id="-middle" class="panel">
-        <ul id="-path-navigation"><li><a href="/index.html">Home</a></li><li><a href="/releases/index.html">Releases</a></li><li><a href="/releases/qpid-java-trunk/index.html">Qpid for Java Trunk</a></li><li><a href="/releases/qpid-java-trunk/java-broker/book/index.html">Apache Qpid Broker for Java</a></li><li>5.8.&#160;Example of JSON 'Initial Configuration'</li></ul>
-
-        <div id="-middle-content">
-          <div class="docbook"><div class="navheader"><table summary="Navigation header" width="100%"><tr><th align="center" colspan="3">5.8.&#160;Example of JSON 'Initial Configuration'</th></tr><tr><td align="left" width="20%"><a accesskey="p" href="Java-Broker-Initial-Configuration-Configuration-Properties.html">Prev</a>&#160;</td><th align="center" width="60%">Chapter&#160;5.&#160;Initial Configuration</th><td align="right" width="20%">&#160;<a accesskey="n" href="Java-Broker-Managem [...]
-            provided below:</p><div class="example"><a id="d0e1694"></a><p class="title"><strong>Example&#160;5.1.&#160;JSON 'Initial configuration' File</strong></p><div class="example-contents"><pre class="programlisting">
-{
-  "name": "${broker.name}",
-  "modelVersion": "6.1",
-  "authenticationproviders" : [ {
-    "name" : "passwordFile",
-    "type" : "PlainPasswordFile",
-    "path" : "${qpid.home_dir}${file.separator}etc${file.separator}passwd"
-  } ],
-    "brokerloggers" : [ {
-    "name" : "logfile",
-    "type" : "File",
-    "fileName" : "${qpid.work_dir}${file.separator}log${file.separator}qpid.log",
-    "brokerloginclusionrules" : [ {
-      "name" : "Root",
-      "type" : "NameAndLevel",
-      "level" : "WARN",
-      "loggerName" : "ROOT"
-    }, {
-      "name" : "Qpid",
-      "type" : "NameAndLevel",
-      "level" : "INFO",
-      "loggerName" : "org.apache.qpid.*"
-    }, {
-      "name" : "Operational",
-      "type" : "NameAndLevel",
-      "level" : "INFO",
-      "loggerName" : "qpid.message.*"
-    } ]
-  }, {
-    "name" : "memory",
-    "type" : "Memory",
-    "brokerloginclusionrules" : [ {
-      "name" : "Root",
-      "type" : "NameAndLevel",
-      "level" : "WARN",
-      "loggerName" : "ROOT"
-    }, {
-      "name" : "Qpid",
-      "type" : "NameAndLevel",
-      "level" : "INFO",
-      "loggerName" : "org.apache.qpid.*"
-    }, {
-      "name" : "Operational",
-      "type" : "NameAndLevel",
-      "level" : "INFO",
-      "loggerName" : "qpid.message.*"
-    } ]
-  } ],
-  "ports" : [  {
-    "name" : "AMQP",
-    "port" : "${qpid.amqp_port}",
-    "authenticationProvider" : "passwordFile",
-    "virtualhostaliases" : [ {
-       "name" : "nameAlias",
-       "type" : "nameAlias"
-    }, {
-        "name" : "defaultAlias",
-        "type" : "defaultAlias"
-    }, {
-        "name" : "hostnameAlias",
-        "type" : "hostnameAlias"
-    } ]
-  }, {
-    "name" : "HTTP",
-    "port" : "${qpid.http_port}",
-    "authenticationProvider" : "passwordFile",
-    "protocols" : [ "HTTP" ]
-  }],
-  "virtualhostnodes" : [ {
-    "name" : "default",
-    "type" : "JSON",
-    "defaultVirtualHostNode" : "true",
-    "virtualHostInitialConfiguration" : "\\${qpid.initial_config_virtualhost_config}"
-  } ],
-  "plugins" : [ {
-    "type" : "MANAGEMENT-HTTP",
-    "name" : "httpManagement"
-  } ]
-}
-</pre><p>In the configuration above the following entries are stored: </p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p> Authentication Provider of type
-                                <span class="emphasis"><em>PlainPasswordFile</em></span> with name "passwordFile".
-                        </p></li><li class="listitem"><p> Two Port entries: "AMQP", "HTTP"
-                        </p></li><li class="listitem"><p> Virtualhost Node called default. On initial startup, it
-                            virtualHostInitialConfiguration will cause a virtualhost to be created
-                            with the same name. The configuration will be stored in a
-                                <span class="emphasis"><em>JSON</em></span> configuration store, the message data will
-                            be stored in a <span class="emphasis"><em>DERBY</em></span> message store.</p></li><li class="listitem"><p>One management plugin: "httpManagement" of type "MANAGEMENT-HTTP".</p></li><li class="listitem"><p>Broker attributes are stored as a root entry.</p></li></ul></div><p>
-            </p></div></div><br class="example-break" /></div><div class="navfooter"><hr /><table summary="Navigation footer" width="100%"><tr><td align="left" width="40%"><a accesskey="p" href="Java-Broker-Initial-Configuration-Configuration-Properties.html">Prev</a>&#160;</td><td align="center" width="20%"><a accesskey="u" href="Java-Broker-Initial-Configuration.html">Up</a></td><td align="right" width="40%">&#160;<a accesskey="n" href="Java-Broker-Management-Channel.html">Next</a></td [...]
-
-          <hr/>
-
-          <ul id="-apache-navigation">
-            <li><a href="http://www.apache.org/">Apache</a></li>
-            <li><a href="http://www.apache.org/licenses/">License</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="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
-          </ul>
-
-          <p id="-legal">
-            Apache Qpid, Messaging built on AMQP; Copyright &#169; 2015
-            The Apache Software Foundation; Licensed under
-            the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
-            License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
-            project logo are trademarks of The Apache Software
-            Foundation; All other marks mentioned may be trademarks or
-            registered trademarks of their respective owners
-          </p>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Initial-Configuration-Initial-Config-Location.html b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Initial-Configuration-Initial-Config-Location.html
deleted file mode 100644
index 11fd62b..0000000
--- a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Initial-Configuration-Initial-Config-Location.html
+++ /dev/null
@@ -1,154 +0,0 @@
-<!DOCTYPE html>
-<!--
- -
- - 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.
- -
--->
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-  <head>
-    <title>5.3.&#160;'Initial Configuration' Location - Apache Qpid&#8482;</title>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-    <link rel="stylesheet" href="/site.css" type="text/css" async="async"/>
-    <link rel="stylesheet" href="/deferred.css" type="text/css" defer="defer"/>
-    <script type="text/javascript">var _deferredFunctions = [];</script>
-    <script type="text/javascript" src="/deferred.js" defer="defer"></script>
-    <!--[if lte IE 8]>
-      <link rel="stylesheet" href="/ie.css" type="text/css"/>
-      <script type="text/javascript" src="/html5shiv.js"></script>
-    <![endif]-->
-
-    <!-- Redirects for `go get` and godoc.org -->
-    <meta name="go-import"
-          content="qpid.apache.org git https://gitbox.apache.org/repos/asf/qpid-proton.git"/>
-    <meta name="go-source"
-          content="qpid.apache.org
-https://github.com/apache/qpid-proton/blob/go1/README.md
-https://github.com/apache/qpid-proton/tree/go1{/dir}
-https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
-  </head>
-  <body>
-    <div id="-content">
-      <div id="-top" class="panel">
-        <a id="-menu-link"><img width="16" height="16" src="" alt="Menu"/></a>
-
-        <a id="-search-link"><img width="22" height="16" src="" alt="Search"/></a>
-
-        <ul id="-global-navigation">
-          <li><a id="-logotype" href="/index.html">Apache Qpid<sup>&#8482;</sup></a></li>
-          <li><a href="/documentation.html">Documentation</a></li>
-          <li><a href="/download.html">Download</a></li>
-          <li><a href="/discussion.html">Discussion</a></li>
-        </ul>
-      </div>
-
-      <div id="-menu" class="panel" style="display: none;">
-        <div class="flex">
-          <section>
-            <h3>Project</h3>
-
-            <ul>
-              <li><a href="/overview.html">Overview</a></li>
-              <li><a href="/components/index.html">Components</a></li>
-              <li><a href="/releases/index.html">Releases</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Messaging APIs</h3>
-
-            <ul>
-              <li><a href="/proton/index.html">Qpid Proton</a></li>
-              <li><a href="/components/jms/index.html">Qpid JMS</a></li>
-              <li><a href="/components/messaging-api/index.html">Qpid Messaging API</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Servers and tools</h3>
-
-            <ul>
-              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
-              <li><a href="/components/cpp-broker/index.html">C++ broker</a></li>
-              <li><a href="/components/dispatch-router/index.html">Dispatch router</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Resources</h3>
-
-            <ul>
-              <li><a href="/dashboard.html">Dashboard</a></li>
-              <li><a href="https://cwiki.apache.org/confluence/display/qpid/Index">Wiki</a></li>
-              <li><a href="/resources.html">More resources</a></li>
-            </ul>
-          </section>
-        </div>
-      </div>
-
-      <div id="-search" class="panel" style="display: none;">
-        <form action="http://www.google.com/search" method="get">
-          <input type="hidden" name="sitesearch" value="qpid.apache.org"/>
-          <input type="text" name="q" maxlength="255" autofocus="autofocus" tabindex="1"/>
-          <button type="submit">Search</button>
-          <a href="/search.html">More ways to search</a>
-        </form>
-      </div>
-
-      <div id="-middle" class="panel">
-        <ul id="-path-navigation"><li><a href="/index.html">Home</a></li><li><a href="/releases/index.html">Releases</a></li><li><a href="/releases/qpid-java-trunk/index.html">Qpid for Java Trunk</a></li><li><a href="/releases/qpid-java-trunk/java-broker/book/index.html">Apache Qpid Broker for Java</a></li><li>5.3.&#160;'Initial Configuration' Location</li></ul>
-
-        <div id="-middle-content">
-          <div class="docbook"><div class="navheader"><table summary="Navigation header" width="100%"><tr><th align="center" colspan="3">5.3.&#160;'Initial Configuration' Location</th></tr><tr><td align="left" width="20%"><a accesskey="p" href="Java-Broker-Initial-Configuration-Location.html">Prev</a>&#160;</td><th align="center" width="60%">Chapter&#160;5.&#160;Initial Configuration</th><td align="right" width="20%">&#160;<a accesskey="n" href="Java-Broker-Initial-Configuration-Create-I [...]
-            configuration stores. The broker will default to using an internal file within its jar
-            unless otherwise instructed. </p><p> The command line argument <span class="emphasis"><em>-icp </em></span> (or
-                <span class="emphasis"><em>--initial-config-path</em></span>) can be used to override the brokers
-            internal file and supply a <a class="link" href="Java-Broker-Initial-Configuration-Create-Initial-Config.html" title="5.4.&#160;Creating an 'Initial Configuration' JSON File">user-created
-                one</a>:</p><pre class="screen">
-$ ./qpid-server -icp ./my-initial-configuration.json
-        </pre><p> If a Configuration Store already exists at the current <a class="link" href="Java-Broker-Initial-Configuration-Location.html" title="5.2.&#160;Configuration Store Location">store location</a> then the
-            current 'Initial Configuration' will be ignored unless otherwise requested to <a class="link" href="Java-Broker-Initial-Configuration-Location.html" title="5.2.&#160;Configuration Store Location">overwrite the configuration
-                store</a>
-        </p></div><div class="navfooter"><hr /><table summary="Navigation footer" width="100%"><tr><td align="left" width="40%"><a accesskey="p" href="Java-Broker-Initial-Configuration-Location.html">Prev</a>&#160;</td><td align="center" width="20%"><a accesskey="u" href="Java-Broker-Initial-Configuration.html">Up</a></td><td align="right" width="40%">&#160;<a accesskey="n" href="Java-Broker-Initial-Configuration-Create-Initial-Config.html">Next</a></td></tr><tr><td align="left" valign=" [...]
-
-          <hr/>
-
-          <ul id="-apache-navigation">
-            <li><a href="http://www.apache.org/">Apache</a></li>
-            <li><a href="http://www.apache.org/licenses/">License</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="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
-          </ul>
-
-          <p id="-legal">
-            Apache Qpid, Messaging built on AMQP; Copyright &#169; 2015
-            The Apache Software Foundation; Licensed under
-            the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
-            License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
-            project logo are trademarks of The Apache Software
-            Foundation; All other marks mentioned may be trademarks or
-            registered trademarks of their respective owners
-          </p>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Initial-Configuration-Location.html b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Initial-Configuration-Location.html
deleted file mode 100644
index b5bca9b..0000000
--- a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Initial-Configuration-Location.html
+++ /dev/null
@@ -1,151 +0,0 @@
-<!DOCTYPE html>
-<!--
- -
- - 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.
- -
--->
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-  <head>
-    <title>5.2.&#160;Configuration Store Location - Apache Qpid&#8482;</title>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-    <link rel="stylesheet" href="/site.css" type="text/css" async="async"/>
-    <link rel="stylesheet" href="/deferred.css" type="text/css" defer="defer"/>
-    <script type="text/javascript">var _deferredFunctions = [];</script>
-    <script type="text/javascript" src="/deferred.js" defer="defer"></script>
-    <!--[if lte IE 8]>
-      <link rel="stylesheet" href="/ie.css" type="text/css"/>
-      <script type="text/javascript" src="/html5shiv.js"></script>
-    <![endif]-->
-
-    <!-- Redirects for `go get` and godoc.org -->
-    <meta name="go-import"
-          content="qpid.apache.org git https://gitbox.apache.org/repos/asf/qpid-proton.git"/>
-    <meta name="go-source"
-          content="qpid.apache.org
-https://github.com/apache/qpid-proton/blob/go1/README.md
-https://github.com/apache/qpid-proton/tree/go1{/dir}
-https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
-  </head>
-  <body>
-    <div id="-content">
-      <div id="-top" class="panel">
-        <a id="-menu-link"><img width="16" height="16" src="" alt="Menu"/></a>
-
-        <a id="-search-link"><img width="22" height="16" src="" alt="Search"/></a>
-
-        <ul id="-global-navigation">
-          <li><a id="-logotype" href="/index.html">Apache Qpid<sup>&#8482;</sup></a></li>
-          <li><a href="/documentation.html">Documentation</a></li>
-          <li><a href="/download.html">Download</a></li>
-          <li><a href="/discussion.html">Discussion</a></li>
-        </ul>
-      </div>
-
-      <div id="-menu" class="panel" style="display: none;">
-        <div class="flex">
-          <section>
-            <h3>Project</h3>
-
-            <ul>
-              <li><a href="/overview.html">Overview</a></li>
-              <li><a href="/components/index.html">Components</a></li>
-              <li><a href="/releases/index.html">Releases</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Messaging APIs</h3>
-
-            <ul>
-              <li><a href="/proton/index.html">Qpid Proton</a></li>
-              <li><a href="/components/jms/index.html">Qpid JMS</a></li>
-              <li><a href="/components/messaging-api/index.html">Qpid Messaging API</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Servers and tools</h3>
-
-            <ul>
-              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
-              <li><a href="/components/cpp-broker/index.html">C++ broker</a></li>
-              <li><a href="/components/dispatch-router/index.html">Dispatch router</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Resources</h3>
-
-            <ul>
-              <li><a href="/dashboard.html">Dashboard</a></li>
-              <li><a href="https://cwiki.apache.org/confluence/display/qpid/Index">Wiki</a></li>
-              <li><a href="/resources.html">More resources</a></li>
-            </ul>
-          </section>
-        </div>
-      </div>
-
-      <div id="-search" class="panel" style="display: none;">
-        <form action="http://www.google.com/search" method="get">
-          <input type="hidden" name="sitesearch" value="qpid.apache.org"/>
-          <input type="text" name="q" maxlength="255" autofocus="autofocus" tabindex="1"/>
-          <button type="submit">Search</button>
-          <a href="/search.html">More ways to search</a>
-        </form>
-      </div>
-
-      <div id="-middle" class="panel">
-        <ul id="-path-navigation"><li><a href="/index.html">Home</a></li><li><a href="/releases/index.html">Releases</a></li><li><a href="/releases/qpid-java-trunk/index.html">Qpid for Java Trunk</a></li><li><a href="/releases/qpid-java-trunk/java-broker/book/index.html">Apache Qpid Broker for Java</a></li><li>5.2.&#160;Configuration Store Location</li></ul>
-
-        <div id="-middle-content">
-          <div class="docbook"><div class="navheader"><table summary="Navigation header" width="100%"><tr><th align="center" colspan="3">5.2.&#160;Configuration Store Location</th></tr><tr><td align="left" width="20%"><a accesskey="p" href="Java-Broker-Initial-Configuration.html">Prev</a>&#160;</td><th align="center" width="60%">Chapter&#160;5.&#160;Initial Configuration</th><td align="right" width="20%">&#160;<a accesskey="n" href="Java-Broker-Initial-Configuration-Initial-Config-Locati [...]
-            otherwise instructed. </p><p> The command line argument <span class="emphasis"><em>-sp</em></span> (or
-                <span class="emphasis"><em>--store-path</em></span>) can optionally be used to specify a different
-            relative or absolute path to use for the broker configuration store: </p><pre class="screen">
-$ ./qpid-server -sp ./my-broker-configuration.json
-        </pre><p> If no configuration store exists at the specified/defaulted location when the broker
-            starts then one will be initialised using the current <a class="link" href="Java-Broker-Initial-Configuration-Initial-Config-Location.html" title="5.3.&#160;'Initial Configuration' Location">'Initial
-                Configuration'</a>. </p></div><div class="navfooter"><hr /><table summary="Navigation footer" width="100%"><tr><td align="left" width="40%"><a accesskey="p" href="Java-Broker-Initial-Configuration.html">Prev</a>&#160;</td><td align="center" width="20%"><a accesskey="u" href="Java-Broker-Initial-Configuration.html">Up</a></td><td align="right" width="40%">&#160;<a accesskey="n" href="Java-Broker-Initial-Configuration-Initial-Config-Location.html">Next</a></td></tr><tr><td  [...]
-
-          <hr/>
-
-          <ul id="-apache-navigation">
-            <li><a href="http://www.apache.org/">Apache</a></li>
-            <li><a href="http://www.apache.org/licenses/">License</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="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
-          </ul>
-
-          <p id="-legal">
-            Apache Qpid, Messaging built on AMQP; Copyright &#169; 2015
-            The Apache Software Foundation; Licensed under
-            the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
-            License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
-            project logo are trademarks of The Apache Software
-            Foundation; All other marks mentioned may be trademarks or
-            registered trademarks of their respective owners
-          </p>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Initial-Configuration-Overwrite-Config-Store.html b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Initial-Configuration-Overwrite-Config-Store.html
deleted file mode 100644
index 16b785c..0000000
--- a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Initial-Configuration-Overwrite-Config-Store.html
+++ /dev/null
@@ -1,154 +0,0 @@
-<!DOCTYPE html>
-<!--
- -
- - 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.
- -
--->
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-  <head>
-    <title>5.5.&#160;Overwriting An Existing Configuration Store - Apache Qpid&#8482;</title>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-    <link rel="stylesheet" href="/site.css" type="text/css" async="async"/>
-    <link rel="stylesheet" href="/deferred.css" type="text/css" defer="defer"/>
-    <script type="text/javascript">var _deferredFunctions = [];</script>
-    <script type="text/javascript" src="/deferred.js" defer="defer"></script>
-    <!--[if lte IE 8]>
-      <link rel="stylesheet" href="/ie.css" type="text/css"/>
-      <script type="text/javascript" src="/html5shiv.js"></script>
-    <![endif]-->
-
-    <!-- Redirects for `go get` and godoc.org -->
-    <meta name="go-import"
-          content="qpid.apache.org git https://gitbox.apache.org/repos/asf/qpid-proton.git"/>
-    <meta name="go-source"
-          content="qpid.apache.org
-https://github.com/apache/qpid-proton/blob/go1/README.md
-https://github.com/apache/qpid-proton/tree/go1{/dir}
-https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
-  </head>
-  <body>
-    <div id="-content">
-      <div id="-top" class="panel">
-        <a id="-menu-link"><img width="16" height="16" src="" alt="Menu"/></a>
-
-        <a id="-search-link"><img width="22" height="16" src="" alt="Search"/></a>
-
-        <ul id="-global-navigation">
-          <li><a id="-logotype" href="/index.html">Apache Qpid<sup>&#8482;</sup></a></li>
-          <li><a href="/documentation.html">Documentation</a></li>
-          <li><a href="/download.html">Download</a></li>
-          <li><a href="/discussion.html">Discussion</a></li>
-        </ul>
-      </div>
-
-      <div id="-menu" class="panel" style="display: none;">
-        <div class="flex">
-          <section>
-            <h3>Project</h3>
-
-            <ul>
-              <li><a href="/overview.html">Overview</a></li>
-              <li><a href="/components/index.html">Components</a></li>
-              <li><a href="/releases/index.html">Releases</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Messaging APIs</h3>
-
-            <ul>
-              <li><a href="/proton/index.html">Qpid Proton</a></li>
-              <li><a href="/components/jms/index.html">Qpid JMS</a></li>
-              <li><a href="/components/messaging-api/index.html">Qpid Messaging API</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Servers and tools</h3>
-
-            <ul>
-              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
-              <li><a href="/components/cpp-broker/index.html">C++ broker</a></li>
-              <li><a href="/components/dispatch-router/index.html">Dispatch router</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Resources</h3>
-
-            <ul>
-              <li><a href="/dashboard.html">Dashboard</a></li>
-              <li><a href="https://cwiki.apache.org/confluence/display/qpid/Index">Wiki</a></li>
-              <li><a href="/resources.html">More resources</a></li>
-            </ul>
-          </section>
-        </div>
-      </div>
-
-      <div id="-search" class="panel" style="display: none;">
-        <form action="http://www.google.com/search" method="get">
-          <input type="hidden" name="sitesearch" value="qpid.apache.org"/>
-          <input type="text" name="q" maxlength="255" autofocus="autofocus" tabindex="1"/>
-          <button type="submit">Search</button>
-          <a href="/search.html">More ways to search</a>
-        </form>
-      </div>
-
-      <div id="-middle" class="panel">
-        <ul id="-path-navigation"><li><a href="/index.html">Home</a></li><li><a href="/releases/index.html">Releases</a></li><li><a href="/releases/qpid-java-trunk/index.html">Qpid for Java Trunk</a></li><li><a href="/releases/qpid-java-trunk/java-broker/book/index.html">Apache Qpid Broker for Java</a></li><li>5.5.&#160;Overwriting An Existing Configuration Store</li></ul>
-
-        <div id="-middle-content">
-          <div class="docbook"><div class="navheader"><table summary="Navigation header" width="100%"><tr><th align="center" colspan="3">5.5.&#160;Overwriting An Existing Configuration Store</th></tr><tr><td align="left" width="20%"><a accesskey="p" href="Java-Broker-Initial-Configuration-Create-Initial-Config.html">Prev</a>&#160;</td><th align="center" width="60%">Chapter&#160;5.&#160;Initial Configuration</th><td align="right" width="20%">&#160;<a accesskey="n" href="Java-Broker-Initia [...]
-            is used and the current <a class="link" href="Java-Broker-Initial-Configuration-Initial-Config-Location.html" title="5.3.&#160;'Initial Configuration' Location">'Initial
-                Configuration'</a> is ignored. </p><p> The command line argument <span class="emphasis"><em>-os</em></span> (or
-                <span class="emphasis"><em>--overwrite-store</em></span>) can be used to force a new broker
-            configuration store to be initialised from the current 'Initial Configuration' even if
-            one exists: </p><pre class="screen">
-$ ./qpid-server -os -icp ./my-initial-configuration.json
-        </pre><p> This can be useful to effectively play configuration into one or more broker to
-            pre-configure them to a particular state, or alternatively to ensure a broker is always
-            started with a fixed configuration. In the latter case, use of the Memory <a class="link" href="Java-Broker-Initial-Configuration-Type.html" title="5.6.&#160;Configuration Store Type">Configuration Store Type</a> may
-            also be useful. </p></div><div class="navfooter"><hr /><table summary="Navigation footer" width="100%"><tr><td align="left" width="40%"><a accesskey="p" href="Java-Broker-Initial-Configuration-Create-Initial-Config.html">Prev</a>&#160;</td><td align="center" width="20%"><a accesskey="u" href="Java-Broker-Initial-Configuration.html">Up</a></td><td align="right" width="40%">&#160;<a accesskey="n" href="Java-Broker-Initial-Configuration-Type.html">Next</a></td></tr><tr><td align [...]
-
-          <hr/>
-
-          <ul id="-apache-navigation">
-            <li><a href="http://www.apache.org/">Apache</a></li>
-            <li><a href="http://www.apache.org/licenses/">License</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="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
-          </ul>
-
-          <p id="-legal">
-            Apache Qpid, Messaging built on AMQP; Copyright &#169; 2015
-            The Apache Software Foundation; Licensed under
-            the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
-            License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
-            project logo are trademarks of The Apache Software
-            Foundation; All other marks mentioned may be trademarks or
-            registered trademarks of their respective owners
-          </p>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Initial-Configuration-Type.html b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Initial-Configuration-Type.html
deleted file mode 100644
index 38d7963..0000000
--- a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Initial-Configuration-Type.html
+++ /dev/null
@@ -1,161 +0,0 @@
-<!DOCTYPE html>
-<!--
- -
- - 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.
- -
--->
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-  <head>
-    <title>5.6.&#160;Configuration Store Type - Apache Qpid&#8482;</title>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-    <link rel="stylesheet" href="/site.css" type="text/css" async="async"/>
-    <link rel="stylesheet" href="/deferred.css" type="text/css" defer="defer"/>
-    <script type="text/javascript">var _deferredFunctions = [];</script>
-    <script type="text/javascript" src="/deferred.js" defer="defer"></script>
-    <!--[if lte IE 8]>
-      <link rel="stylesheet" href="/ie.css" type="text/css"/>
-      <script type="text/javascript" src="/html5shiv.js"></script>
-    <![endif]-->
-
-    <!-- Redirects for `go get` and godoc.org -->
-    <meta name="go-import"
-          content="qpid.apache.org git https://gitbox.apache.org/repos/asf/qpid-proton.git"/>
-    <meta name="go-source"
-          content="qpid.apache.org
-https://github.com/apache/qpid-proton/blob/go1/README.md
-https://github.com/apache/qpid-proton/tree/go1{/dir}
-https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
-  </head>
-  <body>
-    <div id="-content">
-      <div id="-top" class="panel">
-        <a id="-menu-link"><img width="16" height="16" src="" alt="Menu"/></a>
-
-        <a id="-search-link"><img width="22" height="16" src="" alt="Search"/></a>
-
-        <ul id="-global-navigation">
-          <li><a id="-logotype" href="/index.html">Apache Qpid<sup>&#8482;</sup></a></li>
-          <li><a href="/documentation.html">Documentation</a></li>
-          <li><a href="/download.html">Download</a></li>
-          <li><a href="/discussion.html">Discussion</a></li>
-        </ul>
-      </div>
-
-      <div id="-menu" class="panel" style="display: none;">
-        <div class="flex">
-          <section>
-            <h3>Project</h3>
-
-            <ul>
-              <li><a href="/overview.html">Overview</a></li>
-              <li><a href="/components/index.html">Components</a></li>
-              <li><a href="/releases/index.html">Releases</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Messaging APIs</h3>
-
-            <ul>
-              <li><a href="/proton/index.html">Qpid Proton</a></li>
-              <li><a href="/components/jms/index.html">Qpid JMS</a></li>
-              <li><a href="/components/messaging-api/index.html">Qpid Messaging API</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Servers and tools</h3>
-
-            <ul>
-              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
-              <li><a href="/components/cpp-broker/index.html">C++ broker</a></li>
-              <li><a href="/components/dispatch-router/index.html">Dispatch router</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Resources</h3>
-
-            <ul>
-              <li><a href="/dashboard.html">Dashboard</a></li>
-              <li><a href="https://cwiki.apache.org/confluence/display/qpid/Index">Wiki</a></li>
-              <li><a href="/resources.html">More resources</a></li>
-            </ul>
-          </section>
-        </div>
-      </div>
-
-      <div id="-search" class="panel" style="display: none;">
-        <form action="http://www.google.com/search" method="get">
-          <input type="hidden" name="sitesearch" value="qpid.apache.org"/>
-          <input type="text" name="q" maxlength="255" autofocus="autofocus" tabindex="1"/>
-          <button type="submit">Search</button>
-          <a href="/search.html">More ways to search</a>
-        </form>
-      </div>
-
-      <div id="-middle" class="panel">
-        <ul id="-path-navigation"><li><a href="/index.html">Home</a></li><li><a href="/releases/index.html">Releases</a></li><li><a href="/releases/qpid-java-trunk/index.html">Qpid for Java Trunk</a></li><li><a href="/releases/qpid-java-trunk/java-broker/book/index.html">Apache Qpid Broker for Java</a></li><li>5.6.&#160;Configuration Store Type</li></ul>
-
-        <div id="-middle-content">
-          <div class="docbook"><div class="navheader"><table summary="Navigation header" width="100%"><tr><th align="center" colspan="3">5.6.&#160;Configuration Store Type</th></tr><tr><td align="left" width="20%"><a accesskey="p" href="Java-Broker-Initial-Configuration-Overwrite-Config-Store.html">Prev</a>&#160;</td><th align="center" width="60%">Chapter&#160;5.&#160;Initial Configuration</th><td align="right" width="20%">&#160;<a accesskey="n" href="Java-Broker-Initial-Configuration-Co [...]
-            </p><div class="variablelist"><dl class="variablelist"><dt><span class="term">JSON</span></dt><dd><p>the default one which persists content to disk in a JSON file</p></dd><dt><span class="term">Memory</span></dt><dd><p>operates only in-memory and so does not retain changes across broker
-                        restarts and always relies on the current <a class="link" href="Java-Broker-Initial-Configuration-Initial-Config-Location.html" title="5.3.&#160;'Initial Configuration' Location">'Initial
-                            Configuration'</a> to provide the configuration to start the broker with.
-                    </p></dd><dt><span class="term">DERBY</span></dt><dd><p>stores configuration in embedded derby store</p></dd><dt><span class="term">BDB</span></dt><dd><p>stores configuration in Berkeley DB store</p></dd><dt><span class="term">JDBC</span></dt><dd><p>stores configuration in external RDBMS using JDBC</p></dd></dl></div><p>
-        </p><p> The command line argument <span class="emphasis"><em>-st</em></span> (or
-                <span class="emphasis"><em>--store-type</em></span>) can be used to override the default
-                <span class="emphasis"><em>json</em></span>)configuration store type and allow choosing an alternative,
-            such as <span class="emphasis"><em>Memory</em></span>) </p><pre class="screen">
-$ ./qpid-server -st memory
-        </pre><p> This can be useful when running tests, or always wishing to start the broker with the
-            same <a class="link" href="Java-Broker-Initial-Configuration-Initial-Config-Location.html" title="5.3.&#160;'Initial Configuration' Location">'Initial
-                Configuration'</a>
-        </p><p>Another example of broker startup with configuration in DERBY network server</p><pre class="screen">
-$ ./qpid-server -st JDBC \
-  -prop "systemConfig.connectionUrl=jdbc:derby://localhost:1527/path/to/store;create=true" \
-  -prop "systemConfig.username=test" -prop "systemConfig.password=password"
-        </pre></div><div class="navfooter"><hr /><table summary="Navigation footer" width="100%"><tr><td align="left" width="40%"><a accesskey="p" href="Java-Broker-Initial-Configuration-Overwrite-Config-Store.html">Prev</a>&#160;</td><td align="center" width="20%"><a accesskey="u" href="Java-Broker-Initial-Configuration.html">Up</a></td><td align="right" width="40%">&#160;<a accesskey="n" href="Java-Broker-Initial-Configuration-Configuration-Properties.html">Next</a></td></tr><tr><td al [...]
-
-          <hr/>
-
-          <ul id="-apache-navigation">
-            <li><a href="http://www.apache.org/">Apache</a></li>
-            <li><a href="http://www.apache.org/licenses/">License</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="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
-          </ul>
-
-          <p id="-legal">
-            Apache Qpid, Messaging built on AMQP; Copyright &#169; 2015
-            The Apache Software Foundation; Licensed under
-            the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
-            License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
-            project logo are trademarks of The Apache Software
-            Foundation; All other marks mentioned may be trademarks or
-            registered trademarks of their respective owners
-          </p>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Initial-Configuration.html b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Initial-Configuration.html
deleted file mode 100644
index 03068e1..0000000
--- a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Initial-Configuration.html
+++ /dev/null
@@ -1,154 +0,0 @@
-<!DOCTYPE html>
-<!--
- -
- - 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.
- -
--->
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-  <head>
-    <title>Chapter&#160;5.&#160;Initial Configuration - Apache Qpid&#8482;</title>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-    <link rel="stylesheet" href="/site.css" type="text/css" async="async"/>
-    <link rel="stylesheet" href="/deferred.css" type="text/css" defer="defer"/>
-    <script type="text/javascript">var _deferredFunctions = [];</script>
-    <script type="text/javascript" src="/deferred.js" defer="defer"></script>
-    <!--[if lte IE 8]>
-      <link rel="stylesheet" href="/ie.css" type="text/css"/>
-      <script type="text/javascript" src="/html5shiv.js"></script>
-    <![endif]-->
-
-    <!-- Redirects for `go get` and godoc.org -->
-    <meta name="go-import"
-          content="qpid.apache.org git https://gitbox.apache.org/repos/asf/qpid-proton.git"/>
-    <meta name="go-source"
-          content="qpid.apache.org
-https://github.com/apache/qpid-proton/blob/go1/README.md
-https://github.com/apache/qpid-proton/tree/go1{/dir}
-https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
-  </head>
-  <body>
-    <div id="-content">
-      <div id="-top" class="panel">
-        <a id="-menu-link"><img width="16" height="16" src="" alt="Menu"/></a>
-
-        <a id="-search-link"><img width="22" height="16" src="" alt="Search"/></a>
-
-        <ul id="-global-navigation">
-          <li><a id="-logotype" href="/index.html">Apache Qpid<sup>&#8482;</sup></a></li>
-          <li><a href="/documentation.html">Documentation</a></li>
-          <li><a href="/download.html">Download</a></li>
-          <li><a href="/discussion.html">Discussion</a></li>
-        </ul>
-      </div>
-
-      <div id="-menu" class="panel" style="display: none;">
-        <div class="flex">
-          <section>
-            <h3>Project</h3>
-
-            <ul>
-              <li><a href="/overview.html">Overview</a></li>
-              <li><a href="/components/index.html">Components</a></li>
-              <li><a href="/releases/index.html">Releases</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Messaging APIs</h3>
-
-            <ul>
-              <li><a href="/proton/index.html">Qpid Proton</a></li>
-              <li><a href="/components/jms/index.html">Qpid JMS</a></li>
-              <li><a href="/components/messaging-api/index.html">Qpid Messaging API</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Servers and tools</h3>
-
-            <ul>
-              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
-              <li><a href="/components/cpp-broker/index.html">C++ broker</a></li>
-              <li><a href="/components/dispatch-router/index.html">Dispatch router</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Resources</h3>
-
-            <ul>
-              <li><a href="/dashboard.html">Dashboard</a></li>
-              <li><a href="https://cwiki.apache.org/confluence/display/qpid/Index">Wiki</a></li>
-              <li><a href="/resources.html">More resources</a></li>
-            </ul>
-          </section>
-        </div>
-      </div>
-
-      <div id="-search" class="panel" style="display: none;">
-        <form action="http://www.google.com/search" method="get">
-          <input type="hidden" name="sitesearch" value="qpid.apache.org"/>
-          <input type="text" name="q" maxlength="255" autofocus="autofocus" tabindex="1"/>
-          <button type="submit">Search</button>
-          <a href="/search.html">More ways to search</a>
-        </form>
-      </div>
-
-      <div id="-middle" class="panel">
-        <ul id="-path-navigation"><li><a href="/index.html">Home</a></li><li><a href="/releases/index.html">Releases</a></li><li><a href="/releases/qpid-java-trunk/index.html">Qpid for Java Trunk</a></li><li><a href="/releases/qpid-java-trunk/java-broker/book/index.html">Apache Qpid Broker for Java</a></li><li>Chapter&#160;5.&#160;Initial Configuration</li></ul>
-
-        <div id="-middle-content">
-          <div class="docbook"><div class="navheader"><table summary="Navigation header" width="100%"><tr><th align="center" colspan="3">Chapter&#160;5.&#160;Initial Configuration</th></tr><tr><td align="left" width="20%"><a accesskey="p" href="Java-Broker-Concepts-Other-Services.html">Prev</a>&#160;</td><th align="center" width="60%">&#160;</th><td align="right" width="20%">&#160;<a accesskey="n" href="Java-Broker-Initial-Configuration-Location.html">Next</a></td></tr></table><hr /></di [...]
-            the Broker is started, subsequent management is performed using the <a class="link" href="Java-Broker-Management-Channel.html" title="Chapter&#160;6.&#160;Management Channels">Management interfaces</a></p><p> The configuration for each component is stored as an entry in the broker
-            configuration store, currently implemented as a JSON file which persists changes to
-            disk, BDB or Derby database or an in-memory store which does not. The following
-            components configuration is stored there: </p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p>Broker</p></li><li class="listitem"><p>Virtual Host Nodes</p></li><li class="listitem"><p>Loggers</p></li><li class="listitem"><p>Ports</p></li><li class="listitem"><p>Authentication Providers (optionally with Users for managing users Authentication Providers)</p></li><li class="listitem"><p>Access Control Providers</p></li>< [...]
-        </p><p>Broker startup involves two configuration related items, the 'Initial Configuration'
-            and the Configuration Store. When the broker is started, if a Configuration Store does
-            not exist at the current <a class="link" href="Java-Broker-Initial-Configuration-Location.html" title="5.2.&#160;Configuration Store Location">store location</a> then one will be initialised with the current <a class="link" href="Java-Broker-Initial-Configuration-Initial-Config-Location.html" title="5.3.&#160;'Initial Configuration' Location">'Initial
-                Configuration'</a>. Unless otherwise requested to <a class="link" href="Java-Broker-Initial-Configuration-Location.html" title="5.2.&#160;Configuration Store Location">overwrite the configuration
-                store</a> then subsequent broker restarts will use the existing configuration
-            store and ignore the contents of the 'Initial Configuration'. </p></div></div><div class="navfooter"><hr /><table summary="Navigation footer" width="100%"><tr><td align="left" width="40%"><a accesskey="p" href="Java-Broker-Concepts-Other-Services.html">Prev</a>&#160;</td><td align="center" width="20%">&#160;</td><td align="right" width="40%">&#160;<a accesskey="n" href="Java-Broker-Initial-Configuration-Location.html">Next</a></td></tr><tr><td align="left" valign="top" width= [...]
-
-          <hr/>
-
-          <ul id="-apache-navigation">
-            <li><a href="http://www.apache.org/">Apache</a></li>
-            <li><a href="http://www.apache.org/licenses/">License</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="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
-          </ul>
-
-          <p id="-legal">
-            Apache Qpid, Messaging built on AMQP; Copyright &#169; 2015
-            The Apache Software Foundation; Licensed under
-            the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
-            License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
-            project logo are trademarks of The Apache Software
-            Foundation; All other marks mentioned may be trademarks or
-            registered trademarks of their respective owners
-          </p>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Installation-Download.html b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Installation-Download.html
deleted file mode 100644
index 46c453d..0000000
--- a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Installation-Download.html
+++ /dev/null
@@ -1,146 +0,0 @@
-<!DOCTYPE html>
-<!--
- -
- - 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.
- -
--->
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-  <head>
-    <title>2.3.&#160;Download - Apache Qpid&#8482;</title>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-    <link rel="stylesheet" href="/site.css" type="text/css" async="async"/>
-    <link rel="stylesheet" href="/deferred.css" type="text/css" defer="defer"/>
-    <script type="text/javascript">var _deferredFunctions = [];</script>
-    <script type="text/javascript" src="/deferred.js" defer="defer"></script>
-    <!--[if lte IE 8]>
-      <link rel="stylesheet" href="/ie.css" type="text/css"/>
-      <script type="text/javascript" src="/html5shiv.js"></script>
-    <![endif]-->
-
-    <!-- Redirects for `go get` and godoc.org -->
-    <meta name="go-import"
-          content="qpid.apache.org git https://gitbox.apache.org/repos/asf/qpid-proton.git"/>
-    <meta name="go-source"
-          content="qpid.apache.org
-https://github.com/apache/qpid-proton/blob/go1/README.md
-https://github.com/apache/qpid-proton/tree/go1{/dir}
-https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
-  </head>
-  <body>
-    <div id="-content">
-      <div id="-top" class="panel">
-        <a id="-menu-link"><img width="16" height="16" src="" alt="Menu"/></a>
-
-        <a id="-search-link"><img width="22" height="16" src="" alt="Search"/></a>
-
-        <ul id="-global-navigation">
-          <li><a id="-logotype" href="/index.html">Apache Qpid<sup>&#8482;</sup></a></li>
-          <li><a href="/documentation.html">Documentation</a></li>
-          <li><a href="/download.html">Download</a></li>
-          <li><a href="/discussion.html">Discussion</a></li>
-        </ul>
-      </div>
-
-      <div id="-menu" class="panel" style="display: none;">
-        <div class="flex">
-          <section>
-            <h3>Project</h3>
-
-            <ul>
-              <li><a href="/overview.html">Overview</a></li>
-              <li><a href="/components/index.html">Components</a></li>
-              <li><a href="/releases/index.html">Releases</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Messaging APIs</h3>
-
-            <ul>
-              <li><a href="/proton/index.html">Qpid Proton</a></li>
-              <li><a href="/components/jms/index.html">Qpid JMS</a></li>
-              <li><a href="/components/messaging-api/index.html">Qpid Messaging API</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Servers and tools</h3>
-
-            <ul>
-              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
-              <li><a href="/components/cpp-broker/index.html">C++ broker</a></li>
-              <li><a href="/components/dispatch-router/index.html">Dispatch router</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Resources</h3>
-
-            <ul>
-              <li><a href="/dashboard.html">Dashboard</a></li>
-              <li><a href="https://cwiki.apache.org/confluence/display/qpid/Index">Wiki</a></li>
-              <li><a href="/resources.html">More resources</a></li>
-            </ul>
-          </section>
-        </div>
-      </div>
-
-      <div id="-search" class="panel" style="display: none;">
-        <form action="http://www.google.com/search" method="get">
-          <input type="hidden" name="sitesearch" value="qpid.apache.org"/>
-          <input type="text" name="q" maxlength="255" autofocus="autofocus" tabindex="1"/>
-          <button type="submit">Search</button>
-          <a href="/search.html">More ways to search</a>
-        </form>
-      </div>
-
-      <div id="-middle" class="panel">
-        <ul id="-path-navigation"><li><a href="/index.html">Home</a></li><li><a href="/releases/index.html">Releases</a></li><li><a href="/releases/qpid-java-trunk/index.html">Qpid for Java Trunk</a></li><li><a href="/releases/qpid-java-trunk/java-broker/book/index.html">Apache Qpid Broker for Java</a></li><li>2.3.&#160;Download</li></ul>
-
-        <div id="-middle-content">
-          <div class="docbook"><div class="navheader"><table summary="Navigation header" width="100%"><tr><th align="center" colspan="3">2.3.&#160;Download</th></tr><tr><td align="left" width="20%"><a accesskey="p" href="Java-Broker-Installation-Prerequistes.html">Prev</a>&#160;</td><th align="center" width="60%">Chapter&#160;2.&#160;Installation</th><td align="right" width="20%">&#160;<a accesskey="n" href="Java-Broker-Installation-InstallationWindows.html">Next</a></td></tr></table><hr [...]
-        signature matches that available on the site. Instructions are given on the download page.
-      </p></div></div><div class="navfooter"><hr /><table summary="Navigation footer" width="100%"><tr><td align="left" width="40%"><a accesskey="p" href="Java-Broker-Installation-Prerequistes.html">Prev</a>&#160;</td><td align="center" width="20%"><a accesskey="u" href="Java-Broker-Installation.html">Up</a></td><td align="right" width="40%">&#160;<a accesskey="n" href="Java-Broker-Installation-InstallationWindows.html">Next</a></td></tr><tr><td align="left" valign="top" width="40%">2.2. [...]
-
-          <hr/>
-
-          <ul id="-apache-navigation">
-            <li><a href="http://www.apache.org/">Apache</a></li>
-            <li><a href="http://www.apache.org/licenses/">License</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="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
-          </ul>
-
-          <p id="-legal">
-            Apache Qpid, Messaging built on AMQP; Copyright &#169; 2015
-            The Apache Software Foundation; Licensed under
-            the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
-            License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
-            project logo are trademarks of The Apache Software
-            Foundation; All other marks mentioned may be trademarks or
-            registered trademarks of their respective owners
-          </p>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Installation-InstallationUnix.html b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Installation-InstallationUnix.html
deleted file mode 100644
index 36628e1..0000000
--- a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Installation-InstallationUnix.html
+++ /dev/null
@@ -1,168 +0,0 @@
-<!DOCTYPE html>
-<!--
- -
- - 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.
- -
--->
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-  <head>
-    <title>2.5.&#160;Installation on UNIX platforms - Apache Qpid&#8482;</title>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-    <link rel="stylesheet" href="/site.css" type="text/css" async="async"/>
-    <link rel="stylesheet" href="/deferred.css" type="text/css" defer="defer"/>
-    <script type="text/javascript">var _deferredFunctions = [];</script>
-    <script type="text/javascript" src="/deferred.js" defer="defer"></script>
-    <!--[if lte IE 8]>
-      <link rel="stylesheet" href="/ie.css" type="text/css"/>
-      <script type="text/javascript" src="/html5shiv.js"></script>
-    <![endif]-->
-
-    <!-- Redirects for `go get` and godoc.org -->
-    <meta name="go-import"
-          content="qpid.apache.org git https://gitbox.apache.org/repos/asf/qpid-proton.git"/>
-    <meta name="go-source"
-          content="qpid.apache.org
-https://github.com/apache/qpid-proton/blob/go1/README.md
-https://github.com/apache/qpid-proton/tree/go1{/dir}
-https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
-  </head>
-  <body>
-    <div id="-content">
-      <div id="-top" class="panel">
-        <a id="-menu-link"><img width="16" height="16" src="" alt="Menu"/></a>
-
-        <a id="-search-link"><img width="22" height="16" src="" alt="Search"/></a>
-
-        <ul id="-global-navigation">
-          <li><a id="-logotype" href="/index.html">Apache Qpid<sup>&#8482;</sup></a></li>
-          <li><a href="/documentation.html">Documentation</a></li>
-          <li><a href="/download.html">Download</a></li>
-          <li><a href="/discussion.html">Discussion</a></li>
-        </ul>
-      </div>
-
-      <div id="-menu" class="panel" style="display: none;">
-        <div class="flex">
-          <section>
-            <h3>Project</h3>
-
-            <ul>
-              <li><a href="/overview.html">Overview</a></li>
-              <li><a href="/components/index.html">Components</a></li>
-              <li><a href="/releases/index.html">Releases</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Messaging APIs</h3>
-
-            <ul>
-              <li><a href="/proton/index.html">Qpid Proton</a></li>
-              <li><a href="/components/jms/index.html">Qpid JMS</a></li>
-              <li><a href="/components/messaging-api/index.html">Qpid Messaging API</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Servers and tools</h3>
-
-            <ul>
-              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
-              <li><a href="/components/cpp-broker/index.html">C++ broker</a></li>
-              <li><a href="/components/dispatch-router/index.html">Dispatch router</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Resources</h3>
-
-            <ul>
-              <li><a href="/dashboard.html">Dashboard</a></li>
-              <li><a href="https://cwiki.apache.org/confluence/display/qpid/Index">Wiki</a></li>
-              <li><a href="/resources.html">More resources</a></li>
-            </ul>
-          </section>
-        </div>
-      </div>
-
-      <div id="-search" class="panel" style="display: none;">
-        <form action="http://www.google.com/search" method="get">
-          <input type="hidden" name="sitesearch" value="qpid.apache.org"/>
-          <input type="text" name="q" maxlength="255" autofocus="autofocus" tabindex="1"/>
-          <button type="submit">Search</button>
-          <a href="/search.html">More ways to search</a>
-        </form>
-      </div>
-
-      <div id="-middle" class="panel">
-        <ul id="-path-navigation"><li><a href="/index.html">Home</a></li><li><a href="/releases/index.html">Releases</a></li><li><a href="/releases/qpid-java-trunk/index.html">Qpid for Java Trunk</a></li><li><a href="/releases/qpid-java-trunk/java-broker/book/index.html">Apache Qpid Broker for Java</a></li><li>2.5.&#160;Installation on UNIX platforms</li></ul>
-
-        <div id="-middle-content">
-          <div class="docbook"><div class="navheader"><table summary="Navigation header" width="100%"><tr><th align="center" colspan="3">2.5.&#160;Installation on UNIX platforms</th></tr><tr><td align="left" width="20%"><a accesskey="p" href="Java-Broker-Installation-InstallationWindows.html">Prev</a>&#160;</td><th align="center" width="60%">Chapter&#160;2.&#160;Installation</th><td align="right" width="20%">&#160;<a accesskey="n" href="Java-Broker-Installation-OptionalDependencies.html" [...]
-    </p><p>Now chose a directory for Qpid broker installation. This directory will be used for the
-      Qpid JARs and configuration files. It need not be the same location as the work directory used
-      for the persistent message store or the log file (you will choose this location later). For
-      the remainder this example we will assume that location /usr/local/qpid has been
-      chosen.</p><p>Next extract the qpid-broker-6.1.0-SNAPSHOT-bin.tgz package into the directory.</p><pre class="programlisting">mkdir /usr/local/qpid
-cd /usr/local/qpid
-tar xvzf qpid-broker-6.1.0-SNAPSHOT-bin.tgz</pre><p>The extraction of the broker package will have created a directory
-      qpid-broker/6.1.0-SNAPSHOT within /usr/local/qpid</p><pre class="screen">ls -la qpid-broker/6.1.0-SNAPSHOT/
-total 56
-drwxrwxr-x. 5 alex alex  4096 Nov 25 11:43 .
-drwxrwxr-x. 3 alex alex  4096 Nov 25 11:43 ..
-drwxr-xr-x. 2 alex alex  4096 Nov 24 23:38 bin
-drwxr-xr-x. 2 alex alex  4096 Nov 24 23:38 etc
-drwxrwxr-x. 2 alex alex  4096 Nov 25 11:43 lib
--rw-r--r--. 1 alex alex 28143 Nov 24 23:38 LICENSE
--rw-r--r--. 1 alex alex  3409 Nov 24 23:38 NOTICE
--rw-r--r--. 1 alex alex   116 Nov 24 23:38 README.txt
-    </pre><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="Java-Broker-Installation-InstallationUnix-SettingQPIDWORK"></a>2.5.1.&#160;Setting the working directory</h3></div></div></div><p>Qpid requires a work directory. This directory is used for the default location of the
-        Qpid log file and is used for the storage of persistent messages. The work directory can be
-        set on the command-line (for the lifetime of the current shell), but you will normally want
-        to set the environment variable permanently the user's shell profile file (~/.bash_profile
-        for Bash etc).</p><pre class="screen">export QPID_WORK=/var/qpidwork
-      </pre><p>If the directory referred to by <a class="link" href="Java-Broker-Appendix-Environment-Variables.html#Java-Broker-Appendix-Environment-Variables-Qpid-Work">QPID_WORK</a> does not
-        exist, the Broker will attempt to create it on start-up. </p></div></div><div class="navfooter"><hr /><table summary="Navigation footer" width="100%"><tr><td align="left" width="40%"><a accesskey="p" href="Java-Broker-Installation-InstallationWindows.html">Prev</a>&#160;</td><td align="center" width="20%"><a accesskey="u" href="Java-Broker-Installation.html">Up</a></td><td align="right" width="40%">&#160;<a accesskey="n" href="Java-Broker-Installation-OptionalDependencies.html">N [...]
-
-          <hr/>
-
-          <ul id="-apache-navigation">
-            <li><a href="http://www.apache.org/">Apache</a></li>
-            <li><a href="http://www.apache.org/licenses/">License</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="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
-          </ul>
-
-          <p id="-legal">
-            Apache Qpid, Messaging built on AMQP; Copyright &#169; 2015
-            The Apache Software Foundation; Licensed under
-            the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
-            License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
-            project logo are trademarks of The Apache Software
-            Foundation; All other marks mentioned may be trademarks or
-            registered trademarks of their respective owners
-          </p>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Installation-InstallationWindows.html b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Installation-InstallationWindows.html
deleted file mode 100644
index b6ba445..0000000
--- a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Installation-InstallationWindows.html
+++ /dev/null
@@ -1,169 +0,0 @@
-<!DOCTYPE html>
-<!--
- -
- - 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.
- -
--->
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-  <head>
-    <title>2.4.&#160;Installation on Windows - Apache Qpid&#8482;</title>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-    <link rel="stylesheet" href="/site.css" type="text/css" async="async"/>
-    <link rel="stylesheet" href="/deferred.css" type="text/css" defer="defer"/>
-    <script type="text/javascript">var _deferredFunctions = [];</script>
-    <script type="text/javascript" src="/deferred.js" defer="defer"></script>
-    <!--[if lte IE 8]>
-      <link rel="stylesheet" href="/ie.css" type="text/css"/>
-      <script type="text/javascript" src="/html5shiv.js"></script>
-    <![endif]-->
-
-    <!-- Redirects for `go get` and godoc.org -->
-    <meta name="go-import"
-          content="qpid.apache.org git https://gitbox.apache.org/repos/asf/qpid-proton.git"/>
-    <meta name="go-source"
-          content="qpid.apache.org
-https://github.com/apache/qpid-proton/blob/go1/README.md
-https://github.com/apache/qpid-proton/tree/go1{/dir}
-https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
-  </head>
-  <body>
-    <div id="-content">
-      <div id="-top" class="panel">
-        <a id="-menu-link"><img width="16" height="16" src="" alt="Menu"/></a>
-
-        <a id="-search-link"><img width="22" height="16" src="" alt="Search"/></a>
-
-        <ul id="-global-navigation">
-          <li><a id="-logotype" href="/index.html">Apache Qpid<sup>&#8482;</sup></a></li>
-          <li><a href="/documentation.html">Documentation</a></li>
-          <li><a href="/download.html">Download</a></li>
-          <li><a href="/discussion.html">Discussion</a></li>
-        </ul>
-      </div>
-
-      <div id="-menu" class="panel" style="display: none;">
-        <div class="flex">
-          <section>
-            <h3>Project</h3>
-
-            <ul>
-              <li><a href="/overview.html">Overview</a></li>
-              <li><a href="/components/index.html">Components</a></li>
-              <li><a href="/releases/index.html">Releases</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Messaging APIs</h3>
-
-            <ul>
-              <li><a href="/proton/index.html">Qpid Proton</a></li>
-              <li><a href="/components/jms/index.html">Qpid JMS</a></li>
-              <li><a href="/components/messaging-api/index.html">Qpid Messaging API</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Servers and tools</h3>
-
-            <ul>
-              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
-              <li><a href="/components/cpp-broker/index.html">C++ broker</a></li>
-              <li><a href="/components/dispatch-router/index.html">Dispatch router</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Resources</h3>
-
-            <ul>
-              <li><a href="/dashboard.html">Dashboard</a></li>
-              <li><a href="https://cwiki.apache.org/confluence/display/qpid/Index">Wiki</a></li>
-              <li><a href="/resources.html">More resources</a></li>
-            </ul>
-          </section>
-        </div>
-      </div>
-
-      <div id="-search" class="panel" style="display: none;">
-        <form action="http://www.google.com/search" method="get">
-          <input type="hidden" name="sitesearch" value="qpid.apache.org"/>
-          <input type="text" name="q" maxlength="255" autofocus="autofocus" tabindex="1"/>
-          <button type="submit">Search</button>
-          <a href="/search.html">More ways to search</a>
-        </form>
-      </div>
-
-      <div id="-middle" class="panel">
-        <ul id="-path-navigation"><li><a href="/index.html">Home</a></li><li><a href="/releases/index.html">Releases</a></li><li><a href="/releases/qpid-java-trunk/index.html">Qpid for Java Trunk</a></li><li><a href="/releases/qpid-java-trunk/java-broker/book/index.html">Apache Qpid Broker for Java</a></li><li>2.4.&#160;Installation on Windows</li></ul>
-
-        <div id="-middle-content">
-          <div class="docbook"><div class="navheader"><table summary="Navigation header" width="100%"><tr><th align="center" colspan="3">2.4.&#160;Installation on Windows</th></tr><tr><td align="left" width="20%"><a accesskey="p" href="Java-Broker-Installation-Download.html">Prev</a>&#160;</td><th align="center" width="60%">Chapter&#160;2.&#160;Installation</th><td align="right" width="20%">&#160;<a accesskey="n" href="Java-Broker-Installation-InstallationUnix.html">Next</a></td></tr></t [...]
-    </p><p>Now chose a directory for Qpid broker installation. This directory will be used for the
-      Qpid JARs and configuration files. It need not be the same location as the work directory used
-      for the persistent message store or the log file (you will choose this location later). For
-      the remainder this example we will assume that location c:\qpid has been chosen.</p><p>Next extract the qpid-broker-6.1.0-SNAPSHOT-bin.zip package into the directory, using either
-      the zip file handling offered by Windows (right click the file and select 'Extract All') or a
-      third party tool of your choice.</p><p>The extraction of the broker package will have created a directory
-      qpid-broker\\6.1.0-SNAPSHOT within c:\qpid</p><pre class="screen">
- Directory of c:\qpid\qpid-broker\\6.1.0-SNAPSHOT
-
-25/11/2015  11:29    &lt;DIR&gt;          .
-25/11/2015  11:29    &lt;DIR&gt;          ..
-25/11/2015  10:56    &lt;DIR&gt;          bin
-03/07/2015  08:06    &lt;DIR&gt;          etc
-25/11/2015  11:25    &lt;DIR&gt;          lib
-25/11/2015  10:56            28,143 LICENSE
-25/11/2015  10:56             3,409 NOTICE
-29/04/2015  09:13               116 README.txt
-3 File(s)         31,668 bytes
-5 Dir(s)  25,981,767,680 bytes free
-</pre><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="Java-Broker-Installation-InstallationWindows-SettingQPIDWORK"></a>2.4.1.&#160;Setting the working directory</h3></div></div></div><p>Qpid requires a work directory. This directory is used for the default location of the
-        Qpid log file and is used for the storage of persistent messages. The work directory can be
-        set on the command-line (for the lifetime of the command interpreter), but you will normally
-        want to set the environment variable permanently via the Advanced System Settings in the
-        Control Panel.</p><pre class="screen">set QPID_WORK=C:\qpidwork</pre><p>If the directory referred to by <a class="link" href="Java-Broker-Appendix-Environment-Variables.html#Java-Broker-Appendix-Environment-Variables-Qpid-Work">QPID_WORK</a> does not
-        exist, the Broker will attempt to create it on start-up.</p></div></div><div class="navfooter"><hr /><table summary="Navigation footer" width="100%"><tr><td align="left" width="40%"><a accesskey="p" href="Java-Broker-Installation-Download.html">Prev</a>&#160;</td><td align="center" width="20%"><a accesskey="u" href="Java-Broker-Installation.html">Up</a></td><td align="right" width="40%">&#160;<a accesskey="n" href="Java-Broker-Installation-InstallationUnix.html">Next</a></td></tr [...]
-
-          <hr/>
-
-          <ul id="-apache-navigation">
-            <li><a href="http://www.apache.org/">Apache</a></li>
-            <li><a href="http://www.apache.org/licenses/">License</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="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
-          </ul>
-
-          <p id="-legal">
-            Apache Qpid, Messaging built on AMQP; Copyright &#169; 2015
-            The Apache Software Foundation; Licensed under
-            the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
-            License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
-            project logo are trademarks of The Apache Software
-            Foundation; All other marks mentioned may be trademarks or
-            registered trademarks of their respective owners
-          </p>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Installation-OptionalDependencies.html b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Installation-OptionalDependencies.html
deleted file mode 100644
index eb5ddc4..0000000
--- a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Installation-OptionalDependencies.html
+++ /dev/null
@@ -1,146 +0,0 @@
-<!DOCTYPE html>
-<!--
- -
- - 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.
- -
--->
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-  <head>
-    <title>2.6.&#160;Optional Dependencies - Apache Qpid&#8482;</title>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-    <link rel="stylesheet" href="/site.css" type="text/css" async="async"/>
-    <link rel="stylesheet" href="/deferred.css" type="text/css" defer="defer"/>
-    <script type="text/javascript">var _deferredFunctions = [];</script>
-    <script type="text/javascript" src="/deferred.js" defer="defer"></script>
-    <!--[if lte IE 8]>
-      <link rel="stylesheet" href="/ie.css" type="text/css"/>
-      <script type="text/javascript" src="/html5shiv.js"></script>
-    <![endif]-->
-
-    <!-- Redirects for `go get` and godoc.org -->
-    <meta name="go-import"
-          content="qpid.apache.org git https://gitbox.apache.org/repos/asf/qpid-proton.git"/>
-    <meta name="go-source"
-          content="qpid.apache.org
-https://github.com/apache/qpid-proton/blob/go1/README.md
-https://github.com/apache/qpid-proton/tree/go1{/dir}
-https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
-  </head>
-  <body>
-    <div id="-content">
-      <div id="-top" class="panel">
-        <a id="-menu-link"><img width="16" height="16" src="" alt="Menu"/></a>
-
-        <a id="-search-link"><img width="22" height="16" src="" alt="Search"/></a>
-
-        <ul id="-global-navigation">
-          <li><a id="-logotype" href="/index.html">Apache Qpid<sup>&#8482;</sup></a></li>
-          <li><a href="/documentation.html">Documentation</a></li>
-          <li><a href="/download.html">Download</a></li>
-          <li><a href="/discussion.html">Discussion</a></li>
-        </ul>
-      </div>
-
-      <div id="-menu" class="panel" style="display: none;">
-        <div class="flex">
-          <section>
-            <h3>Project</h3>
-
-            <ul>
-              <li><a href="/overview.html">Overview</a></li>
-              <li><a href="/components/index.html">Components</a></li>
-              <li><a href="/releases/index.html">Releases</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Messaging APIs</h3>
-
-            <ul>
-              <li><a href="/proton/index.html">Qpid Proton</a></li>
-              <li><a href="/components/jms/index.html">Qpid JMS</a></li>
-              <li><a href="/components/messaging-api/index.html">Qpid Messaging API</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Servers and tools</h3>
-
-            <ul>
-              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
-              <li><a href="/components/cpp-broker/index.html">C++ broker</a></li>
-              <li><a href="/components/dispatch-router/index.html">Dispatch router</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Resources</h3>
-
-            <ul>
-              <li><a href="/dashboard.html">Dashboard</a></li>
-              <li><a href="https://cwiki.apache.org/confluence/display/qpid/Index">Wiki</a></li>
-              <li><a href="/resources.html">More resources</a></li>
-            </ul>
-          </section>
-        </div>
-      </div>
-
-      <div id="-search" class="panel" style="display: none;">
-        <form action="http://www.google.com/search" method="get">
-          <input type="hidden" name="sitesearch" value="qpid.apache.org"/>
-          <input type="text" name="q" maxlength="255" autofocus="autofocus" tabindex="1"/>
-          <button type="submit">Search</button>
-          <a href="/search.html">More ways to search</a>
-        </form>
-      </div>
-
-      <div id="-middle" class="panel">
-        <ul id="-path-navigation"><li><a href="/index.html">Home</a></li><li><a href="/releases/index.html">Releases</a></li><li><a href="/releases/qpid-java-trunk/index.html">Qpid for Java Trunk</a></li><li><a href="/releases/qpid-java-trunk/java-broker/book/index.html">Apache Qpid Broker for Java</a></li><li>2.6.&#160;Optional Dependencies</li></ul>
-
-        <div id="-middle-content">
-          <div class="docbook"><div class="navheader"><table summary="Navigation header" width="100%"><tr><th align="center" colspan="3">2.6.&#160;Optional Dependencies</th></tr><tr><td align="left" width="20%"><a accesskey="p" href="Java-Broker-Installation-InstallationUnix.html">Prev</a>&#160;</td><th align="center" width="60%">Chapter&#160;2.&#160;Installation</th><td align="right" width="20%">&#160;<a accesskey="n" href="Java-Broker-Getting-Started.html">Next</a></td></tr></table><hr [...]
-      <a class="xref" href="Java-Broker-Miscellaneous-Installing-Oracle-BDB-JE.html" title="E.3.&#160;Installing Oracle BDB JE">Section&#160;E.3, &#8220;Installing Oracle BDB JE&#8221;</a> and <a class="xref" href="Java-Broker-Miscellaneous-Installing-External-JDBC-Driver.html" title="E.2.&#160;Installing External JDBC Driver">Section&#160;E.2, &#8220;Installing External JDBC Driver&#8221;</a> for details of
-      installing their dependencies.</p></div><div class="navfooter"><hr /><table summary="Navigation footer" width="100%"><tr><td align="left" width="40%"><a accesskey="p" href="Java-Broker-Installation-InstallationUnix.html">Prev</a>&#160;</td><td align="center" width="20%"><a accesskey="u" href="Java-Broker-Installation.html">Up</a></td><td align="right" width="40%">&#160;<a accesskey="n" href="Java-Broker-Getting-Started.html">Next</a></td></tr><tr><td align="left" valign="top" width [...]
-
-          <hr/>
-
-          <ul id="-apache-navigation">
-            <li><a href="http://www.apache.org/">Apache</a></li>
-            <li><a href="http://www.apache.org/licenses/">License</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="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
-          </ul>
-
-          <p id="-legal">
-            Apache Qpid, Messaging built on AMQP; Copyright &#169; 2015
-            The Apache Software Foundation; Licensed under
-            the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
-            License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
-            project logo are trademarks of The Apache Software
-            Foundation; All other marks mentioned may be trademarks or
-            registered trademarks of their respective owners
-          </p>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Installation-Prerequistes.html b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Installation-Prerequistes.html
deleted file mode 100644
index a9d88e0..0000000
--- a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Installation-Prerequistes.html
+++ /dev/null
@@ -1,163 +0,0 @@
-<!DOCTYPE html>
-<!--
- -
- - 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.
- -
--->
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-  <head>
-    <title>2.2.&#160;Prerequisites - Apache Qpid&#8482;</title>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-    <link rel="stylesheet" href="/site.css" type="text/css" async="async"/>
-    <link rel="stylesheet" href="/deferred.css" type="text/css" defer="defer"/>
-    <script type="text/javascript">var _deferredFunctions = [];</script>
-    <script type="text/javascript" src="/deferred.js" defer="defer"></script>
-    <!--[if lte IE 8]>
-      <link rel="stylesheet" href="/ie.css" type="text/css"/>
-      <script type="text/javascript" src="/html5shiv.js"></script>
-    <![endif]-->
-
-    <!-- Redirects for `go get` and godoc.org -->
-    <meta name="go-import"
-          content="qpid.apache.org git https://gitbox.apache.org/repos/asf/qpid-proton.git"/>
-    <meta name="go-source"
-          content="qpid.apache.org
-https://github.com/apache/qpid-proton/blob/go1/README.md
-https://github.com/apache/qpid-proton/tree/go1{/dir}
-https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
-  </head>
-  <body>
-    <div id="-content">
-      <div id="-top" class="panel">
-        <a id="-menu-link"><img width="16" height="16" src="" alt="Menu"/></a>
-
-        <a id="-search-link"><img width="22" height="16" src="" alt="Search"/></a>
-
-        <ul id="-global-navigation">
-          <li><a id="-logotype" href="/index.html">Apache Qpid<sup>&#8482;</sup></a></li>
-          <li><a href="/documentation.html">Documentation</a></li>
-          <li><a href="/download.html">Download</a></li>
-          <li><a href="/discussion.html">Discussion</a></li>
-        </ul>
-      </div>
-
-      <div id="-menu" class="panel" style="display: none;">
-        <div class="flex">
-          <section>
-            <h3>Project</h3>
-
-            <ul>
-              <li><a href="/overview.html">Overview</a></li>
-              <li><a href="/components/index.html">Components</a></li>
-              <li><a href="/releases/index.html">Releases</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Messaging APIs</h3>
-
-            <ul>
-              <li><a href="/proton/index.html">Qpid Proton</a></li>
-              <li><a href="/components/jms/index.html">Qpid JMS</a></li>
-              <li><a href="/components/messaging-api/index.html">Qpid Messaging API</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Servers and tools</h3>
-
-            <ul>
-              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
-              <li><a href="/components/cpp-broker/index.html">C++ broker</a></li>
-              <li><a href="/components/dispatch-router/index.html">Dispatch router</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Resources</h3>
-
-            <ul>
-              <li><a href="/dashboard.html">Dashboard</a></li>
-              <li><a href="https://cwiki.apache.org/confluence/display/qpid/Index">Wiki</a></li>
-              <li><a href="/resources.html">More resources</a></li>
-            </ul>
-          </section>
-        </div>
-      </div>
-
-      <div id="-search" class="panel" style="display: none;">
-        <form action="http://www.google.com/search" method="get">
-          <input type="hidden" name="sitesearch" value="qpid.apache.org"/>
-          <input type="text" name="q" maxlength="255" autofocus="autofocus" tabindex="1"/>
-          <button type="submit">Search</button>
-          <a href="/search.html">More ways to search</a>
-        </form>
-      </div>
-
-      <div id="-middle" class="panel">
-        <ul id="-path-navigation"><li><a href="/index.html">Home</a></li><li><a href="/releases/index.html">Releases</a></li><li><a href="/releases/qpid-java-trunk/index.html">Qpid for Java Trunk</a></li><li><a href="/releases/qpid-java-trunk/java-broker/book/index.html">Apache Qpid Broker for Java</a></li><li>2.2.&#160;Prerequisites</li></ul>
-
-        <div id="-middle-content">
-          <div class="docbook"><div class="navheader"><table summary="Navigation header" width="100%"><tr><th align="center" colspan="3">2.2.&#160;Prerequisites</th></tr><tr><td align="left" width="20%"><a accesskey="p" href="Java-Broker-Installation.html">Prev</a>&#160;</td><th align="center" width="60%">Chapter&#160;2.&#160;Installation</th><td align="right" width="20%">&#160;<a accesskey="n" href="Java-Broker-Installation-Download.html">Next</a></td></tr></table><hr /></div><div class [...]
-        operating system supporting Java 1.7  or higher<a class="footnote" href="#ftn.d0e103" id="d0e103"><sup class="footnote">[4]</sup></a>. This includes Linux, Solaris, Mac OS X, and
-        Windows XP/Vista/7/8.</p><p> The broker has been tested with Java implementations from both Oracle and IBM. Whatever
-        platform you chose, it is recommended that you ensure it is patched with any critical
-        updates made available from the vendor. </p><p> Verify that your JVM is installed properly by following <a class="link" href="Java-Broker-Miscellaneous.html#Java-Broker-Miscellaneous-JVM-Verification" title="E.1.&#160;JVM Installation verification">these instructions.</a>
-      </p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="Java-Broker-Installation-Prerequistes-Disk"></a>2.2.2.&#160;Disk</h3></div></div></div><p>The Broker installation requires approximately 20MB of free disk space.</p><p>The Broker also requires a working directory. The working directory is used for the
-        message store, that is, the area of the file-system used to record messages
-        whilst they are passing through the Broker. The working directory is also used for the
-        default location of the log file. The size of the working directory will depend on the how
-        the Broker is used.</p><p>The performance of the file system hosting the work directory is key to the performance
-        of Broker as a whole. For best performance, choose a device that has low latency and one
-        that is uncontended by other applications.</p><p>Be aware that there are additional considerations if you are considering hosting the
-        working directory on NFS.</p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="Java-Broker-Installation-Prerequistes-Memory"></a>2.2.3.&#160;Memory</h3></div></div></div><p>Qpid caches messages in memory for performance reasons, so in general, the Broker will
-        benefit from as much memory as possible. However, on a 32bit JVM, the maximum addressable
-        memory range for a process is 4GB, after leaving space for the JVM's own use this will give
-        a maximum usable size of approximately ~3.7GB.</p><p>See <a class="xref" href="Java-Broker-Runtime-Memory.html" title="9.10.&#160;Memory">Section&#160;9.10, &#8220;Memory&#8221;</a> for a full description of how memory is
-        used.</p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="Java-Broker-Installation-Prerequistes-OperatingSystemAccount"></a>2.2.4.&#160;Operating System Account</h3></div></div></div><p>Installation or operation of Qpid does <span class="emphasis"><em>not</em></span> require a privileged
-        account (i.e. root on UNIX platforms or Administrator on Windows). However it is suggested
-        that you use an dedicated account (e.g. qpid) for the installation and operation of the Broker.</p></div><div class="footnotes"><br /><hr style="width:100; text-align:left;margin-left: 0" /><div class="footnote" id="ftn.d0e103"><p><a class="para" href="#d0e103"><sup class="para">[4] </sup></a>Java Cryptography Extension (JCE)
-          Unlimited Strength policy file are required for some features</p></div></div></div><div class="navfooter"><hr /><table summary="Navigation footer" width="100%"><tr><td align="left" width="40%"><a accesskey="p" href="Java-Broker-Installation.html">Prev</a>&#160;</td><td align="center" width="20%"><a accesskey="u" href="Java-Broker-Installation.html">Up</a></td><td align="right" width="40%">&#160;<a accesskey="n" href="Java-Broker-Installation-Download.html">Next</a></td></tr><tr [...]
-
-          <hr/>
-
-          <ul id="-apache-navigation">
-            <li><a href="http://www.apache.org/">Apache</a></li>
-            <li><a href="http://www.apache.org/licenses/">License</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="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
-          </ul>
-
-          <p id="-legal">
-            Apache Qpid, Messaging built on AMQP; Copyright &#169; 2015
-            The Apache Software Foundation; Licensed under
-            the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
-            License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
-            project logo are trademarks of The Apache Software
-            Foundation; All other marks mentioned may be trademarks or
-            registered trademarks of their respective owners
-          </p>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Installation.html b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Installation.html
deleted file mode 100644
index 798f0ab..0000000
--- a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Installation.html
+++ /dev/null
@@ -1,145 +0,0 @@
-<!DOCTYPE html>
-<!--
- -
- - 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.
- -
--->
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-  <head>
-    <title>Chapter&#160;2.&#160;Installation - Apache Qpid&#8482;</title>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-    <link rel="stylesheet" href="/site.css" type="text/css" async="async"/>
-    <link rel="stylesheet" href="/deferred.css" type="text/css" defer="defer"/>
-    <script type="text/javascript">var _deferredFunctions = [];</script>
-    <script type="text/javascript" src="/deferred.js" defer="defer"></script>
-    <!--[if lte IE 8]>
-      <link rel="stylesheet" href="/ie.css" type="text/css"/>
-      <script type="text/javascript" src="/html5shiv.js"></script>
-    <![endif]-->
-
-    <!-- Redirects for `go get` and godoc.org -->
-    <meta name="go-import"
-          content="qpid.apache.org git https://gitbox.apache.org/repos/asf/qpid-proton.git"/>
-    <meta name="go-source"
-          content="qpid.apache.org
-https://github.com/apache/qpid-proton/blob/go1/README.md
-https://github.com/apache/qpid-proton/tree/go1{/dir}
-https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
-  </head>
-  <body>
-    <div id="-content">
-      <div id="-top" class="panel">
-        <a id="-menu-link"><img width="16" height="16" src="" alt="Menu"/></a>
-
-        <a id="-search-link"><img width="22" height="16" src="" alt="Search"/></a>
-
-        <ul id="-global-navigation">
-          <li><a id="-logotype" href="/index.html">Apache Qpid<sup>&#8482;</sup></a></li>
-          <li><a href="/documentation.html">Documentation</a></li>
-          <li><a href="/download.html">Download</a></li>
-          <li><a href="/discussion.html">Discussion</a></li>
-        </ul>
-      </div>
-
-      <div id="-menu" class="panel" style="display: none;">
-        <div class="flex">
-          <section>
-            <h3>Project</h3>
-
-            <ul>
-              <li><a href="/overview.html">Overview</a></li>
-              <li><a href="/components/index.html">Components</a></li>
-              <li><a href="/releases/index.html">Releases</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Messaging APIs</h3>
-
-            <ul>
-              <li><a href="/proton/index.html">Qpid Proton</a></li>
-              <li><a href="/components/jms/index.html">Qpid JMS</a></li>
-              <li><a href="/components/messaging-api/index.html">Qpid Messaging API</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Servers and tools</h3>
-
-            <ul>
-              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
-              <li><a href="/components/cpp-broker/index.html">C++ broker</a></li>
-              <li><a href="/components/dispatch-router/index.html">Dispatch router</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Resources</h3>
-
-            <ul>
-              <li><a href="/dashboard.html">Dashboard</a></li>
-              <li><a href="https://cwiki.apache.org/confluence/display/qpid/Index">Wiki</a></li>
-              <li><a href="/resources.html">More resources</a></li>
-            </ul>
-          </section>
-        </div>
-      </div>
-
-      <div id="-search" class="panel" style="display: none;">
-        <form action="http://www.google.com/search" method="get">
-          <input type="hidden" name="sitesearch" value="qpid.apache.org"/>
-          <input type="text" name="q" maxlength="255" autofocus="autofocus" tabindex="1"/>
-          <button type="submit">Search</button>
-          <a href="/search.html">More ways to search</a>
-        </form>
-      </div>
-
-      <div id="-middle" class="panel">
-        <ul id="-path-navigation"><li><a href="/index.html">Home</a></li><li><a href="/releases/index.html">Releases</a></li><li><a href="/releases/qpid-java-trunk/index.html">Qpid for Java Trunk</a></li><li><a href="/releases/qpid-java-trunk/java-broker/book/index.html">Apache Qpid Broker for Java</a></li><li>Chapter&#160;2.&#160;Installation</li></ul>
-
-        <div id="-middle-content">
-          <div class="docbook"><div class="navheader"><table summary="Navigation header" width="100%"><tr><th align="center" colspan="3">Chapter&#160;2.&#160;Installation</th></tr><tr><td align="left" width="20%"><a accesskey="p" href="Java-Broker-Introduction.html">Prev</a>&#160;</td><th align="center" width="60%">&#160;</th><td align="right" width="20%">&#160;<a accesskey="n" href="Java-Broker-Installation-Prerequistes.html">Next</a></td></tr></table><hr /></div><div class="chapter"><d [...]
-      platforms.</p></div></div><div class="navfooter"><hr /><table summary="Navigation footer" width="100%"><tr><td align="left" width="40%"><a accesskey="p" href="Java-Broker-Introduction.html">Prev</a>&#160;</td><td align="center" width="20%">&#160;</td><td align="right" width="40%">&#160;<a accesskey="n" href="Java-Broker-Installation-Prerequistes.html">Next</a></td></tr><tr><td align="left" valign="top" width="40%">Chapter&#160;1.&#160;Introduction&#160;</td><td align="center" width [...]
-
-          <hr/>
-
-          <ul id="-apache-navigation">
-            <li><a href="http://www.apache.org/">Apache</a></li>
-            <li><a href="http://www.apache.org/licenses/">License</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="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
-          </ul>
-
-          <p id="-legal">
-            Apache Qpid, Messaging built on AMQP; Copyright &#169; 2015
-            The Apache Software Foundation; Licensed under
-            the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
-            License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
-            project logo are trademarks of The Apache Software
-            Foundation; All other marks mentioned may be trademarks or
-            registered trademarks of their respective owners
-          </p>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Introduction.html b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Introduction.html
deleted file mode 100644
index bb5b23d..0000000
--- a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Introduction.html
+++ /dev/null
@@ -1,150 +0,0 @@
-<!DOCTYPE html>
-<!--
- -
- - 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.
- -
--->
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-  <head>
-    <title>Chapter&#160;1.&#160;Introduction - Apache Qpid&#8482;</title>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-    <link rel="stylesheet" href="/site.css" type="text/css" async="async"/>
-    <link rel="stylesheet" href="/deferred.css" type="text/css" defer="defer"/>
-    <script type="text/javascript">var _deferredFunctions = [];</script>
-    <script type="text/javascript" src="/deferred.js" defer="defer"></script>
-    <!--[if lte IE 8]>
-      <link rel="stylesheet" href="/ie.css" type="text/css"/>
-      <script type="text/javascript" src="/html5shiv.js"></script>
-    <![endif]-->
-
-    <!-- Redirects for `go get` and godoc.org -->
-    <meta name="go-import"
-          content="qpid.apache.org git https://gitbox.apache.org/repos/asf/qpid-proton.git"/>
-    <meta name="go-source"
-          content="qpid.apache.org
-https://github.com/apache/qpid-proton/blob/go1/README.md
-https://github.com/apache/qpid-proton/tree/go1{/dir}
-https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
-  </head>
-  <body>
-    <div id="-content">
-      <div id="-top" class="panel">
-        <a id="-menu-link"><img width="16" height="16" src="" alt="Menu"/></a>
-
-        <a id="-search-link"><img width="22" height="16" src="" alt="Search"/></a>
-
-        <ul id="-global-navigation">
-          <li><a id="-logotype" href="/index.html">Apache Qpid<sup>&#8482;</sup></a></li>
-          <li><a href="/documentation.html">Documentation</a></li>
-          <li><a href="/download.html">Download</a></li>
-          <li><a href="/discussion.html">Discussion</a></li>
-        </ul>
-      </div>
-
-      <div id="-menu" class="panel" style="display: none;">
-        <div class="flex">
-          <section>
-            <h3>Project</h3>
-
-            <ul>
-              <li><a href="/overview.html">Overview</a></li>
-              <li><a href="/components/index.html">Components</a></li>
-              <li><a href="/releases/index.html">Releases</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Messaging APIs</h3>
-
-            <ul>
-              <li><a href="/proton/index.html">Qpid Proton</a></li>
-              <li><a href="/components/jms/index.html">Qpid JMS</a></li>
-              <li><a href="/components/messaging-api/index.html">Qpid Messaging API</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Servers and tools</h3>
-
-            <ul>
-              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
-              <li><a href="/components/cpp-broker/index.html">C++ broker</a></li>
-              <li><a href="/components/dispatch-router/index.html">Dispatch router</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Resources</h3>
-
-            <ul>
-              <li><a href="/dashboard.html">Dashboard</a></li>
-              <li><a href="https://cwiki.apache.org/confluence/display/qpid/Index">Wiki</a></li>
-              <li><a href="/resources.html">More resources</a></li>
-            </ul>
-          </section>
-        </div>
-      </div>
-
-      <div id="-search" class="panel" style="display: none;">
-        <form action="http://www.google.com/search" method="get">
-          <input type="hidden" name="sitesearch" value="qpid.apache.org"/>
-          <input type="text" name="q" maxlength="255" autofocus="autofocus" tabindex="1"/>
-          <button type="submit">Search</button>
-          <a href="/search.html">More ways to search</a>
-        </form>
-      </div>
-
-      <div id="-middle" class="panel">
-        <ul id="-path-navigation"><li><a href="/index.html">Home</a></li><li><a href="/releases/index.html">Releases</a></li><li><a href="/releases/qpid-java-trunk/index.html">Qpid for Java Trunk</a></li><li><a href="/releases/qpid-java-trunk/java-broker/book/index.html">Apache Qpid Broker for Java</a></li><li>Chapter&#160;1.&#160;Introduction</li></ul>
-
-        <div id="-middle-content">
-          <div class="docbook"><div class="navheader"><table summary="Navigation header" width="100%"><tr><th align="center" colspan="3">Chapter&#160;1.&#160;Introduction</th></tr><tr><td align="left" width="20%"><a accesskey="p" href="AMQP-Messaging-Broker-Java-Book.html">Prev</a>&#160;</td><th align="center" width="60%">&#160;</th><td align="right" width="20%">&#160;<a accesskey="n" href="Java-Broker-Installation.html">Next</a></td></tr></table><hr /></div><div class="chapter"><div cla [...]
-      <a class="link" href="http://www.amqp.org" target="_top"> Advanced Message Queuing Protocol (AMQP)</a>. The Apache Qpid Broker for Java
-    is actually one of two message brokers provided by the <a class="link" href="http://qpid.apache.org" target="_top">Apache Qpid project</a>: Broker for Java and the C++
-    Broker.</p><p>This document relates to the Apache Qpid Broker for Java. The <a class="link" href="/releases/qpid-cpp-1.39.0/cpp-broker/book/" target="_top">C++ Broker is
-    described separately</a>.</p><p><span class="emphasis"><em>Headline features</em></span></p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: circle; "><li class="listitem" style="list-style-type: circle"><p>100% Java implementation - runs on any platform supporting Java 1.7 or higher</p></li><li class="listitem" style="list-style-type: circle"><p>Messaging clients support in Java, C++, Python.</p></li><li class="listitem" style="list-style-type: circle"><p>J [...]
-        etc).</p></li><li class="listitem" style="list-style-type: circle"><p>Transaction support including XA<a class="footnote" href="#ftn.d0e44" id="d0e44"><sup class="footnote">[1]</sup></a></p></li><li class="listitem" style="list-style-type: circle"><p>Supports for all versions of the AMQP protocol</p></li><li class="listitem" style="list-style-type: circle"><p>Automatic message translation, allowing clients using different AMQP versions to communicate with each other.</p></li><li  [...]
-        External, OAuth2, and file-based authentication mechanisms.</p></li><li class="listitem" style="list-style-type: circle"><p>Support for message compression</p></li><li class="listitem" style="list-style-type: circle"><p>Client support for end to end message encryption</p></li><li class="listitem" style="list-style-type: circle"><p>Pluggable storage architecture with implementations including <a class="link" href="http://db.apache.org/derby/" target="_top">Apache Derby</a>, <a cla [...]
-
-          <hr/>
-
-          <ul id="-apache-navigation">
-            <li><a href="http://www.apache.org/">Apache</a></li>
-            <li><a href="http://www.apache.org/licenses/">License</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="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
-          </ul>
-
-          <p id="-legal">
-            Apache Qpid, Messaging built on AMQP; Copyright &#169; 2015
-            The Apache Software Foundation; Licensed under
-            the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
-            License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
-            project logo are trademarks of The Apache Software
-            Foundation; All other marks mentioned may be trademarks or
-            registered trademarks of their respective owners
-          </p>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Management-Channel-AMQP-Intrinstic.html b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Management-Channel-AMQP-Intrinstic.html
deleted file mode 100644
index 104d0aa..0000000
--- a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Management-Channel-AMQP-Intrinstic.html
+++ /dev/null
@@ -1,146 +0,0 @@
-<!DOCTYPE html>
-<!--
- -
- - 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.
- -
--->
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-  <head>
-    <title>6.4.&#160;AMQP Intrinstic Management - Apache Qpid&#8482;</title>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-    <link rel="stylesheet" href="/site.css" type="text/css" async="async"/>
-    <link rel="stylesheet" href="/deferred.css" type="text/css" defer="defer"/>
-    <script type="text/javascript">var _deferredFunctions = [];</script>
-    <script type="text/javascript" src="/deferred.js" defer="defer"></script>
-    <!--[if lte IE 8]>
-      <link rel="stylesheet" href="/ie.css" type="text/css"/>
-      <script type="text/javascript" src="/html5shiv.js"></script>
-    <![endif]-->
-
-    <!-- Redirects for `go get` and godoc.org -->
-    <meta name="go-import"
-          content="qpid.apache.org git https://gitbox.apache.org/repos/asf/qpid-proton.git"/>
-    <meta name="go-source"
-          content="qpid.apache.org
-https://github.com/apache/qpid-proton/blob/go1/README.md
-https://github.com/apache/qpid-proton/tree/go1{/dir}
-https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
-  </head>
-  <body>
-    <div id="-content">
-      <div id="-top" class="panel">
-        <a id="-menu-link"><img width="16" height="16" src="" alt="Menu"/></a>
-
-        <a id="-search-link"><img width="22" height="16" src="" alt="Search"/></a>
-
-        <ul id="-global-navigation">
-          <li><a id="-logotype" href="/index.html">Apache Qpid<sup>&#8482;</sup></a></li>
-          <li><a href="/documentation.html">Documentation</a></li>
-          <li><a href="/download.html">Download</a></li>
-          <li><a href="/discussion.html">Discussion</a></li>
-        </ul>
-      </div>
-
-      <div id="-menu" class="panel" style="display: none;">
-        <div class="flex">
-          <section>
-            <h3>Project</h3>
-
-            <ul>
-              <li><a href="/overview.html">Overview</a></li>
-              <li><a href="/components/index.html">Components</a></li>
-              <li><a href="/releases/index.html">Releases</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Messaging APIs</h3>
-
-            <ul>
-              <li><a href="/proton/index.html">Qpid Proton</a></li>
-              <li><a href="/components/jms/index.html">Qpid JMS</a></li>
-              <li><a href="/components/messaging-api/index.html">Qpid Messaging API</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Servers and tools</h3>
-
-            <ul>
-              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
-              <li><a href="/components/cpp-broker/index.html">C++ broker</a></li>
-              <li><a href="/components/dispatch-router/index.html">Dispatch router</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Resources</h3>
-
-            <ul>
-              <li><a href="/dashboard.html">Dashboard</a></li>
-              <li><a href="https://cwiki.apache.org/confluence/display/qpid/Index">Wiki</a></li>
-              <li><a href="/resources.html">More resources</a></li>
-            </ul>
-          </section>
-        </div>
-      </div>
-
-      <div id="-search" class="panel" style="display: none;">
-        <form action="http://www.google.com/search" method="get">
-          <input type="hidden" name="sitesearch" value="qpid.apache.org"/>
-          <input type="text" name="q" maxlength="255" autofocus="autofocus" tabindex="1"/>
-          <button type="submit">Search</button>
-          <a href="/search.html">More ways to search</a>
-        </form>
-      </div>
-
-      <div id="-middle" class="panel">
-        <ul id="-path-navigation"><li><a href="/index.html">Home</a></li><li><a href="/releases/index.html">Releases</a></li><li><a href="/releases/qpid-java-trunk/index.html">Qpid for Java Trunk</a></li><li><a href="/releases/qpid-java-trunk/java-broker/book/index.html">Apache Qpid Broker for Java</a></li><li>6.4.&#160;AMQP Intrinstic Management</li></ul>
-
-        <div id="-middle-content">
-          <div class="docbook"><div class="navheader"><table summary="Navigation header" width="100%"><tr><th align="center" colspan="3">6.4.&#160;AMQP Intrinstic Management</th></tr><tr><td align="left" width="20%"><a accesskey="p" href="Java-Broker-Management-Channel-REST-API.html">Prev</a>&#160;</td><th align="center" width="60%">Chapter&#160;6.&#160;Management Channels</th><td align="right" width="20%">&#160;<a accesskey="n" href="Java-Broker-Management-Channel-QMF.html">Next</a></td [...]
-        and Bindings.</p><p>The exact details of how to utilise this commands depends of the client. See the
-        documentation accompanying the client for details.</p></div><div class="navfooter"><hr /><table summary="Navigation footer" width="100%"><tr><td align="left" width="40%"><a accesskey="p" href="Java-Broker-Management-Channel-REST-API.html">Prev</a>&#160;</td><td align="center" width="20%"><a accesskey="u" href="Java-Broker-Management-Channel.html">Up</a></td><td align="right" width="40%">&#160;<a accesskey="n" href="Java-Broker-Management-Channel-QMF.html">Next</a></td></tr><tr><t [...]
-
-          <hr/>
-
-          <ul id="-apache-navigation">
-            <li><a href="http://www.apache.org/">Apache</a></li>
-            <li><a href="http://www.apache.org/licenses/">License</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="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
-          </ul>
-
-          <p id="-legal">
-            Apache Qpid, Messaging built on AMQP; Copyright &#169; 2015
-            The Apache Software Foundation; Licensed under
-            the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
-            License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
-            project logo are trademarks of The Apache Software
-            Foundation; All other marks mentioned may be trademarks or
-            registered trademarks of their respective owners
-          </p>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Management-Channel-QMF.html b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Management-Channel-QMF.html
deleted file mode 100644
index f6316be..0000000
--- a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Management-Channel-QMF.html
+++ /dev/null
@@ -1,144 +0,0 @@
-<!DOCTYPE html>
-<!--
- -
- - 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.
- -
--->
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-  <head>
-    <title>6.5.&#160;QMF - Apache Qpid&#8482;</title>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-    <link rel="stylesheet" href="/site.css" type="text/css" async="async"/>
-    <link rel="stylesheet" href="/deferred.css" type="text/css" defer="defer"/>
-    <script type="text/javascript">var _deferredFunctions = [];</script>
-    <script type="text/javascript" src="/deferred.js" defer="defer"></script>
-    <!--[if lte IE 8]>
-      <link rel="stylesheet" href="/ie.css" type="text/css"/>
-      <script type="text/javascript" src="/html5shiv.js"></script>
-    <![endif]-->
-
-    <!-- Redirects for `go get` and godoc.org -->
-    <meta name="go-import"
-          content="qpid.apache.org git https://gitbox.apache.org/repos/asf/qpid-proton.git"/>
-    <meta name="go-source"
-          content="qpid.apache.org
-https://github.com/apache/qpid-proton/blob/go1/README.md
-https://github.com/apache/qpid-proton/tree/go1{/dir}
-https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
-  </head>
-  <body>
-    <div id="-content">
-      <div id="-top" class="panel">
-        <a id="-menu-link"><img width="16" height="16" src="" alt="Menu"/></a>
-
-        <a id="-search-link"><img width="22" height="16" src="" alt="Search"/></a>
-
-        <ul id="-global-navigation">
-          <li><a id="-logotype" href="/index.html">Apache Qpid<sup>&#8482;</sup></a></li>
-          <li><a href="/documentation.html">Documentation</a></li>
-          <li><a href="/download.html">Download</a></li>
-          <li><a href="/discussion.html">Discussion</a></li>
-        </ul>
-      </div>
-
-      <div id="-menu" class="panel" style="display: none;">
-        <div class="flex">
-          <section>
-            <h3>Project</h3>
-
-            <ul>
-              <li><a href="/overview.html">Overview</a></li>
-              <li><a href="/components/index.html">Components</a></li>
-              <li><a href="/releases/index.html">Releases</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Messaging APIs</h3>
-
-            <ul>
-              <li><a href="/proton/index.html">Qpid Proton</a></li>
-              <li><a href="/components/jms/index.html">Qpid JMS</a></li>
-              <li><a href="/components/messaging-api/index.html">Qpid Messaging API</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Servers and tools</h3>
-
-            <ul>
-              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
-              <li><a href="/components/cpp-broker/index.html">C++ broker</a></li>
-              <li><a href="/components/dispatch-router/index.html">Dispatch router</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Resources</h3>
-
-            <ul>
-              <li><a href="/dashboard.html">Dashboard</a></li>
-              <li><a href="https://cwiki.apache.org/confluence/display/qpid/Index">Wiki</a></li>
-              <li><a href="/resources.html">More resources</a></li>
-            </ul>
-          </section>
-        </div>
-      </div>
-
-      <div id="-search" class="panel" style="display: none;">
-        <form action="http://www.google.com/search" method="get">
-          <input type="hidden" name="sitesearch" value="qpid.apache.org"/>
-          <input type="text" name="q" maxlength="255" autofocus="autofocus" tabindex="1"/>
-          <button type="submit">Search</button>
-          <a href="/search.html">More ways to search</a>
-        </form>
-      </div>
-
-      <div id="-middle" class="panel">
-        <ul id="-path-navigation"><li><a href="/index.html">Home</a></li><li><a href="/releases/index.html">Releases</a></li><li><a href="/releases/qpid-java-trunk/index.html">Qpid for Java Trunk</a></li><li><a href="/releases/qpid-java-trunk/java-broker/book/index.html">Apache Qpid Broker for Java</a></li><li>6.5.&#160;QMF</li></ul>
-
-        <div id="-middle-content">
-          <div class="docbook"><div class="navheader"><table summary="Navigation header" width="100%"><tr><th align="center" colspan="3">6.5.&#160;QMF</th></tr><tr><td align="left" width="20%"><a accesskey="p" href="Java-Broker-Management-Channel-AMQP-Intrinstic.html">Prev</a>&#160;</td><th align="center" width="60%">Chapter&#160;6.&#160;Management Channels</th><td align="right" width="20%">&#160;<a accesskey="n" href="Java-Broker-Management-Managing-Entities.html">Next</a></td></tr></ta [...]
-
-          <hr/>
-
-          <ul id="-apache-navigation">
-            <li><a href="http://www.apache.org/">Apache</a></li>
-            <li><a href="http://www.apache.org/licenses/">License</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="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
-          </ul>
-
-          <p id="-legal">
-            Apache Qpid, Messaging built on AMQP; Copyright &#169; 2015
-            The Apache Software Foundation; Licensed under
-            the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
-            License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
-            project logo are trademarks of The Apache Software
-            Foundation; All other marks mentioned may be trademarks or
-            registered trademarks of their respective owners
-          </p>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Management-Channel-REST-API.html b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Management-Channel-REST-API.html
deleted file mode 100644
index 436e3c7..0000000
--- a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Management-Channel-REST-API.html
+++ /dev/null
@@ -1,287 +0,0 @@
-<!DOCTYPE html>
-<!--
- -
- - 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.
- -
--->
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-  <head>
-    <title>6.3.&#160;REST API - Apache Qpid&#8482;</title>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-    <link rel="stylesheet" href="/site.css" type="text/css" async="async"/>
-    <link rel="stylesheet" href="/deferred.css" type="text/css" defer="defer"/>
-    <script type="text/javascript">var _deferredFunctions = [];</script>
-    <script type="text/javascript" src="/deferred.js" defer="defer"></script>
-    <!--[if lte IE 8]>
-      <link rel="stylesheet" href="/ie.css" type="text/css"/>
-      <script type="text/javascript" src="/html5shiv.js"></script>
-    <![endif]-->
-
-    <!-- Redirects for `go get` and godoc.org -->
-    <meta name="go-import"
-          content="qpid.apache.org git https://gitbox.apache.org/repos/asf/qpid-proton.git"/>
-    <meta name="go-source"
-          content="qpid.apache.org
-https://github.com/apache/qpid-proton/blob/go1/README.md
-https://github.com/apache/qpid-proton/tree/go1{/dir}
-https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
-  </head>
-  <body>
-    <div id="-content">
-      <div id="-top" class="panel">
-        <a id="-menu-link"><img width="16" height="16" src="" alt="Menu"/></a>
-
-        <a id="-search-link"><img width="22" height="16" src="" alt="Search"/></a>
-
-        <ul id="-global-navigation">
-          <li><a id="-logotype" href="/index.html">Apache Qpid<sup>&#8482;</sup></a></li>
-          <li><a href="/documentation.html">Documentation</a></li>
-          <li><a href="/download.html">Download</a></li>
-          <li><a href="/discussion.html">Discussion</a></li>
-        </ul>
-      </div>
-
-      <div id="-menu" class="panel" style="display: none;">
-        <div class="flex">
-          <section>
-            <h3>Project</h3>
-
-            <ul>
-              <li><a href="/overview.html">Overview</a></li>
-              <li><a href="/components/index.html">Components</a></li>
-              <li><a href="/releases/index.html">Releases</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Messaging APIs</h3>
-
-            <ul>
-              <li><a href="/proton/index.html">Qpid Proton</a></li>
-              <li><a href="/components/jms/index.html">Qpid JMS</a></li>
-              <li><a href="/components/messaging-api/index.html">Qpid Messaging API</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Servers and tools</h3>
-
-            <ul>
-              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
-              <li><a href="/components/cpp-broker/index.html">C++ broker</a></li>
-              <li><a href="/components/dispatch-router/index.html">Dispatch router</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Resources</h3>
-
-            <ul>
-              <li><a href="/dashboard.html">Dashboard</a></li>
-              <li><a href="https://cwiki.apache.org/confluence/display/qpid/Index">Wiki</a></li>
-              <li><a href="/resources.html">More resources</a></li>
-            </ul>
-          </section>
-        </div>
-      </div>
-
-      <div id="-search" class="panel" style="display: none;">
-        <form action="http://www.google.com/search" method="get">
-          <input type="hidden" name="sitesearch" value="qpid.apache.org"/>
-          <input type="text" name="q" maxlength="255" autofocus="autofocus" tabindex="1"/>
-          <button type="submit">Search</button>
-          <a href="/search.html">More ways to search</a>
-        </form>
-      </div>
-
-      <div id="-middle" class="panel">
-        <ul id="-path-navigation"><li><a href="/index.html">Home</a></li><li><a href="/releases/index.html">Releases</a></li><li><a href="/releases/qpid-java-trunk/index.html">Qpid for Java Trunk</a></li><li><a href="/releases/qpid-java-trunk/java-broker/book/index.html">Apache Qpid Broker for Java</a></li><li>6.3.&#160;REST API</li></ul>
-
-        <div id="-middle-content">
-          <div class="docbook"><div class="navheader"><table summary="Navigation header" width="100%"><tr><th align="center" colspan="3">6.3.&#160;REST API</th></tr><tr><td align="left" width="20%"><a accesskey="p" href="Java-Broker-Management-Channel-Web-Console.html">Prev</a>&#160;</td><th align="center" width="60%">Chapter&#160;6.&#160;Management Channels</th><td align="right" width="20%">&#160;<a accesskey="n" href="Java-Broker-Management-Channel-AMQP-Intrinstic.html">Next</a></td></ [...]
-      for use by developers who wish to automate the management or monitoring of the Qpid Broker. It
-      is also very useful for adhoc monitoring on the command line using tools such as
-        <code class="literal">curl</code>.</p><p>The REST API provides access to all of the Broker's entities using hierarchical paths
-      expressed by the URI. Responses are returned in JSON format.</p><p>The <code class="literal">GET</code> method request retrieves information about an object, the
-        <code class="literal">DELETE</code> method requests the removal of one, and the <code class="literal">PUT</code>
-      or <code class="literal">POST</code> methods perform updates or create new objects. The
-        <code class="literal">POST</code> method is also used to invoke operations.</p><p>The REST API is versioned with the version number embedded within the URI. The general form
-      of the URI is <code class="literal">/api/&lt;version&gt;</code> where &lt;version&gt; is a dot separated
-      major and minor model version prefixed with "v", for example, "v6.1" (without the quotation marks).
-      For convenience the alias <code class="literal">latest</code> (<code class="literal">/api/latest</code>) signifies the
-      latest supported version.</p><p>There are also some ancillary services under URI <code class="literal">/service</code> used for
-      authentication and logout.</p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="Java-Broker-Management-Channel-REST-API-APIDocs"></a>6.3.2.&#160;REST API documentation</h3></div></div></div><p>REST API documentation is available on-line from any Broker at location
-        <code class="literal">/apidocs</code>. It is also linked from the menu of the Web Management Console.
-    </p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="Java-Broker-Management-Channel-REST-API-Authentication"></a>6.3.3.&#160;Authentication</h3></div></div></div><p>Before you can use the REST API, you must authenticate. Authentication decisions are made
-      by the <a class="link" href="Java-Broker-Concepts-Authentication-Providers.html" title="4.9.&#160;Authentication Providers">authentication
-        provider</a> associated with HTTP <a class="link" href="Java-Broker-Concepts-Ports.html" title="4.8.&#160;Ports">port</a>
-      on which you connect.</p><p>You may authenticate using <a class="link" href="https://www.ietf.org/rfc/rfc4422.txt" target="_top">SASL</a>
-        (<code class="literal">/service/sasl</code>) or <a class="link" href="https://tools.ietf.org/html/rfc2617" target="_top">HTTP
-        Basic Authentication</a>. The latter is convienent when using tools such as
-        <code class="literal">curl</code> on the command line. This is illustrated in the examples
-      below.</p><p>For SASL authentication use a <code class="literal">GET</code> request to
-        <code class="literal">/service/sasl</code> to get a list of supported SASL mechanisms, and use
-        <code class="literal">PUT</code> to the same URL to perform the SASL negotiation.</p><p>It is possible to end an authenticated session using
-      <code class="literal">/service/logout</code>.</p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="Java-Broker-Management-Channel-REST-API-Create"></a>6.3.4.&#160;Configured Object creation</h3></div></div></div><p>Methods PUT or POST can be used to create ConfiguredObject.</p><p> ConfiguredObject can be created by submitting PUT request against ConfiguredObject full
-      URI (the one ending with configured object name) or by submitting PUT/POST request against
-      parent URI. The request encoding should be json (application/json) and request body should
-      contain attributes values in json format. On successful completion of operation a response
-      should be returned having response status code set to 201 and response header "Location" set
-      to ConfiguredObject full URI. If object with a such name/id already exist and POST/PUT
-      requests is made against parent URI, an error response should be returned having response code
-      409 (conflict) and body containing the json with the reason of operation failure. If object
-      with a such name/id already exist and and PUT request is made against ConfiguredObject full
-      URI, then ConfiguredObject update should be performed and http status code 200 should be
-      returned. If ConfiguredObject cannot be created because of validation failure(s) the response
-      should have http status code set 422 (Unprocessible Entity) and body should contain json with
-      the reason of operation failure. On any other failure to create ConfiguredObject the response
-      should have status code set to 400 (Bad Request) and payload should contain a json with error
-      explaining the exact reason of failure. </p><div class="example"><a id="d0e2092"></a><p class="title"><strong>Example&#160;6.1.&#160;Examples of REST calls for Queue creation</strong></p><div class="example-contents"><p> To create Queue with name "my-queue" on a virtual host with name "vh" (which is
-        contained within virtual host node with name "vhn") either of the following requests should
-        be made: </p><pre class="screen">PUT /api/latest/queue/vhn/vh HTTP/1.1</pre><pre class="screen">POST /api/latest/queue/vhn/vh HTTP/1.1</pre><pre class="screen">PUT /api/latest/queue/vhn/vh/my-queue HTTP/1.1</pre><p> Response code 201 should be returned on successful queue creation. Response header
-        "Location" should be set to "/api/latest/queue/test/my-queue". If queue with name "my-queue"
-        already exists and either of 2 first requests above were used, an error response with
-        response code 409 (conflict) and body containing json with message that queue exists should
-        be returned. If queue with name "my-queue" exists and last request is used, then Queue
-        update should occur. </p></div></div><br class="example-break" /></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="Java-Broker-Management-Channel-REST-API-Update"></a>6.3.5.&#160;Configured Object update</h3></div></div></div><p>Methods PUT or POST can be used to update ConfiguredObject.</p><p> ConfiguredObject can be updated by submitting PUT or POST request against
-      ConfiguredObject full URI (the one ending with configured object name). The request encoding
-      should be json (application/json) and request body should contain a ConfiguredObject json
-      (with all or only modified attributes). On successful completion of operation a response code
-      200 should be returned. If ConfiguredObject does not exists and PUT method is used, such
-      object should be created (201 response will be returned in this case). If ConfiguredObject
-      does not exists and POST method is used, an error response should be returned having response
-      status code 404 and payload with json explaining the problem. If any error occur on update, a
-      response with response code 400 or 422 or 404 should be sent back to the client containing
-      json body with error details. </p><div class="example"><a id="d0e2112"></a><p class="title"><strong>Example&#160;6.2.&#160;Examples of REST calls for Queue update</strong></p><div class="example-contents"><p>To update Queue with name "my-queue" on a virtual host with name "vh" (contained in
-        virtual host node with name "vhn") either of the following requests can be made:</p><pre class="screen">POST /api/latest/queue/vhn/vh/my-queue HTTP/1.1</pre><pre class="screen">POST /api/latest/queue/vhn/vh/my-queue HTTP/1.1</pre></div></div><br class="example-break" /></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="Java-Broker-Management-Channel-REST-API-Delete"></a>6.3.6.&#160;Configured Object deletion</h3></div></div></div><p>Method DELETE [...]
-      be deleted with update request having desiredState attribute set to value "DELETED". POST or
-      PUT methods can be used in this case.</p><p>On successful completion of operation a response code 200 should be returned.</p><p>With DELETE method object ConfiguredObject in following ways:</p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p>by submitting DELETE request using ConfiguredObject full URI (the one ending with
-          configured object name)</p></li><li class="listitem"><p>by submitting DELETE request using parent URI and providing parameters having the same
-          names as children attributes, for example, id, name, etc. Multiple children can be deleted
-          in a such way. Many "id" parameters can be specified in such requests. Only children with
-          matching attribute values will be deleted.</p></li></ul></div><div class="example"><a id="d0e2137"></a><p class="title"><strong>Example&#160;6.3.&#160;Examples of REST calls for Queue deletion</strong></p><div class="example-contents"><p>To delete Queue with name "my-queue" on a virtual host with name "vh" (contained in
-        virtual host node with name "vhn") either of the following requests can be made:</p><pre class="screen">DELETE /api/latest/queue/vhn/vh/my-queue HTTP/1.1</pre><pre class="screen">DELETE /api/latest/queue/vhn/vh?name=my-queue HTTP/1.1</pre><pre class="screen">DELETE /api/latest/queue/vhn/vh?id=real-queue-id HTTP/1.1</pre></div></div><br class="example-break" /></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="Java-Broker-Management-Channel-REST-A [...]
-      hierarchy.</p><p>A particular ConfiguredObject details can be retrieved using full ConfiguredObject URI
-      (the one ending with configured object name)</p><p>A collection of ConfiguredObjects can be retrieved using parent URI. Request parameters
-      (having the same name as attributes) can be used to filter the returned configured
-      objects.</p><p>The REST URI (/api/latest/&gt;category&lt;/*) are hierarchical. It is permitted to replace
-      REST URI elements with an "asterisks" in GET requests to denote all object of a particular
-      type. Additionally, trailing object type in the URL hierarchy can be omitted. In this case GET
-      request will return all of the object underneath of the current object.</p><p>For example, for binding URL <code class="literal">http://localhost:8080/api/latest/binding/&lt;vhost
-        node&gt;/&lt;vhost&gt;/&lt;exchange&gt;/&lt;queue&gt;/&lt;binding&gt;</code> replacing of
-        <code class="literal">&lt;exchange&gt;</code> with "asterisks"
-        (<code class="literal">http://localhost:8080/api/&lt;ver&gt;/binding/&lt;vhost
-        node&gt;/&lt;vhost&gt;/*/&lt;queue&gt;/&lt;binding&gt;</code>) will result in the GET
-      response containing the list of bindings for all of the exchanges in the virtualhost having
-      the given name and given queue.</p><p>If <code class="literal">&lt;binding&gt;</code> and <code class="literal">&lt;queue&gt;</code> are omitted in
-      binding REST URL (<code class="literal">http://localhost:8080/api/&lt;ver&gt;/binding/&lt;vhost
-        node&gt;/&lt;vhost&gt;/&lt;exchangename&gt;</code>) the GET request will result in
-      returning all bindings for all queues for the given exchange in the virtual host. </p><p>Additional parameters supported in GET requests:</p><div class="variablelist"><dl class="variablelist"><dt><span class="term">depth</span></dt><dd><p>To restrict the depth of hierarchy of configured objects to return in
-            response</p></dd><dt><span class="term">actuals</span></dt><dd><p>If set to "true" attribute actual values are returned instead of effective</p></dd><dt><span class="term">includeSysContext</span></dt><dd><p>If set to "true" all system context variables are returned</p></dd><dt><span class="term">inheritedActuals</span></dt><dd><p>If set to "true" actual values for all inherited context is returned.</p></dd><dt><span class="term">oversize</span></dt><dd><p>Sets the maximum le [...]
-      parameters. Pass parameters using a JSON request body containing a map with a map entry for
-      each parameter. </p><div class="example"><a id="d0e2225"></a><p class="title"><strong>Example&#160;6.4.&#160;Example REST call invoking the operation clear queue</strong></p><div class="example-contents"><p>To clear the queue with name "my-queue" on a virtual host with name "vh".</p><pre class="screen">POST api/latest/queue/vhn/vh/my-queue/clearQueue HTTP/1.1</pre></div></div><br class="example-break" /></div><div class="section"><div class="titlepage"><div><div><h3 class="title">< [...]
-              <p>200</p>
-            </td><td>
-              <p>REST request is successfully completed. This status code can be returned by
-                update, delete and get requests.</p>
-            </td></tr><tr><td>
-              <p>201</p>
-            </td><td>
-              <p>New configured object is created. It is returned by REST PUT and POST requests
-                for creation of configured objects.</p>
-            </td></tr><tr><td>
-              <p>400</p>
-            </td><td>
-              <p>REST request cannot be performed due to errors in request. It can be returned
-                from create, update and delete requests. The details of a problem are provided in
-                the response payload in json format.</p>
-            </td></tr><tr><td>
-              <p>401</p>
-            </td><td>
-              <p>The request requires user authentication</p>
-            </td></tr><tr><td>
-              <p>403</p>
-            </td><td>
-              <p>Execution of request is not allowed due to failure to authorize user
-                operation.</p>
-            </td></tr><tr><td>
-              <p>404</p>
-            </td><td>
-              <p> The requested configured object cannot be found. This status code can be
-                returned from POST update requests if configured object does not exist. The reason
-                for the status code is provided in the response payload in json format. </p>
-            </td></tr><tr><td>
-              <p>409</p>
-            </td><td>
-              <p>The request can not be performed because its execution can create conflicts in
-                the broker. This status code can be returned from POST/PUT create requests against
-                parent URI if configured object with requested name or id already exists. The status
-                code 409 can also be returned if removal or update of configured object can violate
-                system integrity. The reason for the status code is provided in the response payload
-                in json format. </p>
-            </td></tr><tr><td>
-              <p>422</p>
-            </td><td>
-              <p>The request can not be performed because provided information either incomplete
-                or invalid. This status code can be returned from create or update requests. The
-                reason for the status code is provided in the response payload in json
-                format.</p>
-            </td></tr></tbody></table></div></div><br class="table-break" /></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="Java-Broker-Management-Channel-REST-API-Examples"></a>6.3.10.&#160;Examples of REST requests with curl</h3></div></div></div><div class="example"><a id="d0e2337"></a><p class="title"><strong>Example&#160;6.5.&#160;Examples of queue creation using curl (authenticating as user admin):</strong></p><div class="example-contents"><pre  [...]
-#create a durable queue
-curl --user admin -X PUT  -d '{"durable":true}' http://localhost:8080/api/latest/queue/&lt;vhostnode name&gt;/&lt;vhostname&gt;/&lt;queuename&gt;
-#create a durable priority queue
-curl --user admin -X PUT  -d '{"durable":true,"type":"priority"}' http://localhost:8080/api/latest/queue/&lt;vhostnode name&gt;/&lt;vhostname&gt;/&lt;queuename&gt;
-            </pre></div></div><br class="example-break" /><div class="example"><a id="d0e2342"></a><p class="title"><strong>Example&#160;6.6.&#160;Example of binding a queue to an exchange using curl</strong></p><div class="example-contents"><pre class="programlisting">
-curl --user admin -X PUT  -d '{}' http://localhost:8080/api/latest/binding/&lt;vhostnode name&gt;/&lt;vhostname&gt;/&lt;exchangename&gt;/&lt;queue-name&gt;/&lt;binding-name&gt;
-            </pre></div></div><br class="example-break" /><p> NOTE: These curl examples utilise unsecure HTTP transport. To use the examples it is
-      first necessary enable Basic authentication for HTTP within the HTTP Management Configuration
-      (it is off by default). For details see <a class="xref" href="Java-Broker-Management-Managing-Plugin-HTTP.html" title="7.16.&#160;HTTP Plugin">Section&#160;7.16, &#8220;HTTP Plugin&#8221;</a>
-    </p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="Java-Broker-Management-Channel-REST-API-CORS"></a>6.3.11.&#160;Cross Origin Resource Sharing (CORS)</h3></div></div></div><p> The Broker supports Cross Origin Resource Sharing (CORS)
-      to allow web management consoles other than the one embedded in the
-      broker to use the REST API.  This feature must be enabled by configuring
-      the CORS Allow Origins and related attributes on the
-      <a class="xref" href="Java-Broker-Management-Managing-Plugin-HTTP.html" title="7.16.&#160;HTTP Plugin">Section&#160;7.16, &#8220;HTTP Plugin&#8221;</a>
-    </p></div></div><div class="navfooter"><hr /><table summary="Navigation footer" width="100%"><tr><td align="left" width="40%"><a accesskey="p" href="Java-Broker-Management-Channel-Web-Console.html">Prev</a>&#160;</td><td align="center" width="20%"><a accesskey="u" href="Java-Broker-Management-Channel.html">Up</a></td><td align="right" width="40%">&#160;<a accesskey="n" href="Java-Broker-Management-Channel-AMQP-Intrinstic.html">Next</a></td></tr><tr><td align="left" valign="top" width [...]
-
-          <hr/>
-
-          <ul id="-apache-navigation">
-            <li><a href="http://www.apache.org/">Apache</a></li>
-            <li><a href="http://www.apache.org/licenses/">License</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="/security.html">Security</a></li>
-            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
-          </ul>
-
-          <p id="-legal">
-            Apache Qpid, Messaging built on AMQP; Copyright &#169; 2015
-            The Apache Software Foundation; Licensed under
-            the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
-            License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
-            Proton, Apache, the Apache feather logo, and the Apache Qpid
-            project logo are trademarks of The Apache Software
-            Foundation; All other marks mentioned may be trademarks or
-            registered trademarks of their respective owners
-          </p>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Management-Channel-Web-Console.html b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Management-Channel-Web-Console.html
deleted file mode 100644
index cfc1c52..0000000
--- a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Management-Channel-Web-Console.html
+++ /dev/null
@@ -1,191 +0,0 @@
-<!DOCTYPE html>
-<!--
- -
- - 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.
- -
--->
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-  <head>
-    <title>6.2.&#160;Web Management Console - Apache Qpid&#8482;</title>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-    <link rel="stylesheet" href="/site.css" type="text/css" async="async"/>
-    <link rel="stylesheet" href="/deferred.css" type="text/css" defer="defer"/>
-    <script type="text/javascript">var _deferredFunctions = [];</script>
-    <script type="text/javascript" src="/deferred.js" defer="defer"></script>
-    <!--[if lte IE 8]>
-      <link rel="stylesheet" href="/ie.css" type="text/css"/>
-      <script type="text/javascript" src="/html5shiv.js"></script>
-    <![endif]-->
-
-    <!-- Redirects for `go get` and godoc.org -->
-    <meta name="go-import"
-          content="qpid.apache.org git https://gitbox.apache.org/repos/asf/qpid-proton.git"/>
-    <meta name="go-source"
-          content="qpid.apache.org
-https://github.com/apache/qpid-proton/blob/go1/README.md
-https://github.com/apache/qpid-proton/tree/go1{/dir}
-https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
-  </head>
-  <body>
-    <div id="-content">
-      <div id="-top" class="panel">
-        <a id="-menu-link"><img width="16" height="16" src="" alt="Menu"/></a>
-
-        <a id="-search-link"><img width="22" height="16" src="" alt="Search"/></a>
-
-        <ul id="-global-navigation">
-          <li><a id="-logotype" href="/index.html">Apache Qpid<sup>&#8482;</sup></a></li>
-          <li><a href="/documentation.html">Documentation</a></li>
-          <li><a href="/download.html">Download</a></li>
-          <li><a href="/discussion.html">Discussion</a></li>
-        </ul>
-      </div>
-
-      <div id="-menu" class="panel" style="display: none;">
-        <div class="flex">
-          <section>
-            <h3>Project</h3>
-
-            <ul>
-              <li><a href="/overview.html">Overview</a></li>
-              <li><a href="/components/index.html">Components</a></li>
-              <li><a href="/releases/index.html">Releases</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Messaging APIs</h3>
-
-            <ul>
-              <li><a href="/proton/index.html">Qpid Proton</a></li>
-              <li><a href="/components/jms/index.html">Qpid JMS</a></li>
-              <li><a href="/components/messaging-api/index.html">Qpid Messaging API</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Servers and tools</h3>
-
-            <ul>
-              <li><a href="/components/broker-j/index.html">Broker-J</a></li>
-              <li><a href="/components/cpp-broker/index.html">C++ broker</a></li>
-              <li><a href="/components/dispatch-router/index.html">Dispatch router</a></li>
-            </ul>
-          </section>
-
-          <section>
-            <h3>Resources</h3>
-
-            <ul>
-              <li><a href="/dashboard.html">Dashboard</a></li>
-              <li><a href="https://cwiki.apache.org/confluence/display/qpid/Index">Wiki</a></li>
-              <li><a href="/resources.html">More resources</a></li>
-            </ul>
-          </section>
-        </div>
-      </div>
-
-      <div id="-search" class="panel" style="display: none;">
-        <form action="http://www.google.com/search" method="get">
-          <input type="hidden" name="sitesearch" value="qpid.apache.org"/>
-          <input type="text" name="q" maxlength="255" autofocus="autofocus" tabindex="1"/>
-          <button type="submit">Search</button>
-          <a href="/search.html">More ways to search</a>
-        </form>
-      </div>
-
-      <div id="-middle" class="panel">
-        <ul id="-path-navigation"><li><a href="/index.html">Home</a></li><li><a href="/releases/index.html">Releases</a></li><li><a href="/releases/qpid-java-trunk/index.html">Qpid for Java Trunk</a></li><li><a href="/releases/qpid-java-trunk/java-broker/book/index.html">Apache Qpid Broker for Java</a></li><li>6.2.&#160;Web Management Console</li></ul>
-
-        <div id="-middle-content">
-          <div class="docbook"><div class="navheader"><table summary="Navigation header" width="100%"><tr><th align="center" colspan="3">6.2.&#160;Web Management Console</th></tr><tr><td align="left" width="20%"><a accesskey="p" href="Java-Broker-Management-Channel.html">Prev</a>&#160;</td><th align="center" width="60%">Chapter&#160;6.&#160;Management Channels</th><td align="right" width="20%">&#160;<a accesskey="n" href="Java-Broker-Management-Channel-REST-API.html">Next</a></td></tr></ [...]
-        and Control of the Broker. From here, all aspects of the Broker can be controlled,
-        including: </p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p>add, remove and monitor queues</p></li><li class="listitem"><p>inspect, move, copy or delete messages</p></li><li class="listitem"><p>add, remove and monitor virtualhosts</p></li><li class="listitem"><p>configure and control high availability</p></li></ul></div><p>
-    </p><p>The remainder of the section provides an introduction to the web management console and
-        its use.</p><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="Java-Broker-Management-Channel-Web-Console-Accessing"></a>6.2.1.&#160;Accessing the Console</h3></div></div></div><p>The Web Management Console is provided by the HTTP Management Plugin. Providing the
-            HTTP Management Plugin is in its default configuration, the Web Management Console can
-            be accessed by pointing a browser at the following URL:</p><p>
-            <code class="literal">http://myhost.mydomain.com:8080</code>
-        </p><p>The Console will prompt you to login using a username and password.</p><div class="figure"><a id="d0e1805"></a><p class="title"><strong>Figure&#160;6.1.&#160;Web Management Console - Authentication</strong></p><div class="figure-contents"><div class="mediaobject"><table border="0" style="cellpadding: 0; cellspacing: 0;" summary="manufactured viewport for HTML img" width="900"><tr><td><img alt="Web Console Authentication" src="images/Management-Web-Auth.png" width="900" />< [...]
-            of the screen are now explained.</p><div class="figure"><a id="d0e1819"></a><p class="title"><strong>Figure&#160;6.2.&#160;Web Management Orientation - Console</strong></p><div class="figure-contents"><div class="mediaobject"><table border="0" style="cellpadding: 0; cellspacing: 0;" summary="manufactured viewport for HTML img" width="900"><tr><td><img alt="The Web Console" src="images/Management-Web-Console.png" width="900" /></td></tr></table></div></div></div><br class="fig [...]
-            </p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p><span class="emphasis"><em>A</em></span> - Hierarchy view. Expandable/collapsible view
-                        showing all entities within the Broker. Double click on an entity name to
-                        cause its tab to be opened. </p></li><li class="listitem"><p><span class="emphasis"><em>B</em></span> - Tab. Shows the details of an entity including its
-                        attributes and its child entities. </p></li><li class="listitem"><p><span class="emphasis"><em>C</em></span> - Occluded tab. Click tab name to bring the tab to
-                        the front.</p></li><li class="listitem"><p><span class="emphasis"><em>D</em></span> - Auto restore check box. Checked tabs will be
-                        automatically restored on subsequent login.</p></li><li class="listitem"><p><span class="emphasis"><em>E</em></span> - Close. Click to close the tab.</p></li><li class="listitem"><p><span class="emphasis"><em>F</em></span> - User Menu. Access to Preferences, Logout and
-                        Help.</p></li></ul></div><p>
-        </p><div class="figure"><a id="Java-Broker-Management-Channel-Web-Console-Orientation-Tab"></a><p class="title"><strong>Figure&#160;6.3.&#160;Web Management Orientation - Tab</strong></p><div class="figure-contents"><div class="mediaobject"><table border="0" style="cellpadding: 0; cellspacing: 0;" summary="manufactured viewport for HTML img" width="900"><tr><td><img alt="A tab within the Web Consle" src="images/Management-Web-Tab.png" width="900" /></td></tr></table></div></div>< [...]
-                        entity. Click the panel title bar opens/closes the panel.</p></li><li class="listitem"><p><span class="emphasis"><em>2</em></span> - Child Panels. Panels containing a table listing
-                        the children of the entity. Click the panel title bar opens/closes the
-                        panel.</p></li><li class="listitem"><p><span class="emphasis"><em>3</em></span> - Child Row. Row summarizing a child entity. Double
... 28413 lines suppressed ...


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org