From: Automerge script <automerge@asterisk.org>
Date: Mon, 6 Mar 2006 03:04:43 +0000 (+0000)
Subject: automerge commit
X-Git-Tag: 1.2.6-netsec~40
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c0763951ba8b7fe960854d124834aac2d0e870fa;p=thirdparty%2Fasterisk.git

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 06aa482837..3b52087e6c 100644
--- 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.
 ;