Index: brlcad/doc/docbook/system/man1/en/bwscale.xml
===================================================================
--- brlcad/doc/docbook/system/man1/en/bwscale.xml	(revision 53848)
+++ brlcad/doc/docbook/system/man1/en/bwscale.xml	(working copy)
@@ -108,7 +108,9 @@
 Optional cubic interpolation would be nice.</para>
 </refsection>
 
-<info><corpauthor>BRL-CAD Team</corpauthor></info>
+<refsection xml:id="author"><title>AUTHOR</title>
+    <para>BRL-CAD Team</para>
+</refsection>
 
 <refsection xml:id="bug_reports"><info><title>BUG REPORTS</title></info>
 <para>Reports of bugs or problems should be submitted via electronic
Index: brlcad/doc/docbook/system/man1/en/g-tankill.xml
===================================================================
--- brlcad/doc/docbook/system/man1/en/g-tankill.xml	(revision 53848)
+++ brlcad/doc/docbook/system/man1/en/g-tankill.xml	(working copy)
@@ -5,6 +5,8 @@
 <refentrytitle>G-TANKILL</refentrytitle>
 <manvolnum>1</manvolnum>
 <refmiscinfo class='source'>BRL-CAD</refmiscinfo>
+<refmiscinfo class='software'>BRL-CAD</refmiscinfo>
+<refmiscinfo class='manual'>User Commands</refmiscinfo>
 </refmeta>
 <refnamediv>
 <refname>g-tankill</refname>
@@ -73,11 +75,9 @@
 </refsect1>
 
 <refsect1 xml:id='example'><title>EXAMPLE</title>
-<literallayout remap='RS'>
 <synopsis>
 $ <emphasis remap='I'>g-tankill -o sample.tankill sample.g sample_object</emphasis>
 </synopsis>
-</literallayout> <!-- remap='RE' -->
 </refsect1>
 
 <refsect1 xml:id='diagnostics'><title>DIAGNOSTICS</title>
Index: brlcad/doc/docbook/system/man1/en/g-x3d.xml
===================================================================
--- brlcad/doc/docbook/system/man1/en/g-x3d.xml	(revision 53848)
+++ brlcad/doc/docbook/system/man1/en/g-x3d.xml	(working copy)
@@ -5,6 +5,8 @@
 <refentrytitle>G-X3D</refentrytitle>
 <manvolnum>1</manvolnum>
 <refmiscinfo class='source'>BRL-CAD</refmiscinfo>
+<refmiscinfo class='software'>BRL-CAD</refmiscinfo>
+<refmiscinfo class='manual'>User Commands</refmiscinfo>
 </refmeta>
 <refnamediv>
 <refname>g-x3d</refname>
@@ -83,11 +85,9 @@
 </refsect1>
 
 <refsect1 xml:id='example'><title>EXAMPLE</title>
-<literallayout remap='RS'>
 <synopsis>
 $ <emphasis remap='I'>g-x3d -o shell.x3d sample.g sample_object</emphasis>
 </synopsis>
-</literallayout> <!-- remap='RE' -->
 </refsect1>
 
 <refsect1 xml:id='diagnostics'><title>DIAGNOSTICS</title>
Index: brlcad/doc/docbook/system/man1/en/tankill-g.xml
===================================================================
--- brlcad/doc/docbook/system/man1/en/tankill-g.xml	(revision 53848)
+++ brlcad/doc/docbook/system/man1/en/tankill-g.xml	(working copy)
@@ -5,6 +5,8 @@
 <refentrytitle>TANKILL-G</refentrytitle>
 <manvolnum>1</manvolnum>
 <refmiscinfo class='source'>BRL-CAD</refmiscinfo>
+<refmiscinfo class='software'>BRL-CAD</refmiscinfo>
+<refmiscinfo class='manual'>User Commands</refmiscinfo>
 </refmeta>
 <refnamediv>
 <refname>tankill-g</refname>
@@ -48,11 +50,9 @@
 </refsect1>
 
 <refsect1 xml:id='example'><title>EXAMPLE</title>
-<literallayout remap='RS'>
 <synopsis>
 $ <emphasis remap='I'>tankill-g sample.tankill sample.g</emphasis>
 </synopsis>
-</literallayout> <!-- remap='RE' -->
 </refsect1>
 
 <refsect1 xml:id='diagnostics'><title>DIAGNOSTICS</title>
Index: brlcad/doc/docbook/system/man1/en/rt.xml
===================================================================
--- brlcad/doc/docbook/system/man1/en/rt.xml	(revision 53848)
+++ brlcad/doc/docbook/system/man1/en/rt.xml	(working copy)
@@ -653,7 +653,9 @@
   Descriptive messages are printed on stderr.</para>
   </refsection>
 
-  <info><corpauthor>BRL-CAD Team</corpauthor></info>
+  <refsection xml:id="author"><title>AUTHOR</title>
+  <para>BRL-CAD Team</para>
+  </refsection>
 
   <refsection xml:id="copyright"><info><title>COPYRIGHT</title></info>
   <para>This software is Copyright (c) 1984-2012 United States Government as
Index: brlcad/doc/docbook/system/man1/en/coil.xml
===================================================================
--- brlcad/doc/docbook/system/man1/en/coil.xml	(revision 53848)
+++ brlcad/doc/docbook/system/man1/en/coil.xml	(working copy)
@@ -176,12 +176,9 @@
   </para>
 </refsection>
 
