From 9e4965440c45260cdd8b313c019e331352b94134 Mon Sep 17 00:00:00 2001
From: Jan Schneider <jan@horde.org>
Date: Mon, 19 Apr 2010 09:05:17 +0200
Subject: [PATCH] Use a default that works with the widest range of devices,
 ws.

---
 horde/config/conf.xml | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/horde/config/conf.xml b/horde/config/conf.xml
index fbbb92f83..f8c982cf6 100644
--- a/horde/config/conf.xml
+++ b/horde/config/conf.xml
@@ -1997,7 +1997,7 @@
       seconds, that the server SHOULD wait before notifying the client of
       changes in a folder on the server.  These settings allow you to indicate
       the allowable range for this setting. Note that not all clients will
-      request this information.NOTE: Some Android devices do not implement this
+      request this information. NOTE: Some Android devices do not implement this
       correctly. If you plan on synching Android devices, you should make sure
       that this range is wide enough to allow Android's default of 470 seconds.
       </configdescription>
@@ -2006,7 +2006,7 @@
       </configinteger>
       <configinteger name="heartbeatmax" desc="The maximum number of seconds to
       wait before sending results. Note this value must not be greater then 3540
-      (59 minutes).">60</configinteger>
+      (59 minutes).">470</configinteger>
       <configinteger name="heartbeatdefault" desc="If the client does not
       request a heartbeat interval, this interval will be used by default.">10
       </configinteger>
@@ -2037,7 +2037,8 @@
           attempts before validating that an actual person is using the device
           is able to read and write. This should typically be half of the
           wipethreshold setting above.">5</configinteger>
-          <configinteger name="minimumlength" desc="Minimum PIN size">5</configinteger>
+          <configinteger name="minimumlength" desc="Minimum PIN
+          size">5</configinteger>
           <configenum name="complexity" desc="PIN/Password complexity. Some
           devices may be able to ONLY support numeric PINS.">
            <values>
@@ -2046,8 +2047,8 @@
             <value desc="Allow any">2</value>
          </values>
         </configenum>
-        <configinteger name="inactivity" desc="Number of minutes of inactivity before device
-        should lock.">3</configinteger>
+        <configinteger name="inactivity" desc="Number of minutes of inactivity
+        before device should lock.">3</configinteger>
          </case>
         </configswitch>
        </case>
@@ -2062,7 +2063,8 @@
           attempts before validating that an actual person is using the device
           is able to read and write. This should typically be half of the
           wipethreshold setting above.">5</configinteger>
-          <configinteger name="minimumlength" desc="Minimum PIN size">5</configinteger>
+          <configinteger name="minimumlength" desc="Minimum PIN
+          size">5</configinteger>
           <configenum name="complexity" desc="PIN/Password complexity. Some
           devices may be able to ONLY support numeric PINS.">
            <values>
@@ -2071,8 +2073,8 @@
             <value desc="Allow any">2</value>
            </values>
           </configenum>
-          <configinteger name="inactivity" desc="Number of minutes of inactivity before device
-          should lock.">3</configinteger>
+          <configinteger name="inactivity" desc="Number of minutes of
+          inactivity before device should lock.">3</configinteger>
          </case>
         </configswitch>
        </case>
-- 
2.11.0