http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0e1f0cc4/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Management-Managing-Access-Control-Providers.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Management-Managing-Access-Control-Providers.html
 
b/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Management-Managing-Access-Control-Providers.html
index 593c4f7..a5e8694 100644
--- 
a/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Management-Managing-Access-Control-Providers.html
+++ 
b/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Management-Managing-Access-Control-Providers.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-java-6.0.7/java-broker/book/Java-Broker-Management-Managing-Authentication-Providers.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Management-Managing-Authentication-Providers.html
 
b/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Management-Managing-Authentication-Providers.html
index dc974de..2e3d579 100644
--- 
a/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Management-Managing-Authentication-Providers.html
+++ 
b/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Management-Managing-Authentication-Providers.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-java-6.0.7/java-broker/book/Java-Broker-Management-Managing-Broker.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Management-Managing-Broker.html
 
b/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Management-Managing-Broker.html
index 264051f..1ba31cf 100644
--- 
a/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Management-Managing-Broker.html
+++ 
b/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Management-Managing-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-java-6.0.7/java-broker/book/Java-Broker-Management-Managing-Consumers.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Management-Managing-Consumers.html
 
b/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Management-Managing-Consumers.html
index 7422758..3e9e2ca 100644
--- 
a/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Management-Managing-Consumers.html
+++ 
b/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Management-Managing-Consumers.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-java-6.0.7/java-broker/book/Java-Broker-Management-Managing-Entities-Matrix.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Management-Managing-Entities-Matrix.html
 
b/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Management-Managing-Entities-Matrix.html
index 25e91b1..27963f1 100644
--- 
a/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Management-Managing-Entities-Matrix.html
+++ 
b/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Management-Managing-Entities-Matrix.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-java-6.0.7/java-broker/book/Java-Broker-Management-Managing-Entities.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Management-Managing-Entities.html
 
b/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Management-Managing-Entities.html
index 9ef0684..4320e50 100644
--- 
a/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Management-Managing-Entities.html
+++ 
b/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Management-Managing-Entities.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-java-6.0.7/java-broker/book/Java-Broker-Management-Managing-Exchanges.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Management-Managing-Exchanges.html
 
b/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Management-Managing-Exchanges.html
index 23ffedb..8c3b536 100644
--- 
a/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Management-Managing-Exchanges.html
+++ 
b/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Management-Managing-Exchanges.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-java-6.0.7/java-broker/book/Java-Broker-Management-Managing-Group-Providers.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Management-Managing-Group-Providers.html
 
b/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Management-Managing-Group-Providers.html
index 64ca1bd..65ba027 100644
--- 
a/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Management-Managing-Group-Providers.html
+++ 
b/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Management-Managing-Group-Providers.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-java-6.0.7/java-broker/book/Java-Broker-Management-Managing-Keystores.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Management-Managing-Keystores.html
 
b/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Management-Managing-Keystores.html
index 97526fd..792627d 100644
--- 
a/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Management-Managing-Keystores.html
+++ 
b/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Management-Managing-Keystores.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-java-6.0.7/java-broker/book/Java-Broker-Management-Managing-Plugin-HTTP.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Management-Managing-Plugin-HTTP.html
 
b/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Management-Managing-Plugin-HTTP.html
index 8c5bb1e..d1b2527 100644
--- 
a/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Management-Managing-Plugin-HTTP.html
+++ 
b/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Management-Managing-Plugin-HTTP.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-java-6.0.7/java-broker/book/Java-Broker-Management-Managing-Ports.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Management-Managing-Ports.html
 
b/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Management-Managing-Ports.html
index a2bc09f..66d1088 100644
--- 
a/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Management-Managing-Ports.html
+++ 
b/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Management-Managing-Ports.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-java-6.0.7/java-broker/book/Java-Broker-Management-Managing-Queues.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Management-Managing-Queues.html
 
b/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Management-Managing-Queues.html
index d6127c7..e0136c2 100644
--- 
a/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Management-Managing-Queues.html
+++ 
b/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Management-Managing-Queues.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-java-6.0.7/java-broker/book/Java-Broker-Management-Managing-RemoteReplicationNodes.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Management-Managing-RemoteReplicationNodes.html
 
