qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kw...@apache.org
Subject svn commit: r1631195 [3/3] - in /qpid/trunk/qpid/doc/book/src/java-broker: ./ concepts/ images/ management/channels/ management/managing/
Date Sun, 12 Oct 2014 15:48:20 GMT
Modified: qpid/trunk/qpid/doc/book/src/java-broker/Java-Broker-Management-Channels.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/java-broker/Java-Broker-Management-Channels.xml?rev=1631195&r1=1631194&r2=1631195&view=diff
==============================================================================
--- qpid/trunk/qpid/doc/book/src/java-broker/Java-Broker-Management-Channels.xml (original)
+++ qpid/trunk/qpid/doc/book/src/java-broker/Java-Broker-Management-Channels.xml Sun Oct 12 15:48:18 2014
@@ -25,17 +25,17 @@
   <para>The Broker can be managed over a number of different channels.</para>
   <itemizedlist>
     <listitem>
-      <para>HTTP - The primary channel for management. The HTTP interace comprises of a Web
+      <para>HTTP - The primary channel for management. The HTTP interface comprises of a Web
         Console and a REST API.</para>
     </listitem>
     <listitem>
-      <para>JMX - The Broker provides a JMX compilent management interface. This is not currently
+      <para>JMX - The Broker provides a JMX compliant management interface. This is not currently
         undergoing further development and is retained largely for backward compatibility. It is
         suggested the new users favour the Web Console/REST API.</para>
     </listitem>
     <listitem>
       <para>AMQP - The AMQP protocols 0-8..0-10 allow for some management of Exchanges, Queue and
-        Bindings. This will be superceded by AMQP 1.0 Management. It is suggested that new users
+        Bindings. This will be superseded by AMQP 1.0 Management. It is suggested that new users
         favour the Management facilities provided by the Web Console/REST API.</para>
     </listitem>
   </itemizedlist>

Modified: qpid/trunk/qpid/doc/book/src/java-broker/Java-Broker-Management-Managing-Entities.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/java-broker/Java-Broker-Management-Managing-Entities.xml?rev=1631195&r1=1631194&r2=1631195&view=diff
==============================================================================
--- qpid/trunk/qpid/doc/book/src/java-broker/Java-Broker-Management-Managing-Entities.xml (original)
+++ qpid/trunk/qpid/doc/book/src/java-broker/Java-Broker-Management-Managing-Entities.xml Sun Oct 12 15:48:18 2014
@@ -56,7 +56,7 @@
               (e.g.<literal>${foo}</literal> or <literal>/data/${foo}/</literal>).</para>
         </listitem>
         <listitem>
-          <para>Each entity has own zero or more context variables.</para>
+          <para>Each entity has zero or more context variables.</para>
         </listitem>
         <listitem>
           <para>The System Context entity (the ultimate ancestor of all object) has a context too.

Modified: qpid/trunk/qpid/doc/book/src/java-broker/Java-Broker-Runtime-Disk-Space-Management-Producer-Flow-Control.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/java-broker/Java-Broker-Runtime-Disk-Space-Management-Producer-Flow-Control.xml?rev=1631195&r1=1631194&r2=1631195&view=diff
==============================================================================
--- qpid/trunk/qpid/doc/book/src/java-broker/Java-Broker-Runtime-Disk-Space-Management-Producer-Flow-Control.xml (original)
+++ qpid/trunk/qpid/doc/book/src/java-broker/Java-Broker-Runtime-Disk-Space-Management-Producer-Flow-Control.xml Sun Oct 12 15:48:18 2014
@@ -45,7 +45,7 @@
             </para>
             <para>
                 The capacity and resume capacity can be specified when the queue is created.  This
-                can be done using the Flow Control Settings wintin the Queue creation dialogue.
+                can be done using the Flow Control Settings within the Queue creation dialogue.
             </para>
             <section role="h4">
                 <title>Broker Log Messages</title>

Modified: qpid/trunk/qpid/doc/book/src/java-broker/Java-Broker-Runtime-Flow-To-Disk.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/java-broker/Java-Broker-Runtime-Flow-To-Disk.xml?rev=1631195&r1=1631194&r2=1631195&view=diff
==============================================================================
--- qpid/trunk/qpid/doc/book/src/java-broker/Java-Broker-Runtime-Flow-To-Disk.xml (original)
+++ qpid/trunk/qpid/doc/book/src/java-broker/Java-Broker-Runtime-Flow-To-Disk.xml Sun Oct 12 15:48:18 2014
@@ -28,7 +28,7 @@
     cumulative size of all messages falls below the limit once again.</para>
   <para>By default the Broker makes 40% of the max available memory for messages. This memory is
     divided between all the queues across all virtual hosts defined on the Broker with a percentage
-    calculated according to their current queue size. These calulations are refreshed periodically
+    calculated according to their current queue size. These calculations are refreshed periodically
     by the housekeeping cycle.</para>
   <para>For example if there are two queues, one containing 75MB and the second 100MB messages
     respectively and the Broker has 1GB heap memory with the default of 40% available for messages.

Modified: qpid/trunk/qpid/doc/book/src/java-broker/Java-Broker-Runtime-Log-Files.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/java-broker/Java-Broker-Runtime-Log-Files.xml?rev=1631195&r1=1631194&r2=1631195&view=diff
==============================================================================
--- qpid/trunk/qpid/doc/book/src/java-broker/Java-Broker-Runtime-Log-Files.xml (original)
+++ qpid/trunk/qpid/doc/book/src/java-broker/Java-Broker-Runtime-Log-Files.xml Sun Oct 12 15:48:18 2014
@@ -54,7 +54,7 @@
   <para>It can be helpful to enable debug within the Broker in order to understand a problem more
    clearly. If this is required, debug can be enabled at runtime (without restarting the Broker)
    using the Logging Management MBean. The change can also be made by changing the log configuration
-   file and restarting the Broker. Whichever mechanism is chosen, change the appender assoicated
+   file and restarting the Broker. Whichever mechanism is chosen, change the appender associated
    with <literal>org.apache.qpid</literal> from <literal>WARN</literal> to
    <literal>DEBUG</literal>.</para>
   <example>