-<info>
-   <author>
-     <personname>Clifford Yapp</personname>
-     <contrib></contrib>
-   </author>
-</info>
+<refsection xml:id="author"><title>AUTHOR</title>
+<para>Clifford Yapp</para>
+</refsection>
 
 <refsection xml:id="copyright"><info><title>COPYRIGHT</title></info>
 
Index: brlcad/doc/docbook/system/man1/en/nastran-g.xml
===================================================================
--- brlcad/doc/docbook/system/man1/en/nastran-g.xml	(revision 53848)
+++ brlcad/doc/docbook/system/man1/en/nastran-g.xml	(working copy)
@@ -5,6 +5,8 @@
 <refentrytitle>NASTRAN-G</refentrytitle>
 <manvolnum>1</manvolnum>
 <refmiscinfo class='source'>BRL-CAD</refmiscinfo>
+<refmiscinfo class='software'>BRL-CAD</refmiscinfo>
+<refmiscinfo class='manual'>User Commands</refmiscinfo>
 </refmeta>
 <refnamediv>
 <refname>nastran-g</refname>
@@ -50,11 +52,9 @@
 </refsect1>
 
 <refsect1 xml:id='example'><title>EXAMPLE</title>
-<literallayout remap='RS'>
 <synopsis>
 $ <emphasis remap='I'>nastran-g -i nastran.file -o sample.g</emphasis>
 </synopsis>
-</literallayout> <!-- remap='RE' -->
 </refsect1>
 
 <refsect1 xml:id='diagnostics'><title>DIAGNOSTICS</title>
Index: brlcad/doc/docbook/system/man1/en/enf-g.xml
===================================================================
--- brlcad/doc/docbook/system/man1/en/enf-g.xml	(revision 53848)
+++ brlcad/doc/docbook/system/man1/en/enf-g.xml	(working copy)
@@ -50,11 +50,9 @@
 </refsect1>
 
 <refsect1 xml:id='example'><title>EXAMPLE</title>
-<literallayout remap='RS'>
 <synopsis>
 $ <emphasis remap='I'>enf-g sample.enf sample.g</emphasis>
 </synopsis>
-</literallayout> <!-- remap='RE' -->
 </refsect1>
 
 <refsect1 xml:id='diagnostics'><title>DIAGNOSTICS</title>
Index: brlcad/doc/docbook/system/man1/en/g-nff.xml
===================================================================
--- brlcad/doc/docbook/system/man1/en/g-nff.xml	(revision 53848)
+++ brlcad/doc/docbook/system/man1/en/g-nff.xml	(working copy)
@@ -68,11 +68,9 @@
 </refsect1>
 
 <refsect1 xml:id='example'><title>EXAMPLE</title>
-<literallayout remap='RS'>
 <synopsis>
 $ <emphasis remap='I'>g-nff -o sample.nff sample.g sample_object</emphasis>
 </synopsis>
-</literallayout> <!-- remap='RE' -->
 </refsect1>
 
 <refsect1 xml:id='diagnostics'><title>DIAGNOSTICS</title>
Index: brlcad/doc/docbook/system/man1/en/g-obj.xml
===================================================================
--- brlcad/doc/docbook/system/man1/en/g-obj.xml	(revision 53848)
+++ brlcad/doc/docbook/system/man1/en/g-obj.xml	(working copy)
@@ -5,6 +5,8 @@
 <refentrytitle>G-OBJ</refentrytitle>
 <manvolnum>1</manvolnum>
 <refmiscinfo class='source'>BRL-CAD</refmiscinfo>
+<refmiscinfo class='software'>BRL-CAD</refmiscinfo>
+<refmiscinfo class='manual'>User Commands</refmiscinfo>
 </refmeta>
 <refnamediv>
 <refname>g-obj</refname>
@@ -84,11 +86,9 @@
 </refsect1>
 
 <refsect1 xml:id='example'><title>EXAMPLE</title>
-<literallayout remap='RS'>
 <synopsis>
 $ <emphasis remap='I'>g-obj -o sample.obj sample.g sample_object</emphasis>
 </synopsis>
-</literallayout> <!-- remap='RE' -->
 </refsect1>
 
 <refsect1 xml:id='diagnostics'><title>DIAGNOSTICS</title>
Index: brlcad/doc/docbook/system/man1/en/obj-g.xml
===================================================================
--- brlcad/doc/docbook/system/man1/en/obj-g.xml	(revision 53848)
+++ brlcad/doc/docbook/system/man1/en/obj-g.xml	(working copy)
@@ -330,12 +330,9 @@
   </para>
 </refsection>
 
-<info>
-  <author>
-    <personname>Richard Weiss</personname>
-    <contrib></contrib>
-  </author>
-</info>
+<refsection xml:id="author"><title>AUTHOR</title>
+  <para>Richard Weiss</para>
+</refsection>
 
 <refsection xml:id="copyright"><info><title>COPYRIGHT</title></info>
 
Index: brlcad/doc/docbook/system/man1/en/cy-g.xml
===================================================================
--- brlcad/doc/docbook/system/man1/en/cy-g.xml	(revision 53848)
+++ brlcad/doc/docbook/system/man1/en/cy-g.xml	(working copy)
@@ -34,11 +34,9 @@
 </refsect1>
 
 <refsect1 xml:id='example'><title>EXAMPLE</title>
-<literallayout remap='RS'>
 <synopsis>
 $ <emphasis remap='I'>cy-g sample.cy sample.g</emphasis>
 </synopsis>