b/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Management-Managing-RemoteReplicationNodes.html
index 87ea0db..00999df 100644
--- 
a/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Management-Managing-RemoteReplicationNodes.html
+++ 
b/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Management-Managing-RemoteReplicationNodes.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-java-6.0.7/java-broker/book/Java-Broker-Management-Managing-Truststores.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Management-Managing-Truststores.html
 
b/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Management-Managing-Truststores.html
index 74de287..a9fda51 100644
--- 
a/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Management-Managing-Truststores.html
+++ 
b/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Management-Managing-Truststores.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-java-6.0.7/java-broker/book/Java-Broker-Management-Managing-Virtualhost-Nodes.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Management-Managing-Virtualhost-Nodes.html
 
b/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Management-Managing-Virtualhost-Nodes.html
index 896a272..1c93ff4 100644
--- 
a/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Management-Managing-Virtualhost-Nodes.html
+++ 
b/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Management-Managing-Virtualhost-Nodes.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-java-6.0.7/java-broker/book/Java-Broker-Management-Managing-Virtualhosts.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Management-Managing-Virtualhosts.html
 
b/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Management-Managing-Virtualhosts.html
index 0ef342d..456775a 100644
--- 
a/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Management-Managing-Virtualhosts.html
+++ 
b/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Management-Managing-Virtualhosts.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-java-6.0.7/java-broker/book/Java-Broker-Miscellaneous-Installing-External-JDBC-Driver.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Miscellaneous-Installing-External-JDBC-Driver.html
 
b/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Miscellaneous-Installing-External-JDBC-Driver.html
index 57eaa28..2d9078a 100644
--- 
a/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Miscellaneous-Installing-External-JDBC-Driver.html
+++ 
b/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Miscellaneous-Installing-External-JDBC-Driver.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-java-6.0.7/java-broker/book/Java-Broker-Miscellaneous-Installing-Oracle-BDB-JE.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Miscellaneous-Installing-Oracle-BDB-JE.html
 
b/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Miscellaneous-Installing-Oracle-BDB-JE.html
index f99e4c8..3b54ed1 100644
--- 
a/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Miscellaneous-Installing-Oracle-BDB-JE.html
+++ 
b/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Miscellaneous-Installing-Oracle-BDB-JE.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-java-6.0.7/java-broker/book/Java-Broker-Miscellaneous.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Miscellaneous.html
 
b/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Miscellaneous.html
index 28b8fa3..d8711e8 100644
--- 
a/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Miscellaneous.html
+++ 
b/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Miscellaneous.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-java-6.0.7/java-broker/book/Java-Broker-Runtime-Background-Recovery.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Runtime-Background-Recovery.html
 
b/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Runtime-Background-Recovery.html
index c4d4c24..1c1c93d 100644
--- 
a/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Runtime-Background-Recovery.html
+++ 
b/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Runtime-Background-Recovery.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-java-6.0.7/java-broker/book/Java-Broker-Runtime-Close-Connection-When-No-Route.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Runtime-Close-Connection-When-No-Route.html
 
b/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Runtime-Close-Connection-When-No-Route.html
index acdc7ed..c83d274 100644
--- 
a/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Runtime-Close-Connection-When-No-Route.html
+++ 
b/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Runtime-Close-Connection-When-No-Route.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-java-6.0.7/java-broker/book/Java-Broker-Runtime-Connection-Limit.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Runtime-Connection-Limit.html
 
b/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Runtime-Connection-Limit.html
index c3f0443..e66ce05 100644
--- 
a/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Runtime-Connection-Limit.html
+++ 
b/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Runtime-Connection-Limit.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-java-6.0.7/java-broker/book/Java-Broker-Runtime-Disk-Space-Management.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Runtime-Disk-Space-Management.html
 
b/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Runtime-Disk-Space-Management.html
index 09813f2..718c552 100644
--- 
a/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Runtime-Disk-Space-Management.html
+++ 
b/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Runtime-Disk-Space-Management.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-java-6.0.7/java-broker/book/Java-Broker-Runtime-Flow-To-Disk.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Runtime-Flow-To-Disk.html
 
b/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Runtime-Flow-To-Disk.html
index 5916dee..e56f5ec 100644
--- 
a/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Runtime-Flow-To-Disk.html
+++ 
b/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Runtime-Flow-To-Disk.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-java-6.0.7/java-broker/book/Java-Broker-Runtime-Handling-Undeliverable-Messages.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Runtime-Handling-Undeliverable-Messages.html
 
