http://git-wip-us.apache.org/repos/asf/qpid-site/blob/18ab1b17/content/AMQP/AMQP_type_reference.html
----------------------------------------------------------------------
diff --git a/content/AMQP/AMQP_type_reference.html 
b/content/AMQP/AMQP_type_reference.html
index 8fc42b9..4afb69f 100644
--- a/content/AMQP/AMQP_type_reference.html
+++ b/content/AMQP/AMQP_type_reference.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">Java 
broker</a></li>
+              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
               <li><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/18ab1b17/content/amqp.html
----------------------------------------------------------------------
diff --git a/content/amqp.html b/content/amqp.html
index 707aa15..3f96b58 100644
--- a/content/amqp.html
+++ b/content/amqp.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">Java 
broker</a></li>
+              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
               <li><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/18ab1b17/content/amqp/index.html
----------------------------------------------------------------------
diff --git a/content/amqp/index.html b/content/amqp/index.html
index 8c1b263..f247475 100644
--- a/content/amqp/index.html
+++ b/content/amqp/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">Java 
broker</a></li>
+              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
               <li><a href="/components/cpp-broker/index.html">C++ 
broker</a></li>
               <li><a href="/components/dispatch-router/index.html">Dispatch 
router</a></li>
             </ul>
@@ -144,7 +144,7 @@ possibilities for messaging applications.</p>
 <ul>
 <li><a href="/components/cpp-broker/index.html">C++ broker</a></li>
 <li><a href="/components/dispatch-router/index.html">Dispatch router</a></li>
-<li><a href="/components/java-broker/index.html">Java broker</a></li>
+<li><a href="/components/java-broker/index.html">Broker for Java</a></li>
 <li><a href="/components/jms/index.html">Qpid JMS</a></li>
 <li><a href="/components/messaging-api/index.html">Qpid Messaging API</a></li>
 <li><a href="/proton/index.html">Qpid Proton</a></li>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/18ab1b17/content/amqp/type-reference.html
----------------------------------------------------------------------
diff --git a/content/amqp/type-reference.html b/content/amqp/type-reference.html
index 79a3da6..94e4bda 100644
--- a/content/amqp/type-reference.html
+++ b/content/amqp/type-reference.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">Java 
broker</a></li>
+              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
               <li><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/18ab1b17/content/components/cpp-broker/index.html
----------------------------------------------------------------------
diff --git a/content/components/cpp-broker/index.html 
b/content/components/cpp-broker/index.html
index d29749e..51c2cec 100644
--- a/content/components/cpp-broker/index.html
+++ b/content/components/cpp-broker/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">Java 
broker</a></li>
+              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
               <li><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/18ab1b17/content/components/cpp-broker/security.html
----------------------------------------------------------------------
diff --git a/content/components/cpp-broker/security.html 
b/content/components/cpp-broker/security.html
index 24474f9..ea66714 100644
--- a/content/components/cpp-broker/security.html
+++ b/content/components/cpp-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">Java 
broker</a></li>
+              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
               <li><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/18ab1b17/content/components/dispatch-router/addressing.html
----------------------------------------------------------------------
diff --git a/content/components/dispatch-router/addressing.html 
b/content/components/dispatch-router/addressing.html
index 747f17a..5952a59 100644
--- a/content/components/dispatch-router/addressing.html
+++ b/content/components/dispatch-router/addressing.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Java 
broker</a></li>
+              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
               <li><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/18ab1b17/content/components/dispatch-router/amqp-mapping.html
----------------------------------------------------------------------
diff --git a/content/components/dispatch-router/amqp-mapping.html 
b/content/components/dispatch-router/amqp-mapping.html
index 5061504..09f46e6 100644
--- a/content/components/dispatch-router/amqp-mapping.html
+++ b/content/components/dispatch-router/amqp-mapping.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Java 
broker</a></li>
+              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
               <li><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/18ab1b17/content/components/dispatch-router/index.html
----------------------------------------------------------------------
diff --git a/content/components/dispatch-router/index.html 
b/content/components/dispatch-router/index.html
index 96ea095..f0a7183 100644
--- a/content/components/dispatch-router/index.html
+++ b/content/components/dispatch-router/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">Java 
broker</a></li>
+              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
               <li><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/18ab1b17/content/components/dispatch-router/overview.html
----------------------------------------------------------------------
diff --git a/content/components/dispatch-router/overview.html 
b/content/components/dispatch-router/overview.html
index 1967c00..c321b21 100644
--- a/content/components/dispatch-router/overview.html
+++ b/content/components/dispatch-router/overview.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">Java 
broker</a></li>
+              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
               <li><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/18ab1b17/content/components/dispatch-router/release-0.1.html
----------------------------------------------------------------------
diff --git a/content/components/dispatch-router/release-0.1.html 
b/content/components/dispatch-router/release-0.1.html
index a6fff30..b5ae8f2 100644
--- a/content/components/dispatch-router/release-0.1.html
+++ b/content/components/dispatch-router/release-0.1.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">Java 
broker</a></li>
+              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
               <li><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/18ab1b17/content/components/index.html
----------------------------------------------------------------------
diff --git a/content/components/index.html b/content/components/index.html
index 50d54a4..28f2ea6 100644
--- a/content/components/index.html
+++ b/content/components/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">Java 
broker</a></li>
+              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
               <li><a href="/components/cpp-broker/index.html">C++ 
broker</a></li>
               <li><a href="/components/dispatch-router/index.html">Dispatch 
router</a></li>
             </ul>
@@ -147,7 +147,7 @@ reliability.</p>
 <a 
href="http://en.wikipedia.org/wiki/Message-oriented_middleware";>message-oriented
 middleware</a>
 brokers.  They offer specialized queueing behaviors, message
 persistence, and manageability.  Qpid offers pure-Java and native-code
-implementations, the <a href="java-broker/index.html">Java broker</a> and the
+implementations, the <a href="java-broker/index.html">Broker for Java</a> and 
the
 <a href="cpp-broker/index.html">C++ broker</a>.</p>
 
 <p><a href="dispatch-router/index.html">Dispatch router</a> is a new kind of
@@ -165,7 +165,7 @@ connecting clients, brokers, and standalone services.</p>
 <h2 id="messaging-servers">Messaging servers</h2>
 
 <ul>
-<li><a href="java-broker/index.html">Java broker</a> - A pure-Java AMQP 
message broker</li>
+<li><a href="java-broker/index.html">Broker for Java</a> - A pure-Java AMQP 
message broker</li>
 <li><a href="cpp-broker/index.html">C++ broker</a> - A native-code AMQP 
message broker</li>
 <li><a href="dispatch-router/index.html">Dispatch router</a> - An AMQP router 
for scalable messaging interconnect</li>
 </ul>
