# HG changeset patch
# User Carl Byington <carl@five-ten-sg.com>
# Date 1404865253 25200
# Node ID abf17d9431ebdd62eb212ee75ffd49145d6005b1
# Parent  13a3bd77881a99b5f40c90ac781f7633ccfdb561# Parent  61ed3984fc1d9a3a5fb08fcbd7ead876c2d72fdf
merge

diff -r 61ed3984fc1d -r abf17d9431eb .hgtags
--- a/.hgtags	Tue Jul 08 17:20:07 2014 -0700
+++ b/.hgtags	Tue Jul 08 17:20:53 2014 -0700
@@ -6,3 +6,4 @@
 9000d274d470967b5ebea8cfd9d1f7f6ff0de81a stable-1.8.1
 88c4168cc2727c29737b990e03a06a7070fd51af stable-1.8.2
 f60d4b1e8c3979e5bd41d4455671151ace397743 stable-1.8.3
+70ecbf70eadb0145640c652aaf166b51072c18e9 stable-1.8.4
diff -r 61ed3984fc1d -r abf17d9431eb AndroidManifest.xml
--- a/AndroidManifest.xml	Tue Jul 08 17:20:07 2014 -0700
+++ b/AndroidManifest.xml	Tue Jul 08 17:20:53 2014 -0700
@@ -17,7 +17,7 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 	package="com.five_ten_sg.connectbot"
-	android:versionName="1.8.3-1"
+	android:versionName="1.8.4-1"
 	android:versionCode="1"
 	android:installLocation="auto">
 
diff -r 61ed3984fc1d -r abf17d9431eb xml/510connectbot.in
--- a/xml/510connectbot.in	Tue Jul 08 17:20:07 2014 -0700
+++ b/xml/510connectbot.in	Tue Jul 08 17:20:53 2014 -0700
@@ -68,6 +68,29 @@
             </para>
         </refsect1>
 
+        <refsect1 id='changes.1'>
+            <title>Changes from previous Connectbots</title>
+            <itemizedlist>
+                <listitem><para>
+                    The soft function keypad can generate all 24 function keys
+                    for 5250 emulation. A hardware button can be configured to
+                    display that function keypad.
+                </para></listitem>
+
+                <listitem><para>
+                    A deployment.connections text file is read (and deleted) on
+                    startup. This may be used to preconfigure the global options
+                    and to create an initial set of host connections.
+                </para></listitem>
+
+                <listitem><para>
+                    The font sizes are now kept with one decimal point, and font
+                    size changes are done by scaling by a constant factor of 1.1,
+                    rather than the linear additive 2 point factor.
+                </para></listitem>
+            </itemizedlist>
+        </refsect1>
+
         <refsect1 id='monitor.1'>
             <title>Terminal Monitor</title>
             <para>