You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by gm...@apache.org on 2016/05/25 20:46:27 UTC

qpid-site git commit: DISPATCH-342 - Fixed qdrouter.json text. Ernie also fixed some images as part of DISPATCH-308

Repository: qpid-site
Updated Branches:
  refs/heads/asf-site 885fb7e3c -> f8a53e176


DISPATCH-342 - Fixed qdrouter.json text. Ernie also fixed some images as part of DISPATCH-308


Project: http://git-wip-us.apache.org/repos/asf/qpid-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-site/commit/f8a53e17
Tree: http://git-wip-us.apache.org/repos/asf/qpid-site/tree/f8a53e17
Diff: http://git-wip-us.apache.org/repos/asf/qpid-site/diff/f8a53e17

Branch: refs/heads/asf-site
Commit: f8a53e1767d93cf4702f6e3b6a72bf4ba29ba650
Parents: 885fb7e
Author: Ganesh Murthy <gm...@redhat.com>
Authored: Wed May 25 16:46:05 2016 -0400
Committer: Ganesh Murthy <gm...@redhat.com>
Committed: Wed May 25 16:46:05 2016 -0400

----------------------------------------------------------------------
 .../_images/console_charts.png                  | Bin 59466 -> 70070 bytes
 .../_images/console_entity.png                  | Bin 86855 -> 69319 bytes
 .../_images/console_login.png                   | Bin 41258 -> 39915 bytes
 .../_images/console_overview.png                | Bin 51563 -> 87960 bytes
 .../_images/console_schema.png                  | Bin 67664 -> 68025 bytes
 .../_images/console_topology.png                | Bin 77879 -> 67338 bytes
 .../qpid-dispatch-master/book/book.html         |   2 +-
 .../qpid-dispatch-master/book/console.html      |   2 +-
 .../book/console_installation.html              |  24 ++++++-------------
 .../book/console_operation.html                 |  15 +++++-------
 .../book/console_overview.html                  |   1 -
 .../qpid-dispatch-master/book/schema.html       |  22 ++++++++---------
 .../book/technical_details.html                 |   6 ++---
 .../releases/qpid-dispatch-master/index.html    |   2 +-
 .../man/qdrouterd.conf.html                     |  24 +++++++++----------
 .../_images/console_charts.png                  | Bin 59466 -> 70070 bytes
 .../_images/console_entity.png                  | Bin 86855 -> 69319 bytes
 .../_images/console_login.png                   | Bin 41258 -> 39915 bytes
 .../_images/console_overview.png                | Bin 51563 -> 87960 bytes
 .../_images/console_schema.png                  | Bin 67664 -> 68025 bytes
 .../_images/console_topology.png                | Bin 77879 -> 67338 bytes
 .../qpid-dispatch-master/book/book.html.in      |   2 +-
 .../qpid-dispatch-master/book/console.html.in   |   2 +-
 .../book/console_installation.html.in           |  24 ++++++-------------
 .../book/console_operation.html.in              |  15 +++++-------
 .../book/console_overview.html.in               |   1 -
 .../qpid-dispatch-master/book/schema.html.in    |  22 ++++++++---------
 .../book/technical_details.html.in              |   6 ++---
 input/releases/qpid-dispatch-master/index.md    |   2 +-
 .../man/qdrouterd.conf.html.in                  |  24 +++++++++----------
 30 files changed, 84 insertions(+), 112 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-site/blob/f8a53e17/content/releases/qpid-dispatch-master/_images/console_charts.png
----------------------------------------------------------------------
diff --git a/content/releases/qpid-dispatch-master/_images/console_charts.png b/content/releases/qpid-dispatch-master/_images/console_charts.png
index 8a70b30..169c2ca 100755
Binary files a/content/releases/qpid-dispatch-master/_images/console_charts.png and b/content/releases/qpid-dispatch-master/_images/console_charts.png differ

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/f8a53e17/content/releases/qpid-dispatch-master/_images/console_entity.png
----------------------------------------------------------------------
diff --git a/content/releases/qpid-dispatch-master/_images/console_entity.png b/content/releases/qpid-dispatch-master/_images/console_entity.png
index 5de7cc1..130c7e7 100755
Binary files a/content/releases/qpid-dispatch-master/_images/console_entity.png and b/content/releases/qpid-dispatch-master/_images/console_entity.png differ

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/f8a53e17/content/releases/qpid-dispatch-master/_images/console_login.png
----------------------------------------------------------------------
diff --git a/content/releases/qpid-dispatch-master/_images/console_login.png b/content/releases/qpid-dispatch-master/_images/console_login.png
index 97a805e..63e22c6 100755
Binary files a/content/releases/qpid-dispatch-master/_images/console_login.png and b/content/releases/qpid-dispatch-master/_images/console_login.png differ

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/f8a53e17/content/releases/qpid-dispatch-master/_images/console_overview.png
----------------------------------------------------------------------
diff --git a/content/releases/qpid-dispatch-master/_images/console_overview.png b/content/releases/qpid-dispatch-master/_images/console_overview.png
index c613a09..af25f36 100755
Binary files a/content/releases/qpid-dispatch-master/_images/console_overview.png and b/content/releases/qpid-dispatch-master/_images/console_overview.png differ

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/f8a53e17/content/releases/qpid-dispatch-master/_images/console_schema.png
----------------------------------------------------------------------
diff --git a/content/releases/qpid-dispatch-master/_images/console_schema.png b/content/releases/qpid-dispatch-master/_images/console_schema.png
index bb83a78..ba56c7b 100755
Binary files a/content/releases/qpid-dispatch-master/_images/console_schema.png and b/content/releases/qpid-dispatch-master/_images/console_schema.png differ

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/f8a53e17/content/releases/qpid-dispatch-master/_images/console_topology.png
----------------------------------------------------------------------
diff --git a/content/releases/qpid-dispatch-master/_images/console_topology.png b/content/releases/qpid-dispatch-master/_images/console_topology.png
index ca86ddb..ae4b22a 100755
Binary files a/content/releases/qpid-dispatch-master/_images/console_topology.png and b/content/releases/qpid-dispatch-master/_images/console_topology.png differ

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/f8a53e17/content/releases/qpid-dispatch-master/book/book.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-dispatch-master/book/book.html b/content/releases/qpid-dispatch-master/book/book.html
index e220aa3..5ba334c 100644
--- a/content/releases/qpid-dispatch-master/book/book.html
+++ b/content/releases/qpid-dispatch-master/book/book.html
@@ -185,7 +185,7 @@ https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
 <li class="toctree-l3"><a class="reference internal" href="console_operation.html#logging-in-to-a-router-network">4.3.1. Logging in to a router network</a></li>
 <li class="toctree-l3"><a class="reference internal" href="console_operation.html#overview-page">4.3.2. Overview page</a></li>
 <li class="toctree-l3"><a class="reference internal" href="console_operation.html#topology-page">4.3.3. Topology page</a></li>
-<li class="toctree-l3"><a class="reference internal" href="console_operation.html#router-entity-details-page">4.3.4. Router entity details page</a></li>
+<li class="toctree-l3"><a class="reference internal" href="console_operation.html#list-page">4.3.4. List page</a></li>
 <li class="toctree-l3"><a class="reference internal" href="console_operation.html#charts-page">4.3.5. Charts page</a></li>
 <li class="toctree-l3"><a class="reference internal" href="console_operation.html#schema-page">4.3.6. Schema page</a></li>
 </ul>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/f8a53e17/content/releases/qpid-dispatch-master/book/console.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-dispatch-master/book/console.html b/content/releases/qpid-dispatch-master/book/console.html
index be5d27d..253ba01 100644
--- a/content/releases/qpid-dispatch-master/book/console.html
+++ b/content/releases/qpid-dispatch-master/book/console.html
@@ -130,7 +130,7 @@ https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
 <li class="toctree-l2"><a class="reference internal" href="console_operation.html#logging-in-to-a-router-network">4.3.1. Logging in to a router network</a></li>
 <li class="toctree-l2"><a class="reference internal" href="console_operation.html#overview-page">4.3.2. Overview page</a></li>
 <li class="toctree-l2"><a class="reference internal" href="console_operation.html#topology-page">4.3.3. Topology page</a></li>
-<li class="toctree-l2"><a class="reference internal" href="console_operation.html#router-entity-details-page">4.3.4. Router entity details page</a></li>
+<li class="toctree-l2"><a class="reference internal" href="console_operation.html#list-page">4.3.4. List page</a></li>
 <li class="toctree-l2"><a class="reference internal" href="console_operation.html#charts-page">4.3.5. Charts page</a></li>
 <li class="toctree-l2"><a class="reference internal" href="console_operation.html#schema-page">4.3.6. Schema page</a></li>
 </ul>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/f8a53e17/content/releases/qpid-dispatch-master/book/console_installation.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-dispatch-master/book/console_installation.html b/content/releases/qpid-dispatch-master/book/console_installation.html
index ca7d0a1..ad31318 100644
--- a/content/releases/qpid-dispatch-master/book/console_installation.html
+++ b/content/releases/qpid-dispatch-master/book/console_installation.html
@@ -123,13 +123,12 @@ https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
 <p>The following need to be installed before running a console:</p>
 <ul class="simple">
 <li>One or more dispatch routers. See the documentation for the dispatch router for help in starting a router network.</li>
-<li>node.js This is needed to provide a proxy between the console&#8217;s websocket traffic and tcp.</li>
+<li>A websockets to tcp proxy.</li>
 <li>A web server. This can be any server capable of serving static html/js/css/image files.</li>
 </ul>
-<p>A nodejs proxy is distributed with proton.
-To start the proton&#8217;s nodejs proxy:</p>
-<div class="highlight-python"><div class="highlight"><pre><span></span>cd ~/rh-qpid-proton/examples/javascript/messenger
- node proxy.js &amp;
+<p>To install a websockets to tcp  proxy:</p>
+<div class="highlight-python"><div class="highlight"><pre><span></span>sudo dnf install python-websockify
+websockify localhost:5673 localhost:5672
 </pre></div>
 </div>
 <p>This will start the proxy listening to ws traffic on port 5673 and translating it to tcp on port 5672.
@@ -145,19 +144,10 @@ One of the routers in the network needs to have a listener configured on port 56
 </div>
 <div class="section" id="the-console-files">
 <h2>4.2.2. The console files<a class="headerlink" href="#the-console-files" title="Permalink to this headline">.</a></h2>
