http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-cpp-1.36.0/messaging-api/cpp/examples/drain.cpp.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-cpp-1.36.0/messaging-api/cpp/examples/drain.cpp.html 
b/content/releases/qpid-cpp-1.36.0/messaging-api/cpp/examples/drain.cpp.html
index 910afd9..51d96f3 100644
--- a/content/releases/qpid-cpp-1.36.0/messaging-api/cpp/examples/drain.cpp.html
+++ b/content/releases/qpid-cpp-1.36.0/messaging-api/cpp/examples/drain.cpp.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-cpp-1.36.0/messaging-api/cpp/examples/hello_world.cpp.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-cpp-1.36.0/messaging-api/cpp/examples/hello_world.cpp.html
 
b/content/releases/qpid-cpp-1.36.0/messaging-api/cpp/examples/hello_world.cpp.html
index 4ef9fec..7f4fc54 100644
--- 
a/content/releases/qpid-cpp-1.36.0/messaging-api/cpp/examples/hello_world.cpp.html
+++ 
b/content/releases/qpid-cpp-1.36.0/messaging-api/cpp/examples/hello_world.cpp.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-cpp-1.36.0/messaging-api/cpp/examples/hello_xml.cpp.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-cpp-1.36.0/messaging-api/cpp/examples/hello_xml.cpp.html
 
b/content/releases/qpid-cpp-1.36.0/messaging-api/cpp/examples/hello_xml.cpp.html
index 1de25a8..37b0bd0 100644
--- 
a/content/releases/qpid-cpp-1.36.0/messaging-api/cpp/examples/hello_xml.cpp.html
+++ 
b/content/releases/qpid-cpp-1.36.0/messaging-api/cpp/examples/hello_xml.cpp.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-cpp-1.36.0/messaging-api/cpp/examples/index.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-cpp-1.36.0/messaging-api/cpp/examples/index.html 
b/content/releases/qpid-cpp-1.36.0/messaging-api/cpp/examples/index.html
index 3a30687..926687f 100644
--- a/content/releases/qpid-cpp-1.36.0/messaging-api/cpp/examples/index.html
+++ b/content/releases/qpid-cpp-1.36.0/messaging-api/cpp/examples/index.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-cpp-1.36.0/messaging-api/cpp/examples/map_receiver.cpp.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-cpp-1.36.0/messaging-api/cpp/examples/map_receiver.cpp.html
 
b/content/releases/qpid-cpp-1.36.0/messaging-api/cpp/examples/map_receiver.cpp.html
index 3d23d62..d120b2f 100644
--- 
a/content/releases/qpid-cpp-1.36.0/messaging-api/cpp/examples/map_receiver.cpp.html
+++ 
b/content/releases/qpid-cpp-1.36.0/messaging-api/cpp/examples/map_receiver.cpp.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-cpp-1.36.0/messaging-api/cpp/examples/map_sender.cpp.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-cpp-1.36.0/messaging-api/cpp/examples/map_sender.cpp.html
 
b/content/releases/qpid-cpp-1.36.0/messaging-api/cpp/examples/map_sender.cpp.html
index f14cc18..368c2d5 100644
--- 
a/content/releases/qpid-cpp-1.36.0/messaging-api/cpp/examples/map_sender.cpp.html
+++ 
b/content/releases/qpid-cpp-1.36.0/messaging-api/cpp/examples/map_sender.cpp.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-cpp-1.36.0/messaging-api/cpp/examples/server.cpp.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-cpp-1.36.0/messaging-api/cpp/examples/server.cpp.html 
b/content/releases/qpid-cpp-1.36.0/messaging-api/cpp/examples/server.cpp.html
index 4424895..92daf56 100644
--- 
a/content/releases/qpid-cpp-1.36.0/messaging-api/cpp/examples/server.cpp.html
+++ 
b/content/releases/qpid-cpp-1.36.0/messaging-api/cpp/examples/server.cpp.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-cpp-1.36.0/messaging-api/cpp/examples/server_reconnect.cpp.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-cpp-1.36.0/messaging-api/cpp/examples/server_reconnect.cpp.html
 
