X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=doc%2Faltusmetrum.xsl;h=8339ca432c61dcb38d9f052e91df412e972ef36c;hb=87f9a8923656f275f74cfb6c8c6a57bbe59e74f8;hp=606c8b9945cb8985d9f4d69020b4ef6c58bb6f68;hpb=0552fbed34c9698dac30c239df2a823a8502b3f3;p=fw%2Faltos

diff --git a/doc/altusmetrum.xsl b/doc/altusmetrum.xsl
index 606c8b99..8339ca43 100644
--- a/doc/altusmetrum.xsl
+++ b/doc/altusmetrum.xsl
@@ -258,7 +258,8 @@ NAR #88757, TRA #12200
       A typical TeleMetrum or TeleMini installation involves attaching 
       only a suitable Lithium Polymer battery, a single pole switch for 
       power on/off, and two pairs of wires connecting e-matches for the 
-      apogee and main ejection charges.
+      apogee and main ejection charges.  All Altus Metrum products are 
+      designed for use with single-cell batteries with 3.7 volts nominal.
     </para>
     <para>
       By default, we use the unregulated output of the Li-Po battery directly
@@ -586,7 +587,7 @@ NAR #88757, TRA #12200
       <section>
 	<title>Maximum Flight Log</title>
 	<para>
-	  TeleMetrum version 1.1 has 2MB of on-board flash storage,
+	  TeleMetrum version 1.1 and 1.2 have 2MB of on-board flash storage,
 	  enough to hold over 40 minutes of data at full data rate
 	  (100 samples/second). TeleMetrum 1.0 has 1MB of on-board
 	  storage. As data are stored at a reduced rate during descent
@@ -602,7 +603,7 @@ NAR #88757, TRA #12200
 	</para>
 	<para>
 	  All of the configuration data is also stored in the flash
-	  memory, which consumes 64kB on TeleMetrum v1.1 and 256B on
+	  memory, which consumes 64kB on TeleMetrum v1.1/v1.2 and 256B on
 	  TeleMetrum v1.0. This configuration space is not available
 	  for storing flight log data.
 	</para>
@@ -619,7 +620,7 @@ NAR #88757, TRA #12200
 	</para>
 	<para>
 	  The default size, 192kB, allows for 10 flights of storage on
-	  TeleMetrum v1.1 and 5 flights on TeleMetrum v1.0. This
+	  TeleMetrum v1.1/v1.2 and 5 flights on TeleMetrum v1.0. This
 	  ensures that you won't need to erase the memory before
 	  flying each time while still allowing more than sufficient
 	  storage for each flight.
@@ -1447,8 +1448,9 @@ NAR #88757, TRA #12200
         <para>
           In the rocket itself, you just need a <ulink url="http://www.altusmetrum.org/TeleMetrum/">TeleMetrum</ulink> or
 	  <ulink url="http://www.altusmetrum.org/TeleMini/">TeleMini</ulink> board and
-          a Li-Po rechargeable battery.  An 860mAh battery weighs less than a 9V
-          alkaline battery, and will run a TeleMetrum for hours.
+          a single-cell, 3.7 volt nominal Li-Po rechargeable battery.  An 
+	  850mAh battery weighs less than a 9V alkaline battery, and will 
+	  run a TeleMetrum for hours.
 	  A 110mAh battery weighs less than a triple A battery and will run a TeleMetrum for
 	  a few hours, or a TeleMini for much (much) longer.
         </para>
@@ -1842,7 +1844,7 @@ NAR #88757, TRA #12200
         </listitem>
         <listitem>
           Select the image you want put on the TeleMetrum, which should have a
-          name in the form telemetrum-v1.1-1.0.0.ihx.  It should be visible
+          name in the form telemetrum-v1.2-1.0.0.ihx.  It should be visible
 	in the default directory, if not you may have to poke around
 	your system to find it.
         </listitem>
@@ -2480,6 +2482,7 @@ NAR #88757, TRA #12200
   <appendix
       xmlns:xi="http://www.w3.org/2001/XInclude">
     <title>Release Notes</title>
+    <xi:include	href="release-notes-1.1.xsl"  xpointer="xpointer(/article/*)"/>
     <xi:include	href="release-notes-1.0.1.xsl"  xpointer="xpointer(/article/*)"/>
     <xi:include	href="release-notes-0.9.2.xsl"  xpointer="xpointer(/article/*)"/>
     <xi:include	href="release-notes-0.9.xsl"  xpointer="xpointer(/article/*)"/>