b/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Runtime-Handling-Undeliverable-Messages.html
index fb65be3..00912a1 100644
--- 
a/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Runtime-Handling-Undeliverable-Messages.html
+++ 
b/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Runtime-Handling-Undeliverable-Messages.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-java-6.0.7/java-broker/book/Java-Broker-Runtime-Memory.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Runtime-Memory.html
 
b/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Runtime-Memory.html
index 5dd78de..0b85af9 100644
--- 
a/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Runtime-Memory.html
+++ 
b/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Runtime-Memory.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-java-6.0.7/java-broker/book/Java-Broker-Runtime-Message-Compression.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Runtime-Message-Compression.html
 
b/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Runtime-Message-Compression.html
index 8655559..b72b1e3 100644
--- 
a/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Runtime-Message-Compression.html
+++ 
b/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Runtime-Message-Compression.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-java-6.0.7/java-broker/book/Java-Broker-Runtime-Producer-Transaction-Timeout.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Runtime-Producer-Transaction-Timeout.html
 
b/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Runtime-Producer-Transaction-Timeout.html
index 5ad9093..c9e9e35 100644
--- 
a/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Runtime-Producer-Transaction-Timeout.html
+++ 
b/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Runtime-Producer-Transaction-Timeout.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-java-6.0.7/java-broker/book/Java-Broker-Runtime.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Runtime.html 
b/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Runtime.html
index 80a77bc..9b5cc72 100644
--- a/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Runtime.html
+++ b/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Runtime.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-java-6.0.7/java-broker/book/Java-Broker-Security-ACLs.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Security-ACLs.html
 
b/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Security-ACLs.html
index 6c78a36..92bf2be 100644
--- 
a/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Security-ACLs.html
+++ 
b/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Security-ACLs.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-java-6.0.7/java-broker/book/Java-Broker-Security-Configuration-Encryption.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Security-Configuration-Encryption.html
 
b/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Security-Configuration-Encryption.html
index d3a314c..f945ff9 100644
--- 
a/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Security-Configuration-Encryption.html
+++ 
b/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Security-Configuration-Encryption.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-java-6.0.7/java-broker/book/Java-Broker-Security-Group-Providers.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Security-Group-Providers.html
 
b/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Security-Group-Providers.html
index 57881a7..a9a1718 100644
--- 
a/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Security-Group-Providers.html
+++ 
b/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Security-Group-Providers.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-java-6.0.7/java-broker/book/Java-Broker-Security.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Security.html 
b/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Security.html
index f27d74e..d4b0e98 100644
--- 
a/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-Security.html
+++ 
b/content/releases/qpid-java-6.0.7/java-broker/book/Java-Broker-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-java-6.0.7/java-broker/book/index.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-java-6.0.7/java-broker/book/index.html 
b/content/releases/qpid-java-6.0.7/java-broker/book/index.html
index 7cdcd2f..82226ba 100644
--- a/content/releases/qpid-java-6.0.7/java-broker/book/index.html
+++ b/content/releases/qpid-java-6.0.7/java-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-java-6.0.7/jms-client-0-10/book/JMS-Client-0-10-Book.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.7/jms-client-0-10/book/JMS-Client-0-10-Book.html
 
b/content/releases/qpid-java-6.0.7/jms-client-0-10/book/JMS-Client-0-10-Book.html
index 1eaf9ee..8bc30b7 100644
--- 
a/content/releases/qpid-java-6.0.7/jms-client-0-10/book/JMS-Client-0-10-Book.html
+++ 
b/content/releases/qpid-java-6.0.7/jms-client-0-10/book/JMS-Client-0-10-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-java-6.0.7/jms-client-0-10/book/JMS-Client-0-10-Configuring-Addresses.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.7/jms-client-0-10/book/JMS-Client-0-10-Configuring-Addresses.html
 