b/content/releases/qpid-cpp-1.36.0/messaging-api/cpp/examples/server_reconnect.cpp.html
index fa53140..e20f4ad 100644
--- 
a/content/releases/qpid-cpp-1.36.0/messaging-api/cpp/examples/server_reconnect.cpp.html
+++ 
b/content/releases/qpid-cpp-1.36.0/messaging-api/cpp/examples/server_reconnect.cpp.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-cpp-1.36.0/messaging-api/cpp/examples/spout.cpp.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-cpp-1.36.0/messaging-api/cpp/examples/spout.cpp.html 
b/content/releases/qpid-cpp-1.36.0/messaging-api/cpp/examples/spout.cpp.html
index 59b4635..ff5cd64 100644
--- a/content/releases/qpid-cpp-1.36.0/messaging-api/cpp/examples/spout.cpp.html
+++ b/content/releases/qpid-cpp-1.36.0/messaging-api/cpp/examples/spout.cpp.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-cpp-1.36.0/release-notes.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-cpp-1.36.0/release-notes.html 
b/content/releases/qpid-cpp-1.36.0/release-notes.html
index caeb960..6fe61dc 100644
--- a/content/releases/qpid-cpp-1.36.0/release-notes.html
+++ b/content/releases/qpid-cpp-1.36.0/release-notes.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-cpp-master/cpp-broker/book/AMQP-Compatibility.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-cpp-master/cpp-broker/book/AMQP-Compatibility.html 
b/content/releases/qpid-cpp-master/cpp-broker/book/AMQP-Compatibility.html
index 0b79f65..d68300f 100644
--- a/content/releases/qpid-cpp-master/cpp-broker/book/AMQP-Compatibility.html
+++ b/content/releases/qpid-cpp-master/cpp-broker/book/AMQP-Compatibility.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-cpp-master/cpp-broker/book/QpidInteroperabilityDocumentation-QpidInteroperabilityDocumentation.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-cpp-master/cpp-broker/book/QpidInteroperabilityDocumentation-QpidInteroperabilityDocumentation.html
 
b/content/releases/qpid-cpp-master/cpp-broker/book/QpidInteroperabilityDocumentation-QpidInteroperabilityDocumentation.html
index 39e6241..77a376a 100644
--- 
a/content/releases/qpid-cpp-master/cpp-broker/book/QpidInteroperabilityDocumentation-QpidInteroperabilityDocumentation.html
+++ 
b/content/releases/qpid-cpp-master/cpp-broker/book/QpidInteroperabilityDocumentation-QpidInteroperabilityDocumentation.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-cpp-master/cpp-broker/book/Using-message-groups.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-cpp-master/cpp-broker/book/Using-message-groups.html 
b/content/releases/qpid-cpp-master/cpp-broker/book/Using-message-groups.html
index 3ea04d3..18c5065 100644
--- a/content/releases/qpid-cpp-master/cpp-broker/book/Using-message-groups.html
+++ b/content/releases/qpid-cpp-master/cpp-broker/book/Using-message-groups.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-cpp-master/cpp-broker/book/ch01.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-cpp-master/cpp-broker/book/ch01.html 
b/content/releases/qpid-cpp-master/cpp-broker/book/ch01.html
index 5653832..af09c21 100644
--- a/content/releases/qpid-cpp-master/cpp-broker/book/ch01.html
+++ b/content/releases/qpid-cpp-master/cpp-broker/book/ch01.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-cpp-master/cpp-broker/book/ch01s02.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-cpp-master/cpp-broker/book/ch01s02.html 
b/content/releases/qpid-cpp-master/cpp-broker/book/ch01s02.html
index 839cd73..d8ea01a 100644
--- a/content/releases/qpid-cpp-master/cpp-broker/book/ch01s02.html
+++ b/content/releases/qpid-cpp-master/cpp-broker/book/ch01s02.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-cpp-master/cpp-broker/book/ch01s03.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-cpp-master/cpp-broker/book/ch01s03.html 
b/content/releases/qpid-cpp-master/cpp-broker/book/ch01s03.html
index 8ea83c1..b5fe621 100644
--- a/content/releases/qpid-cpp-master/cpp-broker/book/ch01s03.html
+++ b/content/releases/qpid-cpp-master/cpp-broker/book/ch01s03.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-cpp-master/cpp-broker/book/ch01s06.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-cpp-master/cpp-broker/book/ch01s06.html 
b/content/releases/qpid-cpp-master/cpp-broker/book/ch01s06.html
index fdae8b7..979fe98 100644
--- a/content/releases/qpid-cpp-master/cpp-broker/book/ch01s06.html
+++ b/content/releases/qpid-cpp-master/cpp-broker/book/ch01s06.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-cpp-master/cpp-broker/book/ch02s02.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-cpp-master/cpp-broker/book/ch02s02.html 
b/content/releases/qpid-cpp-master/cpp-broker/book/ch02s02.html
index 422e936..00e98fb 100644
--- a/content/releases/qpid-cpp-master/cpp-broker/book/ch02s02.html
+++ b/content/releases/qpid-cpp-master/cpp-broker/book/ch02s02.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-cpp-master/cpp-broker/book/ch02s03.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-cpp-master/cpp-broker/book/ch02s03.html 
b/content/releases/qpid-cpp-master/cpp-broker/book/ch02s03.html
index b1ddb20..717414e 100644
--- a/content/releases/qpid-cpp-master/cpp-broker/book/ch02s03.html
+++ b/content/releases/qpid-cpp-master/cpp-broker/book/ch02s03.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-cpp-master/cpp-broker/book/chap-Messaging_User_Guide-Broker_Federation.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-cpp-master/cpp-broker/book/chap-Messaging_User_Guide-Broker_Federation.html
 