-<p>The files for the console are located under the console directory in
-the source tree.:</p>
-<div class="highlight-python"><div class="highlight"><pre><span></span>app/
-bower_components/
-css/
-img/
-index.html
-lib/
-plugin/
-vendor.js
-</pre></div>
-</div>
 <dl class="docutils">
+<dt>The files for the console are located under the console/stand-alone directory in the source tree.::</dt>
+<dd>index.html
+plugin/</dd>
 <dt>Copy these files to a directory under the the html or webapps directory of your web server. For example, for apache tomcat the files should be under webapps/dispatch. Then the console is available as::</dt>
 <dd><a class="reference external" href="http://localhost:8080/dispatch">http://localhost:8080/dispatch</a></dd>
 </dl>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/f8a53e17/content/releases/qpid-dispatch-master/book/console_operation.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-dispatch-master/book/console_operation.html b/content/releases/qpid-dispatch-master/book/console_operation.html
index 6dfb6ee..86b61f6 100644
--- a/content/releases/qpid-dispatch-master/book/console_operation.html
+++ b/content/releases/qpid-dispatch-master/book/console_operation.html
@@ -120,32 +120,29 @@ https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
 <h1>4.3. Console operation<a class="headerlink" href="#console-operation" title="Permalink to this headline">.</a></h1>
 <div class="section" id="logging-in-to-a-router-network">
 <h2>4.3.1. Logging in to a router network<a class="headerlink" href="#logging-in-to-a-router-network" title="Permalink to this headline">.</a></h2>
-<p>The console communicates to the router network using the proton javascript bindings. When run from a web page, the proton bindings use web sockets to send and receive commands. However, the dispatch router requires tcp. Therefore a web-sockets to tcp proxy is used.</p>
 <img alt="../_images/console_login.png" src="../_images/console_login.png" />
-<p>Enter the address of a proxy that is connected to a router in the network.</p>
-<p>User name and password are not used at this time.</p>
+<p>Enter the address of the websockets to tcp proxy that is connected to a router in the network.</p>
 <p>The Autostart checkbox, when checked, will automatically log in with the previous host:port the next time you start the console.</p>
 </div>
 <div class="section" id="overview-page">
 <h2>4.3.2. Overview page<a class="headerlink" href="#overview-page" title="Permalink to this headline">.</a></h2>
-<p>On the overview page, aggregate information about routers, addresses, and connections is displayed.</p>
 <img alt="../_images/console_overview.png" src="../_images/console_overview.png" />
+<p>On the overview page, aggregate information about routers, addresses, and connections is displayed.</p>
 </div>
 <div class="section" id="topology-page">
 <h2>4.3.3. Topology page<a class="headerlink" href="#topology-page" title="Permalink to this headline">.</a></h2>
-<p>This page displays the router network in a graphical form showing how the routers are connected and information about the individual routers and links.</p>
 <img alt="../_images/console_topology.png" src="../_images/console_topology.png" />
+<p>This page displays the router network in a graphical form showing how the routers are connected and information about the individual routers and links.</p>
 </div>
-<div class="section" id="router-entity-details-page">
-<h2>4.3.4. Router entity details page<a class="headerlink" href="#router-entity-details-page" title="Permalink to this headline">.</a></h2>
+<div class="section" id="list-page">
+<h2>4.3.4. List page<a class="headerlink" href="#list-page" title="Permalink to this headline">.</a></h2>
 <img alt="../_images/console_entity.png" src="../_images/console_entity.png" />
 <p>Displays detailed information about entities such as routers, links, addresses, memory.</p>
-<p>Numeric attributes can be graphed by clicking on the graph icon.</p>
 </div>
 <div class="section" id="charts-page">
 <h2>4.3.5. Charts page<a class="headerlink" href="#charts-page" title="Permalink to this headline">.</a></h2>
 <img alt="../_images/console_charts.png" src="../_images/console_charts.png" />
-<p>This page displays graphs of numeric values that are on the entity details page.</p>
+<p>This page displays graphs of numeric values that are on the list page.</p>
 </div>
 <div class="section" id="schema-page">
 <h2>4.3.6. Schema page<a class="headerlink" href="#schema-page" title="Permalink to this headline">.</a></h2>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/f8a53e17/content/releases/qpid-dispatch-master/book/console_overview.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-dispatch-master/book/console_overview.html b/content/releases/qpid-dispatch-master/book/console_overview.html
index 001de8d..f9b6ce9 100644
--- a/content/releases/qpid-dispatch-master/book/console_overview.html
+++ b/content/releases/qpid-dispatch-master/book/console_overview.html
@@ -120,7 +120,6 @@ https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
 <h1>4.1. Console overview<a class="headerlink" href="#console-overview" title="Permalink to this headline">.</a></h1>
 <p>The console is an HTML based web site that displays information about a qpid dispatch router network.</p>
 <p>The console requires an HTML web server that can serve static html, javascript, style sheets, and images.</p>
-<p>The current version of the is read-only. The ability to call management methods that change the running of the router network is planned for a future version of console.</p>
 <p>The console only provides limited information about the clients that are attached to the router network and is therfore more appropriate for administrators needing to know the layout and health of the router network.</p>
 </div>
 

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/f8a53e17/content/releases/qpid-dispatch-master/book/schema.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-dispatch-master/book/schema.html b/content/releases/qpid-dispatch-master/book/schema.html
index 1de21ea..57691ea 100644
--- a/content/releases/qpid-dispatch-master/book/schema.html
+++ b/content/releases/qpid-dispatch-master/book/schema.html
@@ -238,7 +238,7 @@ be modified using the <cite>update</cite> operation, see the entity descriptions
 <dt><em>password</em> (string, <cite>CREATE</cite>)</dt>
 <dd>An alternative to storing the password in a file referenced by passwordFile is to supply the password right here in the configuration file.  This option can be used by supplying the password in the &#8216;password&#8217; option.  Don&#8217;t use both password and passwordFile in the same profile.</dd>
 <dt><em>uidFormat</em> (string, <cite>CREATE</cite>)</dt>
-<dd>A list of x509 client certificate fields that will be used to build a string that will uniquely identify the client certificate owner. For e.g. a value of &#8216;cou&#8217; indicates that the uid will consist of c - common name concatenated with o - organization-company name concatenated with u - organization unit; or a value of &#8216;oF&#8217; indicates that the uid will consist of o (organization name) concatenated with F (the sha256 fingerprint of the entire certificate) . Allowed values can be any combination of comma separated &#8216;c&#8217;( ISO3166 two character country code), &#8216;s&#8217;(state or province), &#8216;l&#8217;(Locality; generally - city), &#8216;o&#8217;(Organization - Company Name), &#8216;u&#8217;(Organization Unit - typically certificate type or brand), &#8216;n&#8217;(CommonName - typically a user name for client certificates) and &#8216;1&#8217;(sha1 certificate fingerprint, as displayed in the fingerprints section when looking at a certificate wi
 th say a web browser is the hash of the entire certificate) and 2 (sha256 certificate fingerprint) and 5 (sha512 certificate fingerprint).</dd>
+<dd>A list of x509 client certificate fields that will be used to build a string that will uniquely identify the client certificate owner. For e.g. a value of &#8216;cou&#8217; indicates that the uid will consist of c - common name concatenated with o - organization-company name concatenated with u - organization unit; or a value of &#8216;o2&#8217; indicates that the uid will consist of o (organization name) concatenated with 2 (the sha256 fingerprint of the entire certificate) . Allowed values can be any combination of comma separated &#8216;c&#8217;( ISO3166 two character country code), &#8216;s&#8217;(state or province), &#8216;l&#8217;(Locality; generally - city), &#8216;o&#8217;(Organization - Company Name), &#8216;u&#8217;(Organization Unit - typically certificate type or brand), &#8216;n&#8217;(CommonName - typically a user name for client certificates) and &#8216;1&#8217;(sha1 certificate fingerprint, as displayed in the fingerprints section when looking at a certificate wi
 th say a web browser is the hash of the entire certificate) and 2 (sha256 certificate fingerprint) and 5 (sha512 certificate fingerprint).</dd>
 <dt><em>displayNameFile</em> (string, <cite>CREATE</cite>)</dt>
 <dd>The path to the file containing the unique id to dispay name mapping</dd>
 <dt><em>sslProfileName</em> (string)</dt>
@@ -297,7 +297,7 @@ be modified using the <cite>update</cite> operation, see the entity descriptions
 <dt><em>password</em> (string, <cite>CREATE</cite>)</dt>
 <dd>An alternative to storing the password in a file referenced by passwordFile is to supply the password right here in the configuration file.  This option can be used by supplying the password in the &#8216;password&#8217; option.  Don&#8217;t use both password and passwordFile in the same profile.</dd>
 <dt><em>uidFormat</em> (string, <cite>CREATE</cite>)</dt>
-<dd>A list of x509 client certificate fields that will be used to build a string that will uniquely identify the client certificate owner. For e.g. a value of &#8216;cou&#8217; indicates that the uid will consist of c - common name concatenated with o - organization-company name concatenated with u - organization unit; or a value of &#8216;oF&#8217; indicates that the uid will consist of o (organization name) concatenated with F (the sha256 fingerprint of the entire certificate) . Allowed values can be any combination of comma separated &#8216;c&#8217;( ISO3166 two character country code), &#8216;s&#8217;(state or province), &#8216;l&#8217;(Locality; generally - city), &#8216;o&#8217;(Organization - Company Name), &#8216;u&#8217;(Organization Unit - typically certificate type or brand), &#8216;n&#8217;(CommonName - typically a user name for client certificates) and &#8216;1&#8217;(sha1 certificate fingerprint, as displayed in the fingerprints section when looking at a certificate wi
 th say a web browser is the hash of the entire certificate) and 2 (sha256 certificate fingerprint) and 5 (sha512 certificate fingerprint).</dd>
