You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by jo...@apache.org on 2010/03/01 23:34:31 UTC

svn commit: r917763 [1/2] - /qpid/trunk/qpid/doc/book/src/

Author: jonathan
Date: Mon Mar  1 22:34:29 2010
New Revision: 917763

URL: http://svn.apache.org/viewvc?rev=917763&view=rev
Log:
Fixed many links, added Apache header to each file. 

Added:
    qpid/trunk/qpid/doc/book/src/Managing-CPP-Broker.xml
      - copied, changed from r908503, qpid/trunk/qpid/doc/book/src/82403.xml
    qpid/trunk/qpid/doc/book/src/Running-CPP-Broker.xml
      - copied, changed from r908503, qpid/trunk/qpid/doc/book/src/RASC.xml
Removed:
    qpid/trunk/qpid/doc/book/src/82403.xml
    qpid/trunk/qpid/doc/book/src/Brokers.xml
    qpid/trunk/qpid/doc/book/src/RASC.xml
Modified:
    qpid/trunk/qpid/doc/book/src/ACL.xml
    qpid/trunk/qpid/doc/book/src/AMQP-.NET-Messaging-Client.xml
    qpid/trunk/qpid/doc/book/src/AMQP-C++-Messaging-Client.xml
    qpid/trunk/qpid/doc/book/src/AMQP-Compatibility.xml
    qpid/trunk/qpid/doc/book/src/AMQP-Java-JMS-Messaging-Client.xml
    qpid/trunk/qpid/doc/book/src/AMQP-Messaging-Broker-CPP.xml
    qpid/trunk/qpid/doc/book/src/AMQP-Messaging-Broker-Java.xml
    qpid/trunk/qpid/doc/book/src/AMQP-Python-Messaging-Client.xml
    qpid/trunk/qpid/doc/book/src/AMQP-Ruby-Messaging-Client.xml
    qpid/trunk/qpid/doc/book/src/AMQP.xml
    qpid/trunk/qpid/doc/book/src/Add-New-Users.xml
    qpid/trunk/qpid/doc/book/src/Binding-URL-Format.xml
    qpid/trunk/qpid/doc/book/src/Book-Info.xml
    qpid/trunk/qpid/doc/book/src/Book.xml
    qpid/trunk/qpid/doc/book/src/Cheat-Sheet-for-configuring-Exchange-Options.xml
    qpid/trunk/qpid/doc/book/src/Cheat-Sheet-for-configuring-Queue-Options.xml
    qpid/trunk/qpid/doc/book/src/Configure-ACLs.xml
    qpid/trunk/qpid/doc/book/src/Configure-Java-Qpid-to-use-a-SSL-connection.xml
    qpid/trunk/qpid/doc/book/src/Configure-Log4j-CompositeRolling-Appender.xml
    qpid/trunk/qpid/doc/book/src/Configure-the-Broker-via-config.xml.xml
    qpid/trunk/qpid/doc/book/src/Configure-the-Virtual-Hosts-via-virtualhosts.xml.xml
    qpid/trunk/qpid/doc/book/src/Configuring-Management-Users.xml
    qpid/trunk/qpid/doc/book/src/Configuring-Qpid-JMX-Management-Console.xml
    qpid/trunk/qpid/doc/book/src/Connection-URL-Format.xml
    qpid/trunk/qpid/doc/book/src/Debug-using-log4j.xml
    qpid/trunk/qpid/doc/book/src/Download.xml
    qpid/trunk/qpid/doc/book/src/Excel-AddIn.xml
    qpid/trunk/qpid/doc/book/src/Getting-Started.xml
    qpid/trunk/qpid/doc/book/src/How-to-Tune-M3-Java-Broker-Performance.xml
    qpid/trunk/qpid/doc/book/src/How-to-Use-JNDI.xml
    qpid/trunk/qpid/doc/book/src/Introduction.xml
    qpid/trunk/qpid/doc/book/src/Java-Broker-Feature-Guide.xml
    qpid/trunk/qpid/doc/book/src/Java-Environment-Variables.xml
    qpid/trunk/qpid/doc/book/src/LVQ.xml
    qpid/trunk/qpid/doc/book/src/Management-Console-Security.xml
    qpid/trunk/qpid/doc/book/src/Management-Design-notes.xml
    qpid/trunk/qpid/doc/book/src/MessageStore-Tool.xml
    qpid/trunk/qpid/doc/book/src/NET-User-Guide.xml
    qpid/trunk/qpid/doc/book/src/PythonBrokerTest.xml
    qpid/trunk/qpid/doc/book/src/QMF-Python-Console-Tutorial.xml
    qpid/trunk/qpid/doc/book/src/QMan-Qpid-Management-bridge.xml
    qpid/trunk/qpid/doc/book/src/Qpid-Interoperability-Documentation.xml
    qpid/trunk/qpid/doc/book/src/Qpid-JMX-Management-Console-FAQ.xml
    qpid/trunk/qpid/doc/book/src/Qpid-JMX-Management-Console-User-Guide.xml
    qpid/trunk/qpid/doc/book/src/Qpid-JMX-Management-Console.xml
    qpid/trunk/qpid/doc/book/src/Qpid-Java-Broker-Management-CLI.xml
    qpid/trunk/qpid/doc/book/src/Qpid-Java-Build-How-To.xml
    qpid/trunk/qpid/doc/book/src/Qpid-Java-FAQ.xml
    qpid/trunk/qpid/doc/book/src/Qpid-Management-Features.xml
    qpid/trunk/qpid/doc/book/src/Qpid-Management-Framework.xml
    qpid/trunk/qpid/doc/book/src/Qpid-Troubleshooting-Guide.xml
    qpid/trunk/qpid/doc/book/src/SSL.xml
    qpid/trunk/qpid/doc/book/src/Starting-a-cluster.xml
    qpid/trunk/qpid/doc/book/src/System-Properties.xml
    qpid/trunk/qpid/doc/book/src/Use-Priority-Queues.xml
    qpid/trunk/qpid/doc/book/src/Using-Broker-Federation.xml
    qpid/trunk/qpid/doc/book/src/Using-Qpid-with-other-JNDI-Providers.xml
    qpid/trunk/qpid/doc/book/src/WCF.xml
    qpid/trunk/qpid/doc/book/src/queue-state-replication.xml
    qpid/trunk/qpid/doc/book/src/schemas.xml

Modified: qpid/trunk/qpid/doc/book/src/ACL.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/ACL.xml?rev=917763&r1=917762&r2=917763&view=diff
==============================================================================
--- qpid/trunk/qpid/doc/book/src/ACL.xml (original)
+++ qpid/trunk/qpid/doc/book/src/ACL.xml Mon Mar  1 22:34:29 2010
@@ -20,17 +20,20 @@
  
 -->
 
-<chapter xmlns:html="http://www.w3.org/1999/xhtml"><title>
+<section id="qpid_ACL">
+  <title>
       Apache Qpid : ACL
-    </title><section role="h2" id="ACL-v2ACLfileformatforbrokers"><title>
-            v2 ACL file format
-            for brokers
-          </title>
-          <para>
-            This new ACL implementation has been designed for implementation
-            and interoperability on all Qpid brokers. It is currently
-            supported in the following brokers:
-          </para>
+  </title>
+
+  <section role="h2" id="ACL-v2ACLfileformatforbrokers">
+    <title>
+      v2 ACL file format for brokers
+    </title>
+    <para>
+      This new ACL implementation has been designed for implementation
+      and interoperability on all Qpid brokers. It is currently
+      supported in the following brokers:
+    </para>
 
 	  <table><title/><tgroup cols="2">
 	  <thead>
@@ -789,4 +792,4 @@
 	  <!--h3--></section>
 	<!--h2--></section>
 
-</chapter>
+</section>

Modified: qpid/trunk/qpid/doc/book/src/AMQP-.NET-Messaging-Client.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/AMQP-.NET-Messaging-Client.xml?rev=917763&r1=917762&r2=917763&view=diff
==============================================================================
--- qpid/trunk/qpid/doc/book/src/AMQP-.NET-Messaging-Client.xml (original)
+++ qpid/trunk/qpid/doc/book/src/AMQP-.NET-Messaging-Client.xml Mon Mar  1 22:34:29 2010
@@ -20,7 +20,7 @@
  
 -->
 
-<chapter xmlns:html="http://www.w3.org/1999/xhtml"  xmlns:xi="http://www.w3.org/2001/XInclude">
+<chapter>
   <title>
     Apache Qpid : AMQP .NET Messaging Client
   </title>
@@ -40,9 +40,9 @@
       User Guides
     </title>
         
-    <xi:include href="NET%20User%20Guide.xml"/>
-    <xi:include href="Excel%20AddIn.xml"/>
-    <xi:include href="WCF.xml"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="NET-User-Guide.xml"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Excel-AddIn.xml"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="WCF.xml"/>
   </section>
 
   <section role="h3" id="AMQP.NETMessagingClient-Examples">
@@ -68,7 +68,7 @@
     <itemizedlist>
     <listitem>
       <para>
-	<xref linkend="qpid_Developer-20Pages"/>
+	<xref linkend="qpid_Developer-Pages"/>
       </para>
     </listitem>
     <listitem>
@@ -79,7 +79,7 @@
       <itemizedlist>
 	<listitem>
 	  <para>
-	    <xref linkend="qpid_Build-20.NET-20Client"/>
+	    <xref linkend="qpid_Build-.NET-Client"/>
 	  </para>
 	</listitem>
 	<listitem>
@@ -89,12 +89,12 @@
 	</listitem>
 	<listitem>
 	  <para>
-	    <xref linkend="qpid_Run-20tests"/>
+	    <xref linkend="qpid_Run-tests"/>
 	  </para>
 	</listitem>
 	<listitem>
 	  <para>
-	    <xref linkend="qpid_Setup-20.Net-20Client-20on-20Windows"/>
+	    <xref linkend="qpid_Setup-.Net-Client-on-Windows"/>
 	  </para>
 	</listitem>
       </itemizedlist>

Modified: qpid/trunk/qpid/doc/book/src/AMQP-C++-Messaging-Client.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/AMQP-C%2B%2B-Messaging-Client.xml?rev=917763&r1=917762&r2=917763&view=diff
==============================================================================
--- qpid/trunk/qpid/doc/book/src/AMQP-C++-Messaging-Client.xml (original)
+++ qpid/trunk/qpid/doc/book/src/AMQP-C++-Messaging-Client.xml Mon Mar  1 22:34:29 2010
@@ -20,7 +20,7 @@
  
 -->
 
-<chapter xmlns:html="http://www.w3.org/1999/xhtml">
+<chapter >
   <title>
     Apache Qpid : AMQP C++ Messaging Client
   </title>

Modified: qpid/trunk/qpid/doc/book/src/AMQP-Compatibility.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/AMQP-Compatibility.xml?rev=917763&r1=917762&r2=917763&view=diff
==============================================================================
--- qpid/trunk/qpid/doc/book/src/AMQP-Compatibility.xml (original)
+++ qpid/trunk/qpid/doc/book/src/AMQP-Compatibility.xml Mon Mar  1 22:34:29 2010
@@ -20,7 +20,7 @@
  
 -->
 