-</literallayout> <!-- remap='RE' -->
 </refsect1>
 
 <refsect1 xml:id='diagnostics'><title>DIAGNOSTICS</title>
Index: brlcad/doc/docbook/system/man1/en/asc2dsp.xml
===================================================================
--- brlcad/doc/docbook/system/man1/en/asc2dsp.xml	(revision 53848)
+++ brlcad/doc/docbook/system/man1/en/asc2dsp.xml	(working copy)
@@ -73,7 +73,10 @@
   Descriptive messages are printed on stderr.</para>
   </refsection>
 
-  <info><corpauthor>BRL-CAD Team</corpauthor></info>
+  <refsection xml:id="author">
+      <title>AUTHORS</title>
+      <para>BRL-CAD Team</para>
+  </refsection>
 
   <refsection xml:id="copyright"><info><title>COPYRIGHT</title></info>
   <para>This software is Copyright (c) 2012-2012 United States Government as
Index: brlcad/doc/docbook/system/man1/en/tire.xml
===================================================================
--- brlcad/doc/docbook/system/man1/en/tire.xml	(revision 53848)
+++ brlcad/doc/docbook/system/man1/en/tire.xml	(working copy)
@@ -203,12 +203,9 @@
   </para>
 </refsection>
 
-<info>
-  <author>
-  <personname>Clifford Yapp</personname>
-  <contrib></contrib>
-  </author>
-</info>
+<refsection xml:id="author"><title>AUTHOR</title>
+  <para>Clifford Yapp</para>
+</refsection>
 
 <refsection xml:id="copyright"><info><title>COPYRIGHT</title></info>
 
Index: brlcad/doc/docbook/system/man1/en/poly-bot.xml
===================================================================
--- brlcad/doc/docbook/system/man1/en/poly-bot.xml	(revision 53848)
+++ brlcad/doc/docbook/system/man1/en/poly-bot.xml	(working copy)
@@ -5,6 +5,8 @@
 <refentrytitle>POLY-BOT</refentrytitle>
 <manvolnum>1</manvolnum>
 <refmiscinfo class='source'>BRL-CAD</refmiscinfo>
+<refmiscinfo class='software'>BRL-CAD</refmiscinfo>
+<refmiscinfo class='manual'>User Commands</refmiscinfo>
 </refmeta>
 <refnamediv>
 <refname>poly-bot</refname>
@@ -36,11 +38,9 @@
 </refsect1>
 
 <refsect1 xml:id='example'><title>EXAMPLE</title>
-<literallayout remap='RS'>
 <synopsis>
 $ <emphasis remap='I'>poly-bot polys.g bots.g</emphasis>
 </synopsis>
-</literallayout> <!-- remap='RE' -->
 </refsect1>
 
 <refsect1 xml:id='diagnostics'><title>DIAGNOSTICS</title>
Index: brlcad/doc/docbook/system/man1/en/dxf-g.xml
===================================================================
--- brlcad/doc/docbook/system/man1/en/dxf-g.xml	(revision 53848)
+++ brlcad/doc/docbook/system/man1/en/dxf-g.xml	(working copy)
@@ -124,11 +124,9 @@
 </refsect1>
 
 <refsect1 xml:id='example'><title>EXAMPLE</title>
-<literallayout remap='RS'>
 <synopsis>
 $ <emphasis remap='I'>dxf-g sample.dxf sample.g</emphasis>
 </synopsis>
-</literallayout> <!-- remap='RE' -->
 </refsect1>
 
 <refsect1 xml:id='see_also'><title>SEE ALSO</title>
Index: brlcad/doc/docbook/system/man1/en/fast4-g.xml
===================================================================
--- brlcad/doc/docbook/system/man1/en/fast4-g.xml	(revision 53848)
+++ brlcad/doc/docbook/system/man1/en/fast4-g.xml	(working copy)
@@ -115,11 +115,9 @@
 </refsect1>
 
 <refsect1 xml:id='example'><title>EXAMPLE</title>
-<literallayout remap='RS'>
 <synopsis>
 $ <emphasis remap='I'>fast4-g sample.fastgen4 sample.g</emphasis>
 </synopsis>
-</literallayout> <!-- remap='RE' -->
 </refsect1>
 
 <refsect1 xml:id='see_also'><title>SEE ALSO</title>
Index: brlcad/doc/docbook/system/man1/en/g-dxf.xml
===================================================================
--- brlcad/doc/docbook/system/man1/en/g-dxf.xml	(revision 53848)
+++ brlcad/doc/docbook/system/man1/en/g-dxf.xml	(working copy)
@@ -76,11 +76,9 @@
 </refsect1>
 
 <refsect1 xml:id='example'><title>EXAMPLE</title>
-<literallayout remap='RS'>
 <synopsis>
 $ <emphasis remap='I'>g-dxf -o sample.dxf sample.g sample_object</emphasis>
 </synopsis>
-</literallayout> <!-- remap='RE' -->
 </refsect1>
 
 <refsect1 xml:id='diagnostics'><title>DIAGNOSTICS</title>
Index: brlcad/doc/docbook/system/man1/en/viewpoint-g.xml
===================================================================
--- brlcad/doc/docbook/system/man1/en/viewpoint-g.xml	(revision 53848)
+++ brlcad/doc/docbook/system/man1/en/viewpoint-g.xml	(working copy)
@@ -5,6 +5,8 @@
 <refentrytitle>VIEWPOINT-G</refentrytitle>
 <manvolnum>1</manvolnum>
 <refmiscinfo class='source'>BRL-CAD</refmiscinfo>