b/content/releases/qpid-java-6.0.7/jms-client-0-10/book/JMS-Client-0-10-Configuring-Addresses.html
index 5c82580..7fe3eeb 100644
--- 
a/content/releases/qpid-java-6.0.7/jms-client-0-10/book/JMS-Client-0-10-Configuring-Addresses.html
+++ 
b/content/releases/qpid-java-6.0.7/jms-client-0-10/book/JMS-Client-0-10-Configuring-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-java-6.0.7/jms-client-0-10/book/JMS-Client-0-10-Configuring-JNDI.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.7/jms-client-0-10/book/JMS-Client-0-10-Configuring-JNDI.html
 
b/content/releases/qpid-java-6.0.7/jms-client-0-10/book/JMS-Client-0-10-Configuring-JNDI.html
index b471d5b..8a03a5d 100644
--- 
a/content/releases/qpid-java-6.0.7/jms-client-0-10/book/JMS-Client-0-10-Configuring-JNDI.html
+++ 
b/content/releases/qpid-java-6.0.7/jms-client-0-10/book/JMS-Client-0-10-Configuring-JNDI.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-java-6.0.7/jms-client-0-10/book/JMS-Client-0-10-Configuring-JVM-Properties.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.7/jms-client-0-10/book/JMS-Client-0-10-Configuring-JVM-Properties.html
 
b/content/releases/qpid-java-6.0.7/jms-client-0-10/book/JMS-Client-0-10-Configuring-JVM-Properties.html
index b8ef0c8..641d54c 100644
--- 
a/content/releases/qpid-java-6.0.7/jms-client-0-10/book/JMS-Client-0-10-Configuring-JVM-Properties.html
+++ 
b/content/releases/qpid-java-6.0.7/jms-client-0-10/book/JMS-Client-0-10-Configuring-JVM-Properties.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-java-6.0.7/jms-client-0-10/book/JMS-Client-0-10-Configuring-Logging.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.7/jms-client-0-10/book/JMS-Client-0-10-Configuring-Logging.html
 
b/content/releases/qpid-java-6.0.7/jms-client-0-10/book/JMS-Client-0-10-Configuring-Logging.html
index a39f69d..781be95 100644
--- 
a/content/releases/qpid-java-6.0.7/jms-client-0-10/book/JMS-Client-0-10-Configuring-Logging.html
+++ 
b/content/releases/qpid-java-6.0.7/jms-client-0-10/book/JMS-Client-0-10-Configuring-Logging.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-java-6.0.7/jms-client-0-10/book/JMS-Client-0-10-Configuring.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.7/jms-client-0-10/book/JMS-Client-0-10-Configuring.html
 
b/content/releases/qpid-java-6.0.7/jms-client-0-10/book/JMS-Client-0-10-Configuring.html
index 3854e70..f286ba3 100644
--- 
a/content/releases/qpid-java-6.0.7/jms-client-0-10/book/JMS-Client-0-10-Configuring.html
+++ 
b/content/releases/qpid-java-6.0.7/jms-client-0-10/book/JMS-Client-0-10-Configuring.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-java-6.0.7/jms-client-0-10/book/JMS-Client-0-10-Example.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.7/jms-client-0-10/book/JMS-Client-0-10-Example.html
 
b/content/releases/qpid-java-6.0.7/jms-client-0-10/book/JMS-Client-0-10-Example.html
index 6e8fc22..a96ca1a 100644
--- 
a/content/releases/qpid-java-6.0.7/jms-client-0-10/book/JMS-Client-0-10-Example.html
+++ 
b/content/releases/qpid-java-6.0.7/jms-client-0-10/book/JMS-Client-0-10-Example.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-java-6.0.7/jms-client-0-10/book/JMS-Client-0-10-Miscellaneous-MapMessages.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.7/jms-client-0-10/book/JMS-Client-0-10-Miscellaneous-MapMessages.html
 
b/content/releases/qpid-java-6.0.7/jms-client-0-10/book/JMS-Client-0-10-Miscellaneous-MapMessages.html
index 7d3b06a..5475850 100644
--- 
a/content/releases/qpid-java-6.0.7/jms-client-0-10/book/JMS-Client-0-10-Miscellaneous-MapMessages.html
+++ 
b/content/releases/qpid-java-6.0.7/jms-client-0-10/book/JMS-Client-0-10-Miscellaneous-MapMessages.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-java-6.0.7/jms-client-0-10/book/JMS-Client-0-10-Miscellaneous.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.7/jms-client-0-10/book/JMS-Client-0-10-Miscellaneous.html
 
