=== modified file 'TODO'
--- TODO	2008-08-30 18:45:41 +0000
+++ TODO	2008-08-30 19:05:15 +0000
@@ -93,12 +93,13 @@
    [[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> with inner <replaceable> and <option> tags
+**** DONE mandos-clients.conf.xml
 **** DONE mandos-keygen.xml
+**** DONE mandos.conf.xml
+**** DONE mandos.xml
+**** TODO plugin-runner.xml
+**** TODO plugins.d/password-prompt.xml
 **** DONE plugins.d/password-request.xml
-**** TODO mandos.conf.xml
-**** TODO mandos.xml
-**** TODO plugin-runner.xml
-**** TODO plugins.d/password-prompt.xml
 *** OPTIONS
     Separate <term> tags with <option> and <replaceable> tags
 **** DONE mandos-clients.conf.xml

=== modified file 'mandos.xml'
--- mandos.xml	2008-08-30 11:39:54 +0000
+++ mandos.xml	2008-08-30 19:05:15 +0000
@@ -74,38 +74,52 @@
   <refsynopsisdiv>
     <cmdsynopsis>
       <command>&COMMANDNAME;</command>
-      <arg>--interface<arg choice="plain">NAME</arg></arg>
-      <arg>--address<arg choice="plain">ADDRESS</arg></arg>
-      <arg>--port<arg choice="plain">PORT</arg></arg>
-      <arg>--priority<arg choice="plain">PRIORITY</arg></arg>
-      <arg>--servicename<arg choice="plain">NAME</arg></arg>
-      <arg>--configdir<arg choice="plain">DIRECTORY</arg></arg>
-      <arg>--debug</arg>
-    </cmdsynopsis>
-    <cmdsynopsis>
-      <command>&COMMANDNAME;</command>
-      <arg>-i<arg choice="plain">NAME</arg></arg>
-      <arg>-a<arg choice="plain">ADDRESS</arg></arg>
-      <arg>-p<arg choice="plain">PORT</arg></arg>
-      <arg>--priority<arg choice="plain">PRIORITY</arg></arg>
-      <arg>--servicename<arg choice="plain">NAME</arg></arg>
-      <arg>--configdir<arg choice="plain">DIRECTORY</arg></arg>
-      <arg>--debug</arg>
+      <group>
+	<arg choice="plain"><option>--interface
+	<replaceable>NAME</replaceable></option></arg>
+	<arg choice="plain"><option>-i
+	<replaceable>NAME</replaceable></option></arg>
+      </group>
+      <sbr/>
+      <group>
+	<arg choice="plain"><option>--address
+	<replaceable>ADDRESS</replaceable></option></arg>
+	<arg choice="plain"><option>-a
+	<replaceable>ADDRESS</replaceable></option></arg>
+      </group>
+      <sbr/>
+      <group>
+	<arg choice="plain"><option>--port
+	<replaceable>PORT</replaceable></option></arg>
+	<arg choice="plain"><option>-p
+	<replaceable>PORT</replaceable></option></arg>
+      </group>
+      <sbr/>
+      <arg><option>--priority
+      <replaceable>PRIORITY</replaceable></option></arg>
+      <sbr/>
+      <arg><option>--servicename
+      <replaceable>NAME</replaceable></option></arg>
+      <sbr/>
+      <arg><option>--configdir
+      <replaceable>DIRECTORY</replaceable></option></arg>
+      <sbr/>
+      <arg><option>--debug</option></arg>
     </cmdsynopsis>
     <cmdsynopsis>
       <command>&COMMANDNAME;</command>
       <group choice="req">
-	<arg choice="plain">-h</arg>
-	<arg choice="plain">--help</arg>
+	<arg choice="plain"><option>-h</option></arg>
+	<arg choice="plain"><option>--help</option></arg>
       </group>
     </cmdsynopsis>
     <cmdsynopsis>
       <command>&COMMANDNAME;</command>
-      <arg choice="plain">--version</arg>
+      <arg choice="plain"><option>--version</option></arg>
     </cmdsynopsis>
     <cmdsynopsis>
       <command>&COMMANDNAME;</command>
-      <arg choice="plain">--check</arg>
+      <arg choice="plain"><option>--check</option></arg>
     </cmdsynopsis>
   </refsynopsisdiv>