Modified: qpid/trunk/qpid/doc/book/src/java-broker/Java-Broker-Security-ACLs.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/java-broker/Java-Broker-Security-ACLs.xml?rev=1631195&r1=1631194&r2=1631195&view=diff
==============================================================================
--- qpid/trunk/qpid/doc/book/src/java-broker/Java-Broker-Security-ACLs.xml (original)
+++ qpid/trunk/qpid/doc/book/src/java-broker/Java-Broker-Security-ACLs.xml Sun Oct 12 15:48:18 2014
@@ -91,7 +91,7 @@
       ACL ALLOW bob ALL EXCHANGE
     </programlisting>
     <para>
-      All ACL files end with an implict rule denying all operations to all users.  It is as if each file ends with
+      All ACL files end with an implicit rule denying all operations to all users.  It is as if each file ends with
       <programlisting>ACL DENY ALL ALL </programlisting>
       If instead you wish to <emphasis>allow</emphasis> all operations other than those controlled by earlier rules,
       add <programlisting>ACL ALLOW ALL ALL</programlisting> to the bottom of the ACL file.
@@ -433,15 +433,15 @@
       <tbody>
         <row>
           <entry> <command>UserManagement</command> </entry>
-          <entry> <para>User maintainance; create/delete/view users, change passwords etc</para> </entry>
+          <entry> <para>User maintenance; create/delete/view users, change passwords etc</para> </entry>
         </row>
         <row>
           <entry> <command>ConfigurationManagement</command> </entry>
-          <entry> <para>Dynammically reload configuration from disk.</para> </entry>
+          <entry> <para>Dynamically reload configuration from disk.</para> </entry>
         </row>
         <row>
           <entry> <command>LoggingManagement</command> </entry>
-          <entry> <para>Dynammically control Qpid logging level</para> </entry>
+          <entry> <para>Dynamically control Qpid logging level</para> </entry>
         </row>
         <row>
           <entry> <command>ServerInformation</command> </entry>
@@ -449,7 +449,7 @@
         </row>
         <row>
           <entry> <command>VirtualHost.Queue</command> </entry>
-          <entry> <para>Queue maintainance; copy/move/purge/view etc</para> </entry>
+          <entry> <para>Queue maintenance; copy/move/purge/view etc</para> </entry>
         </row>
         <row>
           <entry> <command>VirtualHost.Exchange</command> </entry>
@@ -457,7 +457,7 @@
         </row>
         <row>
           <entry> <command>VirtualHost.VirtualHost</command> </entry>
-          <entry> <para>Virtual host maintainace; create/delete exchanges, queues etc</para> </entry>
+          <entry> <para>Virtual host maintenace; create/delete exchanges, queues etc</para> </entry>
         </row>
       </tbody>
     </tgroup>
@@ -501,7 +501,7 @@ ACL DENY-LOG ALL ALL
       <para>
         Suppose you wish to restrict User Management operations to users belonging to a
         <link linkend="Java-Broker-Security-Group-Providers">group</link> 'usermaint'.  No other user
-        is allowed to perform user maintainence  This example illustrates the permissioning of an individual component.
+        is allowed to perform user maintenance  This example illustrates the permissioning of an individual component.
       </para>
       <programlisting>
 # Give usermaint access to management and permission to execute all JMX Methods on the