b/content/releases/qpid-java-6.0.7/jms-client-0-10/book/JMS-Client-0-10-Miscellaneous.html
index a2262c5..4a68c10 100644
--- 
a/content/releases/qpid-java-6.0.7/jms-client-0-10/book/JMS-Client-0-10-Miscellaneous.html
+++ 
b/content/releases/qpid-java-6.0.7/jms-client-0-10/book/JMS-Client-0-10-Miscellaneous.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-java-6.0.7/jms-client-0-10/book/index.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-java-6.0.7/jms-client-0-10/book/index.html 
b/content/releases/qpid-java-6.0.7/jms-client-0-10/book/index.html
index 5ec4225..f8b2d3e 100644
--- a/content/releases/qpid-java-6.0.7/jms-client-0-10/book/index.html
+++ b/content/releases/qpid-java-6.0.7/jms-client-0-10/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-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-Appendix-Exceptions.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-Appendix-Exceptions.html
 
b/content/releases/qpid-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-Appendix-Exceptions.html
index ee8ee27..c0cd9d1 100644
--- 
a/content/releases/qpid-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-Appendix-Exceptions.html
+++ 
b/content/releases/qpid-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-Appendix-Exceptions.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-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-Appendix-JMS-Extensions-Binding.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-Appendix-JMS-Extensions-Binding.html
 
b/content/releases/qpid-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-Appendix-JMS-Extensions-Binding.html
index 225c8d9..f0a6a4b 100644
--- 
a/content/releases/qpid-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-Appendix-JMS-Extensions-Binding.html
+++ 
b/content/releases/qpid-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-Appendix-JMS-Extensions-Binding.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-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-Appendix-JMS-Extensions.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-Appendix-JMS-Extensions.html
 
b/content/releases/qpid-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-Appendix-JMS-Extensions.html
index b34c1f7..4377451 100644
--- 
a/content/releases/qpid-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-Appendix-JMS-Extensions.html
+++ 
b/content/releases/qpid-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-Appendix-JMS-Extensions.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-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-Appendix-Maven.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-Appendix-Maven.html
 
b/content/releases/qpid-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-Appendix-Maven.html
index 9df8014..dd47740 100644
--- 
a/content/releases/qpid-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-Appendix-Maven.html
+++ 
b/content/releases/qpid-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-Appendix-Maven.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-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-Appendix-PooledConnecytionFactory.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-Appendix-PooledConnecytionFactory.html
 
b/content/releases/qpid-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-Appendix-PooledConnecytionFactory.html
index 3f9b4ef..80108e0 100644
--- 
a/content/releases/qpid-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-Appendix-PooledConnecytionFactory.html
+++ 
b/content/releases/qpid-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-Appendix-PooledConnecytionFactory.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-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-Appendix-Tomcat-JNDI-Integration.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-Appendix-Tomcat-JNDI-Integration.html
 
b/content/releases/qpid-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-Appendix-Tomcat-JNDI-Integration.html
index c59464e..ecfed9d 100644
--- 
a/content/releases/qpid-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-Appendix-Tomcat-JNDI-Integration.html
+++ 
b/content/releases/qpid-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-Appendix-Tomcat-JNDI-Integration.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-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-Binding-URL.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-Binding-URL.html
 
b/content/releases/qpid-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-Binding-URL.html
index cce0117..3e3498e 100644
--- 
a/content/releases/qpid-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-Binding-URL.html
+++ 
b/content/releases/qpid-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-Binding-URL.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-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-Client-Understanding-Connection.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-Client-Understanding-Connection.html
 
b/content/releases/qpid-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-Client-Understanding-Connection.html
index e9aa47e..19942fd 100644
--- 
a/content/releases/qpid-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-Client-Understanding-Connection.html
+++ 
b/content/releases/qpid-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-Client-Understanding-Connection.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-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-Client-Understanding-ConnectionFactory.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-Client-Understanding-ConnectionFactory.html
 
b/content/releases/qpid-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-Client-Understanding-ConnectionFactory.html
index 5e65c46..d5019c6 100644
--- 
a/content/releases/qpid-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-Client-Understanding-ConnectionFactory.html
+++ 
b/content/releases/qpid-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-Client-Understanding-ConnectionFactory.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-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-Client-Understanding-Destinations.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-Client-Understanding-Destinations.html
 
