[asterisk-commits] mmichelson: branch 1.6.0 r173777 - in /branches/1.6.0: ./ configs/

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Thu Feb  5 17:51:13 2009
New Revision: 173777

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=173777
Log:
Merged revisions 173776 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
r173776 | mmichelson | 2009-02-05 17:48:48 -0600 (Thu, 05 Feb 2009) | 14 lines

Update extensions.conf.sample to be correct.

In trunk, the only necessary change pointed out was that the call
to ChanIsAvail uses an option that has been removed.

For the 1.6.1 branch, however, it appears that the sample file is
badly in need of updating since there are |'s used all over the place
there. My tentative plan is just to copy trunk's sample config file
to those branches since the info there is most up-to-date and should
be correct for use in 1.6.1

Thanks to macli in #asterisk-dev for bringing this up


........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/configs/extensions.conf.sample

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/configs/extensions.conf.sample
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.0/configs/extensions.conf.sample?view=diff&rev=173777&r1=173776&r2=173777
==============================================================================
--- branches/1.6.0/configs/extensions.conf.sample (original)
+++ branches/1.6.0/configs/extensions.conf.sample Thu Feb  5 17:51:13 2009
@@ -479,7 +479,7 @@
 ;
 ;   ${ARG1} - Device to page
 
-exten => s,1,ChanIsAvail(${ARG1},js)			; j is for Jump and s is for ANY call
+exten => s,1,ChanIsAvail(${ARG1},s)			; s is for ANY call
 exten => s,n,GoToIf([${AVAILSTATUS} = "1"]?autoanswer:fail)
 exten => s,n(autoanswer),Set(_ALERT_INFO="RA")			; This is for the PolyComs
 exten => s,n,SIPAddHeader(Call-Info: Answer-After=0)	; This is for the Grandstream, Snoms, and Others