+<dd>A list of x509 client certificate fields that will be used to build a string that will uniquely identify the client certificate owner. For e.g. a value of &#8216;cou&#8217; indicates that the uid will consist of c - common name concatenated with o - organization-company name concatenated with u - organization unit; or a value of &#8216;o2&#8217; indicates that the uid will consist of o (organization name) concatenated with 2 (the sha256 fingerprint of the entire certificate) . Allowed values can be any combination of comma separated &#8216;c&#8217;( ISO3166 two character country code), &#8216;s&#8217;(state or province), &#8216;l&#8217;(Locality; generally - city), &#8216;o&#8217;(Organization - Company Name), &#8216;u&#8217;(Organization Unit - typically certificate type or brand), &#8216;n&#8217;(CommonName - typically a user name for client certificates) and &#8216;1&#8217;(sha1 certificate fingerprint, as displayed in the fingerprints section when looking at a certificate wi
 th say a web browser is the hash of the entire certificate) and 2 (sha256 certificate fingerprint) and 5 (sha512 certificate fingerprint).</dd>
 <dt><em>displayNameFile</em> (string, <cite>CREATE</cite>)</dt>
 <dd>The path to the file containing the unique id to dispay name mapping</dd>
 <dt><em>sslProfileName</em> (string)</dt>
@@ -341,7 +341,7 @@ be modified using the <cite>update</cite> operation, see the entity descriptions
 </div>
 <div class="section" id="fixedaddress">
 <h3>3.4.1.6. fixedAddress<a class="headerlink" href="#fixedaddress" title="Permalink to this headline">.</a></h3>
-<p>(DEPRECATED) Establishes treatment for addresses starting with a prefix. This entity has been deprecated. Use router.config.address instead</p>
+<p>(DEPRECATED) Establishes treatment for addresses starting with a prefix. This entity has been deprecated. Use address instead</p>
 <p>Operations allowed: <cite>CREATE</cite>, <cite>READ</cite></p>
 <dl class="docutils">
 <dt><em>prefix</em> (string, required, <cite>CREATE</cite>)</dt>
@@ -356,7 +356,7 @@ be modified using the <cite>update</cite> operation, see the entity descriptions
 </div>
 <div class="section" id="waypoint">
 <h3>3.4.1.7. waypoint<a class="headerlink" href="#waypoint" title="Permalink to this headline">.</a></h3>
-<p>(DEPRECATED) A remote node that messages for an address pass through. This entity has been deprecated. Use router.config.autoLink instead</p>
+<p>(DEPRECATED) A remote node that messages for an address pass through. This entity has been deprecated. Use autoLink instead</p>
 <p>Operations allowed: <cite>CREATE</cite>, <cite>DELETE</cite>, <cite>READ</cite></p>
 <dl class="docutils">
 <dt><em>address</em> (string, required, <cite>CREATE</cite>)</dt>
@@ -371,7 +371,7 @@ be modified using the <cite>update</cite> operation, see the entity descriptions
 </div>
 <div class="section" id="linkroutepattern">
 <h3>3.4.1.8. linkRoutePattern<a class="headerlink" href="#linkroutepattern" title="Permalink to this headline">.</a></h3>
-<p>(DEPRECATED) An address pattern to match against link sources and targets to cause the router to link-route the attach across the network to a remote node. This entity has been deprecated. Use router.config.linkRoute instead</p>
+<p>(DEPRECATED) An address pattern to match against link sources and targets to cause the router to link-route the attach across the network to a remote node. This entity has been deprecated. Use linkRoute instead</p>
 <p>Operations allowed: <cite>CREATE</cite>, <cite>READ</cite></p>
 <dl class="docutils">
 <dt><em>prefix</em> (string, required, <cite>CREATE</cite>)</dt>
@@ -382,8 +382,8 @@ be modified using the <cite>update</cite> operation, see the entity descriptions
 <dd>The name of the on-demand connector used to reach the target node&#8217;s container.  If this value is not provided, it means that the target container is expected to be connected to a different router in the network.  This prevents links to a link-routable address from being misinterpreted as message-routing links when there is no route to a valid destination available.</dd>
 </dl>
 </div>
-<div class="section" id="router-config-address">
-<h3>3.4.1.9. router.config.address<a class="headerlink" href="#router-config-address" title="Permalink to this headline">.</a></h3>
+<div class="section" id="address">
+<h3>3.4.1.9. address<a class="headerlink" href="#address" title="Permalink to this headline">.</a></h3>
 <p>Entity type for address configuration.  This is used to configure the treatment of message-routed deliveries within a particular address-space.  The configuration controls distribution and address phasing.</p>
 <p>Operations allowed: <cite>CREATE</cite>, <cite>DELETE</cite>, <cite>READ</cite></p>
 <dl class="docutils">
@@ -399,8 +399,8 @@ be modified using the <cite>update</cite> operation, see the entity descriptions
 <dd>Advanced - Override the egress phase for this address</dd>
 </dl>
 </div>
-<div class="section" id="router-config-linkroute">
-<h3>3.4.1.10. router.config.linkRoute<a class="headerlink" href="#router-config-linkroute" title="Permalink to this headline">.</a></h3>
+<div class="section" id="linkroute">
+<h3>3.4.1.10. linkRoute<a class="headerlink" href="#linkroute" title="Permalink to this headline">.</a></h3>
 <p>Entity type for link-route configuration.  This is used to identify remote containers that shall be destinations for routed link-attaches.  The link-routing configuration applies to an addressing space defined by a prefix.</p>
 <p>Operations allowed: <cite>CREATE</cite>, <cite>DELETE</cite>, <cite>READ</cite></p>
 <dl class="docutils">
@@ -418,8 +418,8 @@ be modified using the <cite>update</cite> operation, see the entity descriptions
 <dd>The operational status of this linkRoute: inactive - The remote container is not connected; active - the remote container is connected and ready to accept link routed attachments.</dd>
 </dl>
 </div>
-<div class="section" id="router-config-autolink">
-<h3>3.4.1.11. router.config.autoLink<a class="headerlink" href="#router-config-autolink" title="Permalink to this headline">.</a></h3>
+<div class="section" id="autolink">
+<h3>3.4.1.11. autoLink<a class="headerlink" href="#autolink" title="Permalink to this headline">.</a></h3>
 <p>Entity type for configuring auto-links.  Auto-links are links whose lifecycle is managed by the router.  These are typically used to attach to waypoints on remote containers (brokers, etc.).</p>
 <p>Operations allowed: <cite>CREATE</cite>, <cite>DELETE</cite>, <cite>READ</cite></p>
 <dl class="docutils">

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/f8a53e17/content/releases/qpid-dispatch-master/book/technical_details.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-dispatch-master/book/technical_details.html b/content/releases/qpid-dispatch-master/book/technical_details.html
index 20860aa..9b251fa 100644
--- a/content/releases/qpid-dispatch-master/book/technical_details.html
+++ b/content/releases/qpid-dispatch-master/book/technical_details.html
@@ -151,9 +151,9 @@ https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
 <li class="toctree-l3"><a class="reference internal" href="schema.html#fixedaddress">3.4.1.6. fixedAddress</a></li>
 <li class="toctree-l3"><a class="reference internal" href="schema.html#waypoint">3.4.1.7. waypoint</a></li>
 <li class="toctree-l3"><a class="reference internal" href="schema.html#linkroutepattern">3.4.1.8. linkRoutePattern</a></li>
-<li class="toctree-l3"><a class="reference internal" href="schema.html#router-config-address">3.4.1.9. router.config.address</a></li>
-<li class="toctree-l3"><a class="reference internal" href="schema.html#router-config-linkroute">3.4.1.10. router.config.linkRoute</a></li>
-<li class="toctree-l3"><a class="reference internal" href="schema.html#router-config-autolink">3.4.1.11. router.config.autoLink</a></li>
+<li class="toctree-l3"><a class="reference internal" href="schema.html#address">3.4.1.9. address</a></li>
+<li class="toctree-l3"><a class="reference internal" href="schema.html#linkroute">3.4.1.10. linkRoute</a></li>
+<li class="toctree-l3"><a class="reference internal" href="schema.html#autolink">3.4.1.11. autoLink</a></li>
 <li class="toctree-l3"><a class="reference internal" href="schema.html#console">3.4.1.12. console</a></li>
 <li class="toctree-l3"><a class="reference internal" href="schema.html#policy">3.4.1.13. policy</a></li>
 <li class="toctree-l3"><a class="reference internal" href="schema.html#policyruleset">3.4.1.14. policyRuleset</a></li>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/f8a53e17/content/releases/qpid-dispatch-master/index.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-dispatch-master/index.html b/content/releases/qpid-dispatch-master/index.html
index bce2f4f..e14d1f9 100644
--- a/content/releases/qpid-dispatch-master/index.html
+++ b/content/releases/qpid-dispatch-master/index.html
@@ -124,7 +124,7 @@ https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
 incomplete.  For a smoother experience, see the <a href="/releases/qpid-dispatch-0.5/index.html">current stable
 release</a>.</p>
 
-<p>This content was generated at 09:44  on Tuesday, 17 May 2016.</p>
+<p>This content was generated at 16:27  on Wednesday, 25 May 2016.</p>
 
 </div>
 

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/f8a53e17/content/releases/qpid-dispatch-master/man/qdrouterd.conf.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-dispatch-master/man/qdrouterd.conf.html b/content/releases/qpid-dispatch-master/man/qdrouterd.conf.html
index 34d9373..aea062b 100644
--- a/content/releases/qpid-dispatch-master/man/qdrouterd.conf.html
+++ b/content/releases/qpid-dispatch-master/man/qdrouterd.conf.html
@@ -201,7 +201,7 @@ listener {
 <dt><em>password</em> (string)</dt>
 <dd>An alternative to storing the password in a file referenced by passwordFile is to supply the password right here in the configuration file.  This option can be used by supplying the password in the &#8216;password&#8217; option.  Don&#8217;t use both password and passwordFile in the same profile.</dd>
 <dt><em>uidFormat</em> (string)</dt>
-<dd>A list of x509 client certificate fields that will be used to build a string that will uniquely identify the client certificate owner. For e.g. a value of &#8216;cou&#8217; indicates that the uid will consist of c - common name concatenated with o - organization-company name concatenated with u - organization unit; or a value of &#8216;oF&#8217; indicates that the uid will consist of o (organization name) concatenated with F (the sha256 fingerprint of the entire certificate) . Allowed values can be any combination of comma separated &#8216;c&#8217;( ISO3166 two character country code), &#8216;s&#8217;(state or province), &#8216;l&#8217;(Locality; generally - city), &#8216;o&#8217;(Organization - Company Name), &#8216;u&#8217;(Organization Unit - typically certificate type or brand), &#8216;n&#8217;(CommonName - typically a user name for client certificates) and &#8216;1&#8217;(sha1 certificate fingerprint, as displayed in the fingerprints section when looking at a certificate wi
 th say a web browser is the hash of the entire certificate) and 2 (sha256 certificate fingerprint) and 5 (sha512 certificate fingerprint).</dd>