-<chapter xmlns:html="http://www.w3.org/1999/xhtml" id="AMQP-Compatibility">
+<chapter id="AMQP-Compatibility">
   <title>
       Apache Qpid : AMQP compatibility
     </title>

Modified: qpid/trunk/qpid/doc/book/src/AMQP-Java-JMS-Messaging-Client.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/AMQP-Java-JMS-Messaging-Client.xml?rev=917763&r1=917762&r2=917763&view=diff
==============================================================================
--- qpid/trunk/qpid/doc/book/src/AMQP-Java-JMS-Messaging-Client.xml (original)
+++ qpid/trunk/qpid/doc/book/src/AMQP-Java-JMS-Messaging-Client.xml Mon Mar  1 22:34:29 2010
@@ -20,7 +20,7 @@
  
 -->
 
-<chapter xmlns:html="http://www.w3.org/1999/xhtml">
+<chapter>
 
   <title>
       Apache Qpid : AMQP Java JMS Messaging Client
@@ -42,13 +42,12 @@
             <listitem><para>AMQP Java JMS Client Feature Guide
             </para></listitem>
 
-http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=qpid&title=JMS%20Client%20Feature%20Guide&linkCreation=true&fromPageId=4589057
+http://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=qpid&title=JMS-Client-Feature-Guide&linkCreation=true&fromPageId=4589057
 -->
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Qpid%20Java%20FAQ.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="System%20Properties.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Connection%20URL%20Format.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Binding%20URL%20Format.xml"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="System-Properties.xml"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Connection-URL-Format.xml"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Binding-URL-Format.xml"/>
 
 <!--
             <listitem><para>How to Use JNDI to configure the AMQP Java JMS Client

Modified: qpid/trunk/qpid/doc/book/src/AMQP-Messaging-Broker-CPP.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/AMQP-Messaging-Broker-CPP.xml?rev=917763&r1=917762&r2=917763&view=diff
==============================================================================
--- qpid/trunk/qpid/doc/book/src/AMQP-Messaging-Broker-CPP.xml (original)
+++ qpid/trunk/qpid/doc/book/src/AMQP-Messaging-Broker-CPP.xml Mon Mar  1 22:34:29 2010
@@ -40,29 +40,29 @@
       Running the AMQP Messaging Broker
     </title>
     
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="RASC.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Cheat%20Sheet%20for%20configuring%20Queue%20Options.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Cheat%20Sheet%20for%20configuring%20Exchange%20Options.xml"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Running-CPP-Broker.xml"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Cheat-Sheet-for-configuring-Queue-Options.xml"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Cheat-Sheet-for-configuring-Exchange-Options.xml"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Using%20Broker%20Federation.xml"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Using-Broker-Federation.xml"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="SSL.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="LVQ.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="queue%20state%20replication.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Starting%20a%20cluster.xml"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="queue-state-replication.xml"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Starting-a-cluster.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ACL.xml"/> 
 </chapter>
  
 
-<chapter>
+<chapter id="chapter-Managing-CPP-Broker">
     <title>            
       Managing the AMQP Messaging Broker
     </title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="82403.xml"/> 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="QMan%20-%20Qpid%20Management%20bridge.xml"/> 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Qpid%20Management%20Framework.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Management%20Design%20notes.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="QMF%20Python%20Console%20Tutorial.xml"/> 
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Managing-CPP-Broker.xml"/> 
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="QMan-Qpid-Management-bridge.xml"/> 
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Qpid-Management-Framework.xml"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Management-Design-notes.xml"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="QMF-Python-Console-Tutorial.xml"/> 
 </chapter>
 </part>

Modified: qpid/trunk/qpid/doc/book/src/AMQP-Messaging-Broker-Java.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/AMQP-Messaging-Broker-Java.xml?rev=917763&r1=917762&r2=917763&view=diff
==============================================================================
--- qpid/trunk/qpid/doc/book/src/AMQP-Messaging-Broker-Java.xml (original)
+++ qpid/trunk/qpid/doc/book/src/AMQP-Messaging-Broker-Java.xml Mon Mar  1 22:34:29 2010
@@ -38,34 +38,33 @@
 <chapter>
   <title>General User Guides</title>
 
-        <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Java%20Broker%20Feature%20Guide.xml"/>
-        <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Qpid%20Java%20FAQ.xml"/>
-        <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Java%20Environment%20Variables.xml"/>
-        <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Qpid%20Troubleshooting%20Guide.xml"/>
+        <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Java-Broker-Feature-Guide.xml"/>
+        <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Qpid-Java-FAQ.xml"/>
+        <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Java-Environment-Variables.xml"/>
+        <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Qpid-Troubleshooting-Guide.xml"/>
 </chapter>
 
-<chapter  id="AMQPMessagingBroker%28implementedinJava%29-HowTos">
+<chapter  id="Qpid-Java-Broker-HowTos">
 <title>How Tos</title>
 
-        <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Add%20New%20Users.xml"/>
-        <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Configure%20ACLs.xml"/>
-        <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Configure%20Java%20Qpid%20to%20use%20a%20SSL%20connection..xml"/>
-        <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Configure%20Log4j%20CompositeRolling%20Appender.xml"/>
-        <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Configure%20the%20Broker%20via%20config.xml.xml"/>
-        <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Configure%20the%20Virtual%20Hosts%20via%20virtualhosts.xml.xml"/>
-        <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Debug%20using%20log4j.xml"/>
-        <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="How%20to%20Tune%20M3%20Java%20Broker%20Performance.xml"/>
-        <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Qpid%20Java%20Build%20How%20To.xml"/>
-        <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Use%20Priority%20Queues.xml"/>
+        <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Add-New-Users.xml"/>
+        <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Configure-ACLs.xml"/>
+        <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Configure-Java-Qpid-to-use-a-SSL-connection.xml"/>
+        <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Configure-Log4j-CompositeRolling-Appender.xml"/>
+        <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Configure-the-Broker-via-config.xml.xml"/>
+        <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Configure-the-Virtual-Hosts-via-virtualhosts.xml.xml"/>
+        <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Debug-using-log4j.xml"/>
+        <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="How-to-Tune-M3-Java-Broker-Performance.xml"/>
+        <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Qpid-Java-Build-How-To.xml"/>
+        <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Use-Priority-Queues.xml"/>
 </chapter>
 
-<chapter id="AMQPMessagingBroker%28implementedinJava%29-ManagementTools">
-<title>Management Tools</title>
 
-        <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Qpid%20JMX%20Management%20Console.xml"/>
-        <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="MessageStore%20Tool.xml"/>
-        <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Qpid%20Java%20Broker%20Management%20CLI.xml"/>
-        <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Management%20Design%20notes.xml"/>
+<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Qpid-JMX-Management-Console.xml"/>
 
+<chapter id="QpidJavaBroker-ManagementTools">
+<title>Management Tools</title>
+        <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="MessageStore-Tool.xml"/>
+        <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Qpid-Java-Broker-Management-CLI.xml"/>
 </chapter>
 </part>

Modified: qpid/trunk/qpid/doc/book/src/AMQP-Python-Messaging-Client.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/AMQP-Python-Messaging-Client.xml?rev=917763&r1=917762&r2=917763&view=diff
==============================================================================
--- qpid/trunk/qpid/doc/book/src/AMQP-Python-Messaging-Client.xml (original)
+++ qpid/trunk/qpid/doc/book/src/AMQP-Python-Messaging-Client.xml Mon Mar  1 22:34:29 2010
@@ -20,7 +20,7 @@
  
 -->
 
-<chapter xmlns:html="http://www.w3.org/1999/xhtml">
+<chapter>
   <title>
     Apache Qpid : AMQP Python Messaging Client
   </title>

Modified: qpid/trunk/qpid/doc/book/src/AMQP-Ruby-Messaging-Client.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/AMQP-Ruby-Messaging-Client.xml?rev=917763&r1=917762&r2=917763&view=diff
==============================================================================
--- qpid/trunk/qpid/doc/book/src/AMQP-Ruby-Messaging-Client.xml (original)
+++ qpid/trunk/qpid/doc/book/src/AMQP-Ruby-Messaging-Client.xml Mon Mar  1 22:34:29 2010
@@ -20,7 +20,7 @@
  
 -->
 
-<chapter xmlns:html="http://www.w3.org/1999/xhtml">
+<chapter>
   <title>
     Apache Qpid : AMQP Ruby Messaging Client
   </title>

Modified: qpid/trunk/qpid/doc/book/src/AMQP.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/AMQP.xml?rev=917763&r1=917762&r2=917763&view=diff
==============================================================================
--- qpid/trunk/qpid/doc/book/src/AMQP.xml (original)
+++ qpid/trunk/qpid/doc/book/src/AMQP.xml Mon Mar  1 22:34:29 2010
@@ -1,4 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ 
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+ 
+   http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ 
+-->
+
 <chapter>
