[asterisk-commits] trunk r11947 - in /trunk: ./ configs/zapata.conf.sample

[asterisk-commits at lists.digium.com]

Author: russell
Date: Sun Mar  5 20:33:36 2006
New Revision: 11947

URL: http://svn.digium.com/view/asterisk?rev=11947&view=rev
Log:
Merged revisions 11946 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r11946 | russell | 2006-03-05 21:32:35 -0500 (Sun, 05 Mar 2006) | 2 lines

fix a typo in the description of the ringtimeout option

........

Modified:
    trunk/   (props changed)
    trunk/configs/zapata.conf.sample

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Modified: trunk/configs/zapata.conf.sample
URL: http://svn.digium.com/view/asterisk/trunk/configs/zapata.conf.sample?rev=11947&r1=11946&r2=11947&view=diff
==============================================================================
--- trunk/configs/zapata.conf.sample (original)
+++ trunk/configs/zapata.conf.sample Sun Mar  5 20:33:36 2006
@@ -444,7 +444,7 @@
 ;callprogress=yes
 ;progzone=us
 ;
-; FXO (FXS signalled) devices must have a timeout to determine whe there was a
+; FXO (FXS signalled) devices must have a timeout to determine if there was a
 ; hangup before the line was answered.  This value can be tweaked to shorten
 ; how long it takes before Zap considers a non-ringing line to have hungup.
 ;