[asterisk-commits] russell: trunk r48325 - in /trunk: ./ configs/iax.conf.sample

[asterisk-commits at lists.digium.com]

Author: russell
Date: Wed Dec  6 10:19:01 2006
New Revision: 48325

URL: http://svn.digium.com/view/asterisk?view=rev&rev=48325
Log:
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)

........

................

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

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

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

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

Modified: trunk/configs/iax.conf.sample
URL: http://svn.digium.com/view/asterisk/trunk/configs/iax.conf.sample?view=diff&rev=48325&r1=48324&r2=48325
==============================================================================
--- trunk/configs/iax.conf.sample (original)
+++ trunk/configs/iax.conf.sample Wed Dec  6 10:19:01 2006
@@ -267,7 +267,7 @@
 			; 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)