From: Bdale Garbee <bdale@gag.com>
Date: Tue, 17 Dec 2013 21:09:30 +0000 (-0700)
Subject: Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
X-Git-Tag: 1.3~37
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=90c88bab305c43eb62f964fd3ff350b8b0b5320d

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

Conflicts:
	doc/altusmetrum.xsl
---

90c88bab305c43eb62f964fd3ff350b8b0b5320d
diff --cc doc/altusmetrum.xsl
index 3e6b4025,61451f41..1e9f04b4
--- a/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>