+
 <title>AMQP (Advanced Message Queueing Protocol</title>
 
 
@@ -25,9 +48,9 @@
 <title>AMQP version 0-10</title>
 <listitem><para><ulink url="https://jira.amqp.org/confluence/download/attachments/720900/amqp.0-10.pdf?version=1"
 >AMQP 0-10 Specification (PDF)</ulink></para></listitem>
-<listitem><para><ulink> url="https://jira.amqp.org/confluence/download/attachments/720900/amqp.0-10.xml?version=1"
+<listitem><para><ulink url="https://jira.amqp.org/confluence/download/attachments/720900/amqp.0-10.xml?version=1"
 >AMQP 0-10 Protocol Definition XML</ulink></para></listitem>
-<listitem><para><ulink> url="https://jira.amqp.org/confluence/download/attachments/720900/amqp.0-10.dfd?version=1"
+<listitem><para><ulink url="https://jira.amqp.org/confluence/download/attachments/720900/amqp.0-10.dfd?version=1"
 >AMQP 0-10 Protocol Definition DTD</ulink></para></listitem>
 </itemizedlist>
 

Modified: qpid/trunk/qpid/doc/book/src/Add-New-Users.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/Add-New-Users.xml?rev=917763&r1=917762&r2=917763&view=diff
==============================================================================
--- qpid/trunk/qpid/doc/book/src/Add-New-Users.xml (original)
+++ qpid/trunk/qpid/doc/book/src/Add-New-Users.xml Mon Mar  1 22:34:29 2010
@@ -20,7 +20,7 @@
  
 -->
 
-<chapter xmlns:html="http://www.w3.org/1999/xhtml"><title>
+<section><title>
       Apache Qpid : Add New Users
     </title><para>
             The Qpid Java Broker has a single reference source (<xref linkend="qpid_PrincipalDatabase"/>) that
@@ -43,10 +43,10 @@
             use they only need support the SASL mechanisms they provide.
           </para><itemizedlist>
             <listitem><para>
-              <xref linkend="AddNewUsers-plain"/>
+              <xref linkend="AddNewUsers-Plain"/>
             </para></listitem>
             <listitem><para>
-              <xref linkend="AddNewUsers-base64md5"/>
+              <xref linkend="AddNewUsers-Base64MD5PasswordFileFormat"/>
             </para></listitem>
           </itemizedlist><para>
             
@@ -156,11 +156,11 @@
               for qpid passwd files.
               <emphasis>NOTE:</emphasis> For the changes to be seen by the broker you must
               either restart the broker or reload the data with the
-              management tools (see <xref linkend="qpid_Qpid-20JMX-20Management-20Console-20User-20Guide"/>)
+              management tools (see <xref linkend="Qpid-JMX-Management-Console-User-Guide"/>)
             </para></listitem>
             <listitem><para>Use the management tools to create a new user. The changes
             will be made by the broker to the password file and the new user
-            will be immediately available to the system (see <xref linkend="qpid_Qpid-20JMX-20Management-20Console-20User-20Guide"/>).
+            will be immediately available to the system (see <xref linkend="Qpid-JMX-Management-Console-User-Guide"/>).
             </para></listitem>
           </orderedlist>
 <!--h3--></section>
@@ -176,7 +176,7 @@
             only read once on start up.
           </para><para>
             To make changes dynamically there are two options, both require
-            administrator access via the Management Console (see <xref linkend="qpid_Qpid-20JMX-20Management-20Console-20User-20Guide"/>)
+            administrator access via the Management Console (see <xref linkend="Qpid-JMX-Management-Console-User-Guide"/>)
           </para><orderedlist>
             <listitem><para>You can replace the file and use the console to reload its
             contents.
@@ -229,8 +229,8 @@
               </row>
             </tbody>
           </tgroup></table><para>
-            For details of SASL support see <xref linkend="qpid_Qpid-20Interoperability-20Documentation"/>
+            For details of SASL support see <xref linkend="qpid_Qpid-Interoperability-Documentation"/>
           </para>
 <!--h2--></section>
 
-</chapter>
+</section>

Modified: qpid/trunk/qpid/doc/book/src/Binding-URL-Format.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/Binding-URL-Format.xml?rev=917763&r1=917762&r2=917763&view=diff
==============================================================================
--- qpid/trunk/qpid/doc/book/src/Binding-URL-Format.xml (original)
+++ qpid/trunk/qpid/doc/book/src/Binding-URL-Format.xml Mon Mar  1 22:34:29 2010
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <!--
  
  Licensed to the Apache Software Foundation (ASF) under one
@@ -20,8 +21,9 @@
  
 -->
 
-<chapter xmlns:html="http://www.w3.org/1999/xhtml"><title>
-      Apache Qpid : BindingURLFormat
+<section id="BindingURLFormat">
+  <title>
+      Apache Qpid : Binding URL Format
     </title>
             <programlisting>
 &lt;Exchange Class&gt;://&lt;Exchange Name&gt;/[&lt;Destination&gt;]/[&lt;Queue&gt;][?&lt;option&gt;='&lt;value&gt;'[&amp;&lt;option&gt;='&lt;value&gt;']]
@@ -169,4 +171,4 @@
 </programlisting>
 </example>
 <!--h4--></section>
-</chapter>
+</section>

Modified: qpid/trunk/qpid/doc/book/src/Book-Info.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/Book-Info.xml?rev=917763&r1=917762&r2=917763&view=diff
==============================================================================
--- qpid/trunk/qpid/doc/book/src/Book-Info.xml (original)
+++ qpid/trunk/qpid/doc/book/src/Book-Info.xml Mon Mar  1 22:34:29 2010
@@ -1,4 +1,26 @@
 <?xml version='1.0' encoding='utf-8' ?>
+
+<!--
+ 
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+ 
+   http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ 
+-->
+
 <!DOCTYPE bookinfo PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
 ]>
 
@@ -41,8 +63,6 @@
 
 	</legalnotice>
 
-
-
 </bookinfo>
 
                 

Modified: qpid/trunk/qpid/doc/book/src/Book.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/Book.xml?rev=917763&r1=917762&r2=917763&view=diff
==============================================================================
--- qpid/trunk/qpid/doc/book/src/Book.xml (original)
+++ qpid/trunk/qpid/doc/book/src/Book.xml Mon Mar  1 22:34:29 2010
@@ -1,4 +1,5 @@
 <?xml version='1.0' encoding='utf-8' ?>
+
 <!--
  
  Licensed to the Apache Software Foundation (ASF) under one
@@ -20,39 +21,39 @@
  
 -->
 
-<!DOCTYPE bookinfo PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
 ]>
 
-<book xmlns:xi="http://www.w3.org/2001/XInclude">
-        <xi:include href="Book_Info.xml"/>
+<book>
+        <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Book-Info.xml"/>
 	<part>
 	  <title>Basics</title>
-	  <xi:include href="Introduction.xml"/>
-	  <xi:include href="AMQP.xml"/>
-	  <xi:include href="Getting_Started.xml"/>
-	  <xi:include href="Download.xml"/>
+	  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Introduction.xml"/>
+	  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="AMQP.xml"/>
+	  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Getting-Started.xml"/>
+	  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Download.xml"/>
 	</part>
 
 <!--
     The broker sections define their own <part/> elements, with <partintro/> text.
 -->
-	<xi:include href="AMQP-Messaging-Broker-CPP.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-	<xi:include href="AMQP-Messaging-Broker-Java.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="AMQP-Messaging-Broker-CPP.xml"/>
+	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="AMQP-Messaging-Broker-Java.xml"/>
 
 	<part>
 	  <title>AMQP Messaging Clients Clients</title>
-	  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="AMQP%20Java%20JMS%20Messaging%20Client.xml"/>
-	  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="AMQP%20C++%20Messaging%20Client.xml"/>
-	  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="AMQP%20.NET%20Messaging%20Client.xml"/>
-	  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="AMQP%20Python%20Messaging%20Client.xml"/>
-	  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="AMQP%20Ruby%20Messaging%20Client.xml"/>
+	  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="AMQP-Java-JMS-Messaging-Client.xml"/>
+	  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="AMQP-C++-Messaging-Client.xml"/>
+	  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="AMQP-.NET-Messaging-Client.xml"/>
+	  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="AMQP-Python-Messaging-Client.xml"/>
+	  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="AMQP-Ruby-Messaging-Client.xml"/>
 
 	</part>
 	<part>
 	  <title>Appendices</title>
-	  <xi:include href="AMQP%20Compatibility.xml"/>
-	  <xi:include href="Qpid%20Interoperability%20Documentation.xml"/>
-<!--	  <xi:include href="FAQ.xml"/> -->
+	  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="AMQP-Compatibility.xml"/>
+	  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Qpid-Interoperability-Documentation.xml"/>
+<!--	  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="FAQ.xml"/> -->
 	</part>
 </book>
 

Modified: qpid/trunk/qpid/doc/book/src/Cheat-Sheet-for-configuring-Exchange-Options.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/Cheat-Sheet-for-configuring-Exchange-Options.xml?rev=917763&r1=917762&r2=917763&view=diff
==============================================================================
--- qpid/trunk/qpid/doc/book/src/Cheat-Sheet-for-configuring-Exchange-Options.xml (original)
+++ qpid/trunk/qpid/doc/book/src/Cheat-Sheet-for-configuring-Exchange-Options.xml Mon Mar  1 22:34:29 2010
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <!--
  
  Licensed to the Apache Software Foundation (ASF) under one
@@ -20,11 +21,15 @@
  
 -->
 
-<chapter xmlns:html="http://www.w3.org/1999/xhtml"><title>
-      Apache Qpid : Cheat Sheet for configuring Exchange Options
-    </title><section role="h2" id="CheatSheetforconfiguringExchangeOptions-ConfiguringExchangeOptions"><title>
-            Configuring Exchange Options
-          </title>
+<section>
+  <title>
+    Apache Qpid : Cheat Sheet for configuring Exchange Options
+  </title>
+
+  <section role="h2" id="CheatSheetforconfiguringExchangeOptions-ConfiguringExchangeOptions">
+    <title>
+      Configuring Exchange Options
+    </title>
           <para>
             The C++ Broker M4 or later supports the following additional
             Exchange options in addition to the standard AMQP define options
@@ -136,4 +141,4 @@
 </programlisting>
 <!--h3--></section>
 <!--h2--></section>
-</chapter>
+</section>

Modified: qpid/trunk/qpid/doc/book/src/Cheat-Sheet-for-configuring-Queue-Options.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/Cheat-Sheet-for-configuring-Queue-Options.xml?rev=917763&r1=917762&r2=917763&view=diff
==============================================================================
--- qpid/trunk/qpid/doc/book/src/Cheat-Sheet-for-configuring-Queue-Options.xml (original)
+++ qpid/trunk/qpid/doc/book/src/Cheat-Sheet-for-configuring-Queue-Options.xml Mon Mar  1 22:34:29 2010
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <!--
  
  Licensed to the Apache Software Foundation (ASF) under one
@@ -20,7 +21,7 @@
  
 -->
 
-<chapter xmlns:html="http://www.w3.org/1999/xhtml"><title>
+<section><title>
       Apache Qpid : Cheat Sheet for configuring Queue Options
     </title>
 
@@ -165,7 +166,7 @@
             ignored.
             </para></listitem>
           </itemizedlist><para>
-            A fully worked <xref linkend="qpid_LVQ-20Example"/> can be found here
+            A fully worked <xref linkend="qpid_LVQ-Example"/> can be found here
           </para>
 	  <!--h3--></section>
 	  <section role="h3" id="CheatSheetforconfiguringQueueOptions-Settingadditionalbehaviors"><title>
@@ -210,7 +211,7 @@
             This option is used to determine whether enqueue/dequeue events
             representing changes made to queue state are generated. These
             events can then be processed by plugins such as that used for
-            <xref linkend="qpid_queue-20state-20replication"/>.
+            <xref linkend="qpid_queue-state-replication"/>.
           </para><para>
             Example:
           </para>
@@ -245,4 +246,4 @@
 	<!--h2--></section>
 
 
-</chapter>
+</section>

Modified: qpid/trunk/qpid/doc/book/src/Configure-ACLs.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/Configure-ACLs.xml?rev=917763&r1=917762&r2=917763&view=diff
==============================================================================
--- qpid/trunk/qpid/doc/book/src/Configure-ACLs.xml (original)
+++ qpid/trunk/qpid/doc/book/src/Configure-ACLs.xml Mon Mar  1 22:34:29 2010
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <!--
  
  Licensed to the Apache Software Foundation (ASF) under one
@@ -20,7 +21,7 @@
  
 -->
 
-<chapter xmlns:html="http://www.w3.org/1999/xhtml">
+<section>
   <title>
       Apache Qpid : Configure ACLs
     </title>
@@ -34,7 +35,7 @@
           </title>
   <itemizedlist>
             <listitem><para>
-              <xref linkend="qpid_Java-20XML-20ACLs"/>
+              <xref linkend="qpid_Java-XML-ACLs"/>
             </para></listitem>
             <listitem><para>
               <xref linkend="qpid_ACL"/>