b/content/releases/qpid-cpp-master/cpp-broker/book/chap-Messaging_User_Guide-Broker_Federation.html
index 8e7e64e..a55e7f4 100644
--- 
a/content/releases/qpid-cpp-master/cpp-broker/book/chap-Messaging_User_Guide-Broker_Federation.html
+++ 
b/content/releases/qpid-cpp-master/cpp-broker/book/chap-Messaging_User_Guide-Broker_Federation.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-cpp-master/cpp-broker/book/chap-Messaging_User_Guide-Security.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-cpp-master/cpp-broker/book/chap-Messaging_User_Guide-Security.html
 
b/content/releases/qpid-cpp-master/cpp-broker/book/chap-Messaging_User_Guide-Security.html
index 954bfe9..61d1535 100644
--- 
a/content/releases/qpid-cpp-master/cpp-broker/book/chap-Messaging_User_Guide-Security.html
+++ 
b/content/releases/qpid-cpp-master/cpp-broker/book/chap-Messaging_User_Guide-Security.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-cpp-master/cpp-broker/book/chapter-Managing-CPP-Broker.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-cpp-master/cpp-broker/book/chapter-Managing-CPP-Broker.html
 
b/content/releases/qpid-cpp-master/cpp-broker/book/chapter-Managing-CPP-Broker.html
index 3f51f92..12941f5 100644
--- 
a/content/releases/qpid-cpp-master/cpp-broker/book/chapter-Managing-CPP-Broker.html
+++ 
b/content/releases/qpid-cpp-master/cpp-broker/book/chapter-Managing-CPP-Broker.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-cpp-master/cpp-broker/book/chapter-ha.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-cpp-master/cpp-broker/book/chapter-ha.html 
b/content/releases/qpid-cpp-master/cpp-broker/book/chapter-ha.html
index e9ea977..61272c8 100644
--- a/content/releases/qpid-cpp-master/cpp-broker/book/chapter-ha.html
+++ b/content/releases/qpid-cpp-master/cpp-broker/book/chapter-ha.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-cpp-master/cpp-broker/book/ha-queue-replication.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-cpp-master/cpp-broker/book/ha-queue-replication.html 
b/content/releases/qpid-cpp-master/cpp-broker/book/ha-queue-replication.html
index 4bb10ce..d962d42 100644
--- a/content/releases/qpid-cpp-master/cpp-broker/book/ha-queue-replication.html
+++ b/content/releases/qpid-cpp-master/cpp-broker/book/ha-queue-replication.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-cpp-master/cpp-broker/book/index.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-cpp-master/cpp-broker/book/index.html 
b/content/releases/qpid-cpp-master/cpp-broker/book/index.html
index f6e11c3..fa029bc 100644
--- a/content/releases/qpid-cpp-master/cpp-broker/book/index.html
+++ b/content/releases/qpid-cpp-master/cpp-broker/book/index.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-cpp-master/cpp-broker/book/pr01.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-cpp-master/cpp-broker/book/pr01.html 
b/content/releases/qpid-cpp-master/cpp-broker/book/pr01.html
index a80a188..ba109d9 100644
--- a/content/releases/qpid-cpp-master/cpp-broker/book/pr01.html
+++ b/content/releases/qpid-cpp-master/cpp-broker/book/pr01.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-cpp-master/cpp-broker/book/producer-flow-control.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-cpp-master/cpp-broker/book/producer-flow-control.html 
b/content/releases/qpid-cpp-master/cpp-broker/book/producer-flow-control.html
index eba951d..abf9d3d 100644
--- 
a/content/releases/qpid-cpp-master/cpp-broker/book/producer-flow-control.html
+++ 
b/content/releases/qpid-cpp-master/cpp-broker/book/producer-flow-control.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-cpp-master/cpp-broker/book/queue-state-replication.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-cpp-master/cpp-broker/book/queue-state-replication.html 
b/content/releases/qpid-cpp-master/cpp-broker/book/queue-state-replication.html
index 1058f64..2f4645c 100644
--- 
a/content/releases/qpid-cpp-master/cpp-broker/book/queue-state-replication.html
+++ 
b/content/releases/qpid-cpp-master/cpp-broker/book/queue-state-replication.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-cpp-master/index.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-cpp-master/index.html 
b/content/releases/qpid-cpp-master/index.html
index 55328e3..b7d2b52 100644
--- a/content/releases/qpid-cpp-master/index.html
+++ b/content/releases/qpid-cpp-master/index.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-cpp-master/messaging-api/cpp/examples/OptionParser.cpp.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-cpp-master/messaging-api/cpp/examples/OptionParser.cpp.html
 