+<refmiscinfo class='software'>BRL-CAD</refmiscinfo>
+<refmiscinfo class='manual'>User Commands</refmiscinfo>
 </refmeta>
 <refnamediv>
 <refname>viewpoint-g</refname>
@@ -42,11 +44,9 @@
 </refsect1>
 
 <refsect1 xml:id='example'><title>EXAMPLE</title>
-<literallayout remap='RS'>
 <synopsis>
 $ <emphasis remap='I'>viewpoint-g -e viewpoint.elems -c viewpoint.coords -o sample.g</emphasis>
 </synopsis>
-</literallayout> <!-- remap='RE' -->
 </refsect1>
 
 <refsect1 xml:id='see_also'><title>SEE ALSO</title>
Index: brlcad/doc/docbook/system/man1/en/bot_dump.xml
===================================================================
--- brlcad/doc/docbook/system/man1/en/bot_dump.xml	(revision 53848)
+++ brlcad/doc/docbook/system/man1/en/bot_dump.xml	(working copy)
@@ -73,11 +73,9 @@
 </refsect1>
 
 <refsect1 xml:id='example'><title>EXAMPLE</title>
-<literallayout remap='RS'>
 <synopsis>
 $ <emphasis remap='I'>bot_dump  -o some_bot_dump.dxf  -t dxf  sample.g  some_bot</emphasis>
 </synopsis>
-</literallayout> <!-- remap='RE' -->
 </refsect1>
 
 <refsect1 xml:id='diagnostics'><title>DIAGNOSTICS</title>
Index: brlcad/doc/docbook/system/man1/en/rtedge.xml
===================================================================
--- brlcad/doc/docbook/system/man1/en/rtedge.xml	(revision 53848)
+++ brlcad/doc/docbook/system/man1/en/rtedge.xml	(working copy)
@@ -612,16 +612,10 @@
     </para>
   </refsection>
 
-  <info>
-    <author>
-      <personname>Ronald Anthony Bowers</personname>
-      <contrib></contrib>
-    </author>
-    <author>
-      <personname>Michael John Muuss</personname>
-      <contrib></contrib>
-    </author>
-  </info>
+  <refsection xml:id="author"><title>AUTHORS</title>
+    <para>Ronald Anthony Bowers</para>
+    <para>Michael John Muuss</para>
+  </refsection>
 
   <refsection xml:id="copyright"><info><title>COPYRIGHT</title></info>
 
Index: brlcad/doc/docbook/system/man1/en/nirt.xml
===================================================================
--- brlcad/doc/docbook/system/man1/en/nirt.xml	(revision 53848)
+++ brlcad/doc/docbook/system/man1/en/nirt.xml	(working copy)
@@ -40,7 +40,7 @@
   <refsection xml:id="options"><info><title>Options</title></info>
   <variablelist remap="TP">
     <varlistentry>
-      <term><option rep="repeat">-A <replaceable>attribute_name...</replaceable></option></term>
+      <term><option>-A <replaceable>attribute_name...</replaceable></option></term>
       <listitem>
 	<para>
 	  Adds the names to the list of attributes that will be reported
@@ -1069,16 +1069,9 @@
   </para>
 </refsection>
 
-<info>
-  <author>
-      <personname>Natalie Eberius</personname>
-      <contrib></contrib>
-  </author>
-  <author>
-      <personname>Paul Tanenbaum</personname>
-      <contrib></contrib>
-  </author>
-</info>
+<refsection xml:id="author"><title>AUTHORS</title>
+    <para>Natalie Eberius</para>
+    <para>Paul Tanenbaum</para>
+</refsection>
 
-
 </refentry>
Index: brlcad/doc/docbook/system/man1/en/g-acad.xml
===================================================================
--- brlcad/doc/docbook/system/man1/en/g-acad.xml	(revision 53848)
+++ brlcad/doc/docbook/system/man1/en/g-acad.xml	(working copy)
@@ -67,11 +67,9 @@
 </refsect1>
 
 <refsect1 xml:id='example'><title>EXAMPLE</title>
-<literallayout remap='RS'>
 <synopsis>
 $ <emphasis remap='I'>g-acad -o sample.ACAD sample.g sample_object</emphasis>
 </synopsis>
-</literallayout> <!-- remap='RE' -->
 </refsect1>
 
 <refsect1 xml:id='diagnostics'><title>DIAGNOSTICS</title>
Index: brlcad/doc/docbook/system/man1/en/rtarea.xml
===================================================================
--- brlcad/doc/docbook/system/man1/en/rtarea.xml	(revision 53848)
+++ brlcad/doc/docbook/system/man1/en/rtarea.xml	(working copy)
@@ -294,5 +294,7 @@
     </para>
   </refsection>
 
-  <info><corpauthor>BRL-CAD Team</corpauthor></info>
+  <refsection xml:id="author"><title>AUTHOR</title>
+    <para>BRL-CAD Team</para>
+  </refsection>
 </refentry>
Index: brlcad/doc/docbook/system/man1/en/rtcheck.xml
===================================================================
--- brlcad/doc/docbook/system/man1/en/rtcheck.xml	(revision 53848)
+++ brlcad/doc/docbook/system/man1/en/rtcheck.xml	(working copy)
@@ -18,7 +18,9 @@
       <command>rtcheck</command>
       <arg choice="opt" rep="repeat"><replaceable>options</replaceable></arg>
       <arg choice="plain" rep="norepeat"><replaceable>model.g</replaceable></arg>