Modified: qpid/trunk/qpid/doc/book/src/java-broker/Java-Broker-Security-Authentication-Providers.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/java-broker/Java-Broker-Security-Authentication-Providers.xml?rev=1631195&r1=1631194&r2=1631195&view=diff
==============================================================================
--- qpid/trunk/qpid/doc/book/src/java-broker/Java-Broker-Security-Authentication-Providers.xml (original)
+++ qpid/trunk/qpid/doc/book/src/java-broker/Java-Broker-Security-Authentication-Providers.xml Sun Oct 12 15:48:18 2014
@@ -199,7 +199,7 @@ com.sun.security.jgss.accept {
       passwords are stored as salted SHA digested password. This can be further encrypted using the
       facilities described in <xref linkend="Java-Broker-Security-Configuration-Encryption"
       />.</para>
-    <para>There are two varients of this provider, SHA1 and SHA256. SHA256 is recommended whenever
+    <para>There are two variants of this provider, SHA1 and SHA256. SHA256 is recommended whenever
       possible. SHA1 is provided with compatibility with clients utilising JDK 1.6 (which does not
       support SHA256).</para>
     <para>For these providers user credentials can be added, removed or changed using

Modified: qpid/trunk/qpid/doc/book/src/java-broker/Java-Broker-Security-Configuration-Encryption.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/java-broker/Java-Broker-Security-Configuration-Encryption.xml?rev=1631195&r1=1631194&r2=1631195&view=diff
==============================================================================
--- qpid/trunk/qpid/doc/book/src/java-broker/Java-Broker-Security-Configuration-Encryption.xml (original)
+++ qpid/trunk/qpid/doc/book/src/java-broker/Java-Broker-Security-Configuration-Encryption.xml Sun Oct 12 15:48:18 2014
@@ -23,7 +23,7 @@
 
 <section id="Java-Broker-Security-Configuration-Encryption">
   <title>Configuration Encryption</title>
-  <para> The Broker is capable of encypting passwords and other security items stored in the
+  <para> The Broker is capable of encrypting passwords and other security items stored in the
     Broker's configuration. This is means that items such as keystore/truststore passwords, JDBC
     passwords, and LDAP passwords can be stored in the configure in a form that is difficult to
     read.</para>
@@ -69,6 +69,6 @@
       the user, perhaps owing to the security standards of their institution, the
         <literal>ConfigurationSecretEncrypter</literal> interface is designed as an extension point.
       Users may implement their own implementation of ConfigurationSecretEncrypter perhaps to employ
-      stonger encryption or delegating the storage of the key to an Enterprise Password Safe.</para>
+      stronger encryption or delegating the storage of the key to an Enterprise Password Safe.</para>
   </section>
 </section>

Modified: qpid/trunk/qpid/doc/book/src/java-broker/Java-Broker-Security-Group-Providers.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/java-broker/Java-Broker-Security-Group-Providers.xml?rev=1631195&r1=1631194&r2=1631195&view=diff
==============================================================================
--- qpid/trunk/qpid/doc/book/src/java-broker/Java-Broker-Security-Group-Providers.xml (original)
+++ qpid/trunk/qpid/doc/book/src/java-broker/Java-Broker-Security-Group-Providers.xml Sun Oct 12 15:48:18 2014
@@ -47,7 +47,7 @@
             The groups file has the following format:
           </para>
             <programlisting>
-    # &lt;GroupName&gt;.users = &lt;comma deliminated user list&gt;
+    # &lt;GroupName&gt;.users = &lt;comma delimited user list&gt;
     # For example:
 
     administrators.users = admin,manager

Modified: qpid/trunk/qpid/doc/book/src/java-broker/concepts/Java-Broker-Concepts-Overview.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/java-broker/concepts/Java-Broker-Concepts-Overview.xml?rev=1631195&r1=1631194&r2=1631195&view=diff
==============================================================================
--- qpid/trunk/qpid/doc/book/src/java-broker/concepts/Java-Broker-Concepts-Overview.xml (original)
+++ qpid/trunk/qpid/doc/book/src/java-broker/concepts/Java-Broker-Concepts-Overview.xml Sun Oct 12 15:48:18 2014
@@ -51,13 +51,13 @@
   <para>These concepts will be developed over the forthcoming pages. The diagrams below also help
     put these entities in context of one and other.</para>
   <para><figure>
-      <title>Message Flow</title>
+      <title>Message Flow through Key Entities</title>
       <mediaobject>
         <imageobject>
           <imagedata fileref="images/Broker-MessageFlow.png" format="PNG" scalefit="1"/>
         </imageobject>
         <textobject>
-          <phrase>Message Flow through the Broker</phrase>
+          <phrase>Message Flow through the Key Entities of the Broker</phrase>
         </textobject>
       </mediaobject>
     </figure></para>

Modified: qpid/trunk/qpid/doc/book/src/java-broker/concepts/Java-Broker-Concepts-Ports.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/java-broker/concepts/Java-Broker-Concepts-Ports.xml?rev=1631195&r1=1631194&r2=1631195&view=diff
==============================================================================
--- qpid/trunk/qpid/doc/book/src/java-broker/concepts/Java-Broker-Concepts-Ports.xml (original)
+++ qpid/trunk/qpid/doc/book/src/java-broker/concepts/Java-Broker-Concepts-Ports.xml Sun Oct 12 15:48:18 2014
@@ -41,7 +41,7 @@
         </itemizedlist>
     </para>
 
-    <para> Addittionally, HTTP and JMX ports can be configured for use by the associated management
+    <para> Additionally, HTTP and JMX ports can be configured for use by the associated management
         plugins. </para>
     <para>This diagram explains how Ports, <link
             linkEnd="Java-Broker-Concepts-Authentication-Providers">Authentication Providers</link>

Modified: qpid/trunk/qpid/doc/book/src/java-broker/concepts/Java-Broker-Concepts-Queues.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/java-broker/concepts/Java-Broker-Concepts-Queues.xml?rev=1631195&r1=1631194&r2=1631195&view=diff
==============================================================================
--- qpid/trunk/qpid/doc/book/src/java-broker/concepts/Java-Broker-Concepts-Queues.xml (original)
+++ qpid/trunk/qpid/doc/book/src/java-broker/concepts/Java-Broker-Concepts-Queues.xml Sun Oct 12 15:48:18 2014
@@ -26,5 +26,5 @@
   hold/buffer messages for later delivery to consumer applications. An <link
    linkend="Java-Broker-Concepts-Exchanges">Exchange</link> for passing messages to a queue.
   Consumers subscribe to a queue in order to receive messages for it. </para>
- <para>The Broker supports different queue types, each with different delivery semantics.  It also also messages on a queue to be treated as a group.</para>
+ <para>The Broker supports different queue types, each with different delivery semantics.  It also messages on a queue to be treated as a group.</para>
 </section>

Added: qpid/trunk/qpid/doc/book/src/java-broker/images/HA-Create-1.png
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/java-broker/images/HA-Create-1.png?rev=1631195&view=auto
==============================================================================
Files qpid/trunk/qpid/doc/book/src/java-broker/images/HA-Create-1.png (added) and qpid/trunk/qpid/doc/book/src/java-broker/images/HA-Create-1.png Sun Oct 12 15:48:18 2014 differ

Added: qpid/trunk/qpid/doc/book/src/java-broker/images/HA-Create-2.png
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/java-broker/images/HA-Create-2.png?rev=1631195&view=auto
==============================================================================
Files qpid/trunk/qpid/doc/book/src/java-broker/images/HA-Create-2.png (added) and qpid/trunk/qpid/doc/book/src/java-broker/images/HA-Create-2.png Sun Oct 12 15:48:18 2014 differ

Added: qpid/trunk/qpid/doc/book/src/java-broker/images/HA-Create-3.png
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/java-broker/images/HA-Create-3.png?rev=1631195&view=auto
==============================================================================
Files qpid/trunk/qpid/doc/book/src/java-broker/images/HA-Create-3.png (added) and qpid/trunk/qpid/doc/book/src/java-broker/images/HA-Create-3.png Sun Oct 12 15:48:18 2014 differ

Added: qpid/trunk/qpid/doc/book/src/java-broker/images/HA-Overview.png
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/java-broker/images/HA-Overview.png?rev=1631195&view=auto
==============================================================================
Files qpid/trunk/qpid/doc/book/src/java-broker/images/HA-Overview.png (added) and qpid/trunk/qpid/doc/book/src/java-broker/images/HA-Overview.png Sun Oct 12 15:48:18 2014 differ

Added: qpid/trunk/qpid/doc/book/src/java-broker/images/Management-Web-Add-Dialogue.png
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/java-broker/images/Management-Web-Add-Dialogue.png?rev=1631195&view=auto
==============================================================================
Files qpid/trunk/qpid/doc/book/src/java-broker/images/Management-Web-Add-Dialogue.png (added) and qpid/trunk/qpid/doc/book/src/java-broker/images/Management-Web-Add-Dialogue.png Sun Oct 12 15:48:18 2014 differ

Added: qpid/trunk/qpid/doc/book/src/java-broker/images/Management-Web-ContextVar.png
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/java-broker/images/Management-Web-ContextVar.png?rev=1631195&view=auto
==============================================================================
Files qpid/trunk/qpid/doc/book/src/java-broker/images/Management-Web-ContextVar.png (added) and qpid/trunk/qpid/doc/book/src/java-broker/images/Management-Web-ContextVar.png Sun Oct 12 15:48:18 2014 differ

Added: qpid/trunk/qpid/doc/book/src/java-broker/images/Management-Web-Edit-Dialogue.png
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/java-broker/images/Management-Web-Edit-Dialogue.png?rev=1631195&view=auto
==============================================================================
Files qpid/trunk/qpid/doc/book/src/java-broker/images/Management-Web-Edit-Dialogue.png (added) and qpid/trunk/qpid/doc/book/src/java-broker/images/Management-Web-Edit-Dialogue.png Sun Oct 12 15:48:18 2014 differ

Modified: qpid/trunk/qpid/doc/book/src/java-broker/management/channels/Java-Broker-Management-Channel-HTTP.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/java-broker/management/channels/Java-Broker-Management-Channel-HTTP.xml?rev=1631195&r1=1631194&r2=1631195&view=diff
==============================================================================
--- qpid/trunk/qpid/doc/book/src/java-broker/management/channels/Java-Broker-Management-Channel-HTTP.xml (original)
+++ qpid/trunk/qpid/doc/book/src/java-broker/management/channels/Java-Broker-Management-Channel-HTTP.xml Sun Oct 12 15:48:18 2014
@@ -36,14 +36,14 @@
                 </listitem>
                 <listitem>
                     <para><link linkend="Java-Broker-Management-Channel-REST-API">REST API</link> -
-                        REST API providing complete programatic management of the Broker.</para>
+                        REST API providing complete programmatic management of the Broker.</para>
                 </listitem>
             </itemizedlist></para>
 
         <para>The Web Management Console itself uses the REST API, so every function you can perform
-            through the Web Management Console can be also be scripted and intergrated into other
+            through the Web Management Console can be also be scripted and integrated into other
             systems. This provides a simple integration point allowing the Broker to monitored and
-            controled from systems such as Naoios or BMC Control-M.</para>
+            controlled from systems such as Naoios or BMC Control-M.</para>
     </section>
 
     <section id="Java-Broker-Management-Channel-HTTP-DefaultConfiguration">

Modified: qpid/trunk/qpid/doc/book/src/java-broker/management/channels/Java-Broker-Management-Channel-JMX.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/java-broker/management/channels/Java-Broker-Management-Channel-JMX.xml?rev=1631195&r1=1631194&r2=1631195&view=diff
==============================================================================
--- qpid/trunk/qpid/doc/book/src/java-broker/management/channels/Java-Broker-Management-Channel-JMX.xml (original)
+++ qpid/trunk/qpid/doc/book/src/java-broker/management/channels/Java-Broker-Management-Channel-JMX.xml Sun Oct 12 15:48:18 2014
@@ -31,7 +31,7 @@
         <title>Introduction</title>
         <para>The JMX management plugin provides a series of managed beans (MBeans) allowing you to
             control and monitor the Broker via an industry compliant interface. This provides a
-            convenient intergration point for a variety of Infrastructure Monitoring Solutions,
+            convenient integration point for a variety of Infrastructure Monitoring Solutions,
             tools such as Jconsole and VisualVM, as well as custom Java programs and scripts.</para>
         <para>The following sections describe how to connect to JMX, the configuration of the JMX
             plugin covering topis including securing with SSL, programmatically interacting with
@@ -174,7 +174,7 @@ managedBroker.createNewQueue("myqueue", 
                         <entry>
                             <para>MBean corresponding to the named virtualhost. Allows operations
                                 such as the creation/deletion of queues and exchanges on that
-                                virtualhost and virtualhost levell statistics.</para>
+                                virtualhost and virtualhost level statistics.</para>
                         </entry>
                     </row>
                     <row>

Modified: qpid/trunk/qpid/doc/book/src/java-broker/management/channels/Java-Broker-Management-Channel-REST-API.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/java-broker/management/channels/Java-Broker-Management-Channel-REST-API.xml?rev=1631195&r1=1631194&r2=1631195&view=diff
==============================================================================
--- qpid/trunk/qpid/doc/book/src/java-broker/management/channels/Java-Broker-Management-Channel-REST-API.xml (original)
+++ qpid/trunk/qpid/doc/book/src/java-broker/management/channels/Java-Broker-Management-Channel-REST-API.xml Sun Oct 12 15:48:18 2014
@@ -30,7 +30,7 @@
     configured object, PUT to create or update the configured object and POST to perform the
     configured objects updates not available with the PUT requests.</para>
   <para>The REST API is versioned with the version number built into the URL. The general form of
-    the the URL is <literal>/api/&lt;version&gt;</literal>. For convience the alias
+    the URL is <literal>/api/&lt;version&gt;</literal>. For convenience the alias
       <literal>latest</literal> signifies the latest supported version. There are also some
     ancillary service prefixed by <literal>/service</literal>.</para>
 

Modified: qpid/trunk/qpid/doc/book/src/java-broker/management/channels/Java-Broker-Management-Channel-Web-Console.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/java-broker/management/channels/Java-Broker-Management-Channel-Web-Console.xml?rev=1631195&r1=1631194&r2=1631195&view=diff
==============================================================================
--- qpid/trunk/qpid/doc/book/src/java-broker/management/channels/Java-Broker-Management-Channel-Web-Console.xml (original)
+++ qpid/trunk/qpid/doc/book/src/java-broker/management/channels/Java-Broker-Management-Channel-Web-Console.xml Sun Oct 12 15:48:18 2014
@@ -23,7 +23,8 @@
 <section id="Java-Broker-Management-Channel-Web-Console">
     <title>Web Management Console</title>
     <para> The Web Management Console provides a simple and intuitive interface for the Management
-        and Control of the Broker. From here, all aspects of the Broker can be controled, including: <itemizedlist>
+        and Control of the Broker. From here, all aspects of the Broker can be controlled,
+        including: <itemizedlist>
             <listitem>
                 <para>add, remove and monitor queues</para>
             </listitem>
@@ -34,86 +35,195 @@
                 <para>add, remove and monitor virtualhosts</para>
             </listitem>
             <listitem>
-                <para>configure and control high availabiliy</para>
+                <para>configure and control high availability</para>
             </listitem>
         </itemizedlist>
     </para>
-    <para>The remainder of the section provides an introduction to the web managemnet console and
+    <para>The remainder of the section provides an introduction to the web management console and
         its use.</para>
     <section id="Java-Broker-Management-Channel-Web-Console-Accessing">
         <title>Accessing the Console</title>
         <para>The Web Management Console is provided by the HTTP Management Plugin. Providing the
             HTTP Management Plugin is in its default configuration, the Web Management Console can
-            be accessed by pointing a brower at the following URL:</para>
-        <para><literal>http://myhost.mydomain.com:8080</literal></para>
+            be accessed by pointing a browser at the following URL:</para>
+        <para>
+            <literal>http://myhost.mydomain.com:8080</literal>
+        </para>
         <para>The Console will prompt you to login using a username and password.</para>
-        <example>
+        <figure>
             <title>Web Management Console - Authentication</title>
-            <screenshot>
-                <graphic fileref="images/Management-Web-Auth.png" width="800px"/>
-            </screenshot>
-        </example>
+            <mediaobject>
+                <imageobject>
+                    <imagedata fileref="images/Management-Web-Auth.png" format="PNG" scalefit="1"/>
+                </imageobject>
+                <textobject>
+                    <phrase>Web Console Authentication</phrase>
+                </textobject>
+            </mediaobject>
+        </figure>
     </section>
     <section id="Java-Broker-Management-Channel-Web-Console-Orientation">
         <title>Orientation</title>
         <para>After you have logged on you will see a screen similar to the following. The elements
             of the screen are now explained.</para>
-        <example>
+        <figure>
             <title>Web Management Orientation - Console</title>
-            <screenshot>
-                <graphic fileref="images/Management-Web-Console.png" width="800px"/>
-            </screenshot>
-        </example>
+            <mediaobject>
+                <imageobject>
+                    <imagedata fileref="images/Management-Web-Console.png" format="PNG" scalefit="1"
+                    />
+                </imageobject>
+                <textobject>
+                    <phrase>The Web Console</phrase>
+                </textobject>
+            </mediaobject>
+        </figure>
         <para>
             <itemizedlist>
                 <listitem>
-                    <para><emphasis>A</emphasis> - Hierarchy view. Expandable/collapsable view showing all entities
-                        within the Broker. Double click on an entity name to cause its tab to be
-                        opened. </para>
+                    <para><emphasis>A</emphasis> - Hierarchy view. Expandable/collapsible view
+                        showing all entities within the Broker. Double click on an entity name to
+                        cause its tab to be opened. </para>
                 </listitem>
                 <listitem>
-                    <para><emphasis>B</emphasis> - Tab. Shows the details of an entity including its attributes and its
-                        child entities. </para>
+                    <para><emphasis>B</emphasis> - Tab. Shows the details of an entity including its
+                        attributes and its child entities. </para>
                 </listitem>
                 <listitem>
-                    <para><emphasis>C</emphasis> - Occluded tab. Click tab name to bring the tab to the front.</para>
+                    <para><emphasis>C</emphasis> - Occluded tab. Click tab name to bring the tab to
+                        the front.</para>
                 </listitem>
                 <listitem>
-                    <para><emphasis>D</emphasis> - Auto restore check box. Checked tabs will be automatically restored on
-                        subsequent login.</para>
+                    <para><emphasis>D</emphasis> - Auto restore check box. Checked tabs will be
+                        automatically restored on subsequent login.</para>
                 </listitem>
                 <listitem>
                     <para><emphasis>E</emphasis> - Close. Click to close the tab.</para>
                 </listitem>
                 <listitem>
-                    <para><emphasis>F</emphasis> - User Menu. Access to Preferences, Logout and Help.</para>
+                    <para><emphasis>F</emphasis> - User Menu. Access to Preferences, Logout and
+                        Help.</para>
                 </listitem>
             </itemizedlist>
         </para>
-        <example>
+        <figure id="Java-Broker-Management-Channel-Web-Console-Orientation-Tab">
             <title>Web Management Orientation - Tab</title>
-            <screenshot>
-                <graphic fileref="images/Management-Web-Tab.png" width="800px"/>
-            </screenshot>
-        </example>
+            <mediaobject>
+                <imageobject>
+                    <imagedata fileref="images/Management-Web-Tab.png" format="PNG" scalefit="1"/>
+                </imageobject>
+                <textobject>
+                    <phrase>A tab within the Web Consle</phrase>
+                </textobject>
+            </mediaobject>
+        </figure>
         <para>The elements of a tab are now explained: <itemizedlist>
                 <listitem>
-                    <para><emphasis>1</emphasis> - Attribute Panel. Shows the attributes of the entity. Click the panel
-                        title bar opens/closes the panel.</para>
+                    <para><emphasis>1</emphasis> - Attribute Panel. Shows the attributes of the
+                        entity. Click the panel title bar opens/closes the panel.</para>
                 </listitem>
                 <listitem>
-                    <para><emphasis>2</emphasis> - Child Panels. Panels containing a table listing the children of the entity. Click the panel
-                        title bar opens/closes the panel.</para>
+                    <para><emphasis>2</emphasis> - Child Panels. Panels containing a table listing
+                        the children of the entity. Click the panel title bar opens/closes the
+                        panel.</para>
                 </listitem>
                 <listitem>
-                    <para><emphasis>3</emphasis> - Child Row. Row summarizing a child entity. Double click to open the
-                        child tab.</para>
+                    <para><emphasis>3</emphasis> - Child Row. Row summarizing a child entity. Double
+                        click to open the child tab.</para>
                 </listitem>
                 <listitem>
-                    <para><emphasis>4</emphasis> - Child Operations. Buttons to add a new child or perform operations on existing children.</para>
+                    <para><emphasis>4</emphasis> - Child Operations. Buttons to add a new child or
+                        perform operations on existing children.</para>
                 </listitem>
             </itemizedlist>
         </para>
     </section>
+    <section id="Java-Broker-Management-Channel-Web-Console-Managing-Entities">
+        <title>Managing Entities</title>
+        <para>All the Entities of the Broker of can be managed through the Web Console.</para>
+        <section id="Java-Broker-Management-Channel-Web-Console-Managing-Entities-Add">
+            <title>Adding Entities</title>
+            <para>To <emphasis>add</emphasis> a new entity, click the <literal>Add</literal> button
+                on the Child Panel on the Parent's tab. Clicking the Add button causes an add
+                dialogue to be displayed.</para>
+            <para>Add dialogues allow you to set the attributes of the new child, and set context
+                variables. Most fields on the add dialogue have field level help that give more
+                details about the attribute and any default value that will take effect if you leave
+                the attribute unset. An example add dialogue is shown in the figure that
+                follows.</para>
+            <figure id="Java-Broker-Management-Channel-Web-Console-Orientation-Add-Dialogue">
+                <title>Web Management Orientation - Add Dialogue</title>
+                <mediaobject>
+                    <imageobject>
+                        <imagedata fileref="images/Management-Web-Add-Dialogue.png" format="PNG"
+                            scalefit="1"/>
+                    </imageobject>
+                    <textobject>
+                        <phrase>Example add dialogue</phrase>
+                    </textobject>
+                </mediaobject>
+            </figure>
+        </section>
+        <section id="Java-Broker-Management-Channel-Web-Console-Managing-Entities-Edit">
+            <title>Editing Entities</title>
+            <para>To <emphasis>edit</emphasis> an existing entity, click the <literal>Edit</literal>
+                button on the tab corresponding to the Entity itself. Editing an entity lets you
+                change some of its attributes and modify its context variables. Most fields on the
+                edit dialogue have field level help that give more details about the attribute and
+                any default value. An example edit dialogue is shown in the figure that
+                follows.</para>
+            <figure id="Java-Broker-Management-Channel-Web-Console-Orientation-Edit-Dialogue">
+                <title>Web Management Orientation - Edit Dialogue</title>
+                <mediaobject>
+                    <imageobject>
+                        <imagedata fileref="images/Management-Web-Edit-Dialogue.png" format="PNG"
+                            scalefit="1"/>
+                    </imageobject>
+                    <textobject>
+                        <phrase>Example edit dialogue</phrase>
+                    </textobject>
+                </mediaobject>
+            </figure>
+        </section>
+        <section id="Java-Broker-Management-Channel-Web-Console-Managing-Entities-Delete">
+            <title>Deleting Entities</title>
+            <para>To <emphasis>remove</emphasis> an existing entity, click the
+                    <literal>Delete</literal> button on the tab corresponding to the Entity itself.
+                For some child types, you can select many children from the parent's type and delete
+                many children at once.</para>
+        </section>
+        <section id="Java-Broker-Management-Channel-Web-Console-Managing-Context Variables">
+            <title>Context Variables</title>
+            <para>All Entities within the Broker have the ability to have <link
+                    linkend="Java-Broker-Management-Managing-Entities-General">context
+                    variables</link> associated with them.</para>
+            <para>Most add and edit dialogues have the ability to make context variable assignments.
+                To add/change/remove a context variable, click the Context Variable panel to expand
+                it.</para>
+            <figure id="Java-Broker-Management-Channel-Web-Console-Orientation-Edit-Dialogue">
+                <title>Web Management Orientation - Context Variables</title>
+                <mediaobject>
+                    <imageobject>
+                        <imagedata fileref="images/Management-Web-ContextVar.png" format="PNG"
+                            scalefit="1"/>
+                    </imageobject>
+                    <textobject>
+                        <phrase>Editting Context Variables</phrase>
+                    </textobject>
+                </mediaobject>
+            </figure>
+            <para>You will see any context varaiables already associated with the object, called
+                local context variables in bold, and any inherited from above in normal face.</para>
+            <para>Since context variables can be defined in terms of other context variables, the
+                display has two value columns: actual and effective. Actual shows the value truely
+                associated with the variable, where as effective shows the resulting value, after
+                variable expansion has taken place.</para>
+            <para>The <literal>+</literal> button allows new variables to be added. The
+                    <literal>-</literal> button removes existing one.</para>
+            <para>You change an existing local variables defintion by clicking on the actual value.
+                You can also <emphasis>provide a local definition</emphasis> for an inherited value
+                by clicking on the actual value and typing its new value.</para>
+        </section>
+    </section>
 
 </section>

Modified: qpid/trunk/qpid/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-Broker.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-Broker.xml?rev=1631195&r1=1631194&r2=1631195&view=diff
==============================================================================
--- qpid/trunk/qpid/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-Broker.xml (original)
+++ qpid/trunk/qpid/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-Broker.xml Sun Oct 12 15:48:18 2014
@@ -23,7 +23,7 @@
 <section id="Java-Broker-Management-Managing-Broker">
   <title>Broker</title>
   <para>The <link linkend="Java-Broker-Concepts-Broker">Broker</link> is the principal entity. It is
-    composed on a number of other entities that colabrate together to provide message broker
+    composed on a number of other entities that collaborate to provide message broker
     facilities.</para>
   <para>The Broker can only be managed via the HTTP management channel.</para>
   <section id="Java-Broker-Management-Managing-Broker-Attributes">
@@ -49,7 +49,9 @@
     <para>
       <itemizedlist>
         <listitem><para><emphasis>broker.flowToDiskThreshold</emphasis> Controls the <link linkend="Java-Broker-Runtime-Flow-To-Disk">flow to disk</link> feature.</para></listitem>
+        <listitem><para><emphasis>broker.messageCompressionEnabled</emphasis> Controls the message compression feature (co-operative feature with some Qpid clients).</para></listitem>
       </itemizedlist>
+      
     </para>
   </section>
   <section id="Java-Broker-Management-Managing-Broker-Children">

Modified: qpid/trunk/qpid/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-Plugins-HTTP.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-Plugins-HTTP.xml?rev=1631195&r1=1631194&r2=1631195&view=diff
==============================================================================
--- qpid/trunk/qpid/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-Plugins-HTTP.xml (original)
+++ qpid/trunk/qpid/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-Plugins-HTTP.xml Sun Oct 12 15:48:18 2014
@@ -22,8 +22,8 @@
 
 <section id="Java-Broker-Management-Managing-Plugin-HTTP">
     <title>HTTP Plugin</title>
-    <para>The HTTP Plugin provides the <link linkend="Java-Broker-Management-Channel-HTTP">HTTP managenenent channel</link> comprising of the <link linkend="Java-Broker-Management-Channel-Web-Console">Web
-        Managemnt Console</link> and the <link linkend="Java-Broker-Management-Channel-REST-API">REST API</link>.</para>
+    <para>The HTTP Plugin provides the <link linkend="Java-Broker-Management-Channel-HTTP">HTTP management channel</link> comprising of the <link linkend="Java-Broker-Management-Channel-Web-Console">Web
+        Management Console</link> and the <link linkend="Java-Broker-Management-Channel-REST-API">REST API</link>.</para>
     <section id="Java-Broker-Management-Managing-Plugin-HTTP-Attributes">
         <title>Attributes</title>
         <para>

Modified: qpid/trunk/qpid/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-Plugins-JMX.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-Plugins-JMX.xml?rev=1631195&r1=1631194&r2=1631195&view=diff
==============================================================================
--- qpid/trunk/qpid/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-Plugins-JMX.xml (original)
+++ qpid/trunk/qpid/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-Plugins-JMX.xml Sun Oct 12 15:48:18 2014
@@ -23,7 +23,7 @@
 <section id="Java-Broker-Management-Managing-Plugins-JMX">
     <title>JMX Plugin</title>
     <para>
-        The JMX Plugin provides the <link linkend="Java-Broker-Management-Channel-JMX">JMX managenenent channel</link>.
+        The JMX Plugin provides the <link linkend="Java-Broker-Management-Channel-JMX">JMX management channel</link>.
     </para>
     <para>TODO</para>
 </section>

Modified: qpid/trunk/qpid/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-Queues.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-Queues.xml?rev=1631195&r1=1631194&r2=1631195&view=diff
==============================================================================
--- qpid/trunk/qpid/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-Queues.xml (original)
+++ qpid/trunk/qpid/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-Queues.xml Sun Oct 12 15:48:18 2014
@@ -113,7 +113,7 @@
         <listitem>
           <para><emphasis>Maximum/Minimum TTL</emphasis>. Defines a maximum and minimum
             time-to-live. Messages arriving with ttl larger than the maximum will be overridden by
-            the maximum. Similarly, messages arriving with tll less than the miniumum (or no ttl at
+            the maximum. Similarly, messages arriving with tll less than the minimum (or no ttl at
             all), will be overridden by the minimum.</para>
           <para>Changing these values affects only new arrivals, existing messages already on the
             queue are not affected.</para>
@@ -130,7 +130,7 @@
         </listitem>
         <listitem>
           <para><emphasis>Alerting Thresholds</emphasis>. Queues have the ability to alert on a
-            variety of conditions: totol queue depth exceeded a number or size, message age exceeded
+            variety of conditions: total queue depth exceeded a number or size, message age exceeded
             a threshold, message size exceeded a threshold. These thresholds are soft. See <xref
               linkend="Java-Broker-Appendix-Queue-Alerts"/></para>
         </listitem>

Modified: qpid/trunk/qpid/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-RemoteReplicationNodes.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-RemoteReplicationNodes.xml?rev=1631195&r1=1631194&r2=1631195&view=diff
==============================================================================
--- qpid/trunk/qpid/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-RemoteReplicationNodes.xml (original)
+++ qpid/trunk/qpid/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-RemoteReplicationNodes.xml Sun Oct 12 15:48:18 2014
@@ -24,7 +24,7 @@
   <title>Remote Replication Nodes</title>
   <para>Used for HA only. A <link linkend="Java-Broker-Concepts-RemoteReplicationNodes">remote replication node</link> is a representation of another virtualhost node
     in the group. Remote replication nodes are not created directly. Instead the system
-    automatically creates a remote replciation node for every node in the group. It serves to
+    automatically creates a remote replication node for every node in the group. It serves to
     provide a view of the whole group from every node in the system.</para>
   <section id="Java-Broker-Management-Managing-RemoteReplicationNodes-Attributes">
     <title>Attributes</title>
@@ -43,7 +43,7 @@
                 <para><emphasis>REPLICA</emphasis> - Remote node is a replica.</para>
               </listitem>
               <listitem>
-                <para><emphasis>UNREACHABLE</emphasis> - Remote node unreachanble from this node.
+                <para><emphasis>UNREACHABLE</emphasis> - Remote node unreachable from this node.
                   This remote note may be down, or an network problem may prevent it from being
                   contacted.</para>
               </listitem>
@@ -96,7 +96,7 @@
                 <para>The current master awaits the proposed master to become up to date.</para>
               </listitem>
               <listitem>
-                <para>The mastership is transfered. This will automatically disconnect messaging
+                <para>The mastership is transferred. This will automatically disconnect messaging
                   clients from the old master, and in-flight transactions are rolled back. Messaging
                   clients reconnect to the new master.</para>
               </listitem>

Modified: qpid/trunk/qpid/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-Truststores.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-Truststores.xml?rev=1631195&r1=1631194&r2=1631195&view=diff
==============================================================================
--- qpid/trunk/qpid/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-Truststores.xml (original)
+++ qpid/trunk/qpid/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-Truststores.xml Sun Oct 12 15:48:18 2014
@@ -58,10 +58,8 @@
                 </listitem>
                 <listitem>
                     <para><emphasis>Peers only</emphasis>. When "Peers Only" option is selected for
-                        the Truststore it will allow logging in for the clients with the certificate
-                        exactly matching the certificate loaded in the Truststore database, thus,
-                        authenticating the connections with self signed certificates not nessesary
-                        signed by CA.</para>
+                        the Truststore it will allow authenticate only those clients that present a certificate
+                        exactly matching a certificate contained within the Truststore database.</para>
                 </listitem>
             </itemizedlist></para>
     </section>

Modified: qpid/trunk/qpid/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-VirtualHostNodes.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-VirtualHostNodes.xml?rev=1631195&r1=1631194&r2=1631195&view=diff
==============================================================================
--- qpid/trunk/qpid/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-VirtualHostNodes.xml (original)
+++ qpid/trunk/qpid/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-VirtualHostNodes.xml Sun Oct 12 15:48:18 2014
@@ -26,24 +26,26 @@
   <section id="Java-Broker-Management-Managing-Virtualhost-Nodes-Types">
     <title>Types</title>
     <para> The following virtualhost nodes types are supported. <itemizedlist>
-      <listitem><para>BDB - Node backed with Oracle BDB <footnote>
-        <para>Oracle BDB JE is optional. See <xref
-          linkend="Java-Broker-Miscellaneous-Installing-Oracle-BDB-JE"/>.</para>
-      </footnote></para></listitem>
-      <listitem><para>BDB HA - Node backed with Oracle BDB utilising High Availablity</para></listitem>
-      <listitem><para>DERBY - Node backed with Apache Derby</para></listitem>
-      <listitem><para>JDBC - Node backed with an external database <footnote>
-        <para>JDBC 4.0 compatible drivers must be available. See <xref
-          linkend="Java-Broker-Miscellaneous-Installing-External-JDBC-Driver"/></para>
-      </footnote></para></listitem>
-      <listitem><para>JSON - Node backed with a file containing json</para></listitem>
-      <listitem><para>Memory - In-memory node (changes lost on Broker restart)</para></listitem>
-    </itemizedlist>
+        <listitem><para>BDB - Node backed with Oracle BDB <footnote>
+              <para>Oracle BDB JE is optional. See <xref
+                  linkend="Java-Broker-Miscellaneous-Installing-Oracle-BDB-JE"/>.</para>
+            </footnote></para></listitem>
+        <listitem><para>BDB HA - Node backed with Oracle BDB utilising High
+          Availability</para></listitem>
+        <listitem><para>DERBY - Node backed with Apache Derby</para></listitem>
+        <listitem><para>JDBC - Node backed with an external database <footnote>
+              <para>JDBC 4.0 compatible drivers must be available. See <xref
+                  linkend="Java-Broker-Miscellaneous-Installing-External-JDBC-Driver"/></para>
+            </footnote></para></listitem>
+        <listitem><para>JSON - Node backed with a file containing json</para></listitem>
+        <listitem><para>Memory - In-memory node (changes lost on Broker restart)</para></listitem>
+      </itemizedlist>
     </para>
   </section>
   <section id="Java-Broker-Management-Managing-Virtualhost-Nodes-Attributes">
     <title>Attributes</title>
-    <para><itemizedlist>
+    <para>
+      <itemizedlist>
         <listitem>
           <para><emphasis>Name the virtualhost node</emphasis>.</para>
         </listitem>
@@ -52,8 +54,8 @@
             configuration of the virtualhost.</para>
         </listitem>
         <listitem>
-          <para><emphasis>Role</emphasis> (HA only). The role that this node is currently playing in the
-            group. <itemizedlist>
+          <para><emphasis>Role</emphasis> (HA only). The role that this node is currently playing in
+            the group. <itemizedlist>
               <listitem>
                 <para>MASTER - Virtualhost node is a master.</para>
               </listitem>
@@ -69,26 +71,40 @@
               </listitem>
             </itemizedlist></para>
         </listitem>
-      <listitem>
-        <para><emphasis>Priority</emphasis> (HA only). The priority of this node when elections occurs.  The attribute can be used to make it more likely for a node to be elected than other nodes, or disallow the node from never being elected at all.  See <xref linkend="Java-Broker-High-Availability"/></para>
-      </listitem>
-      <listitem>
-        <para><emphasis>Minimum Number Of Nodes</emphasis> (HA only - groups of three or more). Allows the number of nodes required to hold an election to be reduced in order that service can be restore when less than quorum nodes are present. See <xref linkend="Java-Broker-High-Availability"/></para>
-      </listitem>
-      <listitem>
-        <para><emphasis>Designated Primary</emphasis> (HA only - groups of two). Allows a single node in a two node group to operate solo.  See <xref linkend="Java-Broker-High-Availability"/></para>
-      </listitem>
-    </itemizedlist></para>
+        <listitem>
+          <para><emphasis>Priority</emphasis> (HA only). The priority of this node when elections
+            occurs. The attribute can be used to make it more likely for a node to be elected than
+            other nodes, or disallow the node from never being elected at all. See <xref
+              linkend="Java-Broker-High-Availability-Behaviour-NodePriority"/></para>
+        </listitem>
+        <listitem>
+          <para><emphasis>Minimum Number Of Nodes</emphasis> (HA only - groups of three or more).
+            Allows the number of nodes required to hold an election to be reduced in order that
+            service can be restore when less than quorum nodes are present. See <xref
+              linkend="Java-Broker-High-Availability-Behaviour-MinimumNumberOfNodes"/></para>
+        </listitem>
+        <listitem>
+          <para><emphasis>Designated Primary</emphasis> (HA only - groups of two). Allows a single
+            node in a two node group to operate solo. See <xref
+              linkend="Java-Broker-High-Availability-Behaviour-DesignatedPrimary"/></para>
+        </listitem>
+      </itemizedlist>
+    </para>
   </section>
   <section id="Java-Broker-Management-Managing-Virtualhost-Node-Children">
     <title>Children</title>
     <para>
       <itemizedlist>
         <listitem>
-          <para><link linkend="Java-Broker-Management-Managing-Virtualhosts">Virtualhost</link></para>
+          <para>
+            <link linkend="Java-Broker-Management-Managing-Virtualhosts">Virtualhost</link>
+          </para>
         </listitem>
         <listitem>
-          <para><link linkend="Java-Broker-Management-Managing-RemoteReplicationNodes">Remote Replication Nodes</link></para>
+          <para>
+            <link linkend="Java-Broker-Management-Managing-RemoteReplicationNodes">Remote
+              Replication Nodes</link>
+          </para>
         </listitem>
       </itemizedlist>
     </para>
@@ -115,8 +131,8 @@
         <listitem>
           <para><emphasis>Delete</emphasis>. Deletes the virtualhost node and the virtualhost
             contained within it. All exchanges and queues, any the messages contained within it are
-            removed. In the HA case, deleting the virtualhost node causes it be be removed
-            permantently from the group.</para>
+            removed. In the HA case, deleting the virtualhost node causes it be removed
+            permanently from the group.</para>
         </listitem>
       </itemizedlist>
     </para>

Modified: qpid/trunk/qpid/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-Virtualhosts.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-Virtualhosts.xml?rev=1631195&r1=1631194&r2=1631195&view=diff
==============================================================================
--- qpid/trunk/qpid/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-Virtualhosts.xml (original)
+++ qpid/trunk/qpid/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-Virtualhosts.xml Sun Oct 12 15:48:18 2014
@@ -35,7 +35,7 @@
             </footnote></para>
         </listitem>
         <listitem>
-          <para>BDB HA - Virtualhost backed with Oracle BDB utilising High Availablity</para>
+          <para>BDB HA - Virtualhost backed with Oracle BDB utilising High Availability</para>
         </listitem>
         <listitem>
           <para>DERBY - Virtualhost backed with Apache Derby</para>
@@ -50,7 +50,7 @@
           <para>Memory - In-memory node (changes lost on Broker restart)</para>
         </listitem>
         <listitem>
-          <para>Provided - Virtualhost that colocates message data within the parent virtualhost
+          <para>Provided - Virtualhost that co-locates message data within the parent virtualhost
             node <footnote>
               <para>Not available if Virtualhost Node type is JSON.</para>
             </footnote>.</para>
@@ -93,6 +93,10 @@
             transactions. See <xref linkend="Java-Broker-Runtime-Producer-Transaction-Timeout"
             /></para>
         </listitem>
+        <listitem>
+          <para><emphasis>Synchronization policy</emphasis>. HA only. See <xref
+              linkend="Java-Broker-High-Availability-Behaviour-SynchronizationPolicy"/></para>
+        </listitem>
       </itemizedlist>
     </para>
   </section>



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


Mime
View raw message