automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@11975 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/configs/zapata.conf.sample b/configs/zapata.conf.sample
index 06aa4828370ee6b5249f0cdd51f87a6a117426cd..3b52087e6cf7bef80ae4545bdddd784987713ae8 100644 (file)
--- a/configs/zapata.conf.sample
+++ b/configs/zapata.conf.sample
@@ -431,7 +431,7 @@ immediate=no
 ;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.
 ;