@@ -197,7 +197,7 @@ connecting clients, brokers, and standalone services.</p>
   <td>1.0</td>
 </tr>
 <tr>
-  <td><a href="/components/java-broker/index.html">Java broker</a></td>
+  <td><a href="/components/java-broker/index.html">Broker for Java</a></td>
   <td>-</td>
   <td>JVM</td>
   <td>1.0, 0-10, 0-9-1, 0-9, 0-8</td>
@@ -225,7 +225,7 @@ connecting clients, brokers, and standalone services.</p>
 
 <p>Any Qpid components that share an AMQP version can interoperate.  For
 instance, the brokers are implemented in C++ and Java respectively,
-but they do not require C++ or Java clients for communication.</p>
+but they do not require C++ or JMS clients for communication.</p>
 
 </div>
 

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/18ab1b17/content/components/java-broker/index.html
----------------------------------------------------------------------
diff --git a/content/components/java-broker/index.html 
b/content/components/java-broker/index.html
index 118d820..63e5d43 100644
--- a/content/components/java-broker/index.html
+++ b/content/components/java-broker/index.html
@@ -21,7 +21,7 @@
 -->
 <html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en">
   <head>
-    <title>Java Broker - Apache Qpid&#8482;</title>
+    <title>Broker for Java - Apache Qpid&#8482;</title>
     <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
     <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
     <link rel="stylesheet" href="/site.css" type="text/css" async="async"/>
@@ -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">Java 
broker</a></li>
+              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
               <li><a href="/components/cpp-broker/index.html">C++ 
broker</a></li>
               <li><a href="/components/dispatch-router/index.html">Dispatch 
router</a></li>
             </ul>
@@ -111,12 +111,12 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
       </div>
 
       <div id="-middle" class="panel">
-        <ul id="-path-navigation"><li><a 
href="/index.html">Home</a></li><li><a 
href="/components/index.html">Components</a></li><li>Java Broker</li></ul>
+        <ul id="-path-navigation"><li><a 
href="/index.html">Home</a></li><li><a 
href="/components/index.html">Components</a></li><li>Broker for Java</li></ul>
 
         <div id="-middle-content">
           <div id="-left-column">
 
-<h1 id="java-broker">Java Broker</h1>
+<h1 id="broker-for-java">Broker for Java</h1>
 
 <div class="feature">
 
@@ -158,8 +158,8 @@ that stores, routes, and forwards messages using AMQP.</p>
 <h2 id="documentation">Documentation</h2>
 
 <ul>
-<li><a href="/releases/qpid-java-6.0.4/java-broker/book/index.html">Java 
broker book</a></li>
-<li><a 
href="https://cwiki.apache.org/confluence/display/qpid/qpid+java+build+how+to";>How
 to build Qpid Java</a></li>
+<li><a href="/releases/qpid-java-6.0.4/java-broker/book/index.html">Broker 
book</a></li>
+<li><a 
href="https://cwiki.apache.org/confluence/display/qpid/qpid+java+build+how+to";>How
 to build Apache Qpid for Java</a></li>
 </ul>
 
 </div>
@@ -169,7 +169,7 @@ that stores, routes, and forwards messages using AMQP.</p>
 <h2 id="releases">Releases</h2>
 
 <ul>
-<li><a href="/releases/qpid-java-6.0.4">Qpid Java 6.0.4</a></li>
+<li><a href="/releases/qpid-java-6.0.4">Qpid for Java 6.0.4</a></li>
 <li><a href="/releases/index.html#past-releases">Past releases</a></li>
 </ul>
 

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/18ab1b17/content/components/java-broker/security.html
----------------------------------------------------------------------
diff --git a/content/components/java-broker/security.html 
b/content/components/java-broker/security.html
index c6b5014..0e45753 100644
--- a/content/components/java-broker/security.html
+++ b/content/components/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">Java 
broker</a></li>
+              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
               <li><a href="/components/cpp-broker/index.html">C++ 
broker</a></li>
               <li><a href="/components/dispatch-router/index.html">Dispatch 
router</a></li>
             </ul>
@@ -111,14 +111,14 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
       </div>
 
       <div id="-middle" class="panel">
-        <ul id="-path-navigation"><li><a 
href="/index.html">Home</a></li><li><a 
href="/components/index.html">Components</a></li><li><a 
href="/components/java-broker/index.html">Java 
Broker</a></li><li>Security</li></ul>
+        <ul id="-path-navigation"><li><a 
href="/index.html">Home</a></li><li><a 
href="/components/index.html">Components</a></li><li><a 
href="/components/java-broker/index.html">Broker for 
Java</a></li><li>Security</li></ul>
 
         <div id="-middle-content">
           <h1 id="security">Security</h1>
 
 <section>
 
-<h2 id="java-broker">Java Broker</h2>
+<h2 id="broker-for-java">Broker for Java</h2>
 
 <table>
   <thead>
@@ -135,7 +135,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
       <td>
         Authentication Bypass. <a id="CVE_2016_4432_details_toggle" 
href="javascript:_toggleDiv({divId:'CVE_2016_4432_details', 
controlId:'CVE_2016_4432_details_toggle', showMore:'<small>show more</small>', 
showLess:'<small>show less</small>'});"><small>show more</small></a>
         <div style="display:none;" id="CVE_2016_4432_details">
-          <p>Versions Affected: Qpid Java Broker versions 6.0.2 and
+          <p>Versions Affected: Apache Qpid Broker for Java versions 6.0.2 and
           earlier</p>
           <p>Description: The code responsible for handling incoming
           AMQP 0-8, 0-9, 0-91, and 0-10 connections contains a flaw
@@ -150,7 +150,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
           support.<br/>The vulnerability does not apply if the Broker
           is configured to require SSL client authentication for all
           messaging connections.</p>
-          <p>Resolution: Users should upgrade the Qpid Java Broker to
+          <p>Resolution: Users should upgrade the Apache Qpid Broker for Java 
to
           version 6.0.3 or later (recommended).</p>
           <p>Mitigation: If upgrading is not possible, the
           vulnerability can be mitigated using an ACL file containing
@@ -173,10 +173,10 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
         Denial of Service.
         <a id="CVE_2016_3094_details_toggle" 
href="javascript:_toggleDiv({divId:'CVE_2016_3094_details', 
controlId:'CVE_2016_3094_details_toggle', showMore:'<small>show more</small>', 
showLess:'<small>show less</small>'});"><small>show more</small></a>
         <div style="display:none;" id="CVE_2016_3094_details">
-          <p>Versions Affected: Qpid Java Broker versions 6.0.0,
+          <p>Versions Affected: Apache Qpid Broker for Java versions 6.0.0,
           6.0.1, and 6.0.2</p>
           <p>Description: A malformed authentication attempt may cause