@@ -62,7 +63,7 @@
 
 	  <itemizedlist>
             <listitem><para>
-              <xref linkend="qpid_Java-20XML-20ACLs"/>
+              <xref linkend="qpid_Java-XML-ACLs"/>
             </para></listitem>
             <listitem><para>Support for Version 2 specification is in progress.
             </para></listitem>
@@ -74,4 +75,4 @@
   <!--h2-->
   </section>
 
-</chapter>
+</section>

Modified: qpid/trunk/qpid/doc/book/src/Configure-Java-Qpid-to-use-a-SSL-connection.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/Configure-Java-Qpid-to-use-a-SSL-connection.xml?rev=917763&r1=917762&r2=917763&view=diff
==============================================================================
--- qpid/trunk/qpid/doc/book/src/Configure-Java-Qpid-to-use-a-SSL-connection.xml (original)
+++ qpid/trunk/qpid/doc/book/src/Configure-Java-Qpid-to-use-a-SSL-connection.xml Mon Mar  1 22:34:29 2010
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <!--
  
  Licensed to the Apache Software Foundation (ASF) under one
@@ -20,7 +21,7 @@
  
 -->
 
-<chapter xmlns:html="http://www.w3.org/1999/xhtml"><title>
+<section><title>
       Apache Qpid : Configure Java Qpid to use a SSL connection.
     </title>
 
@@ -80,4 +81,4 @@
           </title>
 	  <para/>
     <!--h2--></section>
-</chapter>
+</section>

Modified: qpid/trunk/qpid/doc/book/src/Configure-Log4j-CompositeRolling-Appender.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/Configure-Log4j-CompositeRolling-Appender.xml?rev=917763&r1=917762&r2=917763&view=diff
==============================================================================
--- qpid/trunk/qpid/doc/book/src/Configure-Log4j-CompositeRolling-Appender.xml (original)
+++ qpid/trunk/qpid/doc/book/src/Configure-Log4j-CompositeRolling-Appender.xml Mon Mar  1 22:34:29 2010
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <!--
  
  Licensed to the Apache Software Foundation (ASF) under one
@@ -20,7 +21,7 @@
  
 -->
 
-<chapter xmlns:html="http://www.w3.org/1999/xhtml"><title>
+<section><title>
       Apache Qpid : Configure Log4j CompositeRolling Appender
     </title>
     <section role="h2" id="ConfigureLog4jCompositeRollingAppender-HowtoconfiguretheCompositeRollinglog4jAppender"><title>
@@ -146,4 +147,4 @@
 </listitem>
 </orderedlist>
 <!--h2--></section>
-</chapter>
+</section>

Modified: qpid/trunk/qpid/doc/book/src/Configure-the-Broker-via-config.xml.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/Configure-the-Broker-via-config.xml.xml?rev=917763&r1=917762&r2=917763&view=diff
==============================================================================
--- qpid/trunk/qpid/doc/book/src/Configure-the-Broker-via-config.xml.xml (original)
+++ qpid/trunk/qpid/doc/book/src/Configure-the-Broker-via-config.xml.xml Mon Mar  1 22:34:29 2010
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <!--
  
  Licensed to the Apache Software Foundation (ASF) under one
@@ -20,14 +21,13 @@
  
 -->
 
-<chapter xmlns:html="http://www.w3.org/1999/xhtml">
+<section>
   <title>
       Apache Qpid : Configure the Broker via config.xml
     </title>
   <section role="h2" id="ConfiguretheBrokerviaconfig.xml-Brokerconfig.xmlOverview">
     <title>
-            Broker
-            config.xml Overview
+            Broker config.xml Overview
           </title>
   <para>
             The broker config.xml file which is shipped in the etc directory
@@ -68,4 +68,4 @@
     <!--h2-->
   </section>
 
-</chapter>
+</section>

Modified: qpid/trunk/qpid/doc/book/src/Configure-the-Virtual-Hosts-via-virtualhosts.xml.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/Configure-the-Virtual-Hosts-via-virtualhosts.xml.xml?rev=917763&r1=917762&r2=917763&view=diff
==============================================================================
--- qpid/trunk/qpid/doc/book/src/Configure-the-Virtual-Hosts-via-virtualhosts.xml.xml (original)
+++ qpid/trunk/qpid/doc/book/src/Configure-the-Virtual-Hosts-via-virtualhosts.xml.xml Mon Mar  1 22:34:29 2010
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <!--
  
  Licensed to the Apache Software Foundation (ASF) under one
@@ -20,7 +21,7 @@
  
 -->
 
-<chapter xmlns:html="http://www.w3.org/1999/xhtml"><title>
+<section><title>
       Apache Qpid : Configure the Virtual Hosts via virtualhosts.xml
     </title><section role="h2" id="ConfiguretheVirtualHostsviavirtualhosts.xml-virtualhosts.xmlOverview"><title>
             virtualhosts.xml Overview
@@ -127,4 +128,4 @@
           </para>
 <!--h3--></section>
 <!--h2--></section>
-</chapter>
+</section>

Modified: qpid/trunk/qpid/doc/book/src/Configuring-Management-Users.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/Configuring-Management-Users.xml?rev=917763&r1=917762&r2=917763&view=diff
==============================================================================
--- qpid/trunk/qpid/doc/book/src/Configuring-Management-Users.xml (original)
+++ qpid/trunk/qpid/doc/book/src/Configuring-Management-Users.xml Mon Mar  1 22:34:29 2010
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <!--
  
  Licensed to the Apache Software Foundation (ASF) under one
@@ -20,7 +21,7 @@
  
 -->
 
-<chapter xmlns:html="http://www.w3.org/1999/xhtml"><title>
+<section><title>
       Apache Qpid : Configuring Management Users
     </title><para>
             The Qpid Java broker has a single source of users for the system.
@@ -42,7 +43,7 @@
             There are two steps required to add a new user with rights for
             the JMX console.
           </para><orderedlist>
-            <listitem><para>Create a new user login, see HowTo:<xref linkend="qpid_Add-20New-20Users"/>
+            <listitem><para>Create a new user login, see HowTo:<xref linkend="qpid_Add-New-Users"/>
             </para></listitem>
             <listitem><para>Grant the new user permission to the JMX Console
             </para></listitem>
@@ -113,4 +114,4 @@
 <!--h4--></section>
 <!--h3--></section>
 <!--h2--></section>
-</chapter>
+</section>

Modified: qpid/trunk/qpid/doc/book/src/Configuring-Qpid-JMX-Management-Console.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/Configuring-Qpid-JMX-Management-Console.xml?rev=917763&r1=917762&r2=917763&view=diff
==============================================================================
--- qpid/trunk/qpid/doc/book/src/Configuring-Qpid-JMX-Management-Console.xml (original)
+++ qpid/trunk/qpid/doc/book/src/Configuring-Qpid-JMX-Management-Console.xml Mon Mar  1 22:34:29 2010
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <!--
  
  Licensed to the Apache Software Foundation (ASF) under one
@@ -20,7 +21,7 @@
  
 -->
 
-<chapter xmlns:html="http://www.w3.org/1999/xhtml"><title>
+<section><title>
       Apache Qpid : Configuring Qpid JMX Management Console
     </title><section role="h2" id="ConfiguringQpidJMXManagementConsole-ConfiguringQpidJMXManagementConsole"><title>
             Configuring Qpid JMX Management Console
@@ -30,7 +31,7 @@
             Qpid has a JMX management interface that exposes a number of
             components of the running broker.
             You can find out more about the features exposed by the JMX
-            interfaces <xref linkend="qpid_Qpid-20Management-20Features"/>.
+            interfaces <xref linkend="qpid_Qpid-Management-Features"/>.
           </para><para>
             
           </para>
@@ -49,7 +50,7 @@
                         being connected to is making use of this ability then
                         additional console configuration may be required,
                         particularly when using self-signed certificates. See
-                        <xref linkend="qpid_Management-20Console-20Security"/> for details.
+                        <xref linkend="qpid_Management-Console-Security"/> for details.
                       </para>
 	    </note>
 	  </listitem>
@@ -66,7 +67,7 @@
 	      However, if you wish to connect to an older broker using
 	      JMXMP the console will support this so long as the
 	      <emphasis>jmxremote_optional.jar</emphasis> file is provided to it.
-	      For details see <xref linkend="qpid_Management-20Console-20Security"/>.
+	      For details see <xref linkend="qpid_Management-Console-Security"/>.
 	    </para>
 	  </note>
 <!--h3--></section>
@@ -98,7 +99,7 @@
           </title>
 
 	 <para>
-            Please see <xref linkend="qpid_Qpid-20JMX-20Management-20Console-20User-20Guide"/> for details on using this Eclipse RCP
+            Please see <xref linkend="Qpid-JMX-Management-Console-User-Guide"/> for details on using this Eclipse RCP
             application.
           </para>
 
@@ -124,7 +125,7 @@
 	 <para>
             HermesJMS also offers integration with the Qpid management
             interfaces. You can get instructions and more information from
-            <xref linkend="qpid_HermesJMS"/>.
+	    <ulink url="http://cwiki.apache.org/confluence/display/qpid/HermesJMS">HermesJMS</ulink>.
           </para>
 <!--h2--></section>
 
@@ -134,7 +135,7 @@
           </title>
 
 	 <para>
-            <xref linkend="qpid_www.mc4j.org"/> is an alternative
+            <ulink url="qpid_www.mc4j.org">MC4J</ulink> is an alternative
             management tool. It provide a richer "dashboard" that can
             customise the raw MBeans.
           </para>
@@ -177,4 +178,4 @@
           </para>
 <!--h4--></section>
 <!--h2--></section>
-</chapter>
+</section>

Modified: qpid/trunk/qpid/doc/book/src/Connection-URL-Format.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/Connection-URL-Format.xml?rev=917763&r1=917762&r2=917763&view=diff
==============================================================================
--- qpid/trunk/qpid/doc/book/src/Connection-URL-Format.xml (original)
+++ qpid/trunk/qpid/doc/book/src/Connection-URL-Format.xml Mon Mar  1 22:34:29 2010
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <!--
  
  Licensed to the Apache Software Foundation (ASF) under one
@@ -20,7 +21,7 @@
  
 -->
 
-<chapter xmlns:html="http://www.w3.org/1999/xhtml">
+<section id="Connection-URL-Format">
   <title>
     Apache Qpid : Connection URL Format
   </title>
@@ -378,4 +379,4 @@
 </programlisting>
 
 <!--h3--></section>
-</chapter>
+</section>

Modified: qpid/trunk/qpid/doc/book/src/Debug-using-log4j.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/Debug-using-log4j.xml?rev=917763&r1=917762&r2=917763&view=diff
==============================================================================
--- qpid/trunk/qpid/doc/book/src/Debug-using-log4j.xml (original)
+++ qpid/trunk/qpid/doc/book/src/Debug-using-log4j.xml Mon Mar  1 22:34:29 2010
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <!--
  
  Licensed to the Apache Software Foundation (ASF) under one
