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


........


git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@173779 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 13 insertions, 15 deletions

diff --git a/configs/extensions.conf.sample b/configs/extensions.conf.sample
index d3083e639..9d061d71a 100644
--- a/configs/extensions.conf.sample
+++ b/configs/extensions.conf.sample
@@ -188,18 +188,17 @@ TRUNKMSD=1					; MSD digits to strip (usually 1 or 0)
 ;
 ;[context]
 ;exten => someexten,{priority|label{+|-}offset}[(alias)],application(arg1,arg2,...)
-;exten => someexten,{priority|label{+|-}offset}[(alias)],application,arg1|arg2...
 ;
 ; Timing list for includes is 
 ;
-;   <time range>|<days of week>|<days of month>|<months>
+;   <time range>,<days of week>,<days of month>,<months>
 ;
 ; Note that ranges may be specified to wrap around the ends.  Also, minutes are
 ; fine-grained only down to the closest even minute.
 ;
-;include => daytime|9:00-17:00|mon-fri|*|*
-;include => weekend|*|sat-sun|*|*
-;include => weeknights|17:02-8:58|mon-fri|*|*
+;include => daytime,9:00-17:00,mon-fri,*,*
+;include => weekend,*,sat-sun,*,*
+;include => weeknights,17:02-8:58,mon-fri,*,*
 ;
 ; ignorepat can be used to instruct drivers to not cancel dialtone upon receipt
 ; of a particular pattern.  The most commonly used example is of course '9'
@@ -451,9 +450,9 @@ exten => _X.,n,Set(LOCAL(tortcntx)=${ARG4})
 exten => _X.,n,Set(LOCAL(cntx)=${ARG5})
 
 exten => _X.,n,Set(LOCAL(mbx)="${ext}"$["${cntx}" ? "@${cntx}" :: ""])
-exten => _X.,n,Dial(${dev},20|p)			; Ring the interface, 20 seconds maximum, call screening 
-						; option (or use P for databased call screening)
-exten => _X.,n,Goto(stdexten-${DIALSTATUS},1)		; Jump based on status (NOANSWER,BUSY,CHANUNAVAIL,CONGESTION,ANSWER)
+exten => _X.,n,Dial(${dev},20,p)			; Ring the interface, 20 seconds maximum, call screening 
+						; option (or use P for databased call _X.creening)
+exten => _X.,n,Goto(s-${DIALSTATUS},1)		; Jump based on status (NOANSWER,BUSY,CHANUNAVAIL,CONGESTION,ANSWER)
 
 exten => stdexten-NOANSWER,1,Voicemail(${mbx},u)	; If unavailable, send to voicemail w/ unavail announce
 exten => stdexten-NOANSWER,n,NoOp(Finish stdPrivacyexten NOANSWER)
@@ -470,8 +469,7 @@ exten => stdexten-TORTURE,1,Goto(${tortcntx},s,1)	; Callee chose to send this ca
 exten => _stdexten-.,1,Goto(s-NOANSWER,1)		; Treat anything else as no answer
 
 exten => a,1,VoicemailMain(${mbx})		; If they press *, send the user into VoicemailMain
-exten => a,n,Return()
-						; does this ever return?
+exten => a,n,Return
 
 [macro-page];
 ;
@@ -481,12 +479,12 @@ exten => a,n,Return()
 ;
 ;   ${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
 exten => s,n,NoOp()					; Add others here and Post on the Wiki!!!!
-exten => s,n,Dial(${ARG1}||)
+exten => s,n,Dial(${ARG1})
 exten => s,n(fail),Hangup
 
 
@@ -563,7 +561,7 @@ exten => _7XXX,1,Macro(page,SIP/${EXTEN})
 ; System Wide Page at extension 7999
 ;
 exten => 7999,1,Set(TIMEOUT(absolute)=60)
-exten => 7999,2,Page(Local/Grandstream1@page&Local/Xlite1@page&Local/1234@page/n|d)
+exten => 7999,2,Page(Local/Grandstream1@page&Local/Xlite1@page&Local/1234@page/n,d)
 
 ; Give voicemail at extension 8500
 ;
@@ -636,11 +634,11 @@ include => demo
 ;exten => 6275,1,Gosub(stdexten(6275,${MARK}))
 						; assuming ${MARK} is something like DAHDI/2
 ;exten => 6275,n,Goto(default,s,1)		; exited Voicemail
-;exten => mark,1,Goto(6275|1)			; alias mark to 6275
+;exten => mark,1,Goto(6275,1)			; alias mark to 6275
 ;exten => 6536,1,Gosub(stdexten(6236,${WIL}))
 						; Ditto for wil
 ;exten => 6536,n,Goto(default,s,1)		; exited Voicemail
-;exten => wil,1,Goto(6236|1)
+;exten => wil,1,Goto(6236,1)
 
 ;If you want to subscribe to the status of a parking space, this is
 ;how you do it. Subscribe to extension 6600 in sip, and you will see