-          the broker to terminate.  The Qpid Java Broker supports a
+          the broker to terminate.  The Apache Qpid Broker for Java supports a
           number of configurable authentication providers each
           supporting various SASL mechanisms. Some mechanisms need (or
           can be configured to accept) plain-text passwords being sent
@@ -191,7 +191,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
           "PLAIN" mechanism is enabled (by default "PLAIN" will be
           disabled on non-TLS ports, but enabled on TLS
           connections).</p>
-          <p>Mitigation: Users should upgrade their Qpid Java Broker
+          <p>Mitigation: Users should upgrade their Apache Qpid Broker for Java
           to version 6.0.3 or later.  If this is not possible, users
           can disable the PLAIN mechanism for their authentication
           manager on versions 0.32 and later by adding "PLAIN" to the

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/18ab1b17/content/components/jms/amqp-0-x.html
----------------------------------------------------------------------
diff --git a/content/components/jms/amqp-0-x.html 
b/content/components/jms/amqp-0-x.html
index 94b6be9..d22d291 100644
--- a/content/components/jms/amqp-0-x.html
+++ b/content/components/jms/amqp-0-x.html
@@ -21,7 +21,7 @@
 -->
 <html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en">
   <head>
-    <title>JMS for Earlier AMQP Versions - Apache Qpid&#8482;</title>
+    <title>Qpid JMS for AMQP 0-9-1/0-10 - Apache Qpid&#8482;</title>
     <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
     <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
     <link rel="stylesheet" href="/site.css" type="text/css" async="async"/>
@@ -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">Java 
broker</a></li>
+              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
               <li><a href="/components/cpp-broker/index.html">C++ 
broker</a></li>
               <li><a href="/components/dispatch-router/index.html">Dispatch 
router</a></li>
             </ul>
@@ -111,17 +111,17 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
       </div>
 
       <div id="-middle" class="panel">
-        <ul id="-path-navigation"><li><a 
href="/index.html">Home</a></li><li><a 
href="/components/index.html">Components</a></li><li><a 
href="/components/jms/index.html">Qpid JMS</a></li><li>JMS for Earlier AMQP 
Versions</li></ul>
+        <ul id="-path-navigation"><li><a 
href="/index.html">Home</a></li><li><a 
href="/components/index.html">Components</a></li><li><a 
href="/components/jms/index.html">Qpid JMS</a></li><li>Qpid JMS for AMQP 
0-9-1/0-10</li></ul>
 
         <div id="-middle-content">
-          <h1 id="jms-for-earlier-amqp-versions">JMS for Earlier AMQP 
Versions</h1>
+          <h1 id="qpid-jms-for-amqp-0-9-10-10">Qpid JMS for AMQP 
0-9-1/0-10</h1>
 
 <p>A JMS 1.1 implementation supporting AMQP versions 0-10, 0-9-1, 0-9, and
 0-8.  For AMQP 1.0 support, use the newer <a href="index.html">Qpid JMS</a> 
client.</p>
 
 <h2 id="download">Download</h2>
 
-<p>This JMS implementation is released as part of <a 
href="/releases/qpid-java-6.0.4">Qpid Java 6.0.4</a>.</p>
+<p>This JMS implementation is released as part of <a 
href="/releases/qpid-java-6.0.4">Qpid for Java 6.0.4</a>.</p>
 
 <div class="two-column">
 

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/18ab1b17/content/components/jms/index.html
----------------------------------------------------------------------
diff --git a/content/components/jms/index.html 
b/content/components/jms/index.html
index a7e5cc7..d3fc195 100644
--- a/content/components/jms/index.html
+++ b/content/components/jms/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">Java 
broker</a></li>
+              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
               <li><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/18ab1b17/content/components/jms/security-0-x.html
----------------------------------------------------------------------
diff --git a/content/components/jms/security-0-x.html 
b/content/components/jms/security-0-x.html
index 08c16e0..dbe7698 100644
--- a/content/components/jms/security-0-x.html
+++ b/content/components/jms/security-0-x.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">Java 
broker</a></li>
+              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
               <li><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/18ab1b17/content/components/jms/security.html
----------------------------------------------------------------------
diff --git a/content/components/jms/security.html 
b/content/components/jms/security.html
index a6fb6d4..9b69a77 100644
--- a/content/components/jms/security.html
+++ b/content/components/jms/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">Java 
broker</a></li>
+              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
               <li><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/18ab1b17/content/components/messaging-api/index.html
----------------------------------------------------------------------
diff --git a/content/components/messaging-api/index.html 
b/content/components/messaging-api/index.html
index 2660f74..0739498 100644
--- a/content/components/messaging-api/index.html
+++ b/content/components/messaging-api/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">Java 
broker</a></li>
+              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
               <li><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/18ab1b17/content/components/qpid-jca/index.html
----------------------------------------------------------------------
diff --git a/content/components/qpid-jca/index.html 
b/content/components/qpid-jca/index.html
index 396d940..d3bb4c9 100644
--- a/content/components/qpid-jca/index.html
+++ b/content/components/qpid-jca/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">Java 
broker</a></li>
+              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
               <li><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/18ab1b17/content/contributors.html
----------------------------------------------------------------------
diff --git a/content/contributors.html b/content/contributors.html
index 1c43f59..0f9a4bd 100644
--- a/content/contributors.html
+++ b/content/contributors.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">Java 
broker</a></li>
+              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
               <li><a href="/components/cpp-broker/index.html">C++ 
broker</a></li>
               <li><a href="/components/dispatch-router/index.html">Dispatch 
router</a></li>
             </ul>
@@ -224,14 +224,14 @@ improve ours.</p>
 <ul>
 <li><p><img class="company-logo" src="/images/coverity.png"/>
 <a href="http://www.coverity.com/";>Coverity</a> for granting us use of their
-static analysis tools for Qpid C++ and Java code.</p></li>
+static analysis tools for Qpid C++ and Qpid for Java code.</p></li>
 <li><p><img class="company-logo" src="/images/jprofiler.png"/>
 <a href="http://www.ej-technologies.com/";>ej-technologies</a> for giving us a
-free team license for profiling Qpid Java code.</p></li>
+free team license for profiling Qpid for Java code.</p></li>
 <li><p><img class="company-logo" src="/images/structure101.jpg"/>
 <a href="http://structure101.com/";>Headway Software</a> for giving us free
 licenses of Structure101 for analyzing and managing the
-architecture of Qpid Java code.</p></li>
+architecture of Qpid for Java code.</p></li>
 </ul>
 
 <h2 id="apache-sponsors">Apache sponsors</h2>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/18ab1b17/content/dashboard.html
----------------------------------------------------------------------
diff --git a/content/dashboard.html b/content/dashboard.html
index a429b68..469bfca 100644
--- a/content/dashboard.html
+++ b/content/dashboard.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">Java 
broker</a></li>
+              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
               <li><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/18ab1b17/content/discussion.html