-      <arg choice="plain" rep="repeat"><replaceable>objects</replaceable></arg> &gt; <arg choice="plain" rep="norepeat"><replaceable>overlaps.pl</replaceable></arg>
+      <arg choice="plain" rep="repeat"><replaceable>objects</replaceable></arg>
+      <arg choice="plain" rep="norepeat">&gt;</arg>
+      <arg choice="plain" rep="norepeat"><replaceable>overlaps.pl</replaceable></arg>
     </cmdsynopsis>
   </refsynopsisdiv>
 
@@ -172,16 +174,10 @@
     </para>
   </refsection>
 
-  <info>
-    <author>
-       <personname>Michael John Muuss</personname>
-       <contrib></contrib>
-    </author>
-    <author>
-       <personname>Gary S. Moss</personname>
-       <contrib></contrib>
-    </author>
-  </info>
+  <refsection xml:id="author"><title>AUTHORS</title>
+    <para>Michael John Muuss</para>
+    <para>Gary S. Moss</para>
+  </refsection>
 
   <refsection xml:id="copyright"><info><title>COPYRIGHT</title></info>
 
Index: brlcad/doc/docbook/system/man1/en/asc-nmg.xml
===================================================================
--- brlcad/doc/docbook/system/man1/en/asc-nmg.xml	(revision 53848)
+++ brlcad/doc/docbook/system/man1/en/asc-nmg.xml	(working copy)
@@ -88,11 +88,9 @@
 
 <para>Then, the command:</para>
 
-<literallayout remap='RS'>
 <synopsis>
 $ <emphasis remap='I'>asc-nmg ascii_file sample.g</emphasis>
 </synopsis>
-</literallayout> <!-- remap='RE' -->
 
 <para>will produce an 'L'-shaped NMG solid to the sample.g database file.</para>
 </refsect1>
Index: brlcad/doc/docbook/system/man1/en/db.xml
===================================================================
--- brlcad/doc/docbook/system/man1/en/db.xml	(revision 53848)
+++ brlcad/doc/docbook/system/man1/en/db.xml	(working copy)
@@ -162,7 +162,9 @@
     </example>
   </refsection>
 
-  <info><corpauthor>BRL-CAD Team</corpauthor></info>
+  <refsection xml:id="author"><title>AUTHOR</title>
+      <para>BRL-CAD Team</para>
+  </refsection>
 
   <refsection xml:id="bug_reports"><info><title>BUG REPORTS</title></info>
 
Index: brlcad/doc/docbook/system/man1/en/g-stl.xml
===================================================================
--- brlcad/doc/docbook/system/man1/en/g-stl.xml	(revision 53848)
+++ brlcad/doc/docbook/system/man1/en/g-stl.xml	(working copy)
@@ -5,6 +5,8 @@
 <refentrytitle>G-STL</refentrytitle>
 <manvolnum>1</manvolnum>
 <refmiscinfo class='source'>BRL-CAD</refmiscinfo>
+<refmiscinfo class='software'>BRL-CAD</refmiscinfo>
+<refmiscinfo class='manual'>User Commands</refmiscinfo>
 </refmeta>
 <refnamediv>
 <refname>g-stl</refname>
@@ -87,11 +89,9 @@
 </refsect1>
 
 <refsect1 xml:id='example'><title>EXAMPLE</title>
-<literallayout remap='RS'>
 <synopsis>
 $ <emphasis remap='I'>g-stl -o sample.stl sample.g sample_object</emphasis>
 </synopsis>
-</literallayout> <!-- remap='RE' -->
 </refsect1>
 
 <refsect1 xml:id='diagnostics'><title>DIAGNOSTICS</title>
Index: brlcad/doc/docbook/system/man1/en/g-shell-rect.xml
===================================================================
--- brlcad/doc/docbook/system/man1/en/g-shell-rect.xml	(revision 53848)
+++ brlcad/doc/docbook/system/man1/en/g-shell-rect.xml	(working copy)
@@ -5,6 +5,8 @@
 <refentrytitle>G-SHELL-RECT</refentrytitle>
 <manvolnum>1</manvolnum>
 <refmiscinfo class='source'>BRL-CAD</refmiscinfo>
+<refmiscinfo class='software'>BRL-CAD</refmiscinfo>
+<refmiscinfo class='manual'>User Commands</refmiscinfo>
 </refmeta>
 <refnamediv>
 <refname>g-shell-rect</refname>
@@ -96,11 +98,9 @@
 </refsect1>
 
 <refsect1 xml:id='example'><title>EXAMPLE</title>
-<literallayout remap='RS'>
 <synopsis>
 $ <emphasis remap='I'>g-shell-rect -o shell.g sample.g sample_object</emphasis>
 </synopsis>
-</literallayout> <!-- remap='RE' -->
 </refsect1>
 
 <refsect1 xml:id='diagnostics'><title>DIAGNOSTICS</title>
Index: brlcad/doc/docbook/system/man1/en/g-egg.xml
===================================================================
--- brlcad/doc/docbook/system/man1/en/g-egg.xml	(revision 53848)
+++ brlcad/doc/docbook/system/man1/en/g-egg.xml	(working copy)
@@ -66,11 +66,9 @@
 </refsect1>
 
 <refsect1 xml:id='example'><title>EXAMPLE</title>
-<literallayout remap='RS'>
 <synopsis>
 $ <emphasis remap='I'>g-egg -o sample.egg sample.g sample_object</emphasis>
 </synopsis>
