http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-cpp-0.34/cpp-broker/book/chapter-Managing-CPP-Broker.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-cpp-0.34/cpp-broker/book/chapter-Managing-CPP-Broker.html
 
b/content/releases/qpid-cpp-0.34/cpp-broker/book/chapter-Managing-CPP-Broker.html
index c1992b9..9e95eb2 100644
--- 
a/content/releases/qpid-cpp-0.34/cpp-broker/book/chapter-Managing-CPP-Broker.html
+++ 
b/content/releases/qpid-cpp-0.34/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-0.34/cpp-broker/book/chapter-ha.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-cpp-0.34/cpp-broker/book/chapter-ha.html 
b/content/releases/qpid-cpp-0.34/cpp-broker/book/chapter-ha.html
index 091ca42..0b44121 100644
--- a/content/releases/qpid-cpp-0.34/cpp-broker/book/chapter-ha.html
+++ b/content/releases/qpid-cpp-0.34/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-0.34/cpp-broker/book/ha-queue-replication.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-cpp-0.34/cpp-broker/book/ha-queue-replication.html 
b/content/releases/qpid-cpp-0.34/cpp-broker/book/ha-queue-replication.html
index 36e6373..783fb2e 100644
--- a/content/releases/qpid-cpp-0.34/cpp-broker/book/ha-queue-replication.html
+++ b/content/releases/qpid-cpp-0.34/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-0.34/cpp-broker/book/index.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-cpp-0.34/cpp-broker/book/index.html 
b/content/releases/qpid-cpp-0.34/cpp-broker/book/index.html
index 2bd67d1..70150fc 100644
--- a/content/releases/qpid-cpp-0.34/cpp-broker/book/index.html
+++ b/content/releases/qpid-cpp-0.34/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-0.34/cpp-broker/book/pr01.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-cpp-0.34/cpp-broker/book/pr01.html 
b/content/releases/qpid-cpp-0.34/cpp-broker/book/pr01.html
index b8a2355..db076cb 100644
--- a/content/releases/qpid-cpp-0.34/cpp-broker/book/pr01.html
+++ b/content/releases/qpid-cpp-0.34/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-0.34/cpp-broker/book/producer-flow-control.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-cpp-0.34/cpp-broker/book/producer-flow-control.html 
b/content/releases/qpid-cpp-0.34/cpp-broker/book/producer-flow-control.html
index f83e908..428aa6f 100644
--- a/content/releases/qpid-cpp-0.34/cpp-broker/book/producer-flow-control.html
+++ b/content/releases/qpid-cpp-0.34/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-0.34/cpp-broker/book/queue-state-replication.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-cpp-0.34/cpp-broker/book/queue-state-replication.html 
b/content/releases/qpid-cpp-0.34/cpp-broker/book/queue-state-replication.html
index ca3b3b7..a4d6bf8 100644
--- 
a/content/releases/qpid-cpp-0.34/cpp-broker/book/queue-state-replication.html
+++ 
b/content/releases/qpid-cpp-0.34/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-0.34/index.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-cpp-0.34/index.html 
b/content/releases/qpid-cpp-0.34/index.html
index 3594304..f7865c7 100644
--- a/content/releases/qpid-cpp-0.34/index.html
+++ b/content/releases/qpid-cpp-0.34/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-0.34/release-notes.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-cpp-0.34/release-notes.html 
b/content/releases/qpid-cpp-0.34/release-notes.html
index 6919ee0..e71f7f5 100644
--- a/content/releases/qpid-cpp-0.34/release-notes.html
+++ b/content/releases/qpid-cpp-0.34/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-1.35.0/cpp-broker/book/AMQP-Compatibility.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-cpp-1.35.0/cpp-broker/book/AMQP-Compatibility.html 
b/content/releases/qpid-cpp-1.35.0/cpp-broker/book/AMQP-Compatibility.html
index 1b3e8fd..6acc0b5 100644
--- a/content/releases/qpid-cpp-1.35.0/cpp-broker/book/AMQP-Compatibility.html
+++ b/content/releases/qpid-cpp-1.35.0/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-1.35.0/cpp-broker/book/QpidInteroperabilityDocumentation-QpidInteroperabilityDocumentation.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-cpp-1.35.0/cpp-broker/book/QpidInteroperabilityDocumentation-QpidInteroperabilityDocumentation.html
 