----------------------------------------------------------------------
diff --git a/content/discussion.html b/content/discussion.html
index 3e96d4f..546aabd 100644
--- a/content/discussion.html
+++ b/content/discussion.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">Java 
broker</a></li>
+              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
               <li><a href="/components/cpp-broker/index.html">C++ 
broker</a></li>
               <li><a href="/components/dispatch-router/index.html">Dispatch 
router</a></li>
             </ul>
@@ -166,7 +166,7 @@ unsubscribe address.</p>
 <a href="/source-code.html#commits-list">commits</a> and
 <a href="/source-code.html#notifications-list">notifications</a>.</p>
 
-<p><code>NOTE</code>: The Qpid project offers various components in many 
different languages. When mailing the lists please be specific about which 
component, or even which part of a given component, that you are using to 
better facilitate discussion. For example, "I'm using the Qpid Java 
&lt;version&gt; broker with the Qpid JMS &lt;version&gt; AMQP 1.0 client" 
rather than "I'm using the broker and JMS client".</p>
+<p><code>NOTE</code>: The Qpid project offers various components in many 
different languages. When mailing the lists please be specific about which 
component, or even which part of a given component, that you are using to 
better facilitate discussion. For example, "I'm using the Qpid Broker for Java 
&lt;version&gt; with the Qpid JMS &lt;version&gt; AMQP 1.0 client" rather than 
"I'm using the broker and JMS client".</p>
 
 <h2 id="chat">Chat</h2>
 

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/18ab1b17/content/documentation.html
----------------------------------------------------------------------
diff --git a/content/documentation.html b/content/documentation.html
index 763a473..d729b4b 100644
--- a/content/documentation.html
+++ b/content/documentation.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">Java 
broker</a></li>
+              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
               <li><a href="/components/cpp-broker/index.html">C++ 
broker</a></li>
               <li><a href="/components/dispatch-router/index.html">Dispatch 
router</a></li>
             </ul>
@@ -177,11 +177,11 @@ You can find older versions with our
 
 <section>
 
-<h3 id="java-broker">Java broker</h3>
+<h3 id="broker-for-java">Broker for Java</h3>
 
 <ul>
 <li><a href="/components/java-broker/index.html">Overview</a></li>
-<li><a href="/releases/qpid-java-6.0.4/java-broker/book/index.html">Java 
broker book</a></li>
+<li><a href="/releases/qpid-java-6.0.4/java-broker/book/index.html">Broker 
book</a></li>
 </ul>
 
 </section>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/18ab1b17/content/download.html
----------------------------------------------------------------------
diff --git a/content/download.html b/content/download.html
index 044766b..3291220 100644
--- a/content/download.html
+++ b/content/download.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">Java 
broker</a></li>
+              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
               <li><a href="/components/cpp-broker/index.html">C++ 
broker</a></li>
               <li><a href="/components/dispatch-router/index.html">Dispatch 
router</a></li>
             </ul>
@@ -121,7 +121,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
 
 <p>Qpid's source artefacts are produced as part of our community release
 process. The downloads on this page are from our current releases, <a 
href="/releases/qpid-proton-0.13.1">Qpid Proton 0.13.1</a>,
-<a href="/releases/qpid-dispatch-0.6.0">Qpid Dispatch 0.6.0</a>, <a 
href="/releases/qpid-jms-0.10.0">Qpid JMS 0.10.0</a>, <a 
href="/releases/qpid-java-6.0.4">Qpid Java 6.0.4</a> and <a 
href="/releases/qpid-cpp-0.34">Qpid C++ 0.34</a>. You can also see our
+<a href="/releases/qpid-dispatch-0.6.0">Qpid Dispatch 0.6.0</a>, <a 
href="/releases/qpid-jms-0.10.0">Qpid JMS 0.10.0</a>, <a 
href="/releases/qpid-java-6.0.4">Qpid for Java 6.0.4</a> and <a 
href="/releases/qpid-cpp-0.34">Qpid C++ 0.34</a>. You can also see our
 <a href="/releases/index.html#past-releases">past releases</a>.</p>
 
 <p>It is important to <a href="#verify-what-you-download">verify the 
integrity</a> of the files you download.</p>
@@ -177,7 +177,7 @@ process. The downloads on this page are from our current 
releases, <a href="/rel
 </thead>
 <tbody>
 <tr>
-  <td><a href="/components/java-broker/index.html">Java broker</a></td>
+  <td><a href="/components/java-broker/index.html">Broker for Java</a></td>
   <td><a 
href="http://www.apache.org/dyn/closer.lua/qpid/java/6.0.4/binaries/qpid-broker-6.0.4-bin.tar.gz";>qpid-broker-6.0.4-bin.tar.gz</a>*</td>
   <td><a 
href="http://www.apache.org/dist/qpid/java/6.0.4/binaries/qpid-broker-6.0.4-bin.tar.gz.asc";>ASC</a>,
 <a 
href="http://www.apache.org/dist/qpid/java/6.0.4/binaries/qpid-broker-6.0.4-bin.tar.gz.md5";>MD5</a>,
 <a 
href="http://www.apache.org/dist/qpid/java/6.0.4/binaries/qpid-broker-6.0.4-bin.tar.gz.sha1";>SHA1</a></td>
 </tr>
@@ -206,7 +206,7 @@ offer the source as part of our
 <a 
href="http://www.apache.org/dist/qpid/jms/0.10.0/apache-qpid-jms-0.10.0-src.tar.gz.md5";>MD5</a>,
 <a 
href="http://www.apache.org/dist/qpid/jms/0.10.0/apache-qpid-jms-0.10.0-src.tar.gz.sha1";>SHA1</a>]
 and
-<a 
href="http://www.apache.org/dyn/closer.lua/qpid/java/6.0.4/qpid-java-6.0.4.tar.gz";>Qpid
 Java source release</a>
+<a 
href="http://www.apache.org/dyn/closer.lua/qpid/java/6.0.4/qpid-java-6.0.4.tar.gz";>Qpid
 for Java source release</a>
 [<a 
href="http://www.apache.org/dist/qpid/java/6.0.4/qpid-java-6.0.4.tar.gz.asc";>ASC</a>,
 <a 
href="http://www.apache.org/dist/qpid/java/6.0.4/qpid-java-6.0.4.tar.gz.md5";>MD5</a>,
 <a 
href="http://www.apache.org/dist/qpid/java/6.0.4/qpid-java-6.0.4.tar.gz.sha1";>SHA1</a>].</p>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/18ab1b17/content/electron/index.html
----------------------------------------------------------------------
diff --git a/content/electron/index.html b/content/electron/index.html
index e9d836a..a6fe6fb 100644
--- a/content/electron/index.html
+++ b/content/electron/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">Java 
broker</a></li>
+              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
               <li><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/18ab1b17/content/get-involved.html
