From adf48db1b35e0107526114a6c685977626e12f5c Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <zecke@selfish.org>
Date: Sat, 7 Apr 2012 11:37:50 +0200
Subject: [PATCH] usermanual: Obey the docbook schema for xmlto

dblatex was more forgiving, add missing tags to make xmlto happy
---
 docs/chapters/firmware.xml     | 12 ++++++------
 docs/chapters/installation.xml |  4 ++--
 docs/chapters/using_sniff.xml  |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/docs/chapters/firmware.xml b/docs/chapters/firmware.xml
index eb93fb4..542d5be 100644
--- a/docs/chapters/firmware.xml
+++ b/docs/chapters/firmware.xml
@@ -58,7 +58,8 @@ $ cd ../..
         <para>In case the NOR Flash of the SAM7 Microcontroller is either blank or has
         become corrupted the Microcontrollers support entering a mode called SAM-BA which
         then allows flashing the device using the <filename>sam</filename> application. The
-        SAM-BA mode can be easily entered by following the below procedure.
+        SAM-BA mode can be easily entered by following the below procedure.</para>
+
         <procedure>
             <title>Entering SAM-BA Mode</title>
             <step><para>Unplug the SIMtrace Hardware from USB.</para></step>
@@ -71,9 +72,9 @@ $ cd ../..
 
         <figure>
             <title>TEST Jumper</title>
-            <imageobject>
+            <mediaobject><imageobject>
                 <imagedata fileref="images/shortTEST.jpg" width="12cm"/>
-            </imageobject>
+            </imageobject></mediaobject>
         </figure>
 
         <note><title>v1.0p/v1.1p Hardware Owners</title>
@@ -81,14 +82,13 @@ $ cd ../..
             two LEDs are on when powering up the SIMtrace Hardware with the Jumper set.
             The reason for this is unknown but there are several workarounds:
             <itemizedlist>
-                <listitem>Press the RESET button while powering up.</listitem>
-                <listitem>In addition, remove the jumper and put it back.</listitem>
+                <listitem><para>Press the RESET button while powering up.</para></listitem>
+                <listitem><para>In addition, remove the jumper and put it back.</para></listitem>
             </itemizedlist>
 
             As soon as the two LEDs go off, the SAM-BA mode is properly entered.
             </para>
         </note>
-        </para>
         <para>The <command>sam</command> application can be compiled to either use libusb or
         normal files to program the device, depending on the drivers used you will
         need to configure the application one way or another. The programming can then
diff --git a/docs/chapters/installation.xml b/docs/chapters/installation.xml
index fd1acb7..06c7c8a 100644
--- a/docs/chapters/installation.xml
+++ b/docs/chapters/installation.xml
@@ -34,9 +34,9 @@ $ <command>sudo</command> <command>apt-get</command> install wireshark simtrace
 ...
         </screen>
 
-        <note>The wireshark will only be installed if it is newer than the version
+        <note><para>The wireshark will only be installed if it is newer than the version
         provided by Ubuntu. Please verify that the above command installed a version
-        coming from the PPA.
+        coming from the PPA.</para>
         </note>
 
     </section>
diff --git a/docs/chapters/using_sniff.xml b/docs/chapters/using_sniff.xml
index 1a8c2a0..83ca6ea 100644
--- a/docs/chapters/using_sniff.xml
+++ b/docs/chapters/using_sniff.xml
@@ -66,7 +66,7 @@ simtrace - GSM SIM and smartcard tracing
         it basically can be used to intercept and analyze any traffic from (ISO7816)
         smart cards. This includes SIM cards, Pay TV cards (smart card for CAM),
         ATM cards, chip credit card, PKI smart cards, e-passport etc. etc. However
-        watch out: You have to make your chip card fitting in the “SIM card size”
+        watch out: You have to make your chip card fitting in the "SIM card size"
         ID-000 reader or build another adapter.</para>
     </section>
 </chapter>