b/content/releases/qpid-cpp-master/messaging-api/cpp/examples/OptionParser.cpp.html
index 6577d2c..3ba888a 100644
--- 
a/content/releases/qpid-cpp-master/messaging-api/cpp/examples/OptionParser.cpp.html
+++ 
b/content/releases/qpid-cpp-master/messaging-api/cpp/examples/OptionParser.cpp.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-cpp-master/messaging-api/cpp/examples/OptionParser.h.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-cpp-master/messaging-api/cpp/examples/OptionParser.h.html
 
b/content/releases/qpid-cpp-master/messaging-api/cpp/examples/OptionParser.h.html
index 8b0cccf..e4b83c7 100644
--- 
a/content/releases/qpid-cpp-master/messaging-api/cpp/examples/OptionParser.h.html
+++ 
b/content/releases/qpid-cpp-master/messaging-api/cpp/examples/OptionParser.h.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-cpp-master/messaging-api/cpp/examples/client.cpp.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-cpp-master/messaging-api/cpp/examples/client.cpp.html 
b/content/releases/qpid-cpp-master/messaging-api/cpp/examples/client.cpp.html
index 88fb36b..cd55641 100644
--- 
a/content/releases/qpid-cpp-master/messaging-api/cpp/examples/client.cpp.html
+++ 
b/content/releases/qpid-cpp-master/messaging-api/cpp/examples/client.cpp.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-cpp-master/messaging-api/cpp/examples/drain.cpp.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-cpp-master/messaging-api/cpp/examples/drain.cpp.html 
b/content/releases/qpid-cpp-master/messaging-api/cpp/examples/drain.cpp.html
index ed4b6c9..5440d45 100644
--- a/content/releases/qpid-cpp-master/messaging-api/cpp/examples/drain.cpp.html
+++ b/content/releases/qpid-cpp-master/messaging-api/cpp/examples/drain.cpp.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-cpp-master/messaging-api/cpp/examples/hello_world.cpp.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-cpp-master/messaging-api/cpp/examples/hello_world.cpp.html
 
b/content/releases/qpid-cpp-master/messaging-api/cpp/examples/hello_world.cpp.html
index a3f97e4..b52ebd4 100644
--- 
a/content/releases/qpid-cpp-master/messaging-api/cpp/examples/hello_world.cpp.html
+++ 
b/content/releases/qpid-cpp-master/messaging-api/cpp/examples/hello_world.cpp.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-cpp-master/messaging-api/cpp/examples/hello_xml.cpp.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-cpp-master/messaging-api/cpp/examples/hello_xml.cpp.html
 
b/content/releases/qpid-cpp-master/messaging-api/cpp/examples/hello_xml.cpp.html
index fc5b33d..58cff29 100644
--- 
a/content/releases/qpid-cpp-master/messaging-api/cpp/examples/hello_xml.cpp.html
+++ 
b/content/releases/qpid-cpp-master/messaging-api/cpp/examples/hello_xml.cpp.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-cpp-master/messaging-api/cpp/examples/index.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-cpp-master/messaging-api/cpp/examples/index.html 
b/content/releases/qpid-cpp-master/messaging-api/cpp/examples/index.html
index 9e976e7..b24557e 100644
--- a/content/releases/qpid-cpp-master/messaging-api/cpp/examples/index.html
+++ b/content/releases/qpid-cpp-master/messaging-api/cpp/examples/index.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-cpp-master/messaging-api/cpp/examples/map_receiver.cpp.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-cpp-master/messaging-api/cpp/examples/map_receiver.cpp.html
 
b/content/releases/qpid-cpp-master/messaging-api/cpp/examples/map_receiver.cpp.html
index 56a861d..8f98104 100644
--- 
a/content/releases/qpid-cpp-master/messaging-api/cpp/examples/map_receiver.cpp.html
+++ 
b/content/releases/qpid-cpp-master/messaging-api/cpp/examples/map_receiver.cpp.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-cpp-master/messaging-api/cpp/examples/map_sender.cpp.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-cpp-master/messaging-api/cpp/examples/map_sender.cpp.html
 