----------------------------------------------------------------------
diff --git a/content/get-involved.html b/content/get-involved.html
index b89af8d..3fa0c69 100644
--- a/content/get-involved.html
+++ b/content/get-involved.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">Java 
broker</a></li>
+              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
               <li><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/18ab1b17/content/index.html
----------------------------------------------------------------------
diff --git a/content/index.html b/content/index.html
index 883fc07..c06df76 100644
--- a/content/index.html
+++ b/content/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">Java 
broker</a></li>
+              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
               <li><a href="/components/cpp-broker/index.html">C++ 
broker</a></li>
               <li><a href="/components/dispatch-router/index.html">Dispatch 
router</a></li>
             </ul>
@@ -142,7 +142,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
   <h2>Deploy AMQP networks</h2>
   
   <ul>
-    <li><a href="/components/java-broker/index.html">Java broker</a> - A 
pure-Java AMQP message broker</li>
+    <li><a href="/components/java-broker/index.html">Broker for Java</a> - A 
pure-Java AMQP message broker</li>
     <li><a href="/components/cpp-broker/index.html">C++ broker</a> - A 
native-code AMQP message broker</li>
     <li><a href="/components/dispatch-router/index.html">Dispatch router</a> - 
A lightweight AMQP message router</li>
   </ul>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/18ab1b17/content/issues.html
----------------------------------------------------------------------
diff --git a/content/issues.html b/content/issues.html
index 8de3cd6..561dac6 100644
--- a/content/issues.html
+++ b/content/issues.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">Java 
broker</a></li>
+              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
               <li><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/18ab1b17/content/maven.html
----------------------------------------------------------------------
diff --git a/content/maven.html b/content/maven.html
index 0ea5ad8..beb28a4 100644
--- a/content/maven.html
+++ b/content/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">Java 
broker</a></li>
+              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
               <li><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/18ab1b17/content/overview.html
----------------------------------------------------------------------
diff --git a/content/overview.html b/content/overview.html
index f8df07e..aad849c 100644
--- a/content/overview.html
+++ b/content/overview.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">Java 
broker</a></li>
+              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
               <li><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/18ab1b17/content/packages.html
----------------------------------------------------------------------
diff --git a/content/packages.html b/content/packages.html
index 81cbfc7..c3c0fa6 100644
--- a/content/packages.html
+++ b/content/packages.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">Java 
broker</a></li>
+              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
               <li><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/18ab1b17/content/proton/contributing.html
----------------------------------------------------------------------
diff --git a/content/proton/contributing.html b/content/proton/contributing.html
index 544b007..f063ea3 100644
--- a/content/proton/contributing.html
+++ b/content/proton/contributing.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">Java 
broker</a></li>
+              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
               <li><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/18ab1b17/content/proton/development.html
----------------------------------------------------------------------
diff --git a/content/proton/development.html b/content/proton/development.html
index b032d6e..f05a7c8 100644
--- a/content/proton/development.html
+++ b/content/proton/development.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">Java 
broker</a></li>
+              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
               <li><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/18ab1b17/content/proton/index.html
----------------------------------------------------------------------
diff --git a/content/proton/index.html b/content/proton/index.html
index 9e61c06..8f1c704 100644
--- a/content/proton/index.html
+++ b/content/proton/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">Java 
broker</a></li>
+              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
               <li><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/18ab1b17/content/proton/messenger.html
----------------------------------------------------------------------
diff --git a/content/proton/messenger.html b/content/proton/messenger.html
index 5d15141..8b9d1aa 100644
--- a/content/proton/messenger.html
+++ b/content/proton/messenger.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">Java 
broker</a></li>
+              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
               <li><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/18ab1b17/content/proton/overview.html
----------------------------------------------------------------------
diff --git a/content/proton/overview.html b/content/proton/overview.html
index 64b887f..14567a6 100644
--- a/content/proton/overview.html
+++ b/content/proton/overview.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">Java 
broker</a></li>
+              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
               <li><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/18ab1b17/content/proton/proton-j-proton-c.html
----------------------------------------------------------------------
diff --git a/content/proton/proton-j-proton-c.html 
b/content/proton/proton-j-proton-c.html
index 044e722..383e661 100644
--- a/content/proton/proton-j-proton-c.html
+++ b/content/proton/proton-j-proton-c.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">Java 
broker</a></li>
+              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
               <li><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/18ab1b17/content/proton/security.html
----------------------------------------------------------------------
diff --git a/content/proton/security.html b/content/proton/security.html
index a2b2749..3a5114d 100644
--- a/content/proton/security.html
+++ b/content/proton/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">Java 
broker</a></li>
+              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
               <li><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/18ab1b17/content/proton/submitting-patches.html
----------------------------------------------------------------------
diff --git a/content/proton/submitting-patches.html 
b/content/proton/submitting-patches.html
index bdded2b..431d9d5 100644
--- a/content/proton/submitting-patches.html
+++ b/content/proton/submitting-patches.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">Java 
broker</a></li>
+              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
               <li><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/18ab1b17/content/releases/index.html
----------------------------------------------------------------------
diff --git a/content/releases/index.html b/content/releases/index.html
index 120ecc4..e4b3db5 100644
--- a/content/releases/index.html
+++ b/content/releases/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">Java 
broker</a></li>
+              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
               <li><a href="/components/cpp-broker/index.html">C++ 
broker</a></li>
               <li><a href="/components/dispatch-router/index.html">Dispatch 
router</a></li>
             </ul>
@@ -126,7 +126,7 @@ the
 <ul>
 <li><a href="qpid-proton-0.13.1/index.html">Qpid Proton 0.13.1</a>, July 
2016</li>
 <li><a href="qpid-jms-0.10.0/index.html">Qpid JMS 0.10.0</a>, July 2016</li>
-<li><a href="qpid-java-6.0.4/index.html">Qpid Java 6.0.4</a>, July 2016</li>
+<li><a href="qpid-java-6.0.4/index.html">Qpid for Java 6.0.4</a>, July 
2016</li>
 <li><a href="qpid-dispatch-0.6.0/index.html">Qpid Dispatch 0.6.0</a>, June 
2016</li>
 <li><a href="qpid-cpp-0.34/index.html">Qpid C++ 0.34</a>, June 2015</li>
 <li><a href="qpid-0.32/index.html">Qpid 0.32</a>, March 2015</li>
@@ -138,15 +138,15 @@ the
 
 <ul>
 <li><a href="qpid-proton-0.13.0/index.html">Qpid Proton 0.13.0</a>, June 
2016</li>
-<li><a href="qpid-java-6.0.3/index.html">Qpid Java 6.0.3</a>, May 2016</li>
+<li><a href="qpid-java-6.0.3/index.html">Qpid for Java 6.0.3</a>, May 2016</li>
 <li><a href="qpid-jms-0.9.0/index.html">Qpid JMS 0.9.0</a>, April 2016</li>
 <li><a href="qpid-proton-0.12.2/index.html">Qpid Proton 0.12.2</a>, April 