b/content/releases/qpid-cpp-1.35.0/cpp-broker/book/QpidInteroperabilityDocumentation-QpidInteroperabilityDocumentation.html
index 0685962..9e552a6 100644
--- 
a/content/releases/qpid-cpp-1.35.0/cpp-broker/book/QpidInteroperabilityDocumentation-QpidInteroperabilityDocumentation.html
+++ 
b/content/releases/qpid-cpp-1.35.0/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-1.35.0/cpp-broker/book/Using-message-groups.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-cpp-1.35.0/cpp-broker/book/Using-message-groups.html 
b/content/releases/qpid-cpp-1.35.0/cpp-broker/book/Using-message-groups.html
index a406de8..5dab957 100644
--- a/content/releases/qpid-cpp-1.35.0/cpp-broker/book/Using-message-groups.html
+++ b/content/releases/qpid-cpp-1.35.0/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-1.35.0/cpp-broker/book/ch01.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-cpp-1.35.0/cpp-broker/book/ch01.html 
b/content/releases/qpid-cpp-1.35.0/cpp-broker/book/ch01.html
index 9a2e3e5..bd2a00a 100644
--- a/content/releases/qpid-cpp-1.35.0/cpp-broker/book/ch01.html
+++ b/content/releases/qpid-cpp-1.35.0/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-1.35.0/cpp-broker/book/ch01s02.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-cpp-1.35.0/cpp-broker/book/ch01s02.html 
b/content/releases/qpid-cpp-1.35.0/cpp-broker/book/ch01s02.html
index f3defdb..9a5bc20 100644
--- a/content/releases/qpid-cpp-1.35.0/cpp-broker/book/ch01s02.html
+++ b/content/releases/qpid-cpp-1.35.0/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-1.35.0/cpp-broker/book/ch01s03.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-cpp-1.35.0/cpp-broker/book/ch01s03.html 
b/content/releases/qpid-cpp-1.35.0/cpp-broker/book/ch01s03.html
index e272535..ff21a0c 100644
--- a/content/releases/qpid-cpp-1.35.0/cpp-broker/book/ch01s03.html
+++ b/content/releases/qpid-cpp-1.35.0/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-1.35.0/cpp-broker/book/ch01s06.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-cpp-1.35.0/cpp-broker/book/ch01s06.html 
b/content/releases/qpid-cpp-1.35.0/cpp-broker/book/ch01s06.html
index 812ee48..7f57989 100644
--- a/content/releases/qpid-cpp-1.35.0/cpp-broker/book/ch01s06.html
+++ b/content/releases/qpid-cpp-1.35.0/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-1.35.0/cpp-broker/book/ch02s02.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-cpp-1.35.0/cpp-broker/book/ch02s02.html 
b/content/releases/qpid-cpp-1.35.0/cpp-broker/book/ch02s02.html
index 0f991ea..0516c6d 100644
--- a/content/releases/qpid-cpp-1.35.0/cpp-broker/book/ch02s02.html
+++ b/content/releases/qpid-cpp-1.35.0/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-1.35.0/cpp-broker/book/ch02s03.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-cpp-1.35.0/cpp-broker/book/ch02s03.html 
b/content/releases/qpid-cpp-1.35.0/cpp-broker/book/ch02s03.html
index 63f2d82..65e460d 100644
--- a/content/releases/qpid-cpp-1.35.0/cpp-broker/book/ch02s03.html
+++ b/content/releases/qpid-cpp-1.35.0/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-1.35.0/cpp-broker/book/chap-Messaging_User_Guide-Broker_Federation.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-cpp-1.35.0/cpp-broker/book/chap-Messaging_User_Guide-Broker_Federation.html
 
b/content/releases/qpid-cpp-1.35.0/cpp-broker/book/chap-Messaging_User_Guide-Broker_Federation.html
index 160e3c7..4c98c05 100644
--- 
a/content/releases/qpid-cpp-1.35.0/cpp-broker/book/chap-Messaging_User_Guide-Broker_Federation.html
+++ 
b/content/releases/qpid-cpp-1.35.0/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-1.35.0/cpp-broker/book/chap-Messaging_User_Guide-Security.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-cpp-1.35.0/cpp-broker/book/chap-Messaging_User_Guide-Security.html
 
b/content/releases/qpid-cpp-1.35.0/cpp-broker/book/chap-Messaging_User_Guide-Security.html
index 3ea2239..48eaa5f 100644
--- 
a/content/releases/qpid-cpp-1.35.0/cpp-broker/book/chap-Messaging_User_Guide-Security.html
+++ 
b/content/releases/qpid-cpp-1.35.0/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-1.35.0/cpp-broker/book/chapter-Managing-CPP-Broker.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-cpp-1.35.0/cpp-broker/book/chapter-Managing-CPP-Broker.html
 
