From: Russell Bryant <russell@russellbryant.com>
Date: Mon, 6 Mar 2006 02:33:36 +0000 (+0000)
Subject: Merged revisions 11946 via svnmerge from
X-Git-Tag: 1.4.0-beta1~2486
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=99206286fb6785bf25373ed6e6f8a6c7a1994c7a;p=thirdparty%2Fasterisk.git

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

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@11947 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/configs/zapata.conf.sample b/configs/zapata.conf.sample
index 8fad060ae7..7cbbf79b23 100644
--- a/configs/zapata.conf.sample
+++ b/configs/zapata.conf.sample
@@ -444,7 +444,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.
 ;