2016</li>
 <li><a href="qpid-java-6.0.2/index.html">Qpid Java 6.0.2</a>, April 2016</li>
 <li><a href="qpid-proton-0.12.1/index.html">Qpid Proton 0.12.1</a>, March 
2016</li>
 <li><a href="qpid-jms-0.8.0/index.html">Qpid JMS 0.8.0</a>, February 2016</li>
-<li><a href="qpid-java-6.0.1/index.html">Qpid Java 6.0.1</a>, February 
2016</li>
+<li><a href="qpid-java-6.0.1/index.html">Qpid for Java 6.0.1</a>, February 
2016</li>
 <li><a href="qpid-proton-0.12.0/index.html">Qpid Proton 0.12.0</a>, February 
2016</li>
-<li><a href="qpid-java-6.0.0/index.html">Qpid Java 6.0.0</a>, December 
2015</li>
+<li><a href="qpid-java-6.0.0/index.html">Qpid for Java 6.0.0</a>, December 
2015</li>
 <li><a href="qpid-jms-0.7.0/index.html">Qpid JMS 0.7.0</a>, December 2015</li>
 <li><a href="qpid-proton-0.11.1/index.html">Qpid Proton 0.11.1</a>, December 
2015</li>
 <li><a href="qpid-jms-0.6.0/index.html">Qpid JMS 0.6.0</a>, October 2015</li>
@@ -185,7 +185,7 @@ the
 <ul>
 <li><a href="qpid-cpp-trunk/index.html">Qpid C++ trunk</a></li>
 <li><a href="qpid-dispatch-master/index.html">Qpid Dispatch master</a></li>
-<li><a href="qpid-java-trunk/index.html">Qpid Java trunk</a></li>
+<li><a href="qpid-java-trunk/index.html">Qpid for Java trunk</a></li>
 <li><a href="qpid-jms-master/index.html">Qpid JMS master</a></li>
 <li><a href="qpid-proton-master/index.html">Qpid Proton master</a></li>
 </ul>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/18ab1b17/content/releases/qpid-0.26/cpp-broker/book/AMQP-Compatibility.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-0.26/cpp-broker/book/AMQP-Compatibility.html 
b/content/releases/qpid-0.26/cpp-broker/book/AMQP-Compatibility.html
index f211ead..1d7f12e 100644
--- a/content/releases/qpid-0.26/cpp-broker/book/AMQP-Compatibility.html
+++ b/content/releases/qpid-0.26/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">Java 
broker</a></li>
+              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
               <li><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/18ab1b17/content/releases/qpid-0.26/cpp-broker/book/QpidInteroperabilityDocumentation-QpidInteroperabilityDocumentation.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-0.26/cpp-broker/book/QpidInteroperabilityDocumentation-QpidInteroperabilityDocumentation.html
 
b/content/releases/qpid-0.26/cpp-broker/book/QpidInteroperabilityDocumentation-QpidInteroperabilityDocumentation.html
index b38ad24..211097a 100644
--- 
a/content/releases/qpid-0.26/cpp-broker/book/QpidInteroperabilityDocumentation-QpidInteroperabilityDocumentation.html
+++ 
b/content/releases/qpid-0.26/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">Java 
broker</a></li>
+              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
               <li><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/18ab1b17/content/releases/qpid-0.26/cpp-broker/book/Using-message-groups.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-0.26/cpp-broker/book/Using-message-groups.html 
b/content/releases/qpid-0.26/cpp-broker/book/Using-message-groups.html
index cbb8d45..80d3f09 100644
--- a/content/releases/qpid-0.26/cpp-broker/book/Using-message-groups.html
+++ b/content/releases/qpid-0.26/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">Java 
broker</a></li>
+              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
               <li><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/18ab1b17/content/releases/qpid-0.26/cpp-broker/book/ch01.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-0.26/cpp-broker/book/ch01.html 
b/content/releases/qpid-0.26/cpp-broker/book/ch01.html
index 2172969..41f0875 100644
--- a/content/releases/qpid-0.26/cpp-broker/book/ch01.html
+++ b/content/releases/qpid-0.26/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">Java 
broker</a></li>
+              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
               <li><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/18ab1b17/content/releases/qpid-0.26/cpp-broker/book/ch01s02.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-0.26/cpp-broker/book/ch01s02.html 
b/content/releases/qpid-0.26/cpp-broker/book/ch01s02.html
index 98b8927..6fca129 100644
--- a/content/releases/qpid-0.26/cpp-broker/book/ch01s02.html
+++ b/content/releases/qpid-0.26/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">Java 
broker</a></li>
+              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
               <li><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/18ab1b17/content/releases/qpid-0.26/cpp-broker/book/ch01s03.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-0.26/cpp-broker/book/ch01s03.html 
b/content/releases/qpid-0.26/cpp-broker/book/ch01s03.html
index 571dd4a..e86e80b 100644
--- a/content/releases/qpid-0.26/cpp-broker/book/ch01s03.html
+++ b/content/releases/qpid-0.26/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">Java 
broker</a></li>
+              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
               <li><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/18ab1b17/content/releases/qpid-0.26/cpp-broker/book/ch01s06.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-0.26/cpp-broker/book/ch01s06.html 
b/content/releases/qpid-0.26/cpp-broker/book/ch01s06.html
index 9733c30..6e4f2b3 100644
--- a/content/releases/qpid-0.26/cpp-broker/book/ch01s06.html
+++ b/content/releases/qpid-0.26/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">Java 
broker</a></li>
+              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
               <li><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/18ab1b17/content/releases/qpid-0.26/cpp-broker/book/ch02s02.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-0.26/cpp-broker/book/ch02s02.html 
b/content/releases/qpid-0.26/cpp-broker/book/ch02s02.html
index 33e8f1f..d35f2bc 100644
--- a/content/releases/qpid-0.26/cpp-broker/book/ch02s02.html
+++ b/content/releases/qpid-0.26/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">Java 
broker</a></li>
+              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
               <li><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/18ab1b17/content/releases/qpid-0.26/cpp-broker/book/ch02s03.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-0.26/cpp-broker/book/ch02s03.html 
b/content/releases/qpid-0.26/cpp-broker/book/ch02s03.html
index b5ce3b8..d2f6656 100644
--- a/content/releases/qpid-0.26/cpp-broker/book/ch02s03.html
+++ b/content/releases/qpid-0.26/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">Java 
broker</a></li>
+              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
               <li><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/18ab1b17/content/releases/qpid-0.26/cpp-broker/book/chap-Messaging_User_Guide-Broker_Federation.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-0.26/cpp-broker/book/chap-Messaging_User_Guide-Broker_Federation.html
 