b/content/releases/qpid-cpp-1.35.0/cpp-broker/book/chapter-Managing-CPP-Broker.html
index daa8941..6cddd62 100644
--- 
a/content/releases/qpid-cpp-1.35.0/cpp-broker/book/chapter-Managing-CPP-Broker.html
+++ 
b/content/releases/qpid-cpp-1.35.0/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-1.35.0/cpp-broker/book/chapter-ha.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-cpp-1.35.0/cpp-broker/book/chapter-ha.html 
b/content/releases/qpid-cpp-1.35.0/cpp-broker/book/chapter-ha.html
index a20ca30..685e742 100644
--- a/content/releases/qpid-cpp-1.35.0/cpp-broker/book/chapter-ha.html
+++ b/content/releases/qpid-cpp-1.35.0/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-1.35.0/cpp-broker/book/ha-queue-replication.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-cpp-1.35.0/cpp-broker/book/ha-queue-replication.html 
b/content/releases/qpid-cpp-1.35.0/cpp-broker/book/ha-queue-replication.html
index 64e2ea3..ac86c00 100644
--- a/content/releases/qpid-cpp-1.35.0/cpp-broker/book/ha-queue-replication.html
+++ b/content/releases/qpid-cpp-1.35.0/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-1.35.0/cpp-broker/book/index.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-cpp-1.35.0/cpp-broker/book/index.html 
b/content/releases/qpid-cpp-1.35.0/cpp-broker/book/index.html
index 7297dbe..7285657 100644
--- a/content/releases/qpid-cpp-1.35.0/cpp-broker/book/index.html
+++ b/content/releases/qpid-cpp-1.35.0/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-1.35.0/cpp-broker/book/pr01.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-cpp-1.35.0/cpp-broker/book/pr01.html 
b/content/releases/qpid-cpp-1.35.0/cpp-broker/book/pr01.html
index fde0699..7daa466 100644
--- a/content/releases/qpid-cpp-1.35.0/cpp-broker/book/pr01.html
+++ b/content/releases/qpid-cpp-1.35.0/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-1.35.0/cpp-broker/book/producer-flow-control.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-cpp-1.35.0/cpp-broker/book/producer-flow-control.html 
b/content/releases/qpid-cpp-1.35.0/cpp-broker/book/producer-flow-control.html
index 3494d99..9cd54d3 100644
--- 
a/content/releases/qpid-cpp-1.35.0/cpp-broker/book/producer-flow-control.html
+++ 
b/content/releases/qpid-cpp-1.35.0/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-1.35.0/cpp-broker/book/queue-state-replication.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-cpp-1.35.0/cpp-broker/book/queue-state-replication.html 
b/content/releases/qpid-cpp-1.35.0/cpp-broker/book/queue-state-replication.html
index 9a87e51..6284e28 100644
--- 
a/content/releases/qpid-cpp-1.35.0/cpp-broker/book/queue-state-replication.html
+++ 
b/content/releases/qpid-cpp-1.35.0/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-1.35.0/index.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-cpp-1.35.0/index.html 
b/content/releases/qpid-cpp-1.35.0/index.html
index c747e8f..b062215 100644
--- a/content/releases/qpid-cpp-1.35.0/index.html
+++ b/content/releases/qpid-cpp-1.35.0/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.35.0/messaging-api/cpp/examples/OptionParser.cpp.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-cpp-1.35.0/messaging-api/cpp/examples/OptionParser.cpp.html
 
b/content/releases/qpid-cpp-1.35.0/messaging-api/cpp/examples/OptionParser.cpp.html
index 850aae8..9a553fb 100644
--- 
a/content/releases/qpid-cpp-1.35.0/messaging-api/cpp/examples/OptionParser.cpp.html
+++ 
b/content/releases/qpid-cpp-1.35.0/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-1.35.0/messaging-api/cpp/examples/OptionParser.h.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-cpp-1.35.0/messaging-api/cpp/examples/OptionParser.h.html
 
b/content/releases/qpid-cpp-1.35.0/messaging-api/cpp/examples/OptionParser.h.html
index e754b5a..1fc85f8 100644
--- 
a/content/releases/qpid-cpp-1.35.0/messaging-api/cpp/examples/OptionParser.h.html
+++ 
b/content/releases/qpid-cpp-1.35.0/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-1.35.0/messaging-api/cpp/examples/client.cpp.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-cpp-1.35.0/messaging-api/cpp/examples/client.cpp.html 
b/content/releases/qpid-cpp-1.35.0/messaging-api/cpp/examples/client.cpp.html
index c3e0579..43fcb6a 100644
--- 
a/content/releases/qpid-cpp-1.35.0/messaging-api/cpp/examples/client.cpp.html
+++ 
b/content/releases/qpid-cpp-1.35.0/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-1.35.0/messaging-api/cpp/examples/drain.cpp.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-cpp-1.35.0/messaging-api/cpp/examples/drain.cpp.html 
b/content/releases/qpid-cpp-1.35.0/messaging-api/cpp/examples/drain.cpp.html
index 3b43b3c..5b9c4bf 100644
--- a/content/releases/qpid-cpp-1.35.0/messaging-api/cpp/examples/drain.cpp.html
+++ b/content/releases/qpid-cpp-1.35.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.35.0/messaging-api/cpp/examples/hello_world.cpp.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-cpp-1.35.0/messaging-api/cpp/examples/hello_world.cpp.html
 
