Formatting fixes

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@17864 f38db490-d61c-443f-a65b-d21fe96a405b

7 files changed, 79 insertions, 59 deletions

diff --git a/configs/extensions.conf.sample b/configs/extensions.conf.sample
index c98ce56ce..a61c15c90 100644
--- a/configs/extensions.conf.sample
+++ b/configs/extensions.conf.sample
@@ -310,18 +310,18 @@ include => iaxprovider
 ;   ${ARG1} - Extension  (we could have used ${MACRO_EXTEN} here as well
 ;   ${ARG2} - Device(s) to ring
 ;
-exten => s,1,Dial(${ARG2},20)					; Ring the interface, 20 seconds maximum
-exten => s,2,Goto(s-${DIALSTATUS},1)				; Jump based on status (NOANSWER,BUSY,CHANUNAVAIL,CONGESTION,ANSWER)
+exten => s,1,Dial(${ARG2},20)			; Ring the interface, 20 seconds maximum
+exten => s,2,Goto(s-${DIALSTATUS},1)		; Jump based on status (NOANSWER,BUSY,CHANUNAVAIL,CONGESTION,ANSWER)
 
-exten => s-NOANSWER,1,Voicemail(u${ARG1})		; If unavailable, send to voicemail w/ unavail announce
-exten => s-NOANSWER,2,Goto(default,s,1)			; If they press #, return to start
+exten => s-NOANSWER,1,Voicemail(u${ARG1})	; If unavailable, send to voicemail w/ unavail announce
+exten => s-NOANSWER,2,Goto(default,s,1)		; If they press #, return to start
 
-exten => s-BUSY,1,Voicemail(b${ARG1})			; If busy, send to voicemail w/ busy announce
-exten => s-BUSY,2,Goto(default,s,1)				; If they press #, return to start
+exten => s-BUSY,1,Voicemail(b${ARG1})		; If busy, send to voicemail w/ busy announce
+exten => s-BUSY,2,Goto(default,s,1)		; If they press #, return to start
 
-exten => _s-.,1,Goto(s-NOANSWER,1)				; Treat anything else as no answer
+exten => _s-.,1,Goto(s-NOANSWER,1)		; Treat anything else as no answer
 
-exten => a,1,VoicemailMain(${ARG1})				; If they press *, send the user into VoicemailMain
+exten => a,1,VoicemailMain(${ARG1})		; If they press *, send the user into VoicemailMain
 
 [macro-stdPrivacyexten];
 ;
@@ -331,22 +331,23 @@ exten => a,1,VoicemailMain(${ARG1})				; If they press *, send the user into Voi
 ;   ${ARG3} - Optional DONTCALL context name to jump to (assumes the s,1 extension-priority)
 ;   ${ARG4} - Optional TORTURE context name to jump to (assumes the s,1 extension-priority)`
 ;
-exten => s,1,Dial(${ARG2},20|p)					; Ring the interface, 20 seconds maximum, call screening option (or use P for databased call screening)
-exten => s,2,Goto(s-${DIALSTATUS},1)				; Jump based on status (NOANSWER,BUSY,CHANUNAVAIL,CONGESTION,ANSWER)
+exten => s,1,Dial(${ARG2},20|p)			; Ring the interface, 20 seconds maximum, call screening 
+						; option (or use P for databased call screening)
+exten => s,2,Goto(s-${DIALSTATUS},1)		; Jump based on status (NOANSWER,BUSY,CHANUNAVAIL,CONGESTION,ANSWER)
 
-exten => s-NOANSWER,1,Voicemail(u${ARG1})		; If unavailable, send to voicemail w/ unavail announce
-exten => s-NOANSWER,2,Goto(default,s,1)			; If they press #, return to start
+exten => s-NOANSWER,1,Voicemail(u${ARG1})	; If unavailable, send to voicemail w/ unavail announce
+exten => s-NOANSWER,2,Goto(default,s,1)		; If they press #, return to start
 
-exten => s-BUSY,1,Voicemail(b${ARG1})			; If busy, send to voicemail w/ busy announce
-exten => s-BUSY,2,Goto(default,s,1)				; If they press #, return to start
+exten => s-BUSY,1,Voicemail(b${ARG1})		; If busy, send to voicemail w/ busy announce
+exten => s-BUSY,2,Goto(default,s,1)		; If they press #, return to start
 
-exten => s-DONTCALL,1,Goto(${ARG3},s,1)               ; Callee chose to send this call to a polite "Don't call again" script.
+exten => s-DONTCALL,1,Goto(${ARG3},s,1)		; Callee chose to send this call to a polite "Don't call again" script.
 
-exten => s-TORTURE,1,Goto(${ARG4},s,1)                ; Callee chose to send this call to a telemarketer torture script.
+exten => s-TORTURE,1,Goto(${ARG4},s,1)		; Callee chose to send this call to a telemarketer torture script.
 
-exten => _s-.,1,Goto(s-NOANSWER,1)				; Treat anything else as no answer
+exten => _s-.,1,Goto(s-NOANSWER,1)		; Treat anything else as no answer
 
-exten => a,1,VoicemailMain(${ARG1})				; If they press *, send the user into VoicemailMain
+exten => a,1,VoicemailMain(${ARG1})		; If they press *, send the user into VoicemailMain
 
 [macro-page];
 ;
@@ -356,13 +357,13 @@ exten => a,1,VoicemailMain(${ARG1})				; If they press *, send the user into Voi
 ;
 ;   ${ARG1} - Device to page
 
-exten => s,1,ChanIsAvail(${ARG1}|js)                            ; j is for Jump and s is for ANY call
-exten => s,2,GoToIf([${AVAILSTATUS} = "1"]?3:7)
-exten => s,3,Set(_ALERT_INFO="RA")                              ; This is for the PolyComs
-exten => s,4,SIPAddHeader(Call-Info: Answer-After=0)            ; This is for the Grandstream, Snoms, and Others
-exten => s,5,NoOp()                                             ; Add others here and Post on the Wiki!!!!
-exten => s,6,Dial(${ARG1}||)
-exten => s,7,Hangup
+exten => s,1,ChanIsAvail(${ARG1}|js)			; j is for Jump and 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(fail),Hangup
 
 
 [demo]
@@ -375,13 +376,13 @@ exten => s,n,Set(TIMEOUT(digit)=5)	; Set Digit Timeout to 5 seconds
 exten => s,n,Set(TIMEOUT(response)=10)	; Set Response Timeout to 10 seconds
 exten => s,n(restart),BackGround(demo-congrats)	; Play a congratulatory message
 exten => s,n(instruct),BackGround(demo-instruct)	; Play some instructions
-exten => s,n,WaitExten		; Wait for an extension to be dialed.
+exten => s,n,WaitExten			; Wait for an extension to be dialed.
 
 exten => 2,1,BackGround(demo-moreinfo)	; Give some more information.
 exten => 2,n,Goto(s,instruct)
 
 exten => 3,1,Set(LANGUAGE()=fr)		; Set language to french
-exten => 3,n,Goto(s,restart)			; Start with the congratulations
+exten => 3,n,Goto(s,restart)		; Start with the congratulations
 
 exten => 1000,1,Goto(default,s,1)
 ;
@@ -400,7 +401,7 @@ exten => 1236,n,Voicemail(u1234)		; Unless busy
 ;
 ; # for when they're done with the demo
 ;
-exten => #,1,Playback(demo-thanks)		; "Thanks for trying the demo"
+exten => #,1,Playback(demo-thanks)	; "Thanks for trying the demo"
 exten => #,n,Hangup			; Hang them up.
 
 ;
@@ -498,7 +499,7 @@ include => demo
 
 ;exten => 6245,hint,SIP/Grandstream1&SIP/Xlite1,Joe Schmoe ; Channel hints for presence
 ;exten => 6245,1,Dial(SIP/Grandstream1,20,rt)	; permit transfer
-;exten => 6245,n(dial),Dial(${HINT},20,rtT)		; Use hint as listed
+;exten => 6245,n(dial),Dial(${HINT},20,rtT)	; Use hint as listed
 ;exten => 6245,n,Voicemail(u6245)		; Voicemail (unavailable)
 ;exten => 6245,s+1,Hangup			; s+1, same as n
 ;exten => 6245,dial+101,Voicemail(b6245)	; Voicemail (busy)
@@ -530,4 +531,6 @@ include => demo
 ;
 ; 'show application <command>' will show details of how you
 ; use that particular application in this file, the dial plan. 
-;
+; 'show functions" will list all dialplan functions
+; 'show function <COMMAND>' will show you more information about
+; one function. Remember that function names are UPPER CASE.
diff --git a/configs/iax.conf.sample b/configs/iax.conf.sample
index ee1581ac8..2c5e030a9 100644
--- a/configs/iax.conf.sample
+++ b/configs/iax.conf.sample
@@ -11,9 +11,10 @@
 ;
 [general]
 ;bindport=4569			; bindport and bindaddr may be specified
-;                               ; NOTE: bindport must be specified BEFORE bindaddr
-;                               ; or may be specified on a specific bindaddr if followed by
-;                               ; colon and port (e.g. bindaddr=192.168.0.1:4569)
+;                               ; NOTE: bindport must be specified BEFORE
+				; bindaddr or may be specified on a specific
+				; bindaddr if followed by colon and port
+				;  (e.g. bindaddr=192.168.0.1:4569)
 ;bindaddr=192.168.0.1		; more than once to bind to multiple
 ;                               ; addresses, but the first will be the 
 ;                               ; default
diff --git a/configs/meetme.conf.sample b/configs/meetme.conf.sample
index 308ec0772..bcd47e0bc 100644
--- a/configs/meetme.conf.sample
+++ b/configs/meetme.conf.sample
@@ -4,14 +4,14 @@
 ; This configuration file is read every time you call app meetme()
 
 [general]
-;audiobuffers=32		; The number of 20ms audio buffers to be used
-				; when feeding audio frames from non-Zap channels
-				; into the conference; larger numbers will allow
-				; for the conference to 'de-jitter' audio that arrives
-				; at different timing than the conference's timing
-				; source, but can also allow for latency in hearing
-				; the audio from the speaker. Minimum value is 2,
-				; maximum value is 32.
+;audiobuffers=32	; The number of 20ms audio buffers to be used
+			; when feeding audio frames from non-Zap channels
+			; into the conference; larger numbers will allow
+			; for the conference to 'de-jitter' audio that arrives
+			; at different timing than the conference's timing
+			; source, but can also allow for latency in hearing
+			; the audio from the speaker. Minimum value is 2,
+			; maximum value is 32.
 ;
 [rooms]
 ;
diff --git a/configs/mgcp.conf.sample b/configs/mgcp.conf.sample
index cf7b2c916..3508a1b25 100644
--- a/configs/mgcp.conf.sample
+++ b/configs/mgcp.conf.sample
@@ -46,17 +46,19 @@
 ;context=local
 ;host=dynamic
 ;dtmfmode=none		; DTMF Mode can be 'none', 'rfc2833', or 'inband' or
-				; 'hybrid' which starts in none and moves to inband.  Default is none.
+			; 'hybrid' which starts in none and moves to inband.  Default is none.
 ;slowsequence=yes	; The DPH100M does not follow MGCP standards for sequencing
 ;line => aaln/1
 
 ; known to work with wave7optics FTTH LMGs
 ;[192.168.1.20]
 ;accountcode	= 1000		; record this in cdr as account identification for billing
-;amaflags	= billing	; record this in cdr as flagged for 'billing', 'documentation', or 'omit'
+;amaflags	= billing	; record this in cdr as flagged for 'billing',
+				; 'documentation', or 'omit'
 ;context	= local
 ;host		= 192.168.1.20
-;wcardep	= aaln/*	; enables wildcard endpoint and sets it to 'aaln/*' another common format is '*'
+;wcardep	= aaln/*	; enables wildcard endpoint and sets it to 'aaln/*' 
+				; another common format is '*'
 ;callerid 	= "Duane Cox" <123>	; now lets setup line 1 using per endpoint configuration...
 ;callwaiting	= no
 ;callreturn	= yes
diff --git a/configs/queues.conf.sample b/configs/queues.conf.sample
index 71d8db64a..ff00964e6 100644
--- a/configs/queues.conf.sample
+++ b/configs/queues.conf.sample
@@ -90,7 +90,8 @@ persistentmembers = yes
 ;maxlen = 0
 ;
 ;
-; How often to announce queue position and/or estimated holdtime to caller (0=off)
+; How often to announce queue position and/or estimated 
+; holdtime to caller (0=off)
 ;
 ;announce-frequency = 90 
 ;
@@ -116,16 +117,26 @@ persistentmembers = yes
 ; Use these sound files in making position/holdtime announcements.  The
 ; defaults are as listed below -- change only if you need to.
 ;
-;queue-youarenext = queue-youarenext		;	("You are now first in line.")
-;queue-thereare	= queue-thereare		;	("There are")
-;queue-callswaiting = queue-callswaiting	;	("calls waiting.")
-;queue-holdtime = queue-holdtime		;	("The current est. holdtime is")
-;queue-minutes = queue-minutes			;	("minutes.")
-;queue-seconds = queue-seconds			;	("seconds.")
-;queue-thankyou = queue-thankyou		;	("Thank you for your patience.")
-;queue-lessthan = queue-less-than		;       ("less than")
-;queue-reporthold = queue-reporthold		;       ("Hold time")
-;periodic-announce = queue-periodic-announce    ;       ("All reps busy / wait for next")
+			;	("You are now first in line.")
+;queue-youarenext = queue-youarenext		
+			;	("There are")
+;queue-thereare	= queue-thereare
+			;	("calls waiting.")
+;queue-callswaiting = queue-callswaiting
+			;	("The current est. holdtime is")
+;queue-holdtime = queue-holdtime
+			;	("minutes.")
+;queue-minutes = queue-minutes
+			;	("seconds.")
+;queue-seconds = queue-seconds
+			;	("Thank you for your patience.")
+;queue-thankyou = queue-thankyou
+			;       ("less than")
+;queue-lessthan = queue-less-than
+			;       ("Hold time")
+;queue-reporthold = queue-reporthold
+			;       ("All reps busy / wait for next")
+;periodic-announce = queue-periodic-announce
 ;
 ; Calls may be recorded using Asterisk's monitor resource
 ; This can be enabled from within the Queue application, starting recording
diff --git a/configs/skinny.conf.sample b/configs/skinny.conf.sample
index f47c5e314..8a910205a 100644
--- a/configs/skinny.conf.sample
+++ b/configs/skinny.conf.sample
@@ -45,7 +45,8 @@ keepAlive=120
 ;callerid="Customer Support" <810-234-1212>
 ;mailbox=100
 ;context=inbound
-;linelabel="Support Line" ; Displays next to the line button on 7940's and 7960s
+;linelabel="Support Line"	; Displays next to the line 
+				; button on 7940's and 7960s
 ;line => 100
 ;callerid="John Chambers" <408-526-4000>
 ;context=did
diff --git a/configs/voicemail.conf.sample b/configs/voicemail.conf.sample
index d7322860b..ba1834433 100644
--- a/configs/voicemail.conf.sample
+++ b/configs/voicemail.conf.sample
@@ -164,7 +164,8 @@ european=Europe/Copenhagen|'vm-received' a d b 'digits/at' HM
 ; attach=yes 		; Attach the voicemail to the notification email *NOT* the pager email
 ; saycid=yes 		; Say the caller id information before the message. If not described, 
 			;     or set to no, it will be in the envelope
-; cidinternalcontexts=intern	; Internal Context for Name Playback instead of extension digits when saying caller id.
+; cidinternalcontexts=intern	; Internal Context for Name Playback instead of 
+			; extension digits when saying caller id.
 ; sayduration=no 	; Turn on/off the duration information before the message. [ON by default]
 ; saydurationm=2        ; Specify the minimum duration to say. Default is 2 minutes
 ; dialout=fromvm 	; Context to dial out from [option 4 from the advanced menu]
@@ -183,8 +184,9 @@ sendvoicemail=yes	; Context to Send voicemail from [option 5 from the advanced m
 ; envelope=no 		; Turn on/off envelope playback before message playback. [ON by default] 
 			;     This does NOT affect option 3,3 from the advanced options menu
 ; delete=yes		; After notification, the voicemail is deleted from the server. [per-mailbox only]
-			;     This is intended for use with users who wish to receive their voicemail ONLY by email.
-			;     Note:  deletevoicemail is provided as an equivalent option for Realtime configuration.
+			;     This is intended for use with users who wish to receive their 
+			;     voicemail ONLY by email. Note:  "deletevoicemail" is provided as an
+			;     equivalent option for Realtime configuration.
 ; nextaftercmd=yes	; Skips to the next message after hitting 7 or 9 to delete/save current message.
 			;     [global option only at this time] 
 ; forcename=yes		; Forces a new user to record their name.  A new user is