From a759d11549aa071144c46bd302766276ee352b6a Mon Sep 17 00:00:00 2001
From: Chris Beams <cbeams@vmware.com>
Date: Mon, 22 Nov 2010 04:48:37 -0700
Subject: [PATCH] Fix doc typos, upgrade channel-adapter to DocBook 5
 (INT-1552)

---
 docs/src/reference/docbook/channel-adapter.xml | 9 ++++-----
 docs/src/reference/docbook/channel.xml         | 2 +-
 docs/src/reference/docbook/samples.xml         | 3 ---
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/docs/src/reference/docbook/channel-adapter.xml b/docs/src/reference/docbook/channel-adapter.xml
index a689e3b997..8aacb0d317 100644
--- a/docs/src/reference/docbook/channel-adapter.xml
+++ b/docs/src/reference/docbook/channel-adapter.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
-<section id="channel-adapter">
+<section xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="channel-adapter"
+    xmlns:xlink="http://www.w3.org/1999/xlink">
   <title>Channel Adapter</title>
   <para>
     A Channel Adapter is a Message Endpoint that enables connecting a single sender or receiver to a Message Channel.
@@ -70,9 +69,9 @@
     <para>
       Any Channel Adapter can be created without a "channel" reference in which case it will implicitly create an
       instance of <classname>DirectChannel</classname>. The created channel's name will match the "id" attribute
-      of the &lt;inbound-channel-adapter/&gt; or &lt;outbound-channel-adapter&gtl; element. Therefore, if the "channel"
+      of the &lt;inbound-channel-adapter/&gt; or &lt;outbound-channel-adapter&gt; element. Therefore, if the "channel"
       is not provided, the "id" is required.
     </para>
   </section>
 
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/src/reference/docbook/channel.xml b/docs/src/reference/docbook/channel.xml
index cd24f29c24..f5ed890e9b 100644
--- a/docs/src/reference/docbook/channel.xml
+++ b/docs/src/reference/docbook/channel.xml
@@ -604,7 +604,7 @@ public Message<?> receive(final PollableChannel<?> channel) { ... }]]></programl
       </para>
       
       <para>
-      <emphasis>A little more on Wite Tap</emphasis>
+      <emphasis>A little more on Wire Tap</emphasis>
       </para>
       <para>
       One of the common misconception about the wire tap and some time other similar components (<xref linkend="message-publishing-config"/>) 
diff --git a/docs/src/reference/docbook/samples.xml b/docs/src/reference/docbook/samples.xml
index 2261d2e5f5..17ec275990 100644
--- a/docs/src/reference/docbook/samples.xml
+++ b/docs/src/reference/docbook/samples.xml
@@ -145,7 +145,6 @@ That includes Samples, so if you can't find what you are looking for let us know
      However, certain samples require a more detailed and some times graphical explanation. In these section you'll
      find details on samples that we believe require special attention.
      </para>
-     <!-- problem exists somewhere between here XXX -->
       <section id="samples-loan-broker">
         <title>Loan Broker</title>
         <para>
@@ -184,7 +183,6 @@ That includes Samples, so if you can't find what you are looking for let us know
             </listitem>
           </itemizedlist>
       </para>
-      <!-- works up until here XXX -->
       <para>
       The details and variations of this use case are very nicely described in Chapter 9 of the EIP Book, but here is the brief summary;
       A Consumer while shopping for the best Loan Quote(s) subscribes to the services of a Loan Broker, which handles details such as:
@@ -384,7 +382,6 @@ That includes Samples, so if you can't find what you are looking for let us know
       and should not require change in design, testing and deployment strategy if such applications need to integrate with one another.
       </para>
     </section>
-    <!-- and here XXX -->
 
     <section id="samples-cafe">
       <title>The Cafe Sample</title>