b/content/releases/qpid-cpp-1.35.0/messaging-api/cpp/examples/hello_world.cpp.html
index 7651cdd..ba82c91 100644
--- 
a/content/releases/qpid-cpp-1.35.0/messaging-api/cpp/examples/hello_world.cpp.html
+++ 
b/content/releases/qpid-cpp-1.35.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.35.0/messaging-api/cpp/examples/hello_xml.cpp.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-cpp-1.35.0/messaging-api/cpp/examples/hello_xml.cpp.html
 
b/content/releases/qpid-cpp-1.35.0/messaging-api/cpp/examples/hello_xml.cpp.html
index b0086ba..91f3476 100644
--- 
a/content/releases/qpid-cpp-1.35.0/messaging-api/cpp/examples/hello_xml.cpp.html
+++ 
b/content/releases/qpid-cpp-1.35.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.35.0/messaging-api/cpp/examples/index.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-cpp-1.35.0/messaging-api/cpp/examples/index.html 
b/content/releases/qpid-cpp-1.35.0/messaging-api/cpp/examples/index.html
index 2d18982..de9c71c 100644
--- a/content/releases/qpid-cpp-1.35.0/messaging-api/cpp/examples/index.html
+++ b/content/releases/qpid-cpp-1.35.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.35.0/messaging-api/cpp/examples/map_receiver.cpp.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-cpp-1.35.0/messaging-api/cpp/examples/map_receiver.cpp.html
 
b/content/releases/qpid-cpp-1.35.0/messaging-api/cpp/examples/map_receiver.cpp.html
index 020b1f6..ba4d344 100644
--- 
a/content/releases/qpid-cpp-1.35.0/messaging-api/cpp/examples/map_receiver.cpp.html
+++ 
b/content/releases/qpid-cpp-1.35.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.35.0/messaging-api/cpp/examples/map_sender.cpp.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-cpp-1.35.0/messaging-api/cpp/examples/map_sender.cpp.html
 
b/content/releases/qpid-cpp-1.35.0/messaging-api/cpp/examples/map_sender.cpp.html
index b86e10c..25d7dbd 100644
--- 
a/content/releases/qpid-cpp-1.35.0/messaging-api/cpp/examples/map_sender.cpp.html
+++ 
b/content/releases/qpid-cpp-1.35.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.35.0/messaging-api/cpp/examples/server.cpp.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-cpp-1.35.0/messaging-api/cpp/examples/server.cpp.html 
b/content/releases/qpid-cpp-1.35.0/messaging-api/cpp/examples/server.cpp.html
index 768d04b..28fe65d 100644
--- 
a/content/releases/qpid-cpp-1.35.0/messaging-api/cpp/examples/server.cpp.html
+++ 
b/content/releases/qpid-cpp-1.35.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.35.0/messaging-api/cpp/examples/server_reconnect.cpp.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-cpp-1.35.0/messaging-api/cpp/examples/server_reconnect.cpp.html
 
b/content/releases/qpid-cpp-1.35.0/messaging-api/cpp/examples/server_reconnect.cpp.html
index 106692f..6ce14d1 100644
--- 
a/content/releases/qpid-cpp-1.35.0/messaging-api/cpp/examples/server_reconnect.cpp.html
+++ 
b/content/releases/qpid-cpp-1.35.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.35.0/messaging-api/cpp/examples/spout.cpp.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-cpp-1.35.0/messaging-api/cpp/examples/spout.cpp.html 
b/content/releases/qpid-cpp-1.35.0/messaging-api/cpp/examples/spout.cpp.html
index 2e07006..1faad1d 100644
--- a/content/releases/qpid-cpp-1.35.0/messaging-api/cpp/examples/spout.cpp.html
+++ b/content/releases/qpid-cpp-1.35.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.35.0/release-notes.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-cpp-1.35.0/release-notes.html 
b/content/releases/qpid-cpp-1.35.0/release-notes.html
index ebb92cc..059eb33 100644
--- a/content/releases/qpid-cpp-1.35.0/release-notes.html
+++ b/content/releases/qpid-cpp-1.35.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-1.36.0/cpp-broker/book/AMQP-Compatibility.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-cpp-1.36.0/cpp-broker/book/AMQP-Compatibility.html 
b/content/releases/qpid-cpp-1.36.0/cpp-broker/book/AMQP-Compatibility.html
index d4e9247..3f4505f 100644
--- a/content/releases/qpid-cpp-1.36.0/cpp-broker/book/AMQP-Compatibility.html
+++ b/content/releases/qpid-cpp-1.36.0/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-1.36.0/cpp-broker/book/QpidInteroperabilityDocumentation-QpidInteroperabilityDocumentation.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-cpp-1.36.0/cpp-broker/book/QpidInteroperabilityDocumentation-QpidInteroperabilityDocumentation.html
 
