From 546e8d2c5cee27213e232e3d276985615d3b6b48 Mon Sep 17 00:00:00 2001
From: Mark Wielaard <mark@klomp.org>
Date: Thu, 12 Dec 2013 21:20:48 +0000
Subject: [PATCH] Bug 328711 valgrind.1 manpage "memcheck options" section is
 badly generated

Add missing para tags inside listitems. (Miroslav Franc, mfranc@redhat.com)

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@13758
---
 NEWS                        |  1 +
 memcheck/docs/mc-manual.xml | 34 ++++++++++++++++++++--------------
 2 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/NEWS b/NEWS
index 3f8bfe2ce..7b0f94942 100644
--- a/NEWS
+++ b/NEWS
@@ -32,6 +32,7 @@ where XXXXXX is the bug number as listed below.
 328100  XABORT not implemented
 328205  Implement additional Xen hypercalls
 328455  s390x: SIGILL after emitting wrong register pair for ldxbr
+328711  valgrind.1 manpage "memcheck options" section is badly generated
 
 Release 3.9.0 (31 October 2013)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/memcheck/docs/mc-manual.xml b/memcheck/docs/mc-manual.xml
index a53bf86e9..e913e89b5 100644
--- a/memcheck/docs/mc-manual.xml
+++ b/memcheck/docs/mc-manual.xml
@@ -610,14 +610,14 @@ when <option>--leak-check=full</option> is specified. </para>
 in one of the following ways:
 
 <itemizedlist>
-  <listitem>a comma separated list of one or more of
-    <option>definite indirect possible reachable</option>.
+  <listitem><para>a comma separated list of one or more of
+    <option>definite indirect possible reachable</option>.</para>
   </listitem>
 
-  <listitem><option>all</option> to specify the complete set (all leak kinds).
+  <listitem><para><option>all</option> to specify the complete set (all leak kinds).</para>
   </listitem>
 
-  <listitem><option>none</option> for the empty set.
+  <listitem><para><option>none</option> for the empty set.</para>
   </listitem>
 </itemizedlist>
 
@@ -721,16 +721,16 @@ is <option>--errors-for-leak-kinds=definite,possible</option>
       one of the following ways:
 
         <itemizedlist>
-          <listitem>a comma separated list of one or more of
-            <option>definite indirect possible reachable</option>.
+          <listitem><para>a comma separated list of one or more of
+            <option>definite indirect possible reachable</option>.</para>
           </listitem>
           
-          <listitem><option>all</option> to specify the complete set (all leak kinds).
+          <listitem><para><option>all</option> to specify the complete set (all leak kinds).
             It is equivalent to
-            <option>--show-leak-kinds=definite,indirect,possible,reachable</option>.
+            <option>--show-leak-kinds=definite,indirect,possible,reachable</option>.</para>
           </listitem>
           
-          <listitem><option>none</option> for the empty set.
+          <listitem><para><option>none</option> for the empty set.</para>
           </listitem>
         </itemizedlist>
       </para>
@@ -763,17 +763,17 @@ is <option>--errors-for-leak-kinds=definite,possible</option>
         The heuristic set is specified in one of the following ways:
 
         <itemizedlist>
-          <listitem>a comma separated list of one or more of
-            <option>stdstring newarray multipleinheritance</option>.
+          <listitem><para>a comma separated list of one or more of
+            <option>stdstring newarray multipleinheritance</option>.</para>
           </listitem>
           
-          <listitem><option>all</option> to activate the complete set of
+          <listitem><para><option>all</option> to activate the complete set of
             heuristics.
             It is equivalent to
-            <option>--leak-check-heuristics=stdstring,newarray,multipleinheritance</option>.
+            <option>--leak-check-heuristics=stdstring,newarray,multipleinheritance</option>.</para>
           </listitem>
           
-          <listitem><option>none</option> for the empty set.
+          <listitem><para><option>none</option> for the empty set.</para>
           </listitem>
         </itemizedlist>
       </para>
@@ -797,18 +797,24 @@ is <option>--errors-for-leak-kinds=definite,possible</option>
       <para>These options provide an alternative way to specify the leak kinds to show:
         <itemizedlist>
           <listitem>
+	    <para>
             <option>--show-reachable=no --show-possibly-lost=yes</option> is equivalent to
             <option>--show-leak-kinds=definite,possible</option>.
+	    </para>
           </listitem>
           <listitem>
+	    <para>
             <option>--show-reachable=no --show-possibly-lost=no</option> is equivalent to
             <option>--show-leak-kinds=definite</option>.
+	    </para>
           </listitem>
           <listitem>
+	    <para>
             <option>--show-reachable=yes</option> is equivalent to
             <option>--show-leak-kinds=all</option>.
             Note that  <option>--show-possibly-lost=no</option> has no effect
             if <option>--show-reachable=yes</option> is specified.
+	    </para>
           </listitem>
         </itemizedlist>
       </para>