=== modified file 'TODO'
--- TODO	2008-08-29 07:30:17 +0000
+++ TODO	2008-08-29 16:53:41 +0000
@@ -91,7 +91,10 @@
 ** Tags
    Go through all man pages to conform to the style of tags chosen in
    [[http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl/trunk/debian/examples/foo.1.example_manpage.xml?op=file&rev=0&sc=0][foo.1.example_manpage.xml]].  In particular:
-*** Synopsis <arg> and <option> tags
+*** SYNOPSIS
+    <arg> with inner <replaceable> and <option> tags
+*** OPTIONS
+    Separate <term> tags with <option> and <replaceable> tags
 ** Use xinclude for common sections
    Like copyright, authors, etc.
 

=== modified file 'mandos.xml'
--- mandos.xml	2008-08-29 07:30:17 +0000
+++ mandos.xml	2008-08-29 16:53:41 +0000
@@ -143,7 +143,8 @@
 
     <variablelist>
       <varlistentry>
-	<term><literal>-h</literal>, <literal>--help</literal></term>
+	<term><option>-h</option></term>
+	<term><option>--help</option></term>
 	<listitem>
 	  <para>
 	    Show a help message and exit
@@ -152,8 +153,10 @@
       </varlistentry>
 
       <varlistentry>
-	<term><literal>-i</literal>, <literal>--interface <replaceable
-	>NAME</replaceable></literal></term>
+	<term><option>-i</option>
+	<replaceable>NAME</replaceable></term>
+	<term><option>--interface</option>
+	<replaceable>NAME</replaceable></term>
 	<listitem>
 	  <xi:include href="mandos-options.xml" xpointer="interface"/>
 	</listitem>