b/content/releases/qpid-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-Client-Understanding-Destinations.html
index 59d2b9b..43a9404 100644
--- 
a/content/releases/qpid-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-Client-Understanding-Destinations.html
+++ 
b/content/releases/qpid-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-Client-Understanding-Destinations.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-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-Client-Understanding-MessageConsumer.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-Client-Understanding-MessageConsumer.html
 
b/content/releases/qpid-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-Client-Understanding-MessageConsumer.html
index c613c33..d422b57 100644
--- 
a/content/releases/qpid-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-Client-Understanding-MessageConsumer.html
+++ 
b/content/releases/qpid-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-Client-Understanding-MessageConsumer.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-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-Client-Understanding-MessageProducer.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-Client-Understanding-MessageProducer.html
 
b/content/releases/qpid-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-Client-Understanding-MessageProducer.html
index ed36f28..aa098d1 100644
--- 
a/content/releases/qpid-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-Client-Understanding-MessageProducer.html
+++ 
b/content/releases/qpid-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-Client-Understanding-MessageProducer.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-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-Client-Understanding-Session.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-Client-Understanding-Session.html
 
b/content/releases/qpid-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-Client-Understanding-Session.html
index 06ccf94..db7169d 100644
--- 
a/content/releases/qpid-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-Client-Understanding-Session.html
+++ 
b/content/releases/qpid-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-Client-Understanding-Session.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-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-Client-Understanding.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-Client-Understanding.html
 
b/content/releases/qpid-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-Client-Understanding.html
index 0e89a68..6700840 100644
--- 
a/content/releases/qpid-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-Client-Understanding.html
+++ 
b/content/releases/qpid-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-Client-Understanding.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-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-Connection-URL.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-Connection-URL.html
 
b/content/releases/qpid-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-Connection-URL.html
index 0fd36e6..49dd379 100644
--- 
a/content/releases/qpid-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-Connection-URL.html
+++ 
b/content/releases/qpid-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-Connection-URL.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-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-Document-Scope-And-Intended-Audience.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-Document-Scope-And-Intended-Audience.html
 
b/content/releases/qpid-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-Document-Scope-And-Intended-Audience.html
index dac0d48..6afc4c8 100644
--- 
a/content/releases/qpid-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-Document-Scope-And-Intended-Audience.html
+++ 
b/content/releases/qpid-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-Document-Scope-And-Intended-Audience.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-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-Examples-PubSub.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-Examples-PubSub.html
 
b/content/releases/qpid-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-Examples-PubSub.html
index dac561a..5ca84a9 100644
--- 
a/content/releases/qpid-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-Examples-PubSub.html
+++ 
b/content/releases/qpid-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-Examples-PubSub.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-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-Examples.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-Examples.html
 
b/content/releases/qpid-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-Examples.html
index 6cbb188..6dd0e95 100644
--- 
a/content/releases/qpid-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-Examples.html
+++ 
b/content/releases/qpid-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-Examples.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-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-Introduction.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-Introduction.html
 
b/content/releases/qpid-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-Introduction.html
index e825822..7f97c72 100644
--- 
a/content/releases/qpid-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-Introduction.html
+++ 
b/content/releases/qpid-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-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-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-JMS-Getting-And-Dependencies-Dependencies.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-JMS-Getting-And-Dependencies-Dependencies.html
 
b/content/releases/qpid-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-JMS-Getting-And-Dependencies-Dependencies.html
index e03b51c..4940e6a 100644
--- 
a/content/releases/qpid-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-JMS-Getting-And-Dependencies-Dependencies.html
+++ 
b/content/releases/qpid-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-JMS-Getting-And-Dependencies-Dependencies.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-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-JMS-Getting-And-Dependencies.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-JMS-Getting-And-Dependencies.html
 
b/content/releases/qpid-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-JMS-Getting-And-Dependencies.html
index 42fa714..daf1bcb 100644
--- 
a/content/releases/qpid-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-JMS-Getting-And-Dependencies.html
+++ 
b/content/releases/qpid-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-JMS-Getting-And-Dependencies.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-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-JNDI-Properties-Format-Destination.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-JNDI-Properties-Format-Destination.html
 