-</literallayout> <!-- remap='RE' -->
 </refsect1>
 
 <refsect1 xml:id='diagnostics'><title>DIAGNOSTICS</title>
Index: brlcad/doc/docbook/system/man1/en/stl-g.xml
===================================================================
--- brlcad/doc/docbook/system/man1/en/stl-g.xml	(revision 53848)
+++ brlcad/doc/docbook/system/man1/en/stl-g.xml	(working copy)
@@ -5,6 +5,8 @@
 <refentrytitle>STL-G</refentrytitle>
 <manvolnum>1</manvolnum>
 <refmiscinfo class='source'>BRL-CAD</refmiscinfo>
+<refmiscinfo class='software'>BRL-CAD</refmiscinfo>
+<refmiscinfo class='manual'>User Commands</refmiscinfo>
 </refmeta>
 <refnamediv>
 <refname>stl-g</refname>
@@ -76,11 +78,9 @@
 </refsect1>
 
 <refsect1 xml:id='example'><title>EXAMPLE</title>
-<literallayout remap='RS'>
 <synopsis>
 $ <emphasis remap='I'>stl-g sample.stl sample.g</emphasis>
 </synopsis>
-</literallayout> <!-- remap='RE' -->
 </refsect1>
 
 <refsect1 xml:id='diagnostics'><title>DIAGNOSTICS</title>
Index: brlcad/doc/docbook/system/man1/en/ply-g.xml
===================================================================
--- brlcad/doc/docbook/system/man1/en/ply-g.xml	(revision 53848)
+++ brlcad/doc/docbook/system/man1/en/ply-g.xml	(working copy)
@@ -5,6 +5,8 @@
 <refentrytitle>PLY-G</refentrytitle>
 <manvolnum>1</manvolnum>
 <refmiscinfo class='source'>BRL-CAD</refmiscinfo>
+<refmiscinfo class='software'>BRL-CAD</refmiscinfo>
+<refmiscinfo class='manual'>User Commands</refmiscinfo>
 </refmeta>
 <refnamediv>
 <refname>ply-g</refname>
@@ -47,11 +49,9 @@
 </refsect1>
 
 <refsect1 xml:id='example'><title>EXAMPLE</title>
-<literallayout remap='RS'>
 <synopsis>
 $ <emphasis remap='I'>ply-g sample.ply sample.g</emphasis>
 </synopsis>
-</literallayout> <!-- remap='RE' -->
 </refsect1>
 
 <refsect1 xml:id='diagnostics'><title>DIAGNOSTICS</title>
Index: brlcad/doc/docbook/system/man1/en/g-euclid.xml
===================================================================
--- brlcad/doc/docbook/system/man1/en/g-euclid.xml	(revision 53848)
+++ brlcad/doc/docbook/system/man1/en/g-euclid.xml	(working copy)
@@ -55,11 +55,9 @@
 </refsect1>
 
 <refsect1 xml:id='example'><title>EXAMPLE</title>
-<literallayout remap='RS'>
 <synopsis>
 $ <emphasis remap='I'>g-euclid -o sample.euclid sample.g sample_object</emphasis>
 </synopsis>
-</literallayout> <!-- remap='RE' -->
 </refsect1>
 
 <refsect1 xml:id='diagnostics'><title>DIAGNOSTICS</title>
Index: brlcad/doc/docbook/system/man1/en/euclid-g.xml
===================================================================
--- brlcad/doc/docbook/system/man1/en/euclid-g.xml	(revision 53848)
+++ brlcad/doc/docbook/system/man1/en/euclid-g.xml	(working copy)
@@ -37,11 +37,9 @@
 </refsect1>
 
 <refsect1 xml:id='example'><title>EXAMPLE</title>
-<literallayout remap='RS'>
 <synopsis>
 $ <emphasis remap='I'>euclid-g sample.euclid sample.g</emphasis>
 </synopsis>
-</literallayout> <!-- remap='RE' -->
 </refsect1>
 
 <refsect1 xml:id='diagnostics'><title>DIAGNOSTICS</title>
Index: brlcad/doc/docbook/system/man1/en/proe-g.xml
===================================================================
--- brlcad/doc/docbook/system/man1/en/proe-g.xml	(revision 53848)
+++ brlcad/doc/docbook/system/man1/en/proe-g.xml	(working copy)
@@ -5,6 +5,8 @@
 <refentrytitle>PROE-G</refentrytitle>
 <manvolnum>1</manvolnum>
 <refmiscinfo class='source'>BRL-CAD</refmiscinfo>
+<refmiscinfo class='software'>BRL-CAD</refmiscinfo>
+<refmiscinfo class='manual'>User Commands</refmiscinfo>
 </refmeta>
 <refnamediv>
 <refname>proe-g</refname>
@@ -86,11 +88,9 @@
 </refsect1>
 
 <refsect1 xml:id='example'><title>EXAMPLE</title>
-<literallayout remap='RS'>
 <synopsis>
 $ <emphasis remap='I'>proe-g sample.brl sample.g</emphasis>
 </synopsis>
-</literallayout> <!-- remap='RE' -->
 </refsect1>
 
 <refsect1 xml:id='see_also'><title>SEE ALSO</title>