b/content/releases/qpid-0.26/cpp-broker/book/chap-Messaging_User_Guide-Broker_Federation.html
index 3b427d1..8691919 100644
--- 
a/content/releases/qpid-0.26/cpp-broker/book/chap-Messaging_User_Guide-Broker_Federation.html
+++ 
b/content/releases/qpid-0.26/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">Java 
broker</a></li>
+              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
               <li><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/18ab1b17/content/releases/qpid-0.26/cpp-broker/book/chap-Messaging_User_Guide-Security.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-0.26/cpp-broker/book/chap-Messaging_User_Guide-Security.html
 
b/content/releases/qpid-0.26/cpp-broker/book/chap-Messaging_User_Guide-Security.html
index b20deb6..6bcb20c 100644
--- 
a/content/releases/qpid-0.26/cpp-broker/book/chap-Messaging_User_Guide-Security.html
+++ 
b/content/releases/qpid-0.26/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">Java 
broker</a></li>
+              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
               <li><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/18ab1b17/content/releases/qpid-0.26/cpp-broker/book/chapter-Managing-CPP-Broker.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-0.26/cpp-broker/book/chapter-Managing-CPP-Broker.html 
b/content/releases/qpid-0.26/cpp-broker/book/chapter-Managing-CPP-Broker.html
index a3853e8..79a276b 100644
--- 
a/content/releases/qpid-0.26/cpp-broker/book/chapter-Managing-CPP-Broker.html
+++ 
b/content/releases/qpid-0.26/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">Java 
broker</a></li>
+              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
               <li><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/18ab1b17/content/releases/qpid-0.26/cpp-broker/book/chapter-ha.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-0.26/cpp-broker/book/chapter-ha.html 
b/content/releases/qpid-0.26/cpp-broker/book/chapter-ha.html
index 9b1feb4..92da499 100644
--- a/content/releases/qpid-0.26/cpp-broker/book/chapter-ha.html
+++ b/content/releases/qpid-0.26/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">Java 
broker</a></li>
+              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
               <li><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/18ab1b17/content/releases/qpid-0.26/cpp-broker/book/ha-queue-replication.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-0.26/cpp-broker/book/ha-queue-replication.html 
b/content/releases/qpid-0.26/cpp-broker/book/ha-queue-replication.html
index 15e78f5..7830bc6 100644
--- a/content/releases/qpid-0.26/cpp-broker/book/ha-queue-replication.html
+++ b/content/releases/qpid-0.26/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">Java 
broker</a></li>
+              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
               <li><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/18ab1b17/content/releases/qpid-0.26/cpp-broker/book/index.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-0.26/cpp-broker/book/index.html 
b/content/releases/qpid-0.26/cpp-broker/book/index.html
index dcf4218..adb3d86 100644
--- a/content/releases/qpid-0.26/cpp-broker/book/index.html
+++ b/content/releases/qpid-0.26/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">Java 
broker</a></li>
+              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
               <li><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/18ab1b17/content/releases/qpid-0.26/cpp-broker/book/pr01.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-0.26/cpp-broker/book/pr01.html 
b/content/releases/qpid-0.26/cpp-broker/book/pr01.html
index 85801d1..3265d95 100644
--- a/content/releases/qpid-0.26/cpp-broker/book/pr01.html
+++ b/content/releases/qpid-0.26/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">Java 
broker</a></li>
+              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
               <li><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/18ab1b17/content/releases/qpid-0.26/cpp-broker/book/producer-flow-control.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-0.26/cpp-broker/book/producer-flow-control.html 
b/content/releases/qpid-0.26/cpp-broker/book/producer-flow-control.html
index 8874635..41e3ddf 100644
--- a/content/releases/qpid-0.26/cpp-broker/book/producer-flow-control.html
+++ b/content/releases/qpid-0.26/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">Java 
broker</a></li>
+              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
               <li><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/18ab1b17/content/releases/qpid-0.26/cpp-broker/book/queue-state-replication.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-0.26/cpp-broker/book/queue-state-replication.html 
b/content/releases/qpid-0.26/cpp-broker/book/queue-state-replication.html
index f2abe9f..5a2bfae 100644
--- a/content/releases/qpid-0.26/cpp-broker/book/queue-state-replication.html
+++ b/content/releases/qpid-0.26/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">Java 
broker</a></li>
+              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
               <li><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/18ab1b17/content/releases/qpid-0.26/index.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-0.26/index.html 
b/content/releases/qpid-0.26/index.html
index 2078eb0..9611bd1 100644
--- a/content/releases/qpid-0.26/index.html
+++ b/content/releases/qpid-0.26/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">Java 
broker</a></li>
+              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
               <li><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/18ab1b17/content/releases/qpid-0.26/java-broker/book/Java-Broker-Close-Connection-When-No-Route.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-0.26/java-broker/book/Java-Broker-Close-Connection-When-No-Route.html
 
b/content/releases/qpid-0.26/java-broker/book/Java-Broker-Close-Connection-When-No-Route.html
index 9594307..a1a8b57 100644
--- 
a/content/releases/qpid-0.26/java-broker/book/Java-Broker-Close-Connection-When-No-Route.html
+++ 
b/content/releases/qpid-0.26/java-broker/book/Java-Broker-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">Java 
broker</a></li>
+              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
               <li><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/18ab1b17/content/releases/qpid-0.26/java-broker/book/Java-Broker-Concepts-Authentication-Providers.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-0.26/java-broker/book/Java-Broker-Concepts-Authentication-Providers.html
 
b/content/releases/qpid-0.26/java-broker/book/Java-Broker-Concepts-Authentication-Providers.html
index 5c0eaf3..b243c77 100644
--- 
a/content/releases/qpid-0.26/java-broker/book/Java-Broker-Concepts-Authentication-Providers.html
+++ 
b/content/releases/qpid-0.26/java-broker/book/Java-Broker-Concepts-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">Java 
broker</a></li>
+              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
               <li><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/18ab1b17/content/releases/qpid-0.26/java-broker/book/Java-Broker-Concepts-Exchanges.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-0.26/java-broker/book/Java-Broker-Concepts-Exchanges.html
 
b/content/releases/qpid-0.26/java-broker/book/Java-Broker-Concepts-Exchanges.html
index 48f86d8..9508dd3 100644
--- 
a/content/releases/qpid-0.26/java-broker/book/Java-Broker-Concepts-Exchanges.html
+++ 
b/content/releases/qpid-0.26/java-broker/book/Java-Broker-Concepts-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">Java 
broker</a></li>
+              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
               <li><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/18ab1b17/content/releases/qpid-0.26/java-broker/book/Java-Broker-Concepts-Other-Services.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-0.26/java-broker/book/Java-Broker-Concepts-Other-Services.html
 