b/content/releases/qpid-cpp-1.36.0/cpp-broker/book/QpidInteroperabilityDocumentation-QpidInteroperabilityDocumentation.html
index 3ecef70..71c89e0 100644
--- 
a/content/releases/qpid-cpp-1.36.0/cpp-broker/book/QpidInteroperabilityDocumentation-QpidInteroperabilityDocumentation.html
+++ 
b/content/releases/qpid-cpp-1.36.0/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-1.36.0/cpp-broker/book/Using-message-groups.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-cpp-1.36.0/cpp-broker/book/Using-message-groups.html 
b/content/releases/qpid-cpp-1.36.0/cpp-broker/book/Using-message-groups.html
index fb27c18..67ea119 100644
--- a/content/releases/qpid-cpp-1.36.0/cpp-broker/book/Using-message-groups.html
+++ b/content/releases/qpid-cpp-1.36.0/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-1.36.0/cpp-broker/book/ch01.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-cpp-1.36.0/cpp-broker/book/ch01.html 
b/content/releases/qpid-cpp-1.36.0/cpp-broker/book/ch01.html
index b201db2..65623c9 100644
--- a/content/releases/qpid-cpp-1.36.0/cpp-broker/book/ch01.html
+++ b/content/releases/qpid-cpp-1.36.0/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-1.36.0/cpp-broker/book/ch01s02.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-cpp-1.36.0/cpp-broker/book/ch01s02.html 
b/content/releases/qpid-cpp-1.36.0/cpp-broker/book/ch01s02.html
index d2a7f9d..be83f42 100644
--- a/content/releases/qpid-cpp-1.36.0/cpp-broker/book/ch01s02.html
+++ b/content/releases/qpid-cpp-1.36.0/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-1.36.0/cpp-broker/book/ch01s03.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-cpp-1.36.0/cpp-broker/book/ch01s03.html 
b/content/releases/qpid-cpp-1.36.0/cpp-broker/book/ch01s03.html
index 4734b85..749310d 100644
--- a/content/releases/qpid-cpp-1.36.0/cpp-broker/book/ch01s03.html
+++ b/content/releases/qpid-cpp-1.36.0/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-1.36.0/cpp-broker/book/ch01s06.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-cpp-1.36.0/cpp-broker/book/ch01s06.html 
b/content/releases/qpid-cpp-1.36.0/cpp-broker/book/ch01s06.html
index 31f01d4..a2d82f2 100644
--- a/content/releases/qpid-cpp-1.36.0/cpp-broker/book/ch01s06.html
+++ b/content/releases/qpid-cpp-1.36.0/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-1.36.0/cpp-broker/book/ch02s02.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-cpp-1.36.0/cpp-broker/book/ch02s02.html 
b/content/releases/qpid-cpp-1.36.0/cpp-broker/book/ch02s02.html
index 60e9653..c966f75 100644
--- a/content/releases/qpid-cpp-1.36.0/cpp-broker/book/ch02s02.html
+++ b/content/releases/qpid-cpp-1.36.0/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-1.36.0/cpp-broker/book/ch02s03.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-cpp-1.36.0/cpp-broker/book/ch02s03.html 
b/content/releases/qpid-cpp-1.36.0/cpp-broker/book/ch02s03.html
index 5f9cb72..ebdf34e 100644
--- a/content/releases/qpid-cpp-1.36.0/cpp-broker/book/ch02s03.html
+++ b/content/releases/qpid-cpp-1.36.0/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-1.36.0/cpp-broker/book/chap-Messaging_User_Guide-Broker_Federation.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-cpp-1.36.0/cpp-broker/book/chap-Messaging_User_Guide-Broker_Federation.html
 
b/content/releases/qpid-cpp-1.36.0/cpp-broker/book/chap-Messaging_User_Guide-Broker_Federation.html
index b39758b..8104b31 100644
--- 
a/content/releases/qpid-cpp-1.36.0/cpp-broker/book/chap-Messaging_User_Guide-Broker_Federation.html
+++ 
b/content/releases/qpid-cpp-1.36.0/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-1.36.0/cpp-broker/book/chap-Messaging_User_Guide-Security.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-cpp-1.36.0/cpp-broker/book/chap-Messaging_User_Guide-Security.html
 