Index: brlcad/doc/docbook/system/man1/en/nmg-bot.xml
===================================================================
--- brlcad/doc/docbook/system/man1/en/nmg-bot.xml	(revision 53848)
+++ brlcad/doc/docbook/system/man1/en/nmg-bot.xml	(working copy)
@@ -5,6 +5,8 @@
 <refentrytitle>NMG-BOT</refentrytitle>
 <manvolnum>1</manvolnum>
 <refmiscinfo class='source'>BRL-CAD</refmiscinfo>
+<refmiscinfo class='software'>BRL-CAD</refmiscinfo>
+<refmiscinfo class='manual'>User Commands</refmiscinfo>
 </refmeta>
 <refnamediv>
 <refname>nmg-bot</refname>
@@ -39,11 +41,9 @@
 </refsect1>
 
 <refsect1 xml:id='example'><title>EXAMPLE</title>
-<literallayout remap='RS'>
 <synopsis>
 $ <emphasis remap='I'>nmg-bot  file_with_nmgs.g  file_with_BoTs.g</emphasis>
 </synopsis>
-</literallayout> <!-- remap='RE' -->
 </refsect1>
 
 <refsect1 xml:id='diagnostics'><title>DIAGNOSTICS</title>
Index: brlcad/doc/docbook/system/man1/en/g-vrml.xml
===================================================================
--- brlcad/doc/docbook/system/man1/en/g-vrml.xml	(revision 53848)
+++ brlcad/doc/docbook/system/man1/en/g-vrml.xml	(working copy)
@@ -5,6 +5,8 @@
 <refentrytitle>G-VRML</refentrytitle>
 <manvolnum>1</manvolnum>
 <refmiscinfo class='source'>BRL-CAD</refmiscinfo>
+<refmiscinfo class='software'>BRL-CAD</refmiscinfo>
+<refmiscinfo class='manual'>User Commands</refmiscinfo>
 </refmeta>
 <refnamediv>
 <refname>g-vrml</refname>
@@ -83,11 +85,9 @@
 </refsect1>
 
 <refsect1 xml:id='example'><title>EXAMPLE</title>
-<literallayout remap='RS'>
 <synopsis>
 $ <emphasis remap='I'>g-vrml -o shell.wrl sample.g sample_object</emphasis>
 </synopsis>
-</literallayout> <!-- remap='RE' -->
 </refsect1>
 
 <refsect1 xml:id='diagnostics'><title>DIAGNOSTICS</title>
Index: brlcad/doc/docbook/system/man1/en/g-nmg.xml
===================================================================
--- brlcad/doc/docbook/system/man1/en/g-nmg.xml	(revision 53848)
+++ brlcad/doc/docbook/system/man1/en/g-nmg.xml	(working copy)
@@ -122,11 +122,9 @@
 </refsect1>
 
 <refsect1 xml:id='example'><title>EXAMPLE</title>
-<literallayout remap='RS'>
 <synopsis>
 $ <emphasis remap='I'>g-nmg -o shell.g sample.g sample_object</emphasis>
 </synopsis>
-</literallayout> <!-- remap='RE' -->
 </refsect1>
 
 <refsect1 xml:id='diagnostics'><title>DIAGNOSTICS</title>
Index: brlcad/doc/docbook/system/man1/en/rtwizard.xml
===================================================================
--- brlcad/doc/docbook/system/man1/en/rtwizard.xml	(revision 53848)
+++ brlcad/doc/docbook/system/man1/en/rtwizard.xml	(working copy)
@@ -309,7 +309,7 @@
 	    If a type is specified and insufficient information is supplied to generate that particular
 	    image type, rtwizard will exit with an error.
 
-	  <table><info><title>RtWizard Image Types</title></info>
+	  <table><title>RtWizard Image Types</title>
 
 	    <tgroup cols="3">
 	      <thead>
Index: brlcad/doc/docbook/system/man1/en/gqa.xml
===================================================================
--- brlcad/doc/docbook/system/man1/en/gqa.xml	(revision 53848)
+++ brlcad/doc/docbook/system/man1/en/gqa.xml	(working copy)
@@ -145,7 +145,7 @@
     </para>
 
     <para>
-      <prompt>mged&gt; </prompt><userinput>bo -i u c _DENSITIES <emphasis remap="I">filename</emphasis></userinput>
+      <prompt>mged&gt; </prompt><userinput>bo -i u c _DENSITIES <replaceable>filename</replaceable></userinput>
     </para>
   </refsection>
 
@@ -555,34 +555,28 @@
     <example><info><title>Default Behavior</title></info>
 
       <para>
-	The following command computes the weight of an object called <emphasis remap="I">wheel.r</emphasis>
-	from the geometry database <emphasis remap="I">model.g</emphasis> and reports the weight and volume,
-	and checks for overlaps.
+	The following command computes the weight of an object called <emphasis remap="I">wheel.r</emphasis> from the geometry database <emphasis remap="I">model.g</emphasis> and reports the weight and volume, and checks for overlaps.
+    <literallayout><userinput>gqa model.g wheel.r</userinput></literallayout>
       </para>
 
-      <userinput>gqa model.g wheel.r</userinput>
     </example>
 
     <example><info><title>Specifying Grid and Target Objects</title></info>
 
       <para>
-	The following will check objects hull, turret, and suspension for overlaps
-	and report exposed air. The grid starts at 1 cm and is refined to 1 mm unless overlaps or
-	exposed air are detected before the grid is refined to 1 mm.
+	The following will check objects hull, turret, and suspension for overlaps and report exposed air. The grid starts at 1 cm and is refined to 1 mm unless overlaps or exposed air are detected before the grid is refined to 1 mm.
+    <literallayout><userinput>gqa -g 1cm-1mm -A oe model.g hull turret suspension</userinput></literallayout>
       </para>
 