b/content/releases/qpid-cpp-master/messaging-api/cpp/examples/map_sender.cpp.html
index bbc32b9..a735053 100644
--- 
a/content/releases/qpid-cpp-master/messaging-api/cpp/examples/map_sender.cpp.html
+++ 
b/content/releases/qpid-cpp-master/messaging-api/cpp/examples/map_sender.cpp.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-cpp-master/messaging-api/cpp/examples/server.cpp.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-cpp-master/messaging-api/cpp/examples/server.cpp.html 
b/content/releases/qpid-cpp-master/messaging-api/cpp/examples/server.cpp.html
index e67ace7..b8455aa 100644
--- 
a/content/releases/qpid-cpp-master/messaging-api/cpp/examples/server.cpp.html
+++ 
b/content/releases/qpid-cpp-master/messaging-api/cpp/examples/server.cpp.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-cpp-master/messaging-api/cpp/examples/server_reconnect.cpp.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-cpp-master/messaging-api/cpp/examples/server_reconnect.cpp.html
 
b/content/releases/qpid-cpp-master/messaging-api/cpp/examples/server_reconnect.cpp.html
index 24c2787..222bafb 100644
--- 
a/content/releases/qpid-cpp-master/messaging-api/cpp/examples/server_reconnect.cpp.html
+++ 
b/content/releases/qpid-cpp-master/messaging-api/cpp/examples/server_reconnect.cpp.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-cpp-master/messaging-api/cpp/examples/spout.cpp.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-cpp-master/messaging-api/cpp/examples/spout.cpp.html 
b/content/releases/qpid-cpp-master/messaging-api/cpp/examples/spout.cpp.html
index 9767029..69ed9ff 100644
--- a/content/releases/qpid-cpp-master/messaging-api/cpp/examples/spout.cpp.html
+++ b/content/releases/qpid-cpp-master/messaging-api/cpp/examples/spout.cpp.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-cpp-master/release-notes.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-cpp-master/release-notes.html 
b/content/releases/qpid-cpp-master/release-notes.html
index 6d2f023..7c31759 100644
--- a/content/releases/qpid-cpp-master/release-notes.html
+++ b/content/releases/qpid-cpp-master/release-notes.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-dispatch-0.3/book.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-dispatch-0.3/book.html 
b/content/releases/qpid-dispatch-0.3/book.html
index 6ae49d6..1030b86 100644
--- a/content/releases/qpid-dispatch-0.3/book.html
+++ b/content/releases/qpid-dispatch-0.3/book.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-dispatch-0.3/index.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-dispatch-0.3/index.html 
b/content/releases/qpid-dispatch-0.3/index.html
index 599e110..14fbc31 100644
--- a/content/releases/qpid-dispatch-0.3/index.html
+++ b/content/releases/qpid-dispatch-0.3/index.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-dispatch-0.3/release-notes.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-dispatch-0.3/release-notes.html 
b/content/releases/qpid-dispatch-0.3/release-notes.html
index 034425b..dbf4fa5 100644
--- a/content/releases/qpid-dispatch-0.3/release-notes.html
+++ b/content/releases/qpid-dispatch-0.3/release-notes.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-dispatch-0.4/book/addressing.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-dispatch-0.4/book/addressing.html 
b/content/releases/qpid-dispatch-0.4/book/addressing.html
index 703dafa..bf98686 100644
--- a/content/releases/qpid-dispatch-0.4/book/addressing.html
+++ b/content/releases/qpid-dispatch-0.4/book/addressing.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-dispatch-0.4/book/amqp-mapping.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-dispatch-0.4/book/amqp-mapping.html 
b/content/releases/qpid-dispatch-0.4/book/amqp-mapping.html
index 5e77837..98a0112 100644
--- a/content/releases/qpid-dispatch-0.4/book/amqp-mapping.html
+++ b/content/releases/qpid-dispatch-0.4/book/amqp-mapping.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-dispatch-0.4/book/basic_usage.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-dispatch-0.4/book/basic_usage.html 
b/content/releases/qpid-dispatch-0.4/book/basic_usage.html
index 6e0da83..822ee20 100644
--- a/content/releases/qpid-dispatch-0.4/book/basic_usage.html
+++ b/content/releases/qpid-dispatch-0.4/book/basic_usage.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-dispatch-0.4/book/book.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-dispatch-0.4/book/book.html 
b/content/releases/qpid-dispatch-0.4/book/book.html
index 903e31a..81d31eb 100644
--- a/content/releases/qpid-dispatch-0.4/book/book.html
+++ b/content/releases/qpid-dispatch-0.4/book/book.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-dispatch-0.4/book/client_compatibility.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-dispatch-0.4/book/client_compatibility.html 
b/content/releases/qpid-dispatch-0.4/book/client_compatibility.html
index c39012b..b89b89d 100644
--- a/content/releases/qpid-dispatch-0.4/book/client_compatibility.html
+++ b/content/releases/qpid-dispatch-0.4/book/client_compatibility.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-dispatch-0.4/book/default_config.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-dispatch-0.4/book/default_config.html 
b/content/releases/qpid-dispatch-0.4/book/default_config.html
index ae6c22a..376db04 100644
--- a/content/releases/qpid-dispatch-0.4/book/default_config.html
+++ b/content/releases/qpid-dispatch-0.4/book/default_config.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-dispatch-0.4/book/introduction.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-dispatch-0.4/book/introduction.html 
b/content/releases/qpid-dispatch-0.4/book/introduction.html
index e5178e6..668b0e4 100644
--- a/content/releases/qpid-dispatch-0.4/book/introduction.html
+++ b/content/releases/qpid-dispatch-0.4/book/introduction.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-dispatch-0.4/book/link_routing.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-dispatch-0.4/book/link_routing.html 
b/content/releases/qpid-dispatch-0.4/book/link_routing.html
index 5092100..5e89288 100644
--- a/content/releases/qpid-dispatch-0.4/book/link_routing.html
+++ b/content/releases/qpid-dispatch-0.4/book/link_routing.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-dispatch-0.4/book/schema.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-dispatch-0.4/book/schema.html 
b/content/releases/qpid-dispatch-0.4/book/schema.html
index 8c20326..095daf2 100644
--- a/content/releases/qpid-dispatch-0.4/book/schema.html
+++ b/content/releases/qpid-dispatch-0.4/book/schema.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-dispatch-0.4/book/technical_details.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-dispatch-0.4/book/technical_details.html 
b/content/releases/qpid-dispatch-0.4/book/technical_details.html
index 0757830..0ffe5a2 100644
--- a/content/releases/qpid-dispatch-0.4/book/technical_details.html
+++ b/content/releases/qpid-dispatch-0.4/book/technical_details.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-dispatch-0.4/book/tools.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-dispatch-0.4/book/tools.html 
b/content/releases/qpid-dispatch-0.4/book/tools.html
index d14f0e3..3bdf2b4 100644
--- a/content/releases/qpid-dispatch-0.4/book/tools.html
+++ b/content/releases/qpid-dispatch-0.4/book/tools.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-dispatch-0.4/book/using.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-dispatch-0.4/book/using.html 
b/content/releases/qpid-dispatch-0.4/book/using.html
index 493518e..3fc7f90 100644
--- a/content/releases/qpid-dispatch-0.4/book/using.html
+++ b/content/releases/qpid-dispatch-0.4/book/using.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-dispatch-0.4/index.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-dispatch-0.4/index.html 
b/content/releases/qpid-dispatch-0.4/index.html
index 91a50c3..7daaf15 100644
--- a/content/releases/qpid-dispatch-0.4/index.html
+++ b/content/releases/qpid-dispatch-0.4/index.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-dispatch-0.4/man/qdmanage.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-dispatch-0.4/man/qdmanage.html 
b/content/releases/qpid-dispatch-0.4/man/qdmanage.html
index cf0a89f..98315a6 100644
--- a/content/releases/qpid-dispatch-0.4/man/qdmanage.html
+++ b/content/releases/qpid-dispatch-0.4/man/qdmanage.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-dispatch-0.4/man/qdrouterd.conf.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-dispatch-0.4/man/qdrouterd.conf.html 
b/content/releases/qpid-dispatch-0.4/man/qdrouterd.conf.html
index 7d008f3..bc02e98 100644
--- a/content/releases/qpid-dispatch-0.4/man/qdrouterd.conf.html
+++ b/content/releases/qpid-dispatch-0.4/man/qdrouterd.conf.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-dispatch-0.4/man/qdrouterd.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-dispatch-0.4/man/qdrouterd.html 
b/content/releases/qpid-dispatch-0.4/man/qdrouterd.html
index aa4d392..f27dfbc 100644
--- a/content/releases/qpid-dispatch-0.4/man/qdrouterd.html
+++ b/content/releases/qpid-dispatch-0.4/man/qdrouterd.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-dispatch-0.4/man/qdstat.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-dispatch-0.4/man/qdstat.html 
b/content/releases/qpid-dispatch-0.4/man/qdstat.html
index c341d44..c2ee04c 100644
--- a/content/releases/qpid-dispatch-0.4/man/qdstat.html
+++ b/content/releases/qpid-dispatch-0.4/man/qdstat.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-dispatch-0.4/release-notes.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-dispatch-0.4/release-notes.html 
b/content/releases/qpid-dispatch-0.4/release-notes.html
index 188c6d4..490acfa 100644
--- a/content/releases/qpid-dispatch-0.4/release-notes.html
+++ b/content/releases/qpid-dispatch-0.4/release-notes.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-dispatch-0.5/book/addressing.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-dispatch-0.5/book/addressing.html 
b/content/releases/qpid-dispatch-0.5/book/addressing.html
index 569e4d3..908d973 100644
--- a/content/releases/qpid-dispatch-0.5/book/addressing.html
+++ b/content/releases/qpid-dispatch-0.5/book/addressing.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-dispatch-0.5/book/amqp-mapping.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-dispatch-0.5/book/amqp-mapping.html 
b/content/releases/qpid-dispatch-0.5/book/amqp-mapping.html
index 32ff36b..798b2f5 100644
--- a/content/releases/qpid-dispatch-0.5/book/amqp-mapping.html
+++ b/content/releases/qpid-dispatch-0.5/book/amqp-mapping.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-dispatch-0.5/book/basic_usage.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-dispatch-0.5/book/basic_usage.html 
b/content/releases/qpid-dispatch-0.5/book/basic_usage.html
index 7dd4e53..6afa14d 100644
--- a/content/releases/qpid-dispatch-0.5/book/basic_usage.html
+++ b/content/releases/qpid-dispatch-0.5/book/basic_usage.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-dispatch-0.5/book/book.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-dispatch-0.5/book/book.html 
b/content/releases/qpid-dispatch-0.5/book/book.html
index d08c964..ddcaa13 100644
--- a/content/releases/qpid-dispatch-0.5/book/book.html
+++ b/content/releases/qpid-dispatch-0.5/book/book.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-dispatch-0.5/book/client_compatibility.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-dispatch-0.5/book/client_compatibility.html 
b/content/releases/qpid-dispatch-0.5/book/client_compatibility.html
index 573fe94..8724998 100644
--- a/content/releases/qpid-dispatch-0.5/book/client_compatibility.html
+++ b/content/releases/qpid-dispatch-0.5/book/client_compatibility.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-dispatch-0.5/book/default_config.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-dispatch-0.5/book/default_config.html 
b/content/releases/qpid-dispatch-0.5/book/default_config.html
index 5b41d1c..f15c2ef 100644
--- a/content/releases/qpid-dispatch-0.5/book/default_config.html
+++ b/content/releases/qpid-dispatch-0.5/book/default_config.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-dispatch-0.5/book/introduction.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-dispatch-0.5/book/introduction.html 
b/content/releases/qpid-dispatch-0.5/book/introduction.html
index 2a1c3c5..41eff58 100644
--- a/content/releases/qpid-dispatch-0.5/book/introduction.html
+++ b/content/releases/qpid-dispatch-0.5/book/introduction.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-dispatch-0.5/book/link_routing.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-dispatch-0.5/book/link_routing.html 
b/content/releases/qpid-dispatch-0.5/book/link_routing.html
index 9672feb..83ca42d 100644
--- a/content/releases/qpid-dispatch-0.5/book/link_routing.html
+++ b/content/releases/qpid-dispatch-0.5/book/link_routing.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-dispatch-0.5/book/schema.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-dispatch-0.5/book/schema.html 
b/content/releases/qpid-dispatch-0.5/book/schema.html
index d0d0caf..95bc738 100644
--- a/content/releases/qpid-dispatch-0.5/book/schema.html
+++ b/content/releases/qpid-dispatch-0.5/book/schema.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-dispatch-0.5/book/technical_details.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-dispatch-0.5/book/technical_details.html 
b/content/releases/qpid-dispatch-0.5/book/technical_details.html
index 7a05684..08be46e 100644
--- a/content/releases/qpid-dispatch-0.5/book/technical_details.html
+++ b/content/releases/qpid-dispatch-0.5/book/technical_details.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-dispatch-0.5/book/tools.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-dispatch-0.5/book/tools.html 
b/content/releases/qpid-dispatch-0.5/book/tools.html
index 2ebf17e..4d01944 100644
--- a/content/releases/qpid-dispatch-0.5/book/tools.html
+++ b/content/releases/qpid-dispatch-0.5/book/tools.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-dispatch-0.5/book/using.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-dispatch-0.5/book/using.html 
b/content/releases/qpid-dispatch-0.5/book/using.html
index 6593db4..fa0ed58 100644
--- a/content/releases/qpid-dispatch-0.5/book/using.html
+++ b/content/releases/qpid-dispatch-0.5/book/using.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-dispatch-0.5/index.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-dispatch-0.5/index.html 
b/content/releases/qpid-dispatch-0.5/index.html
index 1bd9184..3072dfe 100644
--- a/content/releases/qpid-dispatch-0.5/index.html
+++ b/content/releases/qpid-dispatch-0.5/index.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-dispatch-0.5/man/qdmanage.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-dispatch-0.5/man/qdmanage.html 
b/content/releases/qpid-dispatch-0.5/man/qdmanage.html
index a58e151..0eb88d0 100644
--- a/content/releases/qpid-dispatch-0.5/man/qdmanage.html
+++ b/content/releases/qpid-dispatch-0.5/man/qdmanage.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-dispatch-0.5/man/qdrouterd.conf.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-dispatch-0.5/man/qdrouterd.conf.html 
b/content/releases/qpid-dispatch-0.5/man/qdrouterd.conf.html
index e6f30c6..a303e52 100644
--- a/content/releases/qpid-dispatch-0.5/man/qdrouterd.conf.html
+++ b/content/releases/qpid-dispatch-0.5/man/qdrouterd.conf.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-dispatch-0.5/man/qdrouterd.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-dispatch-0.5/man/qdrouterd.html 
b/content/releases/qpid-dispatch-0.5/man/qdrouterd.html
index 1100e20..71b1132 100644
--- a/content/releases/qpid-dispatch-0.5/man/qdrouterd.html
+++ b/content/releases/qpid-dispatch-0.5/man/qdrouterd.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-dispatch-0.5/man/qdstat.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-dispatch-0.5/man/qdstat.html 
b/content/releases/qpid-dispatch-0.5/man/qdstat.html
index e67b859..a537c7f 100644
--- a/content/releases/qpid-dispatch-0.5/man/qdstat.html
+++ b/content/releases/qpid-dispatch-0.5/man/qdstat.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-dispatch-0.5/release-notes.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-dispatch-0.5/release-notes.html 
b/content/releases/qpid-dispatch-0.5/release-notes.html
index ecffd10..2859b80 100644
--- a/content/releases/qpid-dispatch-0.5/release-notes.html
+++ b/content/releases/qpid-dispatch-0.5/release-notes.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-dispatch-0.6.0/book/addressing.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-dispatch-0.6.0/book/addressing.html 
b/content/releases/qpid-dispatch-0.6.0/book/addressing.html
index 89083fb..95d03d7 100644
--- a/content/releases/qpid-dispatch-0.6.0/book/addressing.html
+++ b/content/releases/qpid-dispatch-0.6.0/book/addressing.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-dispatch-0.6.0/book/amqp-mapping.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-dispatch-0.6.0/book/amqp-mapping.html 
b/content/releases/qpid-dispatch-0.6.0/book/amqp-mapping.html
index 1fe2c2c..10c1bdf 100644
--- a/content/releases/qpid-dispatch-0.6.0/book/amqp-mapping.html
+++ b/content/releases/qpid-dispatch-0.6.0/book/amqp-mapping.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-dispatch-0.6.0/book/auto_links.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-dispatch-0.6.0/book/auto_links.html 
b/content/releases/qpid-dispatch-0.6.0/book/auto_links.html
index 1ed000b..a914a1b 100644
--- a/content/releases/qpid-dispatch-0.6.0/book/auto_links.html
+++ b/content/releases/qpid-dispatch-0.6.0/book/auto_links.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-dispatch-0.6.0/book/basic_usage.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-dispatch-0.6.0/book/basic_usage.html 
b/content/releases/qpid-dispatch-0.6.0/book/basic_usage.html
index 3b0a80c..6b70567 100644
--- a/content/releases/qpid-dispatch-0.6.0/book/basic_usage.html
+++ b/content/releases/qpid-dispatch-0.6.0/book/basic_usage.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-dispatch-0.6.0/book/book.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-dispatch-0.6.0/book/book.html 
b/content/releases/qpid-dispatch-0.6.0/book/book.html
index 7cf57a0..ec1c852 100644
--- a/content/releases/qpid-dispatch-0.6.0/book/book.html
+++ b/content/releases/qpid-dispatch-0.6.0/book/book.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <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>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-dispatch-0.6.0/book/client_compatibility.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-dispatch-0.6.0/book/client_compatibility.html 
b/content/releases/qpid-dispatch-0.6.0/book/client_compatibility.html
index c8d3968..de413df 100644
--- a/content/releases/qpid-dispatch-0.6.0/book/client_compatibility.html
+++ b/content/releases/qpid-dispatch-0.6.0/book/client_compatibility.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
+              <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>


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

Reply via email to