@@ -20,7 +21,7 @@
  
 -->
 
-<chapter xmlns:html="http://www.w3.org/1999/xhtml"><title>
+<section><title>
       Apache Qpid : Debug using log4j
     </title>
 
@@ -59,7 +60,7 @@
           </title>
 	 <para>
             <emphasis>deprecation notice</emphasis> Version 0.6 of the Java broker includes
-            <xref linkend="qpid_Configure-20Operational-20Status-20Logging"/> functionality which improves upon these messages and
+            <xref linkend="qpid_Configure-Operational-Status-Logging"/> functionality which improves upon these messages and
             as such enabling status logging would be more beneficial.
             The configuration file has been left here for assistence with
             broker versions prior to 0.6.
@@ -294,4 +295,4 @@
 
 <!--h3--></section>            
 <!--h2--></section>
-</chapter>
+</section>

Modified: qpid/trunk/qpid/doc/book/src/Download.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/Download.xml?rev=917763&r1=917762&r2=917763&view=diff
==============================================================================
--- qpid/trunk/qpid/doc/book/src/Download.xml (original)
+++ qpid/trunk/qpid/doc/book/src/Download.xml Mon Mar  1 22:34:29 2010
@@ -1,12 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
 <!--
- [ ]  <- ###############
-*<ulink>url</ulink>
-*Broker
+ 
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+ 
+   http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ 
 -->
 
-<chapter>
+<chapter id="chapter-Download">
+
 <title>Download Apache Qpid</title>
 
+<para/>
+
+
 <section><title>Production Releases</title>
 
 <para>These releases are well tested and appropriate for production use. 0.5 is the latest release of Qpid.</para>
@@ -23,13 +43,17 @@
 
 <section><title>Multiple Component Packages</title>
 
-<table>
-<thead><tr><td> Component </td><td> Download </td><td> AMQP 0-10 </td><td> AMQP 0-8/0-9 </td></tr></thead>
+<table frame="all">
+<title/>
+<tgroup cols='4' align='left' colsep='1' rowsep='1'>
+<thead><row><entry> Component </entry><entry> Download </entry><entry> AMQP 0-10 </entry><entry> AMQP 0-8/0-9 </entry></row></thead>
 <tbody>
-<tr><td> Full release &amp; keys </td><td> <ulink url="http://www.apache.org/dist/qpid/0.5/">http://www.apache.org/dist/qpid/0.5/</ulink> </td><td> Y </td><td> Y </td></tr>
-<tr><td> C++ broker &amp; client </td><td> <ulink url="http://www.apache.org/dist/qpid/0.5/qpid-cpp-0.5.tar.gz">http://www.apache.org/dist/qpid/0.5/qpid-cpp-0.5.tar.gz</ulink> </td><td> Y </td><td> </td></tr>
-<tr><td> Java broker, client &amp; tools </td><td> <ulink url="http://www.apache.org/dist/qpid/0.5/qpid-java-0.5.tar.gz">http://www.apache.org/dist/qpid/0.5/qpid-java-0.5.tar.gz</ulink> </td><td> client </td><td> Y </td></tr>
-</tbody></table>
+<row><entry> Full release &amp; keys </entry><entry> <ulink url="http://www.apache.org/dist/qpid/0.5/">http://www.apache.org/dist/qpid/0.5/</ulink> </entry><entry> Y </entry><entry> Y </entry></row>
+<row><entry> C++ broker &amp; client </entry><entry> <ulink url="http://www.apache.org/dist/qpid/0.5/qpid-cpp-0.5.tar.gz">http://www.apache.org/dist/qpid/0.5/qpid-cpp-0.5.tar.gz</ulink> </entry><entry> Y </entry><entry> </entry></row>
+<row><entry> Java broker, client &amp; tools </entry><entry> <ulink url="http://www.apache.org/dist/qpid/0.5/qpid-java-0.5.tar.gz">http://www.apache.org/dist/qpid/0.5/qpid-java-0.5.tar.gz</ulink> </entry><entry> client </entry><entry> Y </entry></row>
+</tbody>
+</tgroup>
+</table>
 </section>
 
 <section><title>Single Component Package</title>
@@ -37,53 +61,61 @@
 
 <table>
 <title>Broker</title>
-<thead><tr><td> Language </td><td> Download </td><td> AMQP 0-10 </td><td> AMQP 0-8/0-9 </td></tr></thead>
+<tgroup cols="4" align='left' colsep='1' rowsep='1'>
+<thead><row><entry> Language </entry><entry> Download </entry><entry> AMQP 0-10 </entry><entry> AMQP 0-8/0-9 </entry></row></thead>
 <tbody>
-<tr><td> Java </td><td> <ulink url="http://www.apache.org/dist/qpid/0.5/qpid-java-broker-0.5.tar.gz">http://www.apache.org/dist/qpid/0.5/qpid-java-broker-0.5.tar.gz</ulink> </td><td> </td><td> Y </td></tr>
+<row><entry> Java </entry><entry> <ulink url="http://www.apache.org/dist/qpid/0.5/qpid-java-broker-0.5.tar.gz">http://www.apache.org/dist/qpid/0.5/qpid-java-broker-0.5.tar.gz</ulink> </entry><entry> </entry><entry> Y </entry></row>
 </tbody>
+</tgroup>
 </table>
 
 
 <table>
 <title>Client</title>
-<thead><tr><td> Language </td><td> Download </td><td> AMQP 0-10 </td><td> AMQP 0-8/0-9 </td></tr></thead>
+<tgroup cols="4" align='left' colsep='1' rowsep='1'>
+<thead><row><entry> Language </entry><entry> Download </entry><entry> AMQP 0-10 </entry><entry> AMQP 0-8/0-9 </entry></row></thead>
 <tbody>
-<tr><td> C# (.NET, WCF, Excel) 0-10 client (C++ Broker Compatible) </td><td> <ulink url="http://www.apache.org/dist/qpid/0.5/qpid-dotnet-0-10-0.5.zip">http://www.apache.org/dist/qpid/0.5/qpid-dotnet-0-10-0.5.zip</ulink> </td><td> Y </td><td> </td></tr>
-<tr><td> C# (.NET) 0-8 client (Java Broker Compatible) </td><td> <ulink url="http://www.apache.org/dist/qpid/0.5/qpid-dotnet-0-8-0.5.zip">http://www.apache.org/dist/qpid/0.5/qpid-dotnet-0-8-0.5.zip</ulink> </td><td> </td><td> Y </td></tr>
-<tr><td> Java </td><td> <ulink url="http://www.apache.org/dist/qpid/0.5/qpid-java-client-0.5.tar.gz">http://www.apache.org/dist/qpid/0.5/qpid-java-client-0.5.tar.gz</ulink> </td><td> Y </td><td> Y </td></tr>
-<tr><td> Python </td><td> <ulink url="http://www.apache.org/dist/qpid/0.5/qpid-python-0.5.tar.gz">http://www.apache.org/dist/qpid/0.5/qpid-python-0.5.tar.gz</ulink> </td><td> Y </td><td> Y </td></tr>
-<tr><td> Ruby </td><td> <ulink url="http://www.apache.org/dist/qpid/0.5/qpid-ruby-0.5.tar.gz">http://www.apache.org/dist/qpid/0.5/qpid-ruby-0.5.tar.gz</ulink> </td><td> Y </td><td> Y </td></tr>
+<row><entry> C# (.NET, WCF, Excel) 0-10 client (C++ Broker Compatible) </entry><entry> <ulink url="http://www.apache.org/dist/qpid/0.5/qpid-dotnet-0-10-0.5.zip">http://www.apache.org/dist/qpid/0.5/qpid-dotnet-0-10-0.5.zip</ulink> </entry><entry> Y </entry><entry> </entry></row>
+<row><entry> C# (.NET) 0-8 client (Java Broker Compatible) </entry><entry> <ulink url="http://www.apache.org/dist/qpid/0.5/qpid-dotnet-0-8-0.5.zip">http://www.apache.org/dist/qpid/0.5/qpid-dotnet-0-8-0.5.zip</ulink> </entry><entry> </entry><entry> Y </entry></row>
+<row><entry> Java </entry><entry> <ulink url="http://www.apache.org/dist/qpid/0.5/qpid-java-client-0.5.tar.gz">http://www.apache.org/dist/qpid/0.5/qpid-java-client-0.5.tar.gz</ulink> </entry><entry> Y </entry><entry> Y </entry></row>
+<row><entry> Python </entry><entry> <ulink url="http://www.apache.org/dist/qpid/0.5/qpid-python-0.5.tar.gz">http://www.apache.org/dist/qpid/0.5/qpid-python-0.5.tar.gz</ulink> </entry><entry> Y </entry><entry> Y </entry></row>
+<row><entry> Ruby </entry><entry> <ulink url="http://www.apache.org/dist/qpid/0.5/qpid-ruby-0.5.tar.gz">http://www.apache.org/dist/qpid/0.5/qpid-ruby-0.5.tar.gz</ulink> </entry><entry> Y </entry><entry> Y </entry></row>
 </tbody>
+</tgroup>
 </table>
 
 
 <table>
 <title>C++ broker management</title>
-<thead><tr><td> Component </td><td> Download </td><td> AMQP 0-10 </td></tr></thead>
+<tgroup cols="3" align='left' colsep='1' rowsep='1'>
+<thead><row><entry> Component </entry><entry> Download </entry><entry> AMQP 0-10 </entry></row></thead>
 <tbody>
-<tr><td> cmd line (packaged with python) </td><td> <ulink url="http://www.apache.org/dist/qpid/0.5/qpid-python-0.5.tar.gz">http://www.apache.org/dist/qpid/0.5/qpid-python-0.5.tar.gz</ulink> </td><td> Y </td></tr>
-<tr><td> QMan JMX bridge, WS-DM </td><td> <ulink url="http://www.apache.org/dist/qpid/0.5/qpid-management-client-0.5.tar.gz">http://www.apache.org/dist/qpid/0.5/qpid-management-client-0.5.tar.gz</ulink> </td><td> Y </td></tr>
+<row><entry> cmd line (packaged with python) </entry><entry> <ulink url="http://www.apache.org/dist/qpid/0.5/qpid-python-0.5.tar.gz">http://www.apache.org/dist/qpid/0.5/qpid-python-0.5.tar.gz</ulink> </entry><entry> Y </entry></row>
+<row><entry> QMan JMX bridge, WS-DM </entry><entry> <ulink url="http://www.apache.org/dist/qpid/0.5/qpid-management-client-0.5.tar.gz">http://www.apache.org/dist/qpid/0.5/qpid-management-client-0.5.tar.gz</ulink> </entry><entry> Y </entry></row>
 </tbody>
+</tgroup>
 </table>
 
 
 <table>
 <title>Java broker management</title>
-<thead><tr><td> Component </td><td> Download </td></tr></thead>
+<tgroup cols="2" align='left' colsep='1' rowsep='1'>
+<thead><row><entry> Component </entry><entry> Download </entry></row></thead>
 <tbody>