-      <userinput>gqa -g 1cm-1mm -A oe model.g hull turret suspension</userinput>
     </example>
 
     <example><info><title>Specifying Using Non-Default Units</title></info>
 
       <para>
-	The following computes volume and weight of hull, turret, and suspension.  Results are
-	reported in cubic centimeters (cc) and ounces (oz).  The grid spacing starts at 5 in. and
-	will not be refined below 0.3 mm spacing.
+	The following computes volume and weight of hull, turret, and suspension.  Results are reported in cubic centimeters (cc) and ounces (oz).  The grid spacing starts at 5 in. and will not be refined below 0.3 mm spacing.
+    <literallayout><userinput>gqa -g5in-0.3mm -Avw -u ft,cc,oz test.g hull turret suspension</userinput></literallayout>
       </para>
 
-      <userinput>gqa -g5in-0.3mm -Avw -u ft,cc,oz test.g hull turret suspension</userinput>
     </example>
 
     <para>For an example of each independent analysis type, consider the following:</para>
@@ -661,7 +655,9 @@
     </variablelist>
   </refsection>
 
-<info><corpauthor>BRL-CAD Team</corpauthor></info>
+  <refsection xml:id="author"><title>AUTHOR</title>
+      <para>BRL-CAD Team</para>
+  </refsection>
 
 <refsection xml:id="bug_reports"><info><title>BUG REPORTS</title></info>
 <para>Reports of bugs or problems should be submitted via electronic
Index: brlcad/doc/docbook/system/man1/en/iges-g.xml
===================================================================
--- brlcad/doc/docbook/system/man1/en/iges-g.xml	(revision 53848)
+++ brlcad/doc/docbook/system/man1/en/iges-g.xml	(working copy)
@@ -5,6 +5,8 @@
 <refentrytitle>IGES-G</refentrytitle>
 <manvolnum>1</manvolnum>
 <refmiscinfo class='source'>BRL-CAD</refmiscinfo>
+<refmiscinfo class='software'>BRL-CAD</refmiscinfo>
+<refmiscinfo class='manual'>User Commands</refmiscinfo>
 </refmeta>
 <refnamediv>
 <refname>iges-g</refname>
@@ -89,11 +91,9 @@
 </refsect1>
 
 <refsect1 xml:id='example'><title>EXAMPLE</title>
-<literallayout remap='RS'>
 <synopsis>
 $ <emphasis remap='I'>iges-g -o sample.g sample.iges</emphasis>
 </synopsis>
-</literallayout> <!-- remap='RE' -->
 </refsect1>
 
 <refsect1 xml:id='see_also'><title>SEE ALSO</title>
Index: brlcad/doc/docbook/system/man1/en/g-var.xml
===================================================================
--- brlcad/doc/docbook/system/man1/en/g-var.xml	(revision 53848)
+++ brlcad/doc/docbook/system/man1/en/g-var.xml	(working copy)
@@ -5,6 +5,8 @@
 <refentrytitle>G-VAR</refentrytitle>
 <manvolnum>1</manvolnum>
 <refmiscinfo class='source'>BRL-CAD</refmiscinfo>
+<refmiscinfo class='software'>BRL-CAD</refmiscinfo>
+<refmiscinfo class='manual'>User Commands</refmiscinfo>
 </refmeta>
 <refnamediv>
 <refname>g-var</refname>
@@ -80,11 +82,9 @@
 </refsect1>
 
 <refsect1 xml:id='example'><title>EXAMPLE</title>
-<literallayout remap='RS'>
 <synopsis>
 $ <emphasis remap='I'>g-var -o sample.mesh sample.g sample_object</emphasis>
 </synopsis>
-</literallayout> <!-- remap='RE' -->
 </refsect1>
 
 <refsect1 xml:id='diagnostics'><title>DIAGNOSTICS</title>
Index: brlcad/doc/docbook/system/man1/en/mged.xml
===================================================================
--- brlcad/doc/docbook/system/man1/en/mged.xml	(revision 53848)
+++ brlcad/doc/docbook/system/man1/en/mged.xml	(working copy)
@@ -277,9 +277,10 @@
     <para>Error messages are intended to be self-explanatory.</para>
   </refsection>
 
-  <info><corpauthor>BRL-CAD Team</corpauthor></info>
+  <refsection xml:id="author"><title>AUTHOR</title>
+      <para>BRL-CAD Team</para>
+  </refsection>
 
-
   <refsection xml:id="bug_reports"><info><title>BUG REPORTS</title></info>
 
     <para>
Index: brlcad/doc/docbook/system/man1/en/bot_shell-vtk.xml
===================================================================
--- brlcad/doc/docbook/system/man1/en/bot_shell-vtk.xml	(revision 53848)
+++ brlcad/doc/docbook/system/man1/en/bot_shell-vtk.xml	(working copy)
@@ -63,11 +63,9 @@
 </refsect1>
 
 <refsect1 xml:id='example'><title>EXAMPLE</title>
-<literallayout remap='RS'>
 <synopsis>
 $ <emphasis remap='I'>bot_shell-vtk  -o output.vtk  sample.g  the_exterior</emphasis>
 </synopsis>
-</literallayout> <!-- remap='RE' -->
 </refsect1>
 
 <refsect1 xml:id='diagnostics'><title>DIAGNOSTICS</title>