b/content/releases/qpid-cpp-1.36.0/cpp-broker/book/chap-Messaging_User_Guide-Security.html
index 5137402..27bf6b5 100644
--- 
a/content/releases/qpid-cpp-1.36.0/cpp-broker/book/chap-Messaging_User_Guide-Security.html
+++ 
b/content/releases/qpid-cpp-1.36.0/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-1.36.0/cpp-broker/book/chapter-Managing-CPP-Broker.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-cpp-1.36.0/cpp-broker/book/chapter-Managing-CPP-Broker.html
 
b/content/releases/qpid-cpp-1.36.0/cpp-broker/book/chapter-Managing-CPP-Broker.html
index dc01d6f..c82cedd 100644
--- 
a/content/releases/qpid-cpp-1.36.0/cpp-broker/book/chapter-Managing-CPP-Broker.html
+++ 
b/content/releases/qpid-cpp-1.36.0/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-1.36.0/cpp-broker/book/chapter-ha.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-cpp-1.36.0/cpp-broker/book/chapter-ha.html 
b/content/releases/qpid-cpp-1.36.0/cpp-broker/book/chapter-ha.html
index 2b8e169..57bd184 100644
--- a/content/releases/qpid-cpp-1.36.0/cpp-broker/book/chapter-ha.html
+++ b/content/releases/qpid-cpp-1.36.0/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-1.36.0/cpp-broker/book/ha-queue-replication.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-cpp-1.36.0/cpp-broker/book/ha-queue-replication.html 
b/content/releases/qpid-cpp-1.36.0/cpp-broker/book/ha-queue-replication.html
index b98f8ef..cb2d019 100644
--- a/content/releases/qpid-cpp-1.36.0/cpp-broker/book/ha-queue-replication.html
+++ b/content/releases/qpid-cpp-1.36.0/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-1.36.0/cpp-broker/book/index.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-cpp-1.36.0/cpp-broker/book/index.html 
b/content/releases/qpid-cpp-1.36.0/cpp-broker/book/index.html
index 517f41d..f38b411 100644
--- a/content/releases/qpid-cpp-1.36.0/cpp-broker/book/index.html
+++ b/content/releases/qpid-cpp-1.36.0/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-1.36.0/cpp-broker/book/pr01.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-cpp-1.36.0/cpp-broker/book/pr01.html 
b/content/releases/qpid-cpp-1.36.0/cpp-broker/book/pr01.html
index 4bd887c..52224d2 100644
--- a/content/releases/qpid-cpp-1.36.0/cpp-broker/book/pr01.html
+++ b/content/releases/qpid-cpp-1.36.0/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-1.36.0/cpp-broker/book/producer-flow-control.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-cpp-1.36.0/cpp-broker/book/producer-flow-control.html 
b/content/releases/qpid-cpp-1.36.0/cpp-broker/book/producer-flow-control.html
index dcf89ea..8e05db8 100644
--- 
a/content/releases/qpid-cpp-1.36.0/cpp-broker/book/producer-flow-control.html
+++ 
b/content/releases/qpid-cpp-1.36.0/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-1.36.0/cpp-broker/book/queue-state-replication.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-cpp-1.36.0/cpp-broker/book/queue-state-replication.html 
b/content/releases/qpid-cpp-1.36.0/cpp-broker/book/queue-state-replication.html
index 53cbd0b..6a6b702 100644
--- 
a/content/releases/qpid-cpp-1.36.0/cpp-broker/book/queue-state-replication.html
+++ 
b/content/releases/qpid-cpp-1.36.0/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-1.36.0/index.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-cpp-1.36.0/index.html 
b/content/releases/qpid-cpp-1.36.0/index.html
index 329ccd4..eb973a5 100644
--- a/content/releases/qpid-cpp-1.36.0/index.html
+++ b/content/releases/qpid-cpp-1.36.0/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/book/Message-Groups-Guide.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-cpp-1.36.0/messaging-api/book/Message-Groups-Guide.html 
b/content/releases/qpid-cpp-1.36.0/messaging-api/book/Message-Groups-Guide.html
index dbb3f50..def66df 100644
--- 
a/content/releases/qpid-cpp-1.36.0/messaging-api/book/Message-Groups-Guide.html
+++ 
b/content/releases/qpid-cpp-1.36.0/messaging-api/book/Message-Groups-Guide.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/book/acknowledgements.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-cpp-1.36.0/messaging-api/book/acknowledgements.html 
b/content/releases/qpid-cpp-1.36.0/messaging-api/book/acknowledgements.html
index 570552f..765fc28 100644
--- a/content/releases/qpid-cpp-1.36.0/messaging-api/book/acknowledgements.html
+++ b/content/releases/qpid-cpp-1.36.0/messaging-api/book/acknowledgements.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/book/ch01s02.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-cpp-1.36.0/messaging-api/book/ch01s02.html 
b/content/releases/qpid-cpp-1.36.0/messaging-api/book/ch01s02.html
index 86d34df..d33961c 100644
--- a/content/releases/qpid-cpp-1.36.0/messaging-api/book/ch01s02.html
+++ b/content/releases/qpid-cpp-1.36.0/messaging-api/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-1.36.0/messaging-api/book/ch01s03.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-cpp-1.36.0/messaging-api/book/ch01s03.html 
b/content/releases/qpid-cpp-1.36.0/messaging-api/book/ch01s03.html
index f05577a..9df7bc8 100644
--- a/content/releases/qpid-cpp-1.36.0/messaging-api/book/ch01s03.html
+++ b/content/releases/qpid-cpp-1.36.0/messaging-api/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-1.36.0/messaging-api/book/ch01s08.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-cpp-1.36.0/messaging-api/book/ch01s08.html 
b/content/releases/qpid-cpp-1.36.0/messaging-api/book/ch01s08.html
index 2ffcf10..826cf24 100644
--- a/content/releases/qpid-cpp-1.36.0/messaging-api/book/ch01s08.html
+++ b/content/releases/qpid-cpp-1.36.0/messaging-api/book/ch01s08.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/book/ch01s09.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-cpp-1.36.0/messaging-api/book/ch01s09.html 
b/content/releases/qpid-cpp-1.36.0/messaging-api/book/ch01s09.html
index 5999360..3638874 100644
--- a/content/releases/qpid-cpp-1.36.0/messaging-api/book/ch01s09.html
+++ b/content/releases/qpid-cpp-1.36.0/messaging-api/book/ch01s09.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/book/ch01s12.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-cpp-1.36.0/messaging-api/book/ch01s12.html 
b/content/releases/qpid-cpp-1.36.0/messaging-api/book/ch01s12.html
index 4f2f3b2..6a72458 100644
--- a/content/releases/qpid-cpp-1.36.0/messaging-api/book/ch01s12.html
+++ b/content/releases/qpid-cpp-1.36.0/messaging-api/book/ch01s12.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/book/ch01s13.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-cpp-1.36.0/messaging-api/book/ch01s13.html 
b/content/releases/qpid-cpp-1.36.0/messaging-api/book/ch01s13.html
index 4d7c55e..6f567f7 100644
--- a/content/releases/qpid-cpp-1.36.0/messaging-api/book/ch01s13.html
+++ b/content/releases/qpid-cpp-1.36.0/messaging-api/book/ch01s13.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/book/ch01s14.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-cpp-1.36.0/messaging-api/book/ch01s14.html 
b/content/releases/qpid-cpp-1.36.0/messaging-api/book/ch01s14.html
index 1db2f3f..28d0d0c 100644
--- a/content/releases/qpid-cpp-1.36.0/messaging-api/book/ch01s14.html
+++ b/content/releases/qpid-cpp-1.36.0/messaging-api/book/ch01s14.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/book/ch01s15.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-cpp-1.36.0/messaging-api/book/ch01s15.html 
b/content/releases/qpid-cpp-1.36.0/messaging-api/book/ch01s15.html
index 8b469a8..df82780 100644
--- a/content/releases/qpid-cpp-1.36.0/messaging-api/book/ch01s15.html
+++ b/content/releases/qpid-cpp-1.36.0/messaging-api/book/ch01s15.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/book/ch02.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-cpp-1.36.0/messaging-api/book/ch02.html 
b/content/releases/qpid-cpp-1.36.0/messaging-api/book/ch02.html
index 7aefef3..81ca7b6 100644
--- a/content/releases/qpid-cpp-1.36.0/messaging-api/book/ch02.html
+++ b/content/releases/qpid-cpp-1.36.0/messaging-api/book/ch02.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/book/ch02s02.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-cpp-1.36.0/messaging-api/book/ch02s02.html 
b/content/releases/qpid-cpp-1.36.0/messaging-api/book/ch02s02.html
index 4aa6c6d..580098e 100644
--- a/content/releases/qpid-cpp-1.36.0/messaging-api/book/ch02s02.html
+++ b/content/releases/qpid-cpp-1.36.0/messaging-api/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-1.36.0/messaging-api/book/ch02s03.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-cpp-1.36.0/messaging-api/book/ch02s03.html 
b/content/releases/qpid-cpp-1.36.0/messaging-api/book/ch02s03.html
index 37939e5..a29dadd 100644
--- a/content/releases/qpid-cpp-1.36.0/messaging-api/book/ch02s03.html
+++ b/content/releases/qpid-cpp-1.36.0/messaging-api/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-1.36.0/messaging-api/book/connections.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-cpp-1.36.0/messaging-api/book/connections.html 
b/content/releases/qpid-cpp-1.36.0/messaging-api/book/connections.html
index 4b19141..4833aa8 100644
--- a/content/releases/qpid-cpp-1.36.0/messaging-api/book/connections.html
+++ b/content/releases/qpid-cpp-1.36.0/messaging-api/book/connections.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/book/index.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-cpp-1.36.0/messaging-api/book/index.html 
b/content/releases/qpid-cpp-1.36.0/messaging-api/book/index.html
index 849d701..a902c9c 100644
--- a/content/releases/qpid-cpp-1.36.0/messaging-api/book/index.html
+++ b/content/releases/qpid-cpp-1.36.0/messaging-api/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-1.36.0/messaging-api/book/prefetch.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-cpp-1.36.0/messaging-api/book/prefetch.html 
b/content/releases/qpid-cpp-1.36.0/messaging-api/book/prefetch.html
index 19c92e3..25e9c2b 100644
--- a/content/releases/qpid-cpp-1.36.0/messaging-api/book/prefetch.html
+++ b/content/releases/qpid-cpp-1.36.0/messaging-api/book/prefetch.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/book/replay.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-cpp-1.36.0/messaging-api/book/replay.html 
b/content/releases/qpid-cpp-1.36.0/messaging-api/book/replay.html
index c7951f3..9493259 100644
--- a/content/releases/qpid-cpp-1.36.0/messaging-api/book/replay.html
+++ b/content/releases/qpid-cpp-1.36.0/messaging-api/book/replay.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/book/section-Maps.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-cpp-1.36.0/messaging-api/book/section-Maps.html 
b/content/releases/qpid-cpp-1.36.0/messaging-api/book/section-Maps.html
index f15e6a4..08574b2 100644
--- a/content/releases/qpid-cpp-1.36.0/messaging-api/book/section-Maps.html
+++ b/content/releases/qpid-cpp-1.36.0/messaging-api/book/section-Maps.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/book/section-addresses.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-cpp-1.36.0/messaging-api/book/section-addresses.html 
b/content/releases/qpid-cpp-1.36.0/messaging-api/book/section-addresses.html
index 3a18dac..8aa4fb0 100644
--- a/content/releases/qpid-cpp-1.36.0/messaging-api/book/section-addresses.html
+++ b/content/releases/qpid-cpp-1.36.0/messaging-api/book/section-addresses.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/book/section-amqp0-10-mapping.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-cpp-1.36.0/messaging-api/book/section-amqp0-10-mapping.html
 