b/content/releases/qpid-0.26/java-broker/book/Java-Broker-Concepts-Other-Services.html
index b58432c..3e7009d 100644
--- 
a/content/releases/qpid-0.26/java-broker/book/Java-Broker-Concepts-Other-Services.html
+++ 
b/content/releases/qpid-0.26/java-broker/book/Java-Broker-Concepts-Other-Services.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">Java 
broker</a></li>
+              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
               <li><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/18ab1b17/content/releases/qpid-0.26/java-broker/book/Java-Broker-Concepts-Ports.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-0.26/java-broker/book/Java-Broker-Concepts-Ports.html 
b/content/releases/qpid-0.26/java-broker/book/Java-Broker-Concepts-Ports.html
index 99fb01e..a4355ae 100644
--- 
a/content/releases/qpid-0.26/java-broker/book/Java-Broker-Concepts-Ports.html
+++ 
b/content/releases/qpid-0.26/java-broker/book/Java-Broker-Concepts-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">Java 
broker</a></li>
+              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
               <li><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/18ab1b17/content/releases/qpid-0.26/java-broker/book/Java-Broker-Concepts-Queues.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-0.26/java-broker/book/Java-Broker-Concepts-Queues.html 
b/content/releases/qpid-0.26/java-broker/book/Java-Broker-Concepts-Queues.html
index af84519..048c269 100644
--- 
a/content/releases/qpid-0.26/java-broker/book/Java-Broker-Concepts-Queues.html
+++ 
b/content/releases/qpid-0.26/java-broker/book/Java-Broker-Concepts-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">Java 
broker</a></li>
+              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
               <li><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/18ab1b17/content/releases/qpid-0.26/java-broker/book/Java-Broker-Concepts-Virtual-Hosts.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-0.26/java-broker/book/Java-Broker-Concepts-Virtual-Hosts.html
 
b/content/releases/qpid-0.26/java-broker/book/Java-Broker-Concepts-Virtual-Hosts.html
index 83f9279..2ea2437 100644
--- 
a/content/releases/qpid-0.26/java-broker/book/Java-Broker-Concepts-Virtual-Hosts.html
+++ 
b/content/releases/qpid-0.26/java-broker/book/Java-Broker-Concepts-Virtual-Hosts.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">Java 
broker</a></li>
+              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
               <li><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/18ab1b17/content/releases/qpid-0.26/java-broker/book/Java-Broker-Concepts.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-0.26/java-broker/book/Java-Broker-Concepts.html 
b/content/releases/qpid-0.26/java-broker/book/Java-Broker-Concepts.html
index c8c6a0d..4028361 100644
--- a/content/releases/qpid-0.26/java-broker/book/Java-Broker-Concepts.html
+++ b/content/releases/qpid-0.26/java-broker/book/Java-Broker-Concepts.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">Java 
broker</a></li>
+              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
               <li><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/18ab1b17/content/releases/qpid-0.26/java-broker/book/Java-Broker-Configuring-And-Managing-HTTP-Management.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-0.26/java-broker/book/Java-Broker-Configuring-And-Managing-HTTP-Management.html
 
b/content/releases/qpid-0.26/java-broker/book/Java-Broker-Configuring-And-Managing-HTTP-Management.html
index e46e455..a2e09c0 100644
--- 
a/content/releases/qpid-0.26/java-broker/book/Java-Broker-Configuring-And-Managing-HTTP-Management.html
+++ 
b/content/releases/qpid-0.26/java-broker/book/Java-Broker-Configuring-And-Managing-HTTP-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">Java 
broker</a></li>
+              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
               <li><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/18ab1b17/content/releases/qpid-0.26/java-broker/book/Java-Broker-Configuring-And-Managing-JMX-Management.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-0.26/java-broker/book/Java-Broker-Configuring-And-Managing-JMX-Management.html
 
b/content/releases/qpid-0.26/java-broker/book/Java-Broker-Configuring-And-Managing-JMX-Management.html
index 9517710..0a334a3 100644
--- 
a/content/releases/qpid-0.26/java-broker/book/Java-Broker-Configuring-And-Managing-JMX-Management.html
+++ 
b/content/releases/qpid-0.26/java-broker/book/Java-Broker-Configuring-And-Managing-JMX-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">Java 
broker</a></li>
+              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
               <li><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/18ab1b17/content/releases/qpid-0.26/java-broker/book/Java-Broker-Configuring-And-Managing-Other-Tooling.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-0.26/java-broker/book/Java-Broker-Configuring-And-Managing-Other-Tooling.html
 
b/content/releases/qpid-0.26/java-broker/book/Java-Broker-Configuring-And-Managing-Other-Tooling.html
index eaf1ee6..c5d5a0c 100644
--- 
a/content/releases/qpid-0.26/java-broker/book/Java-Broker-Configuring-And-Managing-Other-Tooling.html
+++ 
b/content/releases/qpid-0.26/java-broker/book/Java-Broker-Configuring-And-Managing-Other-Tooling.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">Java 
broker</a></li>
+              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
               <li><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/18ab1b17/content/releases/qpid-0.26/java-broker/book/Java-Broker-Configuring-And-Managing.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-0.26/java-broker/book/Java-Broker-Configuring-And-Managing.html
 
b/content/releases/qpid-0.26/java-broker/book/Java-Broker-Configuring-And-Managing.html
index eee94d4..cd35915 100644
--- 
a/content/releases/qpid-0.26/java-broker/book/Java-Broker-Configuring-And-Managing.html
+++ 
b/content/releases/qpid-0.26/java-broker/book/Java-Broker-Configuring-And-Managing.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">Java 
broker</a></li>
+              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
               <li><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/18ab1b17/content/releases/qpid-0.26/java-broker/book/Java-Broker-Exchanges.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-0.26/java-broker/book/Java-Broker-Exchanges.html 
b/content/releases/qpid-0.26/java-broker/book/Java-Broker-Exchanges.html
index 43dadb2..11ca2a0 100644
--- a/content/releases/qpid-0.26/java-broker/book/Java-Broker-Exchanges.html
+++ b/content/releases/qpid-0.26/java-broker/book/Java-Broker-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">Java 
broker</a></li>
+              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
               <li><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/18ab1b17/content/releases/qpid-0.26/java-broker/book/Java-Broker-Getting-Started-CommandLine.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-0.26/java-broker/book/Java-Broker-Getting-Started-CommandLine.html
 
b/content/releases/qpid-0.26/java-broker/book/Java-Broker-Getting-Started-CommandLine.html
index 2512c1a..a3d0e98 100644
--- 
a/content/releases/qpid-0.26/java-broker/book/Java-Broker-Getting-Started-CommandLine.html
+++ 
b/content/releases/qpid-0.26/java-broker/book/Java-Broker-Getting-Started-CommandLine.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">Java 
broker</a></li>
+              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
               <li><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: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to