-<tr><td> Eclipse RCP client </td><td> <ulink url="http://www.apache.org/dist/qpid/0.5/qpid-management-eclipse-plugin-0.5-linux-gtk-x86.tar.gz">Linux x86</ulink>
+<row><entry> Eclipse RCP client </entry><entry> <ulink url="http://www.apache.org/dist/qpid/0.5/qpid-management-eclipse-plugin-0.5-linux-gtk-x86.tar.gz">Linux x86</ulink>
 <ulink url="http://www.apache.org/dist/qpid/0.5/qpid-management-eclipse-plugin-0.5-linux-gtk-x86_64.tar.gz">Linux x86_64</ulink>
 <ulink url="http://www.apache.org/dist/qpid/0.5/qpid-management-eclipse-plugin-0.5-macosx.zip">Mac OS X</ulink>
 <ulink url="http://www.apache.org/dist/qpid/0.5/qpid-management-eclipse-plugin-0.5-win32-win32-x86.zip">Windows x86</ulink>
-</td></tr>
-<tr><td> Command line interface </td><td> <ulink url="http://www.apache.org/dist/qpid/0.5/qpid-management-tools-qpid-cli-0.5.tar.gz">http://www.apache.org/dist/qpid/0.5/qpid-management-tools-qpid-cli-0.5.tar.gz</ulink> </td></tr>
+</entry></row>
+<row><entry> Command line interface </entry><entry> <ulink url="http://www.apache.org/dist/qpid/0.5/qpid-management-tools-qpid-cli-0.5.tar.gz">http://www.apache.org/dist/qpid/0.5/qpid-management-tools-qpid-cli-0.5.tar.gz</ulink> </entry></row>
 </tbody>
+</tgroup>
 </table>
 </section>
 </section>
 
 
-<section><title>QpidComponents.org</title>
+<section id="qpid_3rd-Party-Libraries"><title>QpidComponents.org</title>
 
 <para><ulink url="http://QpidComponents.org">http://QpidComponents.org</ulink> provides further components for Apache Qpid, including both persistence and management tools. These components are open source, but are not developed as part of the Apache Qpid project due to licensing or other restrictions.</para>
 

Modified: qpid/trunk/qpid/doc/book/src/Excel-AddIn.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/Excel-AddIn.xml?rev=917763&r1=917762&r2=917763&view=diff
==============================================================================
--- qpid/trunk/qpid/doc/book/src/Excel-AddIn.xml (original)
+++ qpid/trunk/qpid/doc/book/src/Excel-AddIn.xml Mon Mar  1 22:34:29 2010
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <!--
  
  Licensed to the Apache Software Foundation (ASF) under one
@@ -19,8 +20,7 @@
  under the License.
  
 -->
-
-<chapter xmlns:html="http://www.w3.org/1999/xhtml">
+<section>
   <title>
     Apache Qpid : Excel AddIn
   </title>
@@ -166,4 +166,4 @@
     <!--h1-->
   </section>
 
-</chapter>
+</section>

Modified: qpid/trunk/qpid/doc/book/src/Getting-Started.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/Getting-Started.xml?rev=917763&r1=917762&r2=917763&view=diff
==============================================================================
--- qpid/trunk/qpid/doc/book/src/Getting-Started.xml (original)
+++ qpid/trunk/qpid/doc/book/src/Getting-Started.xml Mon Mar  1 22:34:29 2010
@@ -1,16 +1,36 @@
-<chapter>
-<section>
+<chapter id="Getting-Started">
+
+<!--
+ 
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+ 
+   http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ 
+-->
 <title>Getting Started</title>
 <para>To get started with Apache Qpid, follow the steps below.</para>
 
 <orderedlist>
-<listitem><para>Download the software [Download]</para></listitem>
+<listitem><para><xref linkend="chapter-Download"/></para></listitem>
 <listitem>
   <para>Start a broker. </para>
   <itemizedlist>
-    <listitem><para>Instructions for [running a Qpid Java broker (AMQP 0-8, 0-9) | Getting Started Guide]</para></listitem>
-    <listitem><para>Instructions for [running a Qpid C++ broker (AMQP 0-10) | RASC]</para></listitem>
-    <listitem><para>[Management tools |  MgmtC++]  (AMQP 0-10, works with the Qpid C++ broker)</para></listitem>
+    <listitem><para><xref linkend="chapter-Running-a-Qpid-Java-Broker"/></para></listitem>
+    <listitem><para><xref linkend="section-Running-a-Qpid-CPP-Broker"/></para></listitem>
+    <listitem><para><xref linkend="chapter-Managing-CPP-Broker"/>(AMQP 0-10, works with the Qpid C++ broker)</para></listitem>
   </itemizedlist>
 </listitem>
 <listitem>
@@ -18,35 +38,35 @@
   <itemizedlist>
     <listitem><para>C++ (AMQP 0-10):</para>
     <itemizedlist>
