From: Russell Bryant Date: Wed, 6 Dec 2006 16:19:01 +0000 (+0000) Subject: Merged revisions 48323 via svnmerge from X-Git-Tag: 1.6.0-beta1~3^2~3772 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c7efdf6759b1a67cd88b1d26ed6f170351059ff5;p=thirdparty%2Fasterisk.git Merged revisions 48323 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r48323 | russell | 2006-12-06 11:15:45 -0500 (Wed, 06 Dec 2006) | 11 lines Merged revisions 48322 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r48322 | russell | 2006-12-06 11:05:54 -0500 (Wed, 06 Dec 2006) | 3 lines Fix the name of the rtignoreregexpire option in the sample configuration file. (issue #8526, arkadia) ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48325 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/configs/iax.conf.sample b/configs/iax.conf.sample index adb9f02a5c..6ab33321ff 100644 --- a/configs/iax.conf.sample +++ b/configs/iax.conf.sample @@ -267,7 +267,7 @@ autokill=yes ; If set to an integer, friends expire within this number of ; seconds instead of the registration interval. -;rtignoreexpire=yes ; When reading a peer from Realtime, if the peer's registration +;rtignoreregexpire=yes ; When reading a peer from Realtime, if the peer's registration ; has expired based on its registration interval, used the stored ; address information regardless. (yes|no)