Merge branch 'branch-1.0' of ssh://git.gag.com/scm/git/fw/altos into branch-1.0

diff --git a/doc/Makefile b/doc/Makefile
index 81515b45b5503c67ee40136731342694d5ed146f..ab37c1b9b592f638365c83e3f7c311f3cd5738a5 100644 (file)
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -8,7 +8,8 @@ RELNOTES=\
        release-notes-0.9.html \
        release-notes-0.9.2.html \
        release-notes-1.0.1.html \
-       release-notes-1.0.2.html
+       release-notes-1.0.2.html \
+       release-notes-1.0.3.html \
 
 RELNOTES_XSL=$(RELNOTES:.html=.xsl)
 HTML=altusmetrum.html altos.html telemetry.html $(RELNOTES)

diff --git a/doc/altusmetrum.xsl b/doc/altusmetrum.xsl
index 989abd2a9c5679defa99523ea8da7a1b767e8faa..0a01c6de9e8a121ccae242ef03d0cdcb250e4c0c 100644 (file)
--- a/doc/altusmetrum.xsl
+++ b/doc/altusmetrum.xsl
@@ -2480,6 +2480,7 @@ NAR #88757, TRA #12200
   <appendix
       xmlns:xi="http://www.w3.org/2001/XInclude">
     <title>Release Notes</title>
+    <xi:include        href="release-notes-1.0.3.xsl"  xpointer="xpointer(/article/*)"/>
     <xi:include        href="release-notes-1.0.2.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/*)"/>

diff --git a/doc/release-notes-1.0.3.xsl b/doc/release-notes-1.0.3.xsl
new file mode 100644 (file)
index 0000000..2681d50
--- /dev/null
+++ b/doc/release-notes-1.0.3.xsl
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+"/usr/share/xml/docbook/schema/dtd/4.5/docbookx.dtd">
+
+<article>
+  <para>
+    Version 1.0.3 is a minor release adding support for TeleMetrum v1.2 boards
+  </para>
+  <para>
+    AltOS Firmware Changes
+    <itemizedlist>
+      <listitem>
+       TeleMetrum version 1.2 is functionally identical to version 1.1, the
+       only change required in the firmware was to adjust the product name reported
+       over the USB link.
+      </listitem>
+    </itemizedlist>
+  </para>
+</article>