Merge branch 'master' into branch-1.8

6 files changed, 31 insertions, 2 deletions

diff --git a/doc/Makefile b/doc/Makefile
index 7d33149d..efa7f9d3 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -3,6 +3,7 @@
 #
 
 RELNOTES_INC=\
+	release-notes-1.8.5.inc \
 	release-notes-1.8.4.inc \
 	release-notes-1.8.3.inc \
 	release-notes-1.8.2.inc \
diff --git a/doc/altusmetrum-docinfo.xml b/doc/altusmetrum-docinfo.xml
index 235111fc..3ea79f8b 100644
--- a/doc/altusmetrum-docinfo.xml
+++ b/doc/altusmetrum-docinfo.xml
@@ -18,7 +18,7 @@
   <surname>Towns</surname>
 </author>
 <copyright>
-  <year>2017</year>
+  <year>2018</year>
   <holder>Bdale Garbee and Keith Packard</holder>
 </copyright>
 <mediaobject>
diff --git a/doc/easymini-release-notes.inc b/doc/easymini-release-notes.inc
index dae928a6..2d289b12 100644
--- a/doc/easymini-release-notes.inc
+++ b/doc/easymini-release-notes.inc
@@ -1,6 +1,10 @@
 [appendix]
 == Release Notes
 	:leveloffset: 2
+	include::release-notes-1.8.5.raw[]
+
+	<<<<
+	:leveloffset: 2
 	include::release-notes-1.8.4.raw[]
 
 	<<<<
diff --git a/doc/release-notes-1.8.5.inc b/doc/release-notes-1.8.5.inc
new file mode 100644
index 00000000..5b940efd
--- /dev/null
+++ b/doc/release-notes-1.8.5.inc
@@ -0,0 +1,18 @@
+= Release Notes for Version 1.8.5
+:toc!:
+:doctype: article
+
+	Version 1.8.5 includes fixes to the ground software support
+	for TeleBT v4, along with a few other minor updates.
+
+	== AltOS
+
+	* Fix startup beeps that indicate sensor failures.
+
+	== AltosUI, TeleGPS
+
+	* When updating device firmware, make sure selected firmware
+          matches target device.
+
+	* Correct Bluetooth device matching when looking for TeleBT
+          devices.
diff --git a/doc/release-notes.inc b/doc/release-notes.inc
index 50b27ab5..b7c7f5a7 100644
--- a/doc/release-notes.inc
+++ b/doc/release-notes.inc
@@ -1,6 +1,9 @@
 [appendix]
 == Release Notes
+	:leveloffset: 2
+	include::release-notes-1.8.5.raw[]
 
+	<<<<
 	:leveloffset: 2
 	include::release-notes-1.8.4.raw[]
 
diff --git a/doc/telegps-release-notes.inc b/doc/telegps-release-notes.inc
index 5c5da8f6..f451c2c8 100644
--- a/doc/telegps-release-notes.inc
+++ b/doc/telegps-release-notes.inc
@@ -2,10 +2,13 @@
 == Release Notes
 
 	:leveloffset: 2
-	include::release-notes-1.8.4.raw[]
+	include::release-notes-1.8.5.raw[]
 
 	<<<<
+	:leveloffset: 2
+	include::release-notes-1.8.4.raw[]
 
+	<<<<
 	:leveloffset: 2
 	include::release-notes-1.8.3.raw[]