b/content/releases/qpid-cpp-1.36.0/messaging-api/book/section-amqp0-10-mapping.html
index 7cf8e6c..53f7bea 100644
--- 
a/content/releases/qpid-cpp-1.36.0/messaging-api/book/section-amqp0-10-mapping.html
+++ 
b/content/releases/qpid-cpp-1.36.0/messaging-api/book/section-amqp0-10-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-cpp-1.36.0/messaging-api/book/using-the-qpid-messaging-api.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-cpp-1.36.0/messaging-api/book/using-the-qpid-messaging-api.html
 
b/content/releases/qpid-cpp-1.36.0/messaging-api/book/using-the-qpid-messaging-api.html
index 43534f5..3160ee0 100644
--- 
a/content/releases/qpid-cpp-1.36.0/messaging-api/book/using-the-qpid-messaging-api.html
+++ 
b/content/releases/qpid-cpp-1.36.0/messaging-api/book/using-the-qpid-messaging-api.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/OptionParser.cpp.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-cpp-1.36.0/messaging-api/cpp/examples/OptionParser.cpp.html
 
b/content/releases/qpid-cpp-1.36.0/messaging-api/cpp/examples/OptionParser.cpp.html
index aa9aef5..16b1660 100644
--- 
a/content/releases/qpid-cpp-1.36.0/messaging-api/cpp/examples/OptionParser.cpp.html
+++ 
b/content/releases/qpid-cpp-1.36.0/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-1.36.0/messaging-api/cpp/examples/OptionParser.h.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-cpp-1.36.0/messaging-api/cpp/examples/OptionParser.h.html
 
b/content/releases/qpid-cpp-1.36.0/messaging-api/cpp/examples/OptionParser.h.html
index 23c64b6..d9b66dc 100644
--- 
a/content/releases/qpid-cpp-1.36.0/messaging-api/cpp/examples/OptionParser.h.html
+++ 
b/content/releases/qpid-cpp-1.36.0/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-1.36.0/messaging-api/cpp/examples/client.cpp.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-cpp-1.36.0/messaging-api/cpp/examples/client.cpp.html 
b/content/releases/qpid-cpp-1.36.0/messaging-api/cpp/examples/client.cpp.html
index 747908f..66b4292 100644
--- 
a/content/releases/qpid-cpp-1.36.0/messaging-api/cpp/examples/client.cpp.html
+++ 
b/content/releases/qpid-cpp-1.36.0/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>


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

Reply via email to