+<dd>A list of x509 client certificate fields that will be used to build a string that will uniquely identify the client certificate owner. For e.g. a value of &#8216;cou&#8217; indicates that the uid will consist of c - common name concatenated with o - organization-company name concatenated with u - organization unit; or a value of &#8216;o2&#8217; indicates that the uid will consist of o (organization name) concatenated with 2 (the sha256 fingerprint of the entire certificate) . Allowed values can be any combination of comma separated &#8216;c&#8217;( ISO3166 two character country code), &#8216;s&#8217;(state or province), &#8216;l&#8217;(Locality; generally - city), &#8216;o&#8217;(Organization - Company Name), &#8216;u&#8217;(Organization Unit - typically certificate type or brand), &#8216;n&#8217;(CommonName - typically a user name for client certificates) and &#8216;1&#8217;(sha1 certificate fingerprint, as displayed in the fingerprints section when looking at a certificate wi
 th say a web browser is the hash of the entire certificate) and 2 (sha256 certificate fingerprint) and 5 (sha512 certificate fingerprint).</dd>
 <dt><em>displayNameFile</em> (string)</dt>
 <dd>The path to the file containing the unique id to dispay name mapping</dd>
 </dl>
@@ -285,7 +285,7 @@ listener {
 <dt><em>password</em> (string)</dt>
 <dd>An alternative to storing the password in a file referenced by passwordFile is to supply the password right here in the configuration file.  This option can be used by supplying the password in the &#8216;password&#8217; option.  Don&#8217;t use both password and passwordFile in the same profile.</dd>
 <dt><em>uidFormat</em> (string)</dt>
-<dd>A list of x509 client certificate fields that will be used to build a string that will uniquely identify the client certificate owner. For e.g. a value of &#8216;cou&#8217; indicates that the uid will consist of c - common name concatenated with o - organization-company name concatenated with u - organization unit; or a value of &#8216;oF&#8217; indicates that the uid will consist of o (organization name) concatenated with F (the sha256 fingerprint of the entire certificate) . Allowed values can be any combination of comma separated &#8216;c&#8217;( ISO3166 two character country code), &#8216;s&#8217;(state or province), &#8216;l&#8217;(Locality; generally - city), &#8216;o&#8217;(Organization - Company Name), &#8216;u&#8217;(Organization Unit - typically certificate type or brand), &#8216;n&#8217;(CommonName - typically a user name for client certificates) and &#8216;1&#8217;(sha1 certificate fingerprint, as displayed in the fingerprints section when looking at a certificate wi
 th say a web browser is the hash of the entire certificate) and 2 (sha256 certificate fingerprint) and 5 (sha512 certificate fingerprint).</dd>
+<dd>A list of x509 client certificate fields that will be used to build a string that will uniquely identify the client certificate owner. For e.g. a value of &#8216;cou&#8217; indicates that the uid will consist of c - common name concatenated with o - organization-company name concatenated with u - organization unit; or a value of &#8216;o2&#8217; indicates that the uid will consist of o (organization name) concatenated with 2 (the sha256 fingerprint of the entire certificate) . Allowed values can be any combination of comma separated &#8216;c&#8217;( ISO3166 two character country code), &#8216;s&#8217;(state or province), &#8216;l&#8217;(Locality; generally - city), &#8216;o&#8217;(Organization - Company Name), &#8216;u&#8217;(Organization Unit - typically certificate type or brand), &#8216;n&#8217;(CommonName - typically a user name for client certificates) and &#8216;1&#8217;(sha1 certificate fingerprint, as displayed in the fingerprints section when looking at a certificate wi
 th say a web browser is the hash of the entire certificate) and 2 (sha256 certificate fingerprint) and 5 (sha512 certificate fingerprint).</dd>
 <dt><em>displayNameFile</em> (string)</dt>
 <dd>The path to the file containing the unique id to dispay name mapping</dd>
 <dt><em>saslMechanisms</em> (string)</dt>
@@ -342,7 +342,7 @@ listener {
 <dt><em>password</em> (string)</dt>
 <dd>An alternative to storing the password in a file referenced by passwordFile is to supply the password right here in the configuration file.  This option can be used by supplying the password in the &#8216;password&#8217; option.  Don&#8217;t use both password and passwordFile in the same profile.</dd>
 <dt><em>uidFormat</em> (string)</dt>
-<dd>A list of x509 client certificate fields that will be used to build a string that will uniquely identify the client certificate owner. For e.g. a value of &#8216;cou&#8217; indicates that the uid will consist of c - common name concatenated with o - organization-company name concatenated with u - organization unit; or a value of &#8216;oF&#8217; indicates that the uid will consist of o (organization name) concatenated with F (the sha256 fingerprint of the entire certificate) . Allowed values can be any combination of comma separated &#8216;c&#8217;( ISO3166 two character country code), &#8216;s&#8217;(state or province), &#8216;l&#8217;(Locality; generally - city), &#8216;o&#8217;(Organization - Company Name), &#8216;u&#8217;(Organization Unit - typically certificate type or brand), &#8216;n&#8217;(CommonName - typically a user name for client certificates) and &#8216;1&#8217;(sha1 certificate fingerprint, as displayed in the fingerprints section when looking at a certificate wi
 th say a web browser is the hash of the entire certificate) and 2 (sha256 certificate fingerprint) and 5 (sha512 certificate fingerprint).</dd>
+<dd>A list of x509 client certificate fields that will be used to build a string that will uniquely identify the client certificate owner. For e.g. a value of &#8216;cou&#8217; indicates that the uid will consist of c - common name concatenated with o - organization-company name concatenated with u - organization unit; or a value of &#8216;o2&#8217; indicates that the uid will consist of o (organization name) concatenated with 2 (the sha256 fingerprint of the entire certificate) . Allowed values can be any combination of comma separated &#8216;c&#8217;( ISO3166 two character country code), &#8216;s&#8217;(state or province), &#8216;l&#8217;(Locality; generally - city), &#8216;o&#8217;(Organization - Company Name), &#8216;u&#8217;(Organization Unit - typically certificate type or brand), &#8216;n&#8217;(CommonName - typically a user name for client certificates) and &#8216;1&#8217;(sha1 certificate fingerprint, as displayed in the fingerprints section when looking at a certificate wi
 th say a web browser is the hash of the entire certificate) and 2 (sha256 certificate fingerprint) and 5 (sha512 certificate fingerprint).</dd>
 <dt><em>displayNameFile</em> (string)</dt>
 <dd>The path to the file containing the unique id to dispay name mapping</dd>
 <dt><em>saslMechanisms</em> (string)</dt>