-      <listitem><para>Examples: [https://svn.apache.org/repos/asf/qpid/trunk/qpid/cpp/examples/ | https://svn.apache.org/repos/asf/qpid/trunk/qpid/cpp/examples/]</para></listitem>
-      <listitem><para>[Running the C++ Examples | https://svn.apache.org/repos/asf/qpid/trunk/qpid/cpp/examples/README.txt]</para></listitem>
+      <listitem><para>Examples:</para><para><ulink url="https://svn.apache.org/repos/asf/qpid/trunk/qpid/cpp/examples/">https://svn.apache.org/repos/asf/qpid/trunk/qpid/cpp/examples/</ulink></para></listitem>
+      <listitem><para>Running the C++ Examples:</para><para><ulink url="https://svn.apache.org/repos/asf/qpid/trunk/qpid/cpp/examples/README.txt">https://svn.apache.org/repos/asf/qpid/trunk/qpid/cpp/examples/README.txt</ulink></para></listitem>
     </itemizedlist>
 </listitem>
 <listitem>
   <para>Java JMS (AMQP 0-10):</para>
   <itemizedlist>
-    <listitem><para>Examples: [https://svn.apache.org/repos/asf/qpid/trunk/qpid/java/client/example/ | https://svn.apache.org/repos/asf/qpid/trunk/qpid/java/client/example/]</para></listitem>
-    <listitem><para>[Script for Running the Java JMS Examples | https://svn.apache.org/repos/asf/qpid/trunk/qpid/java/client/example/src/main/java/runSample.sh]</para></listitem>
+    <listitem><para>Examples:</para><para><ulink url="https://svn.apache.org/repos/asf/qpid/trunk/qpid/java/client/example/">https://svn.apache.org/repos/asf/qpid/trunk/qpid/java/client/example/</ulink></para></listitem>
+    <listitem><para>Script for Running the Java JMS Examples </para><para><ulink url="https://svn.apache.org/repos/asf/qpid/trunk/qpid/java/client/example/src/main/java/runSample.sh">https://svn.apache.org/repos/asf/qpid/trunk/qpid/java/client/example/src/main/java/runSample.sh</ulink></para></listitem>
   </itemizedlist>
 </listitem>
 <listitem>
   <para>Python (AMQP 0-10):</para>
   <itemizedlist>
-    <listitem><para>Examples: [https://svn.apache.org/repos/asf/qpid/trunk/qpid/python/examples/ | https://svn.apache.org/repos/asf/qpid/trunk/qpid/python/examples/]</para></listitem>
-    <listitem><para>[Running the Python Examples | https://svn.apache.org/repos/asf/qpid/trunk/qpid/python/examples/README]</para></listitem>
+    <listitem><para>Examples:</para><para><ulink url="https://svn.apache.org/repos/asf/qpid/trunk/qpid/python/examples/">https://svn.apache.org/repos/asf/qpid/trunk/qpid/python/examples/</ulink></para></listitem>
+    <listitem><para>Running the Python Examples</para><para><ulink url="https://svn.apache.org/repos/asf/qpid/trunk/qpid/python/examples/README">https://svn.apache.org/repos/asf/qpid/trunk/qpid/python/examples/README</ulink></para></listitem>
   </itemizedlist>
 </listitem>
 <listitem>
   <para>Ruby (AMQP 0-10):</para>
   <itemizedlist>
-    <listitem><para>Examples: [https://svn.apache.org/repos/asf/qpid/trunk/qpid/ruby/examples/ | https://svn.apache.org/repos/asf/qpid/trunk/qpid/ruby/examples/]</para></listitem>
+    <listitem><para>Examples: </para><para><ulink url="https://svn.apache.org/repos/asf/qpid/trunk/qpid/ruby/examples/">https://svn.apache.org/repos/asf/qpid/trunk/qpid/ruby/examples/</ulink></para></listitem>
   </itemizedlist>
 </listitem>
 <listitem>
   <para>.NET (AMQP 0-10):</para>
   <itemizedlist>
-    <listitem><para>Examples: [http://svn.apache.org/viewvc/qpid/trunk/qpid/dotnet/client-010/examples/ | http://svn.apache.org/viewvc/qpid/trunk/qpid/dotnet/client-010/examples/]</para></listitem>
-    <listitem><para>[.NET Tutorial | http://cwiki.apache.org/confluence/display/qpid/.NET+User+Guide]</para></listitem>
+    <listitem><para>Examples:</para><para><ulink url="http://svn.apache.org/viewvc/qpid/trunk/qpid/dotnet/client-010/examples/">http://svn.apache.org/viewvc/qpid/trunk/qpid/dotnet/client-010/examples/</ulink></para></listitem>
+    <listitem><para><xref linkend="NETUserGuide-Tutorial"/></para></listitem>
   </itemizedlist>
 </listitem>
 </itemizedlist>
@@ -54,19 +74,17 @@
 <listitem>
   <para>Read the API Guides and Documentation</para>
   <itemizedlist>
-    <listitem><para>[C++ Client API (AMQP 0-10) | http://qpid.apache.org/docs/api/cpp/html/index.html]</para></listitem>
-    <listitem><para>[JNDI Configuration for Java JMS | http://cwiki.apache.org/confluence/display/qpid/How+to+Use+JNDI]</para></listitem>
-    <listitem><para>[Python Client API  (AMQP 0-10) | http://qpid.apache.org/docs/api/python/html/index.html]</para></listitem>
-    <listitem><para>[Documentation]</para></listitem>
+    <listitem><para>C++ Client API (AMQP 0-10)</para><para><ulink url="http://qpid.apache.org/docs/api/cpp/html/index.html"></ulink></para></listitem>
+    <listitem><para><xref linkend="How-to-Use-JNDI"/></para></listitem>
+    <listitem><para>Python Client API  (AMQP 0-10)</para><para><ulink url="http://qpid.apache.org/docs/api/python/html/index.html">http://qpid.apache.org/docs/api/python/html/index.html</ulink></para></listitem>
   </itemizedlist>
 </listitem>
 <listitem>
   <para>Get your Questions Answered</para>
   <itemizedlist>
-    <listitem><para>Read the [FAQ|FAQ]</para></listitem>
-    <listitem><para>Ask a question on the user list mailto:users-subscribe@qpid.apache.org</para></listitem>
+    <listitem><para>Read the <xref linkend="FAQ"/></para></listitem>
+    <listitem><para>Ask a question on the user list</para><para>mailto:users-subscribe@qpid.apache.org</para></listitem>
   </itemizedlist>
 </listitem>
 </orderedlist>
-</section>
 </chapter>

Modified: qpid/trunk/qpid/doc/book/src/How-to-Tune-M3-Java-Broker-Performance.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/How-to-Tune-M3-Java-Broker-Performance.xml?rev=917763&r1=917762&r2=917763&view=diff
==============================================================================
--- qpid/trunk/qpid/doc/book/src/How-to-Tune-M3-Java-Broker-Performance.xml (original)
+++ qpid/trunk/qpid/doc/book/src/How-to-Tune-M3-Java-Broker-Performance.xml Mon Mar  1 22:34:29 2010
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <!--
  
  Licensed to the Apache Software Foundation (ASF) under one
@@ -19,8 +20,7 @@
  under the License.
  
 -->
-
-<chapter xmlns:html="http://www.w3.org/1999/xhtml">
+<section id="How-to-Tune-M3-Java-Broker-Performance">
   <title>
       Apache Qpid : How to Tune M3 Java Broker Performance
     </title>
@@ -169,4 +169,4 @@
           </para>
     <!--h3-->
   </section>
-</chapter>
+</section>

Modified: qpid/trunk/qpid/doc/book/src/How-to-Use-JNDI.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/How-to-Use-JNDI.xml?rev=917763&r1=917762&r2=917763&view=diff
==============================================================================
--- qpid/trunk/qpid/doc/book/src/How-to-Use-JNDI.xml (original)
+++ qpid/trunk/qpid/doc/book/src/How-to-Use-JNDI.xml Mon Mar  1 22:34:29 2010
@@ -20,7 +20,7 @@
  
 -->
 
-<chapter xmlns:html="http://www.w3.org/1999/xhtml">
+<chapter id="How-to-Use-JNDI">
   <title>
     Apache Qpid : How to Use JNDI
   </title>
@@ -80,13 +80,13 @@
             The property file allows a number of queues to be defined that
             can then be discovered via JNDI. There are four properties used
             by the PFICFactory.
-            <emphasis>connectionfactory.&lt;jndiname&gt;</emphasis> this is the <xref linkend="qpid_Connection-20URL-20Format"/> that the connection
+            <emphasis>connectionfactory.&lt;jndiname&gt;</emphasis> this is the <xref linkend="Connection-URL-Format"/> that the connection
             factory will use to perform connections.
             <emphasis>queue.&lt;jndiname&gt;</emphasis> this defines a jms queue or in
             amqp a amq.direct exchange
             <emphasis>topic.&lt;jndiname&gt;</emphasis> this defines a jms topic or in
             amqp a amq.topic exchange
-            <emphasis>destination.&lt;jndiname&gt;</emphasis> this takes a <xref linkend="qpid_BindingURLFormat"/>
+            <emphasis>destination.&lt;jndiname&gt;</emphasis> this takes a <xref linkend="BindingURLFormat"/>
             and so can be used for defining all amq destinations, queues,
             topics and header matching.
           </para><para>

Modified: qpid/trunk/qpid/doc/book/src/Introduction.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/Introduction.xml?rev=917763&r1=917762&r2=917763&view=diff
==============================================================================
--- qpid/trunk/qpid/doc/book/src/Introduction.xml (original)
+++ qpid/trunk/qpid/doc/book/src/Introduction.xml Mon Mar  1 22:34:29 2010
@@ -1,4 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ 
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+ 
+   http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ 
+-->
+
 <chapter>
+
 <title>Apache Qpid: Open Source AMQP Messaging</title>
 
 <para>Enterprise Messaging systems let programs communicate by exchanging messages, much as people communicate by exchanging email. Unlike email, enterprise messaging systems provide guaranteed delivery, speed, security, and freedom from spam. Until recently, there was no open standard for Enterprise Messaging systems, so programmers either wrote their own, or used expensive proprietary systems.</para>

Modified: qpid/trunk/qpid/doc/book/src/Java-Broker-Feature-Guide.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/Java-Broker-Feature-Guide.xml?rev=917763&r1=917762&r2=917763&view=diff
==============================================================================
--- qpid/trunk/qpid/doc/book/src/Java-Broker-Feature-Guide.xml (original)
+++ qpid/trunk/qpid/doc/book/src/Java-Broker-Feature-Guide.xml Mon Mar  1 22:34:29 2010
@@ -20,7 +20,7 @@
  
 -->
 
-<chapter xmlns:html="http://www.w3.org/1999/xhtml">
+<section>
   <title>
       Apache Qpid : Java Broker Feature Guide
     </title>
@@ -81,4 +81,4 @@
     <!--h3-->
   </section>
 
-</chapter>
+</section>

Modified: qpid/trunk/qpid/doc/book/src/Java-Environment-Variables.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/Java-Environment-Variables.xml?rev=917763&r1=917762&r2=917763&view=diff
==============================================================================
--- qpid/trunk/qpid/doc/book/src/Java-Environment-Variables.xml (original)
+++ qpid/trunk/qpid/doc/book/src/Java-Environment-Variables.xml Mon Mar  1 22:34:29 2010
@@ -20,7 +20,7 @@
  
 -->
 
-<chapter xmlns:html="http://www.w3.org/1999/xhtml">
+<section>
   <title>
       Apache Qpid : Java Environment Variables
     </title>
@@ -81,4 +81,4 @@
     <!--h2-->
   </section>
 
-</chapter>
+</section>

Modified: qpid/trunk/qpid/doc/book/src/LVQ.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/LVQ.xml?rev=917763&r1=917762&r2=917763&view=diff
==============================================================================
--- qpid/trunk/qpid/doc/book/src/LVQ.xml (original)
+++ qpid/trunk/qpid/doc/book/src/LVQ.xml Mon Mar  1 22:34:29 2010
@@ -1,5 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
-<chapter xmlns:html="http://www.w3.org/1999/xhtml"><title>
+<!--
+ 
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+ 
+   http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ 
+-->
+
+<section><title>
       Apache Qpid : LVQ
     </title>
 
@@ -338,4 +359,4 @@
 
 </programlisting>
 <!--h2--></section>
-</chapter>
+</section>

Modified: qpid/trunk/qpid/doc/book/src/Management-Console-Security.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/Management-Console-Security.xml?rev=917763&r1=917762&r2=917763&view=diff
==============================================================================
--- qpid/trunk/qpid/doc/book/src/Management-Console-Security.xml (original)
+++ qpid/trunk/qpid/doc/book/src/Management-Console-Security.xml Mon Mar  1 22:34:29 2010
@@ -20,7 +20,7 @@
  
 -->
 
-<chapter xmlns:html="http://www.w3.org/1999/xhtml"><title>
+<section><title>
       Apache Qpid : Management Console Security
     </title><section role="h1" id="ManagementConsoleSecurity-ManagementConsoleSecurity"><title>
             Management
@@ -106,7 +106,7 @@
             when starting the console. This can be done at the command line,
             or alternatively an example configuration has been made within
             the console's qpidmc.ini launcher configuration file that may
-            pre-configured in advance for repeated usage. See the <xref linkend="qpid_Qpid-20JMX-20Management-20Console-20User-20Guide"/> for more
+            pre-configured in advance for repeated usage. See the <xref linkend="Qpid-JMX-Management-Console-User-Guide"/> for more
             information on this configuration process.
           </para>
 <!--h3--></section>
@@ -132,7 +132,7 @@
 	  <para>
             More information on Java's handling of SSL certificate
             verification and customizing the keystores can be found in the
-            <xref linkend="qpid_JSSERefGuide"/> .
+	    <ulink url="http://java.sun.com/javase/6/docs/technotes/guides/security/jsse/JSSERefGuide.html#CustomizingStores">http://java.sun.com/javase/6/docs/technotes/guides/security/jsse/JSSERefGuide.html#CustomizingStores</ulink>.
           </para>
 <!--h3--></section>
 <!--h2--></section>
@@ -183,7 +183,7 @@
           </para>
 <!--h3--></section>
 
-	  <section role="h3" id="ManagementConsoleSecurity-BrokerConfiguration"><title>
+	  <section role="h3" id="ManagementConsoleSecurity-BrokerConfiguration2"><title>
             Broker
             Configuration
           </title>
@@ -209,7 +209,7 @@
           </para>
 <!--h3--></section>
 
-	  <section role="h3" id="ManagementConsoleSecurity-JMXManagementConsoleConfiguration"><title>
+	  <section role="h3" id="ManagementConsoleSecurity-JMXManagementConsoleConfiguration-2"><title>
             JMX
             Management Console Configuration
           </title>
@@ -243,10 +243,10 @@
 	  <para>
             In order to access the management operations via JMX, users must
             have an account and have been assigned appropriate access rights.
-            See <xref linkend="qpid_Configuring-20Management-20Users"/>
+            See <xref linkend="qpid_Configuring-Management-Users"/>
           </para>
 <!--h2--></section>
 <!--h1--></section>
 
 	  
-</chapter>
+</section>

Modified: qpid/trunk/qpid/doc/book/src/Management-Design-notes.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/Management-Design-notes.xml?rev=917763&r1=917762&r2=917763&view=diff
==============================================================================
--- qpid/trunk/qpid/doc/book/src/Management-Design-notes.xml (original)
+++ qpid/trunk/qpid/doc/book/src/Management-Design-notes.xml Mon Mar  1 22:34:29 2010
@@ -20,7 +20,7 @@
  
 -->
 
-<chapter xmlns:html="http://www.w3.org/1999/xhtml"><title>
+<section><title>
       Apache Qpid : Management Design notes
     </title><section role="h2" id="ManagementDesignnotes-StatusofThisDocument"><title>
             Status
@@ -35,7 +35,7 @@
           </para><para>
             Development continues on the Qpid Management Framework (QMF) for
             M4. If you are using M3, this is the document you need. If you
-            are using the SVN trunk, please refer to <xref linkend="qpid_Qpid-20Management-20Framework"/> for
+            are using the SVN trunk, please refer to <xref linkend="qpid_Qpid-Management-Framework"/> for
             up-to-date information.
           </para>
 	<!--h2--></section>
@@ -70,7 +70,7 @@
           </title>
 
 	 <para>
-            <xref linkend="qpid_JMX-20Gateway"/>
+            <xref linkend="qpid_JMX-Gateway"/>
           </para>
 	<!--h3--></section>
 
@@ -2132,5 +2132,5 @@
 	   <!--h2--></section>
 
 	 
-</chapter>
+</section>
 	  

Copied: qpid/trunk/qpid/doc/book/src/Managing-CPP-Broker.xml (from r908503, qpid/trunk/qpid/doc/book/src/82403.xml)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/Managing-CPP-Broker.xml?p2=qpid/trunk/qpid/doc/book/src/Managing-CPP-Broker.xml&p1=qpid/trunk/qpid/doc/book/src/82403.xml&r1=908503&r2=917763&rev=917763&view=diff
==============================================================================
--- qpid/trunk/qpid/doc/book/src/82403.xml (original)
+++ qpid/trunk/qpid/doc/book/src/Managing-CPP-Broker.xml Mon Mar  1 22:34:29 2010
@@ -1,10 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
-<chapter xmlns:html="http://www.w3.org/1999/xhtml"><title>
-      Apache Qpid : MgmtC++
-    </title><section role="h2" id="MgmtC-2B-2B-ManagingtheC-5CBroker"><title>
-            Managing the C++
-            Broker
-          </title>
+<!--
+ 
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+ 
+   http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ 
+-->
+
+<section id="section-Managing-CPP-Broker">
+    <title> Managing the C++ Broker </title>
            <para>
             There are quite a few ways to interact with the C++ broker. The
             command line tools
@@ -442,5 +459,4 @@
             You get the idea... have fun!
           </para>
 <!--h3--></section>
-<!--h2--></section>
-</chapter>
+</section>

Modified: qpid/trunk/qpid/doc/book/src/MessageStore-Tool.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/MessageStore-Tool.xml?rev=917763&r1=917762&r2=917763&view=diff
==============================================================================
--- qpid/trunk/qpid/doc/book/src/MessageStore-Tool.xml (original)
+++ qpid/trunk/qpid/doc/book/src/MessageStore-Tool.xml Mon Mar  1 22:34:29 2010
@@ -20,7 +20,7 @@
  
 -->
 
-<chapter xmlns:html="http://www.w3.org/1999/xhtml"><title>
+<section><title>
       Apache Qpid : MessageStore Tool
     </title><section role="h2" id="MessageStoreTool-MessageStoreTool"><title>
             MessageStore Tool
@@ -39,7 +39,7 @@
 
 	 <itemizedlist>
             <listitem><para>
-              <xref linkend="qpid_BDBMessageStore-20-3rd-20Party-"/>
+              <xref linkend="qpid_BDBMessageStore--3rd-Party-"/>
             </para></listitem>
             <listitem><para>
               <xref linkend="qpid_JDBCStore"/>
@@ -147,4 +147,4 @@
           </para>
 <!--h3--></section>
 <!--h2--></section>
-</chapter>
+</section>

Modified: qpid/trunk/qpid/doc/book/src/NET-User-Guide.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/NET-User-Guide.xml?rev=917763&r1=917762&r2=917763&view=diff
==============================================================================
--- qpid/trunk/qpid/doc/book/src/NET-User-Guide.xml (original)
+++ qpid/trunk/qpid/doc/book/src/NET-User-Guide.xml Mon Mar  1 22:34:29 2010
@@ -20,7 +20,7 @@
  
 -->
 
-<chapter xmlns:html="http://www.w3.org/1999/xhtml">
+<section>
   <title>
     Apache Qpid: Open Source AMQP Messaging - .NET User Guide
   </title>
@@ -1024,7 +1024,7 @@
       <!--h3-->
     </section>    
     
-    <section role="h3" id="NETUserGuide-ReadingMessagesfromtheQueue">
+    <section role="h3" id="NETUserGuide-ReadingMessagesfromtheQueue2">
       <title>
 	Reading
 	Messages from the Queue
@@ -1380,4 +1380,4 @@
 	</section>
             
           
-      </chapter>
+      </section>

Modified: qpid/trunk/qpid/doc/book/src/PythonBrokerTest.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/PythonBrokerTest.xml?rev=917763&r1=917762&r2=917763&view=diff
==============================================================================
--- qpid/trunk/qpid/doc/book/src/PythonBrokerTest.xml (original)
+++ qpid/trunk/qpid/doc/book/src/PythonBrokerTest.xml Mon Mar  1 22:34:29 2010
@@ -20,7 +20,7 @@
  
 -->
 
-<chapter xmlns:html="http://www.w3.org/1999/xhtml">
+<section>
   <title>
     Apache Qpid : PythonBrokerTest
   </title>
@@ -95,4 +95,4 @@
     <!--h2-->
   </section>
 
-</chapter>
+</section>

Modified: qpid/trunk/qpid/doc/book/src/QMF-Python-Console-Tutorial.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/QMF-Python-Console-Tutorial.xml?rev=917763&r1=917762&r2=917763&view=diff
==============================================================================
--- qpid/trunk/qpid/doc/book/src/QMF-Python-Console-Tutorial.xml (original)
+++ qpid/trunk/qpid/doc/book/src/QMF-Python-Console-Tutorial.xml Mon Mar  1 22:34:29 2010
@@ -20,7 +20,7 @@
  
 -->
 
-<chapter xmlns:html="http://www.w3.org/1999/xhtml"><title>
+<section><title>
       Apache Qpid : QMF Python Console Tutorial
     </title>
             <itemizedlist>
@@ -84,7 +84,7 @@
             network. Qpid can be downloaded as source from Apache, is
             packaged with a number of Linux distributions, and can be
             purchased from commercial vendors that use Qpid. Please see
-            <xref linkend="qpid_Download"/> for
+            <xref linkend="chapter-Download"/> for
             information as to where to get Qpid Messaging.
           </para><para>
             Qpid Messaging includes a message broker (qpidd) which typically
@@ -891,4 +891,4 @@
 	  <!--h1--></section>
 
 	 
-</chapter>
+</section>

Modified: qpid/trunk/qpid/doc/book/src/QMan-Qpid-Management-bridge.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/QMan-Qpid-Management-bridge.xml?rev=917763&r1=917762&r2=917763&view=diff
==============================================================================
--- qpid/trunk/qpid/doc/book/src/QMan-Qpid-Management-bridge.xml (original)
+++ qpid/trunk/qpid/doc/book/src/QMan-Qpid-Management-bridge.xml Mon Mar  1 22:34:29 2010
@@ -20,7 +20,7 @@
  
 -->
 
-<chapter xmlns:html="http://www.w3.org/1999/xhtml"><title>
+<section><title>
       Apache Qpid : QMan - Qpid Management bridge
     </title><section role="h1" id="QMan-QpidManagementbridge-QMan-3AQpidManagementBridge"><title>
             QMan
@@ -76,7 +76,7 @@
               </row>
               <row>
                 <entry>
-                  <xref linkend="qpid_Get-20me-20up-20and-20running"/>
+                  <xref linkend="qpid_Get-me-up-and-running"/>
                 </entry>
                 <entry>
                   How to install &amp; start QMan.
@@ -84,7 +84,7 @@
               </row>
               <row>
                 <entry>
-                  <xref linkend="qpid_QMan-20User-20Guide"/>
+                  <xref linkend="qpid_QMan-User-Guide"/>
                 </entry>
                 <entry>
                   QMan (WS-DM version only) Administration Console.
@@ -92,7 +92,7 @@
               </row>
               <row>
                 <entry>
-                  <xref linkend="qpid_JMX-20Interface-20Specification"/>
+                  <xref linkend="qpid_JMX-Interface-Specification"/>
                 </entry>
                 <entry>
                   Describes each JMX interface exposed by QMan.
@@ -100,7 +100,7 @@
               </row>
               <row>
                 <entry>
-                  <xref linkend="qpid_WS-DM-20Interface-20Specification"/>
+                  <xref linkend="qpid_WS-DM-Interface-Specification"/>
                 </entry>
                 <entry>
                   Describes each WS-DM interface exposed by QMan.
@@ -108,7 +108,7 @@
               </row>
               <row>
                 <entry>
-                  <xref linkend="qpid_QMan-20Messages-20Catalogue"/>
+                  <xref linkend="qpid_QMan-Messages-Catalogue"/>
                 </entry>
                 <entry>
                   Informational / Debug / Error / Warning messages catalogue.
@@ -142,7 +142,7 @@
               </row>
               <row>
                 <entry>
-                  <xref linkend="qpid_QMan-20System-20Overview"/>
+                  <xref linkend="qpid_QMan-System-Overview"/>
                 </entry>
                 <entry>
                   A short introduction about QMan deployment context.
@@ -150,7 +150,7 @@
               </row>
               <row>
                 <entry>
-                  <xref linkend="qpid_QMan-20Components-20View"/>
+                  <xref linkend="qpid_QMan-Components-View"/>
                 </entry>
                 <entry>
                   Describes QMan components, their interactions and
@@ -163,4 +163,4 @@
 <!--h2--></section>
 <!--h1--></section>
 
-</chapter>
+</section>

Modified: qpid/trunk/qpid/doc/book/src/Qpid-Interoperability-Documentation.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/Qpid-Interoperability-Documentation.xml?rev=917763&r1=917762&r2=917763&view=diff
==============================================================================
--- qpid/trunk/qpid/doc/book/src/Qpid-Interoperability-Documentation.xml (original)
+++ qpid/trunk/qpid/doc/book/src/Qpid-Interoperability-Documentation.xml Mon Mar  1 22:34:29 2010
@@ -20,7 +20,7 @@
  
 -->
 
-<chapter xmlns:html="http://www.w3.org/1999/xhtml"><title>
+<chapter><title>
       Apache Qpid : Qpid Interoperability Documentation
     </title><section role="h2" id="QpidInteroperabilityDocumentation-QpidInteroperabilityDocumentation"><title>
             Qpid Interoperability Documentation
@@ -235,12 +235,14 @@
                 </entry>
               </row>
             </tbody>
-          </tgroup></table><para>
-            
+          </tgroup></table>
+
+	  <para id="QpidInteroperabilityDocumentation-1">        
             1: Support for these will be in M3 (currently available on
             trunk).
+	  </para>
             
-            2: C++ Broker uses <xref linkend="qpid_"/> which
+           <para id="QpidInteroperabilityDocumentation-2">2: C++ Broker uses <ulink url="http://freshmeat.net/projects/cyrussasl/">Cyrus SASL</ulink> which
             supports CRAM-MD5 and GSSAPI but these have not been tested yet
           </para>
 <!--h4--></section>

Modified: qpid/trunk/qpid/doc/book/src/Qpid-JMX-Management-Console-FAQ.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/Qpid-JMX-Management-Console-FAQ.xml?rev=917763&r1=917762&r2=917763&view=diff
==============================================================================
--- qpid/trunk/qpid/doc/book/src/Qpid-JMX-Management-Console-FAQ.xml (original)
+++ qpid/trunk/qpid/doc/book/src/Qpid-JMX-Management-Console-FAQ.xml Mon Mar  1 22:34:29 2010
@@ -20,7 +20,7 @@
  
 -->
 
-<chapter xmlns:html="http://www.w3.org/1999/xhtml"><title>
+<section><title>
       Apache Qpid : Qpid JMX Management Console FAQ
     </title>
 <!--
@@ -51,7 +51,7 @@
           </title>
 
 	  <para>
-            The <xref linkend="qpid_Management-20Console-20Security"/> page will give you the instructions that you should
+            The <xref linkend="qpid_Management-Console-Security"/> page will give you the instructions that you should
             use to set this up.
           </para>
 <!--h3--></section>
@@ -93,4 +93,4 @@
           </para>
 <!--h3--></section>
 <!--h2--></section>
-</chapter>
+</section>



---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project:      http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org