Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos

Conflicts:
	doc/altusmetrum.xsl

diff --cc doc/altusmetrum.xsl
index 3e6b402526964eb8ed1041023227ad9b7164a568,61451f414c840c22ba01f5e72fc21867202f339e..1e9f04b4ee2615499b0a19f25ad566168c474efe
--- 1/doc/altusmetrum.xsl
--- 2/doc/altusmetrum.xsl
+++ b/doc/altusmetrum.xsl
@@@ -1954,22 -1998,28 +2003,28 @@@ NAR #88757, TRA #1220
          parameter allows that default to be changed, permitting the
          board to be mounted with the antenna pointing aft instead.
        </para>
-       <itemizedlist>
-         <listitem>
-           <para>
-             Antenna Up. In this mode, the antenna end of the
-             flight computer must point forward, in line with the
-             expected flight path.
-           </para>
-         </listitem>
-         <listitem>
-           <para>
-             Antenna Down. In this mode, the antenna end of the
-             flight computer must point aft, in line with the
-             expected flight path.
-           </para>
-         </listitem>
-       </itemizedlist>
+       <variablelist>
+         <varlistentry>
+           <term>Antenna Up</term>
+           <listitem>
+             <para>
+               In this mode, the antenna end of the
 -              TeleMetrum board must point forward, in line with the
++              flight computer must point forward, in line with the
+               expected flight path.
+             </para>
+           </listitem>
+         </varlistentry>
+         <varlistentry>
+           <term>Antenna Down</term>
+           <listitem>
+             <para>
+               In this mode, the antenna end of the
 -              TeleMetrum board must point aft, in line with the
++              flight computer must point aft, in line with the
+               expected flight path.
+             </para>
+           </listitem>
+         </varlistentry>
+       </variablelist>
        </section>
        <section>
        <title>Configure Pyro Channels</title>