@@ -383,7 +383,7 @@ listener {
 </div>
 <div class="section" id="fixedaddress">
 <h3>fixedAddress<a class="headerlink" href="#fixedaddress" title="Permalink to this headline">.</a></h3>
-<p>(DEPRECATED) Establishes treatment for addresses starting with a prefix. This entity has been deprecated. Use router.config.address instead</p>
+<p>(DEPRECATED) Establishes treatment for addresses starting with a prefix. This entity has been deprecated. Use address instead</p>
 <dl class="docutils">
 <dt><em>prefix</em> (string, required)</dt>
 <dd>The address prefix (always starting with &#8216;/&#8217;).</dd>
@@ -397,7 +397,7 @@ listener {
 </div>
 <div class="section" id="waypoint">
 <h3>waypoint<a class="headerlink" href="#waypoint" title="Permalink to this headline">.</a></h3>
-<p>(DEPRECATED) A remote node that messages for an address pass through. This entity has been deprecated. Use router.config.autoLink instead</p>
+<p>(DEPRECATED) A remote node that messages for an address pass through. This entity has been deprecated. Use autoLink instead</p>
 <dl class="docutils">
 <dt><em>address</em> (string, required)</dt>
 <dd>The AMQP address of the waypoint.</dd>
@@ -411,7 +411,7 @@ listener {
 </div>
 <div class="section" id="linkroutepattern">
 <h3>linkRoutePattern<a class="headerlink" href="#linkroutepattern" title="Permalink to this headline">.</a></h3>
-<p>(DEPRECATED) An address pattern to match against link sources and targets to cause the router to link-route the attach across the network to a remote node. This entity has been deprecated. Use router.config.linkRoute instead</p>
+<p>(DEPRECATED) An address pattern to match against link sources and targets to cause the router to link-route the attach across the network to a remote node. This entity has been deprecated. Use linkRoute instead</p>
 <dl class="docutils">
 <dt><em>prefix</em> (string, required)</dt>
 <dd>An address prefix to match against target and source addresses.  This pattern must be of the form &#8216;&lt;text&gt;.&lt;text1&gt;.&lt;textN&gt;&#8217; or &#8216;&lt;text&gt;&#8217; or &#8216;&lt;text&gt;.&#8217; and matches any address that contains that prefix.  For example, if the prefix is set to org.apache (or org.apache.), any address that has the prefix &#8216;org.apache&#8217;  (like org.apache.dev) will match. Note that a prefix must not start with a (.), can end in a (.) and can contain zero or more dots (.).  Any characters between the dots are simply treated as part of the address</dd>
@@ -421,8 +421,8 @@ listener {
 <dd>The name of the on-demand connector used to reach the target node&#8217;s container.  If this value is not provided, it means that the target container is expected to be connected to a different router in the network.  This prevents links to a link-routable address from being misinterpreted as message-routing links when there is no route to a valid destination available.</dd>
 </dl>
 </div>
-<div class="section" id="router-config-address">
-<h3>router.config.address<a class="headerlink" href="#router-config-address" title="Permalink to this headline">.</a></h3>
+<div class="section" id="address">
+<h3>address<a class="headerlink" href="#address" title="Permalink to this headline">.</a></h3>
 <p>Entity type for address configuration.  This is used to configure the treatment of message-routed deliveries within a particular address-space.  The configuration controls distribution and address phasing.</p>
 <dl class="docutils">
 <dt><em>prefix</em> (string, required)</dt>
@@ -437,8 +437,8 @@ listener {
 <dd>Advanced - Override the egress phase for this address</dd>
 </dl>
 </div>
-<div class="section" id="router-config-linkroute">
-<h3>router.config.linkRoute<a class="headerlink" href="#router-config-linkroute" title="Permalink to this headline">.</a></h3>
+<div class="section" id="linkroute">
+<h3>linkRoute<a class="headerlink" href="#linkroute" title="Permalink to this headline">.</a></h3>
 <p>Entity type for link-route configuration.  This is used to identify remote containers that shall be destinations for routed link-attaches.  The link-routing configuration applies to an addressing space defined by a prefix.</p>
 <dl class="docutils">
 <dt><em>prefix</em> (string, required)</dt>
@@ -453,8 +453,8 @@ listener {
 <dd>The permitted direction of links: &#8216;in&#8217; means client senders; &#8216;out&#8217; means client receivers</dd>
 </dl>
 </div>
-<div class="section" id="router-config-autolink">
-<h3>router.config.autoLink<a class="headerlink" href="#router-config-autolink" title="Permalink to this headline">.</a></h3>
+<div class="section" id="autolink">
+<h3>autoLink<a class="headerlink" href="#autolink" title="Permalink to this headline">.</a></h3>
 <p>Entity type for configuring auto-links.  Auto-links are links whose lifecycle is managed by the router.  These are typically used to attach to waypoints on remote containers (brokers, etc.).</p>
 <dl class="docutils">
 <dt><em>addr</em> (string, required)</dt>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/f8a53e17/input/releases/qpid-dispatch-master/_images/console_charts.png
----------------------------------------------------------------------
diff --git a/input/releases/qpid-dispatch-master/_images/console_charts.png b/input/releases/qpid-dispatch-master/_images/console_charts.png
index 8a70b30..169c2ca 100644
Binary files a/input/releases/qpid-dispatch-master/_images/console_charts.png and b/input/releases/qpid-dispatch-master/_images/console_charts.png differ

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/f8a53e17/input/releases/qpid-dispatch-master/_images/console_entity.png
----------------------------------------------------------------------
diff --git a/input/releases/qpid-dispatch-master/_images/console_entity.png b/input/releases/qpid-dispatch-master/_images/console_entity.png
index 5de7cc1..130c7e7 100644
Binary files a/input/releases/qpid-dispatch-master/_images/console_entity.png and b/input/releases/qpid-dispatch-master/_images/console_entity.png differ

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/f8a53e17/input/releases/qpid-dispatch-master/_images/console_login.png
----------------------------------------------------------------------
diff --git a/input/releases/qpid-dispatch-master/_images/console_login.png b/input/releases/qpid-dispatch-master/_images/console_login.png
index 97a805e..63e22c6 100644
Binary files a/input/releases/qpid-dispatch-master/_images/console_login.png and b/input/releases/qpid-dispatch-master/_images/console_login.png differ

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/f8a53e17/input/releases/qpid-dispatch-master/_images/console_overview.png
----------------------------------------------------------------------
diff --git a/input/releases/qpid-dispatch-master/_images/console_overview.png b/input/releases/qpid-dispatch-master/_images/console_overview.png
index c613a09..af25f36 100644
Binary files a/input/releases/qpid-dispatch-master/_images/console_overview.png and b/input/releases/qpid-dispatch-master/_images/console_overview.png differ

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/f8a53e17/input/releases/qpid-dispatch-master/_images/console_schema.png
----------------------------------------------------------------------
diff --git a/input/releases/qpid-dispatch-master/_images/console_schema.png b/input/releases/qpid-dispatch-master/_images/console_schema.png
index bb83a78..ba56c7b 100644
Binary files a/input/releases/qpid-dispatch-master/_images/console_schema.png and b/input/releases/qpid-dispatch-master/_images/console_schema.png differ

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/f8a53e17/input/releases/qpid-dispatch-master/_images/console_topology.png
----------------------------------------------------------------------
diff --git a/input/releases/qpid-dispatch-master/_images/console_topology.png b/input/releases/qpid-dispatch-master/_images/console_topology.png
index ca86ddb..ae4b22a 100644
Binary files a/input/releases/qpid-dispatch-master/_images/console_topology.png and b/input/releases/qpid-dispatch-master/_images/console_topology.png differ

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/f8a53e17/input/releases/qpid-dispatch-master/book/book.html.in
----------------------------------------------------------------------
diff --git a/input/releases/qpid-dispatch-master/book/book.html.in b/input/releases/qpid-dispatch-master/book/book.html.in
index f979922..1f1fe66 100644
--- a/input/releases/qpid-dispatch-master/book/book.html.in
+++ b/input/releases/qpid-dispatch-master/book/book.html.in
@@ -69,7 +69,7 @@
 <li class="toctree-l3"><a class="reference internal" href="console_operation.html#logging-in-to-a-router-network">4.3.1. Logging in to a router network</a></li>
 <li class="toctree-l3"><a class="reference internal" href="console_operation.html#overview-page">4.3.2. Overview page</a></li>
 <li class="toctree-l3"><a class="reference internal" href="console_operation.html#topology-page">4.3.3. Topology page</a></li>
-<li class="toctree-l3"><a class="reference internal" href="console_operation.html#router-entity-details-page">4.3.4. Router entity details page</a></li>
+<li class="toctree-l3"><a class="reference internal" href="console_operation.html#list-page">4.3.4. List page</a></li>
 <li class="toctree-l3"><a class="reference internal" href="console_operation.html#charts-page">4.3.5. Charts page</a></li>
 <li class="toctree-l3"><a class="reference internal" href="console_operation.html#schema-page">4.3.6. Schema page</a></li>
 </ul>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/f8a53e17/input/releases/qpid-dispatch-master/book/console.html.in
----------------------------------------------------------------------
diff --git a/input/releases/qpid-dispatch-master/book/console.html.in b/input/releases/qpid-dispatch-master/book/console.html.in
index a0f3750..58d31d9 100644
--- a/input/releases/qpid-dispatch-master/book/console.html.in
+++ b/input/releases/qpid-dispatch-master/book/console.html.in
@@ -14,7 +14,7 @@
 <li class="toctree-l2"><a class="reference internal" href="console_operation.html#logging-in-to-a-router-network">4.3.1. Logging in to a router network</a></li>
 <li class="toctree-l2"><a class="reference internal" href="console_operation.html#overview-page">4.3.2. Overview page</a></li>
 <li class="toctree-l2"><a class="reference internal" href="console_operation.html#topology-page">4.3.3. Topology page</a></li>
-<li class="toctree-l2"><a class="reference internal" href="console_operation.html#router-entity-details-page">4.3.4. Router entity details page</a></li>
+<li class="toctree-l2"><a class="reference internal" href="console_operation.html#list-page">4.3.4. List page</a></li>
 <li class="toctree-l2"><a class="reference internal" href="console_operation.html#charts-page">4.3.5. Charts page</a></li>
 <li class="toctree-l2"><a class="reference internal" href="console_operation.html#schema-page">4.3.6. Schema page</a></li>
 </ul>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/f8a53e17/input/releases/qpid-dispatch-master/book/console_installation.html.in
----------------------------------------------------------------------
diff --git a/input/releases/qpid-dispatch-master/book/console_installation.html.in b/input/releases/qpid-dispatch-master/book/console_installation.html.in
index f5b5809..001b9a3 100644
--- a/input/releases/qpid-dispatch-master/book/console_installation.html.in
+++ b/input/releases/qpid-dispatch-master/book/console_installation.html.in
@@ -7,13 +7,12 @@
 <p>The following need to be installed before running a console:</p>
 <ul class="simple">
 <li>One or more dispatch routers. See the documentation for the dispatch router for help in starting a router network.</li>
-<li>node.js This is needed to provide a proxy between the console&#8217;s websocket traffic and tcp.</li>
+<li>A websockets to tcp proxy.</li>
 <li>A web server. This can be any server capable of serving static html/js/css/image files.</li>
 </ul>
-<p>A nodejs proxy is distributed with proton.
-To start the proton&#8217;s nodejs proxy:</p>
-<div class="highlight-python"><div class="highlight"><pre><span></span>cd ~/rh-qpid-proton/examples/javascript/messenger
- node proxy.js &amp;
+<p>To install a websockets to tcp  proxy:</p>
+<div class="highlight-python"><div class="highlight"><pre><span></span>sudo dnf install python-websockify
+websockify localhost:5673 localhost:5672
 </pre></div>
 </div>
 <p>This will start the proxy listening to ws traffic on port 5673 and translating it to tcp on port 5672.
@@ -29,19 +28,10 @@ One of the routers in the network needs to have a listener configured on port 56
 </div>
 <div class="section" id="the-console-files">
 <h2>4.2.2. The console files<a class="headerlink" href="#the-console-files" title="Permalink to this headline">.</a></h2>
-<p>The files for the console are located under the console directory in
-the source tree.:</p>
-<div class="highlight-python"><div class="highlight"><pre><span></span>app/
-bower_components/
-css/
-img/
-index.html
-lib/
-plugin/
-vendor.js
-</pre></div>
-</div>
 <dl class="docutils">
+<dt>The files for the console are located under the console/stand-alone directory in the source tree.::</dt>
+<dd>index.html
+plugin/</dd>
 <dt>Copy these files to a directory under the the html or webapps directory of your web server. For example, for apache tomcat the files should be under webapps/dispatch. Then the console is available as::</dt>
 <dd><a class="reference external" href="http://localhost:8080/dispatch">http://localhost:8080/dispatch</a></dd>
 </dl>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/f8a53e17/input/releases/qpid-dispatch-master/book/console_operation.html.in
----------------------------------------------------------------------
diff --git a/input/releases/qpid-dispatch-master/book/console_operation.html.in b/input/releases/qpid-dispatch-master/book/console_operation.html.in
index 5ef47b8..2058f78 100644
--- a/input/releases/qpid-dispatch-master/book/console_operation.html.in
+++ b/input/releases/qpid-dispatch-master/book/console_operation.html.in
@@ -4,32 +4,29 @@
 <h1>4.3. Console operation<a class="headerlink" href="#console-operation" title="Permalink to this headline">.</a></h1>
 <div class="section" id="logging-in-to-a-router-network">
 <h2>4.3.1. Logging in to a router network<a class="headerlink" href="#logging-in-to-a-router-network" title="Permalink to this headline">.</a></h2>
-<p>The console communicates to the router network using the proton javascript bindings. When run from a web page, the proton bindings use web sockets to send and receive commands. However, the dispatch router requires tcp. Therefore a web-sockets to tcp proxy is used.</p>
 <img alt="../_images/console_login.png" src="../_images/console_login.png" />
-<p>Enter the address of a proxy that is connected to a router in the network.</p>
-<p>User name and password are not used at this time.</p>
+<p>Enter the address of the websockets to tcp proxy that is connected to a router in the network.</p>
 <p>The Autostart checkbox, when checked, will automatically log in with the previous host:port the next time you start the console.</p>
 </div>
 <div class="section" id="overview-page">
 <h2>4.3.2. Overview page<a class="headerlink" href="#overview-page" title="Permalink to this headline">.</a></h2>
-<p>On the overview page, aggregate information about routers, addresses, and connections is displayed.</p>
 <img alt="../_images/console_overview.png" src="../_images/console_overview.png" />
+<p>On the overview page, aggregate information about routers, addresses, and connections is displayed.</p>
 </div>
 <div class="section" id="topology-page">
 <h2>4.3.3. Topology page<a class="headerlink" href="#topology-page" title="Permalink to this headline">.</a></h2>
-<p>This page displays the router network in a graphical form showing how the routers are connected and information about the individual routers and links.</p>
 <img alt="../_images/console_topology.png" src="../_images/console_topology.png" />
+<p>This page displays the router network in a graphical form showing how the routers are connected and information about the individual routers and links.</p>
 </div>
-<div class="section" id="router-entity-details-page">
-<h2>4.3.4. Router entity details page<a class="headerlink" href="#router-entity-details-page" title="Permalink to this headline">.</a></h2>
+<div class="section" id="list-page">
+<h2>4.3.4. List page<a class="headerlink" href="#list-page" title="Permalink to this headline">.</a></h2>
 <img alt="../_images/console_entity.png" src="../_images/console_entity.png" />
 <p>Displays detailed information about entities such as routers, links, addresses, memory.</p>
-<p>Numeric attributes can be graphed by clicking on the graph icon.</p>
 </div>
 <div class="section" id="charts-page">
 <h2>4.3.5. Charts page<a class="headerlink" href="#charts-page" title="Permalink to this headline">.</a></h2>
 <img alt="../_images/console_charts.png" src="../_images/console_charts.png" />
-<p>This page displays graphs of numeric values that are on the entity details page.</p>
+<p>This page displays graphs of numeric values that are on the list page.</p>
 </div>
 <div class="section" id="schema-page">
 <h2>4.3.6. Schema page<a class="headerlink" href="#schema-page" title="Permalink to this headline">.</a></h2>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/f8a53e17/input/releases/qpid-dispatch-master/book/console_overview.html.in
----------------------------------------------------------------------
diff --git a/input/releases/qpid-dispatch-master/book/console_overview.html.in b/input/releases/qpid-dispatch-master/book/console_overview.html.in
index bd87067..e7b95f0 100644
--- a/input/releases/qpid-dispatch-master/book/console_overview.html.in
+++ b/input/releases/qpid-dispatch-master/book/console_overview.html.in
@@ -4,7 +4,6 @@
 <h1>4.1. Console overview<a class="headerlink" href="#console-overview" title="Permalink to this headline">.</a></h1>
 <p>The console is an HTML based web site that displays information about a qpid dispatch router network.</p>
 <p>The console requires an HTML web server that can serve static html, javascript, style sheets, and images.</p>
-<p>The current version of the is read-only. The ability to call management methods that change the running of the router network is planned for a future version of console.</p>
 <p>The console only provides limited information about the clients that are attached to the router network and is therfore more appropriate for administrators needing to know the layout and health of the router network.</p>
 </div>
 

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/f8a53e17/input/releases/qpid-dispatch-master/book/schema.html.in
----------------------------------------------------------------------
diff --git a/input/releases/qpid-dispatch-master/book/schema.html.in b/input/releases/qpid-dispatch-master/book/schema.html.in
index 2a5dc34..5bd1239 100644
--- a/input/releases/qpid-dispatch-master/book/schema.html.in
+++ b/input/releases/qpid-dispatch-master/book/schema.html.in
@@ -122,7 +122,7 @@ be modified using the <cite>update</cite> operation, see the entity descriptions
 <dt><em>password</em> (string, <cite>CREATE</cite>)</dt>
 <dd>An alternative to storing the password in a file referenced by passwordFile is to supply the password right here in the configuration file.  This option can be used by supplying the password in the &#8216;password&#8217; option.  Don&#8217;t use both password and passwordFile in the same profile.</dd>
 <dt><em>uidFormat</em> (string, <cite>CREATE</cite>)</dt>
-<dd>A list of x509 client certificate fields that will be used to build a string that will uniquely identify the client certificate owner. For e.g. a value of &#8216;cou&#8217; indicates that the uid will consist of c - common name concatenated with o - organization-company name concatenated with u - organization unit; or a value of &#8216;oF&#8217; indicates that the uid will consist of o (organization name) concatenated with F (the sha256 fingerprint of the entire certificate) . Allowed values can be any combination of comma separated &#8216;c&#8217;( ISO3166 two character country code), &#8216;s&#8217;(state or province), &#8216;l&#8217;(Locality; generally - city), &#8216;o&#8217;(Organization - Company Name), &#8216;u&#8217;(Organization Unit - typically certificate type or brand), &#8216;n&#8217;(CommonName - typically a user name for client certificates) and &#8216;1&#8217;(sha1 certificate fingerprint, as displayed in the fingerprints section when looking at a certificate wi
 th say a web browser is the hash of the entire certificate) and 2 (sha256 certificate fingerprint) and 5 (sha512 certificate fingerprint).</dd>
+<dd>A list of x509 client certificate fields that will be used to build a string that will uniquely identify the client certificate owner. For e.g. a value of &#8216;cou&#8217; indicates that the uid will consist of c - common name concatenated with o - organization-company name concatenated with u - organization unit; or a value of &#8216;o2&#8217; indicates that the uid will consist of o (organization name) concatenated with 2 (the sha256 fingerprint of the entire certificate) . Allowed values can be any combination of comma separated &#8216;c&#8217;( ISO3166 two character country code), &#8216;s&#8217;(state or province), &#8216;l&#8217;(Locality; generally - city), &#8216;o&#8217;(Organization - Company Name), &#8216;u&#8217;(Organization Unit - typically certificate type or brand), &#8216;n&#8217;(CommonName - typically a user name for client certificates) and &#8216;1&#8217;(sha1 certificate fingerprint, as displayed in the fingerprints section when looking at a certificate wi
 th say a web browser is the hash of the entire certificate) and 2 (sha256 certificate fingerprint) and 5 (sha512 certificate fingerprint).</dd>
 <dt><em>displayNameFile</em> (string, <cite>CREATE</cite>)</dt>
 <dd>The path to the file containing the unique id to dispay name mapping</dd>
 <dt><em>sslProfileName</em> (string)</dt>
@@ -181,7 +181,7 @@ be modified using the <cite>update</cite> operation, see the entity descriptions
 <dt><em>password</em> (string, <cite>CREATE</cite>)</dt>
 <dd>An alternative to storing the password in a file referenced by passwordFile is to supply the password right here in the configuration file.  This option can be used by supplying the password in the &#8216;password&#8217; option.  Don&#8217;t use both password and passwordFile in the same profile.</dd>
 <dt><em>uidFormat</em> (string, <cite>CREATE</cite>)</dt>
-<dd>A list of x509 client certificate fields that will be used to build a string that will uniquely identify the client certificate owner. For e.g. a value of &#8216;cou&#8217; indicates that the uid will consist of c - common name concatenated with o - organization-company name concatenated with u - organization unit; or a value of &#8216;oF&#8217; indicates that the uid will consist of o (organization name) concatenated with F (the sha256 fingerprint of the entire certificate) . Allowed values can be any combination of comma separated &#8216;c&#8217;( ISO3166 two character country code), &#8216;s&#8217;(state or province), &#8216;l&#8217;(Locality; generally - city), &#8216;o&#8217;(Organization - Company Name), &#8216;u&#8217;(Organization Unit - typically certificate type or brand), &#8216;n&#8217;(CommonName - typically a user name for client certificates) and &#8216;1&#8217;(sha1 certificate fingerprint, as displayed in the fingerprints section when looking at a certificate wi
 th say a web browser is the hash of the entire certificate) and 2 (sha256 certificate fingerprint) and 5 (sha512 certificate fingerprint).</dd>
+<dd>A list of x509 client certificate fields that will be used to build a string that will uniquely identify the client certificate owner. For e.g. a value of &#8216;cou&#8217; indicates that the uid will consist of c - common name concatenated with o - organization-company name concatenated with u - organization unit; or a value of &#8216;o2&#8217; indicates that the uid will consist of o (organization name) concatenated with 2 (the sha256 fingerprint of the entire certificate) . Allowed values can be any combination of comma separated &#8216;c&#8217;( ISO3166 two character country code), &#8216;s&#8217;(state or province), &#8216;l&#8217;(Locality; generally - city), &#8216;o&#8217;(Organization - Company Name), &#8216;u&#8217;(Organization Unit - typically certificate type or brand), &#8216;n&#8217;(CommonName - typically a user name for client certificates) and &#8216;1&#8217;(sha1 certificate fingerprint, as displayed in the fingerprints section when looking at a certificate wi
 th say a web browser is the hash of the entire certificate) and 2 (sha256 certificate fingerprint) and 5 (sha512 certificate fingerprint).</dd>
 <dt><em>displayNameFile</em> (string, <cite>CREATE</cite>)</dt>
 <dd>The path to the file containing the unique id to dispay name mapping</dd>
 <dt><em>sslProfileName</em> (string)</dt>
@@ -225,7 +225,7 @@ be modified using the <cite>update</cite> operation, see the entity descriptions
 </div>
 <div class="section" id="fixedaddress">
 <h3>3.4.1.6. fixedAddress<a class="headerlink" href="#fixedaddress" title="Permalink to this headline">.</a></h3>
-<p>(DEPRECATED) Establishes treatment for addresses starting with a prefix. This entity has been deprecated. Use router.config.address instead</p>
+<p>(DEPRECATED) Establishes treatment for addresses starting with a prefix. This entity has been deprecated. Use address instead</p>
 <p>Operations allowed: <cite>CREATE</cite>, <cite>READ</cite></p>
 <dl class="docutils">
 <dt><em>prefix</em> (string, required, <cite>CREATE</cite>)</dt>
@@ -240,7 +240,7 @@ be modified using the <cite>update</cite> operation, see the entity descriptions
 </div>
 <div class="section" id="waypoint">
 <h3>3.4.1.7. waypoint<a class="headerlink" href="#waypoint" title="Permalink to this headline">.</a></h3>
-<p>(DEPRECATED) A remote node that messages for an address pass through. This entity has been deprecated. Use router.config.autoLink instead</p>
+<p>(DEPRECATED) A remote node that messages for an address pass through. This entity has been deprecated. Use autoLink instead</p>
 <p>Operations allowed: <cite>CREATE</cite>, <cite>DELETE</cite>, <cite>READ</cite></p>
 <dl class="docutils">
 <dt><em>address</em> (string, required, <cite>CREATE</cite>)</dt>
@@ -255,7 +255,7 @@ be modified using the <cite>update</cite> operation, see the entity descriptions
 </div>
 <div class="section" id="linkroutepattern">
 <h3>3.4.1.8. linkRoutePattern<a class="headerlink" href="#linkroutepattern" title="Permalink to this headline">.</a></h3>
-<p>(DEPRECATED) An address pattern to match against link sources and targets to cause the router to link-route the attach across the network to a remote node. This entity has been deprecated. Use router.config.linkRoute instead</p>
+<p>(DEPRECATED) An address pattern to match against link sources and targets to cause the router to link-route the attach across the network to a remote node. This entity has been deprecated. Use linkRoute instead</p>
 <p>Operations allowed: <cite>CREATE</cite>, <cite>READ</cite></p>
 <dl class="docutils">
 <dt><em>prefix</em> (string, required, <cite>CREATE</cite>)</dt>
@@ -266,8 +266,8 @@ be modified using the <cite>update</cite> operation, see the entity descriptions
 <dd>The name of the on-demand connector used to reach the target node&#8217;s container.  If this value is not provided, it means that the target container is expected to be connected to a different router in the network.  This prevents links to a link-routable address from being misinterpreted as message-routing links when there is no route to a valid destination available.</dd>
 </dl>
 </div>
-<div class="section" id="router-config-address">
-<h3>3.4.1.9. router.config.address<a class="headerlink" href="#router-config-address" title="Permalink to this headline">.</a></h3>
+<div class="section" id="address">
+<h3>3.4.1.9. address<a class="headerlink" href="#address" title="Permalink to this headline">.</a></h3>
 <p>Entity type for address configuration.  This is used to configure the treatment of message-routed deliveries within a particular address-space.  The configuration controls distribution and address phasing.</p>
 <p>Operations allowed: <cite>CREATE</cite>, <cite>DELETE</cite>, <cite>READ</cite></p>
 <dl class="docutils">
@@ -283,8 +283,8 @@ be modified using the <cite>update</cite> operation, see the entity descriptions
 <dd>Advanced - Override the egress phase for this address</dd>
 </dl>
 </div>
-<div class="section" id="router-config-linkroute">
-<h3>3.4.1.10. router.config.linkRoute<a class="headerlink" href="#router-config-linkroute" title="Permalink to this headline">.</a></h3>
+<div class="section" id="linkroute">
+<h3>3.4.1.10. linkRoute<a class="headerlink" href="#linkroute" title="Permalink to this headline">.</a></h3>
 <p>Entity type for link-route configuration.  This is used to identify remote containers that shall be destinations for routed link-attaches.  The link-routing configuration applies to an addressing space defined by a prefix.</p>
 <p>Operations allowed: <cite>CREATE</cite>, <cite>DELETE</cite>, <cite>READ</cite></p>
 <dl class="docutils">
@@ -302,8 +302,8 @@ be modified using the <cite>update</cite> operation, see the entity descriptions
 <dd>The operational status of this linkRoute: inactive - The remote container is not connected; active - the remote container is connected and ready to accept link routed attachments.</dd>
 </dl>
 </div>
-<div class="section" id="router-config-autolink">
-<h3>3.4.1.11. router.config.autoLink<a class="headerlink" href="#router-config-autolink" title="Permalink to this headline">.</a></h3>
+<div class="section" id="autolink">
+<h3>3.4.1.11. autoLink<a class="headerlink" href="#autolink" title="Permalink to this headline">.</a></h3>
 <p>Entity type for configuring auto-links.  Auto-links are links whose lifecycle is managed by the router.  These are typically used to attach to waypoints on remote containers (brokers, etc.).</p>
 <p>Operations allowed: <cite>CREATE</cite>, <cite>DELETE</cite>, <cite>READ</cite></p>
 <dl class="docutils">

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/f8a53e17/input/releases/qpid-dispatch-master/book/technical_details.html.in
----------------------------------------------------------------------
diff --git a/input/releases/qpid-dispatch-master/book/technical_details.html.in b/input/releases/qpid-dispatch-master/book/technical_details.html.in
index 27ceccc..139ea56 100644
--- a/input/releases/qpid-dispatch-master/book/technical_details.html.in
+++ b/input/releases/qpid-dispatch-master/book/technical_details.html.in
@@ -35,9 +35,9 @@
 <li class="toctree-l3"><a class="reference internal" href="schema.html#fixedaddress">3.4.1.6. fixedAddress</a></li>
 <li class="toctree-l3"><a class="reference internal" href="schema.html#waypoint">3.4.1.7. waypoint</a></li>
 <li class="toctree-l3"><a class="reference internal" href="schema.html#linkroutepattern">3.4.1.8. linkRoutePattern</a></li>
-<li class="toctree-l3"><a class="reference internal" href="schema.html#router-config-address">3.4.1.9. router.config.address</a></li>
-<li class="toctree-l3"><a class="reference internal" href="schema.html#router-config-linkroute">3.4.1.10. router.config.linkRoute</a></li>
-<li class="toctree-l3"><a class="reference internal" href="schema.html#router-config-autolink">3.4.1.11. router.config.autoLink</a></li>
+<li class="toctree-l3"><a class="reference internal" href="schema.html#address">3.4.1.9. address</a></li>
+<li class="toctree-l3"><a class="reference internal" href="schema.html#linkroute">3.4.1.10. linkRoute</a></li>
+<li class="toctree-l3"><a class="reference internal" href="schema.html#autolink">3.4.1.11. autoLink</a></li>
 <li class="toctree-l3"><a class="reference internal" href="schema.html#console">3.4.1.12. console</a></li>
 <li class="toctree-l3"><a class="reference internal" href="schema.html#policy">3.4.1.13. policy</a></li>
 <li class="toctree-l3"><a class="reference internal" href="schema.html#policyruleset">3.4.1.14. policyRuleset</a></li>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/f8a53e17/input/releases/qpid-dispatch-master/index.md
----------------------------------------------------------------------
diff --git a/input/releases/qpid-dispatch-master/index.md b/input/releases/qpid-dispatch-master/index.md
index b6b9878..aee5895 100644
--- a/input/releases/qpid-dispatch-master/index.md
+++ b/input/releases/qpid-dispatch-master/index.md
@@ -27,7 +27,7 @@ Code and documentation found here may be unstable, incorrect, or
 incomplete.  For a smoother experience, see the [current stable
 release]({{current_dispatch_release_url}}/index.html).
 
-This content was generated at 09:44  on Tuesday, 17 May 2016.
+This content was generated at 16:27  on Wednesday, 25 May 2016.
 
 </div>
 

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/f8a53e17/input/releases/qpid-dispatch-master/man/qdrouterd.conf.html.in
----------------------------------------------------------------------
diff --git a/input/releases/qpid-dispatch-master/man/qdrouterd.conf.html.in b/input/releases/qpid-dispatch-master/man/qdrouterd.conf.html.in
index c3cea2a..6e8b211 100644
--- a/input/releases/qpid-dispatch-master/man/qdrouterd.conf.html.in
+++ b/input/releases/qpid-dispatch-master/man/qdrouterd.conf.html.in
@@ -85,7 +85,7 @@ listener {
 <dt><em>password</em> (string)</dt>
 <dd>An alternative to storing the password in a file referenced by passwordFile is to supply the password right here in the configuration file.  This option can be used by supplying the password in the &#8216;password&#8217; option.  Don&#8217;t use both password and passwordFile in the same profile.</dd>
 <dt><em>uidFormat</em> (string)</dt>
-<dd>A list of x509 client certificate fields that will be used to build a string that will uniquely identify the client certificate owner. For e.g. a value of &#8216;cou&#8217; indicates that the uid will consist of c - common name concatenated with o - organization-company name concatenated with u - organization unit; or a value of &#8216;oF&#8217; indicates that the uid will consist of o (organization name) concatenated with F (the sha256 fingerprint of the entire certificate) . Allowed values can be any combination of comma separated &#8216;c&#8217;( ISO3166 two character country code), &#8216;s&#8217;(state or province), &#8216;l&#8217;(Locality; generally - city), &#8216;o&#8217;(Organization - Company Name), &#8216;u&#8217;(Organization Unit - typically certificate type or brand), &#8216;n&#8217;(CommonName - typically a user name for client certificates) and &#8216;1&#8217;(sha1 certificate fingerprint, as displayed in the fingerprints section when looking at a certificate wi
 th say a web browser is the hash of the entire certificate) and 2 (sha256 certificate fingerprint) and 5 (sha512 certificate fingerprint).</dd>
+<dd>A list of x509 client certificate fields that will be used to build a string that will uniquely identify the client certificate owner. For e.g. a value of &#8216;cou&#8217; indicates that the uid will consist of c - common name concatenated with o - organization-company name concatenated with u - organization unit; or a value of &#8216;o2&#8217; indicates that the uid will consist of o (organization name) concatenated with 2 (the sha256 fingerprint of the entire certificate) . Allowed values can be any combination of comma separated &#8216;c&#8217;( ISO3166 two character country code), &#8216;s&#8217;(state or province), &#8216;l&#8217;(Locality; generally - city), &#8216;o&#8217;(Organization - Company Name), &#8216;u&#8217;(Organization Unit - typically certificate type or brand), &#8216;n&#8217;(CommonName - typically a user name for client certificates) and &#8216;1&#8217;(sha1 certificate fingerprint, as displayed in the fingerprints section when looking at a certificate wi
 th say a web browser is the hash of the entire certificate) and 2 (sha256 certificate fingerprint) and 5 (sha512 certificate fingerprint).</dd>
 <dt><em>displayNameFile</em> (string)</dt>
 <dd>The path to the file containing the unique id to dispay name mapping</dd>
 </dl>
@@ -169,7 +169,7 @@ listener {
 <dt><em>password</em> (string)</dt>
 <dd>An alternative to storing the password in a file referenced by passwordFile is to supply the password right here in the configuration file.  This option can be used by supplying the password in the &#8216;password&#8217; option.  Don&#8217;t use both password and passwordFile in the same profile.</dd>
 <dt><em>uidFormat</em> (string)</dt>
-<dd>A list of x509 client certificate fields that will be used to build a string that will uniquely identify the client certificate owner. For e.g. a value of &#8216;cou&#8217; indicates that the uid will consist of c - common name concatenated with o - organization-company name concatenated with u - organization unit; or a value of &#8216;oF&#8217; indicates that the uid will consist of o (organization name) concatenated with F (the sha256 fingerprint of the entire certificate) . Allowed values can be any combination of comma separated &#8216;c&#8217;( ISO3166 two character country code), &#8216;s&#8217;(state or province), &#8216;l&#8217;(Locality; generally - city), &#8216;o&#8217;(Organization - Company Name), &#8216;u&#8217;(Organization Unit - typically certificate type or brand), &#8216;n&#8217;(CommonName - typically a user name for client certificates) and &#8216;1&#8217;(sha1 certificate fingerprint, as displayed in the fingerprints section when looking at a certificate wi
 th say a web browser is the hash of the entire certificate) and 2 (sha256 certificate fingerprint) and 5 (sha512 certificate fingerprint).</dd>
+<dd>A list of x509 client certificate fields that will be used to build a string that will uniquely identify the client certificate owner. For e.g. a value of &#8216;cou&#8217; indicates that the uid will consist of c - common name concatenated with o - organization-company name concatenated with u - organization unit; or a value of &#8216;o2&#8217; indicates that the uid will consist of o (organization name) concatenated with 2 (the sha256 fingerprint of the entire certificate) . Allowed values can be any combination of comma separated &#8216;c&#8217;( ISO3166 two character country code), &#8216;s&#8217;(state or province), &#8216;l&#8217;(Locality; generally - city), &#8216;o&#8217;(Organization - Company Name), &#8216;u&#8217;(Organization Unit - typically certificate type or brand), &#8216;n&#8217;(CommonName - typically a user name for client certificates) and &#8216;1&#8217;(sha1 certificate fingerprint, as displayed in the fingerprints section when looking at a certificate wi
 th say a web browser is the hash of the entire certificate) and 2 (sha256 certificate fingerprint) and 5 (sha512 certificate fingerprint).</dd>
 <dt><em>displayNameFile</em> (string)</dt>
 <dd>The path to the file containing the unique id to dispay name mapping</dd>
 <dt><em>saslMechanisms</em> (string)</dt>
@@ -226,7 +226,7 @@ listener {
 <dt><em>password</em> (string)</dt>
 <dd>An alternative to storing the password in a file referenced by passwordFile is to supply the password right here in the configuration file.  This option can be used by supplying the password in the &#8216;password&#8217; option.  Don&#8217;t use both password and passwordFile in the same profile.</dd>
 <dt><em>uidFormat</em> (string)</dt>
-<dd>A list of x509 client certificate fields that will be used to build a string that will uniquely identify the client certificate owner. For e.g. a value of &#8216;cou&#8217; indicates that the uid will consist of c - common name concatenated with o - organization-company name concatenated with u - organization unit; or a value of &#8216;oF&#8217; indicates that the uid will consist of o (organization name) concatenated with F (the sha256 fingerprint of the entire certificate) . Allowed values can be any combination of comma separated &#8216;c&#8217;( ISO3166 two character country code), &#8216;s&#8217;(state or province), &#8216;l&#8217;(Locality; generally - city), &#8216;o&#8217;(Organization - Company Name), &#8216;u&#8217;(Organization Unit - typically certificate type or brand), &#8216;n&#8217;(CommonName - typically a user name for client certificates) and &#8216;1&#8217;(sha1 certificate fingerprint, as displayed in the fingerprints section when looking at a certificate wi
 th say a web browser is the hash of the entire certificate) and 2 (sha256 certificate fingerprint) and 5 (sha512 certificate fingerprint).</dd>
+<dd>A list of x509 client certificate fields that will be used to build a string that will uniquely identify the client certificate owner. For e.g. a value of &#8216;cou&#8217; indicates that the uid will consist of c - common name concatenated with o - organization-company name concatenated with u - organization unit; or a value of &#8216;o2&#8217; indicates that the uid will consist of o (organization name) concatenated with 2 (the sha256 fingerprint of the entire certificate) . Allowed values can be any combination of comma separated &#8216;c&#8217;( ISO3166 two character country code), &#8216;s&#8217;(state or province), &#8216;l&#8217;(Locality; generally - city), &#8216;o&#8217;(Organization - Company Name), &#8216;u&#8217;(Organization Unit - typically certificate type or brand), &#8216;n&#8217;(CommonName - typically a user name for client certificates) and &#8216;1&#8217;(sha1 certificate fingerprint, as displayed in the fingerprints section when looking at a certificate wi
 th say a web browser is the hash of the entire certificate) and 2 (sha256 certificate fingerprint) and 5 (sha512 certificate fingerprint).</dd>
 <dt><em>displayNameFile</em> (string)</dt>
 <dd>The path to the file containing the unique id to dispay name mapping</dd>
 <dt><em>saslMechanisms</em> (string)</dt>
