From: Keith Packard <keithp@keithp.com>
Date: Sat, 15 Dec 2012 03:29:50 +0000 (-0800)
Subject: Merge branch 'micropeak-1.1'
X-Git-Tag: 1.1.9.3~14
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=6fa1ec0dbf2a4eda8d061c67b3779b83b88f29f0;hp=f1409311761d65e85ac08c38c9b9a0114cc8f535

Merge branch 'micropeak-1.1'
---

diff --git a/doc/micropeak.xsl b/doc/micropeak.xsl
index 91126ce5..aa1adaef 100644
--- a/doc/micropeak.xsl
+++ b/doc/micropeak.xsl
@@ -230,10 +230,10 @@ NAR #88757, TRA #12200
 	with the negative battery terminal.
       </para>
       <para>
-	Shipping restrictions prevent us from including a CR1025
-	battery with MicroPeak. Many stores carry CR1025 batteries as
-	they are commonly used in small electronic devices such as
-	flash lights.
+	Shipping restrictions may prevent us from including a CR1025
+	battery with MicroPeak. If so, many stores carry CR1025
+	batteries as they are commonly used in small electronic
+	devices such as flash lights.
       </para>
     </section>
     <section>