You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by jr...@apache.org on 2017/11/28 19:37:48 UTC
[04/13] qpid-site git commit: QPID-8015: Prepare the dispatch release
scripts for the new user guide
http://git-wip-us.apache.org/repos/asf/qpid-site/blob/030c23a6/input/releases/qpid-dispatch-master/book/console_charts.png
----------------------------------------------------------------------
diff --git a/input/releases/qpid-dispatch-master/book/console_charts.png b/input/releases/qpid-dispatch-master/book/console_charts.png
deleted file mode 100644
index 169c2ca..0000000
Binary files a/input/releases/qpid-dispatch-master/book/console_charts.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/qpid-site/blob/030c23a6/input/releases/qpid-dispatch-master/book/console_entity.png
----------------------------------------------------------------------
diff --git a/input/releases/qpid-dispatch-master/book/console_entity.png b/input/releases/qpid-dispatch-master/book/console_entity.png
deleted file mode 100644
index 130c7e7..0000000
Binary files a/input/releases/qpid-dispatch-master/book/console_entity.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/qpid-site/blob/030c23a6/input/releases/qpid-dispatch-master/book/console_login.png
----------------------------------------------------------------------
diff --git a/input/releases/qpid-dispatch-master/book/console_login.png b/input/releases/qpid-dispatch-master/book/console_login.png
deleted file mode 100644
index 63e22c6..0000000
Binary files a/input/releases/qpid-dispatch-master/book/console_login.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/qpid-site/blob/030c23a6/input/releases/qpid-dispatch-master/book/console_overview.png
----------------------------------------------------------------------
diff --git a/input/releases/qpid-dispatch-master/book/console_overview.png b/input/releases/qpid-dispatch-master/book/console_overview.png
deleted file mode 100644
index af25f36..0000000
Binary files a/input/releases/qpid-dispatch-master/book/console_overview.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/qpid-site/blob/030c23a6/input/releases/qpid-dispatch-master/book/console_schema.png
----------------------------------------------------------------------
diff --git a/input/releases/qpid-dispatch-master/book/console_schema.png b/input/releases/qpid-dispatch-master/book/console_schema.png
deleted file mode 100644
index ba56c7b..0000000
Binary files a/input/releases/qpid-dispatch-master/book/console_schema.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/qpid-site/blob/030c23a6/input/releases/qpid-dispatch-master/book/console_topology.png
----------------------------------------------------------------------
diff --git a/input/releases/qpid-dispatch-master/book/console_topology.png b/input/releases/qpid-dispatch-master/book/console_topology.png
deleted file mode 100644
index ae4b22a..0000000
Binary files a/input/releases/qpid-dispatch-master/book/console_topology.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/qpid-site/blob/030c23a6/input/releases/qpid-dispatch-master/console1.png
----------------------------------------------------------------------
diff --git a/input/releases/qpid-dispatch-master/console1.png b/input/releases/qpid-dispatch-master/console1.png
deleted file mode 100644
index f131884..0000000
Binary files a/input/releases/qpid-dispatch-master/console1.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/qpid-site/blob/030c23a6/input/releases/qpid-dispatch-master/console_charts.png
----------------------------------------------------------------------
diff --git a/input/releases/qpid-dispatch-master/console_charts.png b/input/releases/qpid-dispatch-master/console_charts.png
deleted file mode 100644
index 169c2ca..0000000
Binary files a/input/releases/qpid-dispatch-master/console_charts.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/qpid-site/blob/030c23a6/input/releases/qpid-dispatch-master/console_entity.png
----------------------------------------------------------------------
diff --git a/input/releases/qpid-dispatch-master/console_entity.png b/input/releases/qpid-dispatch-master/console_entity.png
deleted file mode 100644
index 130c7e7..0000000
Binary files a/input/releases/qpid-dispatch-master/console_entity.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/qpid-site/blob/030c23a6/input/releases/qpid-dispatch-master/console_login.png
----------------------------------------------------------------------
diff --git a/input/releases/qpid-dispatch-master/console_login.png b/input/releases/qpid-dispatch-master/console_login.png
deleted file mode 100644
index 63e22c6..0000000
Binary files a/input/releases/qpid-dispatch-master/console_login.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/qpid-site/blob/030c23a6/input/releases/qpid-dispatch-master/console_overview.png
----------------------------------------------------------------------
diff --git a/input/releases/qpid-dispatch-master/console_overview.png b/input/releases/qpid-dispatch-master/console_overview.png
deleted file mode 100644
index af25f36..0000000
Binary files a/input/releases/qpid-dispatch-master/console_overview.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/qpid-site/blob/030c23a6/input/releases/qpid-dispatch-master/console_schema.png
----------------------------------------------------------------------
diff --git a/input/releases/qpid-dispatch-master/console_schema.png b/input/releases/qpid-dispatch-master/console_schema.png
deleted file mode 100644
index ba56c7b..0000000
Binary files a/input/releases/qpid-dispatch-master/console_schema.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/qpid-site/blob/030c23a6/input/releases/qpid-dispatch-master/console_topology.png
----------------------------------------------------------------------
diff --git a/input/releases/qpid-dispatch-master/console_topology.png b/input/releases/qpid-dispatch-master/console_topology.png
deleted file mode 100644
index ae4b22a..0000000
Binary files a/input/releases/qpid-dispatch-master/console_topology.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/qpid-site/blob/030c23a6/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 dc25335..321aa48 100644
--- a/input/releases/qpid-dispatch-master/index.md
+++ b/input/releases/qpid-dispatch-master/index.md
@@ -27,7 +27,7 @@ Documentation found here may be incorrect or incomplete. For a
smoother experience, see the [current stable
release]({{current_dispatch_release_url}}/index.html).
-This content was generated at 15:51 on Tuesday, 02 May 2017.
+This content was generated at 11:21 on Tuesday, 28 November 2017.
</div>
@@ -36,8 +36,9 @@ This content was generated at 15:51 on Tuesday, 02 May 2017.
<div class="two-column" markdown="1">
- - [Installing Qpid Dispatch](https://git-wip-us.apache.org/repos/asf?p=qpid-dispatch.git;a=blob_plain;f=README;hb=master)
- - [Dispatch Router User Guide](book/book.html)
+ - [Using Qpid Dispatch](user-guide/index.html)
+ - [Installing Qpid Dispatch from
+ source](https://git-wip-us.apache.org/repos/asf?p=qpid-dispatch.git;a=blob_plain;f=README;hb=master)
- [qdrouterd](man/qdrouterd.html) - Router daemon
- [qdrouterd.conf](man/qdrouterd.conf.html) - Daemon configuration
- [qdstat](man/qdstat.html) - Get router statistics
http://git-wip-us.apache.org/repos/asf/qpid-site/blob/030c23a6/input/releases/qpid-dispatch-master/man/qdmanage.html.in
----------------------------------------------------------------------
diff --git a/input/releases/qpid-dispatch-master/man/qdmanage.html.in b/input/releases/qpid-dispatch-master/man/qdmanage.html.in
index 384c8f7..46750fb 100644
--- a/input/releases/qpid-dispatch-master/man/qdmanage.html.in
+++ b/input/releases/qpid-dispatch-master/man/qdmanage.html.in
@@ -7,10 +7,11 @@
<div class="sect1">
<h2 id="_description">DESCRIPTION</h2>
<div class="sectionbody">
-<div class="paragraph"><p>An AMQP management client for use with qdrouterd. Sends AMQP management
-operations requests and prints the response in JSON format. This is a
-generic AMQP management tool and can be used with any standard AMQP
-managed endpoint, not just with qdrouter.</p></div>
+<div class="paragraph"><p>An AMQP management client for use with the Dispatch router daemon
+(<em>qdrouterd</em>). Sends AMQP management operations requests and prints
+the response in JSON format. This is a generic AMQP management tool
+and can be used with any standard AMQP managed endpoint, not just
+with <em>qdrouterd</em>.</p></div>
</div>
</div>
<div class="sect1">
@@ -27,17 +28,17 @@ managed endpoint, not just with qdrouter.</p></div>
<div class="paragraph"><p>--identity=ID
: Identity of entity to operate on.</p></div>
<div class="paragraph"><p>--indent=INDENT
-: Pretty-printing indent. -1 means don’t pretty-print</p></div>
+: Pretty-printing indent. -1 means don’t pretty-print (default 2)</p></div>
<div class="paragraph"><p>--stdin
-: Read attributes as JSON map or list of maps from</p></div>
+: Read attributes as JSON map or list of maps from stdin.</p></div>
<div class="paragraph"><p>--body=BODY
-: JSON value to use as body of a non-standard operation</p></div>
+: JSON value to use as body of a non-standard operation call.</p></div>
<div class="paragraph"><p>--properties=PROPERTIES
: JSON map to use as properties for a non-standard operation call.</p></div>
<div class="sect2">
<h3 id="_connection_options">Connection Options</h3>
<div class="paragraph"><p>-b URL, --bus=URL
-: URL of the messaging bus to connect to (default</p></div>
+: URL of the messaging bus to connect to (default 0.0.0.0)</p></div>
<div class="paragraph"><p>-r ROUTER-ID, --router=ROUTER-ID
: Router to be queried</p></div>
<div class="paragraph"><p>-t SECS, --timeout=SECS
@@ -96,7 +97,7 @@ managed endpoint, not just with qdrouter.</p></div>
</dt>
<dd>
<p>
- Print all the attributes of a single entity, specified by the --name or
+ Print all of the attributes of a single entity, specified by the --name or
--identity options.
</p>
</dd>
@@ -124,7 +125,7 @@ managed endpoint, not just with qdrouter.</p></div>
</dt>
<dd>
<p>
- List entity types with their base types. With no arguments list all
+ List entity types with their base types. With no arguments, list all
types.
</p>
</dd>
@@ -133,7 +134,7 @@ managed endpoint, not just with qdrouter.</p></div>
</dt>
<dd>
<p>
- List entity types with their operations. With no arguments list all
+ List entity types with their operations. With no arguments, list all
types.
</p>
</dd>
@@ -142,7 +143,7 @@ managed endpoint, not just with qdrouter.</p></div>
</dt>
<dd>
<p>
- List entity types with their attributes. With no arguments list all
+ List entity types with their attributes. With no arguments, list all
types.
</p>
</dd>
@@ -151,7 +152,7 @@ managed endpoint, not just with qdrouter.</p></div>
</dt>
<dd>
<p>
- List entity types with their annotations. With no arguments list all
+ List entity types with their annotations. With no arguments, list all
types.
</p>
</dd>
@@ -192,7 +193,7 @@ managed endpoint, not just with qdrouter.</p></div>
</dt>
<dd>
<p>
- Management schema for qdrouterd.
+ Management schema for <em>qdrouterd</em>.
</p>
</dd>
<dt class="hdlist1">
@@ -210,7 +211,7 @@ managed endpoint, not just with qdrouter.</p></div>
<h2 id="_examples">EXAMPLES</h2>
<div class="sectionbody">
<div class="listingblock">
-<div class="title">Show the logging configuration</div>
+<div class="title">Show the logging configuration:</div>
<div class="content">
<pre><code>qdmanage query --type=log</code></pre>
</div></div>
@@ -220,17 +221,17 @@ managed endpoint, not just with qdrouter.</p></div>
<pre><code>qdmanage update name=log/DEFAULT enable=debug+</code></pre>
</div></div>
<div class="listingblock">
-<div class="title">Enable trace log messages only for the MESSAGE module and direct MESSAGE logs to the file "test.log"</div>
+<div class="title">Enable trace log messages only for the MESSAGE module, and direct MESSAGE logs to the file <em>test.log</em>:</div>
<div class="content">
<pre><code>qdmanage update name=log/MESSAGE enable=trace output=test.log</code></pre>
</div></div>
<div class="listingblock">
-<div class="title">Set MESSAGE logging back to the default</div>
+<div class="title">Set MESSAGE logging back to the default:</div>
<div class="content">
<pre><code>qdmanage update name=log/MESSAGE enable=default</code></pre>
</div></div>
<div class="listingblock">
-<div class="title">Disable MESSAGE logging</div>
+<div class="title">Disable MESSAGE logging:</div>
<div class="content">
<pre><code>qdmanage update name=log/MESSAGE enable=none</code></pre>
</div></div>
http://git-wip-us.apache.org/repos/asf/qpid-site/blob/030c23a6/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 81d39c8..fd6853a 100644
--- a/input/releases/qpid-dispatch-master/man/qdrouterd.conf.html.in
+++ b/input/releases/qpid-dispatch-master/man/qdrouterd.conf.html.in
@@ -80,7 +80,7 @@ listener {
</dt>
<dd>
<p>
- Router’s unique identity. One of id or routerId is required. The router will fail to start without id or routerId
+ Router’s unique identity. The router will fail to start without id.
</p>
</dd>
<dt class="hdlist1">
@@ -172,19 +172,11 @@ listener {
</p>
</dd>
<dt class="hdlist1">
-<em>routerId</em> (string)
+<em>defaultDistribution</em> (One of [<em>multicast</em>, <em>closest</em>, <em>balanced</em>, <em>unavailable</em>], default=<em>balanced</em>)
</dt>
<dd>
<p>
- (DEPRECATED) Router’s unique identity. This attribute has been deprecated. Use id instead
-</p>
-</dd>
-<dt class="hdlist1">
-<em>mobileAddrMaxAge</em> (integer, default=<em>60</em>)
-</dt>
-<dd>
-<p>
- (DEPRECATED) This value is no longer used in the router.
+ Default forwarding treatment for any address without a specified treatment. multicast - one copy of each message delivered to all subscribers; closest - messages delivered to only the closest subscriber; balanced - messages delivered to one subscriber with load balanced across subscribers; unavailable - this address is unavailable, link attaches to an address of unavilable distribution will be rejected.
</p>
</dd>
</dl></div>
@@ -194,6 +186,14 @@ listener {
<div class="paragraph"><p>Attributes for setting TLS/SSL configuration for connections.</p></div>
<div class="dlist"><dl>
<dt class="hdlist1">
+<em>ciphers</em> (string)
+</dt>
+<dd>
+<p>
+ Specifies the enabled ciphers so the SSL Ciphers can be hardened. In other words, use this field to disable weak ciphers. The ciphers are specified in the format understood by the OpenSSL library. For example, ciphers can be set to ALL:!aNULL:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP; — The full list of allowed ciphers can be viewed using the openssl ciphers command
+</p>
+</dd>
+<dt class="hdlist1">
<em>certDb</em> (path)
</dt>
<dd>
@@ -252,6 +252,36 @@ listener {
</dl></div>
</div>
<div class="sect2">
+<h3 id="_authserviceplugin">authServicePlugin</h3>
+<div class="paragraph"><p>EXPERIMENTAL. Attributes for setting SASL plugin.</p></div>
+<div class="dlist"><dl>
+<dt class="hdlist1">
+<em>authService</em> (string, required)
+</dt>
+<dd>
+<p>
+ Address of a service to delegate authentication to.
+</p>
+</dd>
+<dt class="hdlist1">
+<em>saslInitHostname</em> (string)
+</dt>
+<dd>
+<p>
+ Value to set for hostname field on sasl-init
+</p>
+</dd>
+<dt class="hdlist1">
+<em>authSslProfile</em> (string)
+</dt>
+<dd>
+<p>
+ Name of the sslProfile to use for the authentication service.
+</p>
+</dd>
+</dl></div>
+</div>
+<div class="sect2">
<h3 id="_listener">listener</h3>
<div class="paragraph"><p>Listens for incoming connections to the router.</p></div>
<div class="dlist"><dl>
@@ -280,11 +310,11 @@ listener {
</p>
</dd>
<dt class="hdlist1">
-<em>role</em> (One of [<em>normal</em>, <em>inter-router</em>, <em>route-container</em>, <em>on-demand</em>], default=<em>normal</em>)
+<em>role</em> (One of [<em>normal</em>, <em>inter-router</em>, <em>route-container</em>], default=<em>normal</em>)
</dt>
<dd>
<p>
- The role of an established connection. In the normal role, the connection is assumed to be used for AMQP clients that are doing normal message delivery over the connection. In the inter-router role, the connection is assumed to be to another router in the network. Inter-router discovery and routing protocols can only be used over inter-router connections. route-container role can be used for router-container connections, for example, a router-broker connection. on-demand role has been deprecated.
+ The role of an established connection. In the normal role, the connection is assumed to be used for AMQP clients that are doing normal message delivery over the connection. In the inter-router role, the connection is assumed to be to another router in the network. Inter-router discovery and routing protocols can only be used over inter-router connections. route-container role can be used for router-container connections, for example, a router-broker connection.
</p>
</dd>
<dt class="hdlist1">
@@ -320,6 +350,14 @@ listener {
</p>
</dd>
<dt class="hdlist1">
+<em>saslPlugin</em> (string)
+</dt>
+<dd>
+<p>
+ EXPERIMENTAL. Name of the a sasl plugin configuration section to use for this listener (e.g. authServicePlugin).
+</p>
+</dd>
+<dt class="hdlist1">
<em>requireEncryption</em> (boolean)
</dt>
<dd>
@@ -376,6 +414,14 @@ listener {
</p>
</dd>
<dt class="hdlist1">
+<em>initialHandshakeTimeoutSeconds</em> (integer)
+</dt>
+<dd>
+<p>
+ The timeout, in seconds, for the initial handshake for connections coming in through listeners. If the time interval expires before the peer sends the AMQP OPEN frame, the connection shall be closed. A value of zero (the default) disables this timeout.
+</p>
+</dd>
+<dt class="hdlist1">
<em>stripAnnotations</em> (One of [<em>in</em>, <em>out</em>, <em>both</em>, <em>no</em>], default=<em>both</em>)
</dt>
<dd>
@@ -408,43 +454,11 @@ listener {
</p>
</dd>
<dt class="hdlist1">
-<em>addr</em> (string, default=<em>127.0.0.1</em>)
-</dt>
-<dd>
-<p>
- (DEPRECATED)IP address: ipv4 or ipv6 literal or a host name. This attribute has been deprecated. Use host instead
-</p>
-</dd>
-<dt class="hdlist1">
-<em>allowNoSasl</em> (boolean)
-</dt>
-<dd>
-<p>
- (DEPRECATED) This attribute is now controlled by the authenticatePeer attribute.
-</p>
-</dd>
-<dt class="hdlist1">
-<em>requirePeerAuth</em> (boolean)
-</dt>
-<dd>
-<p>
- (DEPRECATED) This attribute is now controlled by the authenticatePeer attribute.
-</p>
-</dd>
-<dt class="hdlist1">
-<em>allowUnsecured</em> (boolean)
-</dt>
-<dd>
-<p>
- (DEPRECATED) This attribute is now controlled by the requireEncryption attribute.
-</p>
-</dd>
-<dt class="hdlist1">
<em>http</em> (boolean)
</dt>
<dd>
<p>
- Accept HTTP connections that can upgrade to AMQP over WebSocket
+ Accept HTTP connections that can upgrade to AMQP over WebSocket. Plain AMQP connections are not accepted on this listener.
</p>
</dd>
<dt class="hdlist1">
@@ -494,11 +508,11 @@ listener {
</p>
</dd>
<dt class="hdlist1">
-<em>role</em> (One of [<em>normal</em>, <em>inter-router</em>, <em>route-container</em>, <em>on-demand</em>], default=<em>normal</em>)
+<em>role</em> (One of [<em>normal</em>, <em>inter-router</em>, <em>route-container</em>], default=<em>normal</em>)
</dt>
<dd>
<p>
- The role of an established connection. In the normal role, the connection is assumed to be used for AMQP clients that are doing normal message delivery over the connection. In the inter-router role, the connection is assumed to be to another router in the network. Inter-router discovery and routing protocols can only be used over inter-router connections. route-container role can be used for router-container connections, for example, a router-broker connection. on-demand role has been deprecated.
+ The role of an established connection. In the normal role, the connection is assumed to be used for AMQP clients that are doing normal message delivery over the connection. In the inter-router role, the connection is assumed to be to another router in the network. Inter-router discovery and routing protocols can only be used over inter-router connections. route-container role can be used for router-container connections, for example, a router-broker connection.
</p>
</dd>
<dt class="hdlist1">
@@ -606,19 +620,11 @@ listener {
</p>
</dd>
<dt class="hdlist1">
-<em>addr</em> (string, default=<em>127.0.0.1</em>)
-</dt>
-<dd>
-<p>
- (DEPRECATED)IP address: ipv4 or ipv6 literal or a host name. This attribute has been deprecated. Use host instead
-</p>
-</dd>
-<dt class="hdlist1">
<em>logMessage</em> (string, default=<em>none</em>)
</dt>
<dd>
<p>
- A comma separated list that indicates which components of the message should be logged. Defaults to <em>none</em> (log nothing). If you want all properties and application properties of the message logged use <em>all</em>. Specific components of the message can be logged by indicating the components via a comma separated list. The components are message-id, user-id, to, subject, reply-to, correlation-id, content-type, content-encoding, absolute-expiry-time, creation-time, group-id, group-sequence, reply-to-group-id, app-properties. The application-data part of the bare message will not be logged. No spaces are allowed
+ A comma separated list that indicates which components of the message should be logged (no spaces allowed between list components). Defaults to <em>none</em> (log nothing). If you want all properties and application properties of the message logged use <em>all</em>. Specific components of the message can be logged by indicating the components via a comma separated list. The components are message-id, user-id, to, subject, reply-to, correlation-id, content-type, content-encoding, absolute-expiry-time, creation-time, group-id, group-sequence, reply-to-group-id, app-properties. The application-data part of the bare message will not be logged. This log message is written to the MESSAGE logging module. In the <em>log</em> entity, set <em>module</em> property to MESSAGE or DEFAULT and <em>enable</em> to trace+ to see this log message
</p>
</dd>
</dl></div>
@@ -674,15 +680,23 @@ listener {
<div class="paragraph"><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></div>
<div class="dlist"><dl>
<dt class="hdlist1">
-<em>prefix</em> (string, required)
+<em>prefix</em> (string)
+</dt>
+<dd>
+<p>
+ The address prefix for the configured settings. Cannot be used with a pattern attribute.
+</p>
+</dd>
+<dt class="hdlist1">
+<em>pattern</em> (string)
</dt>
<dd>
<p>
- The address prefix for the configured settings
+ A wildcarded pattern for address matching. Incoming addresses are matched against this pattern. Matching addresses use the configured settings. The pattern consists of one or more tokens separated by a forward slash <em>/</em>. A token can be one of the following: a * character, a # character, or a sequence of characters that do not include /, *, or #. The * token matches any single token. The # token matches zero or more tokens. * has higher precedence than #, and exact match has the highest precedence. Cannot be used with a prefix attribute.
</p>
</dd>
<dt class="hdlist1">
-<em>distribution</em> (One of [<em>multicast</em>, <em>closest</em>, <em>balanced</em>], default=<em>balanced</em>)
+<em>distribution</em> (One of [<em>multicast</em>, <em>closest</em>, <em>balanced</em>, <em>unavailable</em>], default=<em>balanced</em>)
</dt>
<dd>
<p>
@@ -717,14 +731,22 @@ listener {
</div>
<div class="sect2">
<h3 id="_linkroute">linkRoute</h3>
-<div class="paragraph"><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></div>
+<div class="paragraph"><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 or a pattern.</p></div>
<div class="dlist"><dl>
<dt class="hdlist1">
-<em>prefix</em> (string, required)
+<em>prefix</em> (string)
</dt>
<dd>
<p>
- The address prefix for the configured settings
+ The address prefix for the configured settings. Cannot be used with the pattern attribute.
+</p>
+</dd>
+<dt class="hdlist1">
+<em>pattern</em> (string)
+</dt>
+<dd>
+<p>
+ A wildcarded pattern for address matching. Link addresses are matched against this pattern. Matching addresses use the configured settings. The pattern consists of one or more tokens separated by a forward slash <em>/</em>. A token can be one of the following: a * character, a # character, or a sequence of characters that do not include /, *, or #. The * token matches any single token. The # token matches zero or more tokens. * has higher precedence than #, and exact match has the highest precedence. Cannot be used with the prefix attribute.
</p>
</dd>
<dt class="hdlist1">
@@ -817,7 +839,7 @@ listener {
</div>
<div class="sect2">
<h3 id="_console">console</h3>
-<div class="paragraph"><p>Start a websocket/tcp proxy and http file server to serve the web console</p></div>
+<div class="paragraph"><p>(DEPRECATED) Start a websocket/tcp proxy and http file server to serve the web console</p></div>
<div class="dlist"><dl>
<dt class="hdlist1">
<em>listener</em> (string)
@@ -836,7 +858,7 @@ listener {
</p>
</dd>
<dt class="hdlist1">
-<em>proxy</em> (string)
+<em>proxy</em> (string, required)
</dt>
<dd>
<p>
@@ -844,7 +866,7 @@ listener {
</p>
</dd>
<dt class="hdlist1">
-<em>home</em> (string)
+<em>home</em> (string, required)
</dt>
<dd>
<p>
@@ -953,158 +975,6 @@ listener {
</dd>
</dl></div>
</div>
-<div class="sect2">
-<h3 id="_container">container</h3>
-<div class="paragraph"><p>(DEPRECATED)Attributes related to the AMQP container. This entity has been deprecated. Use the router entity instead.</p></div>
-<div class="dlist"><dl>
-<dt class="hdlist1">
-<em>containerName</em> (string)
-</dt>
-<dd>
-<p>
- The name of the AMQP container. If not specified, the container name will be set to a value of the container’s choosing. The automatically assigned container name is not guaranteed to be persistent across restarts of the container.
-</p>
-</dd>
-<dt class="hdlist1">
-<em>workerThreads</em> (integer, default=<em>4</em>)
-</dt>
-<dd>
-<p>
- The number of threads that will be created to process message traffic and other application work (timers, non-amqp file descriptors, etc.) .
-</p>
-</dd>
-<dt class="hdlist1">
-<em>debugDump</em> (path)
-</dt>
-<dd>
-<p>
- A file to dump debugging information that can’t be logged normally.
-</p>
-</dd>
-<dt class="hdlist1">
-<em>saslConfigPath</em> (path)
-</dt>
-<dd>
-<p>
- Absolute path to the SASL configuration file.
-</p>
-</dd>
-<dt class="hdlist1">
-<em>saslConfigName</em> (string)
-</dt>
-<dd>
-<p>
- Name of the SASL configuration. This string + <em>.conf</em> is the name of the configuration file.
-</p>
-</dd>
-</dl></div>
-</div>
-<div class="sect2">
-<h3 id="_waypoint">waypoint</h3>
-<div class="paragraph"><p>(DEPRECATED) A remote node that messages for an address pass through. This entity has been deprecated. Use autoLink instead</p></div>
-<div class="dlist"><dl>
-<dt class="hdlist1">
-<em>address</em> (string, required)
-</dt>
-<dd>
-<p>
- The AMQP address of the waypoint.
-</p>
-</dd>
-<dt class="hdlist1">
-<em>connector</em> (string, required)
-</dt>
-<dd>
-<p>
- The name of the on-demand connector used to reach the waypoint’s container.
-</p>
-</dd>
-<dt class="hdlist1">
-<em>inPhase</em> (integer, default=<em>-1</em>)
-</dt>
-<dd>
-<p>
- The phase of the address as it is routed <em>to</em> the waypoint.
-</p>
-</dd>
-<dt class="hdlist1">
-<em>outPhase</em> (integer, default=<em>-1</em>)
-</dt>
-<dd>
-<p>
- The phase of the address as it is routed <em>from</em> the waypoint.
-</p>
-</dd>
-</dl></div>
-</div>
-<div class="sect2">
-<h3 id="_fixedaddress">fixedAddress</h3>
-<div class="paragraph"><p>(DEPRECATED) Establishes treatment for addresses starting with a prefix. This entity has been deprecated. Use address instead</p></div>
-<div class="dlist"><dl>
-<dt class="hdlist1">
-<em>prefix</em> (string, required)
-</dt>
-<dd>
-<p>
- The address prefix (always starting with <em>/</em>).
-</p>
-</dd>
-<dt class="hdlist1">
-<em>phase</em> (integer)
-</dt>
-<dd>
-<p>
- The phase of a multi-hop address passing through one or more waypoints.
-</p>
-</dd>
-<dt class="hdlist1">
-<em>fanout</em> (One of [<em>multiple</em>, <em>single</em>], default=<em>multiple</em>)
-</dt>
-<dd>
-<p>
- One of <em>multiple</em> or <em>single</em>. Multiple fanout is a non-competing pattern. If there are multiple consumers using the same address, each consumer will receive its own copy of every message sent to the address. Single fanout is a competing pattern where each message is sent to only one consumer.
-</p>
-</dd>
-<dt class="hdlist1">
-<em>bias</em> (One of [<em>closest</em>, <em>spread</em>], default=<em>closest</em>)
-</dt>
-<dd>
-<p>
- Only if fanout is single. One of <em>closest</em> or <em>spread</em>. Closest bias means that messages to an address will always be delivered to the closest (lowest cost) subscribed consumer. Spread bias will distribute the messages across subscribers in an approximately even manner.
-</p>
-</dd>
-</dl></div>
-</div>
-<div class="sect2">
-<h3 id="_linkroutepattern">linkRoutePattern</h3>
-<div class="paragraph"><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></div>
-<div class="dlist"><dl>
-<dt class="hdlist1">
-<em>prefix</em> (string, required)
-</dt>
-<dd>
-<p>
- An address prefix to match against target and source addresses. This pattern must be of the form <em><text>.<text1>.<textN></em> or <em><text></em> or <em><text>.</em> 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 <em>org.apache</em> (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
-</p>
-</dd>
-<dt class="hdlist1">
-<em>dir</em> (One of [<em>in</em>, <em>out</em>, <em>both</em>], default=<em>both</em>)
-</dt>
-<dd>
-<p>
- Link direction for match: <em>in</em> matches only links inbound to the client; <em>out</em> matches only links outbound from the client; <em>both</em> matches any link.
-</p>
-</dd>
-<dt class="hdlist1">
-<em>connector</em> (string)
-</dt>
-<dd>
-<p>
- The name of the on-demand connector used to reach the target node’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.
-</p>
-</dd>
-</dl></div>
-</div>
</div>
</div>
<div class="sect1">
http://git-wip-us.apache.org/repos/asf/qpid-site/blob/030c23a6/input/releases/qpid-dispatch-master/man/qdrouterd.html.in
----------------------------------------------------------------------
diff --git a/input/releases/qpid-dispatch-master/man/qdrouterd.html.in b/input/releases/qpid-dispatch-master/man/qdrouterd.html.in
index 0b85b2e..366c7e3 100644
--- a/input/releases/qpid-dispatch-master/man/qdrouterd.html.in
+++ b/input/releases/qpid-dispatch-master/man/qdrouterd.html.in
@@ -7,7 +7,7 @@
<div class="sect1">
<h2 id="_description">DESCRIPTION</h2>
<div class="sectionbody">
-<div class="paragraph"><p>The Qpid Dispatch router (qdrouterd) is a network daemon that directs
+<div class="paragraph"><p>The Qpid Dispatch router (<em>qdrouterd</em>) is a network daemon that directs
AMQP 1.0 messages between endpoints, such as messaging clients and
servers.</p></div>
</div>
@@ -40,7 +40,7 @@ servers.</p></div>
</dt>
<dd>
<p>
- Configuration flie.
+ Configuration file.
</p>
</dd>
</dl></div>
http://git-wip-us.apache.org/repos/asf/qpid-site/blob/030c23a6/input/releases/qpid-dispatch-master/man/qdstat.html.in
----------------------------------------------------------------------
diff --git a/input/releases/qpid-dispatch-master/man/qdstat.html.in b/input/releases/qpid-dispatch-master/man/qdstat.html.in
index 81f209e..2d15ae9 100644
--- a/input/releases/qpid-dispatch-master/man/qdstat.html.in
+++ b/input/releases/qpid-dispatch-master/man/qdstat.html.in
@@ -7,8 +7,7 @@
<div class="sect1">
<h2 id="_description">DESCRIPTION</h2>
<div class="sectionbody">
-<div class="paragraph"><p>Shows status information about networks of Dispatch routers. It can display
-connections, network nodes and links, and router stats such as memory use.</p></div>
+<div class="paragraph"><p>An AMQP monitoring tool that shows status information about networks of Dispatch routers. It can display connections, network nodes and links, and router stats such as memory use.</p></div>
</div>
</div>
<div class="sect1">
@@ -43,7 +42,7 @@ connections, network nodes and links, and router stats such as memory use.</p></
<div class="sect2">
<h3 id="_connection_options">Connection Options</h3>
<div class="paragraph"><p>-b URL, --bus=URL
-: URL of the messaging bus to connect to (default</p></div>
+: URL of the messaging bus to connect to (default 0.0.0.0)</p></div>
<div class="paragraph"><p>-r ROUTER-ID, --router=ROUTER-ID
: Router to be queried</p></div>
<div class="paragraph"><p>-t SECS, --timeout=SECS
@@ -82,7 +81,7 @@ id
</dt>
<dd>
<p>
-Unique connection identifier
+The connection’s unique identifier.
</p>
</dd>
<dt class="hdlist1">
@@ -90,7 +89,7 @@ host
</dt>
<dd>
<p>
-The hostname or internet address of the remotely connected AMQP container
+The hostname or internet address of the remotely-connected AMQP container.
</p>
</dd>
<dt class="hdlist1">
@@ -98,7 +97,7 @@ container
</dt>
<dd>
<p>
-The container-name of the remotely connected AMQP container
+The container name of the remotely-connected AMQP container.
</p>
</dd>
<dt class="hdlist1">
@@ -106,22 +105,22 @@ role
</dt>
<dd>
<p>
-The configured role of the connection
+The connection’s role:
</p>
<div class="ulist"><ul>
<li>
<p>
-normal - Normal connections from client to router
+<em>normal</em> - The normal connection from a client to a router.
</p>
</li>
<li>
<p>
-inter-router - Connection between routers to form a network
+<em>inter-router</em> - The connection between routers to form a network.
</p>
</li>
<li>
<p>
-route-container - Connection to/from a Broker or other host to receive link-routes and waypoints
+<em>route-container</em> - The connection to or from a broker or other host to receive link routes and waypoints.
</p>
</li>
</ul></div>
@@ -131,17 +130,17 @@ dir
</dt>
<dd>
<p>
-The direction of connection establishment
+The direction in which the connection was established:
</p>
<div class="ulist"><ul>
<li>
<p>
-in - The connection was initiated by the remote container
+<em>in</em> - The connection was initiated by the remote container.
</p>
</li>
<li>
<p>
-out - The connection was initiated by this router
+<em>out</em> - The connection was initiated by this router.
</p>
</li>
</ul></div>
@@ -151,8 +150,7 @@ security
</dt>
<dd>
<p>
-A description of the security/encryption in effect for this
-connection
+The security or encryption method, if any, used for this connection.
</p>
</dd>
<dt class="hdlist1">
@@ -160,8 +158,7 @@ authentication
</dt>
<dd>
<p>
-The method and user-id of the authenticated user for
-this connection
+The authentication method and user ID of the connection’s authenticated user.
</p>
</dd>
</dl></div>
@@ -174,22 +171,22 @@ type
</dt>
<dd>
<p>
-Type of link
+The type of link:
</p>
<div class="ulist"><ul>
<li>
<p>
-router-control - An inter-router link that is reserved for control messages exchanged between routers
+<em>router-control</em> - An inter-router link that is reserved for control messages exchanged between routers.
</p>
</li>
<li>
<p>
-inter-router - An inter-router link that is used for normal message-routed deliveries
+<em>inter-router</em> - An inter-router link that is used for normal message-routed deliveries.
</p>
</li>
<li>
<p>
-endpoint - A normal link to an external endpoint container
+<em>endpoint</em> - A normal link to an external endpoint container.
</p>
</li>
</ul></div>
@@ -199,17 +196,17 @@ dir
</dt>
<dd>
<p>
-The direction of message flow on the link
+The direction that messages flow on the link:
</p>
<div class="ulist"><ul>
<li>
<p>
-in - Deliveries flow inbound to the router
+<em>in</em> - Deliveries flow inbound to the router.
</p>
</li>
<li>
<p>
-out - Deliveries flow outbound from the router
+<em>out</em> - Deliveries flow outbound from the router.
</p>
</li>
</ul></div>
@@ -219,8 +216,8 @@ conn id
</dt>
<dd>
<p>
-Unique identifier of the connection over which this link is
-attached
+The unique identifier of the connection over which this link is
+attached.
</p>
</dd>
<dt class="hdlist1">
@@ -228,7 +225,7 @@ id
</dt>
<dd>
<p>
-Unique identifier of this link
+The unique identifier of this link.
</p>
</dd>
<dt class="hdlist1">
@@ -237,7 +234,7 @@ peer
<dd>
<p>
For link-routed links, the unique identifier of the peer link. In
-link routing, an inbound link is paired with an outbound link
+link routing, an inbound link is paired with an outbound link.
</p>
</dd>
<dt class="hdlist1">
@@ -245,15 +242,47 @@ class
</dt>
<dd>
<p>
-Class of the address bound to the link
+The class of the address bound to the link:
</p>
+<div class="ulist"><ul>
+<li>
+<p>
+<em>local</em> - The address that is local to this router (temporary).
+</p>
+</li>
+<li>
+<p>
+<em>topo</em> - A topological address used for router control messages.
+</p>
+</li>
+<li>
+<p>
+<em>router</em> - A summary router address used to route messages to a remote router’s local addresses.
+</p>
+</li>
+<li>
+<p>
+<em>mobile</em> - A mobile address for an attached consumer or producer.
+</p>
+</li>
+<li>
+<p>
+<em>link-in</em> - The address match for incoming routed links.
+</p>
+</li>
+<li>
+<p>
+<em>link-out</em> - The address match for outgoing routed links.
+</p>
+</li>
+</ul></div>
</dd>
<dt class="hdlist1">
addr
</dt>
<dd>
<p>
-The address bound to the link
+The address bound to the link.
</p>
</dd>
<dt class="hdlist1">
@@ -261,7 +290,7 @@ phs
</dt>
<dd>
<p>
-The phase of the address bound to the link
+The phase of the address bound to the link.
</p>
</dd>
<dt class="hdlist1">
@@ -269,7 +298,7 @@ cap
</dt>
<dd>
<p>
-The capacity, in deliveries, of the link
+The capacity, in deliveries, of the link.
</p>
</dd>
<dt class="hdlist1">
@@ -277,7 +306,7 @@ undel
</dt>
<dd>
<p>
-The number of undelivered messages stored on the link’s FIFO
+The number of undelivered messages stored on the link’s FIFO.
</p>
</dd>
<dt class="hdlist1">
@@ -285,7 +314,7 @@ unsett
</dt>
<dd>
<p>
-The number of unsettled deliveries being tracked by the link
+The number of unsettled deliveries being tracked by the link.
</p>
</dd>
<dt class="hdlist1">
@@ -293,37 +322,65 @@ del
</dt>
<dd>
<p>
-The total number of deliveries that have transited this link
+The total number of deliveries that have transited this link.
+</p>
+</dd>
+<dt class="hdlist1">
+presett
+</dt>
+<dd>
+<p>
+The number of pre-settled deliveries that transited this link.
+</p>
+</dd>
+<dt class="hdlist1">
+acc
+</dt>
+<dd>
+<p>
+The number of deliveries on this link that were accepted.
+</p>
+</dd>
+<dt class="hdlist1">
+rej
+</dt>
+<dd>
+<p>
+The number of deliveries on this link that were rejected.
+</p>
+</dd>
+<dt class="hdlist1">
+rel
+</dt>
+<dd>
+<p>
+The number of deliveries on this link that were released.
+</p>
+</dd>
+<dt class="hdlist1">
+mod
+</dt>
+<dd>
+<p>
+The number of deliveries on this link that were modified.
</p>
</dd>
-</dl></div>
-<div class="paragraph"><p>presett:
-The number of pre-settled deliveries that transited this link</p></div>
-<div class="paragraph"><p>acc:
-The number of deliveries on this link that were accepted</p></div>
-<div class="paragraph"><p>rej:
-The number of deliveries on this link that were rejected</p></div>
-<div class="paragraph"><p>rel:
-The number of deliveries on this link that were released</p></div>
-<div class="paragraph"><p>mod:
-The number of deliveries on this link that were modified</p></div>
-<div class="dlist"><dl>
<dt class="hdlist1">
admin
</dt>
<dd>
<p>
-The administrative status of the link
+The administrative status of the link:
</p>
<div class="ulist"><ul>
<li>
<p>
-enabled - The link is enabled for normal operation
+<em>enabled</em> - The link is enabled for normal operation.
</p>
</li>
<li>
<p>
-disabled - The link is disabled and should be quiescing or stopped (not yet supported)
+<em>disabled</em> - The link is disabled and should be quiescing or stopped (not yet supported).
</p>
</li>
</ul></div>
@@ -333,27 +390,27 @@ oper
</dt>
<dd>
<p>
-The operational status of the link
+The operational status of the link:
</p>
<div class="ulist"><ul>
<li>
<p>
-up - The link is operational
+<em>up</em> - The link is operational.
</p>
</li>
<li>
<p>
-down - The link is not attached
+<em>down</em> - The link is not attached.
</p>
</li>
<li>
<p>
-quiescing - The link is in the process of quiescing (not yet supported)
+<em>quiescing</em> - The link is in the process of quiescing (not yet supported).
</p>
</li>
<li>
<p>
-idle - The link has completed quiescing and is idle (not yet supported)
+<em>idle</em> - The link has completed quiescing and is idle (not yet supported).
</p>
</li>
</ul></div>
@@ -363,7 +420,7 @@ name
</dt>
<dd>
<p>
-The link name (only shown if the -v option is provided)
+The link name (only shown if the -v option is provided).
</p>
</dd>
</dl></div>
@@ -375,7 +432,7 @@ router-id
</dt>
<dd>
<p>
-Identifier of the router
+The router’s ID.
</p>
</dd>
<dt class="hdlist1">
@@ -383,7 +440,7 @@ next-hop
</dt>
<dd>
<p>
-If this router is not a neighbor, identifies the next-hop neighbor used to reach this router
+If this router is not a neighbor, this field identifies the next-hop neighbor used to reach this router.
</p>
</dd>
<dt class="hdlist1">
@@ -391,7 +448,7 @@ link
</dt>
<dd>
<p>
-Unique identifier of the link to the neighbor router
+The ID of the link to the neighbor router.
</p>
</dd>
<dt class="hdlist1">
@@ -399,7 +456,7 @@ cost
</dt>
<dd>
<p>
-The topology cost to this remote router (with -v option only)
+The topology cost to this remote router (with -v option only).
</p>
</dd>
<dt class="hdlist1">
@@ -407,7 +464,7 @@ neighbors
</dt>
<dd>
<p>
-The list of neighbor routers (the router’s link-state) (with -v option only)
+The list of neighbor routers (the router’s link-state). This field is available only if you specify the -v option.
</p>
</dd>
<dt class="hdlist1">
@@ -415,7 +472,7 @@ valid-origins
</dt>
<dd>
<p>
-The list of origin routers for which the best path to the listed router passes through this router (with -v option only)
+The list of origin routers for which the best path to the listed router passes through this router (available only with the -v option).
</p>
</dd>
</dl></div>
@@ -429,27 +486,27 @@ class
</dt>
<dd>
<p>
-The class of the listed address
+The class of the address:
</p>
<div class="ulist"><ul>
<li>
<p>
-local - Address that is local to this router
+<em>local</em> - The address that is local to this router.
</p>
</li>
<li>
<p>
-topo - Topological address used for router control messages
+<em>topo</em> - The topological address used for router control messages.
</p>
</li>
<li>
<p>
-router - A summary router address used to route messages to a remote router’s local addresses
+<em>router</em> - A summary router address used to route messages to a remote router’s local addresses.
</p>
</li>
<li>
<p>
-mobile - A mobile address for an attached consumer or producer
+<em>mobile</em> - A mobile address for an attached consumer or producer.
</p>
</li>
</ul></div>
@@ -459,7 +516,7 @@ addr
</dt>
<dd>
<p>
-The address text
+The address text.
</p>
</dd>
<dt class="hdlist1">
@@ -475,27 +532,27 @@ distrib
</dt>
<dd>
<p>
-Distribution method used for this address
+One of the following distribution methods used for this address:
</p>
<div class="ulist"><ul>
<li>
<p>
-multicast - A copy of each message is delivered once to each consumer for the address
+<em>multicast</em> - A copy of each message is delivered once to each consumer for the address.
</p>
</li>
<li>
<p>
-closest - Each message is delivered to only one consumer for the address. The closest (lowest cost) consumer will be chosen. If there are multiple lowest-cost consumers, deliveries will be spread across those consumers.
+<em>closest</em> - Each message is delivered to only one consumer for the address. The closest (lowest cost) consumer will be chosen. If there are multiple lowest-cost consumers, deliveries will be spread across those consumers.
</p>
</li>
<li>
<p>
-balanced - Each message is delivered to only one consumer for the address. The consumer with the fewest outstanding (unsettled) deliveries will be chosen. The cost of the route to the consumer is a threshold for delivery (i.e. higher cost consumers will only receive deliveries if closer consumers are backed up).
+<em>balanced</em> - Each message is delivered to only one consumer for the address. The consumer with the fewest outstanding (unsettled) deliveries will be chosen. The cost of the route to the consumer is a threshold for delivery (that is, higher cost consumers will only receive deliveries if closer consumers are backed up).
</p>
</li>
<li>
<p>
-flood - Used only for router-control traffic. This is multicast without prevention of duplicate deliveries.
+<em>flood</em> - Used only for router-control traffic. This is multicast without the prevention of duplicate deliveries.
</p>
</li>
</ul></div>
@@ -505,7 +562,7 @@ in-proc
</dt>
<dd>
<p>
-The number of in-process consumers for this address
+The number of in-process consumers for this address.
</p>
</dd>
<dt class="hdlist1">
@@ -513,7 +570,7 @@ local
</dt>
<dd>
<p>
-The number of local (on this router) consumers for this address
+For this router, the number of local consumers for this address.
</p>
</dd>
<dt class="hdlist1">
@@ -521,7 +578,7 @@ remote
</dt>
<dd>
<p>
-The number of remote routers that have at least one consumer for this address
+The number of remote routers that have at least one consumer for this address.
</p>
</dd>
<dt class="hdlist1">
@@ -529,7 +586,7 @@ cntnr
</dt>
<dd>
<p>
-The number of locally attached containers that are destinations for link-routes on this address
+The number of locally-attached containers that are destinations for link routes on this address.
</p>
</dd>
<dt class="hdlist1">
@@ -537,7 +594,7 @@ in
</dt>
<dd>
<p>
-The number of deliveries for this address that entered the network on this router
+The number of deliveries for this address that entered the network on this router.
</p>
</dd>
<dt class="hdlist1">
@@ -545,7 +602,7 @@ out
</dt>
<dd>
<p>
-The number of deliveries for this address that exited the network on this router
+The number of deliveries for this address that exited the network on this router.
</p>
</dd>
<dt class="hdlist1">
@@ -553,7 +610,7 @@ thru
</dt>
<dd>
<p>
-The number of deliveries for this address that were forwarded to other routers
+The number of deliveries for this address that were forwarded to other routers.
</p>
</dd>
<dt class="hdlist1">
@@ -561,7 +618,7 @@ to-proc
</dt>
<dd>
<p>
-The number of deliveries for this address that were delivered to an in-process consumer
+The number of deliveries for this address that were delivered to an in-process consumer.
</p>
</dd>
<dt class="hdlist1">
@@ -569,7 +626,7 @@ from-proc
</dt>
<dd>
<p>
-The number of deliveries for this address that were received from an in-process producer
+The number of deliveries for this address that were received from an in-process producer.
</p>
</dd>
</dl></div>
@@ -582,7 +639,7 @@ prefix
</dt>
<dd>
<p>
-The prefix for matching addresses of routed links
+The address prefix of the link route.
</p>
</dd>
<dt class="hdlist1">
@@ -590,7 +647,7 @@ dir
</dt>
<dd>
<p>
-The direction (from the router’s perspective) of matching links
+The direction of matching links (from this router’s perspective).
</p>
</dd>
<dt class="hdlist1">
@@ -598,32 +655,25 @@ distrib
</dt>
<dd>
<p>
-The distribution method used for routed links
-</p>
-<div class="ulist"><ul>
-<li>
-<p>
-linkBalanced - the only supported distribution for routed links
+The distribution method used for routed links. This value should always be <em>linkBalanced</em>, which is the only supported distribution for routed links.
</p>
-</li>
-</ul></div>
</dd>
<dt class="hdlist1">
status
</dt>
<dd>
<p>
-Operational status of the link route
+The operational status of the link route:
</p>
<div class="ulist"><ul>
<li>
<p>
-active - Route is actively routing attaches (i.e. ready for use)
+<em>active</em> - The route is actively routing attaches (it is ready for use).
</p>
</li>
<li>
<p>
-inactive - Route is inactive because there is no local destination connected
+<em>inactive</em> - The route is inactive, because no local destination is connected.
</p>
</li>
</ul></div>
@@ -638,7 +688,7 @@ addr
</dt>
<dd>
<p>
-The address of the auto link
+The auto link’s address.
</p>
</dd>
<dt class="hdlist1">
@@ -646,17 +696,17 @@ dir
</dt>
<dd>
<p>
-The direction of message flow for the auto link
+The direction that messages flow over the auto link:
</p>
<div class="ulist"><ul>
<li>
<p>
-in - Messages flow in from the route-container to the router network
+<em>in</em> - Messages flow in from the route-container to the router network.
</p>
</li>
<li>
<p>
-out - Messages flow out to the route-container from the router network
+<em>out</em> - Messages flow out to the route-container from the router network.
</p>
</li>
</ul></div>
@@ -666,7 +716,7 @@ phs
</dt>
<dd>
<p>
-Phase of the address for this auto link
+The address phase for this auto link.
</p>
</dd>
<dt class="hdlist1">
@@ -674,7 +724,7 @@ link
</dt>
<dd>
<p>
-Unique identifier of the link managed by this auto link
+The ID of the link managed by this auto link.
</p>
</dd>
<dt class="hdlist1">
@@ -682,37 +732,37 @@ status
</dt>
<dd>
<p>
-The operational status of this auto link
+The operational status of this auto link:
</p>
<div class="ulist"><ul>
<li>
<p>
-inactive - There is no connected container for this auto link
+<em>inactive</em> - There is no connected container for this auto link.
</p>
</li>
<li>
<p>
-attaching - The link is attaching to the container
+<em>attaching</em> - The link is attaching to the container.
</p>
</li>
<li>
<p>
-failed - The link-attach failed
+<em>failed</em> - The link-attach failed.
</p>
</li>
<li>
<p>
-active - The link is operational
+<em>active</em> - The link is operational.
</p>
</li>
<li>
<p>
-quiescing - The link is quiescing (not yet supported)
+<em>quiescing</em> - The link is quiescing (not yet supported).
</p>
</li>
<li>
<p>
-idle - The link is idle (not yet supported)
+<em>idle</em> - The link is idle (not yet supported).
</p>
</li>
</ul></div>
@@ -722,7 +772,7 @@ lastErr
</dt>
<dd>
<p>
-The description of the last attach failure that occurred on this auto link
+The description of the last attach failure that occurred on this auto link.
</p>
</dd>
</dl></div>
http://git-wip-us.apache.org/repos/asf/qpid-site/blob/030c23a6/input/releases/qpid-dispatch-master/qdmanage.8.html.in
----------------------------------------------------------------------
diff --git a/input/releases/qpid-dispatch-master/qdmanage.8.html.in b/input/releases/qpid-dispatch-master/qdmanage.8.html.in
deleted file mode 100644
index 576260c..0000000
--- a/input/releases/qpid-dispatch-master/qdmanage.8.html.in
+++ /dev/null
@@ -1,245 +0,0 @@
-<div class="sect1">
-<h2 id="_synopsis">SYNOPSIS</h2>
-<div class="sectionbody">
-<div class="paragraph"><p><strong>qdmanage</strong> [<em>OPTIONS</em>] <em>OPERATION</em> [<em>ARGUMENTS</em>]</p></div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_description">DESCRIPTION</h2>
-<div class="sectionbody">
-<div class="paragraph"><p>An AMQP management client for use with qdrouterd. Sends AMQP management
-operations requests and prints the response in JSON format. This is a
-generic AMQP management tool and can be used with any standard AMQP
-managed endpoint, not just with qdrouter.</p></div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_options">OPTIONS</h2>
-<div class="sectionbody">
-<div class="paragraph"><p>-h, --help
-: show this help message and exit</p></div>
-<div class="paragraph"><p>--version
-: Print version and exit.</p></div>
-<div class="paragraph"><p>--type=TYPE
-: Type of entity to operate on.</p></div>
-<div class="paragraph"><p>--name=NAME
-: Name of entity to operate on.</p></div>
-<div class="paragraph"><p>--identity=ID
-: Identity of entity to operate on.</p></div>
-<div class="paragraph"><p>--indent=INDENT
-: Pretty-printing indent. -1 means don’t pretty-print</p></div>
-<div class="paragraph"><p>--stdin
-: Read attributes as JSON map or list of maps from</p></div>
-<div class="paragraph"><p>--body=BODY
-: JSON value to use as body of a non-standard operation</p></div>
-<div class="paragraph"><p>--properties=PROPERTIES
-: JSON map to use as properties for a non-standard operation call.</p></div>
-<div class="sect2">
-<h3 id="_connection_options">Connection Options</h3>
-<div class="paragraph"><p>-b URL, --bus=URL
-: URL of the messaging bus to connect to (default 0.0.0.0)</p></div>
-<div class="paragraph"><p>-r ROUTER-ID, --router=ROUTER-ID
-: Router to be queried</p></div>
-<div class="paragraph"><p>-t SECS, --timeout=SECS
-: Maximum time to wait for connection in seconds (default 5)</p></div>
-<div class="paragraph"><p>--ssl-certificate=CERT
-: Client SSL certificate (PEM Format)</p></div>
-<div class="paragraph"><p>--ssl-key=KEY
-: Client SSL private key (PEM Format)</p></div>
-<div class="paragraph"><p>--ssl-trustfile=TRUSTED-CA-DB
-: Trusted Certificate Authority Database file (PEM Format)</p></div>
-<div class="paragraph"><p>--ssl-password=PASSWORD
-: Certificate password, will be prompted if not specifed.</p></div>
-<div class="paragraph"><p>--ssl-password-file=SSL-PASSWORD-FILE
-: Certificate password, will be prompted if not specifed.</p></div>
-<div class="paragraph"><p>--sasl-mechanisms=SASL-MECHANISMS
-: Allowed sasl mechanisms to be supplied during the sasl handshake.</p></div>
-<div class="paragraph"><p>--sasl-username=SASL-USERNAME
-: User name for SASL plain authentication</p></div>
-<div class="paragraph"><p>--sasl-password=SASL-PASSWORD
-: Password for SASL plain authentication</p></div>
-<div class="paragraph"><p>--sasl-password-file=SASL-PASSWORD-FILE
-: Password for SASL plain authentication</p></div>
-<div class="paragraph"><p>--ssl-disable-peer-name-verify
-: Disables SSL peer name verification. WARNING - This option is insecure and must not be used in production environments</p></div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_operations">OPERATIONS</h2>
-<div class="sectionbody">
-<div class="dlist"><dl>
-<dt class="hdlist1">
-<code>query</code> [<em>ATTR</em>…]
-</dt>
-<dd>
-<p>
- Print attributes for multiple entities. Prints all entities by default, use
- --type, --name or --identity options to restrict which entities are printed.
- Prints the attributes named in the ATTR list, or all attributes if none are
- listed.
-</p>
-</dd>
-<dt class="hdlist1">
-<code>create</code> [<em>ATTR=VALUE</em>…]
-</dt>
-<dd>
-<p>
- Create a new entity with the specified attributes. With the --stdin
- option, read attributes from stdin. This can be a JSON map of
- attributes to create a single entity, or a JSON list of maps to create
- multiple entities.
-</p>
-</dd>
-<dt class="hdlist1">
-<code>read</code>
-</dt>
-<dd>
-<p>
- Print all the attributes of a single entity, specified by the --name or
- --identity options.
-</p>
-</dd>
-<dt class="hdlist1">
-<code>update</code> [<em>ATTR=VALUE</em>…]
-</dt>
-<dd>
-<p>
- Update the attributes of an existing entity. If an ATTR name is listed with
- no =VALUE, that attribute will be deleted from the entity. With the --stdin
- option, read attributes from stdin. This can be a JSON map of attributes to
- update a single entity, or a JSON list of maps to update multiple entities.
-</p>
-</dd>
-<dt class="hdlist1">
-<code>delete</code>
-</dt>
-<dd>
-<p>
- Delete an entity specified by the --name or --identity options.
-</p>
-</dd>
-<dt class="hdlist1">
-<code>get-types</code> [<em>TYPE</em>]
-</dt>
-<dd>
-<p>
- List entity types with their base types. With no arguments list all
- types.
-</p>
-</dd>
-<dt class="hdlist1">
-<code>get-operations</code> [<em>TYPE</em>]
-</dt>
-<dd>
-<p>
- List entity types with their operations. With no arguments list all
- types.
-</p>
-</dd>
-<dt class="hdlist1">
-<code>get-attributes</code> [<em>TYPE</em>]
-</dt>
-<dd>
-<p>
- List entity types with their attributes. With no arguments list all
- types.
-</p>
-</dd>
-<dt class="hdlist1">
-<code>get-annotations</code> [<em>TYPE</em>]
-</dt>
-<dd>
-<p>
- List entity types with their annotations. With no arguments list all
- types.
-</p>
-</dd>
-<dt class="hdlist1">
-<code>get-mgmt-nodes</code>
-</dt>
-<dd>
-<p>
- List all other known management nodes connected to this one.
-</p>
-</dd>
-<dt class="hdlist1">
-<code>get-json-schema</code> [<em>INDENT</em>]
-</dt>
-<dd>
-<p>
- Get the router schema in JSON format. Optional integer indent for
- formatted output.
-</p>
-</dd>
-<dt class="hdlist1">
-<code>get-log</code> [<em>INDENT</em>]
-</dt>
-<dd>
-<p>
- Get recent log entries from the router.
-</p>
-</dd>
-</dl></div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_files">FILES</h2>
-<div class="sectionbody">
-<div class="dlist"><dl>
-<dt class="hdlist1">
-/usr/local/share/doc/qpid-dispatch/qdrouter.json
-</dt>
-<dd>
-<p>
- Management schema for qdrouterd.
-</p>
-</dd>
-<dt class="hdlist1">
-/usr/local/share/doc/qpid-dispatch/qdrouter.json.readme.txt
-</dt>
-<dd>
-<p>
- Explanation of the management schema.
-</p>
-</dd>
-</dl></div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_examples">EXAMPLES</h2>
-<div class="sectionbody">
-<div class="listingblock">
-<div class="title">Show the logging configuration</div>
-<div class="content">
-<pre><code>qdmanage query --type=log</code></pre>
-</div></div>
-<div class="listingblock">
-<div class="title">Enable debug and higher log messages by default:</div>
-<div class="content">
-<pre><code>qdmanage update name=log/DEFAULT enable=debug+</code></pre>
-</div></div>
-<div class="listingblock">
-<div class="title">Enable trace log messages only for the MESSAGE module and direct MESSAGE logs to the file "test.log"</div>
-<div class="content">
-<pre><code>qdmanage update name=log/MESSAGE enable=trace output=test.log</code></pre>
-</div></div>
-<div class="listingblock">
-<div class="title">Set MESSAGE logging back to the default</div>
-<div class="content">
-<pre><code>qdmanage update name=log/MESSAGE enable=default</code></pre>
-</div></div>
-<div class="listingblock">
-<div class="title">Disable MESSAGE logging</div>
-<div class="content">
-<pre><code>qdmanage update name=log/MESSAGE enable=none</code></pre>
-</div></div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_see_also">SEE ALSO</h2>
-<div class="sectionbody">
-<div class="paragraph"><p><em>qdrouterd(8)</em>, <em>qdstat(8)</em>, <em>qdrouterd.conf(5)</em></p></div>
-<div class="paragraph"><p><a href="http://qpid.apache.org/components/dispatch-router">http://qpid.apache.org/components/dispatch-router</a></p></div>
-</div>
-</div>
http://git-wip-us.apache.org/repos/asf/qpid-site/blob/030c23a6/input/releases/qpid-dispatch-master/qdrouterd.8.html.in
----------------------------------------------------------------------
diff --git a/input/releases/qpid-dispatch-master/qdrouterd.8.html.in b/input/releases/qpid-dispatch-master/qdrouterd.8.html.in
deleted file mode 100644
index 965f0cd..0000000
--- a/input/releases/qpid-dispatch-master/qdrouterd.8.html.in
+++ /dev/null
@@ -1,53 +0,0 @@
-<div class="sect1">
-<h2 id="_synopsis">SYNOPSIS</h2>
-<div class="sectionbody">
-<div class="paragraph"><p><strong>qdrouterd</strong> [<em>OPTIONS</em>]</p></div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_description">DESCRIPTION</h2>
-<div class="sectionbody">
-<div class="paragraph"><p>The Qpid Dispatch router (qdrouterd) is a network daemon that directs
-AMQP 1.0 messages between endpoints, such as messaging clients and
-servers.</p></div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_options">OPTIONS</h2>
-<div class="sectionbody">
-<div class="paragraph"><p>-c, --config=PATH (/usr/local/etc/qpid-dispatch/qdrouterd.conf)
-: Load configuration from file at PATH</p></div>
-<div class="paragraph"><p>-I, --include=PATH (/usr/local/lib/qpid-dispatch/python)
-: Location of Dispatch’s Python library</p></div>
-<div class="paragraph"><p>-d, --daemon
-: Run process as a SysV-style daemon</p></div>
-<div class="paragraph"><p>-P, --pidfile
-: If daemon, the file for the stored daemon pid</p></div>
-<div class="paragraph"><p>-U, --user
-: If daemon, the username to run as</p></div>
-<div class="paragraph"><p>-h, --help
-: Print this help</p></div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_files">FILES</h2>
-<div class="sectionbody">
-<div class="dlist"><dl>
-<dt class="hdlist1">
-/usr/local/etc/qdrouterd.conf
-</dt>
-<dd>
-<p>
- Configuration flie.
-</p>
-</dd>
-</dl></div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_see_also">SEE ALSO</h2>
-<div class="sectionbody">
-<div class="paragraph"><p><em>qdrouterd.conf(5)</em>, <em>qdstat(8)</em>, <em>qdmanage(8)</em></p></div>
-<div class="paragraph"><p><a href="http://qpid.apache.org/components/dispatch-router">http://qpid.apache.org/components/dispatch-router</a></p></div>
-</div>
-</div>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org