@@ -267,7 +267,7 @@ listener {
 </div>
 <div class="section" id="fixedaddress">
 <h3>fixedAddress<a class="headerlink" href="#fixedaddress" title="Permalink to this headline">.</a></h3>
-<p>(DEPRECATED) Establishes treatment for addresses starting with a prefix. This entity has been deprecated. Use router.config.address instead</p>
+<p>(DEPRECATED) Establishes treatment for addresses starting with a prefix. This entity has been deprecated. Use address instead</p>
 <dl class="docutils">
 <dt><em>prefix</em> (string, required)</dt>
 <dd>The address prefix (always starting with &#8216;/&#8217;).</dd>
@@ -281,7 +281,7 @@ listener {
 </div>
 <div class="section" id="waypoint">
 <h3>waypoint<a class="headerlink" href="#waypoint" title="Permalink to this headline">.</a></h3>
-<p>(DEPRECATED) A remote node that messages for an address pass through. This entity has been deprecated. Use router.config.autoLink instead</p>
+<p>(DEPRECATED) A remote node that messages for an address pass through. This entity has been deprecated. Use autoLink instead</p>
 <dl class="docutils">
 <dt><em>address</em> (string, required)</dt>
 <dd>The AMQP address of the waypoint.</dd>
@@ -295,7 +295,7 @@ listener {
 </div>
 <div class="section" id="linkroutepattern">
 <h3>linkRoutePattern<a class="headerlink" href="#linkroutepattern" title="Permalink to this headline">.</a></h3>
-<p>(DEPRECATED) An address pattern to match against link sources and targets to cause the router to link-route the attach across the network to a remote node. This entity has been deprecated. Use router.config.linkRoute instead</p>
+<p>(DEPRECATED) An address pattern to match against link sources and targets to cause the router to link-route the attach across the network to a remote node. This entity has been deprecated. Use linkRoute instead</p>
 <dl class="docutils">
 <dt><em>prefix</em> (string, required)</dt>
 <dd>An address prefix to match against target and source addresses.  This pattern must be of the form &#8216;&lt;text&gt;.&lt;text1&gt;.&lt;textN&gt;&#8217; or &#8216;&lt;text&gt;&#8217; or &#8216;&lt;text&gt;.&#8217; and matches any address that contains that prefix.  For example, if the prefix is set to org.apache (or org.apache.), any address that has the prefix &#8216;org.apache&#8217;  (like org.apache.dev) will match. Note that a prefix must not start with a (.), can end in a (.) and can contain zero or more dots (.).  Any characters between the dots are simply treated as part of the address</dd>
@@ -305,8 +305,8 @@ listener {
 <dd>The name of the on-demand connector used to reach the target node&#8217;s container.  If this value is not provided, it means that the target container is expected to be connected to a different router in the network.  This prevents links to a link-routable address from being misinterpreted as message-routing links when there is no route to a valid destination available.</dd>
 </dl>
 </div>
-<div class="section" id="router-config-address">
-<h3>router.config.address<a class="headerlink" href="#router-config-address" title="Permalink to this headline">.</a></h3>
+<div class="section" id="address">
+<h3>address<a class="headerlink" href="#address" title="Permalink to this headline">.</a></h3>
 <p>Entity type for address configuration.  This is used to configure the treatment of message-routed deliveries within a particular address-space.  The configuration controls distribution and address phasing.</p>
 <dl class="docutils">
 <dt><em>prefix</em> (string, required)</dt>
@@ -321,8 +321,8 @@ listener {
 <dd>Advanced - Override the egress phase for this address</dd>
 </dl>
 </div>
-<div class="section" id="router-config-linkroute">
-<h3>router.config.linkRoute<a class="headerlink" href="#router-config-linkroute" title="Permalink to this headline">.</a></h3>
+<div class="section" id="linkroute">
+<h3>linkRoute<a class="headerlink" href="#linkroute" title="Permalink to this headline">.</a></h3>
 <p>Entity type for link-route configuration.  This is used to identify remote containers that shall be destinations for routed link-attaches.  The link-routing configuration applies to an addressing space defined by a prefix.</p>
 <dl class="docutils">
 <dt><em>prefix</em> (string, required)</dt>
@@ -337,8 +337,8 @@ listener {
 <dd>The permitted direction of links: &#8216;in&#8217; means client senders; &#8216;out&#8217; means client receivers</dd>
 </dl>
 </div>
-<div class="section" id="router-config-autolink">
-<h3>router.config.autoLink<a class="headerlink" href="#router-config-autolink" title="Permalink to this headline">.</a></h3>
+<div class="section" id="autolink">
+<h3>autoLink<a class="headerlink" href="#autolink" title="Permalink to this headline">.</a></h3>
 <p>Entity type for configuring auto-links.  Auto-links are links whose lifecycle is managed by the router.  These are typically used to attach to waypoints on remote containers (brokers, etc.).</p>
 <dl class="docutils">
 <dt><em>addr</em> (string, required)</dt>


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