summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Conway <aconway@apache.org>2012-10-05 19:12:18 +0000
committerAlan Conway <aconway@apache.org>2012-10-05 19:12:18 +0000
commit2b29c35bbed96f0ca317a33cbbbd1d3fdf98bd0b (patch)
tree430fbefef1c27c6b364e9cc570c220aa7693d36a
parentf6bf1d808361f0fcfa40c2971ea0a68d26efffc4 (diff)
downloadqpid-python-2b29c35bbed96f0ca317a33cbbbd1d3fdf98bd0b.tar.gz
NO-JIRA: HA minor update to documentation.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1394739 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--qpid/doc/book/src/cpp-broker/Active-Passive-Cluster.xml16
1 files changed, 8 insertions, 8 deletions
diff --git a/qpid/doc/book/src/cpp-broker/Active-Passive-Cluster.xml b/qpid/doc/book/src/cpp-broker/Active-Passive-Cluster.xml
index ac280564fc..2929993ad4 100644
--- a/qpid/doc/book/src/cpp-broker/Active-Passive-Cluster.xml
+++ b/qpid/doc/book/src/cpp-broker/Active-Passive-Cluster.xml
@@ -264,7 +264,7 @@ under the License.
<entry>
<para>
The URL
- <footnote>
+ <footnote id="ha-url-grammar">
<para>
The full format of the URL is given by this grammar:
<programlisting>
@@ -276,9 +276,9 @@ ssl_addr = "ssl:" host [":" port]'
</programlisting>
</para>
</footnote>
- used by cluster brokers to connect to each other. The URL can
- contain a list of all the broker addresses or it can contain a single
- virtual IP address. If a list is used it is comma separated, for example
+ used by cluster brokers to connect to each other. The URL should
+ contain a comma separated list of the broker addresses, rather than a
+ virtual IP address. For example:
<literal>amqp:node1.exaple.com,node2.exaple.com,node3.exaple.com</literal>
</para>
</entry>
@@ -287,10 +287,10 @@ ssl_addr = "ssl:" host [":" port]'
<entry><literal>ha-public-url <replaceable>URL</replaceable></literal> </entry>
<entry>
<para>
- The URL that is advertised to clients. This defaults to the
- <literal>ha-brokers-url</literal> URL above, and has the same format. A
- virtual IP address is recommended for the public URL as it simplifies
- deployment and hides changes to the cluster membership from clients.
+ The URL <footnoteref linkend="ha-url-grammar"/> used by clients to connect to the cluster. This can be a list or
+ a single virtual IP address. A virtual IP address is recommended as it
+ simplifies deployment. If not specified this defaults to the value of
+ <literal>ha-brokers-url</literal>.
</para>
<para>
This option allows you to put client traffic on a different network from