b/content/releases/qpid-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-JNDI-Properties-Format-Destination.html
index cce6297..255bd24 100644
--- 
a/content/releases/qpid-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-JNDI-Properties-Format-Destination.html
+++ 
b/content/releases/qpid-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-JNDI-Properties-Format-Destination.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-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-JNDI-Properties-Format-Queue.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-JNDI-Properties-Format-Queue.html
 
b/content/releases/qpid-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-JNDI-Properties-Format-Queue.html
index df3b974..dbdb58e 100644
--- 
a/content/releases/qpid-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-JNDI-Properties-Format-Queue.html
+++ 
b/content/releases/qpid-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-JNDI-Properties-Format-Queue.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-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-JNDI-Properties-Format-Topic.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-JNDI-Properties-Format-Topic.html
 
b/content/releases/qpid-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-JNDI-Properties-Format-Topic.html
index bd4029a..9449603 100644
--- 
a/content/releases/qpid-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-JNDI-Properties-Format-Topic.html
+++ 
b/content/releases/qpid-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-JNDI-Properties-Format-Topic.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-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-JNDI-Properties-Format.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-JNDI-Properties-Format.html
 
b/content/releases/qpid-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-JNDI-Properties-Format.html
index cd95472..dc555ec 100644
--- 
a/content/releases/qpid-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-JNDI-Properties-Format.html
+++ 
b/content/releases/qpid-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-JNDI-Properties-Format.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-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-Logging-EnablingDebugLogging.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-Logging-EnablingDebugLogging.html
 
b/content/releases/qpid-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-Logging-EnablingDebugLogging.html
index 6fde38c..75f4762 100644
--- 
a/content/releases/qpid-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-Logging-EnablingDebugLogging.html
+++ 
b/content/releases/qpid-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-Logging-EnablingDebugLogging.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-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-Logging.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-Logging.html
 
b/content/releases/qpid-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-Logging.html
index 615e17b..bf8de9f 100644
--- 
a/content/releases/qpid-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-Logging.html
+++ 
b/content/releases/qpid-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-Logging.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-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-System-Properties.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-System-Properties.html
 
b/content/releases/qpid-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-System-Properties.html
index 46d1458..5147036 100644
--- 
a/content/releases/qpid-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-System-Properties.html
+++ 
b/content/releases/qpid-java-6.0.7/jms-client-0-8/book/JMS-Client-0-8-System-Properties.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-java-6.0.7/jms-client-0-8/book/JMS-Client-Book.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-6.0.7/jms-client-0-8/book/JMS-Client-Book.html 
b/content/releases/qpid-java-6.0.7/jms-client-0-8/book/JMS-Client-Book.html
index 7029a32..16f94f3 100644
--- a/content/releases/qpid-java-6.0.7/jms-client-0-8/book/JMS-Client-Book.html
+++ b/content/releases/qpid-java-6.0.7/jms-client-0-8/book/JMS-Client-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-java-6.0.7/jms-client-0-8/book/index.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-java-6.0.7/jms-client-0-8/book/index.html 
b/content/releases/qpid-java-6.0.7/jms-client-0-8/book/index.html
index 84a1485..d35cc2e 100644
--- a/content/releases/qpid-java-6.0.7/jms-client-0-8/book/index.html
+++ b/content/releases/qpid-java-6.0.7/jms-client-0-8/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-java-6.0.7/qpid-jms/examples/Drain.java.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-java-6.0.7/qpid-jms/examples/Drain.java.html 
b/content/releases/qpid-java-6.0.7/qpid-jms/examples/Drain.java.html
index a512495..f002002 100644
--- a/content/releases/qpid-java-6.0.7/qpid-jms/examples/Drain.java.html
+++ b/content/releases/qpid-java-6.0.7/qpid-jms/examples/Drain.java.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-java-6.0.7/qpid-jms/examples/Hello.java.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-java-6.0.7/qpid-jms/examples/Hello.java.html 
b/content/releases/qpid-java-6.0.7/qpid-jms/examples/Hello.java.html
index 0846c33..d85e4ae 100644
--- a/content/releases/qpid-java-6.0.7/qpid-jms/examples/Hello.java.html
+++ b/content/releases/qpid-java-6.0.7/qpid-jms/examples/Hello.java.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