[svn-commits] mmichelson: branch group/upenn r129219 - in /team/group/upenn: ./ doc/

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Tue Jul  8 16:35:18 2008
New Revision: 129219

URL: http://svn.digium.com/view/asterisk?view=rev&rev=129219
Log:
Ninja resolve!


Modified:
    team/group/upenn/   (props changed)
    team/group/upenn/doc/imapstorage.txt

Propchange: team/group/upenn/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Jul  8 16:35:18 2008
@@ -1,1 +1,1 @@
-/branches/1.4:1-129198
+/branches/1.4:1-129218

Modified: team/group/upenn/doc/imapstorage.txt
URL: http://svn.digium.com/view/asterisk/team/group/upenn/doc/imapstorage.txt?view=diff&rev=129219&r1=129218&r2=129219
==============================================================================
--- team/group/upenn/doc/imapstorage.txt (original)
+++ team/group/upenn/doc/imapstorage.txt Tue Jul  8 16:35:18 2008
@@ -105,10 +105,10 @@
 expungeonhangup=<yes or no>
 authuser=<username>
 authpassword=<password>
-imapreadtimeout=<value in seconds>
-imapwritetimeout=<value in seconds>
-imapopentimeout=<value in seconds>
-imapclosetimeout=<value in seconds>
+imapopentimeout=<TCP open timeout in seconds>
+imapclosetimeout=<TCP close timeout in seconds>
+imapreadtimeout=<TCP read timeout in seconds>
+imapwritetimeout=<TCP write timeout in seconds>
 
 The "expungeonhangup" flag is used to determine if the voicemail system should
 expunge all messages